Update MainFrame.cpp

1.Add associate .step/.stp files to QIDISlicer
2.Update the userguide.

QIDISlicer.version

@@ -1,16 +1,16 @@
-1.0.1
+1.0.2
-alpha=1.0.1-alpha1
+alpha=1.0.2-alpha1
-beta=1.0.1-beta1
+beta=1.0.2-beta1
 
 [common]
-release = 1.0.1
+release = 1.0.2
-alpha = 1.0.1-alpha1
+alpha = 1.0.2-alpha1
-beta = 1.0.1-beta1
+beta = 1.0.2-beta1
-rc = 1.0.1-rc2
+rc = 1.0.2-rc2
 
 [release:win64]
-url = https://qidi3d.com/
+url = https://github.com/QIDITECH/QIDISlicer/releases/download/V1.0.2/QIDISlicer_Setup_1.0.2.exe
-size = 85814296
+size = 71118761
 
 [release:linux]
 url = https://qidi3d.com

deps/OpenEXR/OpenEXR.cmake

@@ -4,6 +4,7 @@ qidislicer_add_cmake_project(OpenEXR
     URL_HASH SHA256=0307a3d7e1fa1e77e9d84d7e9a8694583fbbbfd50bdc6884e2c96b8ef6b902de
     DEPENDS ${ZLIB_PKG}
     GIT_TAG v2.5.5
+    PATCH_COMMAND COMMAND ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/OpenEXR.patch
     CMAKE_ARGS
         -DCMAKE_POSITION_INDEPENDENT_CODE=ON
         -DBUILD_TESTING=OFF 

deps/OpenEXR/OpenEXR.patch

@@ -0,0 +1,30 @@
+--- ../OpenEXR-orig/OpenEXR/IlmImf/ImfDwaCompressor.cpp	2021-02-12 17:56:19.000000000 +0100
++++ ./OpenEXR/IlmImf/ImfDwaCompressor.cpp	2023-06-01 13:21:32.666695400 +0200
+@@ -159,6 +159,7 @@
+ #include <limits>
+ 
+ #include <cstddef>
++#include <cstdint>
+ 
+ 
+ // Windows specific addition to prevent the indirect import of the redefined min/max macros
+--- ../OpenEXR-orig/OpenEXR/IlmImf/ImfHuf.cpp	2021-02-12 17:56:19.000000000 +0100
++++ ./OpenEXR/IlmImf/ImfHuf.cpp	2023-06-01 13:21:53.018583400 +0200
+@@ -53,6 +53,7 @@
+ #include <cstring>
+ #include <cassert>
+ #include <algorithm>
++#include <cstdint>
+ 
+ 
+ using namespace std;
+--- ../OpenEXR-orig/OpenEXR/IlmImf/ImfMisc.cpp	2021-02-12 17:56:19.000000000 +0100
++++ ./OpenEXR/IlmImf/ImfMisc.cpp	2023-06-01 13:22:15.777480000 +0200
+@@ -40,6 +40,7 @@
+ //
+ //-----------------------------------------------------------------------------
+ 
++#include <cstdint>
+ #include <ImfMisc.h>
+ #include <ImfHeader.h>
+ #include <ImfAttribute.h>

deps/wxWidgets/0001-wxWidget-fix.patch

@@ -0,0 +1,666 @@
+diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake
+index 0bc4f934b9..479431a69c 100644
+--- a/build/cmake/init.cmake
++++ b/build/cmake/init.cmake
+@@ -413,7 +413,11 @@ if(wxUSE_GUI)
+         else()
+             find_package(OpenGL)
+             if(WXGTK3 AND OpenGL_EGL_FOUND AND wxUSE_GLCANVAS_EGL)
++                if(UNIX AND NOT APPLE)
++                set(OPENGL_LIBRARIES OpenGL EGL)
++                else()
+                 set(OPENGL_LIBRARIES OpenGL::OpenGL OpenGL::EGL)
++                endif()
+                 find_package(WAYLANDEGL)
+                 if(WAYLANDEGL_FOUND AND wxHAVE_GDK_WAYLAND)
+                     list(APPEND OPENGL_LIBRARIES ${WAYLANDEGL_LIBRARIES})
+diff --git a/build/cmake/lib/webview/CMakeLists.txt b/build/cmake/lib/webview/CMakeLists.txt
+index cc3298ff33..8adbeaea4f 100644
+--- a/build/cmake/lib/webview/CMakeLists.txt
++++ b/build/cmake/lib/webview/CMakeLists.txt
+@@ -56,7 +56,7 @@ if(APPLE)
+ elseif(WXMSW)
+     if(wxUSE_WEBVIEW_EDGE)
+         # Update the following variables if updating WebView2 SDK
+-        set(WEBVIEW2_VERSION "1.0.705.50")
++        set(WEBVIEW2_VERSION "1.0.1418.22")
+         set(WEBVIEW2_URL "https://www.nuget.org/api/v2/package/Microsoft.Web.WebView2/${WEBVIEW2_VERSION}")
+         set(WEBVIEW2_SHA256 "51d2ef56196e2a9d768a6843385bcb9c6baf9ed34b2603ddb074fb4995543a99")
+ 
+diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h
+index 09ad8c8ef3..3c0c2d8f7e 100644
+--- a/include/wx/fontutil.h
++++ b/include/wx/fontutil.h
+@@ -294,7 +294,11 @@ public:
+     wxFontEncoding GetEncoding() const;
+ 
+     void SetPointSize(int pointsize);
+-    void SetFractionalPointSize(double pointsize);
++    void SetFractionalPointSize(double pointsize
++#if defined(__WXMSW__)
++    	, const wxWindow *window = nullptr
++#endif
++    	);
+     void SetPixelSize(const wxSize& pixelSize);
+     void SetStyle(wxFontStyle style);
+     void SetNumericWeight(int weight);
+@@ -307,12 +311,19 @@ public:
+ 
+     // Helper used in many ports: use the normal font size if the input is
+     // negative, as we handle -1 as meaning this for compatibility.
+-    void SetSizeOrDefault(double size)
++    void SetSizeOrDefault(double size
++#if defined(__WXMSW__)
++    	, const wxWindow *window = nullptr
++#endif
++    	)
+     {
+         SetFractionalPointSize
+         (
+             size < 0 ? wxNORMAL_FONT->GetFractionalPointSize()
+                      : size
++#if defined(__WXMSW__)
++            ,window
++#endif
+         );
+     }
+ 
+diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
+index e29a77627c..dc48cf9451 100644
+--- a/include/wx/gdicmn.h
++++ b/include/wx/gdicmn.h
+@@ -38,6 +38,7 @@ class WXDLLIMPEXP_FWD_CORE wxRegion;
+ class WXDLLIMPEXP_FWD_BASE wxString;
+ class WXDLLIMPEXP_FWD_CORE wxIconBundle;
+ class WXDLLIMPEXP_FWD_CORE wxPoint;
++class WXDLLIMPEXP_FWD_CORE wxWindow;
+ 
+ // ---------------------------------------------------------------------------
+ // constants
+@@ -1092,7 +1093,9 @@ extern int WXDLLIMPEXP_CORE wxDisplayDepth();
+ 
+ // get the display size
+ extern void WXDLLIMPEXP_CORE wxDisplaySize(int *width, int *height);
++extern void WXDLLIMPEXP_CORE wxDisplaySize(const wxWindow *window, int *width, int *height);
+ extern wxSize WXDLLIMPEXP_CORE wxGetDisplaySize();
++extern wxSize WXDLLIMPEXP_CORE wxGetDisplaySize(const wxWindow *window);
+ extern void WXDLLIMPEXP_CORE wxDisplaySizeMM(int *width, int *height);
+ extern wxSize WXDLLIMPEXP_CORE wxGetDisplaySizeMM();
+ extern wxSize WXDLLIMPEXP_CORE wxGetDisplayPPI();
+diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
+index d7a3890764..e4dee51d5a 100644
+--- a/include/wx/generic/grid.h
++++ b/include/wx/generic/grid.h
+@@ -2951,9 +2951,11 @@ private:
+                          wxGridWindow* gridWindow);
+ 
+     // Update the width/height of the column/row being drag-resized.
++    //BBS: add cursor mode for DoGridDragResize's paremeters
+     void DoGridDragResize(const wxPoint& position,
+                           const wxGridOperations& oper,
+-                          wxGridWindow* gridWindow);
++                          wxGridWindow* gridWindow,
++                          CursorMode mode);
+ 
+     // process different clicks on grid cells
+     void DoGridCellLeftDown(wxMouseEvent& event,
+diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h
+index 0f9768b44e..094d774918 100644
+--- a/include/wx/msw/font.h
++++ b/include/wx/msw/font.h
+@@ -23,7 +23,7 @@ public:
+     // ctors and such
+     wxFont() { }
+ 
+-    wxFont(const wxFontInfo& info);
++    wxFont(const wxFontInfo& info, const wxWindow *window = nullptr);
+ 
+     wxFont(int size,
+            wxFontFamily family,
+diff --git a/include/wx/msw/tooltip.h b/include/wx/msw/tooltip.h
+index 4c3be08cec..96fb378d01 100644
+--- a/include/wx/msw/tooltip.h
++++ b/include/wx/msw/tooltip.h
+@@ -91,10 +91,10 @@ private:
+     // the one and only one tooltip control we use - never access it directly
+     // but use GetToolTipCtrl() which will create it when needed
+     static WXHWND ms_hwndTT;
+-
++public:
+     // create the tooltip ctrl if it doesn't exist yet and return its HWND
+     static WXHWND GetToolTipCtrl();
+-
++private:
+     // to be used in wxModule for deleting tooltip ctrl window when exiting mainloop
+     static void DeleteToolTipCtrl();
+ 
+diff --git a/include/wx/osx/app.h b/include/wx/osx/app.h
+index 317a0ca96f..58014ec1d4 100644
+--- a/include/wx/osx/app.h
++++ b/include/wx/osx/app.h
+@@ -161,7 +161,7 @@ private:
+ 
+ public:
+     bool                OSXInitWasCalled() { return m_inited; }
+-    void                OSXStoreOpenFiles(const wxArrayString &files ) { m_openFiles = files ; }
++    virtual void        OSXStoreOpenFiles(const wxArrayString &files ) { m_openFiles = files ; }
+     void                OSXStorePrintFiles(const wxArrayString &files ) { m_printFiles = files ; }
+     void                OSXStoreOpenURL(const wxString &url ) { m_getURL = url ; }
+ #endif
+diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
+index b61aac35bf..d12b745e8c 100644
+--- a/src/common/combocmn.cpp
++++ b/src/common/combocmn.cpp
+@@ -2141,7 +2141,7 @@ void wxComboCtrlBase::CreatePopup()
+         #if !USES_GENERICTLW
+             m_winPopup = new wxComboPopupWindowBase2( this, wxNO_BORDER );
+         #else
+-            int tlwFlags = wxNO_BORDER;
++            int tlwFlags = wxNO_BORDER | wxSTAY_ON_TOP;
+           #ifdef wxCC_GENERIC_TLW_IS_FRAME
+             tlwFlags |= wxFRAME_NO_TASKBAR;
+           #endif
+@@ -2285,6 +2285,9 @@ void wxComboCtrlBase::ShowPopup()
+ 
+     SetFocus();
+ 
++    //int displayIdx = wxDisplay::GetFromWindow(this);
++    //wxRect displayRect = wxDisplay(displayIdx != wxNOT_FOUND ? displayIdx : 0u).GetGeometry();
++
+     // Space above and below
+     int screenHeight;
+     wxPoint scrPos;
+@@ -2407,9 +2410,13 @@ void wxComboCtrlBase::ShowPopup()
+ 
+     int showFlags = CanDeferShow;
+ 
+-    if ( spaceBelow < szp.y )
++    int anchorSideVertical = m_anchorSide & (wxUP | wxDOWN);
++    if (// Pop up as asked for by the library user.
++        (anchorSideVertical & wxUP) || 
++        // Automatic: Pop up if it does not fit down.
++        (anchorSideVertical == 0 && spaceBelow < szp.y ))
+     {
+-        popupY = scrPos.y - szp.y;
++        popupY = scrPos.y - szp.y + displayRect.GetTop();
+         showFlags |= ShowAbove;
+     }
+ 
+diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
+index 1f5fd4d66b..14ea2f8ef1 100644
+--- a/src/common/datavcmn.cpp
++++ b/src/common/datavcmn.cpp
+@@ -1322,7 +1322,11 @@ wxDataViewItem wxDataViewCtrlBase::GetSelection() const
+ 
+     wxDataViewItemArray selections;
+     GetSelections(selections);
+-    return selections[0];
++    // BBS
++    if (!selections.empty())
++        return selections[0];
++    else
++        return wxDataViewItem(0);
+ }
+ 
+ namespace
+diff --git a/src/common/dcbufcmn.cpp b/src/common/dcbufcmn.cpp
+index 74958fce10..59844f4526 100644
+--- a/src/common/dcbufcmn.cpp
++++ b/src/common/dcbufcmn.cpp
+@@ -82,9 +82,15 @@ private:
+         const double scale = dc ? dc->GetContentScaleFactor() : 1.0;
+         wxBitmap* const buffer = new wxBitmap;
+ 
++#if __WXMSW__
+         // we must always return a valid bitmap but creating a bitmap of
+         // size 0 would fail, so create a 1*1 bitmap in this case
+-        buffer->CreateScaled(wxMax(w, 1), wxMax(h, 1), -1, scale);
++        buffer->Create(wxMax(w, 1), wxMax(h, 1), 24);
++#else
++		// we must always return a valid bitmap but creating a bitmap of
++		// size 0 would fail, so create a 1*1 bitmap in this case
++		buffer->CreateScaled(wxMax(w, 1), wxMax(h, 1), -1, scale);
++#endif
+ 
+         return buffer;
+     }
+diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
+index 20442bbc73..9a24951ec7 100644
+--- a/src/common/gdicmn.cpp
++++ b/src/common/gdicmn.cpp
+@@ -863,11 +863,25 @@ void wxDisplaySize(int *width, int *height)
+         *height = size.y;
+ }
+ 
++void wxDisplaySize(const wxWindow *window, int *width, int *height)
++{
++    const wxSize size = wxGetDisplaySize(window);
++    if ( width )
++        *width = size.x;
++    if ( height )
++        *height = size.y;    
++}
++
+ wxSize wxGetDisplaySize()
+ {
+     return wxDisplay().GetGeometry().GetSize();
+ }
+ 
++wxSize wxGetDisplaySize(const wxWindow *window)
++{
++    return window ? wxDisplay(window).GetGeometry().GetSize() : wxDisplay().GetGeometry().GetSize();
++}
++
+ void wxClientDisplayRect(int *x, int *y, int *width, int *height)
+ {
+     const wxRect rect = wxGetClientDisplayRect();
+diff --git a/src/common/intl.cpp b/src/common/intl.cpp
+index 0b0d8798f4..7072fab18a 100644
+--- a/src/common/intl.cpp
++++ b/src/common/intl.cpp
+@@ -1628,6 +1628,12 @@ GetInfoFromLCID(LCID lcid,
+             {
+                 str = buf;
+ 
++//FIXME Vojtech: We forcefully set the locales for a decimal point to "C", but this
++// is not possible for the Win32 locales, therefore there is a discrepancy. 
++// It looks like we live with the discrepancy for at least half a year, so we will
++// suppress the assert until we fix Slic3r to properly switch to "C" locales just
++// for file import / export.
++#if 0
+                 // As we get our decimal point separator from Win32 and not the
+                 // CRT there is a possibility of mismatch between them and this
+                 // can easily happen if the user code called setlocale()
+@@ -1641,6 +1647,7 @@ GetInfoFromLCID(LCID lcid,
+                     "Decimal separator mismatch -- did you use setlocale()?"
+                     "If so, use wxLocale to change the locale instead."
+                 );
++#endif
+             }
+             break;
+ 
+diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
+index 41fd4524cf..f4a15cb839 100644
+--- a/src/generic/grid.cpp
++++ b/src/generic/grid.cpp
+@@ -3824,7 +3824,8 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event, wxGridRowLabelWindo
+             {
+                 case WXGRID_CURSOR_RESIZE_ROW:
+                 {
+-                    DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow);
++                    //BBS: add cursor mode for DoGridDragResize's paremeters
++                    DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow, WXGRID_CURSOR_RESIZE_ROW);
+                 }
+                 break;
+ 
+@@ -4166,7 +4167,8 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event, wxGridColLabelWindo
+             switch ( m_cursorMode )
+             {
+                 case WXGRID_CURSOR_RESIZE_COL:
+-                    DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow);
++                    //BBS: add cursor mode for DoGridDragResize's paremeters
++                    DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow, WXGRID_CURSOR_RESIZE_COL);
+                 break;
+ 
+                 case WXGRID_CURSOR_SELECT_COL:
+@@ -4708,11 +4710,13 @@ bool wxGrid::DoGridDragEvent(wxMouseEvent& event,
+             return DoGridCellDrag(event, coords, isFirstDrag);
+ 
+         case WXGRID_CURSOR_RESIZE_ROW:
+-            DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow);
++            //BBS: add cursor mode for DoGridDragResize's paremeters
++            DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow, WXGRID_CURSOR_RESIZE_ROW);
+             break;
+ 
+         case WXGRID_CURSOR_RESIZE_COL:
+-            DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow);
++            //BBS: add cursor mode for DoGridDragResize's paremeters
++            DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow, WXGRID_CURSOR_RESIZE_COL);
+             break;
+ 
+         default:
+@@ -4803,6 +4807,8 @@ wxGrid::DoGridCellLeftDown(wxMouseEvent& event,
+                             case wxGridSelectCells:
+                             case wxGridSelectRowsOrColumns:
+                                 // nothing to do in these cases
++                                //BBS: select this cell when first click
++                                m_selection->SelectBlock(coords.GetRow(), coords.GetCol(), coords.GetRow(), coords.GetCol(), event);
+                                 break;
+ 
+                             case wxGridSelectRows:
+@@ -5044,9 +5050,11 @@ void wxGrid::ProcessGridCellMouseEvent(wxMouseEvent& event, wxGridWindow *eventG
+     }
+ }
+ 
++//BBS: add cursor mode for DoGridDragResize's paremeters
+ void wxGrid::DoGridDragResize(const wxPoint& position,
+                               const wxGridOperations& oper,
+-                              wxGridWindow* gridWindow)
++                              wxGridWindow* gridWindow,
++                              CursorMode mode)
+ {
+     // Get the logical position from the physical one we're passed.
+     const wxPoint
+@@ -5056,10 +5064,28 @@ void wxGrid::DoGridDragResize(const wxPoint& position,
+     // orthogonal direction.
+     const int linePos = oper.Dual().Select(logicalPos);
+ 
+-    const int lineStart = oper.GetLineStartPos(this, m_dragRowOrCol);
+-    oper.SetLineSize(this, m_dragRowOrCol,
++    //BBS: add logic for resize multiplexed cols
++    if (mode == WXGRID_CURSOR_RESIZE_COL) {
++        int col_to_resize = m_dragRowOrCol;
++        int num_rows, num_cols;
++        this->GetCellSize(0, m_dragRowOrCol, &num_rows, &num_cols);
++        if (num_cols < 1)
++            col_to_resize = m_dragRowOrCol - 1;
++
++        const int lineEnd = oper.GetLineEndPos(this, m_dragRowOrCol);
++        const int lineSize = oper.GetLineSize(this, col_to_resize);
++        int size = linePos - lineEnd + lineSize;
++        oper.SetLineSize(this, col_to_resize,
++                     wxMax(size,
++                           oper.GetMinimalLineSize(this, col_to_resize)));
++    }
++    else {
++        const int lineStart = oper.GetLineStartPos(this, m_dragRowOrCol);
++
++        oper.SetLineSize(this, m_dragRowOrCol,
+                      wxMax(linePos - lineStart,
+                            oper.GetMinimalLineSize(this, m_dragRowOrCol)));
++    }
+ 
+     // TODO: generate RESIZING event, see #10754, if the size has changed.
+ }
+@@ -5082,7 +5108,8 @@ wxPoint wxGrid::GetPositionForResizeEvent(int width) const
+ 
+ void wxGrid::DoEndDragResizeRow(const wxMouseEvent& event, wxGridWindow* gridWindow)
+ {
+-    DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow);
++    //BBS: add cursor mode for DoGridDragResize's paremeters
++    DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow, WXGRID_CURSOR_RESIZE_ROW);
+ 
+     SendGridSizeEvent(wxEVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event);
+ 
+@@ -5091,7 +5118,8 @@ void wxGrid::DoEndDragResizeRow(const wxMouseEvent& event, wxGridWindow* gridWin
+ 
+ void wxGrid::DoEndDragResizeCol(const wxMouseEvent& event, wxGridWindow* gridWindow)
+ {
+-    DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow);
++    //BBS: add cursor mode for DoGridDragResize's paremeters
++    DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow, WXGRID_CURSOR_RESIZE_COL);
+ 
+     SendGridSizeEvent(wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event);
+ 
+@@ -5105,9 +5133,10 @@ void wxGrid::DoHeaderStartDragResizeCol(int col)
+ 
+ void wxGrid::DoHeaderDragResizeCol(int width)
+ {
++    //BBS: add cursor mode for DoGridDragResize's paremeters
+     DoGridDragResize(GetPositionForResizeEvent(width),
+                      wxGridColumnOperations(),
+-                     m_gridWin);
++                     m_gridWin, WXGRID_CURSOR_RESIZE_COL);
+ }
+ 
+ void wxGrid::DoHeaderEndDragResizeCol(int width)
+@@ -5891,6 +5920,10 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
+                     DisableCellEditControl();
+ 
+                     MoveCursorDown( event.ShiftDown() );
++                    //BBS: select this cell when first click
++                    m_selection->SelectBlock(m_currentCellCoords.GetRow(), m_currentCellCoords.GetCol(),
++                                             m_currentCellCoords.GetRow(), m_currentCellCoords.GetCol(),
++                                             event);
+                 }
+                 break;
+ 
+diff --git a/src/msw/bmpcbox.cpp b/src/msw/bmpcbox.cpp
+index 0a2d167ad7..0aeba45ea9 100644
+--- a/src/msw/bmpcbox.cpp
++++ b/src/msw/bmpcbox.cpp
+@@ -156,13 +156,20 @@ void wxBitmapComboBox::RecreateControl()
+ 
+     wxComboBox::DoClear();
+ 
+-    HWND hwnd = GetHwnd();
++    WNDPROC wndproc_edit = nullptr;
++	WinStruct<COMBOBOXINFO> combobox_info;
++	HWND hwnd = GetHwnd();
++if (::GetComboBoxInfo(hwnd, &combobox_info))
++		wndproc_edit = (WNDPROC)wxGetWindowProc(combobox_info.hwndItem);
+     DissociateHandle();
+     ::DestroyWindow(hwnd);
+ 
+     if ( !MSWCreateControl(wxT("COMBOBOX"), wxEmptyString, pos, size) )
+         return;
+ 
++if (::GetComboBoxInfo(GetHwnd(), &combobox_info))
++    wxSetWindowProc(combobox_info.hwndItem, wndproc_edit);
++
+     // initialize the controls contents
+     for ( i = 0; i < numItems; i++ )
+     {
+diff --git a/src/msw/font.cpp b/src/msw/font.cpp
+index 0bd240d79f..d38b1b00f5 100644
+--- a/src/msw/font.cpp
++++ b/src/msw/font.cpp
+@@ -54,7 +54,7 @@ static const int PITCH_MASK = FIXED_PITCH | VARIABLE_PITCH;
+ class WXDLLEXPORT wxFontRefData: public wxGDIRefData
+ {
+ public:
+-    wxFontRefData(const wxFontInfo& info = wxFontInfo());
++    wxFontRefData(const wxFontInfo& info = wxFontInfo(), const wxWindow* window = nullptr);
+ 
+     wxFontRefData(const wxNativeFontInfo& info, WXHFONT hFont = 0)
+     {
+@@ -324,7 +324,7 @@ protected:
+ // wxFontRefData
+ // ----------------------------------------------------------------------------
+ 
+-wxFontRefData::wxFontRefData(const wxFontInfo& info)
++wxFontRefData::wxFontRefData(const wxFontInfo& info, const wxWindow *window)
+ {
+     m_hFont = NULL;
+ 
+@@ -335,7 +335,7 @@ wxFontRefData::wxFontRefData(const wxFontInfo& info)
+     }
+     else
+     {
+-        m_nativeFontInfo.SetSizeOrDefault(info.GetFractionalPointSize());
++        m_nativeFontInfo.SetSizeOrDefault(info.GetFractionalPointSize(), window);
+     }
+ 
+     SetStyle(info.GetStyle());
+@@ -518,12 +518,12 @@ wxFontEncoding wxNativeFontInfo::GetEncoding() const
+     return wxGetFontEncFromCharSet(lf.lfCharSet);
+ }
+ 
+-void wxNativeFontInfo::SetFractionalPointSize(double pointSizeNew)
++void wxNativeFontInfo::SetFractionalPointSize(double pointSizeNew, const wxWindow *window)
+ {
+     // We don't have the correct DPI to use here, so use that of the
+     // primary screen and rely on WXAdjustToPPI() changing it later if
+     // necessary.
+-    const int ppi = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY);
++    const int ppi = window ? window->GetDPI().GetY() : ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY);
+     lf.lfHeight = GetLogFontHeightAtPPI(pointSizeNew, ppi);
+ 
+     pointSize = pointSizeNew;
+@@ -812,9 +812,9 @@ wxFont::wxFont(const wxString& fontdesc)
+         (void)Create(info);
+ }
+ 
+-wxFont::wxFont(const wxFontInfo& info)
++wxFont::wxFont(const wxFontInfo& info, const wxWindow *window)
+ {
+-    m_refData = new wxFontRefData(info);
++    m_refData = new wxFontRefData(info, window);
+ }
+ 
+ bool wxFont::Create(const wxNativeFontInfo& info, WXHFONT hFont)
+diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
+index 9bb397d472..30af7154a7 100644
+--- a/src/msw/menuitem.cpp
++++ b/src/msw/menuitem.cpp
+@@ -368,6 +368,8 @@ void MenuDrawData::Init(wxWindow const* window)
+         // native menu uses small top margin for separator
+         if ( SeparatorMargin.cyTopHeight >= 2 )
+             SeparatorMargin.cyTopHeight -= 2;
++
++        SeparatorSize.cy = 0;
+     }
+     else
+ #endif // wxUSE_UXTHEME
+diff --git a/src/msw/window.cpp b/src/msw/window.cpp
+index eadc2f5700..f64fea4446 100644
+--- a/src/msw/window.cpp
++++ b/src/msw/window.cpp
+@@ -4773,33 +4773,49 @@ static wxSize GetWindowDPI(HWND hwnd)
+ }
+ 
+ /*extern*/
+-int wxGetSystemMetrics(int nIndex, const wxWindow* window)
++int wxGetSystemMetrics(int nIndex, const wxWindow* win)
+ {
+ #if wxUSE_DYNLIB_CLASS
+-    if ( !window )
+-        window = wxApp::GetMainTopWindow();
++    const wxWindow* window = (!win && wxTheApp) ? wxTheApp->GetTopWindow() : win;
+ 
+-    if ( window )
++    if (window)
+     {
+-        typedef int (WINAPI * GetSystemMetricsForDpi_t)(int nIndex, UINT dpi);
+-        static GetSystemMetricsForDpi_t s_pfnGetSystemMetricsForDpi = NULL;
+-        static bool s_initDone = false;
+-
+-        if ( !s_initDone )
+-        {
+-            wxLoadedDLL dllUser32("user32.dll");
+-            wxDL_INIT_FUNC(s_pfn, GetSystemMetricsForDpi, dllUser32);
+-            s_initDone = true;
++#if 1
++        if (window->GetHWND() && (nIndex == SM_CXSCREEN || nIndex == SM_CYSCREEN)) {
++            HDC hdc = GetDC(window->GetHWND());
++#if 0
++            double dim = GetDeviceCaps(hdc, nIndex == SM_CXSCREEN ? HORZRES : VERTRES);
++            ReleaseDC(window->GetHWND(), hdc);
++            wxSize dpi = window->GetDPI();
++            dim *= 96.0 / (nIndex == SM_CXSCREEN ? dpi.x : dpi.y);
++            return int(dim + 0.5);
++#else
++            return int(GetDeviceCaps(hdc, nIndex == SM_CXSCREEN ? HORZRES : VERTRES));
++#endif
+         }
+-
+-        if ( s_pfnGetSystemMetricsForDpi )
++        else
++#endif
+         {
+-            const int dpi = window->GetDPI().y;
+-            return s_pfnGetSystemMetricsForDpi(nIndex, (UINT)dpi);
++            typedef int (WINAPI * GetSystemMetricsForDpi_t)(int nIndex, UINT dpi);
++            static GetSystemMetricsForDpi_t s_pfnGetSystemMetricsForDpi = NULL;
++            static bool s_initDone = false;
++
++            if ( !s_initDone )
++            {
++                wxLoadedDLL dllUser32("user32.dll");
++                wxDL_INIT_FUNC(s_pfn, GetSystemMetricsForDpi, dllUser32);
++                s_initDone = true;
++            }
++
++            if ( s_pfnGetSystemMetricsForDpi )
++            {
++                const int dpi = window->GetDPI().y;
++                return s_pfnGetSystemMetricsForDpi(nIndex, (UINT)dpi);
++            }
+         }
+     }
+ #else
+-    wxUnusedVar(window);
++    wxUnusedVar(win);
+ #endif // wxUSE_DYNLIB_CLASS
+ 
+     return ::GetSystemMetrics(nIndex);
+diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm
+index 6ff0cc3088..4943f3ea38 100644
+--- a/src/osx/cocoa/dataview.mm
++++ b/src/osx/cocoa/dataview.mm
+@@ -1734,12 +1734,22 @@ outlineView:(NSOutlineView*)outlineView
+         if ( !dvc->GetEventHandler()->ProcessEvent(eventDV) )
+             [super keyDown:event];
+     }
+-    else
++    //FIXME Vojtech's hack to get the accelerators assigned to the wxDataViewControl working.
++    else if (! implementation->DoHandleKeyEvent(event))
+     {
+         [super keyDown:event];  // all other keys
+     }
+ }
+ 
++//FIXME Vojtech: This is a workaround to get at least the "mouse move" events at the wxDataViewControl,
++// so we can show the tooltips. The "mouse move" events are being send only if the wxDataViewControl
++// has focus, which is a limitation of wxWidgets. We may grab focus on "mouse entry" though.
++- (void)mouseMoved:(NSEvent *)event
++{
++if (! implementation->DoHandleMouseEvent(event))
++        [super mouseMoved:event];
++}
++
+ //
+ // contextual menus
+ //
+@@ -2672,12 +2682,22 @@ void wxCocoaDataViewControl::DoSetIndent(int indent)
+ 
+ void wxCocoaDataViewControl::HitTest(const wxPoint& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const
+ {
+-    NSPoint const nativePoint = wxToNSPoint((NSScrollView*) GetWXWidget(),point);
++    NSTableHeaderView *headerView = [m_OutlineView headerView];
++    if (headerView && point.y < headerView.visibleRect.size.height) {
++    // The point is inside the header area.
++            columnPtr = NULL;
++            item      = wxDataViewItem();
++    return;
++        }
++    // Convert from the window coordinates to the virtual scrolled view coordinates.
++    NSScrollView *scrollView = [m_OutlineView enclosingScrollView];
++    const NSRect &visibleRect = scrollView.contentView.visibleRect;
++    NSPoint const nativePoint = wxToNSPoint((NSScrollView*) GetWXWidget(),
++    wxPoint(point.x + visibleRect.origin.x, point.y + visibleRect.origin.y));
+ 
+     int indexColumn;
+     int indexRow;
+ 
+-
+     indexColumn = [m_OutlineView columnAtPoint:nativePoint];
+     indexRow    = [m_OutlineView rowAtPoint:   nativePoint];
+     if ((indexColumn >= 0) && (indexRow >= 0))
+diff --git a/src/osx/cocoa/settings.mm b/src/osx/cocoa/settings.mm
+index de5f52860c..a9581174a4 100644
+--- a/src/osx/cocoa/settings.mm
++++ b/src/osx/cocoa/settings.mm
+@@ -224,7 +224,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
+ // ----------------------------------------------------------------------------
+ 
+ // Get a system metric, e.g. scrollbar size
+-int wxSystemSettingsNative::GetMetric(wxSystemMetric index, const wxWindow* WXUNUSED(win))
++int wxSystemSettingsNative::GetMetric(wxSystemMetric index, const wxWindow* win)
+ {
+     int value;
+ 
+@@ -259,11 +259,11 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, const wxWindow* WXUN
+         // TODO case wxSYS_WINDOWMIN_Y:
+ 
+         case wxSYS_SCREEN_X:
+-            wxDisplaySize(&value, NULL);
++            wxDisplaySize(win, &value, NULL);
+             return value;
+ 
+         case wxSYS_SCREEN_Y:
+-            wxDisplaySize(NULL, &value);
++            wxDisplaySize(win, NULL, &value);
+             return value;
+ 
+         // TODO case wxSYS_FRAMESIZE_X:

deps/wxWidgets/wxWidgets.cmake

@@ -1,3 +1,5 @@
+set(_wx_git_tag v3.2.0)
+
 set(_wx_toolkit "")
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     set(_gtk_ver 2)
@@ -5,6 +7,21 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
         set(_gtk_ver 3)
     endif ()
     set(_wx_toolkit "-DwxBUILD_TOOLKIT=gtk${_gtk_ver}")
+    set(_wx_private_font "-DwxUSE_PRIVATE_FONTS=1")
+else ()
+    set(_wx_private_font "-DwxUSE_PRIVATE_FONTS=0")
+endif()
+
+if (MSVC)
+    set(_wx_edge "-DwxUSE_WEBVIEW_EDGE=ON")
+else ()
+    set(_wx_edge "-DwxUSE_WEBVIEW_EDGE=OFF")
+endif ()
+
+if (MSVC)
+    set(_patch_cmd ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-wxWidget-fix.patch)
+else ()
+    set(_patch_cmd test -f WXWIDGETS_PATCHED || ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-wxWidget-fix.patch && touch WXWIDGETS_PATCHED)
 endif ()
 
 set(_unicode_utf8 OFF)
@@ -13,19 +30,28 @@ if (UNIX AND NOT APPLE) # wxWidgets will not use char as the underlying type for
 endif()
 
 qidislicer_add_cmake_project(wxWidgets
-    URL https://github.com/qidi3d/wxWidgets/archive/0b49beaacce17d90f0c370ecd73221abd089667a.zip
+    URL https://github.com/prusa3d/wxWidgets/archive/78aa2dc0ea7ce99dc19adc1140f74c3e2e3f3a26.zip
-    URL_HASH SHA256=8fa978a76d6bd811b30eecc5124186b9ad54290b820f3a354e85bfa9dae6a5ce
+    URL_HASH SHA256=94b7d972373503e380e5a8b0ca63b1ccb956da4006402298dd89a0c5c7041b1e
+    #PATCH_COMMAND ${_patch_cmd}
     DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG} dep_TIFF dep_JPEG dep_NanoSVG
     CMAKE_ARGS
         -DwxBUILD_PRECOMP=ON
         ${_wx_toolkit}
         "-DCMAKE_DEBUG_POSTFIX:STRING="
         -DwxBUILD_DEBUG_LEVEL=0
-        -DwxUSE_MEDIACTRL=OFF
+        -DwxBUILD_SAMPLES=OFF
+        -DwxBUILD_SHARED=OFF
+        -DwxUSE_MEDIACTRL=ON
         -DwxUSE_DETECT_SM=OFF
         -DwxUSE_UNICODE=ON
+        ${_wx_private_font}
         -DwxUSE_UNICODE_UTF8=${_unicode_utf8}
         -DwxUSE_OPENGL=ON
+        -DwxUSE_WEBVIEW=ON
+        ${_wx_edge}
+        -DwxUSE_WEBVIEW_IE=OFF
+        -DwxUSE_STC=OFF
+        -DwxUSE_AUI=ON
         -DwxUSE_LIBPNG=sys
         -DwxUSE_ZLIB=sys
         -DwxUSE_NANOSVG=sys

resources/icons/add.svg

@@ -2,19 +2,10 @@
 <!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="图层_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="#174CCE" d="M57.6,106.5c-13.7,0-27.4,0-41.1,0c-7.2,0-11-3.6-11-10.8c0-22.6,0-39.5,0-62.1c0-7.7,4.4-12,12.1-12
-	c7.3,0,30.6,0,37.9,0c7.6,0,9.1,9.7,10.8,14.2c1.1,3,3.1,3.6,6,3.6c13.5-0.2,23.8-0.1,37.3-0.1c8.5,0,12.7,4.2,12.7,12.7
-	c0,18.8,0,24.1,0,42.8c0,8.1-3.5,11.6-11.5,11.6C97.4,106.5,71.1,106.5,57.6,106.5z"/>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
 <g>
+	<path fill="#174CCE" d="M5.5,24.6v68.3l15.9-41.4c1-2.4,3.3-4,6-4h76.2v-8.6H51.1c-1.2,0-2.2-1-2.2-2.2V29c0-4.2-3.4-7.5-7.5-7.5
+		H8.7C6.9,21.5,5.5,22.9,5.5,24.6z"/>
+	<path fill="#174CCE" d="M28.9,53.1h91.7c1.3,0,2.2,1.3,1.8,2.5l-15.1,42c-1.9,5.4-7.1,9-12.8,9H9.5c-1.7,0-2.9-1.7-2.3-3.3l19-48.3
+		C26.6,53.8,27.7,53.1,28.9,53.1z"/>
 </g>
 </svg>

resources/icons/arrange.svg

@@ -3,11 +3,6 @@
 <svg version="1.1" id="图层_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>
-	<g>
-		<path fill="#174CCE" d="M101.9,122.5H26.1c-11.3,0-20.6-9.2-20.6-20.6V26.1c0-11.3,9.2-20.6,20.6-20.6h75.8
-			c11.3,0,20.6,9.2,20.6,20.6v75.8C122.5,113.3,113.3,122.5,101.9,122.5z M26.1,14.2c-6.6,0-11.9,5.3-11.9,11.9v75.8
-			c0,6.6,5.3,11.9,11.9,11.9h75.8c6.6,0,11.9-5.3,11.9-11.9V26.1c0-6.6-5.3-11.9-11.9-11.9H26.1z"/>
-	</g>
 	<g>
 		<path fill="#174CCE" d="M31.3,47.5c0-5.4,0-10.8,0-16.2c13.6,0,27.2,0,40.9,0c0,5.4,0,10.8,0,16.2C58.6,47.5,45,47.5,31.3,47.5z"
 			/>
@@ -21,17 +16,10 @@
 		<path fill="#174CCE" d="M80.5,72.1c0-5.4,0-10.8,0-16.2c5.4,0,10.8,0,16.3,0c0,5.4,0,10.8,0,16.2C91.3,72.1,85.9,72.1,80.5,72.1z"
 			/>
 	</g>
-</g>
 	<g>
+		<path fill="#174CCE" d="M108.3,13.5c3.4,0,6.2,2.8,6.2,6.2v88.6c0,3.4-2.8,6.2-6.2,6.2H19.7c-3.4,0-6.2-2.8-6.2-6.2V19.7
+			c0-3.4,2.8-6.2,6.2-6.2H108.3 M108.3,5.5H19.7c-7.8,0-14.2,6.3-14.2,14.2v88.6c0,7.8,6.3,14.2,14.2,14.2h88.6
+			c7.8,0,14.2-6.3,14.2-14.2V19.7C122.5,11.9,116.2,5.5,108.3,5.5L108.3,5.5z"/>
 	</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
 </g>
 </svg>

resources/icons/copy.svg

@@ -3,26 +3,19 @@
 <svg version="1.1" id="图层_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>
-	<path fill="#174CCE" d="M44,122.4c-6.7,0-9.5-2.8-9.5-9.4c0-23.1,0-46.2,0-69.3c0-6.3,2.7-9.1,9-9.1c23.3,0,46.6,0,69.8,0
+	<path fill="#174CCE" d="M84.5,23.7l20,20c0.7,0.7,0.7,1.8,0,2.4c-0.3,0.3-0.8,0.5-1.2,0.5h-20c-1,0-1.7-0.8-1.7-1.7v-20
-		c6.5,0,9.1,2.7,9.1,9.2c0,23.1,0,46.2,0,69.3c0,6.5-2.8,9.3-9.4,9.3c-11.6,0-23.2,0-34.8,0C66.9,122.5,55.4,122.5,44,122.4z
+		c0-0.9,0.8-1.7,1.7-1.7C83.8,23.1,84.2,23.3,84.5,23.7"/>
-		 M99.2,81.6c0.7,0,1.4,0,2.1,0c1.9-0.2,3.2-1.2,3.2-3.1c0-2.1-1.4-3.1-3.4-3.1c-5.2,0-10.4,0-15.6,0c-1.1,0-2.2,0-3.8,0
+	<path fill="#174CCE" d="M87.6,13.6c2.1,0,4.2,0.9,5.7,2.4l19,19.7c1.4,1.5,2.2,3.4,2.2,5.5l0,46.7c0,5-4.1,9.1-9.1,9.1H51.8
-		c0-1.5,0-2.8,0-4.2c0-4.8,0-9.5,0-14.3c0-3-1.1-4.4-3.2-4.4c-2.2,0-3.1,1.3-3.1,4.5c0,6,0,11.9,0,18.2c-4.4,0-8.6,0-12.9,0
+		c-5,0-9.1-4.1-9.1-9.1V22.6c0-5,4.1-9.1,9.1-9.1H87.6 M87.6,5.6H51.8c-9.4,0-17.1,7.6-17.1,17.1V88c0,9.4,7.6,17.1,17.1,17.1h53.7
-		c-2,0-4,0-6,0c-2.5,0.1-4,1.4-3.9,3.2c0.2,2.3,1.6,3.2,3.9,3.2c5.4-0.1,10.7,0,16.1,0c0.8,0,1.5,0,2.7,0c0,1.6,0,3,0,4.4
+		c9.4,0,17.1-7.6,17.1-17.1l0-46.7c0-4.1-1.6-8.1-4.4-11l-19-19.7C96,7.4,91.9,5.6,87.6,5.6L87.6,5.6z"/>
-		c0,4.8,0,9.7,0,14.5c0,2.1,0.8,3.6,3,3.8c1.8,0.2,3.2-1.4,3.3-3.9c0-6.2,0-12.4,0-18.9C87.7,81.7,93.5,81.7,99.2,81.6z"/>
+	<path fill="#174CCE" d="M85.3,105v0.4c0,5-4.1,9.1-9.1,9.1H22.6c-5,0-9.1-4.1-9.1-9.1V40.1c0-5,4.1-9.1,9.1-9.1h12.1h0v-8h0H22.6
-	<path fill="#174CCE" d="M93.4,28.2c0-5.5,0.2-10.8-0.1-16c-0.2-3.5-3-5.9-6.5-6.4c-1-0.1-2.1-0.1-3.1-0.1c-22.8,0-45.5,0-68.3,0
+		c-9.4,0-17.1,7.6-17.1,17.1v65.3c0,9.4,7.6,17.1,17.1,17.1h53.7c9.4,0,17.1-7.6,17.1-17.1V105H85.3z"/>
-		c-7.3,0-9.9,2.6-9.9,10c0,22.7,0,45.3,0,68c0,7.2,2.6,9.9,9.8,9.9c4.1,0,8.3,0,12.7,0c0-1.1,0-2,0-3c0-15.5,0-31,0-46.5
+	<g>
-		c0-10.2,5.7-15.9,15.9-15.9c15.5,0,31,0,46.5,0C91.4,28.2,92.3,28.2,93.4,28.2z"/>
+		<path fill="#174CCE" d="M99.9,68.1H57.3c-2.2,0-4-1.8-4-4c0-2.2,1.8-4,4-4h42.6c2.2,0,4,1.8,4,4C103.9,66.3,102.2,68.1,99.9,68.1z
+			"/>
 	</g>
 	<g>
+		<path fill="#174CCE" d="M99.9,85.6H57.3c-2.2,0-4-1.8-4-4s1.8-4,4-4h42.6c2.2,0,4,1.8,4,4S102.2,85.6,99.9,85.6z"/>
 	</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
 </g>
 </svg>

resources/icons/cut.svg

@@ -3,37 +3,11 @@
 <svg version="1.1" id="图层_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>
-	<g id="cut_2_">
+	<path fill="#174CCE" d="M95,10.6c0.8-1.8-0.1-4-1.9-4.8c-1.7-0.7-3.7-0.1-4.6,1.5L46.9,79.4c-4.1-3.2-9.2-5-14.7-5
-		<g>
+		c-13.2,0-24,10.7-24,24c0,13.2,10.7,24,24,24c7.4,0,14.2-3.5,18.5-8.8l0,0l0,0c2.7-3.4,4.7-7.5,5.2-12.1L95,10.6z M32.2,108
-			<path fill="#174CCE" d="M119,65.5h-10c-0.8,0-1.5-0.7-1.5-1.5s0.7-1.5,1.5-1.5h10c0.8,0,1.5,0.7,1.5,1.5S119.8,65.5,119,65.5z
+		c-5.3,0-9.6-4.3-9.6-9.6s4.3-9.6,9.6-9.6s9.6,4.3,9.6,9.6S37.5,108,32.2,108z"/>
-				 M99,65.5H89c-0.8,0-1.5-0.7-1.5-1.5s0.7-1.5,1.5-1.5h10c0.8,0,1.5,0.7,1.5,1.5S99.8,65.5,99,65.5z M79,65.5H69
+	<path fill="#174CCE" d="M72.1,101.4c0.6,4.6,2.4,8.8,5.2,12.1l0,0l0,0c4.4,5.4,11.1,8.8,18.5,8.8c13.2,0,24-10.7,24-24
-				c-0.8,0-1.5-0.7-1.5-1.5s0.7-1.5,1.5-1.5h10c0.8,0,1.5,0.7,1.5,1.5S79.8,65.5,79,65.5z M59,65.5H49c-0.8,0-1.5-0.7-1.5-1.5
+		c0-13.2-10.7-24-24-24c-5.5,0-10.6,1.9-14.7,5L39.6,7.3c-0.9-1.6-2.9-2.2-4.6-1.5c-1.8,0.8-2.6,3-1.9,4.8L72.1,101.4z M86.2,98.4
-				s0.7-1.5,1.5-1.5h10c0.8,0,1.5,0.7,1.5,1.5S59.8,65.5,59,65.5z M39,65.5H29c-0.8,0-1.5-0.7-1.5-1.5s0.7-1.5,1.5-1.5h10
+		c0-5.3,4.3-9.6,9.6-9.6c5.3,0,9.6,4.3,9.6,9.6s-4.3,9.6-9.6,9.6C90.5,108,86.2,103.7,86.2,98.4z"/>
-				c0.8,0,1.5,0.7,1.5,1.5S39.8,65.5,39,65.5z M19,65.5H9c-0.8,0-1.5-0.7-1.5-1.5s0.7-1.5,1.5-1.5h10c0.8,0,1.5,0.7,1.5,1.5
-				S19.8,65.5,19,65.5z"/>
-		</g>
-		<g>
-			<g>
-				<path fill="#174CCE" d="M110,51.5H20c-1.9,0-3.5-1.6-3.5-3.5V10c0-1.9,1.6-3.5,3.5-3.5h90c1.9,0,3.5,1.6,3.5,3.5v38
-					C113.5,49.9,111.9,51.5,110,51.5z"/>
-			</g>
-			<g>
-				<path fill="#174CCE" d="M110,121.5H20c-1.9,0-3.5-1.6-3.5-3.5V80c0-1.9,1.6-3.5,3.5-3.5h90c1.9,0,3.5,1.6,3.5,3.5v38
-					C113.5,119.9,111.9,121.5,110,121.5z"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
 </g>
 </svg>

resources/icons/delete_all.svg

@@ -2,18 +2,10 @@
 <!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="图层_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="#174CCE" d="M64,13.5c-27.9,0-50.5,22.6-50.5,50.5s22.6,50.5,50.5,50.5s50.5-22.6,50.5-50.5S91.9,13.5,64,13.5z
+<path fill="#174CCE" d="M64,5.5C31.7,5.5,5.5,31.7,5.5,64s26.2,58.5,58.5,58.5s58.5-26.2,58.5-58.5S96.3,5.5,64,5.5z M86.9,78.2
-	 M85.5,81.3l-4.2,4.2L64,68.2L46.7,85.5l-4.2-4.2L59.8,64L42.5,46.7l4.2-4.2L64,59.8l17.3-17.3l4.2,4.2L68.2,64L85.5,81.3z"/>
+	c1.8,1.6,2.5,3.6,1.9,5.9c-0.6,2.4-1.9,4-4.3,4.6c-2.4,0.7-4.5,0.1-6.2-1.6C74,83,69.8,78.7,65.6,74.5c-0.6-0.4-1-1.2-1.6-1.9
-<g>
+	c-3.9,4-7.6,7.6-11.1,11.3c-1,1-2.2,2.2-3.3,3.3c-2.7,2.7-6.4,2.7-8.9,0c-2.5-2.7-2.2-6.4,0.4-9.1c4.6-4.6,9.2-9.3,13.9-14.1
-</g>
+	c-4.6-4.6-9.3-9.2-13.9-13.9c-2.8-2.8-3-6.7-0.4-9.2c2.5-2.7,6.4-2.5,9.2,0.3c4.6,4.6,9.2,9.3,13.9,14.1c0.6-0.4,0.9-0.7,1.3-1.2
-<g>
+	c4.3-4.2,8.6-8.5,12.9-12.8c2.8-2.8,6.5-3,9.1-0.4c2.7,2.7,2.5,6.4-0.3,9.2c-4.3,4.3-8.5,8.6-12.8,12.8c-0.4,0.3-1,0.6-1.6,1
-</g>
+	C77.5,68.9,82.1,73.6,86.9,78.2z"/>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
 </svg>

resources/icons/editor.svg

@@ -3,19 +3,13 @@
 <svg version="1.1" id="图层_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>
-	<polygon fill="#174CCE" points="64,29.6 11.9,119.9 116.1,119.9 	"/>
+	
-	<polygon fill="#174CCE" points="64,98.4 116.1,8.1 11.9,8.1 	"/>
+		<polygon fill="none" stroke="#174CCE" stroke-width="8" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
-</g>
+		10.5,95.6 63.9,118.4 117.5,95.6 117.5,32.7 63.4,9.6 10.5,32.7 	"/>
-<g>
+	
-</g>
+		<polyline fill="none" stroke="#174CCE" stroke-width="8" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
-<g>
+		10.5,32.7 64,55.9 63.9,118.4 	"/>
-</g>
+	
-<g>
+		<line fill="none" stroke="#174CCE" stroke-width="8" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="64" y1="55.9" x2="117.5" y2="32.7"/>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
 </g>
 </svg>

resources/icons/fdm_supports.svg

@@ -3,20 +3,8 @@
 <svg version="1.1" id="图层_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>
-	<path fill="#174CCE" d="M27.7,53.6c-3.7-3.7-3.7-9.6,0-13.3l0,0l31-31c3.7-3.7,9.6-3.7,13.3,0l0,0l31,31c3.7,3.7,3.7,9.6,0,13.3
+	<path fill="#174CCE" d="M27.7,52.6c-3.7-3.7-3.7-9.6,0-13.3l0,0l31-31c3.7-3.7,9.6-3.7,13.3,0l0,0l31,31c3.7,3.7,3.7,9.6,0,13.3
-		l0,0l-31,31c-3.7,3.7-9.6,3.7-13.3,0l0,0L27.7,53.6z M115.9,108.5V64.6l-13,10.1v33.8H90V87.1L77,97.2v11.3H57.5v-11l-13-10.1v21.1
+		l0,0l-31,31c-3.7,3.7-9.6,3.7-13.3,0l0,0L27.7,52.6z M115.9,109.5V65.6l-13,10.1v33.8H90V88.1L77,98.2v11.3H57.5v-11l-13-10.1v21.1
-		h-13V75.1L18.6,65v43.5h-13v13h116.8v-13H115.9z"/>
+		h-13V76.1L18.6,66v43.5h-13v13h116.8v-13H115.9z"/>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
 </g>
 </svg>

resources/icons/instance_add.svg

@@ -4,49 +4,18 @@
 	 viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
 <g>
 	<g>
-		<polygon fill="#174CCE" points="90.1,47.5 61.2,65.7 32.4,47.5 61.2,31.7 		"/>
+		<path fill="#174CCE" d="M62.9,122.4C62.9,122.4,62.9,122.4,62.9,122.4c-2.2,0-4-1.8-4-4L59,58.5L7.9,36.3c-2-0.9-3-3.2-2.1-5.3
-		<polygon fill="#174CCE" points="57.6,97.9 31.6,82.1 31.6,54.9 57.6,70.7 		"/>
+			c0.9-2,3.2-3,5.3-2.1l53.5,23.2c1.5,0.6,2.4,2.1,2.4,3.7l-0.1,62.6C66.9,120.7,65.1,122.4,62.9,122.4z"/>
-		<polygon fill="#174CCE" points="65,97.9 91,82.1 91,54.9 65,70.7 		"/>
 	</g>
 	<g>
-		<polygon fill="#174CCE" points="32.5,13.3 19.4,21.6 6.4,13.3 19.4,6.2 		"/>
+		<path fill="#174CCE" d="M63,59.9c-1.5,0-3-0.9-3.7-2.4c-0.9-2,0-4.4,2.1-5.3L115,29c2-0.9,4.4,0,5.3,2.1c0.9,2,0,4.4-2.1,5.3
-		<polygon fill="#174CCE" points="17.8,36.1 6,29 6,16.7 17.8,23.8 		"/>
+			L64.6,59.5C64.1,59.8,63.6,59.9,63,59.9z"/>
-		<polygon fill="#174CCE" points="21.1,36.1 32.9,29 32.9,16.7 21.1,23.8 		"/>
 	</g>
-	<g>
+	<path fill="#174CCE" d="M104.7,86.9c-9.8,0-17.8,8-17.8,17.8s8,17.8,17.8,17.8s17.8-8,17.8-17.8S114.6,86.9,104.7,86.9z
-		<polygon fill="#174CCE" points="32.5,97 19.4,105.2 6.4,97 19.4,89.9 		"/>
+		 M113.1,106.5h-6.5v6.5c0,1-0.8,1.9-1.9,1.9c-1,0-1.9-0.8-1.9-1.9v-6.5h-6.5c-1,0-1.9-0.8-1.9-1.9c0-1,0.8-1.9,1.9-1.9h6.5v-6.5
-		<polygon fill="#174CCE" points="17.8,119.8 6,112.7 6,100.4 17.8,107.5 		"/>
+		c0-1,0.8-1.9,1.9-1.9c1,0,1.9,0.8,1.9,1.9v6.6h6.5c1,0,1.9,0.8,1.9,1.9C114.9,105.7,114.1,106.5,113.1,106.5z"/>
-		<polygon fill="#174CCE" points="21.1,119.8 32.9,112.7 32.9,100.4 21.1,107.5 		"/>
+	<path fill="#174CCE" d="M81.8,106l-18.9,8.1L13.5,93V35.2l48.9-21.3l50.1,21.4v47.9c3,1.1,5.7,2.8,8,5V32.6c0-1.6-1-3.1-2.4-3.7
-	</g>
+		L64,5.9c-1-0.4-2.2-0.4-3.2,0L7.9,29c-1.5,0.6-2.4,2.1-2.4,3.7v63c0,1.6,1,3,2.4,3.7l53.4,22.8c0.5,0.2,1,0.3,1.6,0.3
-	<g>
+		c0.5,0,1.1-0.1,1.6-0.3l19.3-8.2C82.7,111.5,82,108.8,81.8,106z"/>
-		<polygon fill="#174CCE" points="122.1,13.3 109.1,21.6 96,13.3 109.1,6.2 		"/>
-		<polygon fill="#174CCE" points="107.4,36.1 95.7,29 95.7,16.7 107.4,23.8 		"/>
-		<polygon fill="#174CCE" points="110.8,36.1 122.5,29 122.5,16.7 110.8,23.8 		"/>
-	</g>
-	<g>
-		<polygon fill="#174CCE" points="122.1,97 109.1,105.2 96,97 109.1,89.9 		"/>
-		<polygon fill="#174CCE" points="107.4,119.8 95.7,112.7 95.7,100.4 107.4,107.5 		"/>
-		<polygon fill="#174CCE" points="110.8,119.8 122.5,112.7 122.5,100.4 110.8,107.5 		"/>
-	</g>
-	<path fill="#174CCE" d="M117.1,64c0,6.3-1.1,12.3-3.1,17.9h4.2C120,76.3,121,70.3,121,64s-1-12.3-2.9-17.9H114
-		C116,51.7,117.1,57.7,117.1,64z"/>
-	<path fill="#174CCE" d="M85.2,14.9v-4.4C78.4,7.8,71,6.2,63.3,6.2s-15.2,1.5-21.9,4.3v4.4c6.7-3,14.1-4.7,21.9-4.7
-		S78.5,11.9,85.2,14.9z"/>
-	<path fill="#174CCE" d="M85.2,113.1c-6.7,3-14.1,4.7-21.9,4.7s-15.2-1.7-21.9-4.7v4.4c6.8,2.8,14.2,4.3,21.9,4.3s15.2-1.5,21.9-4.3
-		V113.1z"/>
-	<path fill="#174CCE" d="M12.6,81.9c-2-5.6-3.1-11.6-3.1-17.9s1.1-12.3,3.1-17.9H8.4C6.5,51.7,5.5,57.7,5.5,64
-		c0,6.3,1,12.3,2.9,17.9H12.6z"/>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
 </g>
 </svg>

resources/icons/instance_remove.svg

@@ -3,94 +3,77 @@
 <svg version="1.1" id="图层_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>
+	<path fill="#174CCE" d="M104.7,87C94.9,87,87,94.9,87,104.7s7.9,17.7,17.7,17.7s17.7-7.9,17.7-17.7S114.4,87,104.7,87z
+		 M102.8,106.6h-6.4c-1,0-1.9-0.8-1.9-1.9c0-1,0.8-1.9,1.9-1.9h6.4h3.7h6.4c1,0,1.9,0.8,1.9,1.9c0,1-0.8,1.9-1.9,1.9h-6.4H102.8z"/>
 	<g>
-		<polygon fill="#174CCE" points="89.7,47.6 60.9,65.8 32.1,47.6 60.9,31.9 		"/>
+		<path fill="#174CCE" d="M23.2,105.8L8,99.3c-1.5-0.6-2.4-2.1-2.4-3.7V79.1h8V93l12.7,5.4L23.2,105.8z"/>
-		<polygon fill="#174CCE" points="57.3,97.9 31.3,82.2 31.3,55 57.3,70.8 		"/>
-		<polygon fill="#174CCE" points="64.7,97.9 90.6,82.2 90.6,55.1 64.7,70.8 		"/>
-	</g>
-	<path fill="#174CCE" d="M116.7,64.1c0,6.3-1.1,12.3-3.1,17.9h4.2c1.8-5.6,2.8-11.7,2.8-17.9s-1-12.3-2.8-17.9h-4.2
-		C115.6,51.8,116.7,57.8,116.7,64.1z"/>
-	<path fill="#174CCE" d="M84.8,15.1v-4.3C78.1,8,70.7,6.4,63,6.4S47.8,8,41.1,10.7v4.3c6.7-3,14.1-4.7,21.9-4.7S78.2,12.1,84.8,15.1
-		z"/>
-	<path fill="#174CCE" d="M84.8,113.1c-6.7,3-14.1,4.7-21.9,4.7s-15.2-1.7-21.9-4.7v4.3c6.8,2.8,14.1,4.3,21.9,4.3s15.1-1.5,21.9-4.3
-		V113.1z"/>
-	<path fill="#174CCE" d="M12.3,82c-2-5.6-3.1-11.6-3.1-17.9s1.1-12.3,3.1-17.9H8.1c-1.8,5.6-2.8,11.7-2.8,17.9s1,12.3,2.8,17.9H12.3
-		z"/>
-	<g>
-		<g>
-			<path fill="#174CCE" d="M18.5,22.5l-3.4-2.1l1-1.7l3.4,2.1L18.5,22.5z M23,20.7l-1-1.7l3.5-1.9l1,1.7L23,20.7z M11.7,18.4
-				l-3.4-2.1l1-1.7l3.4,2.1L11.7,18.4z M30,16.9l-1-1.7l3.5-1.9l1,1.7L30,16.9z"/>
 	</g>
 	<g>
-			<path fill="#174CCE" d="M19.9,38.1l-1-1.7l3.4-2.1l1,1.7L19.9,38.1z M15.5,36.2l-3.4-2.1l1-1.7l3.4,2.1L15.5,36.2z M26.7,33.9
+		
-				l-1-1.7l3.4-2.1l1,1.7L26.7,33.9z M8.7,32.1L5.3,30l1-1.7l3.4,2.1L8.7,32.1z M33.6,28.8l-2-0.1l0.1-4l2,0.1L33.6,28.8z M6.8,27.7
+			<rect x="32.3" y="98.6" transform="matrix(0.3932 -0.9195 0.9195 0.3932 -76.4206 98.2933)" fill="#174CCE" width="8" height="16.9"/>
-				h-2v-4h2V27.7z M33.8,20.8l-2-0.1l0.1-4l2,0.1L33.8,20.8z M6.8,19.7h-2v-4h2V19.7z M31.4,14.3l-3.5-1.9l1-1.7l3.5,1.9L31.4,14.3z
-				 M7.9,13.7L7,11.9l3.5-1.9l0.9,1.7L7.9,13.7z M24.4,10.5L21,8.5l1-1.7l3.5,1.9L24.4,10.5z M14.9,9.9l-1-1.7l3.5-1.9l1,1.7
-				L14.9,9.9z"/>
 	</g>
 	<g>
-			<path fill="#174CCE" d="M20.2,33.7h-2l0-4h2L20.2,33.7z M20.2,25.7h-2l0-4h2L20.2,25.7z"/>
+		<path fill="#174CCE" d="M62.9,122.5c-0.5,0-1.1-0.1-1.6-0.3l-15.2-6.5l3.1-7.4l13.6,5.8l13.6-5.8l3.1,7.4l-15.2,6.5
+			C64,122.3,63.5,122.5,62.9,122.5z"/>
+	</g>
+	<g>
+		<rect x="112.6" y="54" fill="#174CCE" width="8" height="20.2"/>
+	</g>
+	<g>
+		<path fill="#174CCE" d="M120.6,49.1h-8V35.3l-12.7-5.4l3.1-7.4l15.2,6.5c1.5,0.6,2.4,2.1,2.4,3.7V49.1z"/>
+	</g>
+	<g>
+		
+			<rect x="85.6" y="12.4" transform="matrix(0.3924 -0.9198 0.9198 0.3924 35.0073 95.1898)" fill="#174CCE" width="8" height="17.4"/>
+	</g>
+	<g>
+		<path fill="#174CCE" d="M49,19.8l-3.2-7.3l15.1-6.6c1-0.4,2.2-0.4,3.2,0l15.2,6.5l-3.1,7.4l-13.6-5.8L49,19.8z"/>
+	</g>
+	<g>
+		
+			<rect x="27.7" y="17.1" transform="matrix(0.9167 -0.3997 0.3997 0.9167 -5.4294 16.1588)" fill="#174CCE" width="16.7" height="8"/>
+	</g>
+	<g>
+		<path fill="#174CCE" d="M13.6,49.1h-8V32.6c0-1.6,0.9-3,2.4-3.7l15.1-6.6l3.2,7.3l-12.7,5.5V49.1z"/>
+	</g>
+	<g>
+		<rect x="5.6" y="54" fill="#174CCE" width="8" height="20.2"/>
+	</g>
+	<g>
+		<g>
+			
+				<rect x="13.1" y="27.7" transform="matrix(0.3983 -0.9173 0.9173 0.3983 -22.6432 37.3356)" fill="#174CCE" width="8" height="16.5"/>
+		</g>
+		<g>
+			
+				<rect x="32.3" y="35.7" transform="matrix(0.3983 -0.9173 0.9173 0.3983 -18.7394 59.953)" fill="#174CCE" width="8" height="17.1"/>
+		</g>
+		<g>
+			<path fill="#174CCE" d="M67.1,72.4l-8,0l0-13.9L46.4,53l3.2-7.3l15.1,6.6c1.5,0.6,2.4,2.1,2.4,3.7L67.1,72.4z"/>
+		</g>
+		<g>
+			
+				<rect x="53.1" y="83.2" transform="matrix(2.197260e-03 -1 1 2.197260e-03 -24.2879 149.9948)" fill="#174CCE" width="19.9" height="8"/>
+		</g>
+		<g>
+			
+				<rect x="54.7" y="106.2" transform="matrix(2.197260e-03 -1 1 2.197260e-03 -47.3778 172.9298)" fill="#174CCE" width="16.5" height="8"/>
 		</g>
 	</g>
 	<g>
 		<g>
-			<path fill="#174CCE" d="M18.5,105.9l-3.4-2.1l1-1.7l3.4,2.1L18.5,105.9z M23,104.1l-1-1.7l3.5-1.9l1,1.7L23,104.1z M11.7,101.8
+			
-				l-3.4-2.1l1-1.7l3.4,2.1L11.7,101.8z M30,100.3l-1-1.7l3.5-1.9l1,1.7L30,100.3z"/>
+				<rect x="62.4" y="48.6" transform="matrix(0.9173 -0.3982 0.3982 0.9173 -15.1 32.4863)" fill="#174CCE" width="16.5" height="8"/>
 		</g>
 		<g>
-			<path fill="#174CCE" d="M19.9,121.5l-1-1.7l3.4-2.1l1,1.7L19.9,121.5z M15.5,119.6l-3.4-2.1l1-1.7l3.4,2.1L15.5,119.6z
+			
-				 M26.7,117.3l-1-1.7l3.4-2.1l1,1.7L26.7,117.3z M8.7,115.5l-3.4-2.1l1-1.7l3.4,2.1L8.7,115.5z M33.6,112.2l-2-0.1l0.1-4l2,0.1
+				<rect x="81.3" y="40.3" transform="matrix(0.9173 -0.3982 0.3982 0.9173 -10.1939 39.4399)" fill="#174CCE" width="17.1" height="8"/>
-				L33.6,112.2z M6.8,111.1h-2v-4h2V111.1z M33.8,104.2l-2-0.1l0.1-4l2,0.1L33.8,104.2z M6.8,103.1h-2v-4h2V103.1z M31.4,97.7
-				l-3.5-1.9l1-1.7l3.5,1.9L31.4,97.7z M7.9,97l-1-1.7l3.5-1.9l1,1.7L7.9,97z M24.4,93.9L21,91.9l1-1.7l3.5,1.9L24.4,93.9z
-				 M14.9,93.3L14,91.5l3.5-1.9l0.9,1.7L14.9,93.3z"/>
 		</g>
 		<g>
-			<path fill="#174CCE" d="M20.2,117.1h-2l0-4h2L20.2,117.1z M20.2,109.1h-2l0-4h2L20.2,109.1z"/>
+			
+				<rect x="100.8" y="31.9" transform="matrix(0.9173 -0.3982 0.3982 0.9173 -5.2877 46.3936)" fill="#174CCE" width="16.5" height="8"/>
 		</g>
 	</g>
-	<g>
+	<path fill="#174CCE" d="M120.6,88.2v-9h-8v4C115.6,84.3,118.3,86,120.6,88.2z"/>
-		<g>
-			<path fill="#174CCE" d="M107.9,22.5l-3.4-2.1l1-1.7l3.4,2.1L107.9,22.5z M112.3,20.7l-1-1.7l3.5-1.9l1,1.7L112.3,20.7z M101,18.4
-				l-3.4-2.1l1-1.7l3.4,2.1L101,18.4z M119.3,16.9l-1-1.7l3.5-1.9l1,1.7L119.3,16.9z"/>
-		</g>
-		<g>
-			<path fill="#174CCE" d="M109.2,38.1l-1-1.7l3.4-2.1l1,1.7L109.2,38.1z M104.8,36.2l-3.4-2.1l1-1.7l3.4,2.1L104.8,36.2z M116,33.9
-				l-1-1.7l3.4-2.1l1,1.7L116,33.9z M98,32.1L94.6,30l1-1.7l3.4,2.1L98,32.1z M122.9,28.8l-2-0.1l0.1-4l2,0.1L122.9,28.8z
-				 M96.1,27.7h-2v-4h2V27.7z M123.1,20.8l-2-0.1l0.1-4l2,0.1L123.1,20.8z M96.1,19.7h-2v-4h2V19.7z M120.7,14.3l-3.5-1.9l1-1.7
-				l3.5,1.9L120.7,14.3z M97.2,13.7l-0.9-1.7l3.5-1.9l0.9,1.7L97.2,13.7z M113.7,10.5l-3.5-1.9l1-1.7l3.5,1.9L113.7,10.5z
-				 M104.2,9.9l-1-1.7l3.5-1.9l1,1.7L104.2,9.9z"/>
-		</g>
-		<g>
-			<path fill="#174CCE" d="M109.5,33.7h-2l0-4h2L109.5,33.7z M109.5,25.7h-2l0-4h2L109.5,25.7z"/>
-		</g>
-	</g>
-	<g>
-		<g>
-			<path fill="#174CCE" d="M107.9,105.9l-3.4-2.1l1-1.7l3.4,2.1L107.9,105.9z M112.3,104.1l-1-1.7l3.5-1.9l1,1.7L112.3,104.1z
-				 M101,101.8l-3.4-2.1l1-1.7l3.4,2.1L101,101.8z M119.3,100.3l-1-1.7l3.5-1.9l1,1.7L119.3,100.3z"/>
-		</g>
-		<g>
-			<path fill="#174CCE" d="M109.2,121.5l-1-1.7l3.4-2.1l1,1.7L109.2,121.5z M104.8,119.6l-3.4-2.1l1-1.7l3.4,2.1L104.8,119.6z
-				 M116,117.3l-1-1.7l3.4-2.1l1,1.7L116,117.3z M98,115.5l-3.4-2.1l1-1.7l3.4,2.1L98,115.5z M122.9,112.2l-2-0.1l0.1-4l2,0.1
-				L122.9,112.2z M96.1,111.1h-2v-4h2V111.1z M123.1,104.2l-2-0.1l0.1-4l2,0.1L123.1,104.2z M96.1,103.1h-2v-4h2V103.1z M120.7,97.7
-				l-3.5-1.9l1-1.7l3.5,1.9L120.7,97.7z M97.2,97l-1-1.7l3.5-1.9l1,1.7L97.2,97z M113.7,93.9l-3.5-1.9l1-1.7l3.5,1.9L113.7,93.9z
-				 M104.2,93.3l-0.9-1.7l3.5-1.9l0.9,1.7L104.2,93.3z"/>
-		</g>
-		<g>
-			<path fill="#174CCE" d="M109.5,117.1h-2l0-4h2L109.5,117.1z M109.5,109.1h-2l0-4h2L109.5,109.1z"/>
-		</g>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
 </g>
 </svg>

resources/icons/layers_white.svg

@@ -3,18 +3,11 @@
 <svg version="1.1" id="图层_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>
+	<rect x="1" y="13" fill="#174CCE" width="14" height="2"/>
-		<polygon fill="#174CCE" points="8,5.8 2.4,3.4 7.9,1 13.6,3.4 		"/>
+	<rect x="1" y="10.6" fill="#174CCE" width="14" height="1.7"/>
-	</g>
+	<rect x="1" y="8.2" fill="#174CCE" width="14" height="1.5"/>
-	<g>
+	<rect x="1" y="5.8" fill="#174CCE" width="14" height="1.2"/>
-		<polygon fill="#174CCE" points="8,6.4 3.5,4.5 2.4,4.9 8,7.3 13.6,4.9 12.5,4.5 		"/>
+	<rect x="1" y="3.4" fill="#174CCE" width="14" height="0.9"/>
-	</g>
+	<rect x="1" y="1" fill="#174CCE" width="14" height="0.7"/>
-	<g>
-		<polygon fill="#174CCE" points="8,14.1 3.5,12.1 2.4,12.6 8,15 13.6,12.6 12.5,12.2 		"/>
-	</g>
-	<g>
-		<polygon fill="#174CCE" points="8.4,9.1 8.4,10.7 9.2,10.7 8,11.9 6.8,10.7 7.6,10.7 7.6,9 2.4,11.3 8,13.7 13.6,11.3 		"/>
-	</g>
-	<polygon fill="#174CCE" points="9.2,8.7 8,7.5 6.8,8.7 7.6,8.7 7.6,9 7.9,8.9 8.4,9.1 8.4,8.7 	"/>
 </g>
 </svg>

resources/icons/measure.svg

@@ -1,32 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1"
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 id="Layer_1" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 128 128"
+<g>
-	 enable-background="new 0 0 128 128" xml:space="preserve">
+	<g>
-<sodipodi:namedview  bordercolor="#eeeeee" borderopacity="1" id="namedview974" inkscape:current-layer="Layer_1" inkscape:cx="63.921182" inkscape:cy="64.078818" inkscape:pagecheckerboard="0" inkscape:pageopacity="0" inkscape:pageshadow="0" inkscape:window-height="1001" inkscape:window-maximized="1" inkscape:window-width="1920" inkscape:window-x="3191" inkscape:window-y="-9" inkscape:zoom="6.34375" pagecolor="#505050" showgrid="false">
+		<g>
-	</sodipodi:namedview>
+			<path fill="#174CCE" d="M64,75.6c-0.3,0-0.6-0.1-0.9-0.2L32,62.1c-0.9-0.4-1.4-1.2-1.4-2.1V23.3c0-0.9,0.5-1.8,1.4-2.1L62.8,7.7
-<g id="g1872">
+				c0.6-0.3,1.3-0.3,1.8,0l31.5,13.4c0.9,0.4,1.4,1.2,1.4,2.1V60c0,0.9-0.6,1.8-1.4,2.1L64.9,75.4C64.6,75.5,64.3,75.6,64,75.6z
-	<path id="path958-8" sodipodi:nodetypes="sccsccs" fill="#4479FB" d="M27,54.5l0.1-10c0-0.8,0.7-1.5,1.5-1.5c0.8,0,1.5,0.7,1.5,1.5
+				 M35.2,58.4L64,70.7l28.9-12.3V24.8L63.7,12.4L35.2,24.8V58.4z"/>
-		l-0.1,10c0,0.8-0.7,1.5-1.5,1.5C27.6,56,27,55.3,27,54.5z"/>
-	<path id="path958-8-1" sodipodi:nodetypes="sccsccs" fill="#4479FB" d="M37,54.5l0.1-10c0-0.8,0.7-1.5,1.5-1.5
-		c0.8,0,1.5,0.7,1.5,1.5l-0.1,10c0,0.8-0.7,1.5-1.5,1.5C37.6,56,37,55.3,37,54.5z"/>
-	<path id="path958-8-9" sodipodi:nodetypes="sccsccs" fill="#4479FB" d="M47,60.2l0.1-15c0-1.2,0.7-2.2,1.5-2.2c0.8,0,1.5,1,1.5,2.3
-		l-0.1,15c0,1.2-0.7,2.2-1.5,2.2C47.6,62.5,47,61.4,47,60.2z"/>
-	<path id="path958-8-9-3" sodipodi:nodetypes="sccsccs" fill="#4479FB" d="M57,54.5l0.1-10c0-0.8,0.7-1.5,1.5-1.5
-		c0.8,0,1.5,0.7,1.5,1.5l-0.1,10c0,0.8-0.7,1.5-1.5,1.5C57.6,56,57,55.3,57,54.5z"/>
-	<path id="path958-8-9-3-0" sodipodi:nodetypes="sccsccs" fill="#4479FB" d="M67,54.5l0.1-10c0-0.8,0.7-1.5,1.5-1.5
-		c0.8,0,1.5,0.7,1.5,1.5l-0.1,10c0,0.8-0.7,1.5-1.5,1.5C67.6,56,67,55.3,67,54.5z"/>
-	<path id="path958-8-9-3-1" sodipodi:nodetypes="sccsccs" fill="#4479FB" d="M77,60.2l0.1-15c0-1.2,0.7-2.2,1.5-2.2
-		c0.8,0,1.5,1,1.5,2.3l-0.1,15c0,1.2-0.7,2.2-1.5,2.2C77.6,62.5,77,61.4,77,60.2z"/>
-	<path id="path958-8-9-3-1-4" sodipodi:nodetypes="sccsccs" fill="#4479FB" d="M87,54.5l0.1-10c0-0.8,0.7-1.5,1.5-1.5
-		c0.8,0,1.5,0.7,1.5,1.5l-0.1,10c0,0.8-0.7,1.5-1.5,1.5C87.6,56,87,55.3,87,54.5z"/>
-	<path id="path958-8-9-3-1-4-2" sodipodi:nodetypes="sccsccs" fill="#4479FB" d="M97,54.5l0.1-10c0-0.8,0.7-1.5,1.5-1.5
-		c0.8,0,1.5,0.7,1.5,1.5l-0.1,10c0,0.8-0.7,1.5-1.5,1.5C97.6,56,97,55.3,97,54.5z"/>
 		</g>
-<g id="g964" transform="translate(0,34.9)">
+		<g>
-	<path id="path962" fill="#FFFFFF" d="M108.8,51.6H19.2c-1.9,0-3.5-1.6-3.5-3.5v-38c0-1.9,1.6-3.5,3.5-3.5h89.6
+			<path fill="#174CCE" d="M64,75.6C64,75.6,64,75.6,64,75.6c-1.3,0-2.3-1-2.3-2.3l0.1-34.9L32,25.4c-1.2-0.5-1.7-1.9-1.2-3.1
-		c1.9,0,3.5,1.6,3.5,3.5v38C112.3,50,110.7,51.6,108.8,51.6z M19.2,9.6c-0.3,0-0.5,0.2-0.5,0.5v38c0,0.3,0.2,0.5,0.5,0.5h89.6
+				c0.5-1.2,1.9-1.7,3.1-1.2L65,34.7c0.9,0.4,1.4,1.2,1.4,2.1l-0.1,36.4C66.3,74.5,65.2,75.6,64,75.6z"/>
-		c0.3,0,0.5-0.2,0.5-0.5v-38c0-0.3-0.2-0.5-0.5-0.5H19.2z"/>
+		</g>
+		<g>
+			<path fill="#174CCE" d="M64,39.2c-0.9,0-1.8-0.5-2.1-1.4c-0.5-1.2,0-2.6,1.2-3.1l31.1-13.5c1.2-0.5,2.6,0,3.1,1.2
+				c0.5,1.2,0,2.6-1.2,3.1L65,39C64.7,39.1,64.4,39.2,64,39.2z"/>
+		</g>
+	</g>
+	<path fill="#174CCE" d="M94.6,85.6c-0.8-0.6-2.1-0.1-2.1,0.9v11.6H35.4V86.5c0-1-1.3-1.5-2.1-0.9l-16.9,15.1
+		c-0.5,0.5-0.5,1.3,0,1.8l16.9,15c0.8,0.6,2.1,0.1,2.1-0.9V105h57.2v11.6c0,1,1.3,1.5,2.1,0.9l16.9-15c0.5-0.5,0.5-1.3,0-1.8
+		L94.6,85.6z"/>
+	
+		<line fill="none" stroke="#174CCE" stroke-width="8" stroke-linecap="round" stroke-miterlimit="10" x1="9.5" y1="82.6" x2="9.5" y2="120.5"/>
+	
+		<line fill="none" stroke="#174CCE" stroke-width="8" stroke-linecap="round" stroke-miterlimit="10" x1="118.5" y1="82.6" x2="118.5" y2="120.5"/>
 </g>
 </svg>

resources/icons/mmu_segmentation.svg

@@ -1,24 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 25.0.0, 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"
+<svg version="1.1" id="图层_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="M52.9,108.4c-5.2,0-9.5-4.3-9.5-9.5s4.3-9.5,9.5-9.5s9.5,4.3,9.5,9.5S58.1,108.4,52.9,108.4z M52.9,92.4
+<g>
-	c-3.6,0-6.5,2.9-6.5,6.5s2.9,6.5,6.5,6.5s6.5-2.9,6.5-6.5S56.5,92.4,52.9,92.4z M29.8,83.6c-5.2,0-9.5-4.3-9.5-9.5s4.3-9.5,9.5-9.5
+	<path fill="#174CCE" d="M78.3,79.9c0,0,0-2.2-4.9-2.7c-0.7-0.1-1.3-0.5-1.6-1.3c-0.5-1.8-2.1-4.7-6-4.5c0,0-3.2-1.1,2.3-7.1
-	s9.5,4.3,9.5,9.5S35.1,83.6,29.8,83.6z M29.8,67.6c-3.6,0-6.5,2.9-6.5,6.5s2.9,6.5,6.5,6.5s6.5-2.9,6.5-6.5S33.4,67.6,29.8,67.6z
+		c0,0,4.8-8.7,11.4-7.2l8.9,6.3c0,0,3.4,3.9-1.2,10.2C87.2,73.8,84.6,78.6,78.3,79.9"/>
-	 M34,49.9c-5.2,0-9.5-4.3-9.5-9.5s4.3-9.5,9.5-9.5s9.5,4.3,9.5,9.5S39.2,49.9,34,49.9z M34,33.9c-3.6,0-6.5,2.9-6.5,6.5
+	<path fill="#174CCE" d="M98.1,58.1L80.4,45.9c-0.2,1.2-0.5,2.7-0.5,4.4c0,2.1,0.3,3.9,0.6,5.4c2.9,1.8,5.7,3.8,8.6,5.6
-	s2.9,6.5,6.5,6.5s6.5-2.9,6.5-6.5S37.6,33.9,34,33.9z M64,35.2c-5.2,0-9.5-4.3-9.5-9.5s4.3-9.5,9.5-9.5s9.5,4.3,9.5,9.5
+		C89.2,61.2,94.7,60.9,98.1,58.1"/>
-	S69.2,35.2,64,35.2z M64,19.2c-3.6,0-6.5,2.9-6.5,6.5s2.9,6.5,6.5,6.5s6.5-2.9,6.5-6.5S67.6,19.2,64,19.2z M96.1,52.2
+	<path fill="#174CCE" d="M99.7,56.4l-18-12.3l30.9-36.6c1.8-2.1,4.9-2.6,7.3-1s3.2,4.7,1.9,7.2L99.7,56.4z"/>
-	c-5.2,0-9.5-4.3-9.5-9.5s4.3-9.5,9.5-9.5s9.5,4.3,9.5,9.5S101.3,52.2,96.1,52.2z M96.1,36.2c-3.6,0-6.5,2.9-6.5,6.5s2.9,6.5,6.5,6.5
+	<path fill="#174CCE" d="M91.6,63.9c0,0,4.1,14.1-13.6,19c0,0-17.6,5.7-25.7-11.3c0,0,7.9,2.3,11.8-6.6c3.9-9,10.5-10.2,13.2-10.7
-	s6.5-2.9,6.5-6.5S99.7,36.2,96.1,36.2z M72.5,120.9c2.6-0.4,4.8-2.1,5.8-4.5c1.1-2.5,0.8-5.3-0.8-7.5c-3.1-4.4-4.5-9.9-3.9-15.3
+		l-0.1-1c-11.4-1.8-36-3.3-56.4,10.9c0,0-23.1,16.9-12.1,39.1c0,0,8.3,20.9,45,19.1c0,0,15.5,0.3,20.1-14.9c0,0,3.5-11.9,8.6-14.9
-	c0.3-2.5,0.9-4.9,2-7.2c0.4-0.8,0-1.6-0.7-2s-1.6,0-2,0.7c-1.2,2.6-2,5.3-2.3,8.2c-0.6,6.2,0.9,12.3,4.4,17.3c1,1.4,1.2,3.1,0.5,4.6
+		c0,0,19.8,0.1,21.1-13.1c0,0,2.8-9.6-6-17.6C96.1,62.5,93.8,63.5,91.6,63.9 M26,100.9c-4.4,0.3-8.3-2.2-8.6-5.6
-	c-0.6,1.5-1.9,2.4-3.5,2.7c-3.3,0.5-6.7,0.7-10,0.6c-28.6-1-51.7-24.2-52.6-52.8c-0.5-15.2,5.2-29.5,15.9-40.2s25-16.4,40.2-16
+		c-0.2-3.4,3.2-6.4,7.7-6.7c4.5-0.3,8.3,2.2,8.6,5.6C33.8,97.6,30.4,100.6,26,100.9 M33.2,79.5c-4.4,0.3-8.3-2.2-8.6-5.6
-	c28.6,0.9,51.8,23.9,52.8,52.6c0.1,3.2-0.1,6.5-0.5,9.7c-0.2,1.7-1.3,3.1-2.9,3.7c-1.5,0.7-3.2,0.5-4.5-0.4
+		c-0.2-3.4,3.2-6.4,7.7-6.7s8.3,2.2,8.6,5.6C41.1,76.2,37.7,79.2,33.2,79.5 M54,107.1c-4.4,0.3-8.3-2.2-8.6-5.6
-	c-3.3-2.3-7.2-3.8-11.2-4.3c-0.8-0.1-1.6,0.5-1.7,1.3c-0.1,0.8,0.5,1.6,1.3,1.7c3.6,0.5,7,1.8,9.9,3.8c2.2,1.5,4.9,1.8,7.4,0.7
+		c-0.2-3.4,3.2-6.4,7.7-6.7c4.4-0.3,8.3,2.2,8.6,5.6C61.8,103.8,58.4,106.8,54,107.1"/>
-	c2.5-1.1,4.3-3.4,4.7-6.1c0.5-3.4,0.7-6.8,0.6-10.2C120.4,31.8,96,7.4,65.8,6.5C49.8,6,34.7,12,23.4,23.3C12,34.7,6.1,49.7,6.5,65.8
+</g>
-	C7.4,96,31.8,120.4,62,121.5c0.7,0,1.3,0,2,0C66.9,121.5,69.7,121.3,72.5,120.9z"/>
-<path fill="#4479FB" d="M115.4,105L87.8,66.2c7.8-12.6-22.9-18.1-27.9-23.3c-2.5-2.6-0.4,35.3,15.6,32.3l29.7,37.6
-	c0.5,0.9,3.4,5.5,7.4,6.4c0.4,0.1,0.8,0.1,1.2,0.1c1.3,0,2.5-0.4,3.6-1.2c1.4-1,2.1-2.4,2.3-4C119.9,109.9,116.1,105.8,115.4,105z
-	 M78.4,74.1c1.2-0.6,2.5-1.4,3.9-2.4c1.4-1.1,2.5-2.1,3.4-3l6.9,9.7l-6.8,5.2L78.4,74.1z M116.6,113.7c-0.1,0.8-0.4,1.3-1.1,1.8
-	c-0.8,0.6-1.5,0.8-2.3,0.6c-2.4-0.5-4.8-3.8-5.5-5c0-0.1-0.1-0.1-0.1-0.2l-19.8-25l6.7-5.1l18.5,26c0,0.1,0.1,0.1,0.1,0.2
-	C114.1,108,116.8,111.3,116.6,113.7z"/>
 </svg>

resources/icons/mode.svg

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!-- Generator: Adobe Illustrator 24.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"
+<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="hex_x5F_green">
 	<g>
-		<polygon fill="#4479FB" points="8,1 2,5 2,7 2,11 8,15 14,11 14,7 14,5 		"/>
+		<polygon fill="#ED6B21" points="8,1 2,5 2,7 2,11 8,15 14,11 14,7 14,5 		"/>
 	</g>
 </g>
 </svg>

resources/icons/paste.svg

@@ -3,98 +3,23 @@
 <svg version="1.1" id="图层_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>
-	<path fill="#174CCE" d="M44,122.5c-6.7,0-9.5-2.8-9.5-9.4c0-23.1,0-46.3,0-69.4c0-6.3,2.7-9.1,9-9.1c23.3,0,46.6,0,69.9,0
+	<g>
-		c6.5,0,9.2,2.7,9.2,9.2c0,23.1,0,46.3,0,69.4c0,6.5-2.8,9.3-9.4,9.3c-11.6,0-23.2,0-34.8,0C66.9,122.5,55.4,122.5,44,122.5z
+		<path fill="#174CCE" d="M102.1,81.6H76.2c-2.2,0-4-1.8-4-4s1.8-4,4-4h25.9c2.2,0,4,1.8,4,4S104.3,81.6,102.1,81.6z"/>
-		 M99.2,81.7c0.7,0,1.4,0,2.1,0c1.9-0.2,3.2-1.2,3.2-3.1c0-2.1-1.4-3.1-3.4-3.1c-5.2,0-10.4,0-15.6,0c-1.1,0-2.2,0-3.8,0
-		c0-1.5,0-2.8,0-4.2c0-4.8,0-9.5,0-14.3c0-3-1.1-4.4-3.2-4.4c-2.2,0-3.1,1.3-3.1,4.5c0,6,0,11.9,0,18.2c-4.4,0-8.7,0-12.9,0
-		c-2,0-4,0-6,0c-2.5,0.1-4,1.4-3.9,3.2c0.2,2.3,1.6,3.2,3.9,3.2c5.4-0.1,10.7,0,16.1,0c0.8,0,1.5,0,2.7,0c0,1.6,0,3,0,4.4
-		c0,4.8,0,9.7,0,14.5c0,2.1,0.8,3.6,3,3.8c1.8,0.2,3.2-1.4,3.3-3.9c0-6.2,0-12.4,0-18.9C87.8,81.7,93.5,81.7,99.2,81.7z"/>
-	<path fill="#174CCE" d="M41.9,5.5c-0.6,0-1.2,0-1.8,0c-0.1,0-0.1,0-0.2,0c-4.4,0-8.7,0-13.1,0c-1.7,0-3,1.4-3,3c0,1.7,1.4,3,3,3
-		l0,0l15.1,0c1.7,0,3-1.4,3-3S43.6,5.5,41.9,5.5L41.9,5.5L41.9,5.5z M10.5,6.4c-0.4,0-0.9,0.1-1.3,0.3C9.1,6.7,9,6.8,8.9,6.8
-		c0,0,0,0,0,0C8.8,6.9,8.6,7,8.5,7.1c-2.5,2.9-3,5.2-3,8.4c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,1.7,0,3.5,0,5.2c0,1.7,1.3,3,3,3c1.7,0,3-1.3,3-3l0-5.2
-		c0-2.8,0.5-3.5,0.4-3.5l0,0c1.4-0.9,1.9-2.8,1-4.2C12.5,6.9,11.5,6.4,10.5,6.4L10.5,6.4z M8.5,35.9c-1.7,0-3,1.3-3,3
-		c0,1.1,0,2.2,0,3.3c0,0.2,0,0.5,0,0.7c0,0.3,0,0.7,0,1c0,0.3,0,0.6,0,0.9c0,0.5,0,1,0,1.5c0,0.1,0,0.1,0,0.2c0,2.5,0,5,0,7.5
-		c0,1.7,1.4,3,3,3l0,0c1.7,0,3-1.4,3-3l0-15.1C11.5,37.2,10.2,35.9,8.5,35.9L8.5,35.9z M8.5,69C8.5,69,8.5,69,8.5,69
-		c-1.7,0-3,1.3-3,3c0,0.9,0,1.8,0,2.7c0,3,0,6,0,8.9l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0.1v0c0,0.1,0,0.3,0,0.4l0,0c0,0.1,0,0.1,0,0.2l0,0c0,0,0,0,0,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0.1,0,0.3,0.1,0.4c0.3,1.5,1.5,2.5,3,2.5c0.2,0,0.4,0,0.5,0c1.6-0.3,2.7-1.9,2.4-3.5
-		c-0.1-0.6-0.2-1.5-0.2-2.4l0-11.6C11.5,70.4,10.2,69,8.5,69L8.5,69z M28.1,87.5l-4.2,0l-3.3,0c-1.7,0-3,1.4-3,3c0,1.7,1.3,3,3,3
-		c2.1,0,4.3,0,6.5,0c0.1,0,0.1,0,0.2,0c0.1,0,0.2,0,0.3,0c0,0,0,0,0,0c0.2,0,0.4,0,0.5,0l0,0l0,0l7.6,0c1.7,0,3-1.4,3-3
-		c0-1.7-1.3-3-3-3L28.1,87.5L28.1,87.5z M44.4,65.7c-1.5,0-2.8,1.1-3,2.6l-1.9,15c-0.2,1.7,1,3.2,2.6,3.4c0.1,0,0.3,0,0.4,0
-		c1.5,0,2.8-1.1,3-2.6l1.9-15c0.2-1.6-1-3.2-2.6-3.4C44.6,65.7,44.5,65.7,44.4,65.7L44.4,65.7z M64.7,42.4c-0.3,0-0.5,0-0.8,0.1
-		l-14.6,3.8c-1.6,0.4-2.6,2.1-2.2,3.7c0.4,1.4,1.6,2.3,2.9,2.3c0.3,0,0.5,0,0.8-0.1c0,0,2.1-0.5,4.6-1.2l0,0c0.1,0,0.2-0.1,0.3-0.1
-		l0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0l0,0c0,0,0,0,0.1,0l0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0l9.4-2.5
-		c1.6-0.4,2.6-2.1,2.1-3.7C67.2,43.3,66,42.4,64.7,42.4L64.7,42.4z M90.5,33.9C90.5,33.9,90.5,33.9,90.5,33.9c-1.5,0-2.7,1.1-3,2.5
-		l-6.1,1.6c-1.6,0.4-2.6,2.1-2.2,3.7c0.4,1.4,1.6,2.3,2.9,2.3c0.3,0,0.5,0,0.8-0.1L93.5,41l0,0l0,0l0,0l0,0l0,0l0,0l0,0l0,0l0,0l0,0
-		l0,0l0,0l0,0l0,0l0,0l0-4.1C93.5,35.2,92.1,33.9,90.5,33.9L90.5,33.9z M87.4,5.8c-1.3,0-2.5,0.8-2.9,2.1c-0.5,1.6,0.4,3.3,1.9,3.8
-		c0.3,0.1,0.8,0.3,0.8,0.7c0.1,1.8,0.1,3.9,0.1,6.4c0,1.7,1.3,3,3,3c0,0,0,0,0,0c1.7,0,3-1.3,3-3c0-1.5,0-3-0.1-4.5c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0-0.1c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0-0.1,0-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0-0.1,0-0.1
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0-0.1,0-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0v0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0l0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0-0.1l0,0c-0.1-0.7-0.3-1.3-0.5-1.9l0,0c0-0.1,0-0.1-0.1-0.2c0,0,0,0,0,0c0,0,0-0.1,0-0.1
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c-0.9-1.2-2.2-2.2-3.8-2.7C88.1,5.9,87.7,5.8,87.4,5.8L87.4,5.8z
-		 M55.2,5.5c-1.7,0-3,1.4-3,3c0,1.7,1.3,3,3,3l15.1,0c1.7,0,3-1.3,3-3c0-1.7-1.3-3-3-3c-1.8,0-3.6,0-5.4,0c-0.2,0-0.3,0-0.5,0
-		c-0.4,0-0.7,0-1.1,0C60.6,5.5,57.9,5.5,55.2,5.5L55.2,5.5z"/>
 	</g>
 	<g>
+		<path fill="#174CCE" d="M102.1,98.4H76.2c-2.2,0-4-1.8-4-4s1.8-4,4-4h25.9c2.2,0,4,1.8,4,4S104.3,98.4,102.1,98.4z"/>
 	</g>
 	<g>
+		<path fill="#174CCE" d="M111.2,57.7c1.8,0,3.3,1.5,3.3,3.3v50.1c0,1.8-1.5,3.3-3.3,3.3H66.7c-1.8,0-3.3-1.5-3.3-3.3V61
+			c0-1.8,1.5-3.3,3.3-3.3H111.2 M111.2,49.7H66.7c-6.3,0-11.3,5.1-11.3,11.3v50.1c0,6.3,5.1,11.3,11.3,11.3h44.4
+			c6.3,0,11.3-5.1,11.3-11.3V61C122.5,54.8,117.4,49.7,111.2,49.7L111.2,49.7z"/>
 	</g>
+	<path fill="#174CCE" d="M50.8,13.5c4.8,0,8.8,3.9,8.8,8.8s-3.9,8.8-8.8,8.8H39.2c-4.8,0-8.8-3.9-8.8-8.8s3.9-8.8,8.8-8.8H50.8
+		 M50.8,5.5H39.2c-9.3,0-16.8,7.5-16.8,16.8s7.5,16.8,16.8,16.8h11.6c9.3,0,16.8-7.5,16.8-16.8S60.1,5.5,50.8,5.5L50.8,5.5z"/>
 	<g>
+		<path fill="#174CCE" d="M75.6,29.6v20.2h8V29.6c0-6.2-5-11.2-11.2-11.2H62v8h10.4C74.2,26.3,75.6,27.8,75.6,29.6z"/>
+		<path fill="#174CCE" d="M55.4,99.8H16.8c-1.8,0-3.2-1.5-3.2-3.2v-67c0-1.8,1.5-3.2,3.2-3.2h12.5v-8H16.8c-6.2,0-11.2,5-11.2,11.2
+			v67c0,6.2,5,11.2,11.2,11.2h38.6V99.8z"/>
 	</g>
-<g>
-</g>
-<g>
-</g>
-<g>
 </g>
 </svg>

resources/icons/place.svg

@@ -3,20 +3,10 @@
 <svg version="1.1" id="图层_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>
-	<path fill="#174CCE" d="M101.6,7.7H26.4c-10.6,0-18.8,8.1-18.8,18.8v75.1c0,10.6,8.1,18.8,18.8,18.8h75.1
+	<rect x="5.5" y="111.6" fill="#174CCE" width="117" height="10.9"/>
-		c10.6,0,18.8-8.1,18.8-18.8V26.4C120.4,15.8,112.2,7.7,101.6,7.7z M20.2,20.2h37.6v37.6H20.2V20.2z M57.7,107.8H20.2V70.3h37.6
+	
-		V107.8z M107.8,107.8H70.3V70.3h37.6V107.8z"/>
+		<rect x="18" y="18" transform="matrix(0.7134 -0.7008 0.7008 0.7134 -19.8921 47.4248)" fill="#174CCE" width="60.1" height="60.1"/>
-</g>
+	<polyline fill="none" stroke="#174CCE" stroke-width="8" stroke-miterlimit="10" points="119.5,84.9 102.8,101.6 86.1,84.9 	"/>
-<g>
+	<path fill="none" stroke="#174CCE" stroke-width="8" stroke-miterlimit="10" d="M74.9,27.6c0,0,37.2-44.8,27.9,74"/>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
 </g>
 </svg>

resources/icons/preview.svg

@@ -4,28 +4,16 @@
 	 viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
 <g>
 	<g>
-		<path fill="#174CCE" d="M118.9,79.9l-6.6-3.3L66,105.6c-1.3,0.7-2.6,0.7-4,0L15.8,76.6l-6.6,3.3c-2.6,1.3-2.6,4.6-0.7,6.6
+		<path fill="#174CCE" d="M120.1,80.3l-6.8-3.4L66,106.6c-1.3,0.7-2.7,0.7-4.1,0L14.7,76.9l-6.8,3.4C5.3,81.6,5.3,85,7.2,87
-			L62,120.8c1.3,0.7,2.6,0.7,4,0l53.5-34.4C122.2,84.5,121.5,81.2,118.9,79.9z"/>
+			l54.7,35.1c1.3,0.7,2.7,0.7,4.1,0l54.7-35.2C123.5,85,122.8,81.6,120.1,80.3z"/>
 	</g>
 	<g>
-		<path fill="#174CCE" d="M118.9,56.1l-6.6-3.3L66,81.8c-1.3,0.7-2.6,0.7-4,0L15.8,52.8l-6.6,3.3c-2.6,1.3-2.6,4.6-0.7,6.6L62,97
+		<path fill="#174CCE" d="M120.1,55.9l-6.8-3.4L66,82.2c-1.3,0.7-2.7,0.7-4.1,0L14.7,52.6l-6.8,3.4c-2.7,1.3-2.7,4.7-0.7,6.8
-			c1.3,0.7,2.6,0.7,4,0l53.5-34.4C122.2,60.7,121.5,57.4,118.9,56.1z"/>
+			l54.7,35.1c1.3,0.7,2.7,0.7,4.1,0l54.7-35.2C123.5,60.6,122.8,57.3,120.1,55.9z"/>
 	</g>
 	<g>
-		<path fill="#174CCE" d="M8.5,38.9L62,73.3c1.3,0.7,2.6,0.7,4,0l53.5-34.4c2.6-1.3,2-5.3-0.7-6.6L65.3,7.2c-1.3-0.7-2-0.7-3.3,0
+		<path fill="#174CCE" d="M7.2,38.3l54.7,35.2c1.3,0.7,2.7,0.7,4.1,0l54.7-35.2c2.7-1.3,2-5.4-0.7-6.8L65.3,5.9
-			L9.2,32.3C6.5,33.6,5.9,36.9,8.5,38.9z"/>
+			c-1.3-0.7-2-0.7-3.4,0l-54,25.7C5.2,32.9,4.6,36.3,7.2,38.3z"/>
 	</g>
 </g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
 </svg>

resources/icons/rotate.svg

@@ -3,22 +3,28 @@
 <svg version="1.1" id="图层_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>
-	<path fill="#174CCE" d="M32.4,33.3c8.5-8.5,19.2-13.8,28-13.9L60.3,7.8C48.4,8,35,14.4,24.2,25.1S7.1,49.3,6.9,61.2l11.6,0.2
+	<g>
-		C18.6,52.5,24,41.8,32.4,33.3z"/>
+		<g>
-	<path fill="#174CCE" d="M80.7,6.9L9.2,78.4l40.4,40.4l71.4-71.5L80.7,6.9z M25.7,78.4l55-55l24,24l-55,55L25.7,78.4z"/>
+			<path fill="#174CCE" d="M65.5,91.5c-0.2,0-0.4,0-0.6-0.1L39.4,80.5c-0.6-0.2-0.9-0.8-0.9-1.4v-30c0-0.6,0.4-1.2,0.9-1.4l25.2-11
-	<path fill="#174CCE" d="M108.9,67.6c-0.1,8.8-5.4,19.6-13.9,28s-19.2,13.8-28,13.9l0.2,11.6c11.9-0.2,25.4-6.6,36.1-17.3
+				c0.4-0.2,0.8-0.2,1.2,0l25.8,11c0.6,0.2,0.9,0.8,0.9,1.4v30c0,0.6-0.4,1.2-0.9,1.4L66.1,91.4C65.9,91.5,65.7,91.5,65.5,91.5z
-		s17.2-24.2,17.3-36.1L108.9,67.6z"/>
+				 M41.5,78.1l23.9,10.2l24.1-10.2v-28L65.3,39.7L41.5,50.1V78.1z"/>
 		</g>
 		<g>
+			<path fill="#174CCE" d="M65.5,91.5C65.5,91.5,65.5,91.5,65.5,91.5c-0.8,0-1.5-0.7-1.5-1.5L64,61.1L39.4,50.5
+				c-0.8-0.3-1.1-1.2-0.8-2c0.3-0.8,1.2-1.1,2-0.8l25.5,11.1c0.6,0.2,0.9,0.8,0.9,1.4L67,90C67,90.8,66.3,91.5,65.5,91.5z"/>
 		</g>
 		<g>
+			<path fill="#174CCE" d="M65.5,61.7c-0.6,0-1.2-0.3-1.4-0.9c-0.3-0.8,0-1.7,0.8-2l25.5-11.1c0.8-0.3,1.7,0,2,0.8
+				c0.3,0.8,0,1.7-0.8,2L66.1,61.5C65.9,61.6,65.7,61.7,65.5,61.7z"/>
+		</g>
 	</g>
 	<g>
+		<path fill="#174CCE" d="M113.6,34.4l-3.2-18.1c-0.5-2.9-4.1-4-6.2-1.9L99.6,19C87,8.4,70.4,3.7,54.2,6.2
+			C22.8,11,1.3,40.9,6.2,72.8c0.3,2,2,3.4,3.9,3.4c0.2,0,0.4,0,0.6,0c2.2-0.3,3.7-2.4,3.3-4.6C9.9,44.1,28.4,18.3,55.4,14.1
+			c13.9-2.2,27.7,1.7,38.6,10.6L89.5,29c-2.1,2.1-1,5.6,1.9,6.2l17.9,3.4C111.9,39.1,114.1,36.9,113.6,34.4z"/>
+		<path fill="#174CCE" d="M14.4,93.6l3.2,18.1c0.5,2.9,4.1,4,6.2,1.9l4.6-4.6c12.6,10.5,29.2,15.3,45.5,12.8
+			c31.4-4.9,52.9-34.8,48-66.6c-0.3-2-2-3.4-3.9-3.4c-0.2,0-0.4,0-0.6,0c-2.2,0.3-3.7,2.4-3.3,4.6c4.3,27.5-14.3,53.3-41.3,57.5
+			c-13.9,2.2-27.7-1.7-38.6-10.6l4.4-4.4c2.1-2.1,1-5.6-1.9-6.2l-17.9-3.4C16.1,88.9,13.9,91.1,14.4,93.6z"/>
 	</g>
-<g>
-</g>
-<g>
-</g>
-<g>
 </g>
 </svg>

resources/icons/scale.svg

@@ -3,26 +3,9 @@
 <svg version="1.1" id="图层_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>
-	<polygon fill="#174CCE" points="89.6,121.6 70.4,121.6 70.4,108.8 76.8,108.8 76.8,102.4 89.6,102.4 	"/>
+	<rect x="9" y="71.1" fill="#174CCE" width="47.3" height="47.3"/>
-	<rect x="38.4" y="108.8" fill="#174CCE" width="12.8" height="12.8"/>
+	<path fill="#174CCE" d="M114.5,13.5v101H64v8h58.5V5.5l0,0H5.5V64h8V13.5H114.5"/>
-	<polygon fill="#174CCE" points="25.6,121.6 6.5,121.6 6.5,102.4 19.2,102.4 19.2,108.8 25.6,108.8 	"/>
+	<polygon fill="#174CCE" points="77.2,22.6 87.3,32.7 84,35.9 84,35.9 64.5,55.5 72.5,63.6 92.1,44 92.1,44 95.3,40.7 105.4,50.8 
-	<rect x="6.5" y="76.8" fill="#174CCE" width="12.8" height="12.8"/>
+		105.4,22.6 	"/>
-	<polygon fill="#174CCE" points="19.2,64 6.5,64 6.5,44.8 25.6,44.8 25.6,57.6 19.2,57.6 	"/>
-	<rect x="38.4" y="44.8" fill="#174CCE" width="12.8" height="12.8"/>
-	<rect x="76.8" y="76.8" fill="#174CCE" width="12.8" height="12.8"/>
-	<path fill="#174CCE" d="M44.8,6.5v76.7h76.7V6.5H44.8z M105.8,44l-5.2-5.2L72.3,67.2l-9.9-10l28.3-28.3l-5.2-5.2l24.3-4.1L105.8,44
-		z"/>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
 </g>
 </svg>

resources/icons/seam.svg

@@ -3,29 +3,36 @@
 <svg version="1.1" id="图层_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>
-	<polygon fill="#174CCE" points="105.9,10.7 6.5,10.7 37.3,64 6.5,117.3 105.9,117.3 75.1,64 	"/>
 	<g>
-		
+		<g>
-			<rect x="61.7" y="66.2" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -27.2708 83.533)" fill="#808080" width="51.1" height="17"/>
+			<path fill="#174CCE" d="M63.9,122.4c-0.5,0-1.1-0.1-1.6-0.3L9,99.3c-1.5-0.6-2.4-2.1-2.4-3.7V32.7c0-1.6,0.9-3,2.4-3.7L61.8,5.9
-		<polygon fill="#808080" points="73.7,100.7 56.6,104.5 61.5,89 		"/>
+				c1-0.4,2.2-0.4,3.2,0L119,29c1.5,0.6,2.4,2.1,2.4,3.7v62.9c0,1.6-1,3.1-2.4,3.7l-53.6,22.8C64.9,122.3,64.4,122.4,63.9,122.4z
-		<path fill="#808080" d="M120.6,53.3l-7.9,7.9l-12.1-12.1l7.9-7.9c1.1-1.1,3-1.1,4.1,0l8,8C121.8,50.3,121.8,52.2,120.6,53.3z"/>
+				 M14.5,93l49.3,21.1L113.5,93V35.3L63.4,14L14.5,35.3V93z"/>
 		</g>
 		<g>
-		<path fill="#808080" d="M55.9,101.9c-3-0.4-6-0.7-9-1.1c-1.5-0.2-2.9-0.3-4.4,0c-1.5,0.3-2.9,0.9-4.2,1.5c-1,0.5-1.3,1.9-0.7,2.8
+			<path fill="#174CCE" d="M63.9,122.4C63.9,122.4,63.9,122.4,63.9,122.4c-2.2,0-4-1.8-4-4L60,58.5L8.9,36.3c-2-0.9-3-3.2-2.1-5.3
-			c0.6,1,1.8,1.2,2.8,0.7c1-0.5,2.1-1,3.3-1.1c1.3-0.1,2.6,0.1,3.9,0.3c2.8,0.3,5.6,0.7,8.3,1c1.1,0.1,2-1,2-2
+				c0.9-2,3.2-3,5.3-2.1l53.5,23.2c1.5,0.6,2.4,2.1,2.4,3.7l-0.1,62.5C67.9,120.6,66.1,122.4,63.9,122.4z"/>
-			C58,102.7,57,102,55.9,101.9L55.9,101.9z"/>
+		</g>
+		<g>
+			<path fill="#174CCE" d="M64,59.9c-1.5,0-3-0.9-3.7-2.4c-0.9-2,0-4.4,2.1-5.3L115.9,29c2-0.9,4.4,0,5.3,2.1c0.9,2,0,4.4-2.1,5.3
+				L65.6,59.6C65.1,59.8,64.5,59.9,64,59.9z"/>
 		</g>
 	</g>
 	<g>
+		<path fill="#174CCE" d="M95,54.5l-7.6,3.4c-0.9,0.4-1.7-0.1-1.7-1.2l0,0c0-1,0.8-2.3,1.7-2.6l7.6-3.4c0.9-0.4,1.7,0.1,1.7,1.2l0,0
+			C96.7,52.9,96,54.1,95,54.5z"/>
+		<path fill="#174CCE" d="M89.9,63.6L82.3,67c-0.9,0.4-1.7-0.1-1.7-1.2l0,0c0-1,0.8-2.3,1.7-2.6l7.6-3.4c0.9-0.4,1.7,0.1,1.7,1.2
+			l0,0C91.6,62,90.9,63.1,89.9,63.6z"/>
+		<path fill="#174CCE" d="M98,67l-7.6,3.4c-0.9,0.4-1.7-0.1-1.7-1.2l0,0c0-1,0.8-2.3,1.7-2.6l7.6-3.4c0.9-0.4,1.7,0.1,1.7,1.2l0,0
+			C99.7,65.4,98.9,66.5,98,67z"/>
+		<path fill="#174CCE" d="M103.5,71.4l-7.6,3.4c-0.9,0.4-1.7-0.1-1.7-1.2l0,0c0-1,0.8-2.3,1.7-2.6l7.6-3.4c0.9-0.4,1.7,0.1,1.7,1.2
+			l0,0C105.1,69.8,104.4,71.1,103.5,71.4z"/>
+		<path fill="#174CCE" d="M94.6,82.8l-7.6,3.4c-0.9,0.4-1.7-0.1-1.7-1.2l0,0c0-1,0.8-2.3,1.7-2.6l7.6-3.4c0.9-0.4,1.7,0.1,1.7,1.2
+			l0,0C96.3,81.2,95.5,82.3,94.6,82.8z"/>
+		<path fill="#174CCE" d="M104,85.5l-7.6,3.4c-0.9,0.4-1.7-0.1-1.7-1.2l0,0c0-1,0.8-2.3,1.7-2.6l7.6-3.4c0.9-0.4,1.7,0.1,1.7,1.2
+			l0,0C105.7,83.9,104.9,85,104,85.5z"/>
+		<path fill="#174CCE" d="M98.5,94.8l-7.6,3.4c-0.9,0.4-1.7-0.1-1.7-1.2l0,0c0-1,0.8-2.3,1.7-2.6l7.6-3.4c0.9-0.4,1.7,0.1,1.7,1.2
+			l0,0C100.1,93.2,99.4,94.5,98.5,94.8z"/>
 	</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
 </g>
 </svg>

resources/icons/settings.svg

@@ -1,56 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 25.0.0, 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"
+<svg version="1.1" id="图层_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="settings">
+<path fill="#174CCE" d="M109.9,67.2l-0.3-10.4l10.2-7.2c-0.2-6.9-3.8-13.8-7.4-18.9l-13.8,2.1l-7.1-6.7l3.2-12.2
-	<g>
+	c-5.3-3.3-12.3-6.6-19.2-8.2l-6.7,10.5l-10.4,0.3L51.4,6.3c-8.6,1.9-15.4,5.6-20.5,9.2l2.1,13.8l-6.8,7.1l-12.2-3.2
-		<g>
+	c-5,7-6.6,12.3-8.2,19.2l10.5,6.7l0.3,10.4L6.4,78.4c1.9,6.9,5.5,13.7,9.1,18.8l12.1-2l8.8,6.7l-3.2,12.2c5.3,3.3,12.3,6.6,19.2,8.2
-			<path fill="#4479FB" d="M52,82c-0.6,0-1.1-0.1-1.7-0.3c-1.1-0.4-1.9-1.3-2.3-2.3l-1.7-4.1c-1.6,0.1-3.2,0.1-4.9,0l-1.7,4.1
+	l6.7-10.5l10.4-0.3l7.2,10.2c6.9-1.9,13.8-3.8,18.8-9.1l-2.1-13.8l6.8-7.1l13.9,3.1c3.3-5.3,6.6-12.3,8.2-19.2L109.9,67.2z
-				c-0.9,2.2-3.4,3.2-5.6,2.3l-10-4.2c-2.2-0.9-3.2-3.4-2.3-5.6l1.7-4.1c-1.2-1.1-2.4-2.2-3.4-3.4L16,66c-1.1,0.4-2.2,0.4-3.3,0
+	 M63.7,87.4c-12.1,0.3-22.7-9.8-23-21.9c-0.3-12.1,9.8-22.7,21.9-23c12.1-0.3,22.7,9.8,23,21.9C85.9,76.5,77.5,87,63.7,87.4"/>
-				s-1.9-1.3-2.3-2.3l-4.1-10c-0.9-2.2,0.2-4.7,2.3-5.6l4.1-1.7c-0.1-1.6-0.1-3.2,0-4.9l-4.1-1.7c-1.1-0.4-1.9-1.3-2.3-2.3
-				c-0.4-1.1-0.4-2.2,0-3.3l4.2-10c0.4-1.1,1.3-1.9,2.3-2.3s2.2-0.4,3.3,0l4.1,1.7c1.1-1.2,2.2-2.4,3.4-3.4L22,16
-				c-0.4-1.1-0.4-2.2,0-3.3s1.3-1.9,2.3-2.3l10-4.1c2.2-0.9,4.7,0.2,5.6,2.3l1.7,4.1c1.6-0.1,3.2-0.1,4.9,0l1.7-4.1
-				c0.4-1.1,1.3-1.9,2.3-2.3c1.1-0.4,2.2-0.4,3.3,0l10,4.2c1.1,0.4,1.9,1.3,2.3,2.3s0.4,2.2,0,3.3l-1.7,4.1c1.2,1.1,2.4,2.2,3.4,3.4
-				l4.1-1.7c1.1-0.4,2.2-0.4,3.3,0s1.9,1.3,2.3,2.3l4.1,10c0.4,1.1,0.4,2.2,0,3.3s-1.3,1.9-2.3,2.3l-4.1,1.7c0.1,1.6,0.1,3.2,0,4.9
-				l4.1,1.7c2.2,0.9,3.2,3.4,2.3,5.6l-4.2,10C76.5,66,74,67,71.8,66.1l-4.1-1.7c-1.1,1.2-2.2,2.4-3.4,3.4l1.7,4.1
-				c0.4,1.1,0.4,2.2,0,3.3s-1.3,1.9-2.3,2.3l-10,4.1C53.1,81.9,52.5,82,52,82z M46.8,70.2c1.8,0,3.3,1,4,2.7l1.6,3.9l8.7-3.6
-				l-1.6-3.9c-0.7-1.8-0.2-3.8,1.3-5c1.2-1,2.4-2.2,3.5-3.5c1.2-1.5,3.2-2,4.9-1.2l3.9,1.7l3.6-8.7l-3.9-1.7
-				c-1.7-0.7-2.8-2.5-2.6-4.4c0.2-1.6,0.2-3.3,0-4.9c-0.2-1.9,0.9-3.7,2.6-4.4l3.9-1.6l-3.6-8.7l-3.9,1.6c-1.8,0.7-3.8,0.2-5-1.3
-				c-1-1.2-2.2-2.4-3.5-3.5c-1.5-1.2-2-3.2-1.2-4.9l1.7-3.9l-8.7-3.6l-1.7,3.9c-0.7,1.7-2.5,2.8-4.4,2.6c-1.6-0.2-3.3-0.2-4.9,0
-				c-1.9,0.2-3.7-0.9-4.4-2.6l-1.6-3.9l-8.7,3.6l1.6,3.9c0.7,1.8,0.2,3.8-1.3,5c-1.2,1-2.4,2.2-3.5,3.5c-1.2,1.5-3.2,2-4.9,1.2
-				l-3.9-1.6l-3.6,8.7l3.9,1.7c1.7,0.7,2.8,2.5,2.6,4.4c-0.2,1.6-0.2,3.3,0,4.9c0.2,1.9-0.9,3.7-2.6,4.4l-3.9,1.6l3.6,8.7l3.9-1.6
-				c1.8-0.7,3.8-0.2,5,1.3c1,1.2,2.2,2.4,3.5,3.5c1.5,1.2,2,3.2,1.2,4.9l-1.6,3.9l8.7,3.6l1.7-3.9c0.7-1.7,2.5-2.8,4.4-2.6
-				c1.6,0.2,3.3,0.2,4.9,0C46.5,70.2,46.6,70.2,46.8,70.2z M77,36.3C77,36.3,77,36.3,77,36.3L77,36.3z"/>
-		</g>
-		<g>
-			<path fill="#4479FB" d="M44,60.9c-2.2,0-4.4-0.4-6.5-1.3c-4.2-1.7-7.4-5-9.1-9.2c-1.7-4.2-1.7-8.8,0-12.9s5-7.4,9.2-9.1
-				c4.2-1.7,8.8-1.7,12.9,0c4.2,1.7,7.4,5,9.1,9.2c1.7,4.2,1.7,8.8,0,12.9s-5,7.4-9.2,9.1C48.3,60.5,46.2,60.9,44,60.9z M44,32.1
-				c-1.5,0-3.1,0.3-4.5,0.9c-2.9,1.2-5.2,3.5-6.5,6.4s-1.2,6.2,0,9.1c1.2,2.9,3.5,5.2,6.4,6.5s6.2,1.2,9.1,0
-				c2.9-1.2,5.2-3.5,6.5-6.4s1.2-6.2,0-9.1l0,0c-1.2-2.9-3.5-5.2-6.4-6.5C47.1,32.4,45.6,32.1,44,32.1z"/>
-		</g>
-	</g>
-	<g>
-		<g>
-			<path fill="#FFFFFF" d="M97.4,122.5h-8c-2.1,0-3.8-1.7-3.8-3.8v-2.8c-0.9-0.3-1.7-0.7-2.5-1.1l-2,2c-1.5,1.5-3.9,1.5-5.4,0
-				l-5.6-5.7c-0.7-0.7-1.1-1.7-1.1-2.7c0-1,0.4-2,1.1-2.7l2-2c-0.4-0.8-0.8-1.7-1.1-2.5h-2.8c-2.1,0-3.8-1.7-3.8-3.8v-8
-				c0-2.1,1.7-3.8,3.8-3.8H71c0.3-0.9,0.7-1.7,1.1-2.5l-2-2c-1.5-1.5-1.5-3.9,0-5.4l5.6-5.6c1.5-1.5,3.9-1.5,5.4,0l2,2
-				c0.8-0.4,1.7-0.8,2.5-1.1v-2.8c0-2.1,1.7-3.8,3.8-3.8h8c2.1,0,3.8,1.7,3.8,3.8v2.8c0.9,0.3,1.7,0.7,2.5,1.1l2-2
-				c1.4-1.4,4-1.4,5.4,0l5.6,5.6c1.5,1.5,1.5,3.9,0,5.4l-2,2c0.4,0.8,0.8,1.7,1.1,2.5h2.8c2.1,0,3.8,1.7,3.8,3.8v8
-				c0,2.1-1.7,3.8-3.8,3.8h-2.8c-0.3,0.9-0.7,1.7-1.1,2.5l2,2c0.7,0.7,1.1,1.7,1.1,2.7c0,1-0.4,2-1.1,2.7l-5.6,5.6
-				c-1.4,1.4-4,1.4-5.4,0l-2-2c-0.8,0.4-1.7,0.8-2.5,1.1v2.8C101.2,120.8,99.5,122.5,97.4,122.5z M90.6,117.5h5.6V115
-				c0-1.7,1.1-3.2,2.7-3.7c1.1-0.3,2.2-0.8,3.2-1.3c1.5-0.8,3.3-0.5,4.5,0.7l1.8,1.8l4-4l-1.8-1.8c-1.2-1.2-1.4-3-0.7-4.5
-				c0.6-1,1-2.1,1.3-3.2c0.5-1.6,2-2.7,3.7-2.7h2.5v-5.6H115c-1.7,0-3.2-1.1-3.7-2.7c-0.3-1.1-0.8-2.2-1.3-3.2
-				c-0.8-1.5-0.5-3.3,0.7-4.5l1.8-1.8l-4-4l-1.8,1.8c-1.2,1.2-3,1.4-4.5,0.7c-1-0.6-2.1-1-3.2-1.3c-1.6-0.5-2.7-2-2.7-3.7v-2.5h-5.6
-				v2.5c0,1.7-1.1,3.2-2.7,3.7c-1.1,0.3-2.2,0.8-3.2,1.3c-1.5,0.8-3.3,0.5-4.5-0.7l-1.8-1.8l-4,4l1.8,1.8c1.2,1.2,1.4,3,0.7,4.5
-				c-0.6,1-1,2.1-1.3,3.2c-0.5,1.6-2,2.7-3.7,2.7h-2.5v5.6h2.5c1.7,0,3.2,1.1,3.7,2.7c0.3,1.1,0.8,2.2,1.3,3.2
-				c0.8,1.5,0.5,3.3-0.7,4.5l-1.8,1.8l4,4l1.8-1.8c1.2-1.2,3-1.4,4.5-0.7c1,0.6,2.1,1,3.2,1.3c1.6,0.5,2.7,2,2.7,3.7L90.6,117.5
-				L90.6,117.5z M72.4,104.5C72.4,104.5,72.4,104.5,72.4,104.5C72.4,104.5,72.4,104.5,72.4,104.5z M72.6,83.7L72.6,83.7L72.6,83.7z
-				 M104.5,72.4L104.5,72.4L104.5,72.4z"/>
-		</g>
-		<g>
-			<path fill="#FFFFFF" d="M93.4,106.5c-7.2,0-13.1-5.9-13.1-13.1s5.9-13.1,13.1-13.1s13.1,5.9,13.1,13.1S100.7,106.5,93.4,106.5z
-				 M93.4,85.3c-4.5,0-8.1,3.7-8.1,8.1s3.7,8.1,8.1,8.1s8.1-3.7,8.1-8.1S97.9,85.3,93.4,85.3z"/>
-		</g>
-	</g>
-</g>
 </svg>

resources/icons/split_objects.svg

@@ -3,23 +3,14 @@
 <svg version="1.1" id="图层_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>
-	<path fill="#174CCE" d="M49.6,122.5H15.2c-5.4,0-9.7-4.3-9.7-9.7V15.2c0-5.4,4.3-9.7,9.7-9.7h34.4c5.4,0,9.7,4.3,9.7,9.7v97.6
-		C59.3,118.2,55,122.5,49.6,122.5z"/>
-	<path fill="#174CCE" d="M115.9,5.5H75.3c-3.6,0-6.6,2.9-6.6,6.6v14.5h21.8V14.6l17.8,17.8L90.4,50.2V38.3H68.7v14.5
-		c0,3.6,2.9,6.6,6.6,6.6h40.7c3.6,0,6.6-2.9,6.6-6.6V12.1C122.5,8.4,119.6,5.5,115.9,5.5z"/>
-	<path fill="#174CCE" d="M115.9,68.7H75.3c-3.6,0-6.6,2.9-6.6,6.6v14.5h21.8V77.8l17.8,17.8l-17.8,17.8v-11.9H68.7v14.5
-		c0,3.6,2.9,6.6,6.6,6.6h40.7c3.6,0,6.6-2.9,6.6-6.6V75.3C122.5,71.6,119.6,68.7,115.9,68.7z"/>
-</g>
 	<g>
+		<path fill="#174CCE" d="M49.7,67.8v5.6c0,1.2-1.3,1.9-2.3,1.2l-13.3-9.4c-0.8-0.6-0.8-1.8,0-2.4l13.3-9.4c1-0.7,2.3,0,2.3,1.2V60
+			h11.1V29c0-3.8-3.1-6.8-6.8-6.8H28.9c-3.8,0-6.8,3.1-6.8,6.8v70.1c0,3.8,3.1,6.8,6.8,6.8H54c3.8,0,6.8-3.1,6.8-6.8V67.8H49.7z"/>
+		<path fill="#174CCE" d="M78.3,67.8v5.6c0,1.2,1.3,1.9,2.3,1.2l13.3-9.4c0.8-0.6,0.8-1.8,0-2.4l-13.3-9.4c-1-0.7-2.3,0-2.3,1.2V60
+			h-11V29c0-3.8,3.1-6.8,6.8-6.8h25.1c3.8,0,6.8,3.1,6.8,6.8v70.1c0,3.8-3.1,6.8-6.8,6.8H74.1c-3.8,0-6.8-3.1-6.8-6.8V67.8H78.3z"/>
 	</g>
-<g>
+	<path fill="#174CCE" d="M108.3,13.5c3.4,0,6.2,2.8,6.2,6.2v88.6c0,3.4-2.8,6.2-6.2,6.2H19.7c-3.4,0-6.2-2.8-6.2-6.2V19.7
-</g>
+		c0-3.4,2.8-6.2,6.2-6.2H108.3 M108.3,5.5H19.7c-7.8,0-14.2,6.3-14.2,14.2v88.6c0,7.8,6.3,14.2,14.2,14.2h88.6
-<g>
+		c7.8,0,14.2-6.3,14.2-14.2V19.7C122.5,11.9,116.2,5.5,108.3,5.5L108.3,5.5z"/>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
 </g>
 </svg>

resources/icons/split_parts.svg

@@ -3,33 +3,9 @@
 <svg version="1.1" id="图层_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>
-	<path fill="#174CCE" d="M49.6,122.5H15.2c-5.4,0-9.7-4.3-9.7-9.7V15.2c0-5.4,4.3-9.7,9.7-9.7h34.4c5.4,0,9.7,4.3,9.7,9.7v97.6
+	<path fill="#174CCE" d="M44,69.3v7.8c0,1.7-1.9,2.6-3.2,1.7L22.2,65.6c-1.2-0.8-1.2-2.5,0-3.3l18.6-13.1c1.4-1,3.2,0,3.2,1.7v7.5
-		C59.3,118.2,55,122.5,49.6,122.5z"/>
+		h15.5V15.1c0-5.3-4.3-9.5-9.5-9.5H15c-5.3,0-9.5,4.3-9.5,9.5V113c0,5.3,4.3,9.5,9.5,9.5h35c5.3,0,9.5-4.3,9.5-9.5V69.3H44z"/>
-	<g>
+	<path fill="#174CCE" d="M83.9,69.3v7.8c0,1.7,1.9,2.6,3.2,1.7l18.6-13.1c1.2-0.8,1.2-2.5,0-3.3L87.2,49.2c-1.4-1-3.2,0-3.2,1.7v7.5
-		<path fill="#174CCE" d="M96.6,17h-6.4v15.6h6.4c3,0,5.3-0.7,6.9-2.1c1.6-1.4,2.5-3.3,2.5-5.7c0-2.4-0.8-4.3-2.5-5.7
+		H68.6V15.1c0-5.3,4.3-9.5,9.5-9.5h35c5.3,0,9.5,4.3,9.5,9.5V113c0,5.3-4.3,9.5-9.5,9.5H78c-5.3,0-9.5-4.3-9.5-9.5V69.3H83.9z"/>
-			S99.6,17,96.6,17z"/>
-		<path fill="#174CCE" d="M115.9,5.5H75.3c-3.6,0-6.6,2.9-6.6,6.6v40.7c0,3.6,2.9,6.6,6.6,6.6h40.7c3.6,0,6.6-2.9,6.6-6.6V12.1
-			C122.5,8.4,119.6,5.5,115.9,5.5z M110.5,31.7c-1.3,2-3,3.5-5.3,4.6c-2.3,1.1-4.9,1.6-7.9,1.6h-7.2V53h-6V11.8h13.2
-			c2.9,0,5.5,0.5,7.8,1.6c2.3,1.1,4.1,2.6,5.3,4.6c1.3,2,1.9,4.3,1.9,6.8C112.4,27.4,111.7,29.7,110.5,31.7z"/>
-	</g>
-	<g>
-		<path fill="#174CCE" d="M96.6,80.2h-6.4v15.6h6.4c3,0,5.3-0.7,6.9-2.1c1.6-1.4,2.5-3.3,2.5-5.7c0-2.4-0.8-4.3-2.5-5.7
-			S99.6,80.2,96.6,80.2z"/>
-		<path fill="#174CCE" d="M115.9,68.7H75.3c-3.6,0-6.6,2.9-6.6,6.6v40.7c0,3.6,2.9,6.6,6.6,6.6h40.7c3.6,0,6.6-2.9,6.6-6.6V75.3
-			C122.5,71.6,119.6,68.7,115.9,68.7z M110.5,94.8c-1.3,2-3,3.5-5.3,4.6c-2.3,1.1-4.9,1.6-7.9,1.6h-7.2v15.2h-6V75h13.2
-			c2.9,0,5.5,0.5,7.8,1.6c2.3,1.1,4.1,2.6,5.3,4.6c1.3,2,1.9,4.3,1.9,6.8C112.4,90.6,111.7,92.9,110.5,94.8z"/>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
 </g>
 </svg>

resources/icons/tab_monitor_active.svg

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_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>
+	<path fill="#4479FB" d="M9.2,6.7l0-0.4l0.4-0.3c0-0.3-0.1-0.5-0.3-0.7L8.7,5.5L8.5,5.2l0.1-0.4C8.4,4.7,8.2,4.6,7.9,4.5L7.7,4.9
+		l-0.4,0L7,4.5C6.7,4.6,6.5,4.7,6.3,4.9l0.1,0.5L6.1,5.6L5.7,5.5C5.5,5.8,5.4,5.9,5.4,6.2l0.4,0.2l0,0.4L5.4,7.1
+		c0.1,0.2,0.2,0.5,0.3,0.7l0.4-0.1L6.5,8L6.4,8.4c0.2,0.1,0.4,0.2,0.7,0.3l0.2-0.4l0.4,0l0.3,0.4c0.2-0.1,0.5-0.1,0.7-0.3L8.6,7.9
+		l0.2-0.3l0.5,0.1C9.4,7.5,9.5,7.3,9.6,7L9.2,6.7z M7.5,7.5C7,7.5,6.6,7.1,6.6,6.7c0-0.4,0.4-0.8,0.8-0.8c0.4,0,0.8,0.4,0.8,0.8
+		C8.3,7.1,8,7.4,7.5,7.5"/>
+	<rect x="4.1" y="13.6" fill="#4479FB" width="6.9" height="1.4"/>
+	<rect x="6" y="12.1" transform="matrix(-1.836970e-16 1 -1 -1.836970e-16 20.3214 5.235)" fill="#4479FB" width="3" height="1.4"/>
+	<g>
+		<polygon fill="#4479FB" points="9.5,12.2 1,12.2 1,1 13.9,1 13.9,7.3 12.6,7.3 12.6,2.4 2.4,2.4 2.4,10.9 9.5,10.9 		"/>
+	</g>
+	<g>
+		<polygon fill="#4479FB" points="11.6,12.3 10.2,12.3 10.2,8 14.5,8 14.5,9.4 11.6,9.4 		"/>
+	</g>
+	<g>
+		<rect x="12" y="8" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -3.706 12.0514)" fill="#4479FB" width="1.4" height="5.1"/>
+	</g>
+</g>
+</svg>

resources/icons/userguide.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1687913925905" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8764" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M264.153704 952.655092 64.311213 952.655092 64.311213 224.110197l199.843514 0L264.154727 952.655092 264.153704 952.655092zM229.954811 261.241886 98.815051 261.241886l0 67.14219 131.139759 0L229.954811 261.241886 229.954811 261.241886zM326.469981 64.541969l198.266599 0 0 888.044562L326.469981 952.58653 326.469981 64.541969 326.469981 64.541969zM495.458767 98.756211 360.142895 98.756211l0 69.234851 135.314849 0L495.457744 98.756211 495.458767 98.756211zM954.857758 892.768143l-190.012611 61.911048-225.718835-692.706665 190.010565-61.911048L954.857758 892.768143 954.857758 892.768143zM708.125331 245.963924 583.437517 286.590204l20.798698 63.833841 124.685767-40.627303L708.125331 245.963924 708.125331 245.963924zM708.125331 245.963924" fill="#4479FB" p-id="8765"></path></svg>

resources/localization/ca/QIDISlicer_ca.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-05-26 13:11+0200\n"
-"PO-Revision-Date: 2023-05-17 19:36+0200\n"
+"PO-Revision-Date: 2023-07-01 15:03+0800\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: ca\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.2.2\n"
+"X-Generator: Poedit 3.3.2\n"
 
 #: src/slic3r/GUI/AboutDialog.cpp:46 src/slic3r/GUI/AboutDialog.cpp:304
 msgid "Portions copyright"
@@ -1498,23 +1498,23 @@ msgstr "Col·loca els rodaments a les ranures i segueix imprimint"
 #: src/slic3r/GUI/DoubleSlider.cpp:711 src/libslic3r/Utils.cpp:1015
 #, boost-format
 msgid "%1%d"
-msgstr ""
+msgstr "%1%d"
 
 #: src/slic3r/GUI/DoubleSlider.cpp:712 src/libslic3r/Utils.cpp:1016
 #, boost-format
 msgid "%1%h"
-msgstr ""
+msgstr "%1%h"
 
 #. TRN "m" means "minutes"
 #: src/slic3r/GUI/DoubleSlider.cpp:713 src/libslic3r/Utils.cpp:1018
 #, boost-format
 msgid "%1%m"
-msgstr ""
+msgstr "%1%m"
 
 #: src/slic3r/GUI/DoubleSlider.cpp:714 src/libslic3r/Utils.cpp:1026
 #, boost-format
 msgid "%1%s"
-msgstr ""
+msgstr "%1%s"
 
 #: src/slic3r/GUI/DoubleSlider.cpp:1448
 msgid "One layer mode"
@@ -2303,7 +2303,7 @@ msgstr "a"
 #: src/slic3r/GUI/GCodeViewer.cpp:3278
 msgctxt "Metre"
 msgid "m"
-msgstr ""
+msgstr "m"
 
 #: src/slic3r/GUI/GCodeViewer.cpp:3289
 msgid "Click to hide"
@@ -2451,11 +2451,11 @@ msgstr "Filament"
 
 #: src/slic3r/GUI/GCodeViewer.cpp:3961
 msgid "Hide Custom G-code"
-msgstr ""
+msgstr "Ocultar Codi G personalitzat"
 
 #: src/slic3r/GUI/GCodeViewer.cpp:3961
 msgid "Show Custom G-code"
-msgstr ""
+msgstr "Mostrar Codi G personalitzat"
 
 #: src/slic3r/GUI/GCodeViewer.cpp:3974
 msgid "Estimated printing times"
@@ -2614,15 +2614,15 @@ msgstr "Seq."
 
 #: src/slic3r/GUI/GLCanvas3D.cpp:1305
 msgid "SLA view"
-msgstr ""
+msgstr "Vista SLA"
 
 #: src/slic3r/GUI/GLCanvas3D.cpp:1324
 msgid "Show as processed"
-msgstr ""
+msgstr "Mostrar com a processat"
 
 #: src/slic3r/GUI/GLCanvas3D.cpp:1325
 msgid "Show as original"
-msgstr ""
+msgstr "Mostrar com a original"
 
 #: src/slic3r/GUI/GLCanvas3D.cpp:1758
 msgid "Variable layer height - Reset"
@@ -2849,7 +2849,31 @@ msgstr ""
 "S'ha detectat un objecte fora de l'àrea d'impressió.\n"
 "Resol el problema actual per continuar laminant."
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:7539
+#. TRN %3% is name of Object1, %4% is name of Object2
+#: src/slic3r/GUI/GLCanvas3D.cpp:7496
+#, boost-format
+msgid ""
+"Conflicts in G-code paths have been detected at layer %1%, z=%2$.2f mm. "
+"Please reposition the conflicting objects (%3% <-> %4%) further apart."
+msgstr ""
+"S'han detectat conflictes en les trajectòries del codi G a la capa %1%, z "
+"=%2$.2f mm. Si us plau, reposicioneu els objectes conflictius (%3% <-> %4%) "
+"més separats."
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:7526
+msgid "Jump to"
+msgstr "Anar a"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:7529
+#: src/slic3r/GUI/NotificationManager.cpp:2101
+#: src/slic3r/GUI/NotificationManager.cpp:2108
+#: src/slic3r/GUI/NotificationManager.cpp:2124
+#: src/slic3r/GUI/NotificationManager.cpp:2130
+#: src/slic3r/GUI/NotificationManager.cpp:2201
+msgid "ERROR:"
+msgstr "ERROR:"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:7606
 msgid "Selection-Add from rectangle"
 msgstr "Selecció-Afegir del rectangle"
 
@@ -2948,6 +2972,9 @@ msgid ""
 "Drag to move the cut plane\n"
 "Right-click a part to assign it to the other side"
 msgstr ""
+"Feu clic per capgirar el pla de tall\n"
+"Arrossegueu per moure el pla tallat\n"
+"Feu clic amb el botó dret a una part per assignar-la a l'altre costat"
 
 #: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:259 src/libslic3r/PrintConfig.cpp:495
 #: src/libslic3r/PrintConfig.cpp:1189 src/libslic3r/PrintConfig.cpp:2324
@@ -3836,7 +3863,7 @@ msgstr "La pintura automàtica requereix una configuració d'impressió vàlida.
 
 #: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:527
 msgid "Automatic painting requires printable object."
-msgstr ""
+msgstr "La pintura automàtica requereix un objecte imprimible."
 
 #: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:537
 msgid "Automatic painting will erase all currently painted areas."
@@ -4134,13 +4161,13 @@ msgstr "Farciment de cubs"
 #: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:340
 #: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:356
 msgid "Current"
-msgstr ""
+msgstr "Actual"
 
 #. TRN Means "original color"
 #: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:342
 #: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:356
 msgid "Original"
-msgstr ""
+msgstr "Original"
 
 #: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:404
 msgid "Paints neighboring facets that have the same color."
@@ -4606,7 +4633,13 @@ msgstr "Surt, mouré les meves dades ara"
 msgid "Start the application"
 msgstr "Inicia l'aplicació"
 
-#: src/slic3r/GUI/GUI_App.cpp:736
+#. TRN %s = type of file
+#: src/slic3r/GUI/GUI_App.cpp:609
+#, c-format, boost-format
+msgid "%s files"
+msgstr "%s fitxers"
+
+#: src/slic3r/GUI/GUI_App.cpp:772
 #, c-format, boost-format
 msgid ""
 "%s has encountered an error. It was likely caused by running out of memory. "
@@ -4627,15 +4660,15 @@ msgstr "Error fatal"
 
 #: src/slic3r/GUI/GUI_App.cpp:743
 msgid ""
-"QIDISlicer has encountered a localization error. Please report to "
+"QIDISlicer has encountered a localization error. Please report to QIDISlicer "
-"QIDISlicer team, what language was active and in which scenario this issue "
+"team, what language was active and in which scenario this issue happened. "
-"happened. Thank you.\n"
+"Thank you.\n"
 "\n"
 "The application will now terminate."
 msgstr ""
-"QIDISlicer ha trobat un error de localització. Si us plau, informa a "
+"QIDISlicer ha trobat un error de localització. Si us plau, informa a l'equip "
-"l'equip de QIDISlicer quin idioma estava actiu i en quin escenari va passar "
+"de QIDISlicer quin idioma estava actiu i en quin escenari va passar aquest "
-"aquest problema. Gràcies.\n"
+"problema. Gràcies.\n"
 "\n"
 "L'aplicació es tancarà ara."
 
@@ -4764,17 +4797,17 @@ msgid ""
 "To avoid this problem, consider disabling \"%4%\" in \"Preferences\". "
 "Otherwise, the application will most likely crash again next time."
 msgstr ""
-"QIDISlicer va crashejar la darrera vegada en intentar establir la posició "
+"QIDISlicer va crashejar la darrera vegada en intentar establir la posició de "
-"de la finestra.\n"
+"la finestra.\n"
 "Lamentem les molèsties, malauradament passa amb certes configuracions de "
 "monitor múltiple.\n"
 "El motiu més precís de l'accident: \"%1%\".\n"
 "Per obtenir més informació, consulteu el nostre rastrejador d'incidències de "
 "GitHub: \"%2%\" i \"%3%\"\n"
 "\n"
-"Per evitar aquest problema, considereu desactivar \"%4%\" a \"Preferències"
+"Per evitar aquest problema, considereu desactivar \"%4%\" a "
-"\". En cas contrari, és probable que l'aplicació es torni a crashejar la "
+"\"Preferències\". En cas contrari, és probable que l'aplicació es torni a "
-"propera vegada."
+"crashejar la propera vegada."
 
 #: src/slic3r/GUI/GUI_App.cpp:1415
 #, boost-format
@@ -5129,6 +5162,7 @@ msgstr "Actualment esteu executant l'última versió publicada %1%."
 msgid ""
 "There are no new released versions online. The latest release version is %1%."
 msgstr ""
+"No hi ha noves versions en línia. L'última versió de llançament és %1%."
 
 #: src/slic3r/GUI/GUI_App.cpp:3437
 #, boost-format
@@ -7854,8 +7888,8 @@ msgid ""
 "QIDISlicer recieved a download request from Printables.com, but it's not "
 "allowed. You can allow it"
 msgstr ""
-"QIDISlicer ha rebut una sol·licitud de descàrrega de Printables.com, però "
+"QIDISlicer ha rebut una sol·licitud de descàrrega de Printables.com, però no "
-"no està permès. Pots permetre-ho"
+"està permès. Pots permetre-ho"
 
 #: src/slic3r/GUI/NotificationManager.hpp:925
 msgid "here."
@@ -7950,14 +7984,6 @@ msgstr "Exportar el codi G."
 msgid "Export."
 msgstr "Exportar."
 
-#: src/slic3r/GUI/NotificationManager.cpp:2101
-#: src/slic3r/GUI/NotificationManager.cpp:2108
-#: src/slic3r/GUI/NotificationManager.cpp:2124
-#: src/slic3r/GUI/NotificationManager.cpp:2130
-#: src/slic3r/GUI/NotificationManager.cpp:2201
-msgid "ERROR:"
-msgstr "ERROR:"
-
 #: src/slic3r/GUI/NotificationManager.cpp:2113
 #: src/slic3r/GUI/NotificationManager.cpp:2140
 #: src/slic3r/GUI/NotificationManager.cpp:2148
@@ -8045,8 +8071,8 @@ msgstr "Potser necessiteu actualitzar la vostra targeta gràfica."
 
 #: src/slic3r/GUI/OpenGLManager.cpp:390
 msgid ""
-"As a workaround, you may run QIDISlicer with a software rendered 3D "
+"As a workaround, you may run QIDISlicer with a software rendered 3D graphics "
-"graphics by running qidi-slicer.exe with the --sw-renderer parameter."
+"by running qidi-slicer.exe with the --sw-renderer parameter."
 msgstr ""
 "Com a solució, podeu executar QIDISlicer amb gràfics 3D renderitzats per "
 "programari executant qidi-slicer.exe amb el paràmetre --sw-renderer."
@@ -8157,7 +8183,16 @@ msgstr ""
 "Per utilitzar un fitxer CA personalitzat, importa el teu fitxer CA al "
 "Magatzem de Certificats/Clauer."
 
-#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:705
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:667
+msgid "Unexpected character"
+msgstr "Caracter inesperat"
+
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:668
+#: src/slic3r/GUI/SavePresetDialog.cpp:169
+msgid "The following characters are not allowed in the name"
+msgstr "No es permeten els següents caràcters al nom"
+
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:723
 msgid "You have to enter a printer name."
 msgstr "Heu d'introduir un nom d'impressora."
 
@@ -8625,7 +8660,13 @@ msgstr ""
 msgid "Enable supports for enforcers only"
 msgstr "Habilitar suports només per als reforçadors"
 
-#: src/slic3r/GUI/Plater.cpp:3362 src/slic3r/GUI/Plater.cpp:4258
+#: src/slic3r/GUI/Plater.cpp:3229
+msgid "Bed temperatures for the used filaments differ significantly."
+msgstr ""
+"Les temperatures del llit per als filaments utilitzats difereixen "
+"significativament."
+
+#: src/slic3r/GUI/Plater.cpp:3367 src/slic3r/GUI/Plater.cpp:4294
 msgid "Invalid data"
 msgstr "Les dades no són vàlides"
 
@@ -8686,7 +8727,27 @@ msgstr "S'ha produït un error durant la recàrrega"
 msgid "Reload all from disk"
 msgstr "Torna a carregar-ho tot des del disc"
 
-#: src/slic3r/GUI/Plater.cpp:4211
+#: src/slic3r/GUI/Plater.cpp:4103 src/slic3r/GUI/Plater.cpp:4109
+msgid "You are using template filament preset."
+msgid_plural "You are using template filament presets."
+msgstr[0] "Esteu utilitzant plantilla de filament predefinit."
+msgstr[1] "Esteu utilitzant plantilles de filament predefinits."
+
+#: src/slic3r/GUI/Plater.cpp:4104 src/slic3r/GUI/Plater.cpp:4110
+msgid ""
+"Please note that template presets are not customized for specific printer "
+"and should only be used as a starting point for creating your own user "
+"presets."
+msgstr ""
+"Tingueu en compte que els valors predefinits de plantilles no es "
+"personalitzen per a impressores específiques i només s'han d'utilitzar com a "
+"punt de partida per crear els vostres propis valors predefinits d'usuari."
+
+#: src/slic3r/GUI/Plater.cpp:4106
+msgid "More info at"
+msgstr "Més informació a"
+
+#: src/slic3r/GUI/Plater.cpp:4247
 msgid "There are active warnings concerning sliced models:"
 msgstr "Hi ha advertiments actius sobre els models laminats:"
 
@@ -8940,7 +9001,11 @@ msgstr ""
 msgid "Save project"
 msgstr "Desar projecte"
 
-#: src/slic3r/GUI/Plater.cpp:6826
+#: src/slic3r/GUI/Plater.cpp:6681
+msgid "Unable to save file"
+msgstr "No es pot desar el fitxer"
+
+#: src/slic3r/GUI/Plater.cpp:6875
 msgid "Is the printer ready? Is the print sheet in place, empty and clean?"
 msgstr ""
 "La impressora està preparada? El full d'impressió està col·locat, buit i net?"
@@ -9126,8 +9191,7 @@ msgid ""
 "instead."
 msgstr ""
 "Si està habilitat, en iniciar QIDISlicer i ja s'està executant una altra "
-"instància del mateix QIDISlicer, aquesta instància es reactivarà al seu "
+"instància del mateix QIDISlicer, aquesta instància es reactivarà al seu lloc."
-"lloc."
 
 #: src/slic3r/GUI/Preferences.cpp:332
 msgid ""
@@ -9194,8 +9258,8 @@ msgid ""
 "If enabled, sets QIDISlicer G-code Viewer as default application to open ."
 "gcode files."
 msgstr ""
-"Si està habilitat, estableix el Visor de CodiG de QIDISlicer com a "
+"Si està habilitat, estableix el Visor de CodiG de QIDISlicer com a aplicació "
-"aplicació predeterminada per obrir fitxers .gcode."
+"predeterminada per obrir fitxers .gcode."
 
 #: src/slic3r/GUI/Preferences.cpp:367
 msgid "Use Retina resolution for the 3D scene"
@@ -9569,7 +9633,11 @@ msgstr "Edita el predefinit"
 msgid "Change extruder color"
 msgstr "Canvia el color de l'extrusora"
 
-#: src/slic3r/GUI/PresetComboBoxes.cpp:767 src/slic3r/GUI/Tab.cpp:3503
+#: src/slic3r/GUI/PresetComboBoxes.cpp:787
+msgid "Show/Hide template presets"
+msgstr "Mostrar/Amagar predefinicions de plantilles"
+
+#: src/slic3r/GUI/PresetComboBoxes.cpp:795 src/slic3r/GUI/Tab.cpp:3520
 msgid "Edit physical printer"
 msgstr "Edita la impressora física"
 
@@ -9632,8 +9700,8 @@ msgid ""
 "If estimated layer time is greater, but still below ~%1%s, fan will run at "
 "%2%%%"
 msgstr ""
-"Si el temps de capa estimat és més gran, però continua sent inferior a ~"
+"Si el temps de capa estimat és més gran, però continua sent inferior a "
-"%1%s, el ventilador funcionarà al %2%%%"
+"~%1%s, el ventilador funcionarà al %2%%%"
 
 #: src/slic3r/GUI/PresetHints.cpp:55
 #, boost-format
@@ -9936,10 +10004,6 @@ msgstr "Deseu la configuració del material com a"
 msgid "Save printer settings as"
 msgstr "Deseu la configuració de la impressora com a"
 
-#: src/slic3r/GUI/SavePresetDialog.cpp:169
-msgid "The following characters are not allowed in the name"
-msgstr "No es permeten els següents caràcters al nom"
-
 #: src/slic3r/GUI/SavePresetDialog.cpp:176
 msgid "The following suffix is not allowed in the name"
 msgstr "El sufix següent no està permès al nom"
@@ -10634,12 +10698,13 @@ msgstr ""
 "Nota: Tots els paràmetres d'aquest grup s'han desplaçat a la configuració de "
 "la impressora física (vegeu el registre de canvis).\n"
 "\n"
-"Es crea un nou perfil d'impressora física fent clic a la icona \"engranatge"
+"Es crea un nou perfil d'impressora física fent clic a la icona "
-"\" a la dreta del quadre combinat de perfils d'impressora, seleccionant "
+"\"engranatge\" a la dreta del quadre combinat de perfils d'impressora, "
-"l'element \"Afegeix impressora física\" al quadre combinat d'impressora. "
+"seleccionant l'element \"Afegeix impressora física\" al quadre combinat "
-"L'editor de perfil d'impressora física també s'obre en fer clic a la icona "
+"d'impressora. L'editor de perfil d'impressora física també s'obre en fer "
-"\"engranatge\" a la pestanya Configuració d'impressora. Els perfils de la "
+"clic a la icona \"engranatge\" a la pestanya Configuració d'impressora. Els "
-"impressora física s'emmagatzemen al directori QIDISlicer/physical_printer."
+"perfils de la impressora física s'emmagatzemen al directori QIDISlicer/"
+"physical_printer."
 
 #: src/slic3r/GUI/Tab.cpp:2366
 msgid ""
@@ -11181,7 +11246,7 @@ msgstr "Connexió de les varetes de suport i unions"
 
 #: src/slic3r/GUI/Tab.cpp:5157
 msgid "Branching"
-msgstr ""
+msgstr "Ramificació"
 
 #: src/slic3r/GUI/Tab.cpp:5159
 msgid "Automatic generation"
@@ -12099,6 +12164,8 @@ msgid ""
 "Couldn't locate index file for vendor %1% when performing updates. The "
 "profile will not be installed."
 msgstr ""
+"No s'ha pogut localitzar el fitxer d'índex per als %1% del proveïdor en "
+"realitzar actualitzacions. El perfil no s'instal·larà."
 
 #: src/slic3r/Utils/PresetUpdater.cpp:1344
 #, boost-format
@@ -12106,6 +12173,8 @@ msgid ""
 "Couldn't load index file for vendor %1% when performing updates. The profile "
 "will not be installed. Reason: Corrupted index file %2%."
 msgstr ""
+"No s'ha pogut carregar el fitxer d'índex per al proveïdor %1% en realitzar "
+"actualitzacions. El perfil no s'instal·larà. Motiu: fitxer índex malmès %2%."
 
 #: src/slic3r/Utils/PresetUpdater.cpp:1382
 #, boost-format
@@ -12113,6 +12182,9 @@ msgid ""
 "Couldn't open profile file for vendor %1% when performing updates. The "
 "profile will not be installed. This installation might be corrupted."
 msgstr ""
+"No s'ha pogut obrir el fitxer de perfil per al proveïdor %1% en realitzar "
+"actualitzacions. El perfil no s'instal·larà. Aquesta instal·lació pot estar "
+"corrompuda."
 
 #: src/slic3r/Utils/Http.cpp:73
 msgid ""
@@ -12200,8 +12272,7 @@ msgstr "No s'ha pogut prendre una instantània de configuració."
 msgid ""
 "QIDISlicer has encountered an error while taking a configuration snapshot."
 msgstr ""
-"El QIDISlicer ha trobat un error mentre feia una instantània de "
+"El QIDISlicer ha trobat un error mentre feia una instantània de configuració."
-"configuració."
 
 #: src/slic3r/Config/Snapshot.cpp:599
 msgid "QIDISlicer error"
@@ -12276,19 +12347,19 @@ msgstr ""
 
 #: src/libslic3r/ExtrusionRole.cpp:38 src/libslic3r/ExtrusionRole.cpp:59
 msgid "Perimeter"
-msgstr ""
+msgstr "Perímetre"
 
 #: src/libslic3r/ExtrusionRole.cpp:39 src/libslic3r/ExtrusionRole.cpp:61
 msgid "External perimeter"
-msgstr ""
+msgstr "Perímetre extern"
 
 #: src/libslic3r/ExtrusionRole.cpp:40 src/libslic3r/ExtrusionRole.cpp:63
 msgid "Overhang perimeter"
-msgstr ""
+msgstr "Perímetre de voladís"
 
 #: src/libslic3r/ExtrusionRole.cpp:41 src/libslic3r/ExtrusionRole.cpp:65
 msgid "Internal infill"
-msgstr ""
+msgstr "Farciment intern"
 
 #: src/libslic3r/ExtrusionRole.cpp:42 src/libslic3r/ExtrusionRole.cpp:67
 #: src/libslic3r/PrintConfig.cpp:1452 src/libslic3r/PrintConfig.cpp:2432
@@ -12304,7 +12375,7 @@ msgstr "Farciment sòlid superior"
 
 #: src/libslic3r/ExtrusionRole.cpp:45 src/libslic3r/ExtrusionRole.cpp:73
 msgid "Bridge infill"
-msgstr ""
+msgstr "Farciment del pont"
 
 #: src/libslic3r/ExtrusionRole.cpp:46 src/libslic3r/ExtrusionRole.cpp:75
 #: src/libslic3r/PrintConfig.cpp:1380
@@ -12313,7 +12384,7 @@ msgstr "Farciment del buit"
 
 #: src/libslic3r/ExtrusionRole.cpp:47 src/libslic3r/ExtrusionRole.cpp:77
 msgid "Skirt/Brim"
-msgstr ""
+msgstr "Faldilla/Bassa"
 
 #: src/libslic3r/ExtrusionRole.cpp:49 src/libslic3r/ExtrusionRole.cpp:81
 #: src/libslic3r/PrintConfig.cpp:2781
@@ -12570,7 +12641,7 @@ msgstr ""
 #: src/libslic3r/Print.cpp:525
 #, boost-format
 msgid "The object %1% exceeds the maximum build volume height."
-msgstr ""
+msgstr "L'objecte %1% supera l'alçada màxima de volum de construcció."
 
 #: src/libslic3r/Print.cpp:526
 #, boost-format
@@ -12578,12 +12649,16 @@ msgid ""
 "While the object %1% itself fits the build volume, its last layer exceeds "
 "the maximum build volume height."
 msgstr ""
+"Tot i que l'objecte %1% s'adapta al volum de construcció, la seva última "
+"capa supera l'alçada màxima del volum de construcció."
 
 #: src/libslic3r/Print.cpp:527
 msgid ""
 "You might want to reduce the size of your model or change current print "
 "settings and retry."
 msgstr ""
+"És possible que vulgueu reduir la mida del model o canviar la configuració "
+"d'impressió actual i tornar-ho a provar."
 
 #: src/libslic3r/Print.cpp:543
 msgid "Variable layer height is not supported with Organic supports."
@@ -14804,8 +14879,8 @@ msgid ""
 msgstr ""
 "Emetre M73 P[percentatge imprès] R[temps restant en minuts] en intervals d'1 "
 "minut al codi G per permetre que el firmware mostri el temps restant precís. "
-"A partir d'ara només el firmware QIDI i3 MK3 reconeix M73. També el "
+"A partir d'ara només el firmware QIDI i3 MK3 reconeix M73. També el firmware "
-"firmware i3 MK3 és compatible amb M73 Qxx Sxx per a la manera silenciosa."
+"i3 MK3 és compatible amb M73 Qxx Sxx per a la manera silenciosa."
 
 #: src/libslic3r/PrintConfig.cpp:1693
 msgid "Supports stealth mode"
@@ -15167,11 +15242,13 @@ 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]."
+"[input_filename], [input_filename_base], [default_output_extension]."
 msgstr ""
 "Podeu utilitzar totes les opcions de configuració com a variables dins "
-"d'aquesta mostra. Per exemple, [layer_height], [fill_density] etc. "
+"d'aquesta plantilla. Per exemple: [layer_height], [fill_density], etc. També "
-"[input_filename_base]."
+"podeu utilitzar [marca de temps], [any], [mes], [dia], [hora], [minut], "
+"[segon], [versió], [input_filename], [input_filename_base], "
+"[default_output_extension]."
 
 #: src/libslic3r/PrintConfig.cpp:1992
 msgid "Detect bridging perimeters"
@@ -16410,7 +16487,7 @@ msgstr ""
 
 #: src/libslic3r/PrintConfig.cpp:2943
 msgid "Branch Diameter with double walls"
-msgstr ""
+msgstr "Diàmetre de branca amb parets dobles"
 
 #. TRN PrintSettings: "Organic supports" > "Branch Diameter"
 #: src/libslic3r/PrintConfig.cpp:2946
@@ -16419,6 +16496,9 @@ msgid ""
 "printed with double walls for stability. Set this value to zero for no "
 "double walls."
 msgstr ""
+"Les branques amb una superfície més gran que l'àrea d'un cercle d'aquest "
+"diàmetre s'imprimiran amb parets dobles per a l'estabilitat. Establiu aquest "
+"valor a zero per a cap paret doble."
 
 #. TRN PrintSettings: #lmFIXME
 #: src/libslic3r/PrintConfig.cpp:2959
@@ -16520,8 +16600,8 @@ msgstr ""
 "utilitzar variables de marcador de posició per a tots els paràmetres de "
 "QIDISlicer, així com {toolchange_z}, {previous_extruder} i {next_extruder}. "
 "Quan s'inclou una ordre de canvi d'eina que canvia a l'extrusor correcte "
-"(com T{next_extruder}), QIDISlicer no emetrà cap altra ordre d'aquest "
+"(com T{next_extruder}), QIDISlicer no emetrà cap altra ordre d'aquest tipus. "
-"tipus. Per tant, és possible programar un comportament personalitzat abans i "
+"Per tant, és possible programar un comportament personalitzat abans i "
 "després del canvi d'eina."
 
 #: src/libslic3r/PrintConfig.cpp:3035
@@ -16801,6 +16881,18 @@ msgid "Maximal distance between supports on sparse infill sections."
 msgstr "Distància màxima entre suports a les seccions amb farciment lleuger."
 
 #: src/libslic3r/PrintConfig.cpp:3239
+msgid "Wipe tower extruder"
+msgstr "Extrusor de la Torre de Neteja"
+
+#: src/libslic3r/PrintConfig.cpp:3241
+msgid ""
+"The extruder to use when printing perimeter of the wipe tower. Set to 0 to "
+"use the one that is available (non-soluble would be preferred)."
+msgstr ""
+"L'extrusora a usar per imprimir el perímetre de la Torre de Neteja. Establiu "
+"0 per utilitzar el que estigui disponible (seria preferible no soluble)."
+
+#: src/libslic3r/PrintConfig.cpp:3260
 msgid "XY Size Compensation"
 msgstr "Compensació de mida XY"
 
@@ -17930,9 +18022,9 @@ msgstr ""
 
 #: src/libslic3r/PrintConfig.cpp:4836
 msgid ""
-"This version of QIDISlicer may not understand configurations produced by "
+"This version of QIDISlicer may not understand configurations produced by the "
-"the newest QIDISlicer versions. For example, newer QIDISlicer may extend "
+"newest QIDISlicer versions. For example, newer QIDISlicer may extend the "
-"the list of supported firmware flavors. One may decide to bail out or to "
+"list of supported firmware flavors. One may decide to bail out or to "
 "substitute an unknown value with a default silently or verbosely."
 msgstr ""
 "Aquesta versió de QIDISlicer pot no entendre les configuracions produïdes "
@@ -17992,8 +18084,8 @@ msgstr "Mode d'instància única"
 #: src/libslic3r/PrintConfig.cpp:4857
 msgid ""
 "If enabled, the command line arguments are sent to an existing instance of "
-"GUI QIDISlicer, or an existing QIDISlicer window is activated. Overrides "
+"GUI QIDISlicer, or an existing QIDISlicer window is activated. Overrides the "
-"the \"single_instance\" configuration value from application preferences."
+"\"single_instance\" configuration value from application preferences."
 msgstr ""
 "Si s'habilita, els arguments de la línia de comandes s'envien a una "
 "instància existent de la interfície gràfica d'usuari qidiSlicer o s'activa "
@@ -18161,8 +18253,9 @@ msgstr ""
 #: resources/data/hints.ini: [hint:Hiding sidebar]
 msgid ""
 "Hiding sidebar\n"
-"Did you know that you can hide the right sidebar using the shortcut <b>Shift"
+"Did you know that you can hide the right sidebar using the shortcut "
-"+Tab</b>? You can also enable the icon for this from the<a>Preferences</a>."
+"<b>Shift+Tab</b>? You can also enable the icon for this from "
+"the<a>Preferences</a>."
 msgstr ""
 "Amagar la barra lateral\n"
 "Sabies que pots amagar la barra lateral dreta amb la drecera <b>Majús+Tab</"
@@ -18279,8 +18372,8 @@ msgid ""
 msgstr ""
 "Funcionalitat de cerca\n"
 "Sabíeu que podeu utilitzar l'eina <a>Cerca</a> per trobar ràpidament un "
-"paràmetre específic de QIDISlicer? O utilitzar la coneguda drecera <b>Ctrl"
+"paràmetre específic de QIDISlicer? O utilitzar la coneguda drecera "
-"+F</b>."
+"<b>Ctrl+F</b>."
 
 #: resources/data/hints.ini: [hint:Box selection]
 msgid ""
@@ -22719,10 +22812,6 @@ msgstr "Postal japonesa, 100 x 148 mm"
 msgid "Japanese Postcard Rotated 148 x 100 mm"
 msgstr "Postal japonesa girada, 148 x 100 mm"
 
-#: ../src/common/stockitem.cpp:169
-msgid "Jump to"
-msgstr "Vés a"
-
 #: ../src/common/stockitem.cpp:171
 msgid "Justified"
 msgstr "Justificat"

resources/localization/cs/QIDISlicer_cs.po

@@ -1,13 +1,18 @@
 msgid ""
 msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
 "Language: cs\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"
+"Plural-Forms: nplurals=4; plural=(n == 1) ? 0 : ((n%10 >= 2 && n%10 <=4 && "
-"%100 < 12 || n%100 > 14)) ? 1 : ((n%10 == 0 || n%10 == 1 || (n%10 >= 5 && n"
+"(n%100 < 12 || n%100 > 14)) ? 1 : ((n%10 == 0 || n%10 == 1 || (n%10 >= 5 && "
-"%10 <=9)) || (n%100 >= 12 && n%100 <= 14)) ? 2 : 3);\n"
+"n%10 <=9)) || (n%100 >= 12 && n%100 <= 14)) ? 2 : 3);\n"
-"X-Generator: QIDIlator\n"
+"X-Generator: Poedit 3.3.2\n"
 
 #: src/libslic3r/PrintConfig.cpp:503 src/libslic3r/PrintConfig.cpp:594
 #: src/libslic3r/PrintConfig.cpp:603 src/libslic3r/PrintConfig.cpp:612
@@ -72,7 +77,6 @@ msgstr[0] "%1$d spojka je mimo obrys řezu"
 msgstr[1] "%1$d spojky jsou mimo obrys řezu"
 msgstr[2] "%1$d spojky jsou mimo obrys řezu"
 msgstr[3] "%1$d spojek je mimo obrys řezu"
-msgstr[4] "%1$d spojek je mimo obrys řezu"
 
 #: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2200
 #, c-format, boost-format
@@ -82,7 +86,6 @@ msgstr[0] "%1$d spojka je mimo objekt"
 msgstr[1] "%1$d spojky jsou mimo objekt"
 msgstr[2] "%1$d spojek je mimo objekt"
 msgstr[3] "%1$d spojek je mimo objekt"
-msgstr[4] "%1$d spojek je mimo objekt"
 
 #: src/slic3r/GUI/GUI_ObjectList.cpp:459
 #, c-format, boost-format
@@ -128,7 +131,6 @@ msgstr[0] "%1$d objekt byl načten jako součást rozříznutého objektu."
 msgstr[1] "%1$d objekty byly načteny jako součást rozříznutého objektu."
 msgstr[2] "%1$d objekty byly načteny jako součást rozříznutého objektu."
 msgstr[3] "%1$d objektů bylo načteno jako součást rozříznutého objektu."
-msgstr[4] "%1$d objektů bylo načteno jako součást rozříznutého objektu."
 
 #: src/slic3r/GUI/NotificationManager.cpp:1649
 #, c-format, boost-format
@@ -1355,8 +1357,8 @@ msgstr ""
 
 #: src/slic3r/GUI/OpenGLManager.cpp:390
 msgid ""
-"As a workaround, you may run QIDISlicer with a software rendered 3D "
+"As a workaround, you may run QIDISlicer with a software rendered 3D graphics "
-"graphics by running qidi-slicer.exe with the --sw-renderer parameter."
+"by running qidi-slicer.exe with the --sw-renderer parameter."
 msgstr ""
 "QIDISlicer můžete spustit se softwarovým vykreslováním 3D grafiky pomocí "
 "spuštění programu qidi-slicer.exe s parametrem --sw-renderer."
@@ -1612,7 +1614,11 @@ 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/Tab.cpp:2569 src/libslic3r/GCode.cpp:768
+#: src/slic3r/GUI/Plater.cpp:3229
+msgid "Bed temperatures for the used filaments differ significantly."
+msgstr "Teplota podložky se u použitých filamentů výrazně liší."
+
+#: src/slic3r/GUI/Tab.cpp:2586 src/libslic3r/GCode.cpp:768
 #: src/libslic3r/PrintConfig.cpp:442
 msgid "Before layer change G-code"
 msgstr "G-code před změnou vrstvy"
@@ -1717,9 +1723,9 @@ msgid ""
 "also box-deselect objects with <b>Alt+Mouse drag</b>."
 msgstr ""
 "Výběr rámečkem\n"
-"Věděli jste, že můžete provést výběr rámečkem současným stiskem Shift"
+"Věděli jste, že můžete provést výběr rámečkem současným stiskem "
-"+tažením myší? Výběr objektů v rámečku můžete také zrušit pomocí <b>Alt"
+"Shift+tažením myší? Výběr objektů v rámečku můžete také zrušit pomocí "
-"+tažení myší</b>."
+"<b>Alt+tažení myší</b>."
 
 #: src/libslic3r/PrintConfig.cpp:2969
 msgid "Branch Density"
@@ -2671,6 +2677,16 @@ msgstr "Potvrzení"
 msgid "Confirm connectors"
 msgstr "Potvrzení spojek"
 
+#. TRN %3% is name of Object1, %4% is name of Object2
+#: src/slic3r/GUI/GLCanvas3D.cpp:7496
+#, boost-format
+msgid ""
+"Conflicts in G-code paths have been detected at layer %1%, z=%2$.2f mm. "
+"Please reposition the conflicting objects (%3% <-> %4%) further apart."
+msgstr ""
+"Byly zjištěny konflikty v cestách G-codu ve vrstvě %1%, z=%2$.2f mm. "
+"Přemístěte prosím konfliktní objekty (%3% <-> %4%) dále od sebe."
+
 #: src/libslic3r/PrintConfig.cpp:1492
 msgid ""
 "Connect an infill line to an internal perimeter with a short segment of an "
@@ -6299,8 +6315,9 @@ msgstr "Skrýt pravítko"
 #: resources/data/hints.ini: [hint:Hiding sidebar]
 msgid ""
 "Hiding sidebar\n"
-"Did you know that you can hide the right sidebar using the shortcut <b>Shift"
+"Did you know that you can hide the right sidebar using the shortcut "
-"+Tab</b>? You can also enable the icon for this from the<a>Preferences</a>."
+"<b>Shift+Tab</b>? You can also enable the icon for this from "
+"the<a>Preferences</a>."
 msgstr ""
 "Skrytí postranního panelu\n"
 "Věděli jste, že pravý postranní panel můžete skrýt pomocí klávesové zkratky "
@@ -6601,8 +6618,8 @@ msgstr ""
 #: src/slic3r/GUI/Preferences.cpp:578
 msgid "If enabled, QIDISlicer will be allowed to download from Printables.com"
 msgstr ""
-"Pokud je tato možnost povolena, bude QIDISlicer moci stahovat soubory z "
+"Pokud je tato možnost povolena, bude QIDISlicer moci stahovat soubory z webu "
-"webu Printables.com."
+"Printables.com."
 
 #: src/slic3r/GUI/Preferences.cpp:383
 msgid "If enabled, QIDISlicer will be open at the position it was closed"
@@ -6733,8 +6750,8 @@ msgstr ""
 #: src/libslic3r/PrintConfig.cpp:4857
 msgid ""
 "If enabled, the command line arguments are sent to an existing instance of "
-"GUI QIDISlicer, or an existing QIDISlicer window is activated. Overrides "
+"GUI QIDISlicer, or an existing QIDISlicer window is activated. Overrides the "
-"the \"single_instance\" configuration value from application preferences."
+"\"single_instance\" configuration value from application preferences."
 msgstr ""
 "Pokud je povoleno, argumenty příkazového řádku se odešlou do existující "
 "instance grafického uživatelského rozhraní QIDISlicer,u nebo se aktivuje "
@@ -6933,8 +6950,8 @@ msgid ""
 "same QIDISlicer is already running, that instance will be reactivated "
 "instead."
 msgstr ""
-"Pokud je tato možnost povolena,  tak v případě již běžícího QIDISliceru "
+"Pokud je tato možnost povolena,  tak v případě již běžícího QIDISliceru bude "
-"bude při pokusu spuštění dalšího QIDISliceru aktivována právě tato instance."
+"při pokusu spuštění dalšího QIDISliceru aktivována právě tato instance."
 
 #: src/slic3r/GUI/SendSystemInfoDialog.cpp:591
 msgid ""
@@ -7554,6 +7571,10 @@ msgstr "Rozkmit (Jitter)"
 msgid "Join"
 msgstr "Přidat"
 
+#: src/slic3r/GUI/GLCanvas3D.cpp:7526 ../src/common/stockitem.cpp:169
+msgid "Jump to"
+msgstr "Přejít na"
+
 #: src/slic3r/GUI/DoubleSlider.cpp:2094 src/slic3r/GUI/DoubleSlider.cpp:2324
 msgid "Jump to height"
 msgstr "Přechod do výšky"
@@ -7681,6 +7702,7 @@ msgstr "Nastavení pro vrstvy v rozsahu"
 #: src/libslic3r/PrintConfig.cpp:2173 src/libslic3r/PrintConfig.cpp:2352
 #: src/libslic3r/PrintConfig.cpp:2426 src/libslic3r/PrintConfig.cpp:2685
 #: src/libslic3r/PrintConfig.cpp:2732 src/libslic3r/PrintConfig.cpp:2748
+#: src/libslic3r/PrintConfig.cpp:3254
 msgid "layers"
 msgstr "vrstva(y)"
 
@@ -8953,6 +8975,10 @@ msgstr "Monotónní extruze"
 msgid "More"
 msgstr "Více"
 
+#: src/slic3r/GUI/Plater.cpp:4106
+msgid "More info at"
+msgstr "Více informací na"
+
 #: src/slic3r/GUI/GUI.cpp:317
 msgid ""
 "Most likely the configuration was produced by a newer version of QIDISlicer "
@@ -9424,9 +9450,6 @@ msgstr[2] ""
 "tiskárnách."
 msgstr[3] ""
 "Upozorňujeme, že vybrané přednastavení bude přejmenováno i na této tiskárně."
-msgstr[4] ""
-"Upozorňujeme, že vybrané přednastavení bude přejmenováno i na těchto "
-"tiskárnách."
 
 #: src/slic3r/GUI/Tab.cpp:4151
 msgid ""
@@ -10727,6 +10750,16 @@ msgstr "Před změnou režimu zkontrolujte seznam objektů."
 msgid "Please check your object list before preset changing."
 msgstr "Před změnou nastavení zkontrolujte prosím seznam objektů."
 
+#: src/slic3r/GUI/Plater.cpp:4104 src/slic3r/GUI/Plater.cpp:4110
+msgid ""
+"Please note that template presets are not customized for specific printer "
+"and should only be used as a starting point for creating your own user "
+"presets."
+msgstr ""
+"Upozorňujeme, že šablony přednastavení nejsou přizpůsobeny konkrétní "
+"tiskárně a měly by sloužit pouze jako výchozí bod pro vytvoření vlastních "
+"uživatelských přednastavení."
+
 #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:85
 msgid ""
 "Please save your project and restart QIDISlicer. We would be glad if you "
@@ -11311,14 +11344,14 @@ msgstr "QIDISlicer narazil na fatální chybu: \"%1%\""
 
 #: src/slic3r/GUI/GUI_App.cpp:743
 msgid ""
-"QIDISlicer has encountered a localization error. Please report to "
+"QIDISlicer has encountered a localization error. Please report to QIDISlicer "
-"QIDISlicer team, what language was active and in which scenario this issue "
+"team, what language was active and in which scenario this issue happened. "
-"happened. Thank you.\n"
+"Thank you.\n"
 "\n"
 "The application will now terminate."
 msgstr ""
-"V aplikaci QIDISlicer došlo k chybě v lokalizaci. Nahlaste QIDISlicer "
+"V aplikaci QIDISlicer došlo k chybě v lokalizaci. Nahlaste QIDISlicer týmu, "
-"týmu, jaký jazyk byl aktivní a ve kterém scénáři k tomuto problému došlo. "
+"jaký jazyk byl aktivní a ve kterém scénáři k tomuto problému došlo. "
 "Děkujeme.\n"
 "\n"
 "Aplikace bude nyní ukončena."
@@ -11333,8 +11366,7 @@ msgid ""
 "QIDISlicer is based on Slic3r by Alessandro Ranellucci and the RepRap "
 "community."
 msgstr ""
-"QIDISlicer je založen na Slic3r od Alessandra Ranellucciho a RepRap "
+"QIDISlicer je založen na Slic3r od Alessandra Ranellucciho a RepRap komunity."
-"komunity."
 
 #: src/slic3r/GUI/MainFrame.cpp:234
 msgid "QIDISlicer is closing"
@@ -13274,6 +13306,12 @@ msgstr "Nastavit horní ukazatel jako aktivní"
 msgid "%s Family"
 msgstr "%s Rodina"
 
+#. TRN %s = type of file
+#: src/slic3r/GUI/GUI_App.cpp:609
+#, c-format, boost-format
+msgid "%s files"
+msgstr "%s soubory"
+
 #: src/slic3r/GUI/ConfigManipulation.cpp:167
 msgid "Shall I adjust those settings for supports?"
 msgstr "Mám upravit tato nastavení pro podpěry?"
@@ -13444,6 +13482,10 @@ msgstr "Zobrazit/skrýt legendu"
 msgid "Show/Hide object/instance labels"
 msgstr "Zobrazit/skrýt popisky objektů/instancí"
 
+#: src/slic3r/GUI/PresetComboBoxes.cpp:787
+msgid "Show/Hide template presets"
+msgstr "Zobrazit/skrýt šablony přednastavení"
+
 #: src/slic3r/GUI/Preferences.cpp:304
 msgid "Show incompatible print and filament presets"
 msgstr "Zobrazit nekompatibilní přednastavení tisku a filamentu"
@@ -15084,20 +15126,16 @@ msgid_plural ""
 "the dimensions of these objects?"
 msgstr[0] ""
 "Zdá se, že rozměry objektu ze souboru %s jsou definovány v palcích.\n"
-"Interní jednotkou QIDISliceru je milimetr. Chcete přepočítat rozměry "
+"Interní jednotkou QIDISliceru je milimetr. Chcete přepočítat rozměry objektu?"
-"objektu?"
 msgstr[1] ""
 "Zdá se, že rozměry objektů ze souboru %s jsou definovány v palcích.\n"
-"Interní jednotkou QIDISliceru je milimetr. Chcete přepočítat rozměry "
+"Interní jednotkou QIDISliceru je milimetr. Chcete přepočítat rozměry objektů?"
-"objektů?"
 msgstr[2] ""
 "Zdá se, že rozměry objektů ze souboru %s jsou definovány v palcích.\n"
-"Interní jednotkou QIDISliceru je milimetr. Chcete přepočítat rozměry "
+"Interní jednotkou QIDISliceru je milimetr. Chcete přepočítat rozměry objektů?"
-"objektů?"
 msgstr[3] ""
 "Zdá se, že rozměry objektů ze souboru %s jsou definovány v palcích.\n"
-"Interní jednotkou QIDISliceru je milimetr. Chcete přepočítat rozměry "
+"Interní jednotkou QIDISliceru je milimetr. Chcete přepočítat rozměry objektů?"
-"objektů?"
 
 #: src/slic3r/GUI/Plater.cpp:2611
 #, c-format, boost-format
@@ -15111,20 +15149,16 @@ msgid_plural ""
 "the dimensions of these objects?"
 msgstr[0] ""
 "Zdá se, že rozměry objektu ze souboru %s jsou definovány v metrech.\n"
-"Interní jednotkou QIDISliceru je milimetr. Chcete přepočítat rozměry "
+"Interní jednotkou QIDISliceru je milimetr. Chcete přepočítat rozměry objektu?"
-"objektu?"
 msgstr[1] ""
 "Zdá se, že rozměry objektů ze souboru %s jsou definovány v metrech.\n"
-"Interní jednotkou QIDISliceru je milimetr. Chcete přepočítat rozměry "
+"Interní jednotkou QIDISliceru je milimetr. Chcete přepočítat rozměry objektů?"
-"objektů?"
 msgstr[2] ""
 "Zdá se, že rozměry objektů ze souboru %s jsou definovány v metrech.\n"
-"Interní jednotkou QIDISliceru je milimetr. Chcete přepočítat rozměry "
+"Interní jednotkou QIDISliceru je milimetr. Chcete přepočítat rozměry objektů?"
-"objektů?"
 msgstr[3] ""
 "Zdá se, že rozměry objektů ze souboru %s jsou definovány v metrech.\n"
-"Interní jednotkou QIDISliceru je milimetr. Chcete přepočítat rozměry "
+"Interní jednotkou QIDISliceru je milimetr. Chcete přepočítat rozměry objektů?"
-"objektů?"
 
 #: src/slic3r/GUI/Downloader.cpp:181
 msgid "The download has failed"
@@ -15154,6 +15188,15 @@ msgstr ""
 msgid "The extruder to use when printing infill."
 msgstr "Extruder který se použije pro tisk výplní."
 
+#: src/libslic3r/PrintConfig.cpp:3241
+msgid ""
+"The extruder to use when printing perimeter of the wipe tower. Set to 0 to "
+"use the one that is available (non-soluble would be preferred)."
+msgstr ""
+"Extruder, který se použije při tisku obvodu čistící věže. Nastavte na 0, "
+"abyste použili ten, který je k dispozici (přednostně s nerozpustným "
+"filamentem)."
+
 #: src/libslic3r/PrintConfig.cpp:2036
 msgid ""
 "The extruder to use when printing perimeters and brim. First extruder is 1."
@@ -15550,9 +15593,6 @@ msgstr[2] ""
 msgstr[3] ""
 "Fyzické tiskárny níže je založeny na přednastavení, které se chystáte "
 "přejmenovat."
-msgstr[4] ""
-"Fyzických tiskáren níže je založeno na přednastavení, které se chystáte "
-"přejmenovat."
 
 #: src/libslic3r/PrintConfig.cpp:641
 msgid ""
@@ -16690,15 +16730,15 @@ msgstr ""
 
 #: src/libslic3r/PrintConfig.cpp:4836
 msgid ""
-"This version of QIDISlicer may not understand configurations produced by "
+"This version of QIDISlicer may not understand configurations produced by the "
-"the newest QIDISlicer versions. For example, newer QIDISlicer may extend "
+"newest QIDISlicer versions. For example, newer QIDISlicer may extend the "
-"the list of supported firmware flavors. One may decide to bail out or to "
+"list of supported firmware flavors. One may decide to bail out or to "
 "substitute an unknown value with a default silently or verbosely."
 msgstr ""
 "Tato verze QIDISliceru nemusí být kompatibilní s konfiguracemi vytvořenými "
-"nejnovějšími verzemi QIDISliceru. Novější verze QIDISliceru mohou "
+"nejnovějšími verzemi QIDISliceru. Novější verze QIDISliceru mohou například "
-"například rozšířit seznam podporovaných druhů firmwaru. Lze se rozhodnout, "
+"rozšířit seznam podporovaných druhů firmwaru. Lze se rozhodnout, že to "
-"že to budeme ignorovat, nebo že neznámou hodnotu nahradíme výchozí hodnotou."
+"budeme ignorovat, nebo že neznámou hodnotu nahradíme výchozí hodnotou."
 
 #: src/slic3r/GUI/UpdateDialogs.cpp:392
 #, c-format, boost-format
@@ -17097,6 +17137,10 @@ msgstr "Nelze znovu načíst:"
 msgid "Unable to replace with more than one volume"
 msgstr "Nelze nahradit více než jednou částí"
 
+#: src/slic3r/GUI/Plater.cpp:6681
+msgid "Unable to save file"
+msgstr "Nelze uložit soubor"
+
 #: src/slic3r/GUI/OptionsGroup.cpp:126
 msgid "Unavailable for this method."
 msgstr "Pro tuto metodu není k dispozici."
@@ -17193,6 +17237,10 @@ msgstr "Akce zpět Rotace"
 msgid "Undo translation"
 msgstr "Akce zpět Posun"
 
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:667
+msgid "Unexpected character"
+msgstr "Neočekávaný znak"
+
 #: src/libslic3r/miniz_extension.cpp:111
 msgid "unexpected decompressed size"
 msgstr "neočekávaná dekomprimovaná velikost"
@@ -17842,8 +17890,8 @@ msgstr ""
 "spustí Začátek G-codu poté, co podložka dosáhne cílové teploty a extruder se "
 "začal ohřívat.\n"
 "\n"
-"Pokud funkce není povolena, QIDISlicer NEvkládá příkazy k ohřevu extruderu "
+"Pokud funkce není povolena, QIDISlicer NEvkládá příkazy k ohřevu extruderu a "
-"a podložky, obojí ponechá na vašem vlastním Začátku G-code."
+"podložky, obojí ponechá na vašem vlastním Začátku G-code."
 
 #: src/slic3r/GUI/PresetHints.cpp:192
 msgid "when printing"
@@ -18080,7 +18128,11 @@ msgstr "Čistící Věž"
 msgid "Wipe tower brim width"
 msgstr "Šířka límce čistící věže"
 
-#: src/slic3r/GUI/Tab.cpp:2087
+#: src/libslic3r/PrintConfig.cpp:3239
+msgid "Wipe tower extruder"
+msgstr "Extruder čistící věže"
+
+#: src/slic3r/GUI/Tab.cpp:2096
 msgid "Wipe tower parameters"
 msgstr "Parametry čistící věže"
 
@@ -18219,13 +18271,21 @@ msgid ""
 "Do you wish to continue?"
 msgstr ""
 "Používáte 32bitovou aplikaci QIDISlicer v 64bitovém systému Windows.\n"
-"32bitovová aplikace QIDISliceru pravděpodobně nebude schopna využít "
+"32bitovová aplikace QIDISliceru pravděpodobně nebude schopna využít veškerou "
-"veškerou dostupnou paměť RAM v systému.\n"
+"dostupnou paměť RAM v systému.\n"
 "Stáhněte si a nainstalujte 64bitovou verzi QIDISliceru ze stránek https://"
 "www.qidi3d.cz/qidislicer/.\n"
 "Přejete si pokračovat?"
 
-#: src/slic3r/GUI/Plater.cpp:5200
+#: src/slic3r/GUI/Plater.cpp:4103 src/slic3r/GUI/Plater.cpp:4109
+msgid "You are using template filament preset."
+msgid_plural "You are using template filament presets."
+msgstr[0] "Používáte šablonu filamentového přednastavení."
+msgstr[1] "Používáte šablony filamentového přednastavení."
+msgstr[2] "Používáte šablony filamentového přednastavení."
+msgstr[3] "Používáte šablon filamentového přednastavení."
+
+#: src/slic3r/GUI/Plater.cpp:5241
 msgid ""
 "You can keep presets modifications to the new project, discard them or save "
 "changes as new presets.\n"
@@ -18287,12 +18347,13 @@ 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]."
+"[input_filename], [input_filename_base], [default_output_extension]."
 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]."
+"[version], [input_filename], [input_filename_base], "
+"[default_output_extension]."
 
 #: src/slic3r/GUI/NotificationManager.hpp:908
 msgid ""
@@ -18602,6 +18663,7 @@ msgid_plural "%ld bytes"
 msgstr[0] "%ld bajt"
 msgstr[1] "%ld bajty"
 msgstr[2] "%ld bajtů"
+msgstr[3] ""
 
 #: ../src/html/helpwnd.cpp:1033
 #, c-format
@@ -22650,10 +22712,6 @@ msgstr "Japonská pohlednice 100 x 148 mm"
 msgid "Japanese Postcard Rotated 148 x 100 mm"
 msgstr "Japonská pohlednice na šířku, 148 x 100 mm"
 
-#: ../src/common/stockitem.cpp:169
-msgid "Jump to"
-msgstr "Přejít na"
-
 #: ../src/common/stockitem.cpp:171
 msgid "Justified"
 msgstr "Do bloku"
@@ -22811,6 +22869,7 @@ msgid_plural "Last repeated message (\"%s\", %u times) wasn't output"
 msgstr[0] "Poslední opakovaná zpráva (\"%s\", %ukrát) nebyla vypsána"
 msgstr[1] "Poslední opakovaná zpráva (\"%s\", %ukrát) nebyla vypsána"
 msgstr[2] "Poslední opakovaná zpráva (\"%s\", %ukrát) nebyla vypsána"
+msgstr[3] ""
 
 #: ../src/common/paper.cpp:103
 msgid "Ledger, 17 x 11 in"
@@ -25003,6 +25062,7 @@ msgid_plural "The previous message repeated %u times."
 msgstr[0] "Předchozí zpráva opakovaná %ukrát."
 msgstr[1] "Předchozí zpráva opakovaná %ukrát."
 msgstr[2] "Předchozí zpráva opakovaná %ukrát."
+msgstr[3] ""
 
 #: ../src/common/log.cpp:270
 msgid "The previous message repeated once."

resources/localization/de/QIDISlicer_de.po

@@ -1,11 +1,16 @@
 msgid ""
 msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \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: QIDIlator\n"
+"X-Generator: Poedit 3.3.2\n"
 
 #: src/libslic3r/PrintConfig.cpp:503 src/libslic3r/PrintConfig.cpp:594
 #: src/libslic3r/PrintConfig.cpp:603 src/libslic3r/PrintConfig.cpp:612
@@ -66,7 +71,6 @@ msgid "%1$d connector is out of cut contour"
 msgid_plural "%1$d connectors are out of cut contour"
 msgstr[0] "%1$d Verbinder ist außerhalb der Schnittkontur"
 msgstr[1] "%1$d Verbinder sind außerhalb der Schnittkontur"
-msgstr[2] ""
 
 #: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2200
 #, c-format, boost-format
@@ -74,7 +78,6 @@ msgid "%1$d connector is out of object"
 msgid_plural "%1$d connectors are out of object"
 msgstr[0] "%1$d Verbinder ist außerhalb des Objekts"
 msgstr[1] "%1$d Verbinder sind außerhalb des Objekts"
-msgstr[2] ""
 
 #: src/slic3r/GUI/GUI_ObjectList.cpp:459
 #, c-format, boost-format
@@ -110,7 +113,6 @@ msgid "%1$d object was loaded as a part of cut object."
 msgid_plural "%1$d objects were loaded as parts of cut object"
 msgstr[0] "%1$d Objekt wurde als Teil eines Schnittobjektes geladen."
 msgstr[1] "%1$d Objekte wurde als Teile eines Schnittobjektes geladen."
-msgstr[2] ""
 
 #: src/slic3r/GUI/NotificationManager.cpp:1649
 #, c-format, boost-format
@@ -585,8 +587,8 @@ msgid ""
 "is supported."
 msgstr ""
 "Fügen Sie bei Bedarf weitere Perimeter hinzu, um Spalten in schrägen Wänden "
-"zu vermeiden. QIDISlicer fügt immer wieder Perimeter hinzu, bis mehr als "
+"zu vermeiden. QIDISlicer fügt immer wieder Perimeter hinzu, bis mehr als 70% "
-"70% der unmittelbar darüber liegenden Schleife unterstützt werden."
+"der unmittelbar darüber liegenden Schleife unterstützt werden."
 
 #: src/slic3r/GUI/GUI_Factories.cpp:170
 msgid "Add negative text"
@@ -1339,12 +1341,11 @@ msgstr ""
 
 #: src/slic3r/GUI/OpenGLManager.cpp:390
 msgid ""
-"As a workaround, you may run QIDISlicer with a software rendered 3D "
+"As a workaround, you may run QIDISlicer with a software rendered 3D graphics "
-"graphics by running qidi-slicer.exe with the --sw-renderer parameter."
+"by running qidi-slicer.exe with the --sw-renderer parameter."
 msgstr ""
 "Als Abhilfe können Sie QIDISlicer mit einer softwaregerenderten 3D-Grafik "
-"ausführen, indem Sie qidi-slicer.exe mit dem Parameter --sw-renderer "
+"ausführen, indem Sie qidi-slicer.exe mit dem Parameter --sw-renderer starten."
-"starten."
 
 #: src/slic3r/GUI/Preferences.cpp:352
 #: src/slic3r/GUI/UnsavedChangesDialog.cpp:926
@@ -1603,7 +1604,13 @@ msgstr ""
 "Wert auf null, um die Befehle zur Steuerung der Betttemperatur im Output zu "
 "deaktivieren."
 
-#: src/slic3r/GUI/Tab.cpp:2569 src/libslic3r/GCode.cpp:768
+#: src/slic3r/GUI/Plater.cpp:3229
+msgid "Bed temperatures for the used filaments differ significantly."
+msgstr ""
+"Die Betttemperaturen für die verwendeten Filamente unterscheiden sich "
+"erheblich."
+
+#: src/slic3r/GUI/Tab.cpp:2586 src/libslic3r/GCode.cpp:768
 #: src/libslic3r/PrintConfig.cpp:442
 msgid "Before layer change G-code"
 msgstr "G-Code vor dem Schichtwechsel"
@@ -1856,8 +1863,8 @@ msgid ""
 "Printer Settings anymore.\n"
 "Settings will be available in physical printers settings."
 msgstr ""
-"Seit dieser Version von QIDISlicer zeigen wir diese Informationen nicht "
+"Seit dieser Version von QIDISlicer zeigen wir diese Informationen nicht mehr "
-"mehr in den Druckereinstellungen an.\n"
+"in den Druckereinstellungen an.\n"
 "Die Einstellungen sind in den Einstellungen für physische Drucker verfügbar."
 
 #: src/slic3r/GUI/ButtonsDescription.cpp:200
@@ -2681,6 +2688,17 @@ msgstr "Bestätigung"
 msgid "Confirm connectors"
 msgstr "Verbinder bestätigen"
 
+#. TRN %3% is name of Object1, %4% is name of Object2
+#: src/slic3r/GUI/GLCanvas3D.cpp:7496
+#, boost-format
+msgid ""
+"Conflicts in G-code paths have been detected at layer %1%, z=%2$.2f mm. "
+"Please reposition the conflicting objects (%3% <-> %4%) further apart."
+msgstr ""
+"In der Schicht %1%, z=%2$.2f mm wurden Konflikte in den G-Code-Pfaden "
+"entdeckt. Bitte positionieren Sie die kollidierenden Objekte (%3% <-> %4%) "
+"weiter auseinander."
+
 #: src/libslic3r/PrintConfig.cpp:1492
 msgid ""
 "Connect an infill line to an internal perimeter with a short segment of an "
@@ -6375,8 +6393,9 @@ msgstr "Lineal verbergen"
 #: resources/data/hints.ini: [hint:Hiding sidebar]
 msgid ""
 "Hiding sidebar\n"
-"Did you know that you can hide the right sidebar using the shortcut <b>Shift"
+"Did you know that you can hide the right sidebar using the shortcut "
-"+Tab</b>? You can also enable the icon for this from the<a>Preferences</a>."
+"<b>Shift+Tab</b>? You can also enable the icon for this from "
+"the<a>Preferences</a>."
 msgstr ""
 "Seitenleiste ausblenden\n"
 "Wussten Sie, dass Sie die rechte Seitenleiste mit der Tastenkombination "
@@ -6825,8 +6844,8 @@ msgstr ""
 #: src/libslic3r/PrintConfig.cpp:4857
 msgid ""
 "If enabled, the command line arguments are sent to an existing instance of "
-"GUI QIDISlicer, or an existing QIDISlicer window is activated. Overrides "
+"GUI QIDISlicer, or an existing QIDISlicer window is activated. Overrides the "
-"the \"single_instance\" configuration value from application preferences."
+"\"single_instance\" configuration value from application preferences."
 msgstr ""
 "Wenn aktiviert, werden die Befehlszeilenargumente an eine vorhandene Instanz "
 "der GUI QIDISlicer gesendet, oder ein vorhandenes QIDISlicer-Fenster wird "
@@ -6992,8 +7011,8 @@ msgid ""
 "If this is enabled, Slic3r will auto-center objects around the print bed "
 "center."
 msgstr ""
-"Wenn diese Option aktiviert ist, zentriert QIDISlicer Objekte automatisch "
+"Wenn diese Option aktiviert ist, zentriert QIDISlicer Objekte automatisch um "
-"um die Mitte des Druckbettes."
+"die Mitte des Druckbettes."
 
 #: src/slic3r/GUI/Preferences.cpp:251
 msgid ""
@@ -7031,8 +7050,8 @@ msgid ""
 "same QIDISlicer is already running, that instance will be reactivated "
 "instead."
 msgstr ""
-"Wenn dies aktiviert ist, wird beim Starten von QIDISlicer, wenn bereits "
+"Wenn dies aktiviert ist, wird beim Starten von QIDISlicer, wenn bereits eine "
-"eine andere Instanz desselben QIDISlicers läuft, diese Instanz stattdessen "
+"andere Instanz desselben QIDISlicers läuft, diese Instanz stattdessen "
 "reaktiviert."
 
 #: src/slic3r/GUI/SendSystemInfoDialog.cpp:591
@@ -7671,6 +7690,15 @@ msgstr "Jitter"
 msgid "Join"
 msgstr "Verbinden"
 
+#: src/slic3r/GUI/GLCanvas3D.cpp:7526 ../src/common/stockitem.cpp:169
+#, fuzzy
+msgid "Jump to"
+msgstr ""
+"#-#-#-#-#  catalog.po  #-#-#-#-#\n"
+"Gehen zu\n"
+"#-#-#-#-#  catalog.po  #-#-#-#-#\n"
+"Springen zu"
+
 #: src/slic3r/GUI/DoubleSlider.cpp:2094 src/slic3r/GUI/DoubleSlider.cpp:2324
 msgid "Jump to height"
 msgstr "Zur Höhe wechseln"
@@ -9087,6 +9115,10 @@ msgstr "Monotone Linien"
 msgid "More"
 msgstr "Mehr"
 
+#: src/slic3r/GUI/Plater.cpp:4106
+msgid "More info at"
+msgstr "Weitere Infos unter"
+
 #: src/slic3r/GUI/GUI.cpp:317
 msgid ""
 "Most likely the configuration was produced by a newer version of QIDISlicer "
@@ -9298,8 +9330,8 @@ msgstr ""
 "Negatives Volumen\n"
 "Wussten Sie, dass Sie mit dem Modifizierer \"Negatives Volumen\" ein Netz "
 "von einem anderen subtrahieren können? Auf diese Weise können Sie z.B. "
-"leicht veränderbare Löcher direkt in QIDISlicer erstellen. Lesen Sie mehr "
+"leicht veränderbare Löcher direkt in QIDISlicer erstellen. Lesen Sie mehr in "
-"in der Dokumentation. (Erfordert den Fortgeschrittenen- oder Expertenmodus.)"
+"der Dokumentation. (Erfordert den Fortgeschrittenen- oder Expertenmodus.)"
 
 #: src/slic3r/GUI/BonjourDialog.cpp:58
 msgid "Network lookup"
@@ -9500,13 +9532,13 @@ msgstr ""
 "Hinweis: Alle Parameter aus dieser Gruppe werden in die Einstellungen des "
 "physischen Druckers verschoben (siehe Changelog).\n"
 "\n"
-"Ein neues physisches Druckerprofil wird erstellt, indem man auf das \"Zahnrad"
+"Ein neues physisches Druckerprofil wird erstellt, indem man auf das "
-"\"-Symbol rechts vom Auswahlfeld \"Druckerprofile\" klickt, indem man den "
+"\"Zahnrad\"-Symbol rechts vom Auswahlfeld \"Druckerprofile\" klickt, indem "
-"Punkt \"Physischen Drucker hinzufügen\" im Auswahlfeld \"Drucker\" auswählt. "
+"man den Punkt \"Physischen Drucker hinzufügen\" im Auswahlfeld \"Drucker\" "
-"Der Profil-Editor für physische Drucker wird auch durch Klicken auf das "
+"auswählt. Der Profil-Editor für physische Drucker wird auch durch Klicken "
-"\"Zahnrad\"-Symbol in der Registerkarte \"Druckereinstellungen\" geöffnet. "
+"auf das \"Zahnrad\"-Symbol in der Registerkarte \"Druckereinstellungen\" "
-"Die Profile des physischen Druckers werden im Verzeichnis QIDISlicer/"
+"geöffnet. Die Profile des physischen Druckers werden im Verzeichnis "
-"physical_printer gespeichert."
+"QIDISlicer/physical_printer gespeichert."
 
 #: src/slic3r/Utils/AstroBox.cpp:93
 msgid "Note: AstroBox version at least 1.1.0 is required."
@@ -9564,7 +9596,6 @@ msgstr[0] ""
 msgstr[1] ""
 "Beachten Sie, dass die ausgewählte Voreinstellung auch in diesen Druckern "
 "umbenannt wird."
-msgstr[2] ""
 
 #: src/slic3r/GUI/Tab.cpp:4151
 msgid ""
@@ -10871,6 +10902,16 @@ msgid "Please check your object list before preset changing."
 msgstr ""
 "Bitte überprüfen Sie Ihre Objektliste, bevor Sie die Voreinstellungen ändern."
 
+#: src/slic3r/GUI/Plater.cpp:4104 src/slic3r/GUI/Plater.cpp:4110
+msgid ""
+"Please note that template presets are not customized for specific printer "
+"and should only be used as a starting point for creating your own user "
+"presets."
+msgstr ""
+"Bitte beachten Sie, dass die Vorlagen-Voreinstellungen nicht für einen "
+"bestimmten Drucker angepasst sind und nur als Ausgangspunkt für die "
+"Erstellung Ihrer eigenen Benutzer-Voreinstellungen verwendet werden sollten."
+
 #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:85
 msgid ""
 "Please save your project and restart QIDISlicer. We would be glad if you "
@@ -11159,8 +11200,8 @@ msgid ""
 msgstr ""
 "Printables.com Integration\n"
 "Wussten Sie, dass Sie beim Surfen auf Printables.com mit einem einzigen "
-"Klick 3D-Modelldateien an QIDISlicer senden können? Erfahren Sie mehr in "
+"Klick 3D-Modelldateien an QIDISlicer senden können? Erfahren Sie mehr in der "
-"der Dokumentation."
+"Dokumentation."
 
 #: resources/data/hints.ini: [hint:Printable toggle]
 msgid ""
@@ -11463,15 +11504,15 @@ msgstr "QIDISlicer ist auf einen schwerwiegenden Fehler gestoßen: \"%1%\""
 
 #: src/slic3r/GUI/GUI_App.cpp:743
 msgid ""
-"QIDISlicer has encountered a localization error. Please report to "
+"QIDISlicer has encountered a localization error. Please report to QIDISlicer "
-"QIDISlicer team, what language was active and in which scenario this issue "
+"team, what language was active and in which scenario this issue happened. "
-"happened. Thank you.\n"
+"Thank you.\n"
 "\n"
 "The application will now terminate."
 msgstr ""
-"QIDISlicer ist auf einen Lokalisierungsfehler gestoßen. Bitte melden Sie "
+"QIDISlicer ist auf einen Lokalisierungsfehler gestoßen. Bitte melden Sie dem "
-"dem QIDISlicer-Team, welche Sprache aktiv war und in welchem Szenario "
+"QIDISlicer-Team, welche Sprache aktiv war und in welchem Szenario dieses "
-"dieses Problem aufgetreten ist. Wir danken Ihnen.\n"
+"Problem aufgetreten ist. Wir danken Ihnen.\n"
 "\n"
 "Die Anwendung wird nun beendet."
 
@@ -11533,8 +11574,8 @@ msgid ""
 "correctly, \n"
 "while OpenGL version %s, render %s, vendor %s was detected."
 msgstr ""
-"QIDISlicer benötigt einen OpenGL ES 2.0-fähigen Grafiktreiber, um korrekt "
+"QIDISlicer benötigt einen OpenGL ES 2.0-fähigen Grafiktreiber, um korrekt zu "
-"zu funktionieren, \n"
+"funktionieren, \n"
 "während OpenGL Version %s, Render %s, Hersteller %s erkannt wurde."
 
 #: src/slic3r/GUI/OpenGLManager.cpp:380
@@ -13455,6 +13496,12 @@ msgstr "Oberen Schieber aktiv setzen"
 msgid "%s Family"
 msgstr "%s Familie"
 
+#. TRN %s = type of file
+#: src/slic3r/GUI/GUI_App.cpp:609
+#, c-format, boost-format
+msgid "%s files"
+msgstr "%s Dateien"
+
 #: src/slic3r/GUI/ConfigManipulation.cpp:167
 msgid "Shall I adjust those settings for supports?"
 msgstr "Soll ich diese Einstellungen für Stützen anpassen?"
@@ -13630,6 +13677,10 @@ msgstr "Legende ein-/ausblenden"
 msgid "Show/Hide object/instance labels"
 msgstr "Objekt-/Kopiebeschriftungen ein-/ausblenden"
 
+#: src/slic3r/GUI/PresetComboBoxes.cpp:787
+msgid "Show/Hide template presets"
+msgstr "Zeigen/Verbergen Vorlagen-Voreinstellungen"
+
 #: src/slic3r/GUI/Preferences.cpp:304
 msgid "Show incompatible print and filament presets"
 msgstr "Inkompatible Druck- und Filamenteinstellungen anzeigen"
@@ -13991,8 +14042,8 @@ msgid ""
 "Slic3r can upload G-code files to a printer host. This field must contain "
 "the kind of the host."
 msgstr ""
-"QIDISlicer kann G-Code Dateien auf einen Drucker-Host hochladen. Dieses "
+"QIDISlicer kann G-Code Dateien auf einen Drucker-Host hochladen. Dieses Feld "
-"Feld sollte den Typ des Hosts enthalten."
+"sollte den Typ des Hosts enthalten."
 
 #: src/libslic3r/PrintConfig.cpp:325
 msgid ""
@@ -14011,9 +14062,9 @@ msgid ""
 "name and password into the URL in the following format: https://username:"
 "password@your-octopi-address/"
 msgstr ""
-"QIDISlicer kann G-Code-Dateien auf einen Drucker-Host hochladen. Dieses "
+"QIDISlicer kann G-Code-Dateien auf einen Drucker-Host hochladen. Dieses Feld "
-"Feld sollte den Hostnamen, die IP-Adresse oder die URL der Drucker-Host-"
+"sollte den Hostnamen, die IP-Adresse oder die URL der Drucker-Host-Instanz "
-"Instanz enthalten. Auf einen Drucker-Host hinter HAProxy mit aktivierter "
+"enthalten. Auf einen Drucker-Host hinter HAProxy mit aktivierter "
 "Basisauthentifizierung kann zugegriffen werden, indem der Benutzername und "
 "das Passwort im folgenden Format in die URL eingegeben werden: https://"
 "username:password@Ihre-octopi-addresse/"
@@ -15327,8 +15378,8 @@ msgid_plural ""
 "the dimensions of these objects?"
 msgstr[0] ""
 "Die Abmessungen des Objekts aus der Datei %s scheinen in Metern definiert zu "
-"sein. Die interne Einheit von QIDISlicer ist ein Millimeter. Möchten Sie "
+"sein. Die interne Einheit von QIDISlicer ist ein Millimeter. Möchten Sie die "
-"die Abmessungen des Objekts neu berechnen?"
+"Abmessungen des Objekts neu berechnen?"
 msgstr[1] ""
 "Die Abmessungen einiger Objekte aus der Datei %s scheinen in Metern "
 "definiert zu sein. Die interne Einheit von QIDISlicer ist ein Millimeter. "
@@ -15364,6 +15415,15 @@ msgstr ""
 msgid "The extruder to use when printing infill."
 msgstr "Extruder der beim Infill benutzt wird."
 
+#: src/libslic3r/PrintConfig.cpp:3241
+msgid ""
+"The extruder to use when printing perimeter of the wipe tower. Set to 0 to "
+"use the one that is available (non-soluble would be preferred)."
+msgstr ""
+"Der Extruder, der beim Drucken der Perimeter des Reinigungsturms verwendet "
+"wird. Setzen Sie den Wert auf 0, um den verfügbaren Extruder zu verwenden "
+"(nicht löslich wäre vorzuziehen)."
+
 #: src/libslic3r/PrintConfig.cpp:2036
 msgid ""
 "The extruder to use when printing perimeters and brim. First extruder is 1."
@@ -15745,7 +15805,6 @@ msgstr[0] ""
 msgstr[1] ""
 "Die unten stehenden physischen Drucker basieren auf der Voreinstellung, die "
 "Sie umbenennen werden."
-msgstr[2] ""
 
 #: src/libslic3r/PrintConfig.cpp:641
 msgid ""
@@ -16420,8 +16479,8 @@ msgstr ""
 "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 QIDISlicer angegebenen Filamentdurchmesser zu benutzen. Dies wird nur "
+"in QIDISlicer angegebenen Filamentdurchmesser zu benutzen. Dies wird nur von "
-"von neueren Marlin-Versionen unterstützt."
+"neueren Marlin-Versionen unterstützt."
 
 #: src/libslic3r/PrintConfig.cpp:512
 msgid ""
@@ -16592,8 +16651,8 @@ msgstr "Dies ist eine Systemvoreinstellung."
 #: src/libslic3r/PrintConfig.cpp:3740
 msgid "This is only used in the Slic3r interface as a visual help."
 msgstr ""
-"Dies wird nur als visuelles Hilfsmittel in der QIDISlicer-"
+"Dies wird nur als visuelles Hilfsmittel in der QIDISlicer-Benutzeroberfläche "
-"Benutzeroberfläche verwendet."
+"verwendet."
 
 #: src/libslic3r/PrintConfig.cpp:737
 msgid ""
@@ -16946,17 +17005,17 @@ msgstr ""
 
 #: src/libslic3r/PrintConfig.cpp:4836
 msgid ""
-"This version of QIDISlicer may not understand configurations produced by "
+"This version of QIDISlicer may not understand configurations produced by the "
-"the newest QIDISlicer versions. For example, newer QIDISlicer may extend "
+"newest QIDISlicer versions. For example, newer QIDISlicer may extend the "
-"the list of supported firmware flavors. One may decide to bail out or to "
+"list of supported firmware flavors. One may decide to bail out or to "
 "substitute an unknown value with a default silently or verbosely."
 msgstr ""
 "Diese Version von QIDISlicer versteht möglicherweise keine Konfigurationen, "
-"die von den neuesten QIDISlicer-Versionen erzeugt werden. Neuere "
+"die von den neuesten QIDISlicer-Versionen erzeugt werden. Neuere QIDISlicer "
-"QIDISlicer können zum Beispiel die Liste der unterstützten Firmware-"
+"können zum Beispiel die Liste der unterstützten Firmware-Varianten "
-"Varianten erweitern. Sie können sich entscheiden, das Programm zu verlassen "
+"erweitern. Sie können sich entscheiden, das Programm zu verlassen oder einen "
-"oder einen unbekannten Wert stillschweigend oder interaktiv durch einen "
+"unbekannten Wert stillschweigend oder interaktiv durch einen Standardwert zu "
-"Standardwert zu ersetzen."
+"ersetzen."
 
 #: src/slic3r/GUI/UpdateDialogs.cpp:392
 #, c-format, boost-format
@@ -17368,6 +17427,10 @@ msgstr "Kann nicht nachgeladen werden:"
 msgid "Unable to replace with more than one volume"
 msgstr "Kann nicht durch mehr als ein Volumen ersetzt werden"
 
+#: src/slic3r/GUI/Plater.cpp:6681
+msgid "Unable to save file"
+msgstr "Kann Datei nicht speichern"
+
 #: src/slic3r/GUI/OptionsGroup.cpp:126
 msgid "Unavailable for this method."
 msgstr "Nicht verfügbar für diese Methode."
@@ -17463,6 +17526,10 @@ msgstr "Rotation zurücksetzen"
 msgid "Undo translation"
 msgstr "Verschiebung zurücksetzen"
 
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:667
+msgid "Unexpected character"
+msgstr "Unerwartetes Zeichen"
+
 #: src/libslic3r/miniz_extension.cpp:111
 msgid "unexpected decompressed size"
 msgstr "unerwartete dekomprimierte Größe"
@@ -18131,9 +18198,8 @@ msgstr ""
 "QIDISlicer-Einstellungen verwenden können, so dass Sie den Befehl \"M109 "
 "S[first_layer_temperature]\" an beliebiger Stelle einfügen können.\n"
 "Wenn Ihr benutzerdefinierter Start-G-Code NICHT M104 oder M190 enthält, "
-"führt QIDISlicer den Start-G-Code aus, nachdem das Bett seine "
+"führt QIDISlicer den Start-G-Code aus, nachdem das Bett seine Zieltemperatur "
-"Zieltemperatur erreicht hat und der Extruder gerade mit dem Aufheizen "
+"erreicht hat und der Extruder gerade mit dem Aufheizen begonnen hat.\n"
-"begonnen hat.\n"
 "\n"
 "Wenn diese Option deaktiviert ist, sendet QIDISlicer KEINE Befehle zum "
 "Aufheizen von Extruder und Bett, sondern überlässt beides dem "
@@ -18382,7 +18448,11 @@ msgstr "Reinigungsturm"
 msgid "Wipe tower brim width"
 msgstr "Reinigungsturm Randbreite"
 
-#: src/slic3r/GUI/Tab.cpp:2087
+#: src/libslic3r/PrintConfig.cpp:3239
+msgid "Wipe tower extruder"
+msgstr "Reinigungsturm Extruder"
+
+#: src/slic3r/GUI/Tab.cpp:2096
 msgid "Wipe tower parameters"
 msgstr "Reinigungsturm Parameter"
 
@@ -18526,11 +18596,17 @@ msgstr ""
 "Sie verwenden eine 32-Bit-Version von QIDISlicer unter 64-Bit-Windows.\n"
 "Ein 32-Bit-Build von QIDISlicer ist wahrscheinlich nicht in der Lage, das "
 "gesamte im System verfügbare RAM zu nutzen.\n"
-"Bitte laden Sie einen 64-Bit-Build von QIDISlicer von https://www.qidi3d."
+"Bitte laden Sie einen 64-Bit-Build von QIDISlicer von https://www.qidi3d.com/"
-"com/qidislicer/ herunter und installieren Sie ihn.\n"
+"qidislicer/ herunter und installieren Sie ihn.\n"
 "Möchten Sie fortfahren?"
 
-#: src/slic3r/GUI/Plater.cpp:5200
+#: src/slic3r/GUI/Plater.cpp:4103 src/slic3r/GUI/Plater.cpp:4109
+msgid "You are using template filament preset."
+msgid_plural "You are using template filament presets."
+msgstr[0] "Sie verwenden eine Vorlagen-Filament-Voreinstellung."
+msgstr[1] "Sie verwenden Vorlagen-Filament-Voreinstellungen."
+
+#: src/slic3r/GUI/Plater.cpp:5241
 msgid ""
 "You can keep presets modifications to the new project, discard them or save "
 "changes as new presets.\n"
@@ -18596,12 +18672,13 @@ 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]."
+"[input_filename], [input_filename_base], [default_output_extension]."
 msgstr ""
 "Sie können alle Konfigurationsoptionen als Variablen in dieser Vorlage "
-"benutzen.   Zum Beispiel: [layer_height], [fill_density] usw. Sie können "
+"verwenden. Zum Beispiel: [layer_height], [fill_density] usw. Sie können auch "
-"auch [timestamp], [year], [month], [day], [hour], [minute], [second], "
+"[timestamp], [year], [month], [day], [hour], [minute], [second], [version], "
-"[version], [input_filename], und [input_filename_base] benutzen."
+"[input_filename], [input_filename_base], [default_output_extension] "
+"verwenden."
 
 #: src/slic3r/GUI/NotificationManager.hpp:908
 msgid ""
@@ -18611,8 +18688,8 @@ msgid ""
 msgstr ""
 "Sie haben gerade einen G-Code für Farbwechsel hinzugefügt, aber sein Wert "
 "ist leer.\n"
-"Um den G-Code korrekt zu exportieren, überprüfen Sie den \"Farbwechsel-G-Code"
+"Um den G-Code korrekt zu exportieren, überprüfen Sie den \"Farbwechsel-G-"
-"\" unter \"Druckereinstellungen > Benutzerdefinierter G-Code\"."
+"Code\" unter \"Druckereinstellungen > Benutzerdefinierter G-Code\"."
 
 #: src/slic3r/GUI/SavePresetDialog.cpp:405
 #, boost-format
@@ -23024,10 +23101,6 @@ msgstr "Japanische Postkarte 100 × 148 mm"
 msgid "Japanese Postcard Rotated 148 x 100 mm"
 msgstr "Japanische Postkarte Rotiert 100 × 148 mm"
 
-#: ../src/common/stockitem.cpp:169
-msgid "Jump to"
-msgstr "Springen zu"
-
 #: ../src/common/stockitem.cpp:171
 msgid "Justified"
 msgstr "Blocksatz"

resources/localization/en/QIDISlicer_en.po

@@ -11,7 +11,7 @@ msgstr ""
 "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.3\n"
+"X-Generator: Poedit 3.3.2\n"
 
 #: src/slic3r/GUI/AboutDialog.cpp:46 src/slic3r/GUI/AboutDialog.cpp:304
 msgid "Portions copyright"
@@ -2638,7 +2638,24 @@ msgid ""
 "Resolve the current problem to continue slicing."
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:7539
+#. TRN %3% is name of Object1, %4% is name of Object2
+#: src/slic3r/GUI/GLCanvas3D.cpp:7496
+#, boost-format
+msgid ""
+"Conflicts in G-code paths have been detected at layer %1%, z=%2$.2f mm. "
+"Please reposition the conflicting objects (%3% <-> %4%) further apart."
+msgstr ""
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:7529
+#: src/slic3r/GUI/NotificationManager.cpp:2101
+#: src/slic3r/GUI/NotificationManager.cpp:2108
+#: src/slic3r/GUI/NotificationManager.cpp:2124
+#: src/slic3r/GUI/NotificationManager.cpp:2130
+#: src/slic3r/GUI/NotificationManager.cpp:2201
+msgid "ERROR:"
+msgstr ""
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:7606
 msgid "Selection-Add from rectangle"
 msgstr ""
 
@@ -4332,7 +4349,13 @@ msgstr ""
 msgid "Start the application"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:736
+#. TRN %s = type of file
+#: src/slic3r/GUI/GUI_App.cpp:609
+#, c-format, boost-format
+msgid "%s files"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:772
 #, c-format, boost-format
 msgid ""
 "%s has encountered an error. It was likely caused by running out of memory. "
@@ -4348,9 +4371,9 @@ msgstr ""
 
 #: src/slic3r/GUI/GUI_App.cpp:743
 msgid ""
-"QIDISlicer has encountered a localization error. Please report to "
+"QIDISlicer has encountered a localization error. Please report to QIDISlicer "
-"QIDISlicer team, what language was active and in which scenario this issue "
+"team, what language was active and in which scenario this issue happened. "
-"happened. Thank you.\n"
+"Thank you.\n"
 "\n"
 "The application will now terminate."
 msgstr ""
@@ -7526,14 +7549,6 @@ msgstr ""
 msgid "Export."
 msgstr ""
 
-#: src/slic3r/GUI/NotificationManager.cpp:2101
-#: src/slic3r/GUI/NotificationManager.cpp:2108
-#: src/slic3r/GUI/NotificationManager.cpp:2124
-#: src/slic3r/GUI/NotificationManager.cpp:2130
-#: src/slic3r/GUI/NotificationManager.cpp:2201
-msgid "ERROR:"
-msgstr ""
-
 #: src/slic3r/GUI/NotificationManager.cpp:2113
 #: src/slic3r/GUI/NotificationManager.cpp:2140
 #: src/slic3r/GUI/NotificationManager.cpp:2148
@@ -7609,8 +7624,8 @@ msgstr ""
 
 #: src/slic3r/GUI/OpenGLManager.cpp:390
 msgid ""
-"As a workaround, you may run QIDISlicer with a software rendered 3D "
+"As a workaround, you may run QIDISlicer with a software rendered 3D graphics "
-"graphics by running qidi-slicer.exe with the --sw-renderer parameter."
+"by running qidi-slicer.exe with the --sw-renderer parameter."
 msgstr ""
 
 #: src/slic3r/GUI/OpenGLManager.cpp:392
@@ -7708,7 +7723,16 @@ msgid ""
 "Keychain."
 msgstr ""
 
-#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:705
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:667
+msgid "Unexpected character"
+msgstr ""
+
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:668
+#: src/slic3r/GUI/SavePresetDialog.cpp:169
+msgid "The following characters are not allowed in the name"
+msgstr ""
+
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:723
 msgid "You have to enter a printer name."
 msgstr ""
 
@@ -8124,7 +8148,11 @@ msgstr ""
 msgid "Enable supports for enforcers only"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:3362 src/slic3r/GUI/Plater.cpp:4258
+#: src/slic3r/GUI/Plater.cpp:3229
+msgid "Bed temperatures for the used filaments differ significantly."
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3367 src/slic3r/GUI/Plater.cpp:4294
 msgid "Invalid data"
 msgstr ""
 
@@ -8185,7 +8213,24 @@ msgstr ""
 msgid "Reload all from disk"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:4211
+#: src/slic3r/GUI/Plater.cpp:4103 src/slic3r/GUI/Plater.cpp:4109
+msgid "You are using template filament preset."
+msgid_plural "You are using template filament presets."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/slic3r/GUI/Plater.cpp:4104 src/slic3r/GUI/Plater.cpp:4110
+msgid ""
+"Please note that template presets are not customized for specific printer "
+"and should only be used as a starting point for creating your own user "
+"presets."
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4106
+msgid "More info at"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4247
 msgid "There are active warnings concerning sliced models:"
 msgstr ""
 
@@ -8422,7 +8467,11 @@ msgstr ""
 msgid "Save project"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:6826
+#: src/slic3r/GUI/Plater.cpp:6681
+msgid "Unable to save file"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:6875
 msgid "Is the printer ready? Is the print sheet in place, empty and clean?"
 msgstr ""
 
@@ -8950,7 +8999,11 @@ msgstr ""
 msgid "Change extruder color"
 msgstr ""
 
-#: src/slic3r/GUI/PresetComboBoxes.cpp:767 src/slic3r/GUI/Tab.cpp:3503
+#: src/slic3r/GUI/PresetComboBoxes.cpp:787
+msgid "Show/Hide template presets"
+msgstr ""
+
+#: src/slic3r/GUI/PresetComboBoxes.cpp:795 src/slic3r/GUI/Tab.cpp:3520
 msgid "Edit physical printer"
 msgstr ""
 
@@ -9295,10 +9348,6 @@ msgstr ""
 msgid "Save printer settings as"
 msgstr ""
 
-#: src/slic3r/GUI/SavePresetDialog.cpp:169
-msgid "The following characters are not allowed in the name"
-msgstr ""
-
 #: src/slic3r/GUI/SavePresetDialog.cpp:176
 msgid "The following suffix is not allowed in the name"
 msgstr ""
@@ -13789,7 +13838,7 @@ 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]."
+"[input_filename], [input_filename_base], [default_output_extension]."
 msgstr ""
 
 #: src/libslic3r/PrintConfig.cpp:1992
@@ -15128,11 +15177,21 @@ msgid "Maximal distance between supports on sparse infill sections."
 msgstr ""
 
 #: src/libslic3r/PrintConfig.cpp:3239
-msgid "XY Size Compensation"
+msgid "Wipe tower extruder"
 msgstr ""
 
 #: src/libslic3r/PrintConfig.cpp:3241
 msgid ""
+"The extruder to use when printing perimeter of the wipe tower. Set to 0 to "
+"use the one that is available (non-soluble would be preferred)."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3260
+msgid "XY Size Compensation"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3262
+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."
@@ -16137,9 +16196,9 @@ msgstr ""
 
 #: src/libslic3r/PrintConfig.cpp:4836
 msgid ""
-"This version of QIDISlicer may not understand configurations produced by "
+"This version of QIDISlicer may not understand configurations produced by the "
-"the newest QIDISlicer versions. For example, newer QIDISlicer may extend "
+"newest QIDISlicer versions. For example, newer QIDISlicer may extend the "
-"the list of supported firmware flavors. One may decide to bail out or to "
+"list of supported firmware flavors. One may decide to bail out or to "
 "substitute an unknown value with a default silently or verbosely."
 msgstr ""
 
@@ -16186,8 +16245,8 @@ msgstr ""
 #: src/libslic3r/PrintConfig.cpp:4857
 msgid ""
 "If enabled, the command line arguments are sent to an existing instance of "
-"GUI QIDISlicer, or an existing QIDISlicer window is activated. Overrides "
+"GUI QIDISlicer, or an existing QIDISlicer window is activated. Overrides the "
-"the \"single_instance\" configuration value from application preferences."
+"\"single_instance\" configuration value from application preferences."
 msgstr ""
 
 #: src/libslic3r/PrintConfig.cpp:4862
@@ -16313,8 +16372,9 @@ msgstr ""
 #: resources/data/hints.ini: [hint:Hiding sidebar]
 msgid ""
 "Hiding sidebar\n"
-"Did you know that you can hide the right sidebar using the shortcut <b>Shift"
+"Did you know that you can hide the right sidebar using the shortcut "
-"+Tab</b>? You can also enable the icon for this from the<a>Preferences</a>."
+"<b>Shift+Tab</b>? You can also enable the icon for this from "
+"the<a>Preferences</a>."
 msgstr ""
 
 #: resources/data/hints.ini: [hint:Perspective camera]

resources/localization/es/QIDISlicer_es.po

@@ -1,11 +1,16 @@
 msgid ""
 msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \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: QIDIlator\n"
+"X-Generator: Poedit 3.3.2\n"
 
 #: src/libslic3r/PrintConfig.cpp:503 src/libslic3r/PrintConfig.cpp:594
 #: src/libslic3r/PrintConfig.cpp:603 src/libslic3r/PrintConfig.cpp:612
@@ -66,7 +71,6 @@ msgid "%1$d connector is out of cut contour"
 msgid_plural "%1$d connectors are out of cut contour"
 msgstr[0] "%1$d conector está fuera del contorno de corte"
 msgstr[1] "%1$d conectores están fuera del contorno de corte"
-msgstr[2] ""
 
 #: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2200
 #, c-format, boost-format
@@ -74,7 +78,6 @@ msgid "%1$d connector is out of object"
 msgid_plural "%1$d connectors are out of object"
 msgstr[0] "%1$d conector está fuera de objeto"
 msgstr[1] "%1$d conectores están fuera de objeto"
-msgstr[2] ""
 
 #: src/slic3r/GUI/GUI_ObjectList.cpp:459
 #, c-format, boost-format
@@ -110,7 +113,6 @@ msgid "%1$d object was loaded as a part of cut object."
 msgid_plural "%1$d objects were loaded as parts of cut object"
 msgstr[0] "%1$d objeto se cargó como parte del objeto cortado."
 msgstr[1] "%1$d objetos se cargaron como partes de objetos cortados"
-msgstr[2] ""
 
 #: src/slic3r/GUI/NotificationManager.cpp:1649
 #, c-format, boost-format
@@ -1334,8 +1336,8 @@ msgstr ""
 
 #: src/slic3r/GUI/OpenGLManager.cpp:390
 msgid ""
-"As a workaround, you may run QIDISlicer with a software rendered 3D "
+"As a workaround, you may run QIDISlicer with a software rendered 3D graphics "
-"graphics by running qidi-slicer.exe with the --sw-renderer parameter."
+"by running qidi-slicer.exe with the --sw-renderer parameter."
 msgstr ""
 "Como solución, puedes ejecutar QIDISlicer con gráficos 3D renderizados por "
 "software ejecutando qidi-slicer.exe con el parámetro --sw-renderer."
@@ -1592,7 +1594,13 @@ msgstr ""
 "Ajusta esto a cero para deshabilitar los comandos de control de temperatura "
 "de la base calefactable en la salida."
 
-#: src/slic3r/GUI/Tab.cpp:2569 src/libslic3r/GCode.cpp:768
+#: src/slic3r/GUI/Plater.cpp:3229
+msgid "Bed temperatures for the used filaments differ significantly."
+msgstr ""
+"Las temperaturas de la base para los filamentos utilizados difieren "
+"significativamente."
+
+#: src/slic3r/GUI/Tab.cpp:2586 src/libslic3r/GCode.cpp:768
 #: src/libslic3r/PrintConfig.cpp:442
 msgid "Before layer change G-code"
 msgstr "Código G para antes del cambio de capa"
@@ -1860,8 +1868,8 @@ msgid ""
 "creation.\n"
 "Note: This name can be changed later from the physical printers settings"
 msgstr ""
-"Por defecto, los nuevos dispositivos de impresión se llamarán \"Impresora N"
+"Por defecto, los nuevos dispositivos de impresión se llamarán \"Impresora "
-"\" durante su creación.\n"
+"N\" durante su creación.\n"
 "Nota: Este nombre se puede cambiar posteriormente en los ajustes de "
 "impresora física"
 
@@ -2659,6 +2667,17 @@ msgstr "Confirmación"
 msgid "Confirm connectors"
 msgstr "Confirmar conectores"
 
+#. TRN %3% is name of Object1, %4% is name of Object2
+#: src/slic3r/GUI/GLCanvas3D.cpp:7496
+#, boost-format
+msgid ""
+"Conflicts in G-code paths have been detected at layer %1%, z=%2$.2f mm. "
+"Please reposition the conflicting objects (%3% <-> %4%) further apart."
+msgstr ""
+"Se han detectado conflictos en las rutas del código G en la capa %1%, "
+"z=%2$.2f mm. Por favor, reposiciona los objetos conflictivos (%3% <-> %4%) "
+"más separados."
+
 #: src/libslic3r/PrintConfig.cpp:1492
 msgid ""
 "Connect an infill line to an internal perimeter with a short segment of an "
@@ -2673,13 +2692,13 @@ msgid ""
 msgstr ""
 "Conecta una línea de relleno a un perímetro interno con un segmento corto de "
 "un perímetro adicional. Si se expresa como porcentaje (por ejemplo: 15%), se "
-"calcula sobre el ancho de extrusión del relleno. QIDISlicer intenta "
+"calcula sobre el ancho de extrusión del relleno. QIDISlicer intenta conectar "
-"conectar dos líneas de relleno cercanas a un segmento de perímetro corto. Si "
+"dos líneas de relleno cercanas a un segmento de perímetro corto. Si no se "
-"no se encuentra tal segmento de perímetro más corto que infill_anchor_max, "
+"encuentra tal segmento de perímetro más corto que infill_anchor_max, la "
-"la línea de relleno se conecta a un segmento de perímetro en un solo lado y "
+"línea de relleno se conecta a un segmento de perímetro en un solo lado y la "
-"la longitud del segmento de perímetro tomado se limita a este parámetro, "
+"longitud del segmento de perímetro tomado se limita a este parámetro, pero "
-"pero no más largo que anchor_length_max. Establezca este parámetro a cero "
+"no más largo que anchor_length_max. Establezca este parámetro a cero para "
-"para deshabilitar los perímetros de anclaje conectados a una sola línea de "
+"deshabilitar los perímetros de anclaje conectados a una sola línea de "
 "relleno."
 
 #: src/libslic3r/PrintConfig.cpp:1515
@@ -2695,13 +2714,13 @@ msgid ""
 msgstr ""
 "Conecta una línea de relleno a un perímetro interno con un segmento corto de "
 "un perímetro adicional. Si se expresa como porcentaje (por ejemplo: 15%), se "
-"calcula sobre el ancho de extrusión del relleno. QIDISlicer intenta "
+"calcula sobre el ancho de extrusión del relleno. QIDISlicer intenta conectar "
-"conectar dos líneas de relleno cercanas a un segmento de perímetro corto. Si "
+"dos líneas de relleno cercanas a un segmento de perímetro corto. Si no se "
-"no se encuentra un segmento de perímetro más corto que este parámetro, la "
+"encuentra un segmento de perímetro más corto que este parámetro, la línea de "
-"línea de relleno se conecta a un segmento de perímetro en un solo lado y la "
+"relleno se conecta a un segmento de perímetro en un solo lado y la longitud "
-"longitud del segmento de perímetro tomado se limita a infill_anchor, pero no "
+"del segmento de perímetro tomado se limita a infill_anchor, pero no más "
-"más largo que este parámetro. Establezca este parámetro a cero para "
+"largo que este parámetro. Establezca este parámetro a cero para deshabilitar "
-"deshabilitar el anclaje."
+"el anclaje."
 
 #: src/slic3r/GUI/Tab.cpp:5133
 msgid "Connection of the support sticks and junctions"
@@ -5897,8 +5916,8 @@ msgid ""
 "<b>F11</b> hotkey."
 msgstr ""
 "Modo Pantalla completa\n"
-"¿Sabías que puedes poner el QIDISlicer en modo de pantalla completa? "
+"¿Sabías que puedes poner el QIDISlicer en modo de pantalla completa? Utiliza "
-"Utiliza la tecla de acceso rápido <b>F11</b>."
+"la tecla de acceso rápido <b>F11</b>."
 
 #: src/slic3r/GUI/GUI_Factories.cpp:130 src/libslic3r/PrintConfig.cpp:1341
 #: src/libslic3r/PrintConfig.cpp:1342 src/libslic3r/PrintConfig.cpp:1354
@@ -6343,12 +6362,13 @@ msgstr "Ocultar regla"
 #: resources/data/hints.ini: [hint:Hiding sidebar]
 msgid ""
 "Hiding sidebar\n"
-"Did you know that you can hide the right sidebar using the shortcut <b>Shift"
+"Did you know that you can hide the right sidebar using the shortcut "
-"+Tab</b>? You can also enable the icon for this from the<a>Preferences</a>."
+"<b>Shift+Tab</b>? You can also enable the icon for this from "
+"the<a>Preferences</a>."
 msgstr ""
 "Ocultar la barra lateral\n"
-"¿Sabías que puedes ocultar la barra lateral derecha con el atajo <b>Mayús"
+"¿Sabías que puedes ocultar la barra lateral derecha con el atajo "
-"+Tab</b>? También puedes habilitar el icono para ello desde las "
+"<b>Mayús+Tab</b>? También puedes habilitar el icono para ello desde las "
 "<a>Preferencias</a>."
 
 #: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:295
@@ -6783,13 +6803,13 @@ msgstr ""
 #: src/libslic3r/PrintConfig.cpp:4857
 msgid ""
 "If enabled, the command line arguments are sent to an existing instance of "
-"GUI QIDISlicer, or an existing QIDISlicer window is activated. Overrides "
+"GUI QIDISlicer, or an existing QIDISlicer window is activated. Overrides the "
-"the \"single_instance\" configuration value from application preferences."
+"\"single_instance\" configuration value from application preferences."
 msgstr ""
 "Si está habilitado, los argumentos de la línea de comando se envían a una "
-"instancia existente de GUI QIDISlicer, o se activa una ventana de "
+"instancia existente de GUI QIDISlicer, o se activa una ventana de QIDISlicer "
-"QIDISlicer existente. Anula el valor de configuración \"single_instance\" "
+"existente. Anula el valor de configuración \"single_instance\" de las "
-"de las preferencias de la aplicación."
+"preferencias de la aplicación."
 
 #: src/slic3r/GUI/Preferences.cpp:395
 msgid ""
@@ -7620,6 +7640,15 @@ msgstr "Jitter"
 msgid "Join"
 msgstr "Unir"
 
+#: src/slic3r/GUI/GLCanvas3D.cpp:7526 ../src/common/stockitem.cpp:169
+#, fuzzy
+msgid "Jump to"
+msgstr ""
+"#-#-#-#-#  catalog.po  #-#-#-#-#\n"
+"Salta a\n"
+"#-#-#-#-#  catalog.po  #-#-#-#-#\n"
+"Ir a"
+
 #: src/slic3r/GUI/DoubleSlider.cpp:2094 src/slic3r/GUI/DoubleSlider.cpp:2324
 msgid "Jump to height"
 msgstr "Salta a la altura"
@@ -9030,6 +9059,10 @@ msgstr "Líneas Monotónicas"
 msgid "More"
 msgstr "Más"
 
+#: src/slic3r/GUI/Plater.cpp:4106
+msgid "More info at"
+msgstr "Más información en"
+
 #: src/slic3r/GUI/GUI.cpp:317
 msgid ""
 "Most likely the configuration was produced by a newer version of QIDISlicer "
@@ -9508,7 +9541,6 @@ msgstr[0] ""
 msgstr[1] ""
 "Ten en cuenta que los ajustes seleccionados también se renombrarán en esta "
 "impresora."
-msgstr[2] ""
 
 #: src/slic3r/GUI/Tab.cpp:4151
 msgid ""
@@ -10814,13 +10846,23 @@ msgstr ""
 "Por favor comprueba tu lista de objetos antes de cambiar los ajustes "
 "iniciales."
 
+#: src/slic3r/GUI/Plater.cpp:4104 src/slic3r/GUI/Plater.cpp:4110
+msgid ""
+"Please note that template presets are not customized for specific printer "
+"and should only be used as a starting point for creating your own user "
+"presets."
+msgstr ""
+"Ten en cuenta que las plantillas de configuración no están personalizadas "
+"para una impresora específica y sólo deben utilizarse como punto de partida "
+"para crear tus propios preajustes de usuario."
+
 #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:85
 msgid ""
 "Please save your project and restart QIDISlicer. We would be glad if you "
 "reported the issue."
 msgstr ""
-"Por favor, guarda tu proyecto y reinicia QIDISlicer. Estaremos encantados "
+"Por favor, guarda tu proyecto y reinicia QIDISlicer. Estaremos encantados de "
-"de que nos informes del problema."
+"que nos informes del problema."
 
 #: src/slic3r/GUI/Plater.cpp:3703
 msgid "Please select the file to reload"
@@ -11367,8 +11409,8 @@ msgid ""
 "To avoid this problem, consider disabling \"%4%\" in \"Preferences\". "
 "Otherwise, the application will most likely crash again next time."
 msgstr ""
-"QIDISlicer se bloqueó la última vez al intentar establecer la posición de "
+"QIDISlicer se bloqueó la última vez al intentar establecer la posición de la "
-"la ventana.\n"
+"ventana.\n"
 "Sentimos las molestias, pero desgraciadamente ocurre con ciertas "
 "configuraciones de múltiples monitores.\n"
 "La razón más precisa para la caída: \"%1%\".\n"
@@ -11405,9 +11447,9 @@ msgstr "QIDISlicer ha encontrado un error fatal: \"%1%\""
 
 #: src/slic3r/GUI/GUI_App.cpp:743
 msgid ""
-"QIDISlicer has encountered a localization error. Please report to "
+"QIDISlicer has encountered a localization error. Please report to QIDISlicer "
-"QIDISlicer team, what language was active and in which scenario this issue "
+"team, what language was active and in which scenario this issue happened. "
-"happened. Thank you.\n"
+"Thank you.\n"
 "\n"
 "The application will now terminate."
 msgstr ""
@@ -11475,8 +11517,8 @@ msgid ""
 "correctly, \n"
 "while OpenGL version %s, render %s, vendor %s was detected."
 msgstr ""
-"QIDISlicer requiere un controlador gráfico compatible con OpenGL ES 2.0 "
+"QIDISlicer requiere un controlador gráfico compatible con OpenGL ES 2.0 para "
-"para funcionar correctamente, \n"
+"funcionar correctamente, \n"
 "mientras que OpenGL versión %s, render %s, vendor %s fue detectado."
 
 #: src/slic3r/GUI/OpenGLManager.cpp:380
@@ -12704,8 +12746,8 @@ msgid ""
 msgstr ""
 "Funcionalidad de búsqueda\n"
 "¿Sabías que puedes utilizar la herramienta <a>Búsqueda</a> para encontrar "
-"rápidamente un ajuste específico de QIDISlicer? O utilizar el conocido "
+"rápidamente un ajuste específico de QIDISlicer? O utilizar el conocido atajo "
-"atajo <b>Ctrl+F</b>."
+"<b>Ctrl+F</b>."
 
 #: src/slic3r/GUI/ImGuiWrapper.cpp:1189 src/slic3r/GUI/Search.cpp:526
 msgid "Search in English"
@@ -13389,6 +13431,12 @@ msgstr "Establecer el pulgar superior como activo"
 msgid "%s Family"
 msgstr "%s Familia"
 
+#. TRN %s = type of file
+#: src/slic3r/GUI/GUI_App.cpp:609
+#, c-format, boost-format
+msgid "%s files"
+msgstr "%s archivos"
+
 #: src/slic3r/GUI/ConfigManipulation.cpp:167
 msgid "Shall I adjust those settings for supports?"
 msgstr "¿Debo ajustar esa configuración para los soportes?"
@@ -13559,6 +13607,10 @@ msgstr "Mostrar/Ocultar leyenda"
 msgid "Show/Hide object/instance labels"
 msgstr "Muestra/Oculta etiquetas de pieza/repetición"
 
+#: src/slic3r/GUI/PresetComboBoxes.cpp:787
+msgid "Show/Hide template presets"
+msgstr "Mostrar/Ocultar plantillas de configuración"
+
 #: src/slic3r/GUI/Preferences.cpp:304
 msgid "Show incompatible print and filament presets"
 msgstr "Mostrar impresiones incompatibles y ajustes iniciales de filamentos"
@@ -15278,6 +15330,15 @@ msgstr ""
 msgid "The extruder to use when printing infill."
 msgstr "El extrusor que se usa cuando se imprime relleno."
 
+#: src/libslic3r/PrintConfig.cpp:3241
+msgid ""
+"The extruder to use when printing perimeter of the wipe tower. Set to 0 to "
+"use the one that is available (non-soluble would be preferred)."
+msgstr ""
+"El extrusor a utilizar cuando se imprime el perímetro de la torre de "
+"limpieza. Configúralo a 0 para usar el que esté disponible (sería preferible "
+"no soluble)."
+
 #: src/libslic3r/PrintConfig.cpp:2036
 msgid ""
 "The extruder to use when printing perimeters and brim. First extruder is 1."
@@ -15658,7 +15719,6 @@ msgstr[0] ""
 msgstr[1] ""
 "Las impresoras físicas a continuación se basan en el ajuste, que vas a "
 "cambiar el nombre."
-msgstr[2] ""
 
 #: src/libslic3r/PrintConfig.cpp:641
 msgid ""
@@ -16837,9 +16897,9 @@ msgstr ""
 
 #: src/libslic3r/PrintConfig.cpp:4836
 msgid ""
-"This version of QIDISlicer may not understand configurations produced by "
+"This version of QIDISlicer may not understand configurations produced by the "
-"the newest QIDISlicer versions. For example, newer QIDISlicer may extend "
+"newest QIDISlicer versions. For example, newer QIDISlicer may extend the "
-"the list of supported firmware flavors. One may decide to bail out or to "
+"list of supported firmware flavors. One may decide to bail out or to "
 "substitute an unknown value with a default silently or verbosely."
 msgstr ""
 "Esta versión de QIDISlicer puede no entender las configuraciones producidas "
@@ -17253,6 +17313,10 @@ msgstr "Incapaz de recargar:"
 msgid "Unable to replace with more than one volume"
 msgstr "No se puede sustituir con más de un volumen"
 
+#: src/slic3r/GUI/Plater.cpp:6681
+msgid "Unable to save file"
+msgstr "No se ha podido guardar el archivo"
+
 #: src/slic3r/GUI/OptionsGroup.cpp:126
 msgid "Unavailable for this method."
 msgstr "No disponible para este método."
@@ -17348,6 +17412,10 @@ msgstr "Deshacer rotación"
 msgid "Undo translation"
 msgstr "Deshacer traducción"
 
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:667
+msgid "Unexpected character"
+msgstr "Carácter inesperado"
+
 #: src/libslic3r/miniz_extension.cpp:111
 msgid "unexpected decompressed size"
 msgstr "tamaño de descompresión inesperado"
@@ -17940,8 +18008,8 @@ msgstr ""
 "identificarle posteriormente. Para detectar entradas duplicadas, se envía un "
 "número único derivado de su sistema, pero la información de origen no puede "
 "reconstruirse. Aparte de eso, sólo se envían datos generales sobre tu "
-"sistema operativo, hardware e instalación de OpenGL. QIDISlicer es de "
+"sistema operativo, hardware e instalación de OpenGL. QIDISlicer es de código "
-"código abierto, si quiere inspeccionar el código que realmente realiza la "
+"abierto, si quiere inspeccionar el código que realmente realiza la "
 "comunicación, vea %1%."
 
 #: src/slic3r/GUI/ConfigWizard.cpp:562
@@ -18008,8 +18076,8 @@ msgstr ""
 "contiene M104 o M190. En ese caso, las temperaturas no se emitirán "
 "automáticamente así que puedes personalizar libremente las órdenes de "
 "calentamiento y otras acciones personalizadas. Ten en cuenta que puedes "
-"emplear variables para todos los ajustes de QIDISlicer, así que puedes "
+"emplear variables para todos los ajustes de QIDISlicer, así que puedes poner "
-"poner una orden \"M109 S[first_layer_temperature]\"  donde tú quieras. \n"
+"una orden \"M109 S[first_layer_temperature]\"  donde tú quieras. \n"
 "Si tu G-code Inicial Personalizado NO contiene M104 o M190, QIDISlicer "
 "ejecutará el G-code Inicial después de que la base alcance la temperatura "
 "deseada y el extrusor se comience a calentar.\n"
@@ -18253,7 +18321,11 @@ msgstr "Torre de limpieza"
 msgid "Wipe tower brim width"
 msgstr "Ancho de la balsa de la torre de limpieza"
 
-#: src/slic3r/GUI/Tab.cpp:2087
+#: src/libslic3r/PrintConfig.cpp:3239
+msgid "Wipe tower extruder"
+msgstr "Extrusor de la torre de limpieza"
+
+#: src/slic3r/GUI/Tab.cpp:2096
 msgid "Wipe tower parameters"
 msgstr "Parámetros de la torre de limpieza"
 
@@ -18392,15 +18464,20 @@ msgid ""
 "qidi3d.cz/qidislicer/.\n"
 "Do you wish to continue?"
 msgstr ""
-"Está ejecutando una versión de 32 bits de QIDISlicer en Windows de 64 "
+"Está ejecutando una versión de 32 bits de QIDISlicer en Windows de 64 bits.\n"
-"bits.\n"
 "La versión de 32 bits de QIDISlicer probablemente no podrá utilizar toda la "
 "RAM disponible en el sistema.\n"
 "Por favor, descarga e instala una versión de 64 bits de QIDISlice desde "
 "https://www.qidi3d.cz/qidislicer/.\n"
 "¿Desea continuar?"
 
-#: src/slic3r/GUI/Plater.cpp:5200
+#: src/slic3r/GUI/Plater.cpp:4103 src/slic3r/GUI/Plater.cpp:4109
+msgid "You are using template filament preset."
+msgid_plural "You are using template filament presets."
+msgstr[0] "Está utilizando la plantilla de configuración de filamento."
+msgstr[1] "Estás utilizando las plantillas de configuración de filamentos."
+
+#: src/slic3r/GUI/Plater.cpp:5241
 msgid ""
 "You can keep presets modifications to the new project, discard them or save "
 "changes as new presets.\n"
@@ -18463,12 +18540,13 @@ 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]."
+"[input_filename], [input_filename_base], [default_output_extension]."
 msgstr ""
-"Puedes usar todas las opciones de configuración como las variables dentro de "
+"Puedes utilizar todas las opciones de configuración como variables dentro de "
-"esta muestra. Por ejemplo [layer_height], [fill_density] etc.También puedes "
+"esta plantilla. Por ejemplo: [layer_height], [fill_density] etc. También "
-"usar [timestamp], [year], [month], [day], [hour], [minute], [second], "
+"puedes usar [timestamp], [year], [month], [day], [hour], [minute], [second], "
-"[version], [input_filename], [input_filename_base]."
+"[version], [input_filename], [input_filename_base], "
+"[default_output_extension]."
 
 #: src/slic3r/GUI/NotificationManager.hpp:908
 msgid ""
@@ -22863,10 +22941,6 @@ msgstr "Tarjeta japonesa 100 × 148 mm"
 msgid "Japanese Postcard Rotated 148 x 100 mm"
 msgstr "Tarjeta japonesa Girada 148 × 100 mm"
 
-#: ../src/common/stockitem.cpp:169
-msgid "Jump to"
-msgstr "Ir a"
-
 #: ../src/common/stockitem.cpp:171
 msgid "Justified"
 msgstr "Justificado"

resources/localization/fr/QIDISlicer_fr.po

@@ -1,11 +1,16 @@
 msgid ""
 msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
 "Language: 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: QIDIlator\n"
+"X-Generator: Poedit 3.3.2\n"
 
 #: src/libslic3r/PrintConfig.cpp:503 src/libslic3r/PrintConfig.cpp:594
 #: src/libslic3r/PrintConfig.cpp:603 src/libslic3r/PrintConfig.cpp:612
@@ -66,7 +71,6 @@ msgid "%1$d connector is out of cut contour"
 msgid_plural "%1$d connectors are out of cut contour"
 msgstr[0] "%1$d connecteur est hors du contour de coupe"
 msgstr[1] "%1$d connecteurs sont hors du contour de coupe"
-msgstr[2] ""
 
 #: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2200
 #, c-format, boost-format
@@ -74,7 +78,6 @@ msgid "%1$d connector is out of object"
 msgid_plural "%1$d connectors are out of object"
 msgstr[0] "%1$d connecteur est hors de l'objet"
 msgstr[1] "%1$d connecteurs sont hors de l'objet"
-msgstr[2] ""
 
 #: src/slic3r/GUI/GUI_ObjectList.cpp:459
 #, c-format, boost-format
@@ -110,7 +113,6 @@ msgid "%1$d object was loaded as a part of cut object."
 msgid_plural "%1$d objects were loaded as parts of cut object"
 msgstr[0] "%1$d objet a été chargé en tant que pièce de l'objet coupé."
 msgstr[1] "%1$d objets ont été chargés en tant que pièces de l'objet coupé"
-msgstr[2] ""
 
 #: src/slic3r/GUI/NotificationManager.cpp:1649
 #, c-format, boost-format
@@ -184,7 +186,17 @@ msgstr ""
 "%1%=%2% mm est trop bas pour être imprimable avec une hauteur de couche de "
 "%3% mm"
 
-#: src/slic3r/GUI/Tab.cpp:5227
+#: src/slic3r/GUI/DoubleSlider.cpp:711 src/libslic3r/Utils.cpp:1016
+#, boost-format
+msgid "%1%d"
+msgstr "%1%j"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:712 src/libslic3r/Utils.cpp:1017
+#, boost-format
+msgid "%1%h"
+msgstr "%1%h"
+
+#: src/slic3r/GUI/Tab.cpp:5244
 #, boost-format
 msgid ""
 "\"%1%\" is disabled because \"%2%\" is on in \"%3%\" category.\n"
@@ -197,6 +209,12 @@ msgstr ""
 msgid "1 (light)"
 msgstr "1 (léger)"
 
+#. TRN "m" means "minutes"
+#: src/slic3r/GUI/DoubleSlider.cpp:713 src/libslic3r/Utils.cpp:1019
+#, boost-format
+msgid "%1%m"
+msgstr "%1%m"
+
 #. TRN ConfigWizard: Materials : "%1%" = "Filaments"/"SLA materials"
 #: src/slic3r/GUI/ConfigWizard.cpp:838
 #, boost-format
@@ -234,6 +252,11 @@ msgstr "%1% Préréglage"
 msgid "%1% : read only"
 msgstr "%1% : lecture seule"
 
+#: src/slic3r/GUI/DoubleSlider.cpp:714 src/libslic3r/Utils.cpp:1027
+#, boost-format
+msgid "%1%s"
+msgstr "%1%s"
+
 #. TRN ConfigWizard: Materials : "%1%" = "Filaments"/"SLA materials"
 #: src/slic3r/GUI/ConfigWizard.cpp:835
 #, boost-format
@@ -1326,8 +1349,8 @@ msgstr ""
 
 #: src/slic3r/GUI/OpenGLManager.cpp:390
 msgid ""
-"As a workaround, you may run QIDISlicer with a software rendered 3D "
+"As a workaround, you may run QIDISlicer with a software rendered 3D graphics "
-"graphics by running qidi-slicer.exe with the --sw-renderer parameter."
+"by running qidi-slicer.exe with the --sw-renderer parameter."
 msgstr ""
 "Pour contourner le problème, vous pouvez exécuter QIDISlicer avec un rendu "
 "graphique 3D logiciel en exécutant qidi-slicer.exe avec le paramètre --sw-"
@@ -1592,7 +1615,12 @@ msgstr ""
 "zéro pour désactiver les commandes de contrôle de température du plateau "
 "dans la sortie."
 
-#: src/slic3r/GUI/Tab.cpp:2569 src/libslic3r/GCode.cpp:768
+#: src/slic3r/GUI/Plater.cpp:3229
+msgid "Bed temperatures for the used filaments differ significantly."
+msgstr ""
+"Les températures de lit pour les filaments utilisés sont très différentes."
+
+#: src/slic3r/GUI/Tab.cpp:2586 src/libslic3r/GCode.cpp:768
 #: src/libslic3r/PrintConfig.cpp:442
 msgid "Before layer change G-code"
 msgstr "G-Code avant changement de couche"
@@ -1700,8 +1728,8 @@ msgid ""
 msgstr ""
 "Sélection en boîte\n"
 "Saviez-vous que vous pouvez faire une sélection en boîte avec Maj.+Glisser "
-"la souris? Vous pouvez également désélectionner des objets avec <b>Alt"
+"la souris? Vous pouvez également désélectionner des objets avec "
-"+Glisser la souris</b> ."
+"<b>Alt+Glisser la souris</b> ."
 
 #: src/libslic3r/PrintConfig.cpp:2969
 msgid "Branch Density"
@@ -1736,6 +1764,10 @@ msgstr ""
 "diamètre seront imprimées avec des doubles parois pour plus de stabilité. "
 "Réglez cette valeur à zéro pour aucune double paroi."
 
+#: src/slic3r/GUI/Tab.cpp:5174
+msgid "Branching"
+msgstr "Branchement"
+
 #. TRN One of the "Support tree type"s on SLAPrintSettings : Supports
 #: src/libslic3r/PrintConfig.cpp:3929
 msgid "Branching (experimental)"
@@ -1754,6 +1786,10 @@ msgstr "Pont"
 msgid "Bridge flow ratio"
 msgstr "Ratio de flux pour les ponts"
 
+#: src/libslic3r/ExtrusionRole.cpp:45 src/libslic3r/ExtrusionRole.cpp:73
+msgid "Bridge infill"
+msgstr "Remplissage du pont"
+
 #: src/libslic3r/PrintConfig.cpp:522
 msgid "Bridges"
 msgstr "Ponts"
@@ -2658,6 +2694,17 @@ msgstr "Confirmation"
 msgid "Confirm connectors"
 msgstr "Confirmer les connecteurs"
 
+#. TRN %3% is name of Object1, %4% is name of Object2
+#: src/slic3r/GUI/GLCanvas3D.cpp:7496
+#, boost-format
+msgid ""
+"Conflicts in G-code paths have been detected at layer %1%, z=%2$.2f mm. "
+"Please reposition the conflicting objects (%3% <-> %4%) further apart."
+msgstr ""
+"Des conflits dans les chemins de code G ont été détectés à la couche %1%, "
+"z=%2$.2f mm. Veuillez repositionner les objets en conflit (%3% <-> %4%) plus "
+"loin les uns des autres."
+
 #: src/libslic3r/PrintConfig.cpp:1492
 msgid ""
 "Connect an infill line to an internal perimeter with a short segment of an "
@@ -2997,8 +3044,8 @@ msgid ""
 "Could not detect system SSL certificate store. QIDISlicer will be unable to "
 "establish secure network connections."
 msgstr ""
-"Impossible de détecter le stockage de certificats SSL du système. "
+"Impossible de détecter le stockage de certificats SSL du système. QIDISlicer "
-"QIDISlicer ne pourra pas établir de connexions réseau sécurisées."
+"ne pourra pas établir de connexions réseau sécurisées."
 
 #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:318
 msgid "Could not get a valid Printer Host reference"
@@ -3122,6 +3169,12 @@ msgstr ""
 "L'initialisation de CURL a échoué. QIDISlicer ne pourra pas établir de "
 "connexions réseau. Voir les journaux pour plus de détails."
 
+#. TRN Means "current color"
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:340
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:356
+msgid "Current"
+msgstr "Courant"
+
 #: src/slic3r/GUI/wxExtensions.cpp:629
 #, c-format, boost-format
 msgid "Current mode is %s"
@@ -5058,6 +5111,10 @@ msgstr "Exposition"
 msgid "Exposure time"
 msgstr "Temps d'exposition"
 
+#: src/libslic3r/ExtrusionRole.cpp:39 src/libslic3r/ExtrusionRole.cpp:61
+msgid "External perimeter"
+msgstr "Périmètre externe"
+
 #: src/slic3r/GUI/PresetHints.cpp:170
 msgid "external perimeters"
 msgstr "périmètres externes"
@@ -6360,8 +6417,9 @@ msgstr "Cacher la règle"
 #: resources/data/hints.ini: [hint:Hiding sidebar]
 msgid ""
 "Hiding sidebar\n"
-"Did you know that you can hide the right sidebar using the shortcut <b>Shift"
+"Did you know that you can hide the right sidebar using the shortcut "
-"+Tab</b>? You can also enable the icon for this from the<a>Preferences</a>."
+"<b>Shift+Tab</b>? You can also enable the icon for this from "
+"the<a>Preferences</a>."
 msgstr ""
 "Masquer la barre latérale\n"
 "Saviez-vous que vous pouvez masquer la barre latérale droite en utilisant le "
@@ -6589,8 +6647,8 @@ msgid ""
 msgstr ""
 "Si cette case est cochée, les supports seront générés automatiquement en "
 "fonction de la valeur seuil de surplomb. Si cette case n'est pas cochée, les "
-"supports seront générés uniquement dans les volumes \"Générateur de supports"
+"supports seront générés uniquement dans les volumes \"Générateur de "
-"\"."
+"supports\"."
 
 #. TRN ConfigWizard : Downloader : %1% = "QIDISlicer"
 #: src/slic3r/GUI/ConfigWizard.cpp:1472
@@ -6743,8 +6801,8 @@ msgstr ""
 #: src/slic3r/GUI/Preferences.cpp:280
 msgid "If enabled, sets QIDISlicer as default application to open .stl files."
 msgstr ""
-"Si activé, définit QIDISlicer comme l'application par défaut pour ouvrir "
+"Si activé, définit QIDISlicer comme l'application par défaut pour ouvrir les "
-"les fichiers .stl."
+"fichiers .stl."
 
 #: src/slic3r/GUI/Preferences.cpp:360
 msgid ""
@@ -6807,8 +6865,8 @@ msgstr ""
 #: src/libslic3r/PrintConfig.cpp:4857
 msgid ""
 "If enabled, the command line arguments are sent to an existing instance of "
-"GUI QIDISlicer, or an existing QIDISlicer window is activated. Overrides "
+"GUI QIDISlicer, or an existing QIDISlicer window is activated. Overrides the "
-"the \"single_instance\" configuration value from application preferences."
+"\"single_instance\" configuration value from application preferences."
 msgstr ""
 "Si activé, les arguments de ligne de commande sont envoyés à une instance "
 "existante de la GUI de QIDISlicer, ou une fenêtre existante de QIDISlicer "
@@ -6905,8 +6963,8 @@ msgid ""
 "If estimated layer time is greater, but still below ~%1%s, fan will run at "
 "%2%%%"
 msgstr ""
-"Si le temps estimé pour la couche est supérieur, mais toujours inférieur à ~"
+"Si le temps estimé pour la couche est supérieur, mais toujours inférieur à "
-"%1%s, le ventilateur fonctionnera à %2%%%"
+"~%1%s, le ventilateur fonctionnera à %2%%%"
 
 #: src/slic3r/GUI/PresetHints.cpp:40
 #, boost-format
@@ -6914,9 +6972,9 @@ msgid ""
 "If estimated layer time is greater, but still below ~%1%s, fan will run at a "
 "proportionally decreasing speed between %2%%% and %3%%%."
 msgstr ""
-"Si le temps estimé pour la couche est supérieur, mais cependant inférieur à ~"
+"Si le temps estimé pour la couche est supérieur, mais cependant inférieur à "
-"%1%s, le ventilateur tournera à une vitesse proportionnellement décroissante "
+"~%1%s, le ventilateur tournera à une vitesse proportionnellement "
-"entre %2%%% et %3%%%."
+"décroissante entre %2%%% et %3%%%."
 
 #: src/libslic3r/PrintConfig.cpp:1300
 msgid ""
@@ -7010,9 +7068,9 @@ msgid ""
 "same QIDISlicer is already running, that instance will be reactivated "
 "instead."
 msgstr ""
-"Si cela est activé, lors du démarrage de QIDISlicer et si une autre "
+"Si cela est activé, lors du démarrage de QIDISlicer et si une autre instance "
-"instance du même QIDISlicer est déjà en cours d'exécution, cette instance "
+"du même QIDISlicer est déjà en cours d'exécution, cette instance sera "
-"sera réactivée à la place."
+"réactivée à la place."
 
 #: src/slic3r/GUI/SendSystemInfoDialog.cpp:591
 msgid ""
@@ -7459,6 +7517,10 @@ msgstr "erreur interne"
 msgid "Internal error: %1%"
 msgstr "Erreur interne : %1%"
 
+#: src/libslic3r/ExtrusionRole.cpp:41 src/libslic3r/ExtrusionRole.cpp:65
+msgid "Internal infill"
+msgstr "Remplissage interne"
+
 #: src/libslic3r/GCode.cpp:825
 msgid "In the custom G-code were found reserved keywords:"
 msgstr "Dans le G-code personnalisé ont été trouvés des mots-clés réservés :"
@@ -7644,6 +7706,15 @@ msgstr "Gigue"
 msgid "Join"
 msgstr "Joindre"
 
+#: src/slic3r/GUI/GLCanvas3D.cpp:7526 ../src/common/stockitem.cpp:169
+#, fuzzy
+msgid "Jump to"
+msgstr ""
+"#-#-#-#-#  catalog.po  #-#-#-#-#\n"
+"Sauter à\n"
+"#-#-#-#-#  catalog.po  #-#-#-#-#\n"
+"Aller à"
+
 #: src/slic3r/GUI/DoubleSlider.cpp:2094 src/slic3r/GUI/DoubleSlider.cpp:2324
 msgid "Jump to height"
 msgstr "Sauter à la hauteur"
@@ -8626,6 +8697,11 @@ msgid "Message for pause print on current layer (%1% mm)."
 msgstr ""
 "Message pour mettre en pause l'impression sur la couche en cours (%1% mm)."
 
+#: src/slic3r/GUI/GCodeViewer.cpp:3291
+msgctxt "Metre"
+msgid "m"
+msgstr "m"
+
 #: src/libslic3r/PrintConfig.cpp:1897 src/libslic3r/PrintConfig.cpp:1906
 msgid "Min"
 msgstr "Minimum"
@@ -9058,6 +9134,10 @@ msgstr "Lignes Monotones"
 msgid "More"
 msgstr "Plus"
 
+#: src/slic3r/GUI/Plater.cpp:4106
+msgid "More info at"
+msgstr "Plus d'informations à l'adresse suivante"
+
 #: src/slic3r/GUI/GUI.cpp:317
 msgid ""
 "Most likely the configuration was produced by a newer version of QIDISlicer "
@@ -9534,7 +9614,6 @@ msgstr[0] ""
 msgstr[1] ""
 "Notez que le préréglage sélectionné sera également renommé pour ces "
 "imprimantes."
-msgstr[2] ""
 
 #: src/slic3r/GUI/Tab.cpp:4151
 msgid ""
@@ -10175,6 +10254,12 @@ msgstr "Orienter le texte vers la caméra."
 msgid "Origin"
 msgstr "Origine"
 
+#. TRN Means "original color"
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:342
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:356
+msgid "Original"
+msgstr "Original"
+
 #: src/slic3r/GUI/UnsavedChangesDialog.cpp:860
 msgid "Original value"
 msgstr "Valeur d'origine"
@@ -10235,6 +10320,10 @@ msgstr "Parois extérieures"
 msgid "Overflow"
 msgstr "Débordement"
 
+#: src/libslic3r/ExtrusionRole.cpp:40 src/libslic3r/ExtrusionRole.cpp:63
+msgid "Overhang perimeter"
+msgstr "Périmètre en surplomb"
+
 #. TRN FilamentSettings : "Dynamic fan speeds"
 #: src/libslic3r/PrintConfig.cpp:587
 msgid ""
@@ -10831,6 +10920,16 @@ msgid "Please check your object list before preset changing."
 msgstr ""
 "Veuillez vérifier votre liste d'objet avant le changement de préréglage."
 
+#: src/slic3r/GUI/Plater.cpp:4104 src/slic3r/GUI/Plater.cpp:4110
+msgid ""
+"Please note that template presets are not customized for specific printer "
+"and should only be used as a starting point for creating your own user "
+"presets."
+msgstr ""
+"Veuillez noter que les modèles de préréglages ne sont pas personnalisés pour "
+"une imprimante spécifique et ne doivent être utilisés que comme point de "
+"départ pour la création de vos propres préréglages utilisateur."
+
 #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:85
 msgid ""
 "Please save your project and restart QIDISlicer. We would be glad if you "
@@ -11121,8 +11220,8 @@ msgid ""
 msgstr ""
 "Intégration de Printables.com\n"
 "Saviez-vous que lorsque vous naviguez sur Printables.com, vous pouvez "
-"envoyer des fichiers de modèle 3D à QIDISlicer en un seul clic ? Apprenez-"
+"envoyer des fichiers de modèle 3D à QIDISlicer en un seul clic ? Apprenez-en "
-"en plus dans la documentation."
+"plus dans la documentation."
 
 #: resources/data/hints.ini: [hint:Printable toggle]
 msgid ""
@@ -11394,14 +11493,14 @@ msgstr ""
 "Pour plus d'informations, consultez notre outil de suivi des problèmes "
 "GitHub : \"%2%\" et \"%3%\"\n"
 "\n"
-"Pour éviter ce problème, pensez à désactiver \"%4%\" dans les \"Préférences"
+"Pour éviter ce problème, pensez à désactiver \"%4%\" dans les "
-"\". Sinon, l'application plantera probablement à nouveau la prochaine fois."
+"\"Préférences\". Sinon, l'application plantera probablement à nouveau la "
+"prochaine fois."
 
 #: src/slic3r/Utils/Http.cpp:78
 #, boost-format
 msgid "QIDISlicer detected system SSL certificate store in: %1%"
-msgstr ""
+msgstr "QIDISlicer a détecté un stockage de certificats SSL système dans : %1%"
-"QIDISlicer a détecté un stockage de certificats SSL système dans : %1%"
 
 #: src/slic3r/GUI/GUI_App.cpp:3298 src/slic3r/GUI/Plater.cpp:1742
 #: src/slic3r/GUI/UnsavedChangesDialog.cpp:937
@@ -11423,9 +11522,9 @@ msgstr "QIDISlicer a rencontré une erreur fatale : \" %1%\""
 
 #: src/slic3r/GUI/GUI_App.cpp:743
 msgid ""
-"QIDISlicer has encountered a localization error. Please report to "
+"QIDISlicer has encountered a localization error. Please report to QIDISlicer "
-"QIDISlicer team, what language was active and in which scenario this issue "
+"team, what language was active and in which scenario this issue happened. "
-"happened. Thank you.\n"
+"Thank you.\n"
 "\n"
 "The application will now terminate."
 msgstr ""
@@ -11837,9 +11936,9 @@ msgid ""
 msgstr ""
 "Recharger depuis le disque\n"
 "Saviez-vous que si vous avez créé une version plus récente de votre modèle, "
-"vous pouvez simplement le recharger dans QIDISlicer ? Cliquez avec le "
+"vous pouvez simplement le recharger dans QIDISlicer ? Cliquez avec le bouton "
-"bouton droit sur le modèle dans la vue 3D et choisissez Recharger depuis le "
+"droit sur le modèle dans la vue 3D et choisissez Recharger depuis le disque. "
-"disque. Lire la suite dans la documentation."
+"Lire la suite dans la documentation."
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:111
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:113
@@ -13598,6 +13697,10 @@ msgstr "Afficher/Masquer la légende"
 msgid "Show/Hide object/instance labels"
 msgstr "Afficher/Masquer les labels de l'objet/instance"
 
+#: src/slic3r/GUI/PresetComboBoxes.cpp:787
+msgid "Show/Hide template presets"
+msgstr "Afficher/masquer les préréglages des modèles"
+
 #: src/slic3r/GUI/Preferences.cpp:304
 msgid "Show incompatible print and filament presets"
 msgstr "Afficher les préréglages d'impression et de filament incompatibles"
@@ -13870,6 +13973,10 @@ msgstr "Jupe"
 msgid "Skirt and brim"
 msgstr "Jupe et bordure"
 
+#: src/libslic3r/ExtrusionRole.cpp:47 src/libslic3r/ExtrusionRole.cpp:77
+msgid "Skirt/Brim"
+msgstr "Jupe/Bordure"
+
 #: src/libslic3r/PrintConfig.cpp:2350
 msgid "Skirt height"
 msgstr "Hauteur de la jupe"
@@ -15332,6 +15439,15 @@ msgstr ""
 msgid "The extruder to use when printing infill."
 msgstr "L'extrudeur à utiliser pour imprimer le remplissage."
 
+#: src/libslic3r/PrintConfig.cpp:3241
+msgid ""
+"The extruder to use when printing perimeter of the wipe tower. Set to 0 to "
+"use the one that is available (non-soluble would be preferred)."
+msgstr ""
+"L'extrudeur à utiliser lors de l'impression du périmètre de la tour "
+"d'essuyage. La valeur 0 permet d'utiliser l'extrudeuse disponible (de "
+"préférence non soluble)."
+
 #: src/libslic3r/PrintConfig.cpp:2036
 msgid ""
 "The extruder to use when printing perimeters and brim. First extruder is 1."
@@ -15712,7 +15828,6 @@ msgstr[0] ""
 msgstr[1] ""
 "Les imprimantes physiques ci-dessous sont basées sur le préréglage que vous "
 "allez renommer."
-msgstr[2] ""
 
 #: src/libslic3r/PrintConfig.cpp:641
 msgid ""
@@ -16313,8 +16428,8 @@ msgstr ""
 "Cette procédure de fin est insérée à la fin d'un fichier de sortie, avant le "
 "gcode de fin de l'imprimante (et avant tout changement d'outil de ce "
 "filament dans le cas des imprimantes multimatériaux). Notez que vous pouvez "
-"utiliser des variables génériques pour tous les réglages QIDISlicer. Si "
+"utiliser des variables génériques pour tous les réglages QIDISlicer. Si vous "
-"vous avez des extrudeurs multiples, le gcode est traité dans l'ordre des "
+"avez des extrudeurs multiples, le gcode est traité dans l'ordre des "
 "extrudeurs."
 
 #: src/libslic3r/PrintConfig.cpp:787
@@ -16855,10 +16970,10 @@ msgstr ""
 "Cette procédure de départ est insérée au début, après n'importe quel gcode "
 "de départ de l'imprimante (et après n'importe quel changement d'outil pour "
 "ce filament dans le cas des imprimantes multi-matériaux). Ceci est utilisé "
-"pour supplanter les réglages d'un filament spécifique. Si QIDISlicer "
+"pour supplanter les réglages d'un filament spécifique. Si QIDISlicer détecte "
-"détecte M104, M109, M140 ou M190 dans vos codes personnalisés, de telles "
+"M104, M109, M140 ou M190 dans vos codes personnalisés, de telles commandes "
-"commandes ne seront pas ajoutées automatiquement de sorte que vous restez "
+"ne seront pas ajoutées automatiquement de sorte que vous restez libre de "
-"libre de personnaliser l'ordre des commandes de chauffe et autres actions "
+"personnaliser l'ordre des commandes de chauffe et autres actions "
 "personnalisées. Notez que vous pouvez utiliser des variables génériques pour "
 "les tous les paramètres QIDISlicer, donc vous pouvez utiliser une commande "
 "\"M109 S[first_layer_temperature]\" où vous voulez."
@@ -16910,9 +17025,9 @@ msgstr ""
 
 #: src/libslic3r/PrintConfig.cpp:4836
 msgid ""
-"This version of QIDISlicer may not understand configurations produced by "
+"This version of QIDISlicer may not understand configurations produced by the "
-"the newest QIDISlicer versions. For example, newer QIDISlicer may extend "
+"newest QIDISlicer versions. For example, newer QIDISlicer may extend the "
-"the list of supported firmware flavors. One may decide to bail out or to "
+"list of supported firmware flavors. One may decide to bail out or to "
 "substitute an unknown value with a default silently or verbosely."
 msgstr ""
 "Cette version de QIDISlicer peut ne pas comprendre les configurations "
@@ -17331,6 +17446,10 @@ msgstr "Impossible de recharger :"
 msgid "Unable to replace with more than one volume"
 msgstr "Impossible de remplacer par plus d'un volume"
 
+#: src/slic3r/GUI/Plater.cpp:6681
+msgid "Unable to save file"
+msgstr "Impossible d'enregistrer le fichier"
+
 #: src/slic3r/GUI/OptionsGroup.cpp:126
 msgid "Unavailable for this method."
 msgstr "Non disponible pour cette méthode."
@@ -17426,6 +17545,10 @@ msgstr "Rétablir la rotation"
 msgid "Undo translation"
 msgstr "Rétablir la translation"
 
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:667
+msgid "Unexpected character"
+msgstr "Caractère inattendu"
+
 #: src/libslic3r/miniz_extension.cpp:111
 msgid "unexpected decompressed size"
 msgstr "volume de décompression inattendu"
@@ -18096,8 +18219,8 @@ msgstr ""
 "QIDISlicer, vous pouvez donc mettre une commande \"M109 "
 "S[first_layer_temperature]\" où vous voulez.\n"
 "Si votre G-code de début personnalisé ne contient PAS M104 ou M190, "
-"QIDISlicer exécutera le G-code de début une fois que le plateau a atteint "
+"QIDISlicer exécutera le G-code de début une fois que le plateau a atteint sa "
-"sa température cible et que l'extrudeur vient de commencer à chauffer.\n"
+"température cible et que l'extrudeur vient de commencer à chauffer.\n"
 "\n"
 "Si désactivé, QIDISlicer n'émettra PAS de commandes pour chauffer "
 "l'extrudeur et le plateau, laissant les deux au G-code de début personnalisé."
@@ -18346,7 +18469,11 @@ msgstr "Tour de Nettoyage"
 msgid "Wipe tower brim width"
 msgstr "Largeur de la bordure de la tour de nettoyage"
 
-#: src/slic3r/GUI/Tab.cpp:2087
+#: src/libslic3r/PrintConfig.cpp:3239
+msgid "Wipe tower extruder"
+msgstr "Tour d'essuyage de l'extrudeuse"
+
+#: src/slic3r/GUI/Tab.cpp:2096
 msgid "Wipe tower parameters"
 msgstr "Paramètres de la tour de nettoyage"
 
@@ -18491,11 +18618,17 @@ msgstr ""
 "Vous exécutez une version 32 bits de QIDISlicer sur Windows 64 bits.\n"
 "La version 32 bits de QIDISlicer ne pourra probablement pas utiliser toute "
 "la RAM disponible dans le système.\n"
-"Veuillez télécharger et installer une version 64 bits de QIDISlicer à "
+"Veuillez télécharger et installer une version 64 bits de QIDISlicer à partir "
-"partir de https://www.qidi3d.fr/qidislicer/.\n"
+"de https://www.qidi3d.fr/qidislicer/.\n"
 "Souhaitez-vous continuer ?"
 
-#: src/slic3r/GUI/Plater.cpp:5200
+#: src/slic3r/GUI/Plater.cpp:4103 src/slic3r/GUI/Plater.cpp:4109
+msgid "You are using template filament preset."
+msgid_plural "You are using template filament presets."
+msgstr[0] "Vous utilisez un préréglage de filament de modèle."
+msgstr[1] "Vous utilisez des préréglages de filament de modèle."
+
+#: src/slic3r/GUI/Plater.cpp:5241
 msgid ""
 "You can keep presets modifications to the new project, discard them or save "
 "changes as new presets.\n"
@@ -18565,12 +18698,13 @@ 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]."
+"[input_filename], [input_filename_base], [default_output_extension]."
 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]."
+"[second], [version], [input_filename], [input_filename_base], "
+"[default_output_extension]."
 
 #: src/slic3r/GUI/NotificationManager.hpp:908
 msgid ""
@@ -22988,10 +23122,6 @@ msgstr "Enveloppe japonaise 100 x 148 mm"
 msgid "Japanese Postcard Rotated 148 x 100 mm"
 msgstr "Enveloppe japonaise Paysage 148 x 100 mm"
 
-#: ../src/common/stockitem.cpp:169
-msgid "Jump to"
-msgstr "Aller à"
-
 #: ../src/common/stockitem.cpp:171
 msgid "Justified"
 msgstr "Justifié"

resources/localization/it/QIDISlicer_it.po

@@ -1,11 +1,16 @@
 msgid ""
 msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \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: QIDIlator\n"
+"X-Generator: Poedit 3.3.2\n"
 
 #: src/libslic3r/PrintConfig.cpp:503 src/libslic3r/PrintConfig.cpp:594
 #: src/libslic3r/PrintConfig.cpp:603 src/libslic3r/PrintConfig.cpp:612
@@ -66,7 +71,6 @@ msgid "%1$d connector is out of cut contour"
 msgid_plural "%1$d connectors are out of cut contour"
 msgstr[0] "%1$d connettore è fuori dal profilo di taglio"
 msgstr[1] "%1$d connettori sono fuori dal profilo di taglio"
-msgstr[2] ""
 
 #: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2200
 #, c-format, boost-format
@@ -74,7 +78,6 @@ msgid "%1$d connector is out of object"
 msgid_plural "%1$d connectors are out of object"
 msgstr[0] "%1$d connettore è fuori dall'oggetto"
 msgstr[1] "%1$d connettori sono fuori dall'oggetto"
-msgstr[2] ""
 
 #: src/slic3r/GUI/GUI_ObjectList.cpp:459
 #, c-format, boost-format
@@ -110,7 +113,6 @@ msgid "%1$d object was loaded as a part of cut object."
 msgid_plural "%1$d objects were loaded as parts of cut object"
 msgstr[0] "%1$d oggetto è stato caricato come parte di un oggetto tagliato."
 msgstr[1] "%1$d oggetti sono stati caricati come parti di un oggetto tagliato"
-msgstr[2] ""
 
 #: src/slic3r/GUI/NotificationManager.cpp:1649
 #, c-format, boost-format
@@ -183,7 +185,17 @@ msgid "%1%=%2% mm is too low to be printable at a layer height %3% mm"
 msgstr ""
 "%1%=%2% mm è troppo basso per essere un altezza layer stampabile %3% mm"
 
-#: src/slic3r/GUI/Tab.cpp:5227
+#: src/slic3r/GUI/DoubleSlider.cpp:711 src/libslic3r/Utils.cpp:1016
+#, boost-format
+msgid "%1%d"
+msgstr "%1%g"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:712 src/libslic3r/Utils.cpp:1017
+#, boost-format
+msgid "%1%h"
+msgstr "%1%h"
+
+#: src/slic3r/GUI/Tab.cpp:5244
 #, boost-format
 msgid ""
 "\"%1%\" is disabled because \"%2%\" is on in \"%3%\" category.\n"
@@ -196,6 +208,12 @@ msgstr ""
 msgid "1 (light)"
 msgstr "1 (leggero)"
 
+#. TRN "m" means "minutes"
+#: src/slic3r/GUI/DoubleSlider.cpp:713 src/libslic3r/Utils.cpp:1019
+#, boost-format
+msgid "%1%m"
+msgstr "%1%m"
+
 #. TRN ConfigWizard: Materials : "%1%" = "Filaments"/"SLA materials"
 #: src/slic3r/GUI/ConfigWizard.cpp:838
 #, boost-format
@@ -233,6 +251,11 @@ msgstr "%1% Preset"
 msgid "%1% : read only"
 msgstr "%1% : sola lettura"
 
+#: src/slic3r/GUI/DoubleSlider.cpp:714 src/libslic3r/Utils.cpp:1027
+#, boost-format
+msgid "%1%s"
+msgstr "%1%s"
+
 #. TRN ConfigWizard: Materials : "%1%" = "Filaments"/"SLA materials"
 #: src/slic3r/GUI/ConfigWizard.cpp:835
 #, boost-format
@@ -1313,8 +1336,8 @@ msgstr ""
 
 #: src/slic3r/GUI/OpenGLManager.cpp:390
 msgid ""
-"As a workaround, you may run QIDISlicer with a software rendered 3D "
+"As a workaround, you may run QIDISlicer with a software rendered 3D graphics "
-"graphics by running qidi-slicer.exe with the --sw-renderer parameter."
+"by running qidi-slicer.exe with the --sw-renderer parameter."
 msgstr ""
 "Come soluzione alternativa, puoi eseguire QIDISlicer con una grafica 3D "
 "renderizzata dal software eseguendo qidi-slicer.exe con il parametro --sw-"
@@ -1574,7 +1597,13 @@ msgstr ""
 "Temperatura per i layer dopo il primo. Imposta a zero per disattivare i "
 "comandi di controllo della temperatura del piano di stampa in output."
 
-#: src/slic3r/GUI/Tab.cpp:2569 src/libslic3r/GCode.cpp:768
+#: src/slic3r/GUI/Plater.cpp:3229
+msgid "Bed temperatures for the used filaments differ significantly."
+msgstr ""
+"Le temperature del piano per i filamenti utilizzati differiscono in modo "
+"significativo."
+
+#: src/slic3r/GUI/Tab.cpp:2586 src/libslic3r/GCode.cpp:768
 #: src/libslic3r/PrintConfig.cpp:442
 msgid "Before layer change G-code"
 msgstr "G-code prima del cambio layer"
@@ -1716,6 +1745,10 @@ msgstr ""
 "diametro verranno stampate con pareti doppie per garantire la stabilità. "
 "Imposta questo valore a zero per non avere pareti doppie."
 
+#: src/slic3r/GUI/Tab.cpp:5174
+msgid "Branching"
+msgstr "Ramificazione"
+
 #. TRN One of the "Support tree type"s on SLAPrintSettings : Supports
 #: src/libslic3r/PrintConfig.cpp:3929
 msgid "Branching (experimental)"
@@ -1734,6 +1767,10 @@ msgstr "Bridge"
 msgid "Bridge flow ratio"
 msgstr "Rapporto flusso Bridge"
 
+#: src/libslic3r/ExtrusionRole.cpp:45 src/libslic3r/ExtrusionRole.cpp:73
+msgid "Bridge infill"
+msgstr "Riempimento Bridge"
+
 #: src/libslic3r/PrintConfig.cpp:522
 msgid "Bridges"
 msgstr "Bridge"
@@ -2635,6 +2672,17 @@ msgstr "Conferma"
 msgid "Confirm connectors"
 msgstr "Conferma connettori"
 
+#. TRN %3% is name of Object1, %4% is name of Object2
+#: src/slic3r/GUI/GLCanvas3D.cpp:7496
+#, boost-format
+msgid ""
+"Conflicts in G-code paths have been detected at layer %1%, z=%2$.2f mm. "
+"Please reposition the conflicting objects (%3% <-> %4%) further apart."
+msgstr ""
+"Sono stati rilevati conflitti nei percorsi G-Code nel layer %1%, z=%2$.2f "
+"mm. Riposizionare gli oggetti in conflitto (%3% <-> %4%) ad una distanza "
+"maggiore."
+
 #: src/libslic3r/PrintConfig.cpp:1492
 msgid ""
 "Connect an infill line to an internal perimeter with a short segment of an "
@@ -3094,6 +3142,12 @@ msgstr ""
 "CURL init non riuscito. QIDISlicer non sarà in grado di stabilire "
 "connessioni di rete. Vedere i log per ulteriori dettagli."
 
+#. TRN Means "current color"
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:340
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:356
+msgid "Current"
+msgstr "Attuale"
+
 #: src/slic3r/GUI/wxExtensions.cpp:629
 #, c-format, boost-format
 msgid "Current mode is %s"
@@ -5012,6 +5066,10 @@ msgstr "Esposizione"
 msgid "Exposure time"
 msgstr "Tempo di esposizione"
 
+#: src/libslic3r/ExtrusionRole.cpp:39 src/libslic3r/ExtrusionRole.cpp:61
+msgid "External perimeter"
+msgstr "Perimetro esterno"
+
 #: src/slic3r/GUI/PresetHints.cpp:170
 msgid "external perimeters"
 msgstr "perimetri esterni"
@@ -6300,8 +6358,9 @@ msgstr "Nascondi righello"
 #: resources/data/hints.ini: [hint:Hiding sidebar]
 msgid ""
 "Hiding sidebar\n"
-"Did you know that you can hide the right sidebar using the shortcut <b>Shift"
+"Did you know that you can hide the right sidebar using the shortcut "
-"+Tab</b>? You can also enable the icon for this from the<a>Preferences</a>."
+"<b>Shift+Tab</b>? You can also enable the icon for this from "
+"the<a>Preferences</a>."
 msgstr ""
 "Nascondere barra laterale\n"
 "Sapevi che puoi nascondere la barra laterale destra usando la scorciatoia "
@@ -6737,8 +6796,8 @@ msgstr ""
 #: src/libslic3r/PrintConfig.cpp:4857
 msgid ""
 "If enabled, the command line arguments are sent to an existing instance of "
-"GUI QIDISlicer, or an existing QIDISlicer window is activated. Overrides "
+"GUI QIDISlicer, or an existing QIDISlicer window is activated. Overrides the "
-"the \"single_instance\" configuration value from application preferences."
+"\"single_instance\" configuration value from application preferences."
 msgstr ""
 "Se abilitato, gli argomenti della riga di comando vengono inviati ad "
 "un'istanza GUI esistente di QIDISlicer, oppure viene attivata una finestra "
@@ -6939,8 +6998,7 @@ msgid ""
 "instead."
 msgstr ""
 "Se questo è abilitato, quando si avvia QIDISlicer e un'altra istanza della "
-"stessa QIDISlicer è già in esecuzione, quell'istanza verrà invece "
+"stessa QIDISlicer è già in esecuzione, quell'istanza verrà invece riattivata."
-"riattivata."
 
 #: src/slic3r/GUI/SendSystemInfoDialog.cpp:591
 msgid ""
@@ -7382,6 +7440,10 @@ msgstr "errore interno"
 msgid "Internal error: %1%"
 msgstr "Errore interno: %1%"
 
+#: src/libslic3r/ExtrusionRole.cpp:41 src/libslic3r/ExtrusionRole.cpp:65
+msgid "Internal infill"
+msgstr "Riempimento interno"
+
 #: src/libslic3r/GCode.cpp:825
 msgid "In the custom G-code were found reserved keywords:"
 msgstr "Nel G-code personalizzato sono state trovate parole chiave riservate:"
@@ -7563,6 +7625,15 @@ msgstr "Jitter"
 msgid "Join"
 msgstr "Unisci"
 
+#: src/slic3r/GUI/GLCanvas3D.cpp:7526 ../src/common/stockitem.cpp:169
+#, fuzzy
+msgid "Jump to"
+msgstr ""
+"#-#-#-#-#  catalog.po  #-#-#-#-#\n"
+"Salta a\n"
+"#-#-#-#-#  catalog.po  #-#-#-#-#\n"
+"Vai a"
+
 #: src/slic3r/GUI/DoubleSlider.cpp:2094 src/slic3r/GUI/DoubleSlider.cpp:2324
 msgid "Jump to height"
 msgstr "Salta all'altezza"
@@ -8538,6 +8609,11 @@ msgstr "Messaggio"
 msgid "Message for pause print on current layer (%1% mm)."
 msgstr "Messaggio per pausa stampa al corrente layer (%1% mm)."
 
+#: src/slic3r/GUI/GCodeViewer.cpp:3291
+msgctxt "Metre"
+msgid "m"
+msgstr "m"
+
 #: src/libslic3r/PrintConfig.cpp:1897 src/libslic3r/PrintConfig.cpp:1906
 msgid "Min"
 msgstr "Minimo"
@@ -8970,6 +9046,10 @@ msgstr "Linee Monotoniche"
 msgid "More"
 msgstr "Altro"
 
+#: src/slic3r/GUI/Plater.cpp:4106
+msgid "More info at"
+msgstr "Maggiori informazioni su"
+
 #: src/slic3r/GUI/GUI.cpp:317
 msgid ""
 "Most likely the configuration was produced by a newer version of QIDISlicer "
@@ -9441,7 +9521,6 @@ msgstr[0] ""
 "Si noti che il preset selezionato verrà rinominato anche in questa stampante."
 msgstr[1] ""
 "Si noti che il preset selezionato verrà rinominato anche in queste stampanti."
-msgstr[2] ""
 
 #: src/slic3r/GUI/Tab.cpp:4151
 msgid ""
@@ -10079,6 +10158,12 @@ msgstr "Orienta il testo verso di te."
 msgid "Origin"
 msgstr "Origine"
 
+#. TRN Means "original color"
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:342
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:356
+msgid "Original"
+msgstr "Originale"
+
 #: src/slic3r/GUI/UnsavedChangesDialog.cpp:860
 msgid "Original value"
 msgstr "Valore originale"
@@ -10139,6 +10224,10 @@ msgstr "Pareti esterne"
 msgid "Overflow"
 msgstr "Overflow"
 
+#: src/libslic3r/ExtrusionRole.cpp:40 src/libslic3r/ExtrusionRole.cpp:63
+msgid "Overhang perimeter"
+msgstr "Perimetro sporgente"
+
 #. TRN FilamentSettings : "Dynamic fan speeds"
 #: src/libslic3r/PrintConfig.cpp:587
 msgid ""
@@ -10570,7 +10659,11 @@ msgstr ""
 "Esecuzione dell'integrazione del downloader desktop non riuscita - "
 "Impossibile trovare l'eseguibile."
 
-#: src/libslic3r/PrintConfig.cpp:3312
+#: src/libslic3r/ExtrusionRole.cpp:38 src/libslic3r/ExtrusionRole.cpp:59
+msgid "Perimeter"
+msgstr "Perimetro"
+
+#: src/libslic3r/PrintConfig.cpp:3333
 msgid "Perimeter distribution count"
 msgstr "Conteggio della distribuzione dei perimetri"
 
@@ -10737,6 +10830,16 @@ msgid "Please check your object list before preset changing."
 msgstr ""
 "Per favore verifica la tua lista di oggetti prima di cambiare i preset."
 
+#: src/slic3r/GUI/Plater.cpp:4104 src/slic3r/GUI/Plater.cpp:4110
+msgid ""
+"Please note that template presets are not customized for specific printer "
+"and should only be used as a starting point for creating your own user "
+"presets."
+msgstr ""
+"Si noti che i preset dei template non sono personalizzati per una stampante "
+"specifica e devono essere utilizzati solo come punto di partenza per la "
+"creazione di preset utente personalizzati."
+
 #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:85
 msgid ""
 "Please save your project and restart QIDISlicer. We would be glad if you "
@@ -11326,9 +11429,9 @@ msgstr "QIDISlicer ha riscontrato un errore fatale: \"%1%\""
 
 #: src/slic3r/GUI/GUI_App.cpp:743
 msgid ""
-"QIDISlicer has encountered a localization error. Please report to "
+"QIDISlicer has encountered a localization error. Please report to QIDISlicer "
-"QIDISlicer team, what language was active and in which scenario this issue "
+"team, what language was active and in which scenario this issue happened. "
-"happened. Thank you.\n"
+"Thank you.\n"
 "\n"
 "The application will now terminate."
 msgstr ""
@@ -11375,8 +11478,8 @@ msgid ""
 "QIDISlicer recieved a download request from Printables.com, but it's not "
 "allowed. You can allow it"
 msgstr ""
-"QIDISlicer ha ricevuto una richiesta di download da Printables.com, ma non "
+"QIDISlicer ha ricevuto una richiesta di download da Printables.com, ma non è "
-"è autorizzata. È possibile autorizzarla"
+"autorizzata. È possibile autorizzarla"
 
 #: src/slic3r/GUI/OpenGLManager.cpp:383
 #, c-format, boost-format
@@ -13308,6 +13411,12 @@ msgstr "Imposta cursore superiore come attivo"
 msgid "%s Family"
 msgstr "Famiglia %s"
 
+#. TRN %s = type of file
+#: src/slic3r/GUI/GUI_App.cpp:609
+#, c-format, boost-format
+msgid "%s files"
+msgstr "%s file"
+
 #: src/slic3r/GUI/ConfigManipulation.cpp:167
 msgid "Shall I adjust those settings for supports?"
 msgstr "Vuoi che regoli queste impostazioni per i supporti?"
@@ -13483,6 +13592,10 @@ msgstr "Mostra/Nascondi leggenda"
 msgid "Show/Hide object/instance labels"
 msgstr "Mostra/Nascondi etichette dell'oggetto/istanza"
 
+#: src/slic3r/GUI/PresetComboBoxes.cpp:787
+msgid "Show/Hide template presets"
+msgstr "Mostra/Nascondi i preset template"
+
 #: src/slic3r/GUI/Preferences.cpp:304
 msgid "Show incompatible print and filament presets"
 msgstr "Mostra preset di stampa e di filamento incompatibili"
@@ -13754,6 +13867,10 @@ msgstr "Skirt"
 msgid "Skirt and brim"
 msgstr "Skirt e brim"
 
+#: src/libslic3r/ExtrusionRole.cpp:47 src/libslic3r/ExtrusionRole.cpp:77
+msgid "Skirt/Brim"
+msgstr "Skirt/Brim"
+
 #: src/libslic3r/PrintConfig.cpp:2350
 msgid "Skirt height"
 msgstr "Altezza skirt"
@@ -15203,6 +15320,15 @@ msgstr ""
 msgid "The extruder to use when printing infill."
 msgstr "L'estrusore da utilizzare per la stampa del riempimento."
 
+#: src/libslic3r/PrintConfig.cpp:3241
+msgid ""
+"The extruder to use when printing perimeter of the wipe tower. Set to 0 to "
+"use the one that is available (non-soluble would be preferred)."
+msgstr ""
+"L'estrusore da utilizzare per la stampa del perimetro della torre di "
+"pulitura. Impostare su 0 per utilizzare quello attualmente disponibile "
+"(sarebbe preferibile quello non solubile)."
+
 #: src/libslic3r/PrintConfig.cpp:2036
 msgid ""
 "The extruder to use when printing perimeters and brim. First extruder is 1."
@@ -15584,7 +15710,6 @@ msgstr[0] ""
 msgstr[1] ""
 "Le stampanti fisiche sottostanti sono basate sul preset che si intende "
 "rinominare."
-msgstr[2] ""
 
 #: src/libslic3r/PrintConfig.cpp:641
 msgid ""
@@ -16773,16 +16898,16 @@ msgstr ""
 
 #: src/libslic3r/PrintConfig.cpp:4836
 msgid ""
-"This version of QIDISlicer may not understand configurations produced by "
+"This version of QIDISlicer may not understand configurations produced by the "
-"the newest QIDISlicer versions. For example, newer QIDISlicer may extend "
+"newest QIDISlicer versions. For example, newer QIDISlicer may extend the "
-"the list of supported firmware flavors. One may decide to bail out or to "
+"list of supported firmware flavors. One may decide to bail out or to "
 "substitute an unknown value with a default silently or verbosely."
 msgstr ""
 "Questa versione di QIDISlicer potrebbe non comprendere le configurazioni "
-"realizzate dalle versioni più recenti di QIDISlicer. Per esempio, "
+"realizzate dalle versioni più recenti di QIDISlicer. Per esempio, QIDISlicer "
-"QIDISlicer più recente può estendere la lista dei flavor di firmware "
+"più recente può estendere la lista dei flavor di firmware supportati. Si può "
-"supportati. Si può decidere di abbandonare o di sostituire un valore "
+"decidere di abbandonare o di sostituire un valore sconosciuto con un valore "
-"sconosciuto con un valore predefinito in modo silenzioso o verboso."
+"predefinito in modo silenzioso o verboso."
 
 #: src/slic3r/GUI/UpdateDialogs.cpp:392
 #, c-format, boost-format
@@ -17192,6 +17317,10 @@ msgstr "Impossibile ricaricare:"
 msgid "Unable to replace with more than one volume"
 msgstr "Impossibile sostituire con più di un volume"
 
+#: src/slic3r/GUI/Plater.cpp:6681
+msgid "Unable to save file"
+msgstr "Impossibile salvare il file"
+
 #: src/slic3r/GUI/OptionsGroup.cpp:126
 msgid "Unavailable for this method."
 msgstr "Non disponibile per questo metodo."
@@ -17287,6 +17416,10 @@ msgstr "Annulla rotazione"
 msgid "Undo translation"
 msgstr "Annulla traslazione"
 
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:667
+msgid "Unexpected character"
+msgstr "Carattere non previsto"
+
 #: src/libslic3r/miniz_extension.cpp:111
 msgid "unexpected decompressed size"
 msgstr "dimensione decompressa imprevista"
@@ -17579,8 +17712,8 @@ msgid ""
 "Use \"Even-odd\" for 3DLabPrint airplane models. Use \"Close holes\" to "
 "close all holes in the model."
 msgstr ""
-"Usare \"Pari-dispari\" per i modelli di aerei 3DLabPrint. Usare \"Chiudi fori"
+"Usare \"Pari-dispari\" per i modelli di aerei 3DLabPrint. Usare \"Chiudi "
-"\" per chiudere tutti i fori del modello."
+"fori\" per chiudere tutti i fori del modello."
 
 #: src/libslic3r/PrintConfig.cpp:3098
 msgid "Use firmware retraction"
@@ -18201,7 +18334,11 @@ msgstr "Torre di pulitura"
 msgid "Wipe tower brim width"
 msgstr "Larghezza brim torre di pulitura"
 
-#: src/slic3r/GUI/Tab.cpp:2087
+#: src/libslic3r/PrintConfig.cpp:3239
+msgid "Wipe tower extruder"
+msgstr "Estrusore torre di pulitura"
+
+#: src/slic3r/GUI/Tab.cpp:2096
 msgid "Wipe tower parameters"
 msgstr "Parametri torre di pulitura"
 
@@ -18349,7 +18486,13 @@ msgstr ""
 "www.qidi3d.cz/qidislicer/.\n"
 "Vuoi continuare?"
 
-#: src/slic3r/GUI/Plater.cpp:5200
+#: src/slic3r/GUI/Plater.cpp:4103 src/slic3r/GUI/Plater.cpp:4109
+msgid "You are using template filament preset."
+msgid_plural "You are using template filament presets."
+msgstr[0] "Stai utilizzando un preset filamento template."
+msgstr[1] "Stai utilizzando dei preset filamento template."
+
+#: src/slic3r/GUI/Plater.cpp:5241
 msgid ""
 "You can keep presets modifications to the new project, discard them or save "
 "changes as new presets.\n"
@@ -18413,12 +18556,13 @@ 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]."
+"[input_filename], [input_filename_base], [default_output_extension]."
 msgstr ""
 "È 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], "
+"ecc... È anche possibile utilizzare [timestamp], [year], [month], [day], "
-"[second], [version], [input_filename ], [nome_filename_input]."
+"[hour], [minute], [second], [version], [input_filename], "
+"[input_filename_base], [default_output_extension]."
 
 #: src/slic3r/GUI/NotificationManager.hpp:908
 msgid ""
@@ -22815,10 +22959,6 @@ msgstr "Cartolina giapponese 100 x 148 mm"
 msgid "Japanese Postcard Rotated 148 x 100 mm"
 msgstr "Cartolina giapponese ruotata 148 x 100 mm"
 
-#: ../src/common/stockitem.cpp:169
-msgid "Jump to"
-msgstr "Vai a"
-
 #: ../src/common/stockitem.cpp:171
 msgid "Justified"
 msgstr "Giustificato"
@@ -25485,8 +25625,8 @@ msgid ""
 "Type operation \"%s\" failed: Property labeled \"%s\" is of type \"%s\", NOT "
 "\"%s\"."
 msgstr ""
-"Tipo operazione \"%s\" fallita: etichetta proprietà:  \"%s\" è del tipo  \"%s"
+"Tipo operazione \"%s\" fallita: etichetta proprietà:  \"%s\" è del tipo  "
-"\", NON \"%s\"."
+"\"%s\", NON \"%s\"."
 
 #: ../src/common/paper.cpp:133
 msgid "US Std Fanfold, 14 7/8 x 11 in"

resources/localization/ja/QIDISlicer_ja.po

@@ -1,11 +1,16 @@
 msgid ""
 msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: QIDIlator\n"
+"X-Generator: Poedit 3.3.2\n"
 
 #: src/libslic3r/PrintConfig.cpp:503 src/libslic3r/PrintConfig.cpp:594
 #: src/libslic3r/PrintConfig.cpp:603 src/libslic3r/PrintConfig.cpp:612
@@ -58,6 +63,7 @@ msgstr "0 (溶解性)"
 msgid "%1$d backward edge"
 msgid_plural "%1$d backward edges"
 msgstr[0] "%1$d の後方エッジ"
+msgstr[1] ""
 
 #: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2197
 #, c-format, boost-format
@@ -65,7 +71,6 @@ msgid "%1$d connector is out of cut contour"
 msgid_plural "%1$d connectors are out of cut contour"
 msgstr[0] "%1$dコネクタがカット輪郭から外れている"
 msgstr[1] ""
-msgstr[2] "%1$dコネクタがカット輪郭から外れている"
 
 #: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2200
 #, c-format, boost-format
@@ -73,31 +78,34 @@ msgid "%1$d connector is out of object"
 msgid_plural "%1$d connectors are out of object"
 msgstr[0] "%1$d コネクタがオブジェクトから外れています"
 msgstr[1] ""
-msgstr[2] "%1$d コネクタがオブジェクトから外れています"
 
 #: src/slic3r/GUI/GUI_ObjectList.cpp:459
 #, c-format, boost-format
 msgid "%1$d degenerate facet"
 msgid_plural "%1$d degenerate facets"
 msgstr[0] "%1$d個の変性ファセット"
+msgstr[1] ""
 
 #: src/slic3r/GUI/GUI_ObjectList.cpp:461
 #, c-format, boost-format
 msgid "%1$d edge fixed"
 msgid_plural "%1$d edges fixed"
 msgstr[0] "%1$d エッジが修正されました"
+msgstr[1] ""
 
 #: src/slic3r/GUI/GUI_ObjectList.cpp:463
 #, c-format, boost-format
 msgid "%1$d facet removed"
 msgid_plural "%1$d facets removed"
 msgstr[0] "%1$dファセットが削除されました"
+msgstr[1] ""
 
 #: src/slic3r/GUI/GUI_ObjectList.cpp:465
 #, c-format, boost-format
 msgid "%1$d facet reversed"
 msgid_plural "%1$d facets reversed"
 msgstr[0] "%1$d面リバース"
+msgstr[1] ""
 
 #: src/slic3r/GUI/NotificationManager.cpp:1653
 #, c-format, boost-format
@@ -106,8 +114,6 @@ msgid_plural "%1$d objects were loaded as parts of cut object"
 msgstr[0] ""
 "%1$dのオブジェクトがカットオブジェクトの一部としてロードされました。"
 msgstr[1] ""
-msgstr[2] ""
-"%1$dのオブジェクトがカットオブジェクトの一部としてロードされました。"
 
 #: src/slic3r/GUI/NotificationManager.cpp:1649
 #, c-format, boost-format
@@ -115,7 +121,6 @@ msgid "%1$d object was loaded with custom seam."
 msgid_plural "%1$d objects were loaded with custom seam."
 msgstr[0] "%1$d オブジェクトがカスタム シームでロードされました。"
 msgstr[1] ""
-msgstr[2] "%1$d オブジェクトがカスタム シームでロードされました。"
 
 #: src/slic3r/GUI/NotificationManager.cpp:1648
 #, c-format, boost-format
@@ -123,7 +128,6 @@ msgid "%1$d object was loaded with custom supports."
 msgid_plural "%1$d objects were loaded with custom supports."
 msgstr[0] "%1$d オブジェクトがカスタム・サポートでロードされました。"
 msgstr[1] ""
-msgstr[2] "%1$d オブジェクトがカスタム・サポートでロードされました。"
 
 #: src/slic3r/GUI/NotificationManager.cpp:1650
 #, c-format, boost-format
@@ -131,7 +135,6 @@ msgid "%1$d object was loaded with multimaterial painting."
 msgid_plural "%1$d objects were loaded with multimaterial painting."
 msgstr[0] "%1$d オブジェクトがマルチマテリアルペイントでロードされました。"
 msgstr[1] ""
-msgstr[2] "%1$d オブジェクトがマルチマテリアルペイントでロードされました。"
 
 #: src/slic3r/GUI/NotificationManager.cpp:1652
 #, c-format, boost-format
@@ -139,7 +142,6 @@ msgid "%1$d object was loaded with partial sinking."
 msgid_plural "%1$d objects were loaded with partial sinking."
 msgstr[0] "%1$d オブジェクトが部分的に沈み込んでロードされました。"
 msgstr[1] ""
-msgstr[2] "%1$d オブジェクトが部分的に沈み込んでロードされました。"
 
 #: src/slic3r/GUI/NotificationManager.cpp:1651
 #, c-format, boost-format
@@ -147,13 +149,13 @@ msgid "%1$d object was loaded with variable layer height."
 msgid_plural "%1$d objects were loaded with variable layer height."
 msgstr[0] "%1$d オブジェクトが可変レイヤー高でロードされました。"
 msgstr[1] ""
-msgstr[2] "%1$d オブジェクトが可変レイヤー高でロードされました。"
 
 #: src/slic3r/GUI/GUI_ObjectList.cpp:470 src/slic3r/GUI/GUI_ObjectList.cpp:473
 #, c-format, boost-format
 msgid "%1$d open edge"
 msgid_plural "%1$d open edges"
 msgstr[0] "%1$d オープンエッジ"
+msgstr[1] ""
 
 #: src/libslic3r/PrintConfig.cpp:1507 src/libslic3r/PrintConfig.cpp:1530
 msgid "1000 (unlimited)"
@@ -176,6 +178,7 @@ msgstr "%1%, %2%"
 msgid "%1% (%2$d shell)"
 msgid_plural "%1% (%2$d shells)"
 msgstr[0] "%1% (%2$d シェル)"
+msgstr[1] ""
 
 #: src/libslic3r/Print.cpp:650
 #, boost-format
@@ -1008,6 +1011,7 @@ msgid_plural ""
 "New vendors were installed and one of theirs printers will be activated"
 msgstr[0] ""
 "新しいベンダーがインストールされ、そのプリンターの1つがアクティブ化されます"
+msgstr[1] ""
 
 #: src/slic3r/GUI/GUI_App.cpp:1026
 #, boost-format
@@ -1317,8 +1321,8 @@ msgstr ""
 
 #: src/slic3r/GUI/OpenGLManager.cpp:390
 msgid ""
-"As a workaround, you may run QIDISlicer with a software rendered 3D "
+"As a workaround, you may run QIDISlicer with a software rendered 3D graphics "
-"graphics by running qidi-slicer.exe with the --sw-renderer parameter."
+"by running qidi-slicer.exe with the --sw-renderer parameter."
 msgstr ""
 "回避策として、--sw-rendererパラメーターを指定してqidi-slicer.exeを実行するこ"
 "とにより、ソフトウェアでレンダリングされた3Dグラフィックスを使用して"
@@ -1456,6 +1460,7 @@ msgstr "自動アップデート"
 msgid "Auto-repaired %1$d error"
 msgid_plural "Auto-repaired %1$d errors"
 msgstr[0] "自動修復された%1$dエラー"
+msgstr[1] ""
 
 #: src/slic3r/GUI/Tab.cpp:1586
 msgid "Autospeed (advanced)"
@@ -1571,7 +1576,11 @@ msgstr ""
 "最初のレイヤー以降のレイヤーのベッド温度。 ベッド温度制御コマンドを無効にする"
 "には、これをゼロに設定します。"
 
-#: src/slic3r/GUI/Tab.cpp:2569 src/libslic3r/GCode.cpp:768
+#: src/slic3r/GUI/Plater.cpp:3229
+msgid "Bed temperatures for the used filaments differ significantly."
+msgstr "使用するフィラメントのベッド温度は大きく異なります。"
+
+#: src/slic3r/GUI/Tab.cpp:2586 src/libslic3r/GCode.cpp:768
 #: src/libslic3r/PrintConfig.cpp:442
 msgid "Before layer change G-code"
 msgstr "レイヤー変更前のGコード"
@@ -1602,8 +1611,7 @@ msgstr "オブジェクト間のGコード（シーケンシャルプリント
 
 #: src/slic3r/GUI/SysInfoDialog.cpp:160
 msgid "Blacklisted libraries loaded into QIDISlicer process:"
-msgstr ""
+msgstr "QIDISlicerプロセスにロードされたブラックリストに登録されたライブラリ："
-"QIDISlicerプロセスにロードされたブラックリストに登録されたライブラリ："
 
 #: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:38
 #: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:252
@@ -2627,6 +2635,16 @@ msgstr "確認"
 msgid "Confirm connectors"
 msgstr "コネクタの確認"
 
+#. TRN %3% is name of Object1, %4% is name of Object2
+#: src/slic3r/GUI/GLCanvas3D.cpp:7496
+#, boost-format
+msgid ""
+"Conflicts in G-code paths have been detected at layer %1%, z=%2$.2f mm. "
+"Please reposition the conflicting objects (%3% <-> %4%) further apart."
+msgstr ""
+"レイヤー%1%, z=%2$.2f mmでGコードパスの競合が検出されました。競合するオブジェ"
+"クト (%3%<-> %4%) をさらに離して再配置してください。"
+
 #: src/libslic3r/PrintConfig.cpp:1492
 msgid ""
 "Connect an infill line to an internal perimeter with a short segment of an "
@@ -3070,8 +3088,14 @@ msgid ""
 "CURL init has failed. QIDISlicer will be unable to establish network "
 "connections. See logs for additional details."
 msgstr ""
-"CURLの初期化に失敗しました。 QIDISlicerはネットワーク接続を確立できなくなり"
+"CURLの初期化に失敗しました。 QIDISlicerはネットワーク接続を確立できなくなりま"
-"ます。 詳細については、ログを参照してください。"
+"す。 詳細については、ログを参照してください。"
+
+#. TRN Means "current color"
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:340
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:356
+msgid "Current"
+msgstr "現在"
 
 #: src/slic3r/GUI/wxExtensions.cpp:629
 #, c-format, boost-format
@@ -5590,6 +5614,7 @@ msgid_plural ""
 msgstr[0] ""
 "次のプリンタプリセットが複製されます。%1%上記のプリンタ\"%2%\"のプリセットは1"
 "回だけ使用されます。"
+msgstr[1] ""
 
 #: src/slic3r/GUI/ConfigWizard.cpp:2767
 #, boost-format
@@ -5613,6 +5638,7 @@ msgstr ""
 msgid "Folowing model repair failed"
 msgid_plural "Folowing models repair failed"
 msgstr[0] "次のモデルの修復に失敗しました"
+msgstr[1] ""
 
 #: src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:873
 msgid "Font"
@@ -5800,8 +5826,8 @@ msgid ""
 "<b>F11</b> hotkey."
 msgstr ""
 "フルスクリーンモード\n"
-"QIDISlicerをフルスクリーンモードに切り替えることができることをご存知です"
+"QIDISlicerをフルスクリーンモードに切り替えることができることをご存知ですか？ "
-"か？ <b>F11</b>ホットキーを使用します。"
+"<b>F11</b>ホットキーを使用します。"
 
 #: src/slic3r/GUI/GUI_Factories.cpp:130 src/libslic3r/PrintConfig.cpp:1341
 #: src/libslic3r/PrintConfig.cpp:1342 src/libslic3r/PrintConfig.cpp:1354
@@ -6237,8 +6263,9 @@ msgstr "ルーラー非表示"
 #: resources/data/hints.ini: [hint:Hiding sidebar]
 msgid ""
 "Hiding sidebar\n"
-"Did you know that you can hide the right sidebar using the shortcut <b>Shift"
+"Did you know that you can hide the right sidebar using the shortcut "
-"+Tab</b>? You can also enable the icon for this from the<a>Preferences</a>."
+"<b>Shift+Tab</b>? You can also enable the icon for this from "
+"the<a>Preferences</a>."
 msgstr ""
 "サイドバーを隠す\n"
 "ショートカット<b> Shift + Tab </b>を使用して右側のサイドバーを非表示にできる"
@@ -6662,12 +6689,12 @@ msgstr ""
 #: src/libslic3r/PrintConfig.cpp:4857
 msgid ""
 "If enabled, the command line arguments are sent to an existing instance of "
-"GUI QIDISlicer, or an existing QIDISlicer window is activated. Overrides "
+"GUI QIDISlicer, or an existing QIDISlicer window is activated. Overrides the "
-"the \"single_instance\" configuration value from application preferences."
+"\"single_instance\" configuration value from application preferences."
 msgstr ""
 "有効にすると、コマンドライン引数がGUI QIDISlicerの既存のインスタンスに送信さ"
-"れるか、既存のQIDISlicerウィンドウがアクティブになります。 アプリケーション"
+"れるか、既存のQIDISlicerウィンドウがアクティブになります。 アプリケーション設"
-"設定の「single_instance」構成値を上書きします。 "
+"定の「single_instance」構成値を上書きします。 "
 
 #: src/slic3r/GUI/Preferences.cpp:395
 msgid ""
@@ -6853,9 +6880,9 @@ msgid ""
 "same QIDISlicer is already running, that instance will be reactivated "
 "instead."
 msgstr ""
-"これが有効になっている場合、QIDISlicerを起動し、同じQIDISlicerの別のインス"
+"これが有効になっている場合、QIDISlicerを起動し、同じQIDISlicerの別のインスタ"
-"タンスがすでに実行されていると、代わりにそのインスタンスが再アクティブ化され"
+"ンスがすでに実行されていると、代わりにそのインスタンスが再アクティブ化されま"
-"ます。"
+"す。"
 
 #: src/slic3r/GUI/SendSystemInfoDialog.cpp:591
 msgid ""
@@ -7472,6 +7499,10 @@ msgstr "ジッター"
 msgid "Join"
 msgstr "結合"
 
+#: src/slic3r/GUI/GLCanvas3D.cpp:7526
+msgid "Jump to"
+msgstr "ジャンプする"
+
 #: src/slic3r/GUI/DoubleSlider.cpp:2094 src/slic3r/GUI/DoubleSlider.cpp:2324
 msgid "Jump to height"
 msgstr "高さにジャンプ"
@@ -8866,6 +8897,10 @@ msgstr "モノトニックライン"
 msgid "More"
 msgstr "もっと見る"
 
+#: src/slic3r/GUI/Plater.cpp:4106
+msgid "More info at"
+msgstr "詳しくはこちらで"
+
 #: src/slic3r/GUI/GUI.cpp:317
 msgid ""
 "Most likely the configuration was produced by a newer version of QIDISlicer "
@@ -9075,9 +9110,9 @@ msgid ""
 msgstr ""
 "切取りボリューム\n"
 "切取りボリュームモディファイヤを使用して、あるメッシュを別のメッシュから差し"
-"引くことができることをご存知ですか？ これを使うと、たとえば、QIDISlicerに直"
+"引くことができることをご存知ですか？ これを使うと、たとえば、QIDISlicerに直接"
-"接簡単にサイズ変更可能な穴を作成できます。 詳細については、ドキュメントをご覧"
+"簡単にサイズ変更可能な穴を作成できます。 詳細については、ドキュメントをご覧く"
-"ください。 （詳細モードまたはエキスパートモードが必要です。）"
+"ださい。 （詳細モードまたはエキスパートモードが必要です。）"
 
 #: src/slic3r/GUI/BonjourDialog.cpp:58
 msgid "Network lookup"
@@ -9321,6 +9356,7 @@ msgid_plural ""
 msgstr[0] ""
 "選択したプリセットはこれらのプリンターからも削除されることに注意してくださ"
 "い。"
+msgstr[1] ""
 
 #: src/slic3r/GUI/Tab.cpp:4049
 msgid "Note, that the selected preset will be renamed in this printer too."
@@ -9329,7 +9365,6 @@ msgid_plural ""
 msgstr[0] ""
 "なお、これらのプリンターでは、選択したプリセットの名前も変更されます。"
 msgstr[1] ""
-msgstr[2] "なお、このプリンターでは、選択したプリセットの名前も変更されます。"
 
 #: src/slic3r/GUI/Tab.cpp:4151
 msgid ""
@@ -9339,6 +9374,7 @@ msgid_plural ""
 msgstr[0] ""
 "選択したプリセットを削除すると、これらのプリンターは削除されることに注意して"
 "ください。"
+msgstr[1] ""
 
 #: src/slic3r/GUI/SavePresetDialog.cpp:213
 msgid "Note: This preset will be replaced after saving"
@@ -9494,7 +9530,7 @@ msgstr "ツールチェンジ回数"
 msgid "object"
 msgid_plural "objects"
 msgstr[0] "オブジェクト"
-msgstr[1] "オブジェクト"
+msgstr[1] ""
 
 #: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:238
 #: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2022
@@ -9556,6 +9592,7 @@ msgid_plural ""
 msgstr[0] ""
 "ファイル%sのオブジェクトサイズはゼロのようです。\n"
 "これらのオブジェクトはモデルから削除されました"
+msgstr[1] ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:207
 msgid "Objects List"
@@ -9948,6 +9985,12 @@ msgstr "テキストの向きをカメラ側にする。"
 msgid "Origin"
 msgstr "原点"
 
+#. TRN Means "original color"
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:342
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:356
+msgid "Original"
+msgstr "オリジナル"
+
 #: src/slic3r/GUI/UnsavedChangesDialog.cpp:860
 msgid "Original value"
 msgstr "オリジナルの値"
@@ -10400,8 +10443,8 @@ msgid ""
 "file. QIDISlicer desktop file was probably created successfully."
 msgstr ""
 "デスクトップ統合の実行に失敗しました-Gcodeビュワーデスクトップファイルを作成"
-"できませんでした。 QIDISlicerデスクトップファイルはおそらく正常に作成されま"
+"できませんでした。 QIDISlicerデスクトップファイルはおそらく正常に作成されまし"
-"した。"
+"た。"
 
 #: src/slic3r/GUI/DesktopIntegrationDialog.cpp:243
 msgid "Performing desktop integration failed - Could not find executable."
@@ -10599,13 +10642,23 @@ msgstr "モード変更の前に、オブジェクトリストをご確認くだ
 msgid "Please check your object list before preset changing."
 msgstr "プリセットを変更する前にオブジェクトリストを確認してください。"
 
+#: src/slic3r/GUI/Plater.cpp:4104 src/slic3r/GUI/Plater.cpp:4110
+msgid ""
+"Please note that template presets are not customized for specific printer "
+"and should only be used as a starting point for creating your own user "
+"presets."
+msgstr ""
+"なお、テンプレートプリセットは、特定のプリンター用にカスタマイズされたもので"
+"はなく、独自のユーザープリセットを作成するための出発点としてのみ使用されるべ"
+"きです。"
+
 #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:85
 msgid ""
 "Please save your project and restart QIDISlicer. We would be glad if you "
 "reported the issue."
 msgstr ""
-"プロジェクトを保存して、QIDISlicerを再起動してください。 問題を報告していた"
+"プロジェクトを保存して、QIDISlicerを再起動してください。 問題を報告していただ"
-"だければ幸いです。"
+"ければ幸いです。"
 
 #: src/slic3r/GUI/Plater.cpp:3703
 msgid "Please select the file to reload"
@@ -10677,7 +10730,7 @@ msgstr ""
 "後処理スクリプトは、Gコードファイルを%2%変更する予定ですが、Gコードファイルが"
 "削除され、新しい名前で保存されている可能性があります。\n"
 "後処理スクリプトを調整してGコードを変更し、オプションで後処理されたGコード"
-"ファイルの名前を変更する方法についてマニュアルを参照してください。"
+"ファイルの名前を変更する方法についてマニュアルを参照してください。\n"
 
 #: src/slic3r/GUI/Tab.cpp:1683 src/libslic3r/PrintConfig.cpp:2080
 msgid "Post-processing scripts"
@@ -11176,15 +11229,15 @@ msgstr "QIDISlicerで致命的なエラーが発生しました: \"%1%\""
 
 #: src/slic3r/GUI/GUI_App.cpp:743
 msgid ""
-"QIDISlicer has encountered a localization error. Please report to "
+"QIDISlicer has encountered a localization error. Please report to QIDISlicer "
-"QIDISlicer team, what language was active and in which scenario this issue "
+"team, what language was active and in which scenario this issue happened. "
-"happened. Thank you.\n"
+"Thank you.\n"
 "\n"
 "The application will now terminate."
 msgstr ""
-"QIDISlicerでローカリゼーションエラーが発生しました。 QIDISlicerチームに、ど"
+"QIDISlicerでローカリゼーションエラーが発生しました。 QIDISlicerチームに、どの"
-"の言語がアクティブで、どのシナリオでこの問題が発生したかをご報告ください。 ご"
+"言語がアクティブで、どのシナリオでこの問題が発生したかをご報告ください。 ご協"
-"協力に感謝いたします。\n"
+"力に感謝いたします。\n"
 " \n"
 "これでアプリケーションは終了します。 "
 
@@ -11198,8 +11251,8 @@ msgid ""
 "QIDISlicer is based on Slic3r by Alessandro Ranellucci and the RepRap "
 "community."
 msgstr ""
-"QIDISlicerは、Alessandro RanellucciとRepRapコミュニティによるSlic3rをベース"
+"QIDISlicerは、Alessandro RanellucciとRepRapコミュニティによるSlic3rをベースに"
-"にしています。"
+"しています。"
 
 #: src/slic3r/GUI/MainFrame.cpp:234
 msgid "QIDISlicer is closing"
@@ -11515,7 +11568,7 @@ msgstr "再実行"
 msgid "Redo %1$d Action"
 msgid_plural "Redo %1$d Actions"
 msgstr[0] "%1$d 操作の繰り返し"
-msgstr[1] "%1$d 操作の繰り返し"
+msgstr[1] ""
 
 #: src/slic3r/GUI/GLCanvas3D.cpp:4717
 msgid "Redo History"
@@ -12458,8 +12511,8 @@ msgid ""
 "QIDISlicer setting? Or use the familiar shortcut <b>Ctrl+F</b>."
 msgstr ""
 "検索機能\n"
-"<a>検索</a>ツールを使用して特定のQIDISlicer設定をすばやく見つけることをご存"
+"<a>検索</a>ツールを使用して特定のQIDISlicer設定をすばやく見つけることをご存知"
-"知ですか？ または、おなじみのショートカット<b>Ctrl+F</b>を使用します。"
+"ですか？ または、おなじみのショートカット<b>Ctrl+F</b>を使用します。"
 
 #: src/slic3r/GUI/ImGuiWrapper.cpp:1189 src/slic3r/GUI/Search.cpp:526
 msgid "Search in English"
@@ -13126,6 +13179,12 @@ msgstr "上側の範囲をアクティブに設定"
 msgid "%s Family"
 msgstr "%sファミリー"
 
+#. TRN %s = type of file
+#: src/slic3r/GUI/GUI_App.cpp:609
+#, c-format, boost-format
+msgid "%s files"
+msgstr "%s ファイル"
+
 #: src/slic3r/GUI/ConfigManipulation.cpp:167
 msgid "Shall I adjust those settings for supports?"
 msgstr "サポート用にこれらの設定を調整しますか？"
@@ -13166,10 +13225,10 @@ msgid ""
 "the platter and select<a>Add Shape - Gallery</a>."
 msgstr ""
 "シェイプギャラリー\n"
-"QIDISlicerにシェイプギャラリーがあることをご存知ですか？ 含まれているモデル"
+"QIDISlicerにシェイプギャラリーがあることをご存知ですか？ 含まれているモデルを"
-"をモディファイヤ、切取りボリューム、またはプリント可のオブジェクトとして使用"
+"モディファイヤ、切取りボリューム、またはプリント可のオブジェクトとして使用で"
-"できます。 プラッターを右クリックして、<a>[シェイプの追加]-[ギャラリー]</a>を"
+"きます。 プラッターを右クリックして、<a>[シェイプの追加]-[ギャラリー]</a>を選"
-"選択します。"
+"択します。"
 
 #: src/slic3r/GUI/MsgDialog.cpp:248
 #, c-format, boost-format
@@ -13295,6 +13354,10 @@ msgstr "凡例の表示／非表示"
 msgid "Show/Hide object/instance labels"
 msgstr "オブジェクト/インスタンスラベルの表示/非表示"
 
+#: src/slic3r/GUI/PresetComboBoxes.cpp:787
+msgid "Show/Hide template presets"
+msgstr "テンプレートプリセットの表示／非表示"
+
 #: src/slic3r/GUI/Preferences.cpp:304
 msgid "Show incompatible print and filament presets"
 msgstr "互換性のないプリントとフィラメントのプリセットを表示する"
@@ -14924,8 +14987,9 @@ msgid_plural ""
 "the dimensions of these objects?"
 msgstr[0] ""
 "ファイル%sの一部のオブジェクトの寸法は、インチで定義されているようです。\n"
-"QIDISlicerの内部単位はミリメートルです。 これらのオブジェクトの寸法を再計算"
+"QIDISlicerの内部単位はミリメートルです。 これらのオブジェクトの寸法を再計算し"
-"しますか？"
+"ますか？"
+msgstr[1] ""
 
 #: src/slic3r/GUI/Plater.cpp:2611
 #, c-format, boost-format
@@ -14939,8 +15003,9 @@ msgid_plural ""
 "the dimensions of these objects?"
 msgstr[0] ""
 "ファイル%sの一部のオブジェクトの寸法は、メートルで定義されているようです。\n"
-"QIDISlicerの内部単位はミリメートルです。 これらのオブジェクトの寸法を再計算"
+"QIDISlicerの内部単位はミリメートルです。 これらのオブジェクトの寸法を再計算し"
-"しますか？"
+"ますか？"
+msgstr[1] ""
 
 #: src/slic3r/GUI/Downloader.cpp:181
 msgid "The download has failed"
@@ -14970,6 +15035,14 @@ msgstr ""
 msgid "The extruder to use when printing infill."
 msgstr "インフィルに使用するエクストルーダー。"
 
+#: src/libslic3r/PrintConfig.cpp:3241
+msgid ""
+"The extruder to use when printing perimeter of the wipe tower. Set to 0 to "
+"use the one that is available (non-soluble would be preferred)."
+msgstr ""
+"ワイプタワーの外周を印刷する際に使用するエクストルーダーです。0に設定すると、"
+"使用可能なものを使用します（非水溶性であることが望ましい）。"
+
 #: src/libslic3r/PrintConfig.cpp:2036
 msgid ""
 "The extruder to use when printing perimeters and brim. First extruder is 1."
@@ -15057,16 +15130,19 @@ msgstr[0] ""
 "次の行%sには、予約済みのキーワードが含まれています。\n"
 "Gコードの視覚化で問題が発生する可能性があるため、削除してください。\n"
 "プリント時間の見積もり。"
+msgstr[1] ""
 
 #: src/slic3r/GUI/GUI_ObjectList.cpp:4760
 msgid "The following model was repaired successfully"
 msgid_plural "The following models were repaired successfully"
 msgstr[0] "次のモデルは正常に修復されました"
+msgstr[1] ""
 
 #: src/slic3r/GUI/UnsavedChangesDialog.cpp:1240
 msgid "The following preset was modified"
 msgid_plural "The following presets were modified"
 msgstr[0] "以下のプリセットが変更されました"
+msgstr[1] ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:260
 msgid ""
@@ -15300,6 +15376,7 @@ msgid_plural ""
 "delete."
 msgstr[0] ""
 "以下の物理プリンタは、プリセットのみに基づいているため、削除します。"
+msgstr[1] ""
 
 #: src/slic3r/GUI/Tab.cpp:4136
 msgid ""
@@ -15307,6 +15384,7 @@ msgid ""
 msgid_plural ""
 "The physical printers below are based on the preset, you are going to delete."
 msgstr[0] "以下の物理プリンタはプリセットに基づいているため、削除します。"
+msgstr[1] ""
 
 #: src/slic3r/GUI/Tab.cpp:4044
 msgid ""
@@ -15316,8 +15394,6 @@ msgid_plural ""
 msgstr[0] ""
 "以下の物理プリンターは、プリセットに基づき、名前を変更するものです。"
 msgstr[1] ""
-msgstr[2] ""
-"下の物理プリンタは、プリセットを元に、名前を変更することになります。"
 
 #: src/libslic3r/PrintConfig.cpp:641
 msgid ""
@@ -15353,11 +15429,13 @@ msgid_plural ""
 msgstr[0] ""
 "以下のプリセットは、QIDISlicerのアクティブなインスタンスに一時的にインストー"
 "ルされました"
+msgstr[1] ""
 
 #: src/slic3r/GUI/UnsavedChangesDialog.cpp:1329
 msgid "The preset modifications are successfully saved"
 msgid_plural "The presets modifications are successfully saved"
 msgstr[0] "プリセットの変更は正常に保存されます"
+msgstr[1] ""
 
 #: src/libslic3r/PrintConfig.cpp:2562
 msgid "The printer multiplexes filaments into a single hot end."
@@ -15480,24 +15558,24 @@ msgid ""
 "The selected 3MF contains FDM supports painted object using a newer version "
 "of QIDISlicer and is not compatible."
 msgstr ""
-"選択した3MFには、新しいバージョンのQIDISlicerを使用してペイントされたオブ"
+"選択した3MFには、新しいバージョンのQIDISlicerを使用してペイントされたオブジェ"
-"ジェクトをサポートするFDMが含まれており、互換性がありません。"
+"クトをサポートするFDMが含まれており、互換性がありません。"
 
 #: src/libslic3r/Format/3mf.cpp:1897
 msgid ""
 "The selected 3MF contains multi-material painted object using a newer "
 "version of QIDISlicer and is not compatible."
 msgstr ""
-"選択した3MFには、新しいバージョンのQIDISlicerを使用したマルチマテリアルペイ"
+"選択した3MFには、新しいバージョンのQIDISlicerを使用したマルチマテリアルペイン"
-"ントオブジェクトが含まれており、互換性がありません。"
+"トオブジェクトが含まれており、互換性がありません。"
 
 #: src/libslic3r/Format/3mf.cpp:1893
 msgid ""
 "The selected 3MF contains seam painted object using a newer version of "
 "QIDISlicer and is not compatible."
 msgstr ""
-"選択した3MFには、新しいバージョンのQIDISlicerを使用したシームペイントされた"
+"選択した3MFには、新しいバージョンのQIDISlicerを使用したシームペイントされたオ"
-"オブジェクトが含まれており、互換性がありません。"
+"ブジェクトが含まれており、互換性がありません。"
 
 #: src/libslic3r/Format/3mf.cpp:1878
 #, boost-format
@@ -15897,8 +15975,8 @@ msgid ""
 "This end procedure is inserted at the end of the output file. Note that you "
 "can use placeholder variables for all QIDISlicer settings."
 msgstr ""
-"この終了プロシージャは、出力ファイルの最後に挿入されます。 すべての"
+"この終了プロシージャは、出力ファイルの最後に挿入されます。 すべてのQIDISlicer"
-"QIDISlicer変数を使用できます。"
+"変数を使用できます。"
 
 #: src/libslic3r/PrintConfig.cpp:1886
 msgid ""
@@ -16447,16 +16525,16 @@ msgstr ""
 
 #: src/libslic3r/PrintConfig.cpp:4836
 msgid ""
-"This version of QIDISlicer may not understand configurations produced by "
+"This version of QIDISlicer may not understand configurations produced by the "
-"the newest QIDISlicer versions. For example, newer QIDISlicer may extend "
+"newest QIDISlicer versions. For example, newer QIDISlicer may extend the "
-"the list of supported firmware flavors. One may decide to bail out or to "
+"list of supported firmware flavors. One may decide to bail out or to "
 "substitute an unknown value with a default silently or verbosely."
 msgstr ""
-"このバージョンのQIDISlicerは、最新のQIDISlicerバージョンによって生成された"
+"このバージョンのQIDISlicerは、最新のQIDISlicerバージョンによって生成された構"
-"構成を理解できない場合があります。 たとえば、新しいQIDISlicerは、サポートさ"
+"成を理解できない場合があります。 たとえば、新しいQIDISlicerは、サポートされて"
-"れているファームウェアフレーバーのリストを拡張する場合があります。 暗黙的にま"
+"いるファームウェアフレーバーのリストを拡張する場合があります。 暗黙的にまたは"
-"たは冗長的に、修正するか、未知の値をデフォルトに置き換えるかを決めることがで"
+"冗長的に、修正するか、未知の値をデフォルトに置き換えるかを決めることができま"
-"きます。"
+"す。"
 
 #: src/slic3r/GUI/UpdateDialogs.cpp:392
 #, c-format, boost-format
@@ -16851,6 +16929,10 @@ msgstr "リロードできません："
 msgid "Unable to replace with more than one volume"
 msgstr "複数のボリュームに置き換えることはできません"
 
+#: src/slic3r/GUI/Plater.cpp:6681
+msgid "Unable to save file"
+msgstr "ファイルの保存ができない"
+
 #: src/slic3r/GUI/OptionsGroup.cpp:126
 msgid "Unavailable for this method."
 msgstr "このメソッドでは使用できません。"
@@ -16901,7 +16983,7 @@ msgstr "元に戻す"
 msgid "Undo %1$d Action"
 msgid_plural "Undo %1$d Actions"
 msgstr[0] "%1$d 操作のやり直し"
-msgstr[1] "%1$d 操作のやり直し"
+msgstr[1] ""
 
 #: src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:2999
 msgid "Undo boldness"
@@ -16946,6 +17028,10 @@ msgstr "回転を取り消す"
 msgid "Undo translation"
 msgstr "移動を取り消す"
 
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:667
+msgid "Unexpected character"
+msgstr "意外な人物像"
+
 #: src/libslic3r/miniz_extension.cpp:111
 msgid "unexpected decompressed size"
 msgstr "予期しない解凍サイズ"
@@ -17531,8 +17617,8 @@ msgstr ""
 "個人情報や、後でお客様を特定できるようなものは送信しません。 重複エントリを検"
 "出するために、システムから派生した一意の番号が送信されますが、ソース情報を再"
 "構築することはできません。 それとは別に、OS、ハードウェア、OpenGLのインストー"
-"ルに関する一般的なデータのみが送信されます。 QIDISlicerはオープンソースで"
+"ルに関する一般的なデータのみが送信されます。 QIDISlicerはオープンソースです。"
-"す。実際に通信を実行しているコードを検査する場合は、%1%を参照してください。"
+"実際に通信を実行しているコードを検査する場合は、%1%を参照してください。"
 
 #: src/slic3r/GUI/ConfigWizard.cpp:562
 msgid "Welcome"
@@ -17592,15 +17678,15 @@ msgid ""
 "When disabled, QIDISlicer will NOT emit commands to heat up extruder and "
 "bed, leaving both to Custom Start G-Code."
 msgstr ""
-"有効にすると、QIDISlicerはカスタムスタートGコードにM104またはM190が含まれて"
+"有効にすると、QIDISlicerはカスタムスタートGコードにM104またはM190が含まれてい"
-"いるかどうかをチェックします。含まれていた場合、温度は自動的に出力されず、加"
+"るかどうかをチェックします。含まれていた場合、温度は自動的に出力されず、加熱"
-"熱コマンドやその他のカスタムアクションの順序を自由にカスタマイズできます。"
+"コマンドやその他のカスタムアクションの順序を自由にカスタマイズできます。"
 "QIDISlicerのすべての設定にプレースホルダー変数を使用できるので、好きな場所に"
 "\"M109 S[first_layer_temperature]\"コマンドを置くことができることに注意してく"
 "ださい。\n"
-"カスタムスタートGコードにM104またはM190が含まれていない場合、QIDISlicerは"
+"カスタムスタートGコードにM104またはM190が含まれていない場合、QIDISlicerはベッ"
-"ベッドが目標温度に達し、エクストルーダーが加熱を開始した後にスタートGコードを"
+"ドが目標温度に達し、エクストルーダーが加熱を開始した後にスタートGコードを実行"
-"実行します。\n"
+"します。\n"
 "\n"
 "無効の場合、QIDISlicerはエクストルーダーとベッドを加熱するコマンドを発行せ"
 "ず、両方をカスタムスタートGコードに任せます。"
@@ -17829,7 +17915,11 @@ msgstr "ワイプタワー"
 msgid "Wipe tower brim width"
 msgstr "ワイプタワーのブリム幅"
 
-#: src/slic3r/GUI/Tab.cpp:2087
+#: src/libslic3r/PrintConfig.cpp:3239
+msgid "Wipe tower extruder"
+msgstr "ワイプタワーエクストルーダー"
+
+#: src/slic3r/GUI/Tab.cpp:2096
 msgid "Wipe tower parameters"
 msgstr "ワイプタワーのパラメータ"
 
@@ -17966,13 +18056,19 @@ msgid ""
 "Do you wish to continue?"
 msgstr ""
 "64ビットWindowsでQIDISlicerの32ビットビルドを実行しています。\n"
-"QIDISlicerの32ビットビルドでは、システムで使用可能なすべてのRAMを利用できな"
+"QIDISlicerの32ビットビルドでは、システムで使用可能なすべてのRAMを利用できない"
-"い可能性があります。\n"
+"可能性があります。\n"
-"https://www.qidi3d.cz/qidislicer/からQIDISlicerの64ビットビルドをダウン"
+"https://www.qidi3d.cz/qidislicer/からQIDISlicerの64ビットビルドをダウンロード"
-"ロードしてインストールしてください。\n"
+"してインストールしてください。\n"
 "続行しますか？"
 
-#: src/slic3r/GUI/Plater.cpp:5200
+#: src/slic3r/GUI/Plater.cpp:4103 src/slic3r/GUI/Plater.cpp:4109
+msgid "You are using template filament preset."
+msgid_plural "You are using template filament presets."
+msgstr[0] "テンプレート フィラメント プリセットを使用しています。"
+msgstr[1] ""
+
+#: src/slic3r/GUI/Plater.cpp:5241
 msgid ""
 "You can keep presets modifications to the new project, discard them or save "
 "changes as new presets.\n"
@@ -18037,12 +18133,12 @@ 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]."
+"[input_filename], [input_filename_base], [default_output_extension]."
 msgstr ""
 "このテンプレート内では、すべての構成オプションを変数として使用できます。例："
 "[layer_height]、[fill_density]など。[timestamp]、[year]、[month]、[day]、"
 "[hour]、[minute]、[second]、[version]、[input_filename]、"
-"[input_filename_base]も使用できます。"
+"[input_filename_base]、[default_output_extension]も使用できます。"
 
 #: src/slic3r/GUI/NotificationManager.hpp:908
 msgid ""
@@ -18353,6 +18449,7 @@ msgstr "%i / %i"
 msgid "%ld byte"
 msgid_plural "%ld bytes"
 msgstr[0] "%ld バイト"
+msgstr[1] ""
 
 #: ../src/html/helpwnd.cpp:1033
 #, fuzzy, c-format
@@ -22495,11 +22592,6 @@ msgstr "はがき 100×148mm"
 msgid "Japanese Postcard Rotated 148 x 100 mm"
 msgstr "はがき横置き 148×100mm"
 
-#: ../src/common/stockitem.cpp:169
-#, fuzzy
-msgid "Jump to"
-msgstr "移動 (&J)"
-
 #: ../src/common/stockitem.cpp:171
 msgid "Justified"
 msgstr "両端揃え"
@@ -22669,6 +22761,7 @@ msgstr "次のページ"
 msgid "Last repeated message (\"%s\", %u time) wasn't output"
 msgid_plural "Last repeated message (\"%s\", %u times) wasn't output"
 msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/common/paper.cpp:103
 msgid "Ledger, 17 x 11 in"
@@ -24928,6 +25021,7 @@ msgstr "アウトラインレベルを指定できます。"
 msgid "The previous message repeated %u time."
 msgid_plural "The previous message repeated %u times."
 msgstr[0] "直前のメッセージは %lu 回繰り返されました。"
+msgstr[1] ""
 
 #: ../src/common/log.cpp:270
 #, fuzzy

resources/localization/nl/QIDISlicer_nl.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-05-26 13:11+0200\n"
-"PO-Revision-Date: 2022-09-27 15:39+0200\n"
+"PO-Revision-Date: 2023-07-01 15:15+0800\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: nl\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.1.1\n"
+"X-Generator: Poedit 3.3.2\n"
 
 #: src/slic3r/GUI/AboutDialog.cpp:46 src/slic3r/GUI/AboutDialog.cpp:304
 msgid "Portions copyright"
@@ -2808,7 +2808,28 @@ msgstr ""
 "Er is een object buiten het printbereik gedetecteerd.\n"
 "Los het probleem op om door te gaan met slicen."
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:7539
+#. TRN %3% is name of Object1, %4% is name of Object2
+#: src/slic3r/GUI/GLCanvas3D.cpp:7496
+#, boost-format
+msgid ""
+"Conflicts in G-code paths have been detected at layer %1%, z=%2$.2f mm. "
+"Please reposition the conflicting objects (%3% <-> %4%) further apart."
+msgstr ""
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:7526
+msgid "Jump to"
+msgstr "Spring naar"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:7529
+#: src/slic3r/GUI/NotificationManager.cpp:2101
+#: src/slic3r/GUI/NotificationManager.cpp:2108
+#: src/slic3r/GUI/NotificationManager.cpp:2124
+#: src/slic3r/GUI/NotificationManager.cpp:2130
+#: src/slic3r/GUI/NotificationManager.cpp:2201
+msgid "ERROR:"
+msgstr "Fout:"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:7606
 msgid "Selection-Add from rectangle"
 msgstr "Selectie - Voeg toe van boxselectie"
 
@@ -4546,7 +4567,13 @@ msgstr "Afsluiten, ik zal mijn data nu verplaatsen"
 msgid "Start the application"
 msgstr "Start het programma"
 
-#: src/slic3r/GUI/GUI_App.cpp:736
+#. TRN %s = type of file
+#: src/slic3r/GUI/GUI_App.cpp:609
+#, c-format, boost-format
+msgid "%s files"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:772
 #, c-format, boost-format
 msgid ""
 "%s has encountered an error. It was likely caused by running out of memory. "
@@ -4567,9 +4594,9 @@ msgstr "Fatale fout"
 
 #: src/slic3r/GUI/GUI_App.cpp:743
 msgid ""
-"QIDISlicer has encountered a localization error. Please report to "
+"QIDISlicer has encountered a localization error. Please report to QIDISlicer "
-"QIDISlicer team, what language was active and in which scenario this issue "
+"team, what language was active and in which scenario this issue happened. "
-"happened. Thank you.\n"
+"Thank you.\n"
 "\n"
 "The application will now terminate."
 msgstr ""
@@ -4736,8 +4763,8 @@ msgid ""
 "Printer Settings anymore.\n"
 "Settings will be available in physical printers settings."
 msgstr ""
-"Maar sinds deze versie van QIDISlicer, wordt de informatie niet meer "
+"Maar sinds deze versie van QIDISlicer, wordt de informatie niet meer getoond "
-"getoond in de printerinstellingen.\n"
+"in de printerinstellingen.\n"
 "Instellingen zijn beschikbaar in de fysieke-printerinstellingen."
 
 #: src/slic3r/GUI/GUI_App.cpp:1793
@@ -7847,14 +7874,6 @@ msgstr "Exporteer G-code."
 msgid "Export."
 msgstr "Exporteer."
 
-#: src/slic3r/GUI/NotificationManager.cpp:2101
-#: src/slic3r/GUI/NotificationManager.cpp:2108
-#: src/slic3r/GUI/NotificationManager.cpp:2124
-#: src/slic3r/GUI/NotificationManager.cpp:2130
-#: src/slic3r/GUI/NotificationManager.cpp:2201
-msgid "ERROR:"
-msgstr "Fout:"
-
 #: src/slic3r/GUI/NotificationManager.cpp:2113
 #: src/slic3r/GUI/NotificationManager.cpp:2140
 #: src/slic3r/GUI/NotificationManager.cpp:2148
@@ -7932,12 +7951,11 @@ msgstr "U moet mogelijk uw grafische kaart updaten."
 
 #: src/slic3r/GUI/OpenGLManager.cpp:390
 msgid ""
-"As a workaround, you may run QIDISlicer with a software rendered 3D "
+"As a workaround, you may run QIDISlicer with a software rendered 3D graphics "
-"graphics by running qidi-slicer.exe with the --sw-renderer parameter."
+"by running qidi-slicer.exe with the --sw-renderer parameter."
 msgstr ""
 "Als tijdelijke oplossing kunt u QIDISlicer draaien met software gerenderde "
-"modelweergave door qidi-slicer.exe te draaien met de --sw-renderer "
+"modelweergave door qidi-slicer.exe te draaien met de --sw-renderer parameter."
-"parameter."
 
 #: src/slic3r/GUI/OpenGLManager.cpp:392
 msgid "Unsupported OpenGL version"
@@ -8042,7 +8060,16 @@ msgstr ""
 "Importeer een CA-bestand in de Certificate Store of Keychain om deze te "
 "gebruiken."
 
-#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:705
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:667
+msgid "Unexpected character"
+msgstr ""
+
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:668
+#: src/slic3r/GUI/SavePresetDialog.cpp:169
+msgid "The following characters are not allowed in the name"
+msgstr ""
+
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:723
 msgid "You have to enter a printer name."
 msgstr "U moet een printernaam invoeren."
 
@@ -8349,12 +8376,12 @@ msgid_plural ""
 "the dimensions of these objects?"
 msgstr[0] ""
 "De afmetingen van het object van bestand %s lijken in meters te zijn.\n"
-"De gebruikte eenheid van QIDISlicer is millimeters. Wilt u de afmetingen "
+"De gebruikte eenheid van QIDISlicer is millimeters. Wilt u de afmetingen van "
-"van het object verschalen?"
+"het object verschalen?"
 msgstr[1] ""
 "De afmetingen van sommige objecten van bestand %s lijken in meters te zijn.\n"
-"De gebruikte eenheid van QIDISlicer is millimeters. Wilt u de afmetingen "
+"De gebruikte eenheid van QIDISlicer is millimeters. Wilt u de afmetingen van "
-"van het object verschalen?"
+"het object verschalen?"
 
 #: src/slic3r/GUI/Plater.cpp:2615 src/slic3r/GUI/Plater.cpp:2637
 msgid "The object is too small"
@@ -8376,12 +8403,12 @@ msgid_plural ""
 "the dimensions of these objects?"
 msgstr[0] ""
 "De afmetingen van het object van bestand %s lijken in inches te zijn.\n"
-"De gebruikte eenheid van QIDISlicer is millimeters. Wilt u de afmetingen "
+"De gebruikte eenheid van QIDISlicer is millimeters. Wilt u de afmetingen van "
-"van het object verschalen?"
+"het object verschalen?"
 msgstr[1] ""
 "De afmetingen van sommige objecten van bestand %s lijken in inches te zijn.\n"
-"De gebruikte eenheid van QIDISlicer is millimeters. Wilt u de afmetingen "
+"De gebruikte eenheid van QIDISlicer is millimeters. Wilt u de afmetingen van "
-"van het object verschalen?"
+"het object verschalen?"
 
 #: src/slic3r/GUI/Plater.cpp:2650
 msgid ""
@@ -8506,7 +8533,11 @@ msgstr ""
 msgid "Enable supports for enforcers only"
 msgstr "Sta supports voor forceringen alleen toe"
 
-#: src/slic3r/GUI/Plater.cpp:3362 src/slic3r/GUI/Plater.cpp:4258
+#: src/slic3r/GUI/Plater.cpp:3229
+msgid "Bed temperatures for the used filaments differ significantly."
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3367 src/slic3r/GUI/Plater.cpp:4294
 msgid "Invalid data"
 msgstr "Ongeldige data"
 
@@ -8567,7 +8598,24 @@ msgstr "Fout tijdens herladen"
 msgid "Reload all from disk"
 msgstr "Herlaad alles van schijf"
 
-#: src/slic3r/GUI/Plater.cpp:4211
+#: src/slic3r/GUI/Plater.cpp:4103 src/slic3r/GUI/Plater.cpp:4109
+msgid "You are using template filament preset."
+msgid_plural "You are using template filament presets."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/slic3r/GUI/Plater.cpp:4104 src/slic3r/GUI/Plater.cpp:4110
+msgid ""
+"Please note that template presets are not customized for specific printer "
+"and should only be used as a starting point for creating your own user "
+"presets."
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4106
+msgid "More info at"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4247
 msgid "There are active warnings concerning sliced models:"
 msgstr "Er zijn actieve waarschuwingen wat betreft de slice:"
 
@@ -8816,7 +8864,11 @@ msgstr ""
 msgid "Save project"
 msgstr "Project opslaan"
 
-#: src/slic3r/GUI/Plater.cpp:6826
+#: src/slic3r/GUI/Plater.cpp:6681
+msgid "Unable to save file"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:6875
 msgid "Is the printer ready? Is the print sheet in place, empty and clean?"
 msgstr ""
 
@@ -8848,8 +8900,8 @@ msgid ""
 "If this is enabled, Slic3r will prompt the last output directory instead of "
 "the one containing the input files."
 msgstr ""
-"Als dit aan staat zal QIDISlicer de opslaglocatie gebruiken in plaats van "
+"Als dit aan staat zal QIDISlicer de opslaglocatie gebruiken in plaats van de "
-"de originele locatie."
+"originele locatie."
 
 #: src/slic3r/GUI/Preferences.cpp:245
 msgid "Auto-center parts"
@@ -8872,8 +8924,8 @@ 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 ""
-"Als dit aanstaat zal QIDISlicer objecten op de achtergrond slicen om tijd "
+"Als dit aanstaat zal QIDISlicer objecten op de achtergrond slicen om tijd te "
-"te besparen bij het exporteren van de G-code."
+"besparen bij het exporteren van de G-code."
 
 #: src/slic3r/GUI/Preferences.cpp:256
 msgid "Alert when supports needed"
@@ -9423,7 +9475,11 @@ msgstr "Bewerk preset"
 msgid "Change extruder color"
 msgstr "Verander extruderkleur"
 
-#: src/slic3r/GUI/PresetComboBoxes.cpp:767 src/slic3r/GUI/Tab.cpp:3503
+#: src/slic3r/GUI/PresetComboBoxes.cpp:787
+msgid "Show/Hide template presets"
+msgstr ""
+
+#: src/slic3r/GUI/PresetComboBoxes.cpp:795 src/slic3r/GUI/Tab.cpp:3520
 msgid "Edit physical printer"
 msgstr "Bewerk fysieke printer"
 
@@ -9783,10 +9839,6 @@ msgstr ""
 msgid "Save printer settings as"
 msgstr ""
 
-#: src/slic3r/GUI/SavePresetDialog.cpp:169
-msgid "The following characters are not allowed in the name"
-msgstr ""
-
 #: src/slic3r/GUI/SavePresetDialog.cpp:176
 msgid "The following suffix is not allowed in the name"
 msgstr ""
@@ -11897,14 +11949,13 @@ msgid ""
 "Could not detect system SSL certificate store. QIDISlicer will be unable to "
 "establish secure network connections."
 msgstr ""
-"Kan geen systeem SSL certicate store detecteren. QIDISlicer is niet in "
+"Kan geen systeem SSL certicate store detecteren. QIDISlicer is niet in staat "
-"staat om een veilige netwerkverbinding in te stellen."
+"om een veilige netwerkverbinding in te stellen."
 
 #: src/slic3r/Utils/Http.cpp:78
 #, boost-format
 msgid "QIDISlicer detected system SSL certificate store in: %1%"
-msgstr ""
+msgstr "QIDISlicer heeft een system SSL certificate store gedetecteerd in: %1%"
-"QIDISlicer heeft een system SSL certificate store gedetecteerd in: %1%"
 
 #: src/slic3r/Utils/Http.cpp:82
 #, boost-format
@@ -12827,8 +12878,8 @@ 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 ""
-"QIDISlicer kan .gcode-bestanden naar een printerhost uploaden. Dit veld "
+"QIDISlicer kan .gcode-bestanden naar een printerhost uploaden. Dit veld moet "
-"moet de API-key of het wachtwoord voor authenticatie bevatten."
+"de API-key of het wachtwoord voor authenticatie bevatten."
 
 #: src/libslic3r/PrintConfig.cpp:333
 msgid "Name of the printer"
@@ -13256,8 +13307,8 @@ msgid ""
 msgstr ""
 "Als meerdere objecten geprint worden, zorgt deze optie dat de objecten "
 "afzonderlijk voltooid worden voordat bewogen wordt naar de volgende. "
-"QIDISlicer voorkomt botsingen van de extruder tegen eerder geprinte "
+"QIDISlicer voorkomt botsingen van de extruder tegen eerder geprinte objecten "
-"objecten en zal u daar ook voor waarschuwen, maar blijf wel alert."
+"en zal u daar ook voor waarschuwen, maar blijf wel alert."
 
 #: src/libslic3r/PrintConfig.cpp:714
 msgid "Enable auto cooling"
@@ -14085,10 +14136,11 @@ msgid ""
 "maximum allowed speed at layer \"disable_fan_first_layers\" + 1."
 msgstr ""
 "De ventilatorsnelheid wordt geleidelijk opgebouwd van 0 op laag "
-"\"disable_fan_first_layers\" naar het maximale op laag \"full_fan_speed_layer"
+"\"disable_fan_first_layers\" naar het maximale op laag "
-"\". \"full_fan_speed_layer\" wordt genegeerd als die lager is dan "
+"\"full_fan_speed_layer\". \"full_fan_speed_layer\" wordt genegeerd als die "
-"\"disable_fan_first_layers\" in welk geval de ventilator zal draaien op de "
+"lager is dan \"disable_fan_first_layers\" in welk geval de ventilator zal "
-"maximaal toegestane snelheid op laag \"disable_fan_first_layers\" + 1."
+"draaien op de maximaal toegestane snelheid op laag "
+"\"disable_fan_first_layers\" + 1."
 
 #: src/libslic3r/PrintConfig.cpp:1343
 msgid "Fuzzy skin type."
@@ -14785,8 +14837,7 @@ msgstr "Minimale printsnelheid"
 
 #: src/libslic3r/PrintConfig.cpp:1916
 msgid "Slic3r will not scale speed down below this speed."
-msgstr ""
+msgstr "QIDISlicer zal de printsnelheid niet verlagen tot onder deze snelheid."
-"QIDISlicer zal de printsnelheid niet verlagen tot onder deze snelheid."
 
 #: src/libslic3r/PrintConfig.cpp:1923
 msgid "Minimal filament extrusion length"
@@ -14828,8 +14879,8 @@ msgid ""
 "Slic3r can upload G-code files to a printer host. This field must contain "
 "the kind of the host."
 msgstr ""
-"QIDISlicer kan .gcode-bestanden uploaden naar een printerhost. Dit veld "
+"QIDISlicer kan .gcode-bestanden uploaden naar een printerhost. Dit veld moet "
-"moet het type host bevatten."
+"het type host bevatten."
 
 #: src/libslic3r/PrintConfig.cpp:1968
 msgid "Only retract when crossing perimeters"
@@ -14859,12 +14910,12 @@ 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]."
+"[input_filename], [input_filename_base], [default_output_extension]."
 msgstr ""
 "U kunt alle instellingen gebruiken in deze template. U kunt hier ook andere "
 "variabelen gebruiken, zoals 'layer_height', 'fill_density', 'timestamp', "
 "'year', 'month', 'day', 'hour', 'minute', 'second', 'version', "
-"'input_filename', 'input_filename_base', etc."
+"'input_filename', 'input_filename_base', 'default_output_extension', etc."
 
 #: src/libslic3r/PrintConfig.cpp:1992
 msgid "Detect bridging perimeters"
@@ -16135,11 +16186,11 @@ msgid ""
 "behaviour both before and after the toolchange."
 msgstr ""
 "Deze custom code wordt ingevoegd voor elke toolwisseling. Variabelen voor "
-"alle QIDISlicer-instellingen kunnen gebruikt worden, evenals "
+"alle QIDISlicer-instellingen kunnen gebruikt worden, evenals {toolchange_z}, "
-"{toolchange_z}, {previous_extruder} en {next_extruder}. Als een "
+"{previous_extruder} en {next_extruder}. Als een toolwisseling-commando is "
-"toolwisseling-commando is toegevoegd die wisselt naar dezelfde extruder "
+"toegevoegd die wisselt naar dezelfde extruder (zoals T{next_extruder}), zal "
-"(zoals T{next_extruder}), zal QIDISlicer deze verder negeren. Het is daarom "
+"QIDISlicer deze verder negeren. Het is daarom mogelijk om een custom script "
-"mogelijk om een custom script toe te passen voor en na de toolwisseling."
+"toe te passen voor en na de toolwisseling."
 
 #: src/libslic3r/PrintConfig.cpp:3035
 msgid ""
@@ -16410,6 +16461,16 @@ msgid "Maximal distance between supports on sparse infill sections."
 msgstr "Maximale afstand tussen support op dunne vullingsdelen."
 
 #: src/libslic3r/PrintConfig.cpp:3239
+msgid "Wipe tower extruder"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3241
+msgid ""
+"The extruder to use when printing perimeter of the wipe tower. Set to 0 to "
+"use the one that is available (non-soluble would be preferred)."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3260
 msgid "XY Size Compensation"
 msgstr "Compensatie voor X- en Y-grootte"
 
@@ -17522,16 +17583,15 @@ msgstr ""
 
 #: src/libslic3r/PrintConfig.cpp:4836
 msgid ""
-"This version of QIDISlicer may not understand configurations produced by "
+"This version of QIDISlicer may not understand configurations produced by the "
-"the newest QIDISlicer versions. For example, newer QIDISlicer may extend "
+"newest QIDISlicer versions. For example, newer QIDISlicer may extend the "
-"the list of supported firmware flavors. One may decide to bail out or to "
+"list of supported firmware flavors. One may decide to bail out or to "
 "substitute an unknown value with a default silently or verbosely."
 msgstr ""
 "Deze versie van QIDISlicer snapt configuraties geproduceerd door nieuwere "
-"versie van QIDISlicer niet. Ter illustratie: nieuwere versies van "
+"versie van QIDISlicer niet. Ter illustratie: nieuwere versies van QIDISlicer "
-"QIDISlicer ondersteunen meer firmwarevarianten. Besloten kan worden om een "
+"ondersteunen meer firmwarevarianten. Besloten kan worden om een onbekende "
-"onbekende waarde zonder melding of woordelijk te vervangen door een "
+"waarde zonder melding of woordelijk te vervangen door een standaardwaarde."
-"standaardwaarde."
 
 #: src/libslic3r/PrintConfig.cpp:4840
 msgid "Bail out on unknown configuration values"
@@ -17584,12 +17644,12 @@ msgstr "Enkele instantiemodus"
 #: src/libslic3r/PrintConfig.cpp:4857
 msgid ""
 "If enabled, the command line arguments are sent to an existing instance of "
-"GUI QIDISlicer, or an existing QIDISlicer window is activated. Overrides "
+"GUI QIDISlicer, or an existing QIDISlicer window is activated. Overrides the "
-"the \"single_instance\" configuration value from application preferences."
+"\"single_instance\" configuration value from application preferences."
 msgstr ""
 "Als dit is ingeschakeld worden de commando-argumenten naar een bestaande "
-"instantie van de QIDISlicer GUI of een geopend QIDISlicer venster "
+"instantie van de QIDISlicer GUI of een geopend QIDISlicer venster gestuurd. "
-"gestuurd. Dit overschrijft de \"enkele instantie\"-configuratiewaarde van de "
+"Dit overschrijft de \"enkele instantie\"-configuratiewaarde van de "
 "programmavoorkeuren."
 
 #: src/libslic3r/PrintConfig.cpp:4862
@@ -17748,8 +17808,9 @@ msgstr ""
 #: resources/data/hints.ini: [hint:Hiding sidebar]
 msgid ""
 "Hiding sidebar\n"
-"Did you know that you can hide the right sidebar using the shortcut <b>Shift"
+"Did you know that you can hide the right sidebar using the shortcut "
-"+Tab</b>? You can also enable the icon for this from the<a>Preferences</a>."
+"<b>Shift+Tab</b>? You can also enable the icon for this from "
+"the<a>Preferences</a>."
 msgstr ""
 "Verberg zijbalk\n"
 "Wist u dat u de rechter zijbalk kan verbergen met de sneltoets <b>Shift+Tab</"
@@ -17865,8 +17926,8 @@ msgid ""
 msgstr ""
 "Zoekfuncties\n"
 "Wist u dat u de <a>Zoekfunctie</a> kunt gebruiken om snel een specifieke "
-"instelling in QIDISlicer te vinden? Of gebruik de bekende sneltoets <b>Ctrl"
+"instelling in QIDISlicer te vinden? Of gebruik de bekende sneltoets "
-"+F</b>."
+"<b>Ctrl+F</b>."
 
 #: resources/data/hints.ini: [hint:Box selection]
 msgid ""
@@ -22273,10 +22334,6 @@ msgstr "Japanse Briefkaart 100 x 148 mm"
 msgid "Japanese Postcard Rotated 148 x 100 mm"
 msgstr "Japanse Breifkaart Gedraaid 148 x 100 mm"
 
-#: ../src/common/stockitem.cpp:169
-msgid "Jump to"
-msgstr "Spring naar"
-
 #: ../src/common/stockitem.cpp:171
 msgid "Justified"
 msgstr "Uitgevuld"
@@ -24939,8 +24996,8 @@ msgid ""
 "Type operation \"%s\" failed: Property labeled \"%s\" is of type \"%s\", NOT "
 "\"%s\"."
 msgstr ""
-"Type handeling \"%s\" mislukt: Eigenschap met label \"%s\" is van type \"%s"
+"Type handeling \"%s\" mislukt: Eigenschap met label \"%s\" is van type "
-"\", NIET \"%s\"."
+"\"%s\", NIET \"%s\"."
 
 #: ../src/common/paper.cpp:133
 msgid "US Std Fanfold, 14 7/8 x 11 in"

resources/localization/pl/QIDISlicer_pl.po

@@ -1,13 +1,18 @@
 msgid ""
 msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \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"
+"Plural-Forms: nplurals=4; plural=(n == 1) ? 0 : ((n%10 >= 2 && n%10 <=4 && "
-"%100 < 12 || n%100 > 14)) ? 1 : ((n%10 == 0 || n%10 == 1 || (n%10 >= 5 && n"
+"(n%100 < 12 || n%100 > 14)) ? 1 : ((n%10 == 0 || n%10 == 1 || (n%10 >= 5 && "
-"%10 <=9)) || (n%100 >= 12 && n%100 <= 14)) ? 2 : 3);\n"
+"n%10 <=9)) || (n%100 >= 12 && n%100 <= 14)) ? 2 : 3);\n"
-"X-Generator: QIDIlator\n"
+"X-Generator: Poedit 3.3.2\n"
 
 #: src/libslic3r/PrintConfig.cpp:503 src/libslic3r/PrintConfig.cpp:594
 #: src/libslic3r/PrintConfig.cpp:603 src/libslic3r/PrintConfig.cpp:612
@@ -64,7 +69,7 @@ msgstr[1] "‪%1$d‬ odwróconych krawędzi"
 msgstr[2] "‪%1$d‬ odwróconych krawędzi"
 msgstr[3] "‪%1$d‬ odwróconych krawędzi"
 
-#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2197
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2196
 #, c-format, boost-format
 msgid "%1$d connector is out of cut contour"
 msgid_plural "%1$d connectors are out of cut contour"
@@ -72,9 +77,8 @@ msgstr[0] "%1$d łącznik poza konturem"
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] "%1$d łączniki poza konturem"
-msgstr[4] ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2200
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:2199
 #, c-format, boost-format
 msgid "%1$d connector is out of object"
 msgid_plural "%1$d connectors are out of object"
@@ -82,7 +86,6 @@ msgstr[0] "%1$d łącznik poza obiektem"
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] "%1$d łączniki poza obiektem"
-msgstr[4] ""
 
 #: src/slic3r/GUI/GUI_ObjectList.cpp:459
 #, c-format, boost-format
@@ -128,7 +131,6 @@ msgstr[0] "%1$d obiekt został załadowany jako część przeciętego obiektu"
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] "%1$d obiektów zostały załadowanych jako część przeciętego obiektu"
-msgstr[4] ""
 
 #: src/slic3r/GUI/NotificationManager.cpp:1649
 #, c-format, boost-format
@@ -613,9 +615,9 @@ msgid ""
 "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. "
+"Dodaj więcej obrysów, aby uniknąć przerw przy pochyłych ścianach. QIDISlicer "
-"QIDISlicer będzie dodawał tyle obrysów, ile jest potrzebne aby podeprzeć co "
+"będzie dodawał tyle obrysów, ile jest potrzebne aby podeprzeć co najmniej "
-"najmniej 70% grubości ściany kolejnej warstwy."
+"70% grubości ściany kolejnej warstwy."
 
 #: src/slic3r/GUI/GUI_Factories.cpp:170
 msgid "Add negative text"
@@ -1370,8 +1372,8 @@ msgstr ""
 
 #: src/slic3r/GUI/OpenGLManager.cpp:390
 msgid ""
-"As a workaround, you may run QIDISlicer with a software rendered 3D "
+"As a workaround, you may run QIDISlicer with a software rendered 3D graphics "
-"graphics by running qidi-slicer.exe with the --sw-renderer parameter."
+"by running qidi-slicer.exe with the --sw-renderer parameter."
 msgstr ""
 "Jako obejście problemu, można uruchomić QIDISlicer z programowo renderowaną "
 "grafiką 3D poprzez uruchomienie qidi-slicer.exe z parametrem --sw-renderer."
@@ -1633,7 +1635,11 @@ msgstr ""
 "Temperatura stołu dla warstw powyżej pierwszej. Ustaw 0, aby wyłączyć "
 "kontrolowanie temperatury w pliku wyjściowym."
 
-#: src/slic3r/GUI/Tab.cpp:2569 src/libslic3r/GCode.cpp:768
+#: src/slic3r/GUI/Plater.cpp:3229
+msgid "Bed temperatures for the used filaments differ significantly."
+msgstr "Temperatury stołu dla używanych filamentów znacznie się różnią."
+
+#: src/slic3r/GUI/Tab.cpp:2586 src/libslic3r/GCode.cpp:768
 #: src/libslic3r/PrintConfig.cpp:442
 msgid "Before layer change G-code"
 msgstr "G-code wykonywany przed zmianą warstwy"
@@ -1739,9 +1745,9 @@ msgid ""
 "also box-deselect objects with <b>Alt+Mouse drag</b>."
 msgstr ""
 "Zaznaczanie prostokątem\n"
-"Czy wiesz, że możesz zaznaczyć prostokątem za pomocą kombinacji Shift"
+"Czy wiesz, że możesz zaznaczyć prostokątem za pomocą kombinacji "
-"+przeciągnięcie myszki? Możesz również usuwać zaznaczenie obiektów za pomocą "
+"Shift+przeciągnięcie myszki? Możesz również usuwać zaznaczenie obiektów za "
-"<b>Alt+przeciągnięcie myszki</b>."
+"pomocą <b>Alt+przeciągnięcie myszki</b>."
 
 #: src/libslic3r/PrintConfig.cpp:2969
 msgid "Branch Density"
@@ -2691,6 +2697,16 @@ msgstr "Potwierdzenie"
 msgid "Confirm connectors"
 msgstr "Potwierdź łączniki"
 
+#. TRN %3% is name of Object1, %4% is name of Object2
+#: src/slic3r/GUI/GLCanvas3D.cpp:7496
+#, boost-format
+msgid ""
+"Conflicts in G-code paths have been detected at layer %1%, z=%2$.2f mm. "
+"Please reposition the conflicting objects (%3% <-> %4%) further apart."
+msgstr ""
+"Wykryto konflikty w ścieżkach G-code na warstwie %1%, z=%2$.2f mm. Odsuń "
+"obiekty powodujące konflikt (%3% <-> %4%) dalej od siebie."
+
 #: src/libslic3r/PrintConfig.cpp:1492
 msgid ""
 "Connect an infill line to an internal perimeter with a short segment of an "
@@ -2705,13 +2721,13 @@ msgid ""
 msgstr ""
 "Łączenie wypełnienia z wewnętrznym obrysem przez dodanie krótkiego segmentu "
 "obrysu. Jeśli wyrażone w procentach (np. 15%), zostanie obliczone z "
-"szerokości ścieżki wypełnienia. QIDISlicer spróbuje połączyć dwie "
+"szerokości ścieżki wypełnienia. QIDISlicer spróbuje połączyć dwie najbliższe "
-"najbliższe linie wypełnienia krótkim segmentem obrysu. Jeśli nie zostanie "
+"linie wypełnienia krótkim segmentem obrysu. Jeśli nie zostanie znaleziony "
-"znaleziony segment krótszy, niż parametr infill_anchor_max, linia "
+"segment krótszy, niż parametr infill_anchor_max, linia wypełnienia zostanie "
-"wypełnienia zostanie dołączona do segmentu obrysu tylko z jednej strony, a "
+"dołączona do segmentu obrysu tylko z jednej strony, a długość segmentu "
-"długość segmentu będzie ograniczona do wartości tego parametru, ale nie "
+"będzie ograniczona do wartości tego parametru, ale nie dłuższa niż "
-"dłuższa niż anchor_length_max. Ustaw zero, aby wyłączyć kotwiczenie obrysów "
+"anchor_length_max. Ustaw zero, aby wyłączyć kotwiczenie obrysów do "
-"do pojedynczej linii wypełnienia."
+"pojedynczej linii wypełnienia."
 
 #: src/libslic3r/PrintConfig.cpp:1515
 msgid ""
@@ -2726,12 +2742,12 @@ msgid ""
 msgstr ""
 "Łączenie wypełnienia z wewnętrznym obrysem przez dodanie krótkiego segmentu "
 "obrysu. Jeśli wyrażone w procentach (np. 15%), zostanie obliczone z "
-"szerokości ścieżki wypełnienia. QIDISlicer spróbuje połączyć dwie "
+"szerokości ścieżki wypełnienia. QIDISlicer spróbuje połączyć dwie najbliższe "
-"najbliższe linie wypełnienia krótkim segmentem obrysu. Jeśli nie zostanie "
+"linie wypełnienia krótkim segmentem obrysu. Jeśli nie zostanie znaleziony "
-"znaleziony segment krótszy, niż ten parametr, linia wypełnienia zostanie "
+"segment krótszy, niż ten parametr, linia wypełnienia zostanie dołączona do "
-"dołączona do segmentu obrysu tylko z jednej strony, a długość segmentu "
+"segmentu obrysu tylko z jednej strony, a długość segmentu będzie ograniczona "
-"będzie ograniczona do wartości parametru infill_anchor, ale nie dłuższa niż "
+"do wartości parametru infill_anchor, ale nie dłuższa niż ten parametr. Ustaw "
-"ten parametr. Ustaw zero, aby wyłączyć kotwiczenie."
+"zero, aby wyłączyć kotwiczenie."
 
 #: src/slic3r/GUI/Tab.cpp:5133
 msgid "Connection of the support sticks and junctions"
@@ -3083,10 +3099,10 @@ msgid ""
 "triangle mesh slicing. The gap closing operation may reduce the final print "
 "resolution, therefore it is advisable to keep the value reasonably low."
 msgstr ""
-"Szpary mniejsze niż dwukrotność wartości parametru \"promień zamykania szpar"
+"Szpary mniejsze niż dwukrotność wartości parametru \"promień zamykania "
-"\" zostaną zamknięte przy cięciu. Operacja zamykania szpar może zmniejszyć "
+"szpar\" zostaną zamknięte przy cięciu. Operacja zamykania szpar może "
-"finalną rozdzielczość wydruku, więc zalecane jest ustawienie tej wartości na "
+"zmniejszyć finalną rozdzielczość wydruku, więc zalecane jest ustawienie tej "
-"rozsądnie niskim poziomie."
+"wartości na rozsądnie niskim poziomie."
 
 #: src/libslic3r/miniz_extension.cpp:113
 msgid "CRC-32 check failed"
@@ -3141,6 +3157,12 @@ msgstr ""
 "Niepowodzenie inicjalizacji CURL. QIDISlicer nie będzie w stanie nawiązać "
 "połączenia przez sieć. Szczegóły w logach."
 
+#. TRN Means "current color"
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:340
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:356
+msgid "Current"
+msgstr "Obecny"
+
 #: src/slic3r/GUI/wxExtensions.cpp:629
 #, c-format, boost-format
 msgid "Current mode is %s"
@@ -5241,10 +5263,11 @@ msgid ""
 "maximum allowed speed at layer \"disable_fan_first_layers\" + 1."
 msgstr ""
 "Prędkość wentylatora będzie podnoszona liniowo od zera na warstwie "
-"\"disable_fan_first_layers\" do maksimum na warstwie \"full_fan_speed_layer"
+"\"disable_fan_first_layers\" do maksimum na warstwie "
-"\". Parametr \"full_fan_speed_layer\" będzie ignorowany, jeśli jest niższy "
+"\"full_fan_speed_layer\". Parametr \"full_fan_speed_layer\" będzie "
-"niż \"disable_fan_first_layers\" i w takim przypadku będzie pracować z "
+"ignorowany, jeśli jest niższy niż \"disable_fan_first_layers\" i w takim "
-"najwyższą dozwoloną prędkością na warstwie \"disable_fan_first_layers\" +1."
+"przypadku będzie pracować z najwyższą dozwoloną prędkością na warstwie "
+"\"disable_fan_first_layers\" +1."
 
 #: src/slic3r/GUI/PresetHints.cpp:57
 #, boost-format
@@ -6334,8 +6357,9 @@ msgstr "Ukryj linijkę"
 #: resources/data/hints.ini: [hint:Hiding sidebar]
 msgid ""
 "Hiding sidebar\n"
-"Did you know that you can hide the right sidebar using the shortcut <b>Shift"
+"Did you know that you can hide the right sidebar using the shortcut "
-"+Tab</b>? You can also enable the icon for this from the<a>Preferences</a>."
+"<b>Shift+Tab</b>? You can also enable the icon for this from "
+"the<a>Preferences</a>."
 msgstr ""
 "Ukrywanie paska bocznego\n"
 "Czy wiesz, że możesz ukryć prawy pasek używając skrótu <b>Shift+Tab</b>? "
@@ -6639,8 +6663,7 @@ msgstr ""
 #: src/slic3r/GUI/Preferences.cpp:578
 msgid "If enabled, QIDISlicer will be allowed to download from Printables.com"
 msgstr ""
-"Jeśli włączone, QIDISlicer dostanie pozwolenie na pobieranie z Printables."
+"Jeśli włączone, QIDISlicer dostanie pozwolenie na pobieranie z Printables.com"
-"com"
 
 #: src/slic3r/GUI/Preferences.cpp:383
 msgid "If enabled, QIDISlicer will be open at the position it was closed"
@@ -6770,8 +6793,8 @@ msgstr ""
 #: src/libslic3r/PrintConfig.cpp:4857
 msgid ""
 "If enabled, the command line arguments are sent to an existing instance of "
-"GUI QIDISlicer, or an existing QIDISlicer window is activated. Overrides "
+"GUI QIDISlicer, or an existing QIDISlicer window is activated. Overrides the "
-"the \"single_instance\" configuration value from application preferences."
+"\"single_instance\" configuration value from application preferences."
 msgstr ""
 "Jeśli włączone, argumenty linii komend zostaną wysłane do istniejącego GUI "
 "QIDISlicer lub aktywnego okna QIDISlicer. Nadpisuje parametr konfiguracji "
@@ -6960,10 +6983,10 @@ msgid ""
 "such issues are floating object parts, unsupported extrusions and low bed "
 "adhesion."
 msgstr ""
-"Jeśli włączone, QIDISlicer będzie zgłaszał ostrzeżenia, gdy wykryje "
+"Jeśli włączone, QIDISlicer będzie zgłaszał ostrzeżenia, gdy wykryje problemy "
-"problemy w pociętym obiekcie, które mogą być rozwiązane za pomocą podpór (i "
+"w pociętym obiekcie, które mogą być rozwiązane za pomocą podpór (i brimu). "
-"brimu). Przykładami takich problemów są pływające części obiektu, "
+"Przykładami takich problemów są pływające części obiektu, niepodparte "
-"niepodparte ekstruzje i niska przyczepność do stołu."
+"ekstruzje i niska przyczepność do stołu."
 
 #: src/slic3r/GUI/Preferences.cpp:324
 msgid ""
@@ -6971,8 +6994,8 @@ msgid ""
 "same QIDISlicer is already running, that instance will be reactivated "
 "instead."
 msgstr ""
-"Jeśli włączone, uruchomienie QIDISlicer, gdy uruchomiona jest ta sama "
+"Jeśli włączone, uruchomienie QIDISlicer, gdy uruchomiona jest ta sama wersja "
-"wersja QIDISlicer, spowoduje reaktywację tej instancji."
+"QIDISlicer, spowoduje reaktywację tej instancji."
 
 #: src/slic3r/GUI/SendSystemInfoDialog.cpp:591
 msgid ""
@@ -7598,6 +7621,15 @@ msgstr "Jitter"
 msgid "Join"
 msgstr "Dołącz"
 
+#: src/slic3r/GUI/GLCanvas3D.cpp:7526 ../src/common/stockitem.cpp:169
+#, fuzzy
+msgid "Jump to"
+msgstr ""
+"#-#-#-#-#  catalog.po  #-#-#-#-#\n"
+"Przejdź do\n"
+"#-#-#-#-#  catalog.po  #-#-#-#-#\n"
+"Skocz do"
+
 #: src/slic3r/GUI/DoubleSlider.cpp:2094 src/slic3r/GUI/DoubleSlider.cpp:2324
 msgid "Jump to height"
 msgstr "Przejdź do wysokości"
@@ -8998,6 +9030,10 @@ msgstr "Linie monotoniczne"
 msgid "More"
 msgstr "Więcej"
 
+#: src/slic3r/GUI/Plater.cpp:4106
+msgid "More info at"
+msgstr "Więcej informacji na"
+
 #: src/slic3r/GUI/GUI.cpp:317
 msgid ""
 "Most likely the configuration was produced by a newer version of QIDISlicer "
@@ -9474,7 +9510,6 @@ msgstr[2] ""
 msgstr[3] ""
 "Należy pamiętać, że w tych drukarkach również zostanie zmieniona nazwa "
 "wybranego zestawu ustawień."
-msgstr[4] ""
 
 #: src/slic3r/GUI/Tab.cpp:4151
 msgid ""
@@ -9608,9 +9643,9 @@ msgid ""
 "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"
+"Liczba pętli skirt. Jeśli włączona jest opcja \"Minimalna długość "
-"\", to może ona nadpisać wartość wprowadzoną w tym polu. Ustaw zero, aby "
+"ekstruzji\", to może ona nadpisać wartość wprowadzoną w tym polu. Ustaw "
-"całkowicie wyłączyć skirt."
+"zero, aby całkowicie wyłączyć skirt."
 
 #: src/libslic3r/PrintConfig.cpp:3601
 msgid "Number of pixels in"
@@ -10119,6 +10154,12 @@ msgstr "Skieruj tekst w stronę kamery."
 msgid "Origin"
 msgstr "Punkt zerowy"
 
+#. TRN Means "original color"
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:342
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:356
+msgid "Original"
+msgstr "Oryginalny"
+
 #: src/slic3r/GUI/UnsavedChangesDialog.cpp:860
 msgid "Original value"
 msgstr "Oryginalna wartość"
@@ -10777,6 +10818,16 @@ msgstr "Sprawdź listę modeli przed zmianą zestawu ustawień."
 msgid "Please check your object list before preset changing."
 msgstr "Sprawdź listę modeli przed zmianą zestawu ustawień."
 
+#: src/slic3r/GUI/Plater.cpp:4104 src/slic3r/GUI/Plater.cpp:4110
+msgid ""
+"Please note that template presets are not customized for specific printer "
+"and should only be used as a starting point for creating your own user "
+"presets."
+msgstr ""
+"Należy pamiętać, że ustawienia typu szablon nie są dostosowane do konkretnej "
+"drukarki i powinny być używane wyłącznie jako punkt wyjścia do tworzenia "
+"własnych ustawień użytkownika."
+
 #: src/slic3r/GUI/BackgroundSlicingProcess.cpp:85
 msgid ""
 "Please save your project and restart QIDISlicer. We would be glad if you "
@@ -11360,9 +11411,9 @@ msgstr "QIDISlicer napotkał krytyczny błąd: \"%1%\""
 
 #: src/slic3r/GUI/GUI_App.cpp:743
 msgid ""
-"QIDISlicer has encountered a localization error. Please report to "
+"QIDISlicer has encountered a localization error. Please report to QIDISlicer "
-"QIDISlicer team, what language was active and in which scenario this issue "
+"team, what language was active and in which scenario this issue happened. "
-"happened. Thank you.\n"
+"Thank you.\n"
 "\n"
 "The application will now terminate."
 msgstr ""
@@ -13329,6 +13380,12 @@ msgstr "Ustaw górny punkt jako aktywny"
 msgid "%s Family"
 msgstr "Rodzina %s"
 
+#. TRN %s = type of file
+#: src/slic3r/GUI/GUI_App.cpp:609
+#, c-format, boost-format
+msgid "%s files"
+msgstr "%s plików"
+
 #: src/slic3r/GUI/ConfigManipulation.cpp:167
 msgid "Shall I adjust those settings for supports?"
 msgstr "Czy chcesz zmienić te ustawienia dla podpór?"
@@ -13498,6 +13555,10 @@ msgstr "Pokaż/ukryj legendę"
 msgid "Show/Hide object/instance labels"
 msgstr "Ukryj/pokaż etykiety modelu/instancji"
 
+#: src/slic3r/GUI/PresetComboBoxes.cpp:787
+msgid "Show/Hide template presets"
+msgstr "Pokaż/ukryj zestawy szablonowe"
+
 #: src/slic3r/GUI/Preferences.cpp:304
 msgid "Show incompatible print and filament presets"
 msgstr "Pokaż niekompatybilne ustawienia druku i filamentów"
@@ -15213,6 +15274,15 @@ msgstr ""
 msgid "The extruder to use when printing infill."
 msgstr "Ekstruder używany do druku wypełnienia."
 
+#: src/libslic3r/PrintConfig.cpp:3241
+msgid ""
+"The extruder to use when printing perimeter of the wipe tower. Set to 0 to "
+"use the one that is available (non-soluble would be preferred)."
+msgstr ""
+"Ekstruder używany do drukowania obrysów wieży czyszczącej. Ustaw na 0, aby "
+"użyć tego, który jest dostępny (preferowany jest ten, w którym załadowany "
+"jest filament nierozpuszczalny)."
+
 #: src/libslic3r/PrintConfig.cpp:2036
 msgid ""
 "The extruder to use when printing perimeters and brim. First extruder is 1."
@@ -15436,10 +15506,10 @@ msgid ""
 "as percentage (for example 50%) of a direct travel path."
 msgstr ""
 "Maksymalna długość objazdu przy unikaniu przejeżdżania nad obrysami. Jeśli "
-"objazd miałby wykroczyć poza tę wartość, funkcja \"Unikaj ruchów nad obrysami"
+"objazd miałby wykroczyć poza tę wartość, funkcja \"Unikaj ruchów nad "
-"\" zostanie zignorowana dla tej ścieżki. Długość objazdu można zdefiniować "
+"obrysami\" zostanie zignorowana dla tej ścieżki. Długość objazdu można "
-"jako wartość absolutna lub obliczona procentowo (np. 50%) z długości ruchu "
+"zdefiniować jako wartość absolutna lub obliczona procentowo (np. 50%) z "
-"bezpośredniego."
+"długości ruchu bezpośredniego."
 
 #: src/libslic3r/PrintConfig.cpp:1355
 msgid ""
@@ -15606,7 +15676,6 @@ msgstr[2] ""
 msgstr[3] ""
 "Fizyczne drukarki poniżej są oparte na zestawie ustawień, którego nazwę "
 "zamierzasz zmienić."
-msgstr[4] ""
 
 #: src/libslic3r/PrintConfig.cpp:641
 msgid ""
@@ -16441,8 +16510,7 @@ msgstr "To jest systemowy zestaw ustawień."
 #: src/libslic3r/PrintConfig.cpp:3740
 msgid "This is only used in the Slic3r interface as a visual help."
 msgstr ""
-"Ta funkcja jest używana jedynie w interfejsie QIDISlicer jako pomoc "
+"Ta funkcja jest używana jedynie w interfejsie QIDISlicer jako pomoc wizualna."
-"wizualna."
 
 #: src/libslic3r/PrintConfig.cpp:737
 msgid ""
@@ -16778,16 +16846,16 @@ msgstr ""
 
 #: src/libslic3r/PrintConfig.cpp:4836
 msgid ""
-"This version of QIDISlicer may not understand configurations produced by "
+"This version of QIDISlicer may not understand configurations produced by the "
-"the newest QIDISlicer versions. For example, newer QIDISlicer may extend "
+"newest QIDISlicer versions. For example, newer QIDISlicer may extend the "
-"the list of supported firmware flavors. One may decide to bail out or to "
+"list of supported firmware flavors. One may decide to bail out or to "
 "substitute an unknown value with a default silently or verbosely."
 msgstr ""
 "Ta wersja QIDISlicera może nie rozumieć konfiguracji tworzonych przez "
-"najnowsze wersje QIDISlicera. Na przykład, nowszy QIDISlicer może "
+"najnowsze wersje QIDISlicera. Na przykład, nowszy QIDISlicer może rozszerzyć "
-"rozszerzyć listę obsługiwanych rodzajów firmware. Możesz zdecydować się na "
+"listę obsługiwanych rodzajów firmware. Możesz zdecydować się na rezygnację "
-"rezygnację lub zastąpienie nieznanej wartości wartością domyślną po cichu "
+"lub zastąpienie nieznanej wartości wartością domyślną po cichu lub z "
-"lub z powiadomieniem."
+"powiadomieniem."
 
 #: src/slic3r/GUI/UpdateDialogs.cpp:392
 #, c-format, boost-format
@@ -17189,6 +17257,10 @@ msgstr "Nie można wczytać:"
 msgid "Unable to replace with more than one volume"
 msgstr "Nie można zamienić na więcej niż jeden kształt"
 
+#: src/slic3r/GUI/Plater.cpp:6681
+msgid "Unable to save file"
+msgstr "Nie można zapisać pliku"
+
 #: src/slic3r/GUI/OptionsGroup.cpp:126
 msgid "Unavailable for this method."
 msgstr "Niedostępne dla tej metody."
@@ -17286,6 +17358,10 @@ msgstr "Cofnij obrót"
 msgid "Undo translation"
 msgstr "Cofnij przesunięcie"
 
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:667
+msgid "Unexpected character"
+msgstr "Nieoczekiwany znak"
+
 #: src/libslic3r/miniz_extension.cpp:111
 msgid "unexpected decompressed size"
 msgstr "nieoczekiwany rozmiar po rozpakowaniu"
@@ -18185,7 +18261,11 @@ msgstr "Wieża czyszcząca"
 msgid "Wipe tower brim width"
 msgstr "Szerokość brimu wieży czyszczącej"
 
-#: src/slic3r/GUI/Tab.cpp:2087
+#: src/libslic3r/PrintConfig.cpp:3239
+msgid "Wipe tower extruder"
+msgstr "Ekstruder dla wieży czyszczącej"
+
+#: src/slic3r/GUI/Tab.cpp:2096
 msgid "Wipe tower parameters"
 msgstr "Parametry wieży czyszczącej"
 
@@ -18330,11 +18410,18 @@ msgstr ""
 "bitowym.\n"
 "32-bitowa wersja prawdopodobnie nie będzie w stanie wykorzystać w pełni "
 "pamięci RAM zainstalowanej w komputerze.\n"
-"Pobierz i zainstaluj wersję 64-bitową z https://www.qidi3d.pl/"
+"Pobierz i zainstaluj wersję 64-bitową z https://www.qidi3d.pl/qidislicer/.\n"
-"qidislicer/.\n"
 "Czy chcesz kontynuować?"
 
-#: src/slic3r/GUI/Plater.cpp:5200
+#: src/slic3r/GUI/Plater.cpp:4103 src/slic3r/GUI/Plater.cpp:4109
+msgid "You are using template filament preset."
+msgid_plural "You are using template filament presets."
+msgstr[0] "Używasz ustawień filamentu typu szablon."
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] "Używasz ustawień filamentu typu szablon."
+
+#: src/slic3r/GUI/Plater.cpp:5241
 msgid ""
 "You can keep presets modifications to the new project, discard them or save "
 "changes as new presets.\n"
@@ -18395,15 +18482,13 @@ 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]."
+"[input_filename], [input_filename_base], [default_output_extension]."
 msgstr ""
-"Możesz użyć wszystkich opcji konfiguracjnych jako zmiennych w tym szablonie, "
+"Możesz użyć wszystkich opcji konfiguracji jako zmiennych wewnątrz tego "
-"takich jak np: [layer_height] - wysokość warstwy, [fill_density] - gęstość "
+"szablonu. Na przykład: [layer_height], [fill_density] itp. Możesz również "
-"wypełnienia, itp. Możesz również użyć [timestamp] - czas, [year] - rok, "
+"użyć [timestamp], [year], [month], [day], [hour], [minute], [second], "
-"[month] - miesiąc, [day] - dzień, [hour] - godzina, [minute] - minuta, "
+"[version], [input_filename], [input_filename_base], "
-"[second] - sekunda, [version] - wersja, [input_filename] - pełna nazwa pliku "
+"[default_output_extension]."
-"wejściowego, [input_filename_base] - nazwa pliku wejściowego bez "
-"rozszerzenia."
 
 #: src/slic3r/GUI/NotificationManager.hpp:908
 msgid ""
@@ -18717,6 +18802,7 @@ msgid_plural "%ld bytes"
 msgstr[0] "%ld bajt"
 msgstr[1] "%ld bajty"
 msgstr[2] "%ld bajtów"
+msgstr[3] ""
 
 #: ../src/html/helpwnd.cpp:1033
 #, c-format
@@ -22848,10 +22934,6 @@ msgstr "Japońska Pocztówka 100 x 148 mm"
 msgid "Japanese Postcard Rotated 148 x 100 mm"
 msgstr "Japońska Pocztówka Obrócona 148 x 100 mm"
 
-#: ../src/common/stockitem.cpp:169
-msgid "Jump to"
-msgstr "Skocz do"
-
 #: ../src/common/stockitem.cpp:171
 msgid "Justified"
 msgstr "Wyrównanie obustronne"
@@ -23021,6 +23103,7 @@ msgid_plural "Last repeated message (\"%s\", %u times) wasn't output"
 msgstr[0] "Last repeated message (\"%s\", %lu time) wasn't output"
 msgstr[1] "Last repeated message (\"%s\", %lu times) wasn't output"
 msgstr[2] "Last repeated message (\"%s\", %lu times) wasn't output"
+msgstr[3] ""
 
 #: ../src/common/paper.cpp:103
 msgid "Ledger, 17 x 11 in"
@@ -25240,6 +25323,7 @@ msgid_plural "The previous message repeated %u times."
 msgstr[0] "Poprzedni komunikat powtórzył się %lu raz."
 msgstr[1] "Poprzedni komunikat powtórzył się %lu razy."
 msgstr[2] "Poprzedni komunikat powtórzył się %lu razy."
+msgstr[3] ""
 
 #: ../src/common/log.cpp:270
 msgid "The previous message repeated once."
@@ -25545,8 +25629,8 @@ msgid ""
 "Type operation \"%s\" failed: Property labeled \"%s\" is of type \"%s\", NOT "
 "\"%s\"."
 msgstr ""
-"Niepowodzenie operacji typu \"%s\": właściwość nazwana  \"%s\" jest typu \"%s"
+"Niepowodzenie operacji typu \"%s\": właściwość nazwana  \"%s\" jest typu "
-"\", nie \"%s\"."
+"\"%s\", nie \"%s\"."
 
 #: ../src/common/paper.cpp:133
 msgid "US Std Fanfold, 14 7/8 x 11 in"

resources/localization/ru/QIDISlicer_ru.po

@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: QIDISlicer 2.6.0-beta1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-05-26 13:11+0200\n"
-"PO-Revision-Date: 2023-05-15 20:43+0700\n"
+"PO-Revision-Date: 2023-07-01 15:18+0800\n"
 "Last-Translator: Andylg <andylg@yandex.ru>\n"
 "Language-Team: \n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n"
+"n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n"
-"X-Generator: Poedit 3.3\n"
+"X-Generator: Poedit 3.3.2\n"
 
 #: src/slic3r/GUI/AboutDialog.cpp:46 src/slic3r/GUI/AboutDialog.cpp:304
 msgid "Portions copyright"
@@ -1431,8 +1431,8 @@ msgid ""
 "file. QIDISlicer desktop file was probably created successfully."
 msgstr ""
 "Не удалось выполнить интеграцию с рабочим столом - не удалось установить "
-"ссылку на Gcodeviewer на рабочем столе. Ссылка на QIDISlicer, вероятно, "
+"ссылку на Gcodeviewer на рабочем столе. Ссылка на QIDISlicer, вероятно, была "
-"была успешно создана на рабочем столе."
+"успешно создана на рабочем столе."
 
 #: src/slic3r/GUI/DesktopIntegrationDialog.cpp:472
 msgid ""
@@ -2843,7 +2843,24 @@ msgstr ""
 "Обнаружена модель вне области печати. \n"
 "Решите текущую проблему, чтобы продолжить нарезку."
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:7539
+#. TRN %3% is name of Object1, %4% is name of Object2
+#: src/slic3r/GUI/GLCanvas3D.cpp:7496
+#, boost-format
+msgid ""
+"Conflicts in G-code paths have been detected at layer %1%, z=%2$.2f mm. "
+"Please reposition the conflicting objects (%3% <-> %4%) further apart."
+msgstr ""
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:7529
+#: src/slic3r/GUI/NotificationManager.cpp:2101
+#: src/slic3r/GUI/NotificationManager.cpp:2108
+#: src/slic3r/GUI/NotificationManager.cpp:2124
+#: src/slic3r/GUI/NotificationManager.cpp:2130
+#: src/slic3r/GUI/NotificationManager.cpp:2201
+msgid "ERROR:"
+msgstr "ОШИБКА:"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:7606
 msgid "Selection-Add from rectangle"
 msgstr "Выбор\\Добавление из прямоугольника"
 
@@ -4598,7 +4615,13 @@ msgstr "Выйти и перенести свои данные"
 msgid "Start the application"
 msgstr "Запустить приложение"
 
-#: src/slic3r/GUI/GUI_App.cpp:736
+#. TRN %s = type of file
+#: src/slic3r/GUI/GUI_App.cpp:609
+#, c-format, boost-format
+msgid "%s files"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:772
 #, c-format, boost-format
 msgid ""
 "%s has encountered an error. It was likely caused by running out of memory. "
@@ -4619,9 +4642,9 @@ msgstr "Критическая ошибка"
 
 #: src/slic3r/GUI/GUI_App.cpp:743
 msgid ""
-"QIDISlicer has encountered a localization error. Please report to "
+"QIDISlicer has encountered a localization error. Please report to QIDISlicer "
-"QIDISlicer team, what language was active and in which scenario this issue "
+"team, what language was active and in which scenario this issue happened. "
-"happened. Thank you.\n"
+"Thank you.\n"
 "\n"
 "The application will now terminate."
 msgstr ""
@@ -7953,14 +7976,6 @@ msgstr "Экспорт в G-код."
 msgid "Export."
 msgstr "Экспорт."
 
-#: src/slic3r/GUI/NotificationManager.cpp:2101
-#: src/slic3r/GUI/NotificationManager.cpp:2108
-#: src/slic3r/GUI/NotificationManager.cpp:2124
-#: src/slic3r/GUI/NotificationManager.cpp:2130
-#: src/slic3r/GUI/NotificationManager.cpp:2201
-msgid "ERROR:"
-msgstr "ОШИБКА:"
-
 #: src/slic3r/GUI/NotificationManager.cpp:2113
 #: src/slic3r/GUI/NotificationManager.cpp:2140
 #: src/slic3r/GUI/NotificationManager.cpp:2148
@@ -8048,8 +8063,8 @@ msgstr "Возможно, вам потребуется обновить дра
 
 #: src/slic3r/GUI/OpenGLManager.cpp:390
 msgid ""
-"As a workaround, you may run QIDISlicer with a software rendered 3D "
+"As a workaround, you may run QIDISlicer with a software rendered 3D graphics "
-"graphics by running qidi-slicer.exe with the --sw-renderer parameter."
+"by running qidi-slicer.exe with the --sw-renderer parameter."
 msgstr ""
 "В качестве обходного пути вы можете запустить QIDISlicer с программной "
 "рендерингом 3D-графики, запустив qidi-sler.exe с параметром --sw-renderer."
@@ -8158,7 +8173,16 @@ msgstr ""
 "Чтобы использовать пользовательский файл CA, импортируйте его в хранилище "
 "сертификатов/Keychain."
 
-#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:705
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:667
+msgid "Unexpected character"
+msgstr ""
+
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:668
+#: src/slic3r/GUI/SavePresetDialog.cpp:169
+msgid "The following characters are not allowed in the name"
+msgstr "В имени не допустимы следующие символы"
+
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:723
 msgid "You have to enter a printer name."
 msgstr "Введите имя принтера."
 
@@ -8431,8 +8455,7 @@ msgid_plural ""
 "The presets below were temporarily installed on the active instance of "
 "QIDISlicer"
 msgstr[0] ""
-"Приведённый ниже профиль был временно установлен на активной копии "
+"Приведённый ниже профиль был временно установлен на активной копии QIDISlicer"
-"QIDISlicer"
 msgstr[1] ""
 "Приведённые ниже профили были временно установлены на активной копии "
 "QIDISlicer"
@@ -8510,8 +8533,8 @@ msgid_plural ""
 "the dimensions of these objects?"
 msgstr[0] ""
 "Похоже, что размеры модели из файла %s заданы в метрах.\n"
-"Внутренней единицей измерения QIDISlicer являются дюймы. Пересчитать "
+"Внутренней единицей измерения QIDISlicer являются дюймы. Пересчитать размеры "
-"размеры модели?"
+"модели?"
 msgstr[1] ""
 "Похоже, что размеры моделей из файла %s заданы в дюймы.\n"
 "Внутренней единицей измерения QIDISlicer являются миллиметры. Пересчитать "
@@ -8705,7 +8728,25 @@ msgstr "Ошибка во время перезагрузки"
 msgid "Reload all from disk"
 msgstr "Перезагрузить всё с диска"
 
-#: src/slic3r/GUI/Plater.cpp:4211
+#: src/slic3r/GUI/Plater.cpp:4103 src/slic3r/GUI/Plater.cpp:4109
+msgid "You are using template filament preset."
+msgid_plural "You are using template filament presets."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/slic3r/GUI/Plater.cpp:4104 src/slic3r/GUI/Plater.cpp:4110
+msgid ""
+"Please note that template presets are not customized for specific printer "
+"and should only be used as a starting point for creating your own user "
+"presets."
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4106
+msgid "More info at"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4247
 msgid "There are active warnings concerning sliced models:"
 msgstr "Имеются активные предупреждения о нарезанных моделях:"
 
@@ -8954,7 +8995,11 @@ msgstr ""
 msgid "Save project"
 msgstr "Сохранение проекта"
 
-#: src/slic3r/GUI/Plater.cpp:6826
+#: src/slic3r/GUI/Plater.cpp:6681
+msgid "Unable to save file"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:6875
 msgid "Is the printer ready? Is the print sheet in place, empty and clean?"
 msgstr "Готов ли принтер? Лист для печати на месте, пустой и чистый?"
 
@@ -9059,10 +9104,10 @@ msgid ""
 "When a new preset version becomes available it is offered at application "
 "startup."
 msgstr ""
-"Если включено, то QIDISlicer будет загружать обновления встроенных "
+"Если включено, то QIDISlicer будет загружать обновления встроенных системных "
-"системных профилей в фоновом режиме. Эти обновления загружаются в отдельную "
+"профилей в фоновом режиме. Эти обновления загружаются в отдельную временную "
-"временную папку. Когда новые профили становятся доступны, они предлагаются "
+"папку. Когда новые профили становятся доступны, они предлагаются при запуске "
-"при запуске приложения."
+"приложения."
 
 #: src/slic3r/GUI/Preferences.cpp:294
 msgid "Suppress \" - default - \" presets"
@@ -9582,7 +9627,11 @@ msgstr "Изменить профиль"
 msgid "Change extruder color"
 msgstr "Изменить цвет экструдера"
 
-#: src/slic3r/GUI/PresetComboBoxes.cpp:767 src/slic3r/GUI/Tab.cpp:3503
+#: src/slic3r/GUI/PresetComboBoxes.cpp:787
+msgid "Show/Hide template presets"
+msgstr ""
+
+#: src/slic3r/GUI/PresetComboBoxes.cpp:795 src/slic3r/GUI/Tab.cpp:3520
 msgid "Edit physical printer"
 msgstr "Изменить физический профиль"
 
@@ -9946,10 +9995,6 @@ msgstr "Сохранить настройки марериала как"
 msgid "Save printer settings as"
 msgstr "Сохранить настройки принтера как"
 
-#: src/slic3r/GUI/SavePresetDialog.cpp:169
-msgid "The following characters are not allowed in the name"
-msgstr "В имени не допустимы следующие символы"
-
 #: src/slic3r/GUI/SavePresetDialog.cpp:176
 msgid "The following suffix is not allowed in the name"
 msgstr "В имени не допустим следующий суффикс"
@@ -10639,11 +10684,12 @@ msgstr ""
 "Примечание: все параметры из этой группы перенесены в настройки физического "
 "принтера (см. список изменений).\n"
 "\n"
-"Новый профиль физического принтера создаётся нажатием по значку \"шестеренка"
+"Новый профиль физического принтера создаётся нажатием по значку "
-"\" справа от поля со списком профилей принтеров, выбрав «Добавить физический "
+"\"шестеренка\" справа от поля со списком профилей принтеров, выбрав "
-"принтер». Редактор профиля физического принтера открывается также при "
+"«Добавить физический принтер». Редактор профиля физического принтера "
-"нажатии на значок шестеренки на вкладке настройки принтера. Профили "
+"открывается также при нажатии на значок шестеренки на вкладке настройки "
-"физического принтера сохраняются в папке QIDISlicer/physical_printer."
+"принтера. Профили физического принтера сохраняются в папке QIDISlicer/"
+"physical_printer."
 
 #: src/slic3r/GUI/Tab.cpp:2366
 msgid ""
@@ -13204,8 +13250,8 @@ msgid ""
 msgstr ""
 "Этот пользовательский код вставляется при каждой смене слоя, непосредственно "
 "перед перемещения оси Z. Обратите внимание, что вы можете использовать "
-"шаблонные переменные для всех параметров QIDISlicer, в том числе "
+"шаблонные переменные для всех параметров QIDISlicer, в том числе [layer_num] "
-"[layer_num] и [layer_z]."
+"и [layer_z]."
 
 #: src/libslic3r/PrintConfig.cpp:453
 msgid "Between objects G-code"
@@ -14371,10 +14417,11 @@ msgid ""
 "maximum allowed speed at layer \"disable_fan_first_layers\" + 1."
 msgstr ""
 "Скорость вентилятора будет линейно увеличиваться от нуля на слое "
-"\"disable_fan_first_layers\" до максимальной на слое \"full_fan_speed_layer"
+"\"disable_fan_first_layers\" до максимальной на слое "
-"\". \"full_fan_speed_layer\" будет игнорироваться, если она ниже, чем "
+"\"full_fan_speed_layer\". \"full_fan_speed_layer\" будет игнорироваться, "
-"\"disable_fan_first_layers\", и в этом случае вентилятор будет работать с "
+"если она ниже, чем \"disable_fan_first_layers\", и в этом случае вентилятор "
-"максимально допустимой скоростью на слое \"disable_fan_first_layers\" +1."
+"будет работать с максимально допустимой скоростью на слое "
+"\"disable_fan_first_layers\" +1."
 
 #: src/libslic3r/PrintConfig.cpp:1343
 msgid "Fuzzy skin type."
@@ -15167,13 +15214,13 @@ 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]."
+"[input_filename], [input_filename_base], [default_output_extension]."
 msgstr ""
 "Вы можете использовать все параметры в качестве переменных внутри этого "
 "шаблона. Они будят добавлены к имени файла. Например: [layer_height], "
 "[fill_density]. Так же вы можете использовать [timestamp], [year], [month], "
 "[day], [hour], [minute], [second], [version], [input_filename], "
-"[input_filename_base]."
+"[input_filename_base], [default_output_extension]."
 
 #: src/libslic3r/PrintConfig.cpp:1992
 msgid "Detect bridging perimeters"
@@ -15280,8 +15327,8 @@ msgstr ""
 "Количество слоёв контура модели (или количество вертикальных слоёв стенки "
 "модели). Чем меньше число, тем меньше толщина стенки модели, а значит, "
 "модель будет более хрупкая. Обратите внимание, если включена опция "
-"«Дополнительные периметры при необходимости», QIDISlicer может "
+"«Дополнительные периметры при необходимости», QIDISlicer может автоматически "
-"автоматически увеличить это значение, если обнаружит наклонные поверхности."
+"увеличить это значение, если обнаружит наклонные поверхности."
 
 #: src/libslic3r/PrintConfig.cpp:2073
 msgid "(minimum)"
@@ -15860,11 +15907,11 @@ msgid ""
 "When disabled, QIDISlicer will NOT emit commands to heat up extruder and "
 "bed, leaving both to Custom Start G-Code."
 msgstr ""
-"Если включено, QIDISlicer будет проверять, присутствуют ли в вашем "
+"Если включено, QIDISlicer будет проверять, присутствуют ли в вашем стартовом "
-"стартовом g-коде температурные команды M104 или M190. Если эти команды "
+"g-коде температурные команды M104 или M190. Если эти команды присутствуют, "
-"присутствуют, то температуры не будут вставляться автоматически, и вы "
+"то температуры не будут вставляться автоматически, и вы сможете настроить "
-"сможете настроить порядок команд нагрева и другие пользовательские действия. "
+"порядок команд нагрева и другие пользовательские действия. Обратите "
-"Обратите внимание, что вы можете использовать шаблонные переменные для всех "
+"внимание, что вы можете использовать шаблонные переменные для всех "
 "параметров QIDISlicer, поэтому вы можете вставить команду \"M109 "
 "S[first_layer_temperature]\" где угодно. \n"
 "Если в вашем стартовом G-коде отсутствует команды M104 или M190, QIDISlicer "
@@ -16808,6 +16855,16 @@ msgstr ""
 "Максимальное расстояние между опорами на разряженных участках заполнения."
 
 #: src/libslic3r/PrintConfig.cpp:3239
+msgid "Wipe tower extruder"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3241
+msgid ""
+"The extruder to use when printing perimeter of the wipe tower. Set to 0 to "
+"use the one that is available (non-soluble would be preferred)."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3260
 msgid "XY Size Compensation"
 msgstr "Коррекция горизонтальных размеров модели"
 
@@ -17951,9 +18008,9 @@ msgstr ""
 
 #: src/libslic3r/PrintConfig.cpp:4836
 msgid ""
-"This version of QIDISlicer may not understand configurations produced by "
+"This version of QIDISlicer may not understand configurations produced by the "
-"the newest QIDISlicer versions. For example, newer QIDISlicer may extend "
+"newest QIDISlicer versions. For example, newer QIDISlicer may extend the "
-"the list of supported firmware flavors. One may decide to bail out or to "
+"list of supported firmware flavors. One may decide to bail out or to "
 "substitute an unknown value with a default silently or verbosely."
 msgstr ""
 "Эта версия QIDISlicer может не понимать конфигурации, созданные новейшими "
@@ -18013,8 +18070,8 @@ msgstr "Одни экземпляр программы"
 #: src/libslic3r/PrintConfig.cpp:4857
 msgid ""
 "If enabled, the command line arguments are sent to an existing instance of "
-"GUI QIDISlicer, or an existing QIDISlicer window is activated. Overrides "
+"GUI QIDISlicer, or an existing QIDISlicer window is activated. Overrides the "
-"the \"single_instance\" configuration value from application preferences."
+"\"single_instance\" configuration value from application preferences."
 msgstr ""
 "Если включено, аргументы командной строки посылаются в существующий "
 "экземпляр GUI QIDISlicer, либо активируется существующее окно QIDISlicer. "
@@ -18175,15 +18232,16 @@ msgid ""
 msgstr ""
 "Перезагрузить с диска\n"
 "Знаете ли вы, что если вы создали новую версию своей модели, вы можете "
-"просто перезагрузить ее в QIDISlicer? Щелкните правой кнопкой мыши на "
+"просто перезагрузить ее в QIDISlicer? Щелкните правой кнопкой мыши на модели "
-"модели в окне 3D просмотра и выберите Перезагрузить с диска. Подробнее "
+"в окне 3D просмотра и выберите Перезагрузить с диска. Подробнее читайте в "
-"читайте в документации."
+"документации."
 
 #: resources/data/hints.ini: [hint:Hiding sidebar]
 msgid ""
 "Hiding sidebar\n"
-"Did you know that you can hide the right sidebar using the shortcut <b>Shift"
+"Did you know that you can hide the right sidebar using the shortcut "
-"+Tab</b>? You can also enable the icon for this from the<a>Preferences</a>."
+"<b>Shift+Tab</b>? You can also enable the icon for this from "
+"the<a>Preferences</a>."
 msgstr ""
 "Свернуть боковую панель\n"
 "Знаете ли вы, что правую боковую панель можно скрыть с помощью сочетания "

resources/localization/tr/QIDISlicer_tr.po

@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-05-26 13:11+0200\n"
-"PO-Revision-Date: 2023-04-10 05:30+0300\n"
+"PO-Revision-Date: 2023-07-01 15:34+0800\n"
 "Last-Translator: Mehmet Sutas <msutas@gmail.com>\n"
 "Language-Team: \n"
 "Language: tr_TR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.4.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 3.3.2\n"
 
 #: src/slic3r/GUI/AboutDialog.cpp:46 src/slic3r/GUI/AboutDialog.cpp:304
 msgid "Portions copyright"
@@ -2811,7 +2811,24 @@ msgstr ""
 "Yazdırma alanının dışında bir nesne algılandı.\n"
 "Dilimlemeye devam etmek için sorunu çözün."
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:7539
+#. TRN %3% is name of Object1, %4% is name of Object2
+#: src/slic3r/GUI/GLCanvas3D.cpp:7496
+#, boost-format
+msgid ""
+"Conflicts in G-code paths have been detected at layer %1%, z=%2$.2f mm. "
+"Please reposition the conflicting objects (%3% <-> %4%) further apart."
+msgstr ""
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:7529
+#: src/slic3r/GUI/NotificationManager.cpp:2101
+#: src/slic3r/GUI/NotificationManager.cpp:2108
+#: src/slic3r/GUI/NotificationManager.cpp:2124
+#: src/slic3r/GUI/NotificationManager.cpp:2130
+#: src/slic3r/GUI/NotificationManager.cpp:2201
+msgid "ERROR:"
+msgstr "HATA:"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:7606
 msgid "Selection-Add from rectangle"
 msgstr "Seçim-Dörtgenden ekle"
 
@@ -4571,7 +4588,13 @@ msgstr "Çıkış, verilerimi şimdi taşıyacağım"
 msgid "Start the application"
 msgstr "Uygulamayı başlat"
 
-#: src/slic3r/GUI/GUI_App.cpp:736
+#. TRN %s = type of file
+#: src/slic3r/GUI/GUI_App.cpp:609
+#, c-format, boost-format
+msgid "%s files"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:772
 #, c-format, boost-format
 msgid ""
 "%s has encountered an error. It was likely caused by running out of memory. "
@@ -4592,9 +4615,9 @@ msgstr "Önemli hata"
 
 #: src/slic3r/GUI/GUI_App.cpp:743
 msgid ""
-"QIDISlicer has encountered a localization error. Please report to "
+"QIDISlicer has encountered a localization error. Please report to QIDISlicer "
-"QIDISlicer team, what language was active and in which scenario this issue "
+"team, what language was active and in which scenario this issue happened. "
-"happened. Thank you.\n"
+"Thank you.\n"
 "\n"
 "The application will now terminate."
 msgstr ""
@@ -4671,8 +4694,7 @@ msgid ""
 "qidi3d.cz/qidislicer/.\n"
 "Do you wish to continue?"
 msgstr ""
-"64-bit Windows üzerinde 32 bit QIDISlicer yapılandırması "
+"64-bit Windows üzerinde 32 bit QIDISlicer yapılandırması çalıştırıyorsunuz.\n"
-"çalıştırıyorsunuz.\n"
 "QIDISlicer'ın 32 bit yapısı muhtemelen sistemde bulunan tüm RAM'i "
 "kullanamayacaktır.\n"
 "Lütfen https://www.qidi3d.cz/qidislicer/'dan 64 bitlik bir QIDISlicer "
@@ -7898,14 +7920,6 @@ msgstr "G-kodu Dışa Aktar"
 msgid "Export."
 msgstr "Dışa Aktar"
 
-#: src/slic3r/GUI/NotificationManager.cpp:2101
-#: src/slic3r/GUI/NotificationManager.cpp:2108
-#: src/slic3r/GUI/NotificationManager.cpp:2124
-#: src/slic3r/GUI/NotificationManager.cpp:2130
-#: src/slic3r/GUI/NotificationManager.cpp:2201
-msgid "ERROR:"
-msgstr "HATA:"
-
 #: src/slic3r/GUI/NotificationManager.cpp:2113
 #: src/slic3r/GUI/NotificationManager.cpp:2140
 #: src/slic3r/GUI/NotificationManager.cpp:2148
@@ -7990,8 +8004,8 @@ msgstr "Grafik kartı sürücünüzü güncellemeniz gerekebilir."
 
 #: src/slic3r/GUI/OpenGLManager.cpp:390
 msgid ""
-"As a workaround, you may run QIDISlicer with a software rendered 3D "
+"As a workaround, you may run QIDISlicer with a software rendered 3D graphics "
-"graphics by running qidi-slicer.exe with the --sw-renderer parameter."
+"by running qidi-slicer.exe with the --sw-renderer parameter."
 msgstr ""
 "Geçici bir çözüm olarak, qidi-slicer.exe --sw-renderer parametresiyle "
 "çalıştırarak QIDISlicer'ı yazılımla işlenmiş 3B grafiklerle "
@@ -8101,7 +8115,11 @@ msgstr ""
 "Özel bir CA dosyası kullanmak için, lütfen CA dosyanızı Sertifika Deposu/"
 "Anahtarlık içine aktarın."
 
-#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:705
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:667
+msgid "Unexpected character"
+msgstr ""
+
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:723
 msgid "You have to enter a printer name."
 msgstr "Bir yazıcı adı girmeniz gerekir."
 
@@ -8367,8 +8385,7 @@ msgid_plural ""
 "The presets below were temporarily installed on the active instance of "
 "QIDISlicer"
 msgstr[0] ""
-"Aşağıdaki hazır ayar, QIDISlicer'ın etkin örneğine geçici olarak "
+"Aşağıdaki hazır ayar, QIDISlicer'ın etkin örneğine geçici olarak yüklenmiştir"
-"yüklenmiştir"
 msgstr[1] ""
 "Aşağıdaki hazır ayarlar, QIDISlicer'ın etkin örneğine geçici olarak "
 "yüklenmiştir"
@@ -8568,7 +8585,11 @@ msgstr ""
 msgid "Enable supports for enforcers only"
 msgstr "Yalnızca uygulayıcılar için destekleri etkinleştir"
 
-#: src/slic3r/GUI/Plater.cpp:3362 src/slic3r/GUI/Plater.cpp:4258
+#: src/slic3r/GUI/Plater.cpp:3229
+msgid "Bed temperatures for the used filaments differ significantly."
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3367 src/slic3r/GUI/Plater.cpp:4294
 msgid "Invalid data"
 msgstr "Geçersiz veri"
 
@@ -8629,7 +8650,24 @@ msgstr "Yeniden yükleme sırasında hata oluştu"
 msgid "Reload all from disk"
 msgstr "Tümünü diskten yeniden yükle"
 
-#: src/slic3r/GUI/Plater.cpp:4211
+#: src/slic3r/GUI/Plater.cpp:4103 src/slic3r/GUI/Plater.cpp:4109
+msgid "You are using template filament preset."
+msgid_plural "You are using template filament presets."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/slic3r/GUI/Plater.cpp:4104 src/slic3r/GUI/Plater.cpp:4110
+msgid ""
+"Please note that template presets are not customized for specific printer "
+"and should only be used as a starting point for creating your own user "
+"presets."
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4106
+msgid "More info at"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4247
 msgid "There are active warnings concerning sliced models:"
 msgstr "Dilimlenmiş modellerle ilgili aktif uyarılar var:"
 
@@ -8878,7 +8916,11 @@ msgstr ""
 msgid "Save project"
 msgstr "Projeyi kaydet"
 
-#: src/slic3r/GUI/Plater.cpp:6826
+#: src/slic3r/GUI/Plater.cpp:6681
+msgid "Unable to save file"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:6875
 msgid "Is the printer ready? Is the print sheet in place, empty and clean?"
 msgstr "Yazıcı hazır mı? Baskı tablası  yerinde, boş ve temiz mi?"
 
@@ -9353,8 +9395,7 @@ msgstr "Printables.com'dan indirmelere izin ver"
 #: src/slic3r/GUI/Preferences.cpp:578
 msgid "If enabled, QIDISlicer will be allowed to download from Printables.com"
 msgstr ""
-"Etkinleştirilirse, QIDISlicer'ın Printables.com'dan indirmesine izin "
+"Etkinleştirilirse, QIDISlicer'ın Printables.com'dan indirmesine izin verilir."
-"verilir."
 
 #: src/slic3r/GUI/Preferences.cpp:588
 msgid "Render"
@@ -9504,7 +9545,11 @@ msgstr "Hazır ayarı düzenle"
 msgid "Change extruder color"
 msgstr "Ekstruder rengini değiştir"
 
-#: src/slic3r/GUI/PresetComboBoxes.cpp:767 src/slic3r/GUI/Tab.cpp:3503
+#: src/slic3r/GUI/PresetComboBoxes.cpp:787
+msgid "Show/Hide template presets"
+msgstr ""
+
+#: src/slic3r/GUI/PresetComboBoxes.cpp:795 src/slic3r/GUI/Tab.cpp:3520
 msgid "Edit physical printer"
 msgstr "Fiziksel yazıcıyı düzenle"
 
@@ -11990,8 +12035,8 @@ msgid ""
 "Could not detect system SSL certificate store. QIDISlicer will be unable to "
 "establish secure network connections."
 msgstr ""
-"Sistem SSL sertifika deposu algılanamadı. QIDISlicer güvenli ağ "
+"Sistem SSL sertifika deposu algılanamadı. QIDISlicer güvenli ağ bağlantıları "
-"bağlantıları kuramaz."
+"kuramaz."
 
 #: src/slic3r/Utils/Http.cpp:78
 #, boost-format
@@ -13473,8 +13518,8 @@ msgid ""
 "This end procedure is inserted at the end of the output file. Note that you "
 "can use placeholder variables for all QIDISlicer settings."
 msgstr ""
-"Bu bitiş prosedürü, çıktı dosyasının sonuna eklenir. Tüm QIDISlicer "
+"Bu bitiş prosedürü, çıktı dosyasının sonuna eklenir. Tüm QIDISlicer ayarları "
-"ayarları için yer tutucu değişkenleri kullanabileceğinizi unutmayın."
+"için yer tutucu değişkenleri kullanabileceğinizi unutmayın."
 
 #: src/libslic3r/PrintConfig.cpp:797
 msgid ""
@@ -14966,12 +15011,12 @@ 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]."
+"[input_filename], [input_filename_base], [default_output_extension]."
 msgstr ""
 "Tüm konfigürasyon seçeneklerini bu şablon içindeki değişkenler olarak "
 "kullanabilirsiniz. Örneğin: [layer_height], [fill_density], [timestamp], "
 "[year], [month], [day], [hour], [minute], [second], [version], "
-"[input_filename], [input_filename_base]."
+"[input_filename], [input_filename_base], [default_output_extension]."
 
 #: src/libslic3r/PrintConfig.cpp:1992
 msgid "Detect bridging perimeters"
@@ -16280,9 +16325,8 @@ msgstr ""
 "ayarlarının yer tutucu değişkenleri yanı sıra {toolchange_z}, "
 "{previous_extruder} ve {next_extruder} kullanılabilir. Doğru ekstrüdere "
 "değişen bir takım değiştirme komutu dahil edildiğinde (T{next_extruder} "
-"gibi), QIDISlicer başka bir komut eklemez. Bu nedenle, takım "
+"gibi), QIDISlicer başka bir komut eklemez. Bu nedenle, takım değişikliğinden "
-"değişikliğinden önce ve sonra özel davranış komut dosyası oluşturmak "
+"önce ve sonra özel davranış komut dosyası oluşturmak mümkündür."
-"mümkündür."
 
 #: src/libslic3r/PrintConfig.cpp:3035
 msgid ""
@@ -16552,6 +16596,16 @@ msgid "Maximal distance between supports on sparse infill sections."
 msgstr "Seyrek dolgu bölümlerinde destekler arasındaki azami mesafe."
 
 #: src/libslic3r/PrintConfig.cpp:3239
+msgid "Wipe tower extruder"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3241
+msgid ""
+"The extruder to use when printing perimeter of the wipe tower. Set to 0 to "
+"use the one that is available (non-soluble would be preferred)."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3260
 msgid "XY Size Compensation"
 msgstr "XY Boyut Telafisi"
 
@@ -17670,9 +17724,9 @@ msgstr ""
 
 #: src/libslic3r/PrintConfig.cpp:4836
 msgid ""
-"This version of QIDISlicer may not understand configurations produced by "
+"This version of QIDISlicer may not understand configurations produced by the "
-"the newest QIDISlicer versions. For example, newer QIDISlicer may extend "
+"newest QIDISlicer versions. For example, newer QIDISlicer may extend the "
-"the list of supported firmware flavors. One may decide to bail out or to "
+"list of supported firmware flavors. One may decide to bail out or to "
 "substitute an unknown value with a default silently or verbosely."
 msgstr ""
 "QIDISlicer'ın bu sürümü, en yeni QIDISlicer sürümleri tarafından üretilen "
@@ -17731,8 +17785,8 @@ msgstr "Tek örnek modu"
 #: src/libslic3r/PrintConfig.cpp:4857
 msgid ""
 "If enabled, the command line arguments are sent to an existing instance of "
-"GUI QIDISlicer, or an existing QIDISlicer window is activated. Overrides "
+"GUI QIDISlicer, or an existing QIDISlicer window is activated. Overrides the "
-"the \"single_instance\" configuration value from application preferences."
+"\"single_instance\" configuration value from application preferences."
 msgstr ""
 "Etkinleştirilirse, komut satırı bağımsız değişkenleri varolan bir GUI "
 "QIDISlicer örneğine gönderilir veya varolan bir QIDISlicer penceresi "
@@ -17898,8 +17952,9 @@ msgstr ""
 #: resources/data/hints.ini: [hint:Hiding sidebar]
 msgid ""
 "Hiding sidebar\n"
-"Did you know that you can hide the right sidebar using the shortcut <b>Shift"
+"Did you know that you can hide the right sidebar using the shortcut "
-"+Tab</b>? You can also enable the icon for this from the<a>Preferences</a>."
+"<b>Shift+Tab</b>? You can also enable the icon for this from "
+"the<a>Preferences</a>."
 msgstr ""
 "Kenar çubuğunu gizleme\n"
 " <b>Shift+Sekme</b> kısayolunu kullanarak sağ kenar çubuğunu "
@@ -18377,6 +18432,7 @@ msgstr "%i / %u"
 msgid "%ld byte"
 msgid_plural "%ld bytes"
 msgstr[0] "%ld bayt"
+msgstr[1] ""
 
 #: ../src/html/helpwnd.cpp:1033
 #, c-format
@@ -22586,6 +22642,7 @@ msgstr "Son sayfa"
 msgid "Last repeated message (\"%s\", %u time) wasn't output"
 msgid_plural "Last repeated message (\"%s\", %u times) wasn't output"
 msgstr[0] "Son yinelenen ileti (\"%s\", %u kez) çıkartılmadı"
+msgstr[1] ""
 
 #: ../src/common/paper.cpp:103
 msgid "Ledger, 17 x 11 in"
@@ -24777,6 +24834,7 @@ msgstr "Taslak düzeyi."
 msgid "The previous message repeated %u time."
 msgid_plural "The previous message repeated %u times."
 msgstr[0] "Önceki ileti %u kez yinelendi."
+msgstr[1] ""
 
 #: ../src/common/log.cpp:270
 msgid "The previous message repeated once."
@@ -25074,8 +25132,8 @@ msgid ""
 "Type operation \"%s\" failed: Property labeled \"%s\" is of type \"%s\", NOT "
 "\"%s\"."
 msgstr ""
-"\"%s\" tür işlemi yapılamadı: Etiketlenen özellik \"%s\" \"%s\" türünde, \"%s"
+"\"%s\" tür işlemi yapılamadı: Etiketlenen özellik \"%s\" \"%s\" türünde, "
-"\" türünde DEĞİL."
+"\"%s\" türünde DEĞİL."
 
 #: ../src/common/paper.cpp:133
 msgid "US Std Fanfold, 14 7/8 x 11 in"

resources/profiles/QIDITechnology.idx

@@ -1,3 +1,8 @@
+min_slic3r_version = 1.0.3
+1.0.3 Delete filament property
+min_slic3r_version = 1.0.2
+1.0.2 Add filament property
+min_slic3r_version = 1.0.1
+1.0.1 Optimize parameters
 min_slic3r_version = 1.0.0
-1.0.1 Initial
 1.0.0 Initial

resources/profiles/QIDITechnology.ini

@@ -5,7 +5,7 @@
 name = QIDI Technology
 # Configuration version of this file. Config file will only be installed, if the config_version differs.
 # This means, the server may force the PrusaSlicer configuration to be downgraded.
-config_version = 1.0.0
+config_version = 1.0.3
 # Where to get the updates from?
 config_update_url = https://github.com/QIDITECH/QIDISlicer/releases/download/QIDITechnology/
 changelog_url = https://qidi3d.com/pages/software-firmware
@@ -22,8 +22,6 @@ family = X
 bed_model = X-MAX 3_bed.stl
 bed_texture = X-MAX 3.svg
 default_materials = QIDI ABS Rapido @X-MAX 3; QIDI PLA Rapido @X-MAX 3; QIDI PLA Rapido Matte @X-MAX 3; QIDI ToughPETG @X-MAX 3; Generic ABS @X-MAX 3; Generic PETG @X-MAX 3; Generic PLA @X-MAX 3
-email = MAX3support@qd3Dprinter.com; MAX3AMS@qd3Dprinter.com
-skype = MAX3support@qd3Dprinter.com
 
 [printer_model:X-Plus 3]
 name = X-Plus 3
@@ -33,8 +31,6 @@ family = X
 bed_model = X-Plus 3_bed.stl
 bed_texture = X-Plus 3.svg
 default_materials = QIDI ABS Rapido @X-Plus 3; QIDI PLA Rapido @X-Plus 3; QIDI PLA Rapido Matte @X-Plus 3; QIDI ToughPETG @X-Plus 3; Generic ABS @X-Plus 3; Generic PETG @X-Plus 3; Generic PLA @X-Plus 3
-email = Plus3support@qd3Dprinter.com; Plus3AMS@qd3Dprinter.com
-skype = Plus3support@qd3Dprinter.com
 
 [printer_model:X-smart 3]
 name = X-smart 3
@@ -44,8 +40,6 @@ family = X
 bed_model = X-smart 3_bed.stl
 bed_texture = X-smart 3.svg
 default_materials = QIDI ABS Rapido @X-smart 3; QIDI PLA Rapido @X-smart 3; QIDI PLA Rapido Matte @X-smart 3; QIDI ToughPETG @X-smart 3; Generic ABS @X-smart 3; Generic PETG @X-smart 3; Generic PLA @X-smart 3
-email = Smart3support@qd3dprinter.com; Smart3AMS@qd3dprinter.com
-skype = Smart3AMS@qd3dprinter.com
 
 # All presets starting with asterisk, for example *common*, are intermediate and they will
 # not make it into the user interface.
@@ -268,6 +262,7 @@ solid_infill_speed = 230
 
 # Common filament preset
 [filament:*common*]
+advance_pressure = 0.031
 bed_temperature = 60
 bridge_fan_speed = 100
 compatible_printers = 
@@ -276,9 +271,11 @@ compatible_prints =
 compatible_prints_condition = 
 cooling = 1
 disable_fan_first_layers = 1
-enable_dynamic_fan_speeds = 0
+enable_advance_pressure = 1
 enable_auxiliary_fan = 100
-end_filament_gcode = "; Filament-specific end gcode \n;END gcode for filament\nM106 P3 S0"
+enable_dynamic_fan_speeds = 0
+enable_volume_fan = 100
+end_filament_gcode = "; Filament-specific end gcode \n;END gcode for filament\n"
 extrusion_multiplier = 0.98
 fan_always_on = 1
 fan_below_layer_time = 60
@@ -317,7 +314,7 @@ filament_unloading_speed_start = 100
 filament_vendor = QIDI
 filament_wipe = nil
 first_layer_bed_temperature = 60
-first_layer_temperature = 220
+first_layer_temperature = 210
 first_layer_volume_temperature = 0
 full_fan_speed_layer = 0
 idle_temperature = 100
@@ -330,53 +327,59 @@ overhang_fan_speed_1 = 0
 overhang_fan_speed_2 = 0
 overhang_fan_speed_3 = 0
 slowdown_below_layer_time = 5
-start_filament_gcode = "; Filament gcode\nM106 P3 S255"
+smooth_time = 0.03
+start_filament_gcode = "; Filament gcode\n"
 temperature = 220
 volume_temperature = 0
 
 # QIDI filament preset
 [filament:*QIDI ABS Rapido*]
 inherits = *common*
+advance_pressure = 0.021
 bed_temperature = 100
 enable_auxiliary_fan = 0
+enable_volume_fan = 0
 extrusion_multiplier = 0.95
 filament_colour = #FFC800
 filament_density = 1.02
 filament_max_volumetric_speed = 22
 filament_type = ABS
 first_layer_bed_temperature = 100
-first_layer_temperature = 270
+first_layer_temperature = 250
 max_fan_speed = 60
 min_fan_speed = 60
-start_filament_gcode = "; Filament gcode\nM106 P3 S0"
 temperature = 270
 volume_temperature = 55
 
 [filament:*QIDI ABS-GF*]
 inherits = *common*
+advance_pressure = 0.01
 bed_temperature = 100
+bridge_fan_speed = 0
 enable_auxiliary_fan = 0
+enable_volume_fan = 0
 extrusion_multiplier = 0.95
 filament_colour = #282828
 filament_density = 1.15
-filament_max_volumetric_speed = 16
+filament_max_volumetric_speed = 17
 filament_type = ABS-GF
 first_layer_bed_temperature = 100
 first_layer_temperature = 270
 max_fan_speed = 20
 min_fan_speed = 20
-start_filament_gcode = "; Filament gcode\nM106 P3 S0"
 temperature = 270
 volume_temperature = 55
 
 [filament:*QIDI PA12-CF*]
 inherits = *common*
+advance_pressure = 0.01
 bed_temperature = 80
+bridge_fan_speed = 0
 enable_auxiliary_fan = 0
 extrusion_multiplier = 0.96
 filament_colour = #696969
 filament_density = 1.09
-filament_max_volumetric_speed = 16
+filament_max_volumetric_speed = 14
 filament_type = PA12-CF
 first_layer_bed_temperature = 80
 first_layer_temperature = 290
@@ -386,12 +389,14 @@ temperature = 290
 
 [filament:*QIDI PAHT-CF*]
 inherits = *common*
+advance_pressure = 0.01
 bed_temperature = 80
+bridge_fan_speed = 0
 enable_auxiliary_fan = 0
 extrusion_multiplier = 0.96
 filament_colour = #4F4F4F
 filament_density = 1.20
-filament_max_volumetric_speed = 16
+filament_max_volumetric_speed = 15
 filament_type = PAHT-CF
 first_layer_bed_temperature = 80
 first_layer_temperature = 310
@@ -401,12 +406,14 @@ temperature = 310
 
 [filament:*QIDI PET-CF*]
 inherits = *common*
+advance_pressure = 0.01
 bed_temperature = 80
+bridge_fan_speed = 5
 enable_auxiliary_fan = 0
 extrusion_multiplier = 1
 filament_colour = #323232
 filament_density = 1.30
-filament_max_volumetric_speed = 16
+filament_max_volumetric_speed = 14
 filament_type = PET-CF
 first_layer_bed_temperature = 80
 first_layer_temperature = 320
@@ -416,15 +423,17 @@ temperature = 320
 
 [filament:*QIDI PETG-Tough*]
 inherits = *common*
+advance_pressure = 0.07
 bed_temperature = 80
+bridge_fan_speed = 60
 enable_auxiliary_fan = 0
 extrusion_multiplier = 0.95
 filament_colour = #00FF40
 filament_density = 1.24
-filament_max_volumetric_speed = 15
+filament_max_volumetric_speed = 16
 filament_type = PETG
 first_layer_bed_temperature = 80
-first_layer_temperature = 250
+first_layer_temperature = 240
 max_fan_speed = 60
 min_fan_speed = 60
 temperature = 250
@@ -440,49 +449,53 @@ filament_max_volumetric_speed = 22
 
 [filament:*QIDI UltraPA*]
 inherits = *common*
+advance_pressure = 0.03
 bed_temperature = 80
+bridge_fan_speed = 0
 enable_auxiliary_fan = 0
 extrusion_multiplier = 0.96
 filament_colour = #FFEBCD
 filament_density = 1.21
-filament_max_volumetric_speed = 6.5
+filament_max_volumetric_speed = 3.5
 filament_type = UltraPA
 first_layer_bed_temperature = 80
-first_layer_temperature = 280
+first_layer_temperature = 300
 max_fan_speed = 20
 min_fan_speed = 20
-temperature = 280
+temperature = 300
 
 # Generic filament preset
 [filament:*Generic ABS*]
 inherits = *common*
+advance_pressure = 0.021
 bed_temperature = 100
 enable_auxiliary_fan = 0
+enable_volume_fan = 0
 extrusion_multiplier = 0.95
 filament_colour = #FFFF00
 filament_density = 1.04
-filament_max_volumetric_speed = 16
+filament_max_volumetric_speed = 17.5
 filament_type = ABS
 filament_vendor = Generic
 first_layer_bed_temperature = 100
-first_layer_temperature = 260
+first_layer_temperature = 250
 max_fan_speed = 60
 min_fan_speed = 60
-start_filament_gcode = "; Filament gcode\nM106 P3 S0"
 temperature = 260
 
 [filament:*Generic PETG*]
 inherits = *common*
+advance_pressure = 0.07
 bed_temperature = 80
 enable_auxiliary_fan = 0
 extrusion_multiplier = 0.95
 filament_colour = #00FF00
 filament_density = 1.27
-filament_max_volumetric_speed = 10
+filament_max_volumetric_speed = 9
 filament_type = PETG
 filament_vendor = Generic
 first_layer_bed_temperature = 80
-first_layer_temperature = 250
+first_layer_temperature = 240
 max_fan_speed = 60
 min_fan_speed = 60
 temperature = 250
@@ -491,16 +504,17 @@ temperature = 250
 inherits = *common*
 filament_colour = #0000FF
 filament_density = 1.20
-filament_max_volumetric_speed = 12
+filament_max_volumetric_speed = 17
 filament_vendor = Generic
 
 [filament:*Generic TPU 95A*]
 inherits = *common*
+advance_pressure = 0.1
 extrusion_multiplier = 1
 filament_colour = #8000FF
 filament_density = 1.21
-filament_max_volumetric_speed = 3.2
+filament_max_volumetric_speed = 6
-filament_type = TPU 95A
+filament_type = TPU
 filament_vendor = Generic
 first_layer_temperature = 230
 temperature = 230
@@ -617,35 +631,51 @@ compatible_printers_condition = printer_model=="X-Plus 3"
 [filament:QIDI ABS Rapido @X-smart 3]
 inherits = *QIDI ABS Rapido*
 compatible_printers_condition = printer_model=="X-smart 3"
+advance_pressure = 0.024
+filament_max_volumetric_speed = 20
+volume_temperature = 0
 
 [filament:QIDI PETG-Tough @X-smart 3]
 inherits = *QIDI PETG-Tough*
 compatible_printers_condition = printer_model=="X-smart 3"
+advance_pressure = 0.048
+filament_max_volumetric_speed = 14
 
 [filament:QIDI PLA Rapido @X-smart 3]
 inherits = *QIDI PLA Rapido*
 compatible_printers_condition = printer_model=="X-smart 3"
+filament_max_volumetric_speed = 19
+slowdown_below_layer_time = 8
 
 [filament:QIDI PLA Rapido Matte @X-smart 3]
 inherits = *QIDI PLA Rapido Matte*
 compatible_printers_condition = printer_model=="X-smart 3"
+filament_max_volumetric_speed = 20
+slowdown_below_layer_time = 8
 
 # X-smart 3 Generic filament preset
 [filament:Generic ABS @X-smart 3]
 inherits = *Generic ABS*
 compatible_printers_condition = printer_model=="X-smart 3"
+advance_pressure = 0.024
+filament_max_volumetric_speed = 15.5
 
 [filament:Generic PETG @X-smart 3]
 inherits = *Generic PETG*
 compatible_printers_condition = printer_model=="X-smart 3"
+advance_pressure = 0.048
+filament_max_volumetric_speed = 8
 
 [filament:Generic PLA @X-smart 3]
 inherits = *Generic PLA*
 compatible_printers_condition = printer_model=="X-smart 3"
+filament_max_volumetric_speed = 15
+slowdown_below_layer_time = 8
 
 [filament:Generic TPU 95A @X-smart 3]
 inherits = *Generic TPU 95A*
 compatible_printers_condition = printer_model=="X-smart 3"
+slowdown_below_layer_time = 8
 
 # Common printer preset
 [printer:*common*]
@@ -667,7 +697,7 @@ extruder_colour = ""
 extruder_offset = 0x0
 gcode_flavor = klipper
 high_current_on_filament_swap = 0
-host_type = mainsail
+host_type = moonraker
 inherits = 
 layer_gcode = 
 machine_limits_usage = time_estimate_only

resources/web/data/text.js

@@ -0,0 +1,210 @@
+var LangText={
+	"en": {
+		"t0": "Welcome to QIDISlicer",
+		"t1": "User Guide",
+		"t2": "First Print",
+		"t3": "Add Support",
+		"t4": "Connect Device",
+		"t5": "Wifi Send",
+		"t6": "Issue Report",
+		"t7": "Demonstration",
+		"t8": "Product Info",
+		"t9": "Contact with us",
+		"t10": "Filament",
+		"t11": "Add Text",
+		"t12": "Cut Model",
+		"t13": "Download Model",
+		"ls1": "You can download 3D models from the following websites.",
+		"ls2": "If you have any questions about the Printer or QIDISlicer, please contact us via the appropriate E-mail address or Skype.",
+		"ls3": "Note: please try to tell us your requirements in the form of video or pictures, and provide 3MF file, G-code file, machine number and other necessary information.",
+	},
+	"zh_CN": {
+		"t0": "欢迎使用QIDISlicer",
+		"t1": "用户指南",
+		"t2": "首次打印",
+		"t3": "添加支撑",
+		"t4": "连接设备",
+		"t5": "无线发送",
+		"t6": "问题报告",
+		"t7": "演示",
+		"t8": "产品信息",
+		"t9": "与我们联系",
+		"t10": "耗材",
+		"t11": "添加文本",
+		"t12": "切割模型",
+		"t13": "下载模型",
+		"ls1": "您可以从以下网站下载 3D 模型。",
+		"ls2": "如果您对打印机或 QIDISlicer 有任何疑问，请通过相应的电子邮件地址或 Skype 与我们联系。",
+		"ls3": "注：请尽量以视频或图片的形式告诉我们您的需求，并提供3MF文件、G-Code文件、机器编号等必要信息。",
+	},
+	"ja": {
+		"t0": "QIDISlicerへようこそ",
+		"t1": "ユーザーガイド",
+		"t2": "最初の印刷物",
+		"t3": "サポートを追加する",
+		"t4": "デバイスを接続する",
+		"t5": "Wi-Fi送信",
+		"t6": "問題レポート",
+		"t7": "デモンストレーション",
+		"t8": "製品情報",
+		"t9": "お問い合わせください",
+		"t10": "フィラメント",
+		"t11": "テキストを追加",
+		"t12": "カットモデル",
+		"t13": "モデルをダウンロード",
+		"ls1": "3Dモデルは以下のWebサイトからダウンロードできます。",
+		"ls2": "如果您对打印机或 QIDISlicer 有任何疑问，请通过相应的电子邮件地址或 Skype 与我们联系。",
+		"ls3": "注：请尽量以视频或图片的形式告诉我们您的需求，并提供3MF文件、G-Code文件、机器编号等必要信息。",
+	},
+	"fr": {
+		"t0": "Bienvenue dans QIDISlicer",
+		"t1": "Guide de l'utilisateur",
+		"t2": "Première d'impression",
+		"t3": "Ajouter une prise en charge",
+		"t4": "Connecter l'appareil",
+		"t5": "Envoi Wi-Fi",
+		"t6": "Rapport de problème",
+		"t7": "Démonstration",
+		"t8": "Informations sur le produit",
+		"t9": "Contactez-nous",
+		"t10": "Filament",
+		"t11": "Ajouter du texte",
+		"t12": "Couper le modèle",
+		"t13": "Télécharger le modèle",
+		"ls1": "Vous pouvez télécharger des modèles 3D à partir des sites Web suivants.",
+		"ls2": "Si vous avez des questions sur l'imprimante ou le QIDISlicer, veuillez nous contacter via l'adresse e-mail appropriée ou via Skype.",
+		"ls3": "Remarque : veuillez essayer de nous indiquer vos besoins sous forme de vidéo ou d'images, et fournir un fichier 3MF, un fichier G-code, un numéro de machine et d'autres informations nécessaires.",
+	},
+	"de": {
+		"t0": "Willkommen bei QIDISlicer",
+		"t1": "Benutzerhandbuch",
+		"t2": "Erster Druck",
+		"t3": "Unterstützung hinzufügen",
+		"t4": "Gerät verbinden",
+		"t5": "Wi-Fi senden",
+		"t6": "Problembericht",
+		"t7": "Demonstration",
+		"t8": "Produktinformationen",
+		"t9": "Kontaktieren Sie uns",
+		"t10": "Filament",
+		"t11": "Text hinzufügen",
+		"t12": "Modell schneiden",
+		"t13": "Modell herunterladen",
+		"ls1": "Sie können 3D-Modelle von den folgenden Websites herunterladen.",
+		"ls2": "Wenn Sie Fragen zum Drucker oder QIDISlicer haben, kontaktieren Sie uns bitte über die entsprechende E-Mail-Adresse oder Skype.",
+		"ls3": "Hinweis: Bitte versuchen Sie, uns Ihre Anforderungen in Form von Videos oder Bildern mitzuteilen und geben Sie die 3MF-Datei, die G-Code-Datei, die Maschinennummer und andere notwendige Informationen an.",
+	},
+	"be": {
+		"t0": "Вітаем у QIDISlicer",
+		"t1": "Кіраўніцтва карыстальніка",
+		"t2": "Першы адбітак",
+		"t3": "Дадаць падтрымку",
+		"t4": "Падключыць прыладу",
+		"t5": "Адправіць па Wi-Fi",
+		"t6": "Паведамленне аб праблеме",
+		"t7": "Дэманстрацыя",
+		"t8": "Інфармацыя аб прадукце",
+		"t9": "Звязацца з намі",
+		"t10": "Філамент",
+		"t11": "Дадаць тэкст",
+		"t12": "Разрэзаная мадэль",
+		"t13": "Спампаваць мадэль",
+		"ls1": "Вы можаце загрузіць 3D-мадэлі з наступных сайтаў.",
+		"ls2": "Калі ў вас ёсць якія-небудзь пытанні аб прынтары або QIDISlicer, калі ласка, звяжыцеся з намі праз адпаведны адрас электроннай пошты або Skype.",
+		"ls3": "Заўвага: калі ласка, паспрабуйце паведаміць нам свае патрабаванні ў выглядзе відэа ці малюнкаў, а таксама прадаставіць файл 3MF, файл G-кода, нумар машыны і іншую неабходную інфармацыю.",
+	},
+	"ca": {
+		"t0": "Benvingut a QIDISlicer",
+		"t1": "Guia de l'usuari",
+		"t2": "Primera d'impressió",
+		"t3": "Afegeix suport",
+		"t4": "Connecta el dispositiu",
+		"t5": "Enviament sense fil",
+		"t6": "Informe de problemes",
+		"t7": "Demostració",
+		"t8": "Informació del producte",
+		"t9": "Contacteu amb nosaltres",
+		"t10": "Filament",
+		"t11": "Afegeix text",
+		"t12": "Tallar el model",
+		"t13": "Baixa el model",
+		"ls1": "Podeu descarregar models 3D dels següents llocs web.",
+		"ls2": "Si teniu cap pregunta sobre la impressora o QIDISlicer, poseu-vos en contacte amb nosaltres mitjançant l'adreça de correu electrònic corresponent o Skype.",
+		"ls3": "Nota: proveu d'indicar-nos els vostres requisits en forma de vídeo o imatges i proporcioneu un fitxer 3MF, un fitxer de codi G, un número de màquina i altra informació necessària.",
+	},
+	"cs": {
+		"t0": "Vítejte v QIDISlicer",
+		"t1": "Uživatelská příručka",
+		"t2": "První výtisk",
+		"t3": "Přidat podporu",
+		"t4": "Připojit zařízení",
+		"t5": "Bezdrátové odesílání",
+		"t6": "Hlášení o problému",
+		"t7": "Demonstrace",
+		"t8": "Informace o produktu",
+		"t9": "Kontaktujte nás",
+		"t10": "Filament",
+		"t11": "Přidat text",
+		"t12": "Vyříznutý model",
+		"t13": "Stáhnout model",
+		"ls1": "3D modely si můžete stáhnout z následujících webových stránek.",
+		"ls2": "Máte-li jakékoli dotazy týkající se tiskárny nebo QIDISlicer, kontaktujte nás prosím prostřednictvím příslušné e-mailové adresy nebo Skype.",
+		"ls3": "Poznámka: Zkuste nám prosím sdělit své požadavky ve formě videa nebo obrázků a poskytněte soubor 3MF, soubor G-kódu, číslo stroje a další potřebné informace.",
+	},
+	"es": {
+		"t0": "Bienvenido a QIDISlicer",
+		"t1": "Guía del usuario",
+		"t2": "Primera de impresión",
+		"t3": "Agregar soporte",
+		"t4": "Conectar dispositivo",
+		"t5": "Envío inalámbrico",
+		"t6": "Informe de problema",
+		"t7": "Demostración",
+		"t8": "Información del producto",
+		"t9": "Contacta con nosotros",
+		"t10": "Filamento",
+		"t11": "Agregar texto",
+		"t12": "Modelo cortado",
+		"t13": "Descargar Modelo",
+		"ls1": "Puede descargar modelos 3D de los siguientes sitios web.",
+		"ls2": "Si tiene alguna pregunta sobre la impresora o QIDISlicer, comuníquese con nosotros a través de la dirección de correo electrónico correspondiente o Skype.",
+		"ls3": "Nota: intente decirnos sus requisitos en forma de video o imágenes, y proporcione el archivo 3MF, el archivo de código G, el número de máquina y otra información necesaria.",
+    },
+};
+
+
+var LANG_COOKIE_NAME="QIDIWebLang";
+var LANG_COOKIE_EXPIRESECOND= 365*86400;
+
+function TranslatePage()
+{
+	let strLang=GetQueryString("lang");
+	if(strLang!=null)
+	{
+		//setCookie(LANG_COOKIE_NAME,strLang,LANG_COOKIE_EXPIRESECOND,'/');
+		localStorage.setItem(LANG_COOKIE_NAME,strLang);
+	}
+	else
+	{
+		//strLang=getCookie(LANG_COOKIE_NAME);
+		strLang=localStorage.getItem(LANG_COOKIE_NAME);
+	}
+	
+	//alert(strLang);
+	
+	if( !LangText.hasOwnProperty(strLang) )
+		strLang="en";
+	
+    let AllNode=$(".trans");
+	let nTotal=AllNode.length;
+	for(let n=0;n<nTotal;n++)
+	{
+		let OneNode=AllNode[n];
+		
+		let tid=$(OneNode).attr("tid");
+		if( LangText[strLang].hasOwnProperty(tid) )
+		{
+			$(OneNode).html(LangText[strLang][tid]);
+		}
+	}
+}

resources/web/guide/css/dark.css

@@ -0,0 +1,66 @@
+body
+{
+	background-color:#242428;
+}
+
+*
+{
+	border-color: #3E3E45;
+}
+
+
+.TextS1
+{
+	color:#efeff0;
+}
+
+.ZScrol::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
+    background-color: #939594;
+}
+
+.ZScrol::-webkit-scrollbar-track {/*滚动条里面轨道*/
+        background: #161817;
+}
+
+
+
+
+/*----Left Menu Button----*/
+.BtnItem
+{
+	color:#B3B3B5;
+}
+
+.BtnItem:hover
+{
+	color: #efeff0;
+	background-color: #243E30;
+}
+
+.BtnItem:hover .LeftIcon
+{
+	filter: brightness(300%);
+}
+
+.BtnItemSelected
+{
+	color: #efeff0;
+	background-color: #243E30;
+}
+
+.BtnItemSelected .LeftIcon
+{
+	filter: brightness(300%);
+}
+
+/*-----Right Top MenuBtn-----*/
+#RecentClearAllBtn:hover
+{
+	color: #000;
+}
+
+/*----User Manual------*/
+.UG_DESC
+{
+	color:#818183;
+}

resources/web/guide/css/home.css

@@ -0,0 +1,538 @@
+* {
+	padding: 0px;
+	border: 0px;
+	margin: 0px;
+	font-family: "system-ui", "Segoe UI", Roboto, Oxygen, Ubuntu, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-sans;
+	border-color: #4479FB;
+}
+
+html, body {
+	height: 100%;
+	width: 100%;
+	margin: 0px;
+	padding: 0px;
+	line-height: 20px;
+	font-size: 16px;
+	background-color: #F4F7FE;
+}
+
+.LinkBtn {
+	font-size: 12px;
+	color: #1200FF;
+	cursor: pointer;
+}
+
+.LinkBtn:hover {
+	text-decoration: underline;
+}
+
+/*------------------*/
+* {
+	/* 页面初始化 清除元素原有的内外边距 */
+	padding: 0;
+	margin: 0;
+	/* 盒子模型 */
+	box-sizing: border-box;
+}
+body {
+	display: flex;
+	justify-content: flex-start;
+	align-items: center;
+	/* 让页面占浏览器可视区域的高度 */
+	height: 100vh;
+}
+
+#LeftBoard {
+	/*border-right-width: 1px;
+	border-right-style: solid;*/
+	background: #414345;
+	width:360px;
+	min-width: 280px;
+	height: 100%;
+}
+
+li {
+	/* 清除li元素前面的项目符号 */
+	list-style: none;
+}
+
+.accordion {
+	/* 溢出隐藏 */
+	overflow: hidden;
+	/* 圆角属性 */
+	border-radius: 0 8px 8px 0;
+	/* 盒子阴影 */
+	box-shadow: 0 0 10px rgba(0, 0, 0, 0.6);
+}
+.accordion > li {
+	width: 100%;
+}
+.accordion > li input {
+	/* 将单选按钮隐藏起来 */
+	display: none;
+}
+.accordion > li label {
+	/* 相对定位 */
+	position: relative;
+	/* label元素是行内元素 需要将其转为块级元素 才能设置宽度和高度 */
+	display: block;
+	width: 100%;
+	padding: 20px 50px;
+	color: #fff;
+	background-color: #4479FB;
+	/* 鼠标移入变小手 */
+	cursor: pointer;
+}
+.accordion > li label i {
+	/* 绝对定位 */
+	position: absolute;
+	/* calc方法自动计算数值 让字体图标垂直居中 */
+	top: calc(50% - 12px);
+	left: 20px;
+	font-size: 24px;
+	/* 加过渡 */
+	transition: all 0.5s;
+}
+.accordion > li label:hover {
+	border-left-color: #F1F1FF;
+	border-left-width: 4px;
+	border-style: solid;
+}
+/* :not()选择器选取的是除括号里的元素以外的其它元素 :first-child选择器是第一个元素 */
+.accordion > li:not(:first-child) label {
+	border-top: 1px solid #38814d;
+}
+.accordion > li ol {
+	width: 100%;
+	background-color: #333;
+}
+.accordion > li ol li {
+	position: relative;
+	width: 100%;
+	height: 0;
+	line-height: 50px;
+	padding-left: 20px;
+	cursor: pointer;
+	transition: all 0.5s;
+}
+.accordion > li ol li::before {
+	content: "";
+	position: absolute;
+	top: 3px;
+	left: 0;
+	width: 4px;
+	height: 44px;
+	background-color: #4479FB;
+	transform: scaleY(0);
+	transition: all 0.5s;
+}
+.accordion > li ol li:hover::before {
+	transform: scaleY(1);
+}
+.accordion > li input:checked ~ label i {
+	transform: rotate(90deg);
+}
+.accordion > li input:checked ~ ol li {
+	height: 50px;
+}
+
+#GuideArea {
+	/*border-bottom-width:1px;
+	border-bottom-style:inset;*/
+	height: 100px;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	flex-wrap: nowrap;
+	position: relative;
+	width: 100%;
+}
+
+
+#Guide1 {
+	height: 36px;
+	line-height: 36px;
+	display: flex;
+	justify-content: center;
+	user-select: none;
+}
+
+#GuideBtn {
+	cursor: pointer;
+	color: #4479FB;
+}
+
+.TbItem {
+	font-size: 24px;
+	display: flex;
+	justify-content: flex-start;
+	cursor: pointer;
+	color: #4479FB
+}
+
+.TbItem:hover {
+	font-size: 25px;
+}
+
+.TbItemSelected {
+}
+
+#Icon1 {
+	margin-right: 10px;
+}
+
+#QDIcon {
+	height: 36px;
+}
+
+/*------------------*/
+#BtnArea {
+	padding: 0;
+	margin: 0;
+}
+
+.BtnItem {
+	padding-left: 30px;
+	height: 50px;
+	line-height: 50px;
+	text-indent: 10px;
+	display: flex;
+	justify-content: flex-start;
+	cursor: pointer;
+	color: white;
+	transition: all 0.5s;
+}
+.BtnItem:hover {
+	color: #4479FB
+}
+
+.BtnItemSelected {
+	background-color: #CED1D9;
+	color: #4479FB
+}
+
+.BtnIcon {
+	margin-left: 15px;
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+}
+
+.BookIcon {
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+}
+
+.MainIcon {
+	width: 20px;
+	height: 20px;
+}
+
+.LeftIcon {
+	width: 30px;
+	height: 30px;
+	padding-left: 10px;
+}
+
+/*--------------------*/
+#RightBoard {
+	width: 100%;
+	height: 100%;
+	min-width: 835px;
+	overflow-y: auto;
+}
+
+#ThumbBoard
+{
+	overflow-y:auto;
+	padding: 0px 40px;
+	display: flex;
+	flex-wrap: wrap;
+	align-content: flex-start;
+	margin: 30px 40px;
+	position: relative;
+	top: 0px;
+	bottom: 0px;
+	right: 0px;
+	left: 0px;
+}
+
+@media screen and (max-width: 1100px) {
+	.GuideBlock {
+		width: calc(50% - 20px);
+		margin: 0px 10px 40px 10px;
+		cursor: pointer;
+	}
+}
+
+@media screen and ( min-width:1101px) and ( max-width:1680px ) {
+	.GuideBlock {
+		width: calc(33% - 20px);
+		margin: 0px 10px 40px 10px;
+		cursor: pointer;
+	}
+}
+
+@media screen and ( min-width:1681px) and (max-width:2120px ) {
+	.GuideBlock {
+		width: calc(25% - 20px);
+		margin: 0px 10px 40px 10px;
+		cursor: pointer;
+	}
+}
+
+@media screen and ( min-width:2121px) and (max-width:2620px ) {
+	.GuideBlock {
+		width: calc(20% - 20px);
+		margin: 0px 10px 40px 10px;
+		cursor: pointer;
+	}
+}
+
+@media screen and (min-width:2621px ) and (max-width:3120px ) {
+	.GuideBlock {
+		width: calc(16.6% - 20px);
+		margin: 0px 10px 40px 10px;
+		cursor: pointer;
+	}
+}
+
+@media screen and (min-width:3121px ) {
+	.GuideBlock {
+		width: calc(14.2% - 20px);
+		margin: 0px 10px 40px 10px;
+		cursor: pointer;
+	}
+}
+
+#IssueBoard {
+	overflow-y: auto;
+	padding: 0px 40px;
+	display: flex;
+	flex-wrap: wrap;
+	justify-content: center;
+	align-items: center;
+	margin: 30px 40px;
+	position: relative;
+	top: 0px;
+	bottom: 0px;
+	right: 0px;
+	left: 0px;
+}
+
+@media screen{
+	.halfBlock {
+		text-align: center;
+		justify-content: center;
+		width: calc(50% - 20px);
+		margin: 0px 10px;
+	}
+}
+
+@media screen and (max-width: 1100px) {
+	.PrintBlock {
+		text-align:center;
+		width: calc(50% - 20px);
+		margin: 0px 10px 40px 10px;
+		cursor: pointer;
+	}
+}
+
+@media screen and ( min-width:1101px) and ( max-width:1680px ) {
+	.PrintBlock {
+		width: calc(33% - 20px);
+		margin: 0px 10px 40px 10px;
+		cursor: pointer;
+	}
+}
+
+@media screen and ( min-width:1681px) and (max-width:2120px ) {
+	.PrintBlock {
+		width: calc(25% - 20px);
+		margin: 0px 10px 40px 10px;
+		cursor: pointer;
+	}
+}
+
+@media screen and ( min-width:2121px) and (max-width:2620px ) {
+	.PrintBlock {
+		width: calc(20% - 20px);
+		margin: 0px 10px 40px 10px;
+		cursor: pointer;
+	}
+}
+
+@media screen and (min-width:2621px ) and (max-width:3120px ) {
+	.PrintBlock {
+		width: calc(16.6% - 20px);
+		margin: 0px 10px 40px 10px;
+		cursor: pointer;
+	}
+}
+
+@media screen and (min-width:3121px ) {
+	.PrintBlock {
+		width: calc(14.2% - 20px);
+		margin: 0px 10px 40px 10px;
+		cursor: pointer;
+	}
+}
+
+#FilaBigBoard {
+	display: none;
+}
+
+#FilaBoard {
+	display: flex;
+	flex-wrap: wrap;
+	text-align: center;
+	justify-content: center;
+	height: 100vh;
+	overflow-y: auto;
+	top: 0px;
+	bottom: 0px;
+	right: 0px;
+	left: 0px;
+	box-sizing: border-box;
+}
+
+.main {
+	margin: 50px 50px;
+	width: 100%;
+	overflow: auto;
+}
+
+td, th {
+	/* 设置td,th宽度高度 */
+	border: 1px solid gray;
+	font-size: 12px;
+	width: 100px;
+	height: 50px;
+}
+
+th {
+	background-color: #4F6EBC;
+	color: #fff;
+}
+
+table {
+	table-layout: fixed;
+	width: 200px; /* 固定宽度 */
+}
+
+td:first-child, th:first-child {
+	position: sticky;
+	left: 0; /* 首行永远固定在左侧 */
+	z-index: 1;
+	background: #CDDBFB;
+}
+
+th:nth-child(odd) { /*奇表头*/
+	background-color: #6993FB;
+}
+
+thead tr th {
+	position: sticky;
+	top: 0; /* 列首永远固定在头部  */
+}
+
+tbody tr:nth-child(odd) {
+	background: #B7B9BF;
+}
+
+th:first-child {
+	z-index: 2;
+}
+
+/*------Gif------*/
+#GifBigBoard {
+	display: none;
+}
+
+#GifBoard {
+	display: flex;
+	flex-wrap: wrap;
+	align-content: flex-start;
+	align-items: center;
+	justify-content: center;
+	overflow-y: auto;
+	margin: 30px 40px;
+	position: relative;
+	top: 0px;
+	bottom: 0px;
+	right: 0px;
+	left: 0px;
+}
+
+@media screen {
+	.GifBlock {
+		margin: 0px 0px 0px 0px;
+		cursor: pointer;
+	}
+}
+
+.UG_PRINTER {
+	text-align: center;
+	width: 100%;
+}
+
+.UG_PRINTER img {
+	width: 15%;
+}
+
+.UG_IMG {
+	justify-content:center;
+	text-align:center;
+	width: 100%;
+}
+
+.UG_IMG img {
+	width: 100%;
+	border-radius: 5px 5px 5px 5px;
+}
+
+.UG_TITLE {
+	text-align: center;
+	font-size: 18px;
+	font-weight: 700;
+	line-height: 25px;
+	width: 100%;
+	margin-top: 20px;
+	margin-bottom: 4px;
+	color: #4479FB;
+}
+
+.UG_DESC {
+	font-size: 14px;
+	width: 100%;
+	line-height: 20px;
+}
+
+.UG_CDESC {
+	margin-top:35px;
+	margin-bottom:5px;
+	text-align: center;
+	font-size: 24px;
+	width: 100%;
+	line-height: 20px;
+}
+
+.UG_B_TITLE {
+	text-align: center;
+	font-size: 36px;
+	font-weight: 700;
+	line-height: 25px;
+	width: 100%;
+	margin-top: 20px;
+	margin-bottom: 25px;
+	color: #4479FB;
+}
+
+.UG_B_DESC {
+	font-size: 16px;
+	width: 100%;
+	line-height: 20px;
+	margin-bottom: 50px;
+}