diff --git a/.tx/config b/.tx/config
index 8afd5fe81..de69aa30f 100644
--- a/.tx/config
+++ b/.tx/config
@@ -2,7 +2,7 @@
 host = https://www.transifex.com
 lang_map = uk: uk_UA, cs : cs_CZ, nl : nl_NL, fi : fi_FI, es : es_ES, id : id_ID
 
-[valentina-project.valentina_ts]
+[valentina-project.valentina-ts]
 file_filter = share/translations/valentina_<lang>.ts
 minimum_perc = 20
 source_file = share/translations/valentina.ts
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 85431bd70..3f9469091 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -8,6 +8,8 @@
 - Fix finding point of intersection curve and axis. Case when the axis's point lies on the curve.
 - Fix visualization for tool point of intersection line and axis. Case when the axis's point lies on the line.
 - Table of variables is available in Details mode.
+- Fix incorrect comparison of the global length of passmark to minimal allowed value.
+- Make an increment name valid after user selected it from a completion list.
 
 # Valentina 0.7.49 July 1, 2021
 - Fix crash.
diff --git a/dist/OBS_debian/debian.valentina.1 b/dist/OBS_debian/debian.valentina.1
index 9f5efa2b7..8359a26bb 100644
--- a/dist/OBS_debian/debian.valentina.1
+++ b/dist/OBS_debian/debian.valentina.1
@@ -132,7 +132,10 @@ The path to output destination folder. By default the directory at which the app
 .BR "*" " PDF tiled files (*.pdf) = 33,"
 .RE
 .RS
-.BR "*" " TIFF файли (*.tif) = 35."
+.BR "*" " TIFF файли (*.tif) = 35,"
+.RE
+.RS
+.BR "*" " TIFF файли (*.tif) = 36."
 .RE
 .IP "--bdxf"
 .RB "Export dxf in binary form."
diff --git a/dist/Puzzle.icns b/dist/Puzzle.icns
new file mode 100644
index 000000000..a8c2190d6
Binary files /dev/null and b/dist/Puzzle.icns differ
diff --git a/dist/debian/menu b/dist/debian/menu
index 3addde6b9..3e2e6f89d 100644
--- a/dist/debian/menu
+++ b/dist/debian/menu
@@ -1,2 +1,3 @@
 ?package(valentina): needs="X11" section="Applications/Graphics" title="Valentina" command="valentina"
 ?package(valentina): needs="X11" section="Applications/Data Management" title="Tape" command="tape" 
+?package(valentina): needs="X11" section="Applications/Data Management" title="Puzzle" command="puzzle" 
diff --git a/dist/debian/puzzle.1 b/dist/debian/puzzle.1
new file mode 100644
index 000000000..3c04b8ad7
--- /dev/null
+++ b/dist/debian/puzzle.1
@@ -0,0 +1,55 @@
+.\" Manpage for puzzle
+.\" Contact dismine@gmail.com to correct errors.
+.TH puzzle 1 "23 March, 2020" "puzzle man page"
+.SH NAME
+Puzzle \- Valentina's manual layout
+.SH SYNOPSIS
+puzzle [options] file
+.SH DESCRIPTION
+.B Valentina
+Puzzle is the name of the new application to create manual layouts. Similar to "Tape", it is an application that is separated from Valentina and work on it's own, but is a part of the Valentina package and work closely together with Valentina.
+
+.B Puzzle
+is a part of Valentina. And used for creating and editing manual layouts.
+.IP "-h, --help"
+Displays this help.
+.IP "-v, --version"
+Displays version information.
+.IP "-e, --exportFile <The filename of layout file>"
+The filename of exported layout file. Use it to enable console export mode.
+.IP "-r, --rawLayout <The raw layout data file>"
+Load pattern pieces form the raw layout data file.
+.IP "-f, --format <Format number>"
+Number corresponding to tiled pdf page template (default = 0, export mode with tiled pdf format): <not defined>
+.IP "--bdxf"
+Export dxf in binary form.
+.IP "--text2paths"
+Export text as paths.
+.IP "-c, --crop"
+Auto crop unused length (export mode).
+.IP "--cropWidth"
+Auto crop unused width (export mode).
+.IP "--tiledPageformat <Template number>"
+Number corresponding to tiled pdf page template (default = 0, export mode with tiled pdf format): <not defined>
+.IP "--tiledlmargin <The left margin>"
+Tiled page left margin in current units like 3.0 (export mode). If not set will be used default value 1 cm.
+.IP "--tiledrmargin <The right margin>"
+Tiled page right margin in current units like 3.0 (export mode). If not set will be used default value 1 cm.
+.IP "--tiledtmargin <The top margin>"
+Tiled page top margin in current units like 3.0 (export mode). If not set will be used value default value 1 cm.
+.IP "--tiledbmargin <The bottom margin>"
+Tiled page bottom margin in current units like 3.0 (export mode). If not set will be used value default value 1 cm.
+.IP "--tiledLandscape"
+Set tiled page orienatation to landscape (export mode). Default value if not set portrait.
+.IP "-t, --test"
+Run the program in a test mode. The program in this mode loads a single layout file and silently quit without showing the main window. The key have priority before key 'exportFile'.
+.IP "--no-scaling"
+Disable high dpi scaling. Call this option if has problem with scaling (by default scaling enabled). Alternatively you can use the QT_AUTO_SCREEN_SCALE_FACTOR=0 environment variable.
+.IP Arguments: 
+.I filename
+\- the manual layout file.
+.SH AUTHOR
+.RI "This  manual  page  was  written  by Roman Telezhynskyi <" dismine@gmail.com ">"
+
+.BR valentina (1)
+
diff --git a/dist/debian/source/include-binaries b/dist/debian/source/include-binaries
index 5f9e9000a..92ff0082c 100644
--- a/dist/debian/source/include-binaries
+++ b/dist/debian/source/include-binaries
@@ -1,10 +1,13 @@
 debian/usr/share/pixmaps/valentina.png
 debian/usr/share/pixmaps/tape.png
+debian/usr/share/pixmaps/puzzle.png
 debian/usr/share/pixmaps/application-x-valentina-pattern.png
 debian/usr/share/pixmaps/application-x-valentina-i-measurements.png
 debian/usr/share/pixmaps/application-x-valentina-s-measurements.png
+debian/usr/share/pixmaps/application-x-valentina-layout.png
 debian/valentina/usr/bin/valentina
 debian/valentina/usr/bin/tape
+debian/valentina/usr/bin/puzzle
 debian/valentina/usr/share/valentina/diagrams.rcc
 debian/valentina/usr/share/valentina/translations/measurements_p0_cs_CZ.qm
 debian/valentina/usr/share/valentina/translations/measurements_p0_de_DE.qm
diff --git a/dist/debian/tape.1 b/dist/debian/tape.1
old mode 100644
new mode 100755
diff --git a/dist/debian/valentina.1 b/dist/debian/valentina.1
old mode 100644
new mode 100755
diff --git a/dist/debian/valentina.manpages b/dist/debian/valentina.manpages
index e2540884d..ca51f67c3 100644
--- a/dist/debian/valentina.manpages
+++ b/dist/debian/valentina.manpages
@@ -1,2 +1,3 @@
 debian/valentina.1
 debian/tape.1
+debian/puzzle.1
diff --git a/dist/debian/valentina.mime b/dist/debian/valentina.mime
index 94de3debe..b863ec357 100644
--- a/dist/debian/valentina.mime
+++ b/dist/debian/valentina.mime
@@ -1,3 +1,4 @@
 application/x-valentina-pattern; valentina %s; nametemplate=%s.val; description="Valentina pattern" edit=valentina '%s'; priority=6
 application/x-valentina-i-pattern; tape %s; nametemplate=%s.vit; description="Valentina individual measurments" edit=tape '%s'; priority=6
 application/x-valentina-s-pattern; tape %s; nametemplate=%s.vst; description="Valentina standard measurments" edit=tape '%s'; priority=6
+application/x-valentina-layout; puzzle %s; nametemplate=%s.vlt; description="Valentina layout" edit=puzzle '%s'; priority=6
diff --git a/dist/debian/valentina.sharedmimeinfo b/dist/debian/valentina.sharedmimeinfo
index 41bb06377..ac60d8b05 100644
--- a/dist/debian/valentina.sharedmimeinfo
+++ b/dist/debian/valentina.sharedmimeinfo
@@ -282,4 +282,98 @@
      <glob pattern="*.vst"/>
      <icon name="application-x-valentina-s-measurements"/>
    </mime-type>
+   <mime-type type="application/x-valentina-layout">
+     <sub-class-of type="text/xml"/>
+     <_comment>Valentina layout</_comment>
+	 <comment xml:lang="af">Valentina layout</comment>
+     <comment xml:lang="ar">Valentina layout</comment>
+     <comment xml:lang="as">Valentina layout</comment>
+     <comment xml:lang="ast">Valentina layout</comment>
+     <comment xml:lang="be">Valentina layout</comment>
+     <comment xml:lang="bg">Valentina layout</comment>
+     <comment xml:lang="bn">Valentina layout</comment>
+     <comment xml:lang="br">Valentina layout</comment>
+     <comment xml:lang="bs">Valentina layout</comment>
+     <comment xml:lang="ca">Valentina layout</comment>
+     <comment xml:lang="ca-valencia">Valentina layout</comment>
+     <comment xml:lang="cs">Valentina layout</comment>
+     <comment xml:lang="cy">Valentina layout</comment>
+     <comment xml:lang="da">Valentina layout</comment>
+     <comment xml:lang="de">Valentina layout</comment>
+     <comment xml:lang="dz">Valentina layout</comment>
+     <comment xml:lang="el">Valentina layout</comment>
+     <comment xml:lang="en-GB">Valentina layout</comment>
+     <comment xml:lang="en-ZA">Valentina layout</comment>
+     <comment xml:lang="eo">Valentina layout</comment>
+     <comment xml:lang="es">Valentina layout</comment>
+     <comment xml:lang="et">Valentina layout</comment>
+     <comment xml:lang="eu">Valentina layout</comment>
+     <comment xml:lang="fa">Valentina layout</comment>
+     <comment xml:lang="fi">Valentina layout</comment>
+     <comment xml:lang="fr">Valentina layout</comment>
+     <comment xml:lang="ga">Valentina layout</comment>
+     <comment xml:lang="gd">Valentina layout</comment>
+     <comment xml:lang="gl">Valentina layout</comment>
+     <comment xml:lang="gu">Valentina layout</comment>
+     <comment xml:lang="he">Valentina layout</comment>
+     <comment xml:lang="hi">Valentina layout</comment>
+     <comment xml:lang="hr">Valentina layout</comment>
+     <comment xml:lang="hu">Valentina layout</comment>
+     <comment xml:lang="id">Valentina layout</comment>
+     <comment xml:lang="is">Valentina layout</comment>
+     <comment xml:lang="it">Valentina layout</comment>
+     <comment xml:lang="ja">Valentina layout</comment>
+     <comment xml:lang="ka">Valentina layout</comment>
+     <comment xml:lang="kk">Valentina layout</comment>
+     <comment xml:lang="km">Valentina layout</comment>
+     <comment xml:lang="kmr-Latn">Valentina layout</comment>
+     <comment xml:lang="ko">Valentina layout</comment>
+     <comment xml:lang="lt">Valentina layout</comment>
+     <comment xml:lang="lv">Valentina layout</comment>
+     <comment xml:lang="mk">Valentina layout</comment>
+     <comment xml:lang="ml">Valentina layout</comment>
+     <comment xml:lang="mn">Valentina layout</comment>
+     <comment xml:lang="mr">Valentina layout</comment>
+     <comment xml:lang="nb">Valentina layout</comment>
+     <comment xml:lang="ne">Valentina layout</comment>
+     <comment xml:lang="nl">Valentina layout</comment>
+     <comment xml:lang="nn">Valentina layout</comment>
+     <comment xml:lang="nr">Valentina layout</comment>
+     <comment xml:lang="nso">Valentina layout</comment>
+     <comment xml:lang="oc">Valentina layout</comment>
+     <comment xml:lang="om">Valentina layout</comment>
+     <comment xml:lang="or">Valentina layout</comment>
+     <comment xml:lang="pa-IN">Valentina layout</comment>
+     <comment xml:lang="pl">Valentina layout</comment>
+     <comment xml:lang="pt">Valentina layout</comment>
+     <comment xml:lang="pt-BR">Valentina layout</comment>
+     <comment xml:lang="ro">Valentina layout</comment>
+     <comment xml:lang="ru">Valentina раскладка</comment>
+     <comment xml:lang="rw">Valentina layout</comment>
+     <comment xml:lang="si">Valentina layout</comment>
+     <comment xml:lang="sk">Valentina layout</comment>
+     <comment xml:lang="sl">Valentina layout</comment>
+     <comment xml:lang="sr">Valentina layout</comment>
+     <comment xml:lang="ss">Valentina layout</comment>
+     <comment xml:lang="st">Valentina layout</comment>
+     <comment xml:lang="sv">Valentina layout</comment>
+     <comment xml:lang="ta">Valentina layout</comment>
+     <comment xml:lang="te">Valentina layout</comment>
+     <comment xml:lang="tg">Valentina layout</comment>
+     <comment xml:lang="th">Valentina layout</comment>
+     <comment xml:lang="tn">Valentina layout</comment>
+     <comment xml:lang="tr">Valentina layout</comment>
+     <comment xml:lang="ts">Valentina layout</comment>
+     <comment xml:lang="ug">Valentina layout</comment>
+     <comment xml:lang="uk">Valentina розкладка</comment>
+     <comment xml:lang="uz">Valentina layout</comment>
+     <comment xml:lang="ve">Valentina layout</comment>
+     <comment xml:lang="vi">Valentina layout</comment>
+     <comment xml:lang="xh">Valentina layout</comment>
+     <comment xml:lang="zh-CN">Valentina layout</comment>
+     <comment xml:lang="zh-TW">Valentina layout</comment>
+     <comment xml:lang="zu">Valentina layout</comment>
+     <glob pattern="*.vlt"/>
+     <icon name="application-x-valentina-layout"/>
+   </mime-type>
 </mime-info>
diff --git a/dist/ebuild/valentina-0.0.0_alpha(template_unstable).ebuild b/dist/ebuild/valentina-0.0.0_alpha(template_unstable).ebuild
index 45a67e704..45a286af3 100644
--- a/dist/ebuild/valentina-0.0.0_alpha(template_unstable).ebuild
+++ b/dist/ebuild/valentina-0.0.0_alpha(template_unstable).ebuild
@@ -59,6 +59,7 @@ src_install() {
 
 	doman dist/debian/${PN}.1
 	doman dist/debian/tape.1
+    doman dist/debian/puzzle.1
 
 	cp dist/debian/valentina.sharedmimeinfo dist/debian/${PN}.xml || die
 	insinto /usr/share/mime/packages
diff --git a/dist/macx/layout.icns b/dist/macx/layout.icns
new file mode 100644
index 000000000..831979454
Binary files /dev/null and b/dist/macx/layout.icns differ
diff --git a/dist/macx/puzzle/Info.plist b/dist/macx/puzzle/Info.plist
new file mode 100755
index 000000000..b68500345
--- /dev/null
+++ b/dist/macx/puzzle/Info.plist
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>CFBundleIconFile</key>
+	<string>@ICON@</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.7</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>© 2013-2021, Valentina project</string>
+	<key>CFBundleSignature</key>
+	<string>@TYPEINFO@</string>
+	<key>CFBundleExecutable</key>
+	<string>@EXECUTABLE@</string>
+	<key>CFBundleIdentifier</key>
+	<string>io.bitbucket.valentinaproject.@EXECUTABLE@</string>
+	<key>CFBundleShortVersionString</key>
+	<string>0.7.47</string>
+	<key>CFBundleVersion</key>
+	<string>0.7.47.0</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+        <key>CFBundleDocumentTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleTypeIconFile</key>
+			<string>layout.incs</string>
+			<key>LSItemContentTypes</key>
+			<array>
+				<string>io.bitbucket.valentinaproject.vlt</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>Valentina layout</string>
+			<key>LSHandlerRank</key>
+			<string>Owner</string>
+		</dict>
+	</array>
+	<key>UTExportedTypeDeclarations</key>
+	<array>
+		<dict>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.text</string>
+				<string>public.xml</string>
+			</array>
+			<key>UTTypeDescription</key>
+			<string>Valentina layout</string>
+			<key>UTTypeIconFile</key>
+			<string>layout.icns</string>
+			<key>UTTypeIdentifier</key>
+			<string>io.bitbucket.valentinaproject.vlt</string>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>vlt</string>
+				</array>
+				<key>public.mime-type</key>
+            	                <string>text/xml</string>
+			</dict>
+		</dict>
+	</array>
+	<key>NSRequiresAquaSystemAppearance</key>
+	<true/>
+</dict>
+</plist>
diff --git a/dist/puzzle.desktop b/dist/puzzle.desktop
new file mode 100644
index 000000000..b166d63fe
--- /dev/null
+++ b/dist/puzzle.desktop
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Type=Application
+Name=Puzzle
+Exec=puzzle %F
+Version=1.0
+GenericName=Valentina's layout editor
+Comment=Create and edit layouts
+Comment[uk]=Створюйте і редагуйте розкладки
+Comment[ru]=Создавайте и редактируйте раскладку
+Icon=puzzle
+Terminal=false
+MimeType=application/x-valentina-layout;
+Categories=Qt;Utility;FileTools;
+TryExec=puzzle
diff --git a/dist/rpm/valentina.spec b/dist/rpm/valentina.spec
index 633383937..8a81276ab 100644
--- a/dist/rpm/valentina.spec
+++ b/dist/rpm/valentina.spec
@@ -151,6 +151,9 @@ gzip -9c dist/debian/%{name}.1 > dist/debian/%{name}.1.gz &&
 gzip -9c dist/debian/tape.1 > dist/debian/tape.1.gz &&
 %{__install} -Dm 644 dist/debian/tape.1.gz %{buildroot}%{_mandir}/man1/tape.1.gz
 
+gzip -9c dist/debian/puzzle.1 > dist/debian/puzzle.1.gz &&
+%{__install} -Dm 644 dist/debian/puzzle.1.gz %{buildroot}%{_mandir}/man1/puzzle.1.gz
+
 cp dist/debian/valentina.sharedmimeinfo dist/debian/%{name}.xml &&
 %{__install} -Dm 644 dist/debian/%{name}.xml %{buildroot}%{_datadir}/mime/packages/%{name}.xml
 
@@ -160,6 +163,7 @@ cp dist/debian/valentina.mime dist/debian/%{name} &&
 %if 0%{?suse_version} > 0
 %suse_update_desktop_file -r %{name} Graphics VectorGraphics 2DGraphics
 %suse_update_desktop_file -r tape Utility Applet
+%suse_update_desktop_file -r puzzle Utility Applet
 %endif
 
 %post 
@@ -194,8 +198,10 @@ fi
 %license LICENSE_GPL.txt 
 %doc %{_mandir}/man1/%{name}.1*
 %doc %{_mandir}/man1/tape.1*
+%doc %{_mandir}/man1/puzzle.1*
 %{_bindir}/valentina
 %{_bindir}/tape
+%{_bindir}/puzzle
 %{_libdir}/libvpropertyexplorer.so
 %{_libdir}/libvpropertyexplorer.so.*
 %{_libdir}/libqmuparser.so
@@ -208,6 +214,7 @@ fi
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/applications/tape.desktop
+%{_datadir}/applications/puzzle.desktop
 
 %dir %{_datadir}/icons/
 %dir %{_datadir}/icons/hicolor/
@@ -242,7 +249,7 @@ fi
 %{_datadir}/%{name}/labels/*.xml
 
 %clean
-rm -f dist/debian/%{name}.1.gz dist/debian/tape.1.gz dist/debian/%{name}.xml dist/debian/%{name}
+rm -f dist/debian/%{name}.1.gz dist/debian/tape.1.gz dist/debian/puzzle.1.gz dist/debian/%{name}.xml dist/debian/%{name}
 [ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
 
 
diff --git a/dist/win/inno/valentina.iss b/dist/win/inno/valentina.iss
index d9c9f7e87..60a532a42 100644
--- a/dist/win/inno/valentina.iss
+++ b/dist/win/inno/valentina.iss
@@ -86,6 +86,7 @@ Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescrip
 Name: "fileassoc1"; Description: "{cm:CreateFileAssocVal}"; GroupDescription: "{cm:FileAssoc}"
 Name: "fileassoc2"; Description: "{cm:CreateFileAssocVit}"; GroupDescription: "{cm:FileAssoc}"
 Name: "fileassoc3"; Description: "{cm:CreateFileAssocVst}"; GroupDescription: "{cm:FileAssoc}"
+Name: "fileassoc4"; Description: "{cm:CreateFileAssocVlt}"; GroupDescription: "{cm:FileAssoc}"
 Name: "deletesettings"; Description: "{cm:RemoveAnyExistingSettings}"; GroupDescription: "{cm:ManageSettings}"; Flags: unchecked
 
 [Types]
@@ -161,6 +162,7 @@ Name: "lang_files\chinese"; Description: "Chinese (China)"; Types: full custom;
 ; Signing
 Source: ".\valentina\valentina.exe"; DestDir: "{app}"; Flags: ignoreversion sign
 Source: ".\valentina\tape.exe"; DestDir: "{app}"; Flags: ignoreversion sign
+Source: ".\valentina\puzzle.exe"; DestDir: "{app}"; Flags: ignoreversion sign
 Source: ".\valentina\vpropertyexplorer.dll"; DestDir: "{app}"; Flags: ignoreversion sign
 Source: ".\valentina\qmuparser2.dll"; DestDir: "{app}"; Flags: ignoreversion sign
 ; Localizations
@@ -249,6 +251,7 @@ Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChang
 Root: "HKCR"; Subkey: ".val"; ValueType: string; ValueName: ""; ValueData: "Valentina.Pattern"; Flags: uninsdeletevalue; Tasks: fileassoc1
 Root: "HKCR"; Subkey: ".vit"; ValueType: string; ValueName: ""; ValueData: "Valentina.IndividualMeasurements"; Flags: uninsdeletevalue; Tasks: fileassoc2
 Root: "HKCR"; Subkey: ".vst"; ValueType: string; ValueName: ""; ValueData: "Valentina.StandardMeasurements"; Flags: uninsdeletevalue; Tasks: fileassoc3
+Root: "HKCR"; Subkey: ".vlt"; ValueType: string; ValueName: ""; ValueData: "Valentina.Layout"; Flags: uninsdeletevalue; Tasks: fileassoc3
 
 Root: "HKCR"; Subkey: "Valentina.Pattern"; ValueType: string; ValueData: "Valentina pattern file"; Flags: uninsdeletekey; Tasks: fileassoc1
 Root: "HKCR"; Subkey: "Valentina.Pattern\DefaultIcon"; ValueType: string; ValueData: "{app}\pattern.ico,0"; Tasks: fileassoc1
@@ -262,6 +265,10 @@ Root: "HKCR"; Subkey: "Valentina.StandardMeasurements"; ValueType: string; Value
 Root: "HKCR"; Subkey: "Valentina.StandardMeasurements\DefaultIcon"; ValueType: string; ValueData: "{app}\s-measurements.ico,0"; Tasks: fileassoc3
 Root: "HKCR"; Subkey: "Valentina.StandardMeasurements\shell\open\command"; ValueType: string; ValueData: """{app}\tape.exe"" ""%1"""; Tasks: fileassoc3
 
+Root: "HKCR"; Subkey: "Valentina.Layout"; ValueType: string; ValueData: "Valentina layout file"; Flags: uninsdeletekey; Tasks: fileassoc1
+Root: "HKCR"; Subkey: "Valentina.Layout\DefaultIcon"; ValueType: string; ValueData: "{app}\layout.ico,0"; Tasks: fileassoc1
+Root: "HKCR"; Subkey: "Valentina.Layout\shell\open\command"; ValueType: string; ValueData: """{app}\puzzle.exe"" ""%1"""; Tasks: fileassoc1
+
 [CustomMessages]
 FileAssoc = Create file associations
 english.FileAssoc = Create file associations
@@ -287,6 +294,12 @@ russian.CreateFileAssocVst = *.vst (Мультиразмерный файл ме
 ukrainian.CreateFileAssocVst = *.vst (Мультирозмірний файл мірок)
 german.CreateFileAssocVst = *.vst (Multi-Size Maßdatei)
 
+CreateFileAssocVlt = *.vlt (Layout file)
+english.CreateFileAssocVlt = *.vlt (Layout file)
+russian.CreateFileAssocVlt = *.vlt (Файл раскладки)
+ukrainian.CreateFileAssocVlt = *.vlt (Файл роскладки)
+german.CreateFileAssocVlt = *.vlt (Layoutdatei)
+
 WarnRemoveOld = is installed at the moment. Remove old version?
 english.WarnRemoveOld = is installed at the moment. Remove old version?
 russian.WarnRemoveOld = установлена на данный момент. Удалить старую версию?
diff --git a/dist/win/layout.ico b/dist/win/layout.ico
new file mode 100644
index 000000000..3888c30e0
Binary files /dev/null and b/dist/win/layout.ico differ
diff --git a/scripts/travis-deploy.sh b/scripts/travis-deploy.sh
old mode 100755
new mode 100644
diff --git a/share/icons/128x128/apps/puzzle.png b/share/icons/128x128/apps/puzzle.png
new file mode 100644
index 000000000..f28c66ef4
Binary files /dev/null and b/share/icons/128x128/apps/puzzle.png differ
diff --git a/share/icons/128x128/mimetypes/application-x-valentina-layout.png b/share/icons/128x128/mimetypes/application-x-valentina-layout.png
new file mode 100644
index 000000000..e424b5bb4
Binary files /dev/null and b/share/icons/128x128/mimetypes/application-x-valentina-layout.png differ
diff --git a/share/icons/256x256/apps/puzzle.png b/share/icons/256x256/apps/puzzle.png
new file mode 100644
index 000000000..d8b12f68b
Binary files /dev/null and b/share/icons/256x256/apps/puzzle.png differ
diff --git a/share/icons/256x256/mimetypes/application-x-valentina-layout.png b/share/icons/256x256/mimetypes/application-x-valentina-layout.png
new file mode 100644
index 000000000..c71a5c413
Binary files /dev/null and b/share/icons/256x256/mimetypes/application-x-valentina-layout.png differ
diff --git a/share/icons/48x48/apps/puzzle.png b/share/icons/48x48/apps/puzzle.png
new file mode 100644
index 000000000..fe729270a
Binary files /dev/null and b/share/icons/48x48/apps/puzzle.png differ
diff --git a/share/icons/48x48/mimetypes/application-x-valentina-layout.png b/share/icons/48x48/mimetypes/application-x-valentina-layout.png
new file mode 100644
index 000000000..d85f939c2
Binary files /dev/null and b/share/icons/48x48/mimetypes/application-x-valentina-layout.png differ
diff --git a/share/icons/512x512/apps/puzzle.png b/share/icons/512x512/apps/puzzle.png
new file mode 100644
index 000000000..03c919de0
Binary files /dev/null and b/share/icons/512x512/apps/puzzle.png differ
diff --git a/share/icons/512x512/mimetypes/application-x-valentina-layout.png b/share/icons/512x512/mimetypes/application-x-valentina-layout.png
new file mode 100644
index 000000000..9f370f115
Binary files /dev/null and b/share/icons/512x512/mimetypes/application-x-valentina-layout.png differ
diff --git a/share/icons/64x64/apps/puzzle.png b/share/icons/64x64/apps/puzzle.png
new file mode 100644
index 000000000..ea9aa050e
Binary files /dev/null and b/share/icons/64x64/apps/puzzle.png differ
diff --git a/share/icons/64x64/mimetypes/application-x-valentina-layout.png b/share/icons/64x64/mimetypes/application-x-valentina-layout.png
new file mode 100644
index 000000000..2b37af605
Binary files /dev/null and b/share/icons/64x64/mimetypes/application-x-valentina-layout.png differ
diff --git a/share/translations/translations.pro b/share/translations/translations.pro
index 2a161330b..c343e6691 100644
--- a/share/translations/translations.pro
+++ b/share/translations/translations.pro
@@ -10,6 +10,7 @@ TEMPLATE = app
 DEPENDPATH +=  \
             ../../src/app/valentina \
             ../../src/app/tape \
+            ../../src/app/puzzle \    
             ../../src/libs/qmuparser \
             ../../src/libs/vpropertyexplorer \
             ../../src/libs/ifc \
@@ -25,6 +26,7 @@ DEPENDPATH +=  \
 
 include(../../src/app/valentina/valentina.pri)
 include(../../src/app/tape/tape.pri)
+include(../../src/app/puzzle/puzzle.pri)
 include(../../src/libs/qmuparser/qmuparser.pri)
 include(../../src/libs/vpropertyexplorer/vpropertyexplorer.pri)
 include(../../src/libs/ifc/ifc.pri)
diff --git a/share/translations/valentina.ts b/share/translations/valentina.ts
index cbf1fcf7d..27b888306 100644
--- a/share/translations/valentina.ts
+++ b/share/translations/valentina.ts
@@ -710,11 +710,11 @@
         <translation type="unfinished">Tool</translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alias:</source>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -837,11 +837,11 @@
         <translation type="unfinished">Tool</translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alias:</source>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1039,11 +1039,11 @@
         <translation type="unfinished">Tool</translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alias:</source>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1098,11 +1098,11 @@
         <translation type="unfinished">Tool</translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alias:</source>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1299,10 +1299,6 @@
         <source>Tool</source>
         <translation type="unfinished">Tool</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Alias1:</source>
         <translation type="unfinished"></translation>
@@ -1311,6 +1307,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCutSpline</name>
@@ -1390,10 +1390,6 @@
         <source>Tool</source>
         <translation type="unfinished">Tool</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Alias1:</source>
         <translation type="unfinished"></translation>
@@ -1402,6 +1398,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCutSplinePath</name>
@@ -1481,10 +1481,6 @@
         <source>Tool</source>
         <translation type="unfinished">Tool</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Alias1:</source>
         <translation type="unfinished"></translation>
@@ -1493,6 +1489,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogDateTimeFormats</name>
@@ -1794,6 +1794,10 @@
         <source>Dimension labels</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Dimension:</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Value</source>
         <translation type="unfinished">Value</translation>
@@ -1802,10 +1806,6 @@
         <source>Label</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Dimension:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DialogDuplicateDetail</name>
@@ -2094,10 +2094,6 @@
         <source>Customer email</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Measurement: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
@@ -2119,23 +2115,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No data for the height dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the size dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the hip dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the waist dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Final measurement: %1</source>
+        <source>Measurement: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2158,6 +2138,26 @@
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Final measurement: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the height dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the size dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the hip dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the waist dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogEditWrongFormula</name>
@@ -2409,11 +2409,11 @@
         <translation type="unfinished">Tool</translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alias:</source>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2753,10 +2753,6 @@
         <source>Tool</source>
         <translation type="unfinished">Tool</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
@@ -2773,6 +2769,10 @@
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -2872,10 +2872,6 @@
         <source>Tool</source>
         <translation type="unfinished">Tool</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
@@ -2892,6 +2888,10 @@
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -4269,50 +4269,6 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished">Name</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <translation type="unfinished">Value</translation>
-    </message>
-    <message>
-        <source>Full name</source>
-        <translation type="obsolete">Full name</translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="obsolete">Description</translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <translation type="unfinished">Base value</translation>
-    </message>
-    <message>
-        <source>Skip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shift (%1)*:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File path is empty</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not enough columns</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not enough data to import</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please, select unique number for each column</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Name</source>
         <comment>measurement column</comment>
@@ -4343,6 +4299,42 @@ Apply settings anyway?</source>
         <comment>measurement column</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished">Value</translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <translation type="unfinished">Base value</translation>
+    </message>
+    <message>
+        <source>Shift (%1)*:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File path is empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not enough columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not enough data to import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, select unique number for each column</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogMove</name>
@@ -4438,10 +4430,6 @@ Apply settings anyway?</source>
         <source>Tool</source>
         <translation type="unfinished">Tool</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
@@ -4458,6 +4446,10 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -6153,6 +6145,28 @@ Apply settings anyway?</source>
         </translation>
     </message>
 </context>
+<context>
+    <name>DialogPuzzlePreferences</name>
+    <message>
+        <source>Puzzle preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished">Configuration</translation>
+    </message>
+    <message>
+        <source>Paths</source>
+        <translation type="unfinished">Paths</translation>
+    </message>
+    <message numerus="yes">
+        <source>Followed %n option(s) require restart to take effect: %1.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+</context>
 <context>
     <name>DialogRestrictDimension</name>
     <message>
@@ -6266,10 +6280,6 @@ Apply settings anyway?</source>
         <source>Tool</source>
         <translation type="unfinished">Tool</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Alias</source>
         <translation type="unfinished"></translation>
@@ -6286,6 +6296,10 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -6532,6 +6546,10 @@ Apply settings anyway?</source>
         <source>Numerical control</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogSeamAllowance</name>
@@ -6940,7 +6958,8 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Height</source>
-        <translation type="obsolete">Height</translation>
+        <comment>dimension</comment>
+        <translation type="unfinished">Height</translation>
     </message>
     <message>
         <source>Min value:</source>
@@ -6976,12 +6995,23 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Size</source>
-        <translation type="obsolete">Size</translation>
+        <comment>dimension</comment>
+        <translation type="unfinished">Size</translation>
     </message>
     <message>
         <source>Circumference</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Waist</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hip</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Please, provide correct data for dimensions</source>
         <translation type="unfinished"></translation>
@@ -6998,26 +7028,6 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Height</source>
-        <comment>dimension</comment>
-        <translation type="unfinished">Height</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <comment>dimension</comment>
-        <translation type="unfinished">Size</translation>
-    </message>
-    <message>
-        <source>Waist</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hip</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DialogShoulderPoint</name>
@@ -7320,11 +7330,11 @@ Apply settings anyway?</source>
         <translation type="unfinished">Tool</translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alias:</source>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -7479,11 +7489,11 @@ Apply settings anyway?</source>
         <translation type="unfinished">Tool</translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alias:</source>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -8518,7 +8528,7 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>This file already opened in another window.</source>
-        <translation>This file already opened in another window.</translation>
+        <translation type="vanished">This file already opened in another window.</translation>
     </message>
     <message>
         <source>Wrong units.</source>
@@ -8971,27 +8981,27 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>Locking file</source>
-        <translation>Locking file</translation>
+        <translation type="vanished">Locking file</translation>
     </message>
     <message>
         <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+        <translation type="vanished">This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+        <translation type="vanished">The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+        <translation type="vanished">Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions.</source>
-        <translation>The lock file could not be created, for lack of permissions.</translation>
+        <translation type="vanished">The lock file could not be created, for lack of permissions.</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation>Unknown error happened, for instance a full partition prevented writing out the lock file.</translation>
+        <translation type="vanished">Unknown error happened, for instance a full partition prevented writing out the lock file.</translation>
     </message>
     <message>
         <source>Report Bug...</source>
@@ -9149,18 +9159,6 @@ Do you want to save your changes?</translation>
         <source>Select main path objects clockwise.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>The document has no write permissions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cannot set permissions for %1 to writable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not save the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Could not save the file</source>
         <translation type="unfinished"></translation>
@@ -9550,7 +9548,43 @@ Do you want to save your changes?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to change the premissions?</source>
+        <source>Manual Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open the Puzzle app</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished">Update</translation>
+    </message>
+    <message>
+        <source>Update manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to prepare raw layout data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select manual layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -10192,6 +10226,10 @@ Do you want to save your changes?</translation>
         <source>My label templates</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>My manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PreferencesPatternPage</name>
@@ -10353,6 +10391,111 @@ This option will take an affect after restart.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>Puzzle</name>
+    <message>
+        <source>Export options can be used with single input file only.</source>
+        <translation type="unfinished">Export options can be used with single input file only.</translation>
+    </message>
+    <message>
+        <source>Valentina&apos;s manual layout editor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The manual layout file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesConfigurationPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished">Language</translation>
+    </message>
+    <message>
+        <source>GUI language:</source>
+        <translation type="unfinished">GUI language:</translation>
+    </message>
+    <message>
+        <source>Toolbar</source>
+        <translation type="unfinished">Toolbar</translation>
+    </message>
+    <message>
+        <source>The text appears under the icon (recommended for beginners).</source>
+        <translation type="unfinished">The text appears under the icon (recommended for beginners).</translation>
+    </message>
+    <message>
+        <source>User Interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate dark mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t use the native file dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dark mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesPathPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <source>Paths that Valentina uses</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished">Type</translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished">Path</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished">Default</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished">Edit</translation>
+    </message>
+    <message>
+        <source>Open Directory</source>
+        <translation type="unfinished">Open Directory</translation>
+    </message>
+    <message>
+        <source>My Individual Measurements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Multisize Measurements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Patterns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Templates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>QApplication</name>
     <message>
@@ -10698,6 +10841,10 @@ This option will take an affect after restart.</source>
         <source>Can&apos;t convert toInt parameter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Piece name &apos;%1&apos; is not unique.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Could not find the segment start.</source>
         <translation type="unfinished"></translation>
@@ -10714,6 +10861,10 @@ This option will take an affect after restart.</source>
         <source>Error calculating segment for curve &apos;%1&apos;. %2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot prepare builtin passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
@@ -10730,18 +10881,14 @@ This option will take an affect after restart.</source>
         <source>Cannot prepare passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Piece name &apos;%1&apos; is not unique.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Cannot get tokens from formula &apos;%1&apos;. Formula error: %2.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>No data for the height dimension.</source>
         <translation type="unfinished"></translation>
@@ -10763,11 +10910,15 @@ This option will take an affect after restart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
+        <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
+        <source>Unplaced pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet 1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -11378,7 +11529,7 @@ This option will take an affect after restart.</source>
     </message>
     <message>
         <source>untitled</source>
-        <translation type="vanished">untitled</translation>
+        <translation>untitled</translation>
     </message>
     <message>
         <source>&lt;Empty&gt;</source>
@@ -11615,27 +11766,27 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>Locking file</source>
-        <translation>Locking file</translation>
+        <translation type="vanished">Locking file</translation>
     </message>
     <message>
         <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+        <translation type="vanished">This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+        <translation type="vanished">The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+        <translation type="vanished">Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions.</source>
-        <translation>The lock file could not be created, for lack of permissions.</translation>
+        <translation type="vanished">The lock file could not be created, for lack of permissions.</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation>Unknown error happened, for instance a full partition prevented writing out the lock file.</translation>
+        <translation type="vanished">Unknown error happened, for instance a full partition prevented writing out the lock file.</translation>
     </message>
     <message>
         <source>Export to CSV</source>
@@ -11681,18 +11832,6 @@ Do you want to save your changes?</translation>
         <source>All files</source>
         <translation>All files</translation>
     </message>
-    <message>
-        <source>The measurements document has no write permissions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cannot set permissions for %1 to writable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not save the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Could not save the file</source>
         <translation type="unfinished"></translation>
@@ -11822,11 +11961,37 @@ Do you want to save your changes?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to change the premissions?</source>
+        <source>Cannot read settings from a malformed .INI file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cannot read settings from a malformed .INI file.</source>
+        <source>Name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <source>Full name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Full name</translation>
+    </message>
+    <message>
+        <source>Calculated value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Calculated value</translation>
+    </message>
+    <message>
+        <source>Formula</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Formula</translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Base value</translation>
+    </message>
+    <message>
+        <source>Correction</source>
+        <comment>measurement column</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -11941,36 +12106,6 @@ Do you want to save your changes?</translation>
         <source>Degrees</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Name</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished">Name</translation>
-    </message>
-    <message>
-        <source>Full name</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished">Full name</translation>
-    </message>
-    <message>
-        <source>Calculated value</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished">Calculated value</translation>
-    </message>
-    <message>
-        <source>Formula</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished">Formula</translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished">Base value</translation>
-    </message>
-    <message>
-        <source>Correction</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Restrict first dimension</source>
         <translation type="unfinished"></translation>
@@ -12577,6 +12712,18 @@ Do you want to save your changes?</translation>
         <comment>seam allowance</comment>
         <translation type="unfinished">Custom</translation>
     </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Universally Unique IDentifier of piece. Used to identifier piece while updating manual layout. Left empty to generate new value.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TabPins</name>
@@ -12834,6 +12981,10 @@ Do you want to save your changes?</translation>
         <source>My Patterns</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ToggleDetailInLayout</name>
@@ -12920,14 +13071,6 @@ Do you want to save your changes?</translation>
         <source>Base value invalid</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Height</source>
-        <translation type="obsolete">Height</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished">Size</translation>
-    </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
@@ -12958,6 +13101,10 @@ Do you want to save your changes?</translation>
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished">Size</translation>
+    </message>
     <message>
         <source>Chest circumference</source>
         <comment>dimension</comment>
@@ -13203,6 +13350,50 @@ Do you want to save your changes?</translation>
         <source>Export to CSV</source>
         <translation type="unfinished">Export to CSV</translation>
     </message>
+    <message>
+        <source>The measurements document has no write permissions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to change the premissions?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot set permissions for %1 to writable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Locking file</source>
+        <translation type="unfinished">Locking file</translation>
+    </message>
+    <message>
+        <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished">This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished">The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished">Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+    </message>
+    <message>
+        <source>This file already opened in another window.</source>
+        <translation type="unfinished">This file already opened in another window.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions.</source>
+        <translation type="unfinished">The lock file could not be created, for lack of permissions.</translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
+        <translation type="unfinished">Unknown error happened, for instance a full partition prevented writing out the lock file.</translation>
+    </message>
 </context>
 <context>
     <name>VAbstractNode</name>
@@ -13984,6 +14175,34 @@ Do you want to save your changes?</translation>
         <source>The dimension C base</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>The filename of exported layout file. Use it to enable console export mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The filename of layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pattern pieces form the raw layout data file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The raw layout data file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to output format (default = 0, export mode): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to tiled pdf page template (default = 0, export mode with tiled pdf format): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run the program in a test mode. The program in this mode loads a single layout file and silently quit without showing the main window. The key have priority before key &apos;%1&apos;.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VCommonSettings</name>
@@ -14011,6 +14230,10 @@ Do you want to save your changes?</translation>
         <source>patterns</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VContainer</name>
@@ -14265,6 +14488,10 @@ Do you want to save your changes?</translation>
 </context>
 <context>
     <name>VLayoutExporter</name>
+    <message>
+        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot set printer page size</source>
         <translation type="unfinished"></translation>
@@ -14278,12 +14505,12 @@ Do you want to save your changes?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Creating file &apos;%1&apos; failed! %2</source>
-        <translation type="unfinished">Creating file &apos;%1&apos; failed! %2</translation>
+        <source>Export raw layout data failed. %1.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
-        <translation type="unfinished"></translation>
+        <source>Creating file &apos;%1&apos; failed! %2</source>
+        <translation type="unfinished">Creating file &apos;%1&apos; failed! %2</translation>
     </message>
     <message>
         <source>Can&apos;t create an flat dxf file.</source>
@@ -14475,6 +14702,114 @@ Do you want to save your changes?</translation>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>VPApplication</name>
+    <message>
+        <source>Error parsing file. Program will be terminated.</source>
+        <translation type="unfinished">Error parsing file. Program will be terminated.</translation>
+    </message>
+    <message>
+        <source>Error bad id. Program will be terminated.</source>
+        <translation type="unfinished">Error bad id. Program will be terminated.</translation>
+    </message>
+    <message>
+        <source>Error can&apos;t convert value. Program will be terminated.</source>
+        <translation type="unfinished">Error can&apos;t convert value. Program will be terminated.</translation>
+    </message>
+    <message>
+        <source>Error empty parameter. Program will be terminated.</source>
+        <translation type="unfinished">Error empty parameter. Program will be terminated.</translation>
+    </message>
+    <message>
+        <source>Error wrong id. Program will be terminated.</source>
+        <translation type="unfinished">Error wrong id. Program will be terminated.</translation>
+    </message>
+    <message>
+        <source>Something&apos;s wrong!!</source>
+        <translation type="unfinished">Something&apos;s wrong!!</translation>
+    </message>
+    <message>
+        <source>Exception thrown: %1. Program will be terminated.</source>
+        <translation type="unfinished">Exception thrown: %1. Program will be terminated.</translation>
+    </message>
+    <message>
+        <source>Can&apos;t begin to listen for incoming connections on name &apos;%1&apos;</source>
+        <translation type="unfinished">Can&apos;t begin to listen for incoming connections on name &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <source>Export mode doesn&apos;t support openning several files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import raw layout data does not support openning several layout files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, provide one input file.</source>
+        <translation type="unfinished">Please, provide one input file.</translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrousel</name>
+    <message>
+        <source>Pieces of </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrouselPieceList</name>
+    <message>
+        <source>Move to Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Delete</translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPDialogAbout</name>
+    <message>
+        <source>About Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Puzzle version</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Build revision:</source>
+        <translation type="unfinished">Build revision:</translation>
+    </message>
+    <message>
+        <source>This program is part of Valentina project.</source>
+        <translation type="unfinished">This program is part of Valentina project.</translation>
+    </message>
+    <message>
+        <source>Check For Updates</source>
+        <translation type="unfinished">Check For Updates</translation>
+    </message>
+    <message>
+        <source>Cannot open your default browser</source>
+        <translation type="unfinished">Cannot open your default browser</translation>
+    </message>
+    <message>
+        <source>Build revision: %1</source>
+        <translation type="unfinished">Build revision: %1</translation>
+    </message>
+    <message>
+        <source>Built on %1 at %2</source>
+        <translation type="unfinished">Built on %1 at %2</translation>
+    </message>
+    <message>
+        <source>Web site : %1</source>
+        <translation type="unfinished">Web site : %1</translation>
+    </message>
+</context>
 <context>
     <name>VPE::VBoolProperty</name>
     <message>
@@ -14497,6 +14832,573 @@ Do you want to save your changes?</translation>
         <translation>Open File</translation>
     </message>
 </context>
+<context>
+    <name>VPGraphicsPiece</name>
+    <message>
+        <source>Move to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPLayoutFileReader</name>
+    <message>
+        <source>Piece List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Got empty attribute &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPMainWindow</name>
+    <message>
+        <source>Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;File</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished">&amp;Help</translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished">Menu</translation>
+    </message>
+    <message>
+        <source>Piece Carrousel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Infos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Name:</translation>
+    </message>
+    <message>
+        <source>DummyName</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UUID:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{7b2ce4ae-96f5-4905-bb34-405cb40ca208}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Geometry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mirror piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotation</source>
+        <translation type="unfinished">Rotation</translation>
+    </message>
+    <message>
+        <source>Angle:</source>
+        <translation type="unfinished">Angle:</translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° anti-clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Placement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Y:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No piece selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple pieces selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Width</source>
+        <translation type="unfinished">Width</translation>
+    </message>
+    <message>
+        <source>Length</source>
+        <translation type="unfinished">Length</translation>
+    </message>
+    <message>
+        <source>Orientation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove unused length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right:</source>
+        <translation type="unfinished">Right:</translation>
+    </message>
+    <message>
+        <source>Top:</source>
+        <translation type="unfinished">Top:</translation>
+    </message>
+    <message>
+        <source>Left:</source>
+        <translation type="unfinished">Left:</translation>
+    </message>
+    <message>
+        <source>Bottom:</source>
+        <translation type="unfinished">Bottom:</translation>
+    </message>
+    <message>
+        <source>Placement Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Row height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Follow grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vertical grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Horizontal grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pieces gap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sticky edges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation type="unfinished">Export</translation>
+    </message>
+    <message>
+        <source>Export Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiles properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiled Pdf Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Tiles on sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export Tiled Pdf</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation type="unfinished">Layout</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Description</translation>
+    </message>
+    <message>
+        <source>Unit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning superposition of pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning pieces out of bound</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation type="unfinished">&amp;Open</translation>
+    </message>
+    <message>
+        <source>Ctrl+O</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Save</translation>
+    </message>
+    <message>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save &amp;As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Import Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation type="unfinished">E&amp;xit</translation>
+    </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation type="unfinished">&amp;New</translation>
+    </message>
+    <message>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation type="unfinished">About &amp;Qt</translation>
+    </message>
+    <message>
+        <source>About &amp;Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom in</source>
+        <translation type="unfinished">Zoom in</translation>
+    </message>
+    <message>
+        <source>Zoom out</source>
+        <translation type="unfinished">Zoom out</translation>
+    </message>
+    <message>
+        <source>Zoom 1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom fit best</source>
+        <translation type="unfinished">Zoom fit best</translation>
+    </message>
+    <message>
+        <source>Zoom sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished">Preferences</translation>
+    </message>
+    <message>
+        <source>File &apos;%1&apos; doesn&apos;t exist!</source>
+        <translation type="unfinished">File &apos;%1&apos; doesn&apos;t exist!</translation>
+    </message>
+    <message>
+        <source>File error.</source>
+        <translation type="unfinished">File error.</translation>
+    </message>
+    <message>
+        <source>Unable to read a layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fail to create layout.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not extract data from file &apos;%1&apos;. %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Centimeters</source>
+        <translation type="unfinished">Centimeters</translation>
+    </message>
+    <message>
+        <source>Millimiters</source>
+        <translation type="unfinished">Millimiters</translation>
+    </message>
+    <message>
+        <source>Inches</source>
+        <translation type="unfinished">Inches</translation>
+    </message>
+    <message>
+        <source>Scale:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>untitled %1.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>untitled.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot read settings from a malformed .INI file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save settings. Access denied.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to open file, is it writable?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New Window</source>
+        <translation type="unfinished">&amp;New Window</translation>
+    </message>
+    <message>
+        <source>Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open file</source>
+        <translation type="unfinished">Open file</translation>
+    </message>
+    <message>
+        <source>Could not save the file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save as</source>
+        <translation type="unfinished">Save as</translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window.</source>
+        <translation type="unfinished">Failed to lock. This file already opened in another window.</translation>
+    </message>
+    <message>
+        <source>Could not save file</source>
+        <translation type="unfinished">Could not save file</translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window. Expect collissions when run 2 copies of the program.</source>
+        <translation type="unfinished">Failed to lock. This file already opened in another window. Expect collissions when run 2 copies of the program.</translation>
+    </message>
+    <message>
+        <source>Raw Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About Qt</source>
+        <translation type="unfinished">About Qt</translation>
+    </message>
+    <message>
+        <source>PDF Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SVG Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPSheet</name>
+    <message>
+        <source>Letter</source>
+        <translation type="unfinished">Letter</translation>
+    </message>
+    <message>
+        <source>Legal</source>
+        <translation type="unfinished">Legal</translation>
+    </message>
+    <message>
+        <source>Tabloid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 24in</source>
+        <translation type="unfinished">Roll 24in</translation>
+    </message>
+    <message>
+        <source>Roll 30in</source>
+        <translation type="unfinished">Roll 30in</translation>
+    </message>
+    <message>
+        <source>Roll 36in</source>
+        <translation type="unfinished">Roll 36in</translation>
+    </message>
+    <message>
+        <source>Roll 42in</source>
+        <translation type="unfinished">Roll 42in</translation>
+    </message>
+    <message>
+        <source>Roll 44in</source>
+        <translation type="unfinished">Roll 44in</translation>
+    </message>
+    <message>
+        <source>Roll 48in</source>
+        <translation type="unfinished">Roll 44in {48i?}</translation>
+    </message>
+    <message>
+        <source>Roll 62in</source>
+        <translation type="unfinished">Roll 44in {62i?}</translation>
+    </message>
+    <message>
+        <source>Roll 72in</source>
+        <translation type="unfinished">Roll 44in {72i?}</translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation type="unfinished">Custom</translation>
+    </message>
+</context>
+<context>
+    <name>VPTileFactory</name>
+    <message>
+        <source>Grid ( %1 , %2 )</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page %1 of %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VPattern</name>
     <message>
@@ -14906,9 +15808,14 @@ Do you want to save your changes?</translation>
     </message>
 </context>
 <context>
-    <name>VSettings</name>
+    <name>VRawLayout</name>
     <message>
-        <source>layouts</source>
+        <source>VRawLayout::ReadFile() failed. Raw layout format prefix mismatch error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VRawLayout::ReadFile() failed.
+Raw layout format compatibility error: actualFileVersion = %1 and fileVersion = %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -17594,6 +18501,13 @@ Do you want to save your changes?</translation>
         <translation type="vanished">Error restoring backup file: %1.</translation>
     </message>
 </context>
+<context>
+    <name>VValentinaSettings</name>
+    <message>
+        <source>layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VWidgetDetails</name>
     <message>
diff --git a/share/translations/valentina_cs_CZ.ts b/share/translations/valentina_cs_CZ.ts
index 6252816ee..860b7cc0b 100644
--- a/share/translations/valentina_cs_CZ.ts
+++ b/share/translations/valentina_cs_CZ.ts
@@ -576,7 +576,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -707,16 +707,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogArcWithLength</name>
@@ -834,16 +834,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogBisector</name>
@@ -965,7 +965,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -1036,16 +1036,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCubicBezierPath</name>
@@ -1095,16 +1095,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCurveIntersectAxis</name>
@@ -1206,7 +1206,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -1297,11 +1297,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1311,6 +1307,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCutSpline</name>
@@ -1388,11 +1388,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1402,6 +1398,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCutSplinePath</name>
@@ -1479,11 +1479,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1493,6 +1489,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogDateTimeFormats</name>
@@ -1794,17 +1794,17 @@
         <source>Dimension labels</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Dimension:</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Value</source>
-        <translation>Hodnota</translation>
+        <translation type="unfinished">Hodnota</translation>
     </message>
     <message>
         <source>Label</source>
-        <translation>Popis</translation>
-    </message>
-    <message>
-        <source>Dimension:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Popis</translation>
     </message>
 </context>
 <context>
@@ -1958,6 +1958,14 @@
         <source>Measurments file name</source>
         <translation>Název souboru měření</translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="vanished">Velikost</translation>
+    </message>
+    <message>
+        <source>Height</source>
+        <translation type="vanished">Výška</translation>
+    </message>
     <message>
         <source>Measurments extension</source>
         <translation>Rozšíření měření</translation>
@@ -2086,19 +2094,15 @@
         <source>Customer email</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Measurement: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Výška</translation>
+        <translation type="unfinished">Výška</translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Velikost</translation>
+        <translation type="unfinished">Velikost</translation>
     </message>
     <message>
         <source>Hip</source>
@@ -2111,23 +2115,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No data for the height dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the size dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the hip dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the waist dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Final measurement: %1</source>
+        <source>Measurement: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2150,6 +2138,26 @@
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Final measurement: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the height dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the size dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the hip dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the waist dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogEditWrongFormula</name>
@@ -2382,16 +2390,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogEndLine</name>
@@ -2497,7 +2505,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -2727,11 +2735,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -2749,6 +2753,10 @@
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -2846,11 +2854,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -2868,6 +2872,10 @@
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -3020,7 +3028,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -3884,7 +3892,7 @@ Přesto použít nastavení?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -3951,7 +3959,7 @@ Přesto použít nastavení?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -4078,7 +4086,7 @@ Přesto použít nastavení?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -4217,7 +4225,7 @@ Přesto použít nastavení?</translation>
     </message>
     <message>
         <source>Preview</source>
-        <translation>Náhled</translation>
+        <translation type="unfinished">Náhled</translation>
     </message>
     <message>
         <source>Input</source>
@@ -4233,11 +4241,11 @@ Přesto použít nastavení?</translation>
     </message>
     <message>
         <source>Full name:</source>
-        <translation>Plný název:</translation>
+        <translation type="unfinished">Plný název:</translation>
     </message>
     <message>
         <source>Description:</source>
-        <translation>Popis:</translation>
+        <translation type="unfinished">Popis:</translation>
     </message>
     <message>
         <source>Ready</source>
@@ -4245,20 +4253,50 @@ Přesto použít nastavení?</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation>Název</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Název</translation>
     </message>
     <message>
         <source>Value</source>
-        <translation>Hodnota</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Hodnota</translation>
+    </message>
+    <message>
+        <source>Full name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Plný název</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Popis</translation>
     </message>
     <message>
         <source>Base value</source>
-        <translation>Základní hodnota</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Základní hodnota</translation>
+    </message>
+    <message>
+        <source>Shift (%1):</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Skip</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Název</translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished">Hodnota</translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <translation type="unfinished">Základní hodnota</translation>
+    </message>
     <message>
         <source>Shift (%1)*:</source>
         <translation type="unfinished"></translation>
@@ -4279,36 +4317,6 @@ Přesto použít nastavení?</translation>
         <source>Please, select unique number for each column</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Name</source>
-        <comment>measurement column</comment>
-        <translation>Název</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <comment>measurement column</comment>
-        <translation>Hodnota</translation>
-    </message>
-    <message>
-        <source>Full name</source>
-        <comment>measurement column</comment>
-        <translation>Plný název</translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <comment>measurement column</comment>
-        <translation>Popis</translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <comment>measurement column</comment>
-        <translation>Základní hodnota</translation>
-    </message>
-    <message>
-        <source>Shift (%1):</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DialogMove</name>
@@ -4402,11 +4410,7 @@ Přesto použít nastavení?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -4424,6 +4428,10 @@ Přesto použít nastavení?</translation>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -4663,7 +4671,7 @@ Přesto použít nastavení?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -4859,6 +4867,10 @@ Přesto použít nastavení?</translation>
         <source>Show measurements file</source>
         <translation type="vanished">Ukázat soubor s mírami</translation>
     </message>
+    <message>
+        <source>From multisize measurements</source>
+        <translation type="vanished">Z vícevelikostních rozměrů</translation>
+    </message>
     <message>
         <source>Pattern</source>
         <translation>Střih</translation>
@@ -4867,10 +4879,66 @@ Přesto použít nastavení?</translation>
         <source>For technical notes</source>
         <translation>Technické poznámky</translation>
     </message>
+    <message>
+        <source>Label data</source>
+        <translation type="vanished">Data popisu</translation>
+    </message>
+    <message>
+        <source>Label template:</source>
+        <translation type="vanished">Předloha popisu:</translation>
+    </message>
+    <message>
+        <source>Edit pattern label</source>
+        <translation type="vanished">Upravit popis střihu</translation>
+    </message>
+    <message>
+        <source>Edit template</source>
+        <translation type="vanished">Upravit předlohu</translation>
+    </message>
+    <message>
+        <source>Date format:</source>
+        <translation type="vanished">Formát data:</translation>
+    </message>
+    <message>
+        <source>Time format:</source>
+        <translation type="vanished">Formát času:</translation>
+    </message>
+    <message>
+        <source>Save label data.</source>
+        <translation type="vanished">Uložit data popisu.</translation>
+    </message>
+    <message>
+        <source>Label data were changed. Do you want to save them before editing label template?</source>
+        <translation type="vanished">Popisy byly změněny. Chcete je uložit, předtím než upravíte předlohu popisu?</translation>
+    </message>
+    <message>
+        <source>Materials</source>
+        <translation type="vanished">Materiály</translation>
+    </message>
+    <message>
+        <source>Pattern materials:</source>
+        <translation type="vanished">Materiály střihu:</translation>
+    </message>
+    <message>
+        <source>Manage list of pattern materials</source>
+        <translation type="vanished">Spravovat seznam materiálů střihů</translation>
+    </message>
+    <message>
+        <source>Manage</source>
+        <translation type="vanished">Spravovat</translation>
+    </message>
+    <message>
+        <source>The customer name from individual measurements</source>
+        <translation type="vanished">Jméno zákazníka jednotlivých rozměrů</translation>
+    </message>
     <message>
         <source>Label language:</source>
         <translation>Jazyk popisu:</translation>
     </message>
+    <message>
+        <source>yyyy-MM-dd</source>
+        <translation type="obsolete">rrrr mm dd</translation>
+    </message>
     <message>
         <source>Passmark length:</source>
         <translation type="unfinished"></translation>
@@ -5572,7 +5640,7 @@ Přesto použít nastavení?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5671,7 +5739,7 @@ Přesto použít nastavení?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5766,7 +5834,7 @@ Přesto použít nastavení?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5825,7 +5893,7 @@ Přesto použít nastavení?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5892,7 +5960,7 @@ Přesto použít nastavení?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6007,7 +6075,7 @@ Přesto použít nastavení?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6054,7 +6122,7 @@ Přesto použít nastavení?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6104,6 +6172,29 @@ Přesto použít nastavení?</translation>
         </translation>
     </message>
 </context>
+<context>
+    <name>DialogPuzzlePreferences</name>
+    <message>
+        <source>Puzzle preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished">Nastavení</translation>
+    </message>
+    <message>
+        <source>Paths</source>
+        <translation type="unfinished">Cesty</translation>
+    </message>
+    <message numerus="yes">
+        <source>Followed %n option(s) require restart to take effect: %1.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+</context>
 <context>
     <name>DialogRestrictDimension</name>
     <message>
@@ -6128,7 +6219,7 @@ Přesto použít nastavení?</translation>
     </message>
     <message>
         <source>Exclude</source>
-        <translation>Vyloučit</translation>
+        <translation type="unfinished">Vyloučit</translation>
     </message>
     <message>
         <source>Include</source>
@@ -6215,11 +6306,7 @@ Přesto použít nastavení?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Alias</source>
@@ -6237,6 +6324,10 @@ Přesto použít nastavení?</translation>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -6479,6 +6570,10 @@ Přesto použít nastavení?</translation>
         <source>Numerical control</source>
         <translation>Číslicové ovládání</translation>
     </message>
+    <message>
+        <source>Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogSeamAllowance</name>
@@ -6708,7 +6803,7 @@ Přesto použít nastavení?</translation>
     </message>
     <message>
         <source>The customer name from individual measurements</source>
-        <translation>Jméno zákazníka jednotlivých rozměrů</translation>
+        <translation type="unfinished">Jméno zákazníka jednotlivých rozměrů</translation>
     </message>
     <message>
         <source>The customer email from individual measurements</source>
@@ -6720,11 +6815,11 @@ Přesto použít nastavení?</translation>
     </message>
     <message>
         <source>Save label data.</source>
-        <translation>Uložit data popisu.</translation>
+        <translation type="unfinished">Uložit data popisu.</translation>
     </message>
     <message>
         <source>Label data were changed. Do you want to save them before editing label template?</source>
-        <translation>Popisy byly změněny. Chcete je uložit, předtím než upravíte předlohu popisu?</translation>
+        <translation type="unfinished">Popisy byly změněny. Chcete je uložit, předtím než upravíte předlohu popisu?</translation>
     </message>
 </context>
 <context>
@@ -6737,6 +6832,11 @@ Přesto použít nastavení?</translation>
         <source>Use full circumference</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Height</source>
+        <comment>dimension</comment>
+        <translation type="unfinished">Výška</translation>
+    </message>
     <message>
         <source>Min value:</source>
         <translation type="unfinished"></translation>
@@ -6769,10 +6869,25 @@ Přesto použít nastavení?</translation>
         <source>The base value for the column</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <comment>dimension</comment>
+        <translation type="unfinished">Velikost</translation>
+    </message>
     <message>
         <source>Circumference</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Waist</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hip</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Please, provide correct data for dimensions</source>
         <translation type="unfinished"></translation>
@@ -6789,26 +6904,6 @@ Přesto použít nastavení?</translation>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Height</source>
-        <comment>dimension</comment>
-        <translation>Výška</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <comment>dimension</comment>
-        <translation>Velikost</translation>
-    </message>
-    <message>
-        <source>Waist</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hip</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DialogShoulderPoint</name>
@@ -6918,7 +7013,7 @@ Přesto použít nastavení?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6961,7 +7056,7 @@ Přesto použít nastavení?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -7108,16 +7203,16 @@ Přesto použít nastavení?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogSplinePath</name>
@@ -7267,16 +7362,16 @@ Přesto použít nastavení?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogTapePreferences</name>
@@ -7460,7 +7555,7 @@ Přesto použít nastavení?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -7571,7 +7666,7 @@ Přesto použít nastavení?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Nástroj</translation>
+        <translation type="unfinished">Nástroj</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -8310,7 +8405,7 @@ Chcete uložit své změny?</translation>
     </message>
     <message>
         <source>This file already opened in another window.</source>
-        <translation>Tento soubor je již otevřen v jiném okně.</translation>
+        <translation type="vanished">Tento soubor je již otevřen v jiném okně.</translation>
     </message>
     <message>
         <source>Wrong units.</source>
@@ -8763,27 +8858,27 @@ Chcete uložit své změny?</translation>
     </message>
     <message>
         <source>Locking file</source>
-        <translation>Uzamyká se soubor</translation>
+        <translation type="vanished">Uzamyká se soubor</translation>
     </message>
     <message>
         <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Tento soubor je již otevřen v jiném okně. Nevšímejte si této zprávy, pokud chcete pokračovat (nedoporučuje se, může vést k poškození dat).</translation>
+        <translation type="vanished">Tento soubor je již otevřen v jiném okně. Nevšímejte si této zprávy, pokud chcete pokračovat (nedoporučuje se, může vést k poškození dat).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Soubor se zámkem se nepodařilo vytvořit kvůli nedostatku oprávnění. Nevšímejte si této zprávy, pokud chcete pokračovat (nedoporučuje se, může vést k poškození dat).</translation>
+        <translation type="vanished">Soubor se zámkem se nepodařilo vytvořit kvůli nedostatku oprávnění. Nevšímejte si této zprávy, pokud chcete pokračovat (nedoporučuje se, může vést k poškození dat).</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Vyskytla se neznámá chyba. Například plný disk zabránil tomu, aby byl soubor se zámkem zapsán. Nevšímejte si této zprávy, pokud chcete pokračovat (nedoporučuje se, může vést k poškození dat).</translation>
+        <translation type="vanished">Vyskytla se neznámá chyba. Například plný disk zabránil tomu, aby byl soubor se zámkem zapsán. Nevšímejte si této zprávy, pokud chcete pokračovat (nedoporučuje se, může vést k poškození dat).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions.</source>
-        <translation>Soubor se zámkem se nepodařilo vytvořit kvůli nedostatku oprávnění.</translation>
+        <translation type="vanished">Soubor se zámkem se nepodařilo vytvořit kvůli nedostatku oprávnění.</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation>Vyskytla se neznámá chyba. Například plný disk zabránil tomu, aby byl soubor se zámkem zapsán.</translation>
+        <translation type="vanished">Vyskytla se neznámá chyba. Například plný disk zabránil tomu, aby byl soubor se zámkem zapsán.</translation>
     </message>
     <message>
         <source>Report Bug...</source>
@@ -8943,15 +9038,15 @@ Chcete uložit své změny?</translation>
     </message>
     <message>
         <source>The document has no write permissions.</source>
-        <translation>Dokument nemá žádná oprávnění k zápisu.</translation>
+        <translation type="vanished">Dokument nemá žádná oprávnění k zápisu.</translation>
     </message>
     <message>
         <source>Cannot set permissions for %1 to writable.</source>
-        <translation>Nelze nastavit oprávnění pro %1 na zapisovatelný.</translation>
+        <translation type="vanished">Nelze nastavit oprávnění pro %1 na zapisovatelný.</translation>
     </message>
     <message>
         <source>Could not save the file.</source>
-        <translation>Nepodařilo se uložit soubor.</translation>
+        <translation type="vanished">Nepodařilo se uložit soubor.</translation>
     </message>
     <message>
         <source>Could not save the file</source>
@@ -9097,6 +9192,14 @@ Chcete uložit své změny?</translation>
         <source>Can&apos;t export details.</source>
         <translation>Nelze vyvést jednotlivosti (díly střihu).</translation>
     </message>
+    <message>
+        <source>Couldn&apos;t set size. Need a file with multisize measurements.</source>
+        <translation type="vanished">Nepodařilo se stanovit velikost. Soubor musí mít vícevelikostní rozměry.</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t set height. Need a file with multisize measurements.</source>
+        <translation type="vanished">Nepodařilo se stanovit výšku. Soubor musí mít vícevelikostní rozměry.</translation>
+    </message>
     <message>
         <source>Label template editor</source>
         <translation>Editor předlohy popisu</translation>
@@ -9337,9 +9440,49 @@ Chcete uložit své změny?</translation>
         <source>Watermark files</source>
         <translation>Soubory vodoznaku</translation>
     </message>
+    <message>
+        <source>Manual Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open the Puzzle app</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished">Aktualizovat</translation>
+    </message>
+    <message>
+        <source>Update manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Do you want to change the premissions?</source>
-        <translation>Chcete změnit oprávnění?</translation>
+        <translation type="obsolete">Chcete změnit oprávnění?</translation>
+    </message>
+    <message>
+        <source>Unable to prepare raw layout data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select manual layout</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not supported dimension A value &apos;%1&apos; for this pattern file.</source>
@@ -9536,6 +9679,14 @@ Chcete uložit své změny?</translation>
         <source>Measurement file contains invalid known measurement(s).</source>
         <translation>Soubor s rozměry obsahuje neplatný(é) rozměr(y).</translation>
     </message>
+    <message>
+        <source>Wrong units.</source>
+        <translation type="vanished">Nesprávné jednotky.</translation>
+    </message>
+    <message>
+        <source>Application doesn&apos;t support multisize table with inches.</source>
+        <translation type="vanished">Program nepodporuje vícevelikostní tabulku s palci.</translation>
+    </message>
     <message>
         <source>File error.</source>
         <translation>Chyba souboru.</translation>
@@ -9556,10 +9707,30 @@ Chcete uložit své změny?</translation>
         <source>Timeout.</source>
         <translation>Vypršení času.</translation>
     </message>
+    <message>
+        <source>Cannot set printer page size</source>
+        <translation type="vanished">Nelze nastavit velikost strany tiskárny</translation>
+    </message>
+    <message>
+        <source>Cannot set custom printer page size</source>
+        <translation type="vanished">Nelze nastavit vlastní velikost strany tiskárny</translation>
+    </message>
     <message>
         <source>Process has been stoped because of exception.</source>
         <translation>Postup byl kvůli výjimce zastaven.</translation>
     </message>
+    <message>
+        <source>File error.
+
+%1
+
+%2</source>
+        <translation type="vanished">Chyba souboru.
+
+%1
+
+%2</translation>
+    </message>
 </context>
 <context>
     <name>MoveDoubleLabel</name>
@@ -9960,6 +10131,10 @@ Chcete uložit své změny?</translation>
         <source>My label templates</source>
         <translation>Moje předlohy popisů</translation>
     </message>
+    <message>
+        <source>My manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PreferencesPatternPage</name>
@@ -10102,6 +10277,111 @@ Tato volba se projeví po opětovném spuštění.</translation>
         <translation>Vykreslení scény</translation>
     </message>
 </context>
+<context>
+    <name>Puzzle</name>
+    <message>
+        <source>Export options can be used with single input file only.</source>
+        <translation type="unfinished">Volby pro vyvedení lze použít jen s jedním vstupním souborem.</translation>
+    </message>
+    <message>
+        <source>Valentina&apos;s manual layout editor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The manual layout file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesConfigurationPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished">Formulář</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished">Jazyk</translation>
+    </message>
+    <message>
+        <source>GUI language:</source>
+        <translation type="unfinished">Jazyk rozhraní:</translation>
+    </message>
+    <message>
+        <source>Toolbar</source>
+        <translation type="unfinished">Nástrojový panel</translation>
+    </message>
+    <message>
+        <source>The text appears under the icon (recommended for beginners).</source>
+        <translation type="unfinished">Text se ukáže pod symbolem (doporučeno pro začátečníky).</translation>
+    </message>
+    <message>
+        <source>User Interface</source>
+        <translation type="unfinished">Uživatelské rozhraní</translation>
+    </message>
+    <message>
+        <source>Activate dark mode</source>
+        <translation type="unfinished">Zapnout tmavý vzhled</translation>
+    </message>
+    <message>
+        <source>Don&apos;t use the native file dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dark mode</source>
+        <translation type="unfinished">Tmavý vzhled</translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesPathPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished">Formulář</translation>
+    </message>
+    <message>
+        <source>Paths that Valentina uses</source>
+        <translation type="unfinished">Cesty, které používá Valentina</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished">Typ</translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished">Cesta</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished">Výchozí</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished">Upravit</translation>
+    </message>
+    <message>
+        <source>Open Directory</source>
+        <translation type="unfinished">Otevřít adresář</translation>
+    </message>
+    <message>
+        <source>My Individual Measurements</source>
+        <translation type="unfinished">Moje individuální rozměry</translation>
+    </message>
+    <message>
+        <source>My Multisize Measurements</source>
+        <translation type="unfinished">Moje vícevelikostní rozměry</translation>
+    </message>
+    <message>
+        <source>My Patterns</source>
+        <translation type="unfinished">Moje střihy</translation>
+    </message>
+    <message>
+        <source>My Templates</source>
+        <translation type="unfinished">Moje předlohy</translation>
+    </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished">Moje rozvržení</translation>
+    </message>
+</context>
 <context>
     <name>QApplication</name>
     <message>
@@ -10447,6 +10727,10 @@ Tato volba se projeví po opětovném spuštění.</translation>
         <source>Can&apos;t convert toInt parameter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Piece name &apos;%1&apos; is not unique.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Could not find the segment start.</source>
         <translation type="unfinished"></translation>
@@ -10463,6 +10747,10 @@ Tato volba se projeví po opětovném spuštění.</translation>
         <source>Error calculating segment for curve &apos;%1&apos;. %2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot prepare builtin passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
@@ -10479,18 +10767,14 @@ Tato volba se projeví po opětovném spuštění.</translation>
         <source>Cannot prepare passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Piece name &apos;%1&apos; is not unique.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Cannot get tokens from formula &apos;%1&apos;. Formula error: %2.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>No data for the height dimension.</source>
         <translation type="unfinished"></translation>
@@ -10512,11 +10796,15 @@ Tato volba se projeví po opětovném spuštění.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
+        <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
+        <source>Unplaced pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet 1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -11112,7 +11400,7 @@ Tato volba se projeví po opětovném spuštění.</translation>
     </message>
     <message>
         <source>untitled</source>
-        <translation type="vanished">bez názvu</translation>
+        <translation>bez názvu</translation>
     </message>
     <message>
         <source>&lt;Empty&gt;</source>
@@ -11349,27 +11637,27 @@ Chcete uložit změny?</translation>
     </message>
     <message>
         <source>Locking file</source>
-        <translation>Uzamyká se soubor</translation>
+        <translation type="vanished">Uzamyká se soubor</translation>
     </message>
     <message>
         <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Tento soubor je již otevřen v jiném okně. Nevšímejte si této zprávy, pokud chcete pokračovat (nedoporučuje se, může vést k poškození dat).</translation>
+        <translation type="vanished">Tento soubor je již otevřen v jiném okně. Nevšímejte si této zprávy, pokud chcete pokračovat (nedoporučuje se, může vést k poškození dat).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Soubor se zámkem se nepodařilo vytvořit kvůli nedostatku oprávnění. Nevšímejte si této zprávy, pokud chcete pokračovat (nedoporučuje se, může vést k poškození dat).</translation>
+        <translation type="vanished">Soubor se zámkem se nepodařilo vytvořit kvůli nedostatku oprávnění. Nevšímejte si této zprávy, pokud chcete pokračovat (nedoporučuje se, může vést k poškození dat).</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Vyskytla se neznámá chyba. Například plný disk zabránil tomu, aby byl soubor se zámkem zapsán. Nevšímejte si této zprávy, pokud chcete pokračovat (nedoporučuje se, může vést k poškození dat).</translation>
+        <translation type="vanished">Vyskytla se neznámá chyba. Například plný disk zabránil tomu, aby byl soubor se zámkem zapsán. Nevšímejte si této zprávy, pokud chcete pokračovat (nedoporučuje se, může vést k poškození dat).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions.</source>
-        <translation>Soubor se zámkem se nepodařilo vytvořit kvůli nedostatku oprávnění.</translation>
+        <translation type="vanished">Soubor se zámkem se nepodařilo vytvořit kvůli nedostatku oprávnění.</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation>Vyskytla se neznámá chyba. Například plný disk zabránil tomu, aby byl soubor se zámkem zapsán.</translation>
+        <translation type="vanished">Vyskytla se neznámá chyba. Například plný disk zabránil tomu, aby byl soubor se zámkem zapsán.</translation>
     </message>
     <message>
         <source>Export to CSV</source>
@@ -11417,15 +11705,15 @@ Chcete uložit změny?</translation>
     </message>
     <message>
         <source>The measurements document has no write permissions.</source>
-        <translation>Dokument s rozměry nemá žádná oprávnění k zápisu.</translation>
+        <translation type="vanished">Dokument s rozměry nemá žádná oprávnění k zápisu.</translation>
     </message>
     <message>
         <source>Cannot set permissions for %1 to writable.</source>
-        <translation>Nelze nastavit oprávnění pro %1 na zapisovatelný.</translation>
+        <translation type="vanished">Nelze nastavit oprávnění pro %1 na zapisovatelný.</translation>
     </message>
     <message>
         <source>Could not save the file.</source>
-        <translation>Nepodařilo se uložit soubor.</translation>
+        <translation type="vanished">Nepodařilo se uložit soubor.</translation>
     </message>
     <message>
         <source>Could not save the file</source>
@@ -11499,6 +11787,18 @@ Chcete uložit změny?</translation>
         <source>Multisize measurements require at least 4 columns.</source>
         <translation>Vícevelikostní rozměry vyžadují alespoň 4 sloupce.</translation>
     </message>
+    <message>
+        <source>Cannot convert base size value to double in column 2.</source>
+        <translation type="vanished">Nelze převést hodnotu základní velikosti na dvojnásobek ve sloupci 2.</translation>
+    </message>
+    <message>
+        <source>Cannot convert height increase value to double in column 3.</source>
+        <translation type="vanished">Nelze převést hodnotu zvětšení velikosti na dvojnásobek ve sloupci 2.</translation>
+    </message>
+    <message>
+        <source>Cannot convert size increase value to double in column 4.</source>
+        <translation type="vanished">Nelze převést hodnotu zvětšení velikosti na dvojnásobek ve sloupci 4.</translation>
+    </message>
     <message>
         <source>Imported file must not contain the same name twice.</source>
         <translation>Zavedený soubor nesmí obsahovat stejný název dvakrát.</translation>
@@ -11557,15 +11857,53 @@ Chcete uložit změny?</translation>
     </message>
     <message>
         <source>Do you want to change the premissions?</source>
-        <translation>Chcete změnit oprávnění?</translation>
+        <translation type="vanished">Chcete změnit oprávnění?</translation>
     </message>
     <message>
         <source>Cannot read settings from a malformed .INI file.</source>
         <translation>Nelze číst nastavení z poškozeného souboru .INI.</translation>
     </message>
+    <message>
+        <source>Height (%1):</source>
+        <translation type="vanished">Výška (%1):</translation>
+    </message>
+    <message>
+        <source>Size (%1):</source>
+        <translation type="vanished">Velikost (%1):</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Název</translation>
+    </message>
+    <message>
+        <source>Full name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Plný název</translation>
+    </message>
+    <message>
+        <source>Calculated value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Vypočítaná hodnota</translation>
+    </message>
+    <message>
+        <source>Formula</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Vzorec</translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Základní hodnota</translation>
+    </message>
+    <message>
+        <source>Correction</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Units:</source>
-        <translation>Jednotky:</translation>
+        <translation type="unfinished">Jednotky:</translation>
     </message>
     <message>
         <source>Shift B</source>
@@ -11665,46 +12003,16 @@ Chcete uložit změny?</translation>
     </message>
     <message>
         <source>Inches</source>
-        <translation>Palce</translation>
+        <translation type="unfinished">Palce</translation>
     </message>
     <message>
         <source>Centimeters</source>
-        <translation>Centimetry</translation>
+        <translation type="unfinished">Centimetry</translation>
     </message>
     <message>
         <source>Degrees</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Name</source>
-        <comment>measurement column</comment>
-        <translation>Název</translation>
-    </message>
-    <message>
-        <source>Full name</source>
-        <comment>measurement column</comment>
-        <translation>Plný název</translation>
-    </message>
-    <message>
-        <source>Calculated value</source>
-        <comment>measurement column</comment>
-        <translation>Vypočítaná hodnota</translation>
-    </message>
-    <message>
-        <source>Formula</source>
-        <comment>measurement column</comment>
-        <translation>Vzorec</translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <comment>measurement column</comment>
-        <translation>Základní hodnota</translation>
-    </message>
-    <message>
-        <source>Correction</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Restrict first dimension</source>
         <translation type="unfinished"></translation>
@@ -11783,6 +12091,10 @@ Chcete uložit změny?</translation>
         <source>Labels</source>
         <translation>Popisy</translation>
     </message>
+    <message>
+        <source>Detail label visible</source>
+        <translation type="vanished">Popis jednotlivosti (dílu střihu) viditelný</translation>
+    </message>
     <message>
         <source>Width:</source>
         <translation>Šířka:</translation>
@@ -11889,31 +12201,31 @@ Chcete uložit změny?</translation>
     </message>
     <message>
         <source>Edit pattern label</source>
-        <translation>Upravit popis střihu</translation>
+        <translation type="unfinished">Upravit popis střihu</translation>
     </message>
     <message>
         <source>Pattern name:</source>
-        <translation>Název střihu:</translation>
+        <translation type="unfinished">Název střihu:</translation>
     </message>
     <message>
         <source>Pattern number:</source>
-        <translation>Číslo střihu:</translation>
+        <translation type="unfinished">Číslo střihu:</translation>
     </message>
     <message>
         <source>Company/Designer name:</source>
-        <translation>Jméno společnosti/návrháře:</translation>
+        <translation type="unfinished">Jméno společnosti/návrháře:</translation>
     </message>
     <message>
         <source>Customer name:</source>
-        <translation>Jméno zákazníka:</translation>
+        <translation type="unfinished">Jméno zákazníka:</translation>
     </message>
     <message>
         <source>Date format:</source>
-        <translation>Formát data:</translation>
+        <translation type="unfinished">Formát data:</translation>
     </message>
     <message>
         <source>Time format:</source>
-        <translation>Formát času:</translation>
+        <translation type="unfinished">Formát času:</translation>
     </message>
     <message>
         <source>Customer birth date:</source>
@@ -11921,7 +12233,7 @@ Chcete uložit změny?</translation>
     </message>
     <message>
         <source>yyyy-MM-dd</source>
-        <translation>rrrr mm dd</translation>
+        <translation type="unfinished">rrrr mm dd</translation>
     </message>
     <message>
         <source>Customer email:</source>
@@ -11929,19 +12241,19 @@ Chcete uložit změny?</translation>
     </message>
     <message>
         <source>Materials</source>
-        <translation>Materiály</translation>
+        <translation type="unfinished">Materiály</translation>
     </message>
     <message>
         <source>Pattern materials:</source>
-        <translation>Materiály střihu:</translation>
+        <translation type="unfinished">Materiály střihu:</translation>
     </message>
     <message>
         <source>Manage list of pattern materials</source>
-        <translation>Spravovat seznam materiálů střihů</translation>
+        <translation type="unfinished">Spravovat seznam materiálů střihů</translation>
     </message>
     <message>
         <source>Manage</source>
-        <translation>Spravovat</translation>
+        <translation type="unfinished">Spravovat</translation>
     </message>
     <message>
         <source>Piece label visible</source>
@@ -12034,6 +12346,10 @@ Chcete uložit změny?</translation>
         <source>Intersection 2 (only right)</source>
         <translation>Průsečík 2 (pouze pravý)</translation>
     </message>
+    <message>
+        <source>Acute angle that looks intside of piece</source>
+        <translation type="vanished">Ostrý úhel, který vypadá, že je uvnitř střihu</translation>
+    </message>
     <message>
         <source>Acute angle that looks outside of piece</source>
         <translation>Ostrý úhel, který vypadá, že je vně střihu</translation>
@@ -12080,7 +12396,7 @@ Chcete uložit změny?</translation>
     </message>
     <message>
         <source>Acute angle that looks inside of piece</source>
-        <translation>Ostrý úhel, který vypadá, že je uvnitř dílu</translation>
+        <translation type="unfinished">Ostrý úhel, který vypadá, že je uvnitř dílu</translation>
     </message>
 </context>
 <context>
@@ -12243,6 +12559,18 @@ Chcete uložit změny?</translation>
         <comment>seam allowance</comment>
         <translation>Vlastní</translation>
     </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Universally Unique IDentifier of piece. Used to identifier piece while updating manual layout. Left empty to generate new value.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TabPlaceLabels</name>
@@ -12418,6 +12746,18 @@ Chcete uložit změny?</translation>
         <source>The text appears under the icon (recommended for beginners).</source>
         <translation>Text se ukáže pod symbolem (doporučeno pro začátečníky).</translation>
     </message>
+    <message>
+        <source>Default height and size</source>
+        <translation type="vanished">Výchozí výška a velikost</translation>
+    </message>
+    <message>
+        <source>Default height:</source>
+        <translation type="vanished">Výchozí výška:</translation>
+    </message>
+    <message>
+        <source>Default size:</source>
+        <translation type="vanished">Výchozí velikost:</translation>
+    </message>
     <message>
         <source>With OS options</source>
         <translation>S volbami OS</translation>
@@ -12481,6 +12821,10 @@ Chcete uložit změny?</translation>
         <source>My Patterns</source>
         <translation>Moje střihy</translation>
     </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished">Moje rozvržení</translation>
+    </message>
 </context>
 <context>
     <name>ToggleDetailInLayout</name>
@@ -12532,19 +12876,15 @@ Chcete uložit změny?</translation>
         <source>Base value invalid</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Size</source>
-        <translation>Velikost</translation>
-    </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Výška</translation>
+        <translation type="unfinished">Výška</translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Velikost</translation>
+        <translation type="unfinished">Velikost</translation>
     </message>
     <message>
         <source>Waist</source>
@@ -12566,6 +12906,10 @@ Chcete uložit změny?</translation>
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished">Velikost</translation>
+    </message>
     <message>
         <source>Chest circumference</source>
         <comment>dimension</comment>
@@ -12749,7 +13093,7 @@ Chcete uložit změny?</translation>
     <name>VAbstractMainWindow</name>
     <message>
         <source>Confirm format rewriting</source>
-        <translation>Potvrdit přepsání formátu</translation>
+        <translation type="unfinished">Potvrdit přepsání formátu</translation>
     </message>
     <message>
         <source>This file is using previous format version v%1. The current is v%2. Saving the file with this app version will update the format version for this file. This may prevent you from be able to open the file with older app versions. Do you really want to continue?</source>
@@ -12757,7 +13101,7 @@ Chcete uložit změny?</translation>
     </message>
     <message>
         <source>Comma-Separated Values</source>
-        <translation>Čárkou oddělené hodnoty</translation>
+        <translation type="unfinished">Čárkou oddělené hodnoty</translation>
     </message>
     <message>
         <source>values</source>
@@ -12765,7 +13109,51 @@ Chcete uložit změny?</translation>
     </message>
     <message>
         <source>Export to CSV</source>
-        <translation>Vyvést do CSV</translation>
+        <translation type="unfinished">Vyvést do CSV</translation>
+    </message>
+    <message>
+        <source>The measurements document has no write permissions.</source>
+        <translation type="unfinished">Dokument s rozměry nemá žádná oprávnění k zápisu.</translation>
+    </message>
+    <message>
+        <source>Do you want to change the premissions?</source>
+        <translation type="unfinished">Chcete změnit oprávnění?</translation>
+    </message>
+    <message>
+        <source>Cannot set permissions for %1 to writable.</source>
+        <translation type="unfinished">Nelze nastavit oprávnění pro %1 na zapisovatelný.</translation>
+    </message>
+    <message>
+        <source>Could not save the file.</source>
+        <translation type="unfinished">Nepodařilo se uložit soubor.</translation>
+    </message>
+    <message>
+        <source>Locking file</source>
+        <translation type="unfinished">Uzamyká se soubor</translation>
+    </message>
+    <message>
+        <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished">Tento soubor je již otevřen v jiném okně. Nevšímejte si této zprávy, pokud chcete pokračovat (nedoporučuje se, může vést k poškození dat).</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished">Soubor se zámkem se nepodařilo vytvořit kvůli nedostatku oprávnění. Nevšímejte si této zprávy, pokud chcete pokračovat (nedoporučuje se, může vést k poškození dat).</translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished">Vyskytla se neznámá chyba. Například plný disk zabránil tomu, aby byl soubor se zámkem zapsán. Nevšímejte si této zprávy, pokud chcete pokračovat (nedoporučuje se, může vést k poškození dat).</translation>
+    </message>
+    <message>
+        <source>This file already opened in another window.</source>
+        <translation type="unfinished">Tento soubor je již otevřen v jiném okně.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions.</source>
+        <translation type="unfinished">Soubor se zámkem se nepodařilo vytvořit kvůli nedostatku oprávnění.</translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
+        <translation type="unfinished">Vyskytla se neznámá chyba. Například plný disk zabránil tomu, aby byl soubor se zámkem zapsán.</translation>
     </message>
 </context>
 <context>
@@ -12995,7 +13383,7 @@ Chcete uložit změny?</translation>
     <name>VComboBoxDelegate</name>
     <message>
         <source>Select material</source>
-        <translation>Vybrat materiál</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -13424,6 +13812,14 @@ Chcete uložit změny?</translation>
         <source>Page measure units (export mode). Valid values: %1.</source>
         <translation>Jednotky pro měření strany (režim vyvedení). Platné hodnoty: %1.</translation>
     </message>
+    <message>
+        <source>Set size value for pattern file, that was opened with multisize measurements (export mode). Valid values: %1cm.</source>
+        <translation type="vanished">Nastavit hodnotu velikosti pro soubor se střihem, který byl otevřen s vícevelikostními rozměry (režim vyvedení). Platné hodnoty: %1 cm.</translation>
+    </message>
+    <message>
+        <source>Set height value for pattern file, that was opened with multisize measurements (export mode). Valid values: %1cm.</source>
+        <translation type="vanished">Nastavit hodnotu výšky pro soubor se střihem, který byl otevřen s vícevelikostními rozměry (režim vyvedení). Platné hodnoty: %1 cm.</translation>
+    </message>
     <message>
         <source>Use this option to override user material defined in pattern. The value must be in form &lt;number&gt;@&lt;user matrial name&gt;. The number should be in range from 1 to %1. For example, 1@Fabric2. The key can be used multiple times. Has no effect in GUI mode.</source>
         <translation>Tuto volbu použijte na zrušení uživatelského materiálu stanoveného ve střihu. Hodnota musí být ve tvaru &lt;číslo&gt;@&lt;název uživatelského materiálu&gt;. Číslo má být v rozsahu od 1 po %1. Například, 1@Fabric2. Klíč lze použít vícekrát. Nemúčinkuje v režimu grafického uživatelského rozhraní.</translation>
@@ -13548,6 +13944,34 @@ Chcete uložit změny?</translation>
         <source>The dimension C base</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>The filename of exported layout file. Use it to enable console export mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The filename of layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pattern pieces form the raw layout data file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The raw layout data file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to output format (default = 0, export mode): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to tiled pdf page template (default = 0, export mode with tiled pdf format): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run the program in a test mode. The program in this mode loads a single layout file and silently quit without showing the main window. The key have priority before key &apos;%1&apos;.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VCommonSettings</name>
@@ -13575,6 +13999,10 @@ Chcete uložit změny?</translation>
         <source>patterns</source>
         <translation>Vzory</translation>
     </message>
+    <message>
+        <source>manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VContainer</name>
@@ -13822,25 +14250,29 @@ Chcete uložit změny?</translation>
 </context>
 <context>
     <name>VLayoutExporter</name>
+    <message>
+        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot set printer page size</source>
-        <translation>Nelze nastavit velikost strany tiskárny</translation>
+        <translation type="unfinished">Nelze nastavit velikost strany tiskárny</translation>
     </message>
     <message>
         <source>Cannot set printer margins</source>
-        <translation>Nelze nastavit okraje tiskárny</translation>
+        <translation type="unfinished">Nelze nastavit okraje tiskárny</translation>
     </message>
     <message>
         <source>Can&apos;t open file &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Creating file &apos;%1&apos; failed! %2</source>
-        <translation>Vytvoření souboru &apos;%1&apos; se nezdařilo! %2</translation>
+        <source>Export raw layout data failed. %1.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
-        <translation type="unfinished"></translation>
+        <source>Creating file &apos;%1&apos; failed! %2</source>
+        <translation type="unfinished">Vytvoření souboru &apos;%1&apos; se nezdařilo! %2</translation>
     </message>
     <message>
         <source>Can&apos;t create an flat dxf file.</source>
@@ -13874,15 +14306,15 @@ Chcete uložit změny?</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>Žádný</translation>
+        <translation type="unfinished">Žádný</translation>
     </message>
     <message>
         <source>Height</source>
-        <translation>Výška</translation>
+        <translation type="unfinished">Výška</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Velikost</translation>
+        <translation type="unfinished">Velikost</translation>
     </message>
     <message>
         <source>Hip</source>
@@ -14028,6 +14460,114 @@ Chcete uložit změny?</translation>
         <translation>Značka okénko</translation>
     </message>
 </context>
+<context>
+    <name>VPApplication</name>
+    <message>
+        <source>Error parsing file. Program will be terminated.</source>
+        <translation type="unfinished">Chyba při zpracování souboru. Program bude ukončen.</translation>
+    </message>
+    <message>
+        <source>Error bad id. Program will be terminated.</source>
+        <translation type="unfinished">Chyba. Špatný identifikátor. Program bude ukončen.</translation>
+    </message>
+    <message>
+        <source>Error can&apos;t convert value. Program will be terminated.</source>
+        <translation type="unfinished">Chyba. Nelze převést hodnotu. Program bude ukončen.</translation>
+    </message>
+    <message>
+        <source>Error empty parameter. Program will be terminated.</source>
+        <translation type="unfinished">Chyba. Prázdný parametr. Program bude ukončen.</translation>
+    </message>
+    <message>
+        <source>Error wrong id. Program will be terminated.</source>
+        <translation type="unfinished">Chyba. Špatný identifikátor. Program bude ukončen.</translation>
+    </message>
+    <message>
+        <source>Something&apos;s wrong!!</source>
+        <translation type="unfinished">Něco je špatně!</translation>
+    </message>
+    <message>
+        <source>Exception thrown: %1. Program will be terminated.</source>
+        <translation type="unfinished">Způsobena chyba: %1. Program bude ukončen.</translation>
+    </message>
+    <message>
+        <source>Can&apos;t begin to listen for incoming connections on name &apos;%1&apos;</source>
+        <translation type="unfinished">Nelze začít naslouchat příchozímu spojení &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <source>Export mode doesn&apos;t support openning several files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import raw layout data does not support openning several layout files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, provide one input file.</source>
+        <translation type="unfinished">Poskytněte, prosím, jeden vstupní soubor.</translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrousel</name>
+    <message>
+        <source>Pieces of </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrouselPieceList</name>
+    <message>
+        <source>Move to Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Smazat</translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPDialogAbout</name>
+    <message>
+        <source>About Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Puzzle version</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Build revision:</source>
+        <translation type="unfinished">Revize sestavení:</translation>
+    </message>
+    <message>
+        <source>This program is part of Valentina project.</source>
+        <translation type="unfinished">Tento program je částí projektu Valentina.</translation>
+    </message>
+    <message>
+        <source>Check For Updates</source>
+        <translation type="unfinished">Zkontrolovat aktualizace</translation>
+    </message>
+    <message>
+        <source>Cannot open your default browser</source>
+        <translation type="unfinished">Nelze otevřít váš výchozí prohlížeč</translation>
+    </message>
+    <message>
+        <source>Build revision: %1</source>
+        <translation type="unfinished">Revize sestavení: %1</translation>
+    </message>
+    <message>
+        <source>Built on %1 at %2</source>
+        <translation type="unfinished">Sestaveno %1 v %2</translation>
+    </message>
+    <message>
+        <source>Web site : %1</source>
+        <translation type="unfinished">Stránky: %1</translation>
+    </message>
+</context>
 <context>
     <name>VPE::VBoolProperty</name>
     <message>
@@ -14050,6 +14590,573 @@ Chcete uložit změny?</translation>
         <translation>Otevřít soubor</translation>
     </message>
 </context>
+<context>
+    <name>VPGraphicsPiece</name>
+    <message>
+        <source>Move to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPLayoutFileReader</name>
+    <message>
+        <source>Piece List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Got empty attribute &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPMainWindow</name>
+    <message>
+        <source>Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;Soubor</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished">&amp;Okno</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished">&amp;Nápověda</translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished">Nabídka</translation>
+    </message>
+    <message>
+        <source>Piece Carrousel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Infos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Název:</translation>
+    </message>
+    <message>
+        <source>DummyName</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UUID:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{7b2ce4ae-96f5-4905-bb34-405cb40ca208}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Geometry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mirror piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotation</source>
+        <translation type="unfinished">Otáčení</translation>
+    </message>
+    <message>
+        <source>Angle:</source>
+        <translation type="unfinished">Úhel:</translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° anti-clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Placement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Y:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No piece selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple pieces selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Width</source>
+        <translation type="unfinished">Šířka</translation>
+    </message>
+    <message>
+        <source>Length</source>
+        <translation type="unfinished">Délka</translation>
+    </message>
+    <message>
+        <source>Orientation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove unused length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Margins</source>
+        <translation type="unfinished">Okraje</translation>
+    </message>
+    <message>
+        <source>Right:</source>
+        <translation type="unfinished">Pravý:</translation>
+    </message>
+    <message>
+        <source>Top:</source>
+        <translation type="unfinished">Nahoře:</translation>
+    </message>
+    <message>
+        <source>Left:</source>
+        <translation type="unfinished">Levý:</translation>
+    </message>
+    <message>
+        <source>Bottom:</source>
+        <translation type="unfinished">Dole:</translation>
+    </message>
+    <message>
+        <source>Placement Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Row height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Control</source>
+        <translation type="unfinished">Nastavení</translation>
+    </message>
+    <message>
+        <source>Follow grainline</source>
+        <translation type="unfinished">Následovat dráhu nitě</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vertical grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Horizontal grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pieces gap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sticky edges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation type="unfinished">Vyvést</translation>
+    </message>
+    <message>
+        <source>Export Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiles properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiled Pdf Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Tiles on sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export Tiled Pdf</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation type="unfinished">Rozvržení</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Název</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Popis</translation>
+    </message>
+    <message>
+        <source>Unit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning superposition of pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning pieces out of bound</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished">Měřítko</translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation type="unfinished">&amp;Otevřít</translation>
+    </message>
+    <message>
+        <source>Ctrl+O</source>
+        <translation type="unfinished">Ctrl+O</translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Uložit</translation>
+    </message>
+    <message>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save &amp;As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Import Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation type="unfinished">&amp;Ukončit</translation>
+    </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation type="unfinished">&amp;Nový</translation>
+    </message>
+    <message>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation type="unfinished">O &amp;Qt</translation>
+    </message>
+    <message>
+        <source>About &amp;Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom in</source>
+        <translation type="unfinished">Přiblížit</translation>
+    </message>
+    <message>
+        <source>Zoom out</source>
+        <translation type="unfinished">Oddálit</translation>
+    </message>
+    <message>
+        <source>Zoom 1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom fit best</source>
+        <translation type="unfinished">Přizpůsobit velikost oknu aplikace</translation>
+    </message>
+    <message>
+        <source>Zoom sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished">Nastavení</translation>
+    </message>
+    <message>
+        <source>File &apos;%1&apos; doesn&apos;t exist!</source>
+        <translation type="unfinished">Soubor &apos;%1&apos; není!</translation>
+    </message>
+    <message>
+        <source>File error.</source>
+        <translation type="unfinished">Chyba souboru.</translation>
+    </message>
+    <message>
+        <source>Unable to read a layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fail to create layout.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not extract data from file &apos;%1&apos;. %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Centimeters</source>
+        <translation type="unfinished">Centimetry</translation>
+    </message>
+    <message>
+        <source>Millimiters</source>
+        <translation type="unfinished">Milimetry</translation>
+    </message>
+    <message>
+        <source>Inches</source>
+        <translation type="unfinished">Palce</translation>
+    </message>
+    <message>
+        <source>Scale:</source>
+        <translation type="unfinished">Měřítko:</translation>
+    </message>
+    <message>
+        <source>untitled %1.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>untitled.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read only</source>
+        <translation type="unfinished">Pouze pro čtení</translation>
+    </message>
+    <message>
+        <source>Cannot read settings from a malformed .INI file.</source>
+        <translation type="unfinished">Nelze číst nastavení z poškozeného souboru .INI.</translation>
+    </message>
+    <message>
+        <source>Cannot save settings. Access denied.</source>
+        <translation type="unfinished">Nelze uložit nastavení. Přístup odepřen.</translation>
+    </message>
+    <message>
+        <source>Failed to open file, is it writable?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New Window</source>
+        <translation type="unfinished">&amp;Nové okno</translation>
+    </message>
+    <message>
+        <source>Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open file</source>
+        <translation type="unfinished">Otevřít soubor</translation>
+    </message>
+    <message>
+        <source>Could not save the file</source>
+        <translation type="unfinished">Nepodařilo se uložit soubor</translation>
+    </message>
+    <message>
+        <source>layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save as</source>
+        <translation type="unfinished">Uložit jako</translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window.</source>
+        <translation type="unfinished">Nepodařilo se uzamknout. Tento soubor je již otevřen v jiném okně.</translation>
+    </message>
+    <message>
+        <source>Could not save file</source>
+        <translation type="unfinished">Nepodařilo se uložit soubor</translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window. Expect collissions when run 2 copies of the program.</source>
+        <translation type="unfinished">Nepodařilo se uzamknout. Tento soubor je již otevřen v jiném okně. Při zdvojeném vykonávání (dvě kopie programu) může dojít ke střetům.</translation>
+    </message>
+    <message>
+        <source>Raw Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About Qt</source>
+        <translation type="unfinished">O Qt</translation>
+    </message>
+    <message>
+        <source>PDF Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SVG Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPSheet</name>
+    <message>
+        <source>Letter</source>
+        <translation type="unfinished">Dopis</translation>
+    </message>
+    <message>
+        <source>Legal</source>
+        <translation type="unfinished">Legal</translation>
+    </message>
+    <message>
+        <source>Tabloid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 24in</source>
+        <translation type="unfinished">Role 24 palců</translation>
+    </message>
+    <message>
+        <source>Roll 30in</source>
+        <translation type="unfinished">Role 30 palců</translation>
+    </message>
+    <message>
+        <source>Roll 36in</source>
+        <translation type="unfinished">Role 36 palců</translation>
+    </message>
+    <message>
+        <source>Roll 42in</source>
+        <translation type="unfinished">Role 42 palců</translation>
+    </message>
+    <message>
+        <source>Roll 44in</source>
+        <translation type="unfinished">Role 44 palců</translation>
+    </message>
+    <message>
+        <source>Roll 48in</source>
+        <translation type="unfinished">Role 48 palců</translation>
+    </message>
+    <message>
+        <source>Roll 62in</source>
+        <translation type="unfinished">Role 62 palců</translation>
+    </message>
+    <message>
+        <source>Roll 72in</source>
+        <translation type="unfinished">Role 72 palců</translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation type="unfinished">Vlastní</translation>
+    </message>
+</context>
+<context>
+    <name>VPTileFactory</name>
+    <message>
+        <source>Grid ( %1 , %2 )</source>
+        <translation type="unfinished">Mřížka ( %1 , %2 )</translation>
+    </message>
+    <message>
+        <source>Page %1 of %2</source>
+        <translation type="unfinished">Strana %1 z %2</translation>
+    </message>
+</context>
 <context>
     <name>VPattern</name>
     <message>
@@ -14395,23 +15502,23 @@ Chcete uložit změny?</translation>
     <name>VPrintLayout</name>
     <message>
         <source>For printing multipages document all sheet should have the same size.</source>
-        <translation>Pro tisk vícestránkového dokumentu musí mít všechny listy stejnou velikost.</translation>
+        <translation type="unfinished">Pro tisk vícestránkového dokumentu musí mít všechny listy stejnou velikost.</translation>
     </message>
     <message>
         <source>For previewing multipage document all sheet should have the same size.</source>
-        <translation>Pro náhled vícestránkového dokumentu musí mít všechny listy stejnou velikost.</translation>
+        <translation type="unfinished">Pro náhled vícestránkového dokumentu musí mít všechny listy stejnou velikost.</translation>
     </message>
     <message>
         <source>Pages will be cropped because they do not fit printer paper size.</source>
-        <translation>Strany budou ořezány, protože se neshodují s velikostí papíru tiskárny.</translation>
+        <translation type="unfinished">Strany budou ořezány, protože se neshodují s velikostí papíru tiskárny.</translation>
     </message>
     <message>
         <source>Print error</source>
-        <translation>Chyba při tisku</translation>
+        <translation type="unfinished">Chyba při tisku</translation>
     </message>
     <message>
         <source>Cannot proceed because there are no available printers in your system.</source>
-        <translation>Nelze pokračovat, protože ve vašem systému nejsou dostupné žádné tiskárny.</translation>
+        <translation type="unfinished">Nelze pokračovat, protože ve vašem systému nejsou dostupné žádné tiskárny.</translation>
     </message>
     <message>
         <source>Failed to open file, is it writable?</source>
@@ -14423,15 +15530,15 @@ Chcete uložit změny?</translation>
     </message>
     <message>
         <source>Cannot set printer margins</source>
-        <translation>Nelze nastavit okraje tiskárny</translation>
+        <translation type="unfinished">Nelze nastavit okraje tiskárny</translation>
     </message>
     <message>
         <source>Cannot set custom printer page size</source>
-        <translation>Nelze nastavit vlastní velikost strany tiskárny</translation>
+        <translation type="unfinished">Nelze nastavit vlastní velikost strany tiskárny</translation>
     </message>
     <message>
         <source>Cannot set printer page size</source>
-        <translation>Nelze nastavit velikost strany tiskárny</translation>
+        <translation type="unfinished">Nelze nastavit velikost strany tiskárny</translation>
     </message>
     <message>
         <source>Cannot set printer tiled page size</source>
@@ -14447,7 +15554,7 @@ Chcete uložit změny?</translation>
 %1
 
 %2</source>
-        <translation>Chyba souboru.
+        <translation type="unfinished">Chyba souboru.
 
 %1
 
@@ -14455,18 +15562,30 @@ Chcete uložit změny?</translation>
     </message>
     <message>
         <source>The layout is stale.</source>
-        <translation>Rozvržení je zastaralé.</translation>
+        <translation type="unfinished">Rozvržení je zastaralé.</translation>
     </message>
     <message>
         <source>The layout was not updated since last pattern modification. Do you want to continue?</source>
-        <translation>Rozvržení nebylo od poslední změny střihu aktualizováno. Chcete pokračovat?</translation>
+        <translation type="unfinished">Rozvržení nebylo od poslední změny střihu aktualizováno. Chcete pokračovat?</translation>
+    </message>
+</context>
+<context>
+    <name>VRawLayout</name>
+    <message>
+        <source>VRawLayout::ReadFile() failed. Raw layout format prefix mismatch error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VRawLayout::ReadFile() failed.
+Raw layout format compatibility error: actualFileVersion = %1 and fileVersion = %2</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VSettings</name>
     <message>
         <source>layouts</source>
-        <translation>Rozvržení</translation>
+        <translation type="vanished">Rozvržení</translation>
     </message>
 </context>
 <context>
@@ -15415,7 +16534,7 @@ Chcete uložit změny?</translation>
     </message>
     <message>
         <source>Notes:</source>
-        <translation>Poznámky:</translation>
+        <translation type="unfinished">Poznámky:</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -16876,6 +17995,131 @@ Chcete uložit změny?</translation>
         <comment>Left symbol _ in the name</comment>
         <translation>Úhel2ElOblouk_</translation>
     </message>
+    <message>
+        <source>date</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">Datum</translation>
+    </message>
+    <message>
+        <source>time</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">Čas</translation>
+    </message>
+    <message>
+        <source>patternName</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">NázevStřihu</translation>
+    </message>
+    <message>
+        <source>patternNumber</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">ČísloStřihu</translation>
+    </message>
+    <message>
+        <source>author</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">Autor</translation>
+    </message>
+    <message>
+        <source>customer</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">Zákazník</translation>
+    </message>
+    <message>
+        <source>pExt</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">pExt</translation>
+    </message>
+    <message>
+        <source>pFileName</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">pNázevSouboru</translation>
+    </message>
+    <message>
+        <source>mFileName</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">mNázevSouboru</translation>
+    </message>
+    <message>
+        <source>mExt</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">mExt</translation>
+    </message>
+    <message>
+        <source>pLetter</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">pPísmeno</translation>
+    </message>
+    <message>
+        <source>pAnnotation</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">pVysvětlivka</translation>
+    </message>
+    <message>
+        <source>pOrientation</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">pNatočení</translation>
+    </message>
+    <message>
+        <source>pRotation</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">pOtočení</translation>
+    </message>
+    <message>
+        <source>pTilt</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">pSklon</translation>
+    </message>
+    <message>
+        <source>pFoldPosition</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">pPolohaZáhybu</translation>
+    </message>
+    <message>
+        <source>pName</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">pNázev</translation>
+    </message>
+    <message>
+        <source>pQuantity</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">pMnožství</translation>
+    </message>
+    <message>
+        <source>mFabric</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">pLátka</translation>
+    </message>
+    <message>
+        <source>mLining</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">pPodšívka</translation>
+    </message>
+    <message>
+        <source>mInterfacing</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">mVnitřníVýztuha</translation>
+    </message>
+    <message>
+        <source>mInterlining</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">pVnitřníPodšívka</translation>
+    </message>
+    <message>
+        <source>wCut</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">wStřih</translation>
+    </message>
+    <message>
+        <source>wOnFold</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">wVZáhybu</translation>
+    </message>
+    <message>
+        <source>userMaterial</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">UživatelskýMateriál</translation>
+    </message>
     <message>
         <source>r2cm</source>
         <comment>round to up to 1 decimal</comment>
@@ -17114,6 +18358,13 @@ Chcete uložit změny?</translation>
         <translation type="vanished">Chyba při obnově záložního souboru: %1.</translation>
     </message>
 </context>
+<context>
+    <name>VValentinaSettings</name>
+    <message>
+        <source>layouts</source>
+        <translation type="unfinished">Rozvržení</translation>
+    </message>
+</context>
 <context>
     <name>VWidgetDetails</name>
     <message>
@@ -17526,7 +18777,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Do you want to change the premissions?</source>
-        <translation>Chcete změnit oprávnění?</translation>
+        <translation type="unfinished">Chcete změnit oprávnění?</translation>
     </message>
 </context>
 <context>
diff --git a/share/translations/valentina_de_DE.ts b/share/translations/valentina_de_DE.ts
index 9648829f9..5794d6ab6 100644
--- a/share/translations/valentina_de_DE.ts
+++ b/share/translations/valentina_de_DE.ts
@@ -576,7 +576,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -707,16 +707,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogArcWithLength</name>
@@ -834,16 +834,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogBisector</name>
@@ -965,7 +965,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -1036,16 +1036,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCubicBezierPath</name>
@@ -1095,16 +1095,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCurveIntersectAxis</name>
@@ -1206,7 +1206,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -1297,11 +1297,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1311,6 +1307,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCutSpline</name>
@@ -1388,11 +1388,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1402,6 +1398,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCutSplinePath</name>
@@ -1479,11 +1479,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1493,6 +1489,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogDateTimeFormats</name>
@@ -1794,17 +1794,17 @@
         <source>Dimension labels</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Dimension:</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Value</source>
-        <translation>Wert</translation>
+        <translation type="unfinished">Wert</translation>
     </message>
     <message>
         <source>Label</source>
-        <translation>Bezeichnung</translation>
-    </message>
-    <message>
-        <source>Dimension:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Bezeichnung</translation>
     </message>
 </context>
 <context>
@@ -1958,6 +1958,14 @@
         <source>Measurments file name</source>
         <translation>Maßdateiname</translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="vanished">Größe</translation>
+    </message>
+    <message>
+        <source>Height</source>
+        <translation type="vanished">Höhe</translation>
+    </message>
     <message>
         <source>Measurments extension</source>
         <translation>Messwerterweiterung</translation>
@@ -2086,19 +2094,15 @@
         <source>Customer email</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Measurement: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Höhe</translation>
+        <translation type="unfinished">Höhe</translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Größe</translation>
+        <translation type="unfinished">Größe</translation>
     </message>
     <message>
         <source>Hip</source>
@@ -2111,23 +2115,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No data for the height dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the size dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the hip dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the waist dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Final measurement: %1</source>
+        <source>Measurement: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2150,6 +2138,26 @@
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Final measurement: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the height dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the size dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the hip dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the waist dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogEditWrongFormula</name>
@@ -2382,16 +2390,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogEndLine</name>
@@ -2497,7 +2505,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -2727,11 +2735,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -2749,6 +2753,10 @@
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -2846,11 +2854,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -2868,6 +2872,10 @@
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -3020,7 +3028,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -3883,7 +3891,7 @@ Einstellungen trotzdem anwenden?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -3950,7 +3958,7 @@ Einstellungen trotzdem anwenden?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -4077,7 +4085,7 @@ Einstellungen trotzdem anwenden?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -4216,7 +4224,7 @@ Einstellungen trotzdem anwenden?</translation>
     </message>
     <message>
         <source>Preview</source>
-        <translation>Vorschau</translation>
+        <translation type="unfinished">Vorschau</translation>
     </message>
     <message>
         <source>Input</source>
@@ -4232,11 +4240,11 @@ Einstellungen trotzdem anwenden?</translation>
     </message>
     <message>
         <source>Full name:</source>
-        <translation>Vollständiger Name:</translation>
+        <translation type="unfinished">Vollständiger Name:</translation>
     </message>
     <message>
         <source>Description:</source>
-        <translation>Beschreibung:</translation>
+        <translation type="unfinished">Beschreibung:</translation>
     </message>
     <message>
         <source>Ready</source>
@@ -4244,20 +4252,50 @@ Einstellungen trotzdem anwenden?</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation>Name</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Value</source>
-        <translation>Wert</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Wert</translation>
+    </message>
+    <message>
+        <source>Full name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Vollständiger Name</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Beschreibung</translation>
     </message>
     <message>
         <source>Base value</source>
-        <translation>Basiswert</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Basiswert</translation>
+    </message>
+    <message>
+        <source>Shift (%1):</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Skip</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished">Wert</translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <translation type="unfinished">Basiswert</translation>
+    </message>
     <message>
         <source>Shift (%1)*:</source>
         <translation type="unfinished"></translation>
@@ -4278,36 +4316,6 @@ Einstellungen trotzdem anwenden?</translation>
         <source>Please, select unique number for each column</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Name</source>
-        <comment>measurement column</comment>
-        <translation>Name</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <comment>measurement column</comment>
-        <translation>Wert</translation>
-    </message>
-    <message>
-        <source>Full name</source>
-        <comment>measurement column</comment>
-        <translation>Vollständiger Name</translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <comment>measurement column</comment>
-        <translation>Beschreibung</translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <comment>measurement column</comment>
-        <translation>Basiswert</translation>
-    </message>
-    <message>
-        <source>Shift (%1):</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DialogMove</name>
@@ -4401,11 +4409,7 @@ Einstellungen trotzdem anwenden?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -4423,6 +4427,10 @@ Einstellungen trotzdem anwenden?</translation>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -4662,7 +4670,7 @@ Einstellungen trotzdem anwenden?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -4858,6 +4866,10 @@ Einstellungen trotzdem anwenden?</translation>
         <source>Show measurements file</source>
         <translation type="vanished">Maßdatei anzeigen</translation>
     </message>
+    <message>
+        <source>From multisize measurements</source>
+        <translation type="vanished">Aus Multimaß-Maße</translation>
+    </message>
     <message>
         <source>Pattern</source>
         <translation>Schnittmuster</translation>
@@ -4866,10 +4878,66 @@ Einstellungen trotzdem anwenden?</translation>
         <source>For technical notes</source>
         <translation>Für technische Notizen</translation>
     </message>
+    <message>
+        <source>Label data</source>
+        <translation type="vanished">Bezeichnungsdaten</translation>
+    </message>
+    <message>
+        <source>Label template:</source>
+        <translation type="vanished">Bezeichnungsvorlage:</translation>
+    </message>
+    <message>
+        <source>Edit pattern label</source>
+        <translation type="vanished">Musterbezeichnung bearbeiten</translation>
+    </message>
+    <message>
+        <source>Edit template</source>
+        <translation type="vanished">Vorlage bearbeiten</translation>
+    </message>
+    <message>
+        <source>Date format:</source>
+        <translation type="vanished">Datumsformat:</translation>
+    </message>
+    <message>
+        <source>Time format:</source>
+        <translation type="vanished">Zeitformat:</translation>
+    </message>
+    <message>
+        <source>Save label data.</source>
+        <translation type="vanished">Bezeichnungsdaten speichern.</translation>
+    </message>
+    <message>
+        <source>Label data were changed. Do you want to save them before editing label template?</source>
+        <translation type="vanished">Bezeichnungsdaten wurden angepasst. Möchten Sie diese Speichern bevor Sie die Bezeichnungsvorlage editieren?</translation>
+    </message>
+    <message>
+        <source>Materials</source>
+        <translation type="vanished">Materialien</translation>
+    </message>
+    <message>
+        <source>Pattern materials:</source>
+        <translation type="vanished">Schnittmustermaterialien:</translation>
+    </message>
+    <message>
+        <source>Manage list of pattern materials</source>
+        <translation type="vanished">Liste an Schnittmustermaterialien verwalten</translation>
+    </message>
+    <message>
+        <source>Manage</source>
+        <translation type="vanished">Verwalten</translation>
+    </message>
+    <message>
+        <source>The customer name from individual measurements</source>
+        <translation type="vanished">Der Name des Kunden von individuellen Maßen</translation>
+    </message>
     <message>
         <source>Label language:</source>
         <translation>Bezeichnungs Sprache:</translation>
     </message>
+    <message>
+        <source>yyyy-MM-dd</source>
+        <translation type="obsolete">yyyy-MM-dd</translation>
+    </message>
     <message>
         <source>Passmark length:</source>
         <translation type="unfinished"></translation>
@@ -5571,7 +5639,7 @@ Einstellungen trotzdem anwenden?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5670,7 +5738,7 @@ Einstellungen trotzdem anwenden?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5765,7 +5833,7 @@ Einstellungen trotzdem anwenden?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5824,7 +5892,7 @@ Einstellungen trotzdem anwenden?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5891,7 +5959,7 @@ Einstellungen trotzdem anwenden?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6006,7 +6074,7 @@ Einstellungen trotzdem anwenden?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6053,7 +6121,7 @@ Einstellungen trotzdem anwenden?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6102,6 +6170,28 @@ Einstellungen trotzdem anwenden?</translation>
         </translation>
     </message>
 </context>
+<context>
+    <name>DialogPuzzlePreferences</name>
+    <message>
+        <source>Puzzle preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paths</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>Followed %n option(s) require restart to take effect: %1.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+</context>
 <context>
     <name>DialogRestrictDimension</name>
     <message>
@@ -6213,11 +6303,7 @@ Einstellungen trotzdem anwenden?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Alias</source>
@@ -6235,6 +6321,10 @@ Einstellungen trotzdem anwenden?</translation>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -6477,6 +6567,10 @@ Einstellungen trotzdem anwenden?</translation>
         <source>Numerical control</source>
         <translation>Numerische Steuerung</translation>
     </message>
+    <message>
+        <source>Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogSeamAllowance</name>
@@ -6706,7 +6800,7 @@ Einstellungen trotzdem anwenden?</translation>
     </message>
     <message>
         <source>The customer name from individual measurements</source>
-        <translation>Der Name des Kunden von individuellen Maßen</translation>
+        <translation type="unfinished">Der Name des Kunden von individuellen Maßen</translation>
     </message>
     <message>
         <source>The customer email from individual measurements</source>
@@ -6718,11 +6812,11 @@ Einstellungen trotzdem anwenden?</translation>
     </message>
     <message>
         <source>Save label data.</source>
-        <translation>Bezeichnungsdaten speichern.</translation>
+        <translation type="unfinished">Bezeichnungsdaten speichern.</translation>
     </message>
     <message>
         <source>Label data were changed. Do you want to save them before editing label template?</source>
-        <translation>Bezeichnungsdaten wurden angepasst. Möchten Sie diese Speichern bevor Sie die Bezeichnungsvorlage editieren?</translation>
+        <translation type="unfinished">Bezeichnungsdaten wurden angepasst. Möchten Sie diese Speichern bevor Sie die Bezeichnungsvorlage editieren?</translation>
     </message>
 </context>
 <context>
@@ -6735,6 +6829,11 @@ Einstellungen trotzdem anwenden?</translation>
         <source>Use full circumference</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Height</source>
+        <comment>dimension</comment>
+        <translation type="unfinished">Höhe</translation>
+    </message>
     <message>
         <source>Min value:</source>
         <translation type="unfinished"></translation>
@@ -6767,10 +6866,25 @@ Einstellungen trotzdem anwenden?</translation>
         <source>The base value for the column</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <comment>dimension</comment>
+        <translation type="unfinished">Größe</translation>
+    </message>
     <message>
         <source>Circumference</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Waist</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hip</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Please, provide correct data for dimensions</source>
         <translation type="unfinished"></translation>
@@ -6787,26 +6901,6 @@ Einstellungen trotzdem anwenden?</translation>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Height</source>
-        <comment>dimension</comment>
-        <translation>Höhe</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <comment>dimension</comment>
-        <translation>Größe</translation>
-    </message>
-    <message>
-        <source>Waist</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hip</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DialogShoulderPoint</name>
@@ -6916,7 +7010,7 @@ Einstellungen trotzdem anwenden?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6959,7 +7053,7 @@ Einstellungen trotzdem anwenden?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -7106,16 +7200,16 @@ Einstellungen trotzdem anwenden?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogSplinePath</name>
@@ -7265,16 +7359,16 @@ Einstellungen trotzdem anwenden?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogTapePreferences</name>
@@ -7457,7 +7551,7 @@ Einstellungen trotzdem anwenden?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -7568,7 +7662,7 @@ Einstellungen trotzdem anwenden?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Werkzeug</translation>
+        <translation type="unfinished">Werkzeug</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -8307,7 +8401,7 @@ Sollen die Änderungen gespeichert werden?</translation>
     </message>
     <message>
         <source>This file already opened in another window.</source>
-        <translation>Diese Datei ist bereits geöffnet.</translation>
+        <translation type="vanished">Diese Datei ist bereits geöffnet.</translation>
     </message>
     <message>
         <source>Wrong units.</source>
@@ -8760,27 +8854,27 @@ Sollen die Änderungen gespeichert werden?</translation>
     </message>
     <message>
         <source>Locking file</source>
-        <translation>Datei wird gesperrt</translation>
+        <translation type="vanished">Datei wird gesperrt</translation>
     </message>
     <message>
         <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Diese Datei ist bereits in einem anderen Fenster geöffnet. Ignorieren Sie diese Nachricht, wenn Sie fortfahren wollen (nicht empfohlen, kann zu Datenverlust führen).</translation>
+        <translation type="vanished">Diese Datei ist bereits in einem anderen Fenster geöffnet. Ignorieren Sie diese Nachricht, wenn Sie fortfahren wollen (nicht empfohlen, kann zu Datenverlust führen).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>DIe Sperrdatei konnte aufgrund fehlender Berechtigungen nicht erstellt werden. Ignorieren Sie diese Nachricht, wenn Sie fortfahren wollen (nicht empfohlen, kann zu Datenverust führen).</translation>
+        <translation type="vanished">DIe Sperrdatei konnte aufgrund fehlender Berechtigungen nicht erstellt werden. Ignorieren Sie diese Nachricht, wenn Sie fortfahren wollen (nicht empfohlen, kann zu Datenverust führen).</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Ein unbekannter Fehler ist aufgetreten, zum Beispiel hat eine volle Festplatten-Partition verhindert, dass die Sperrdatei geschrieben werden konnte. Ignorieren Sie diese Nachricht, wenn Sie fortfahren wollen (nicht empfohlen, kann zu Datenverlust führen).</translation>
+        <translation type="vanished">Ein unbekannter Fehler ist aufgetreten, zum Beispiel hat eine volle Festplatten-Partition verhindert, dass die Sperrdatei geschrieben werden konnte. Ignorieren Sie diese Nachricht, wenn Sie fortfahren wollen (nicht empfohlen, kann zu Datenverlust führen).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions.</source>
-        <translation>Die Sperrdatei konnte aufgrund fehlender Berechtigungen nicht erstellt werden.</translation>
+        <translation type="vanished">Die Sperrdatei konnte aufgrund fehlender Berechtigungen nicht erstellt werden.</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation>Ein unbekannter Fehler ist aufgetreten, zum Beispiel hat eine volle Festplatten-Partition verhindert, dass die Sperrdatei geschrieben werden konnte.</translation>
+        <translation type="vanished">Ein unbekannter Fehler ist aufgetreten, zum Beispiel hat eine volle Festplatten-Partition verhindert, dass die Sperrdatei geschrieben werden konnte.</translation>
     </message>
     <message>
         <source>Report Bug...</source>
@@ -8940,15 +9034,15 @@ Sollen die Änderungen gespeichert werden?</translation>
     </message>
     <message>
         <source>The document has no write permissions.</source>
-        <translation>Dokument hat keine Schreibrechte.</translation>
+        <translation type="vanished">Dokument hat keine Schreibrechte.</translation>
     </message>
     <message>
         <source>Cannot set permissions for %1 to writable.</source>
-        <translation>Berechtigungen für %1 können nicht auf beschreibbar gesetzt werden.</translation>
+        <translation type="vanished">Berechtigungen für %1 können nicht auf beschreibbar gesetzt werden.</translation>
     </message>
     <message>
         <source>Could not save the file.</source>
-        <translation>Datei konnte nicht gespeichert werden.</translation>
+        <translation type="vanished">Datei konnte nicht gespeichert werden.</translation>
     </message>
     <message>
         <source>Could not save the file</source>
@@ -9094,6 +9188,14 @@ Sollen die Änderungen gespeichert werden?</translation>
         <source>Can&apos;t export details.</source>
         <translation>Kann Details nicht exportieren.</translation>
     </message>
+    <message>
+        <source>Couldn&apos;t set size. Need a file with multisize measurements.</source>
+        <translation type="vanished">Konnte die Größe nicht übernehmen. Benötige eine Datei mit MultiMaß Massen.</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t set height. Need a file with multisize measurements.</source>
+        <translation type="vanished">Konnte die Höhe nicht übernehmen. Benötige eine Datei mit MultiMaß Massen.</translation>
+    </message>
     <message>
         <source>Label template editor</source>
         <translation>Beschriftungsvorlageneditor</translation>
@@ -9334,9 +9436,49 @@ Sollen die Änderungen gespeichert werden?</translation>
         <source>Watermark files</source>
         <translation>Wasserzeichen Dateien</translation>
     </message>
+    <message>
+        <source>Manual Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open the Puzzle app</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished">Updaten</translation>
+    </message>
+    <message>
+        <source>Update manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Do you want to change the premissions?</source>
-        <translation>Wollen Sie die Berechtigung ändern ?</translation>
+        <translation type="obsolete">Wollen Sie die Berechtigung ändern ?</translation>
+    </message>
+    <message>
+        <source>Unable to prepare raw layout data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select manual layout</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not supported dimension A value &apos;%1&apos; for this pattern file.</source>
@@ -9533,6 +9675,14 @@ Sollen die Änderungen gespeichert werden?</translation>
         <source>Measurement file contains invalid known measurement(s).</source>
         <translation>Maßdatei enthält ungültiges Maß(e).</translation>
     </message>
+    <message>
+        <source>Wrong units.</source>
+        <translation type="vanished">Falsche Maßeinheiten.</translation>
+    </message>
+    <message>
+        <source>Application doesn&apos;t support multisize table with inches.</source>
+        <translation type="vanished">Anwendung unterstützt keine MultiMaß-Tabelle mit Inches.</translation>
+    </message>
     <message>
         <source>File error.</source>
         <translation>Dateifehler.</translation>
@@ -9553,10 +9703,30 @@ Sollen die Änderungen gespeichert werden?</translation>
         <source>Timeout.</source>
         <translation>Zeitüberschreitung.</translation>
     </message>
+    <message>
+        <source>Cannot set printer page size</source>
+        <translation type="vanished">Kann die Seitengröße für den Druck nicht einstellen</translation>
+    </message>
+    <message>
+        <source>Cannot set custom printer page size</source>
+        <translation type="vanished">Kann keine selbsterstellte Druck Seitengröße einstellen</translation>
+    </message>
     <message>
         <source>Process has been stoped because of exception.</source>
         <translation>Vorgang wurde wegen eines Fehlers unterbrochen.</translation>
     </message>
+    <message>
+        <source>File error.
+
+%1
+
+%2</source>
+        <translation type="vanished">Datei Fehler.
+
+%1
+
+%2</translation>
+    </message>
 </context>
 <context>
     <name>MoveDoubleLabel</name>
@@ -9957,6 +10127,10 @@ Sollen die Änderungen gespeichert werden?</translation>
         <source>My label templates</source>
         <translation>Meine Bezeichnungsvorlagen</translation>
     </message>
+    <message>
+        <source>My manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PreferencesPatternPage</name>
@@ -10099,6 +10273,111 @@ Diese Option wird nach einem Neustart aktiv.</translation>
         <translation>Szene berechnen</translation>
     </message>
 </context>
+<context>
+    <name>Puzzle</name>
+    <message>
+        <source>Export options can be used with single input file only.</source>
+        <translation type="unfinished">Exportoptionen können nur mit einer Eingabedatei verwendet werden.</translation>
+    </message>
+    <message>
+        <source>Valentina&apos;s manual layout editor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The manual layout file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesConfigurationPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished">Sprache</translation>
+    </message>
+    <message>
+        <source>GUI language:</source>
+        <translation type="unfinished">Sprache der Benutzeroberfläche:</translation>
+    </message>
+    <message>
+        <source>Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The text appears under the icon (recommended for beginners).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Interface</source>
+        <translation type="unfinished">Benutzeroberfläche</translation>
+    </message>
+    <message>
+        <source>Activate dark mode</source>
+        <translation type="unfinished">Dunklen Hintergrund aktivieren</translation>
+    </message>
+    <message>
+        <source>Don&apos;t use the native file dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dark mode</source>
+        <translation type="unfinished">Dunkler Hintergrund</translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesPathPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <source>Paths that Valentina uses</source>
+        <translation type="unfinished">Pfade die Valentina benutzt</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished">Typ</translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished">Standard</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished">Bearbeiten</translation>
+    </message>
+    <message>
+        <source>Open Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Individual Measurements</source>
+        <translation type="unfinished">Meine Persönlichen Maße</translation>
+    </message>
+    <message>
+        <source>My Multisize Measurements</source>
+        <translation type="unfinished">Meine MultiMaß Masse</translation>
+    </message>
+    <message>
+        <source>My Patterns</source>
+        <translation type="unfinished">Meine Schnittmuster</translation>
+    </message>
+    <message>
+        <source>My Templates</source>
+        <translation type="unfinished">meine Vorlagen</translation>
+    </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished">Meine Layouts</translation>
+    </message>
+</context>
 <context>
     <name>QApplication</name>
     <message>
@@ -10444,6 +10723,10 @@ Diese Option wird nach einem Neustart aktiv.</translation>
         <source>Can&apos;t convert toInt parameter</source>
         <translation>Konnte nicht in Parameter vom Typ &apos;Ganzzahl&apos; umwandeln</translation>
     </message>
+    <message>
+        <source>Piece name &apos;%1&apos; is not unique.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Could not find the segment start.</source>
         <translation type="unfinished"></translation>
@@ -10460,6 +10743,10 @@ Diese Option wird nach einem Neustart aktiv.</translation>
         <source>Error calculating segment for curve &apos;%1&apos;. %2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot prepare builtin passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
@@ -10476,18 +10763,14 @@ Diese Option wird nach einem Neustart aktiv.</translation>
         <source>Cannot prepare passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Piece name &apos;%1&apos; is not unique.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Cannot get tokens from formula &apos;%1&apos;. Formula error: %2.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>No data for the height dimension.</source>
         <translation type="unfinished"></translation>
@@ -10509,11 +10792,15 @@ Diese Option wird nach einem Neustart aktiv.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
+        <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
+        <source>Unplaced pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet 1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -11109,7 +11396,7 @@ Diese Option wird nach einem Neustart aktiv.</translation>
     </message>
     <message>
         <source>untitled</source>
-        <translation type="vanished">ohne Titel</translation>
+        <translation>ohne Titel</translation>
     </message>
     <message>
         <source>&lt;Empty&gt;</source>
@@ -11345,27 +11632,27 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Locking file</source>
-        <translation>Datei wird gesperrt</translation>
+        <translation type="vanished">Datei wird gesperrt</translation>
     </message>
     <message>
         <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Diese Datei ist bereits in einem anderen Fenster geöffnet. Ignorieren Sie diese Nachricht, wenn Sie fortfahren wollen (nicht empfohlen, kann zu Datenverlust führen).</translation>
+        <translation type="vanished">Diese Datei ist bereits in einem anderen Fenster geöffnet. Ignorieren Sie diese Nachricht, wenn Sie fortfahren wollen (nicht empfohlen, kann zu Datenverlust führen).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>DIe Sperrdatei konnte aufgrund fehlender Berechtigungen nicht erstellt werden. Ignorieren Sie diese Nachricht, wenn Sie fortfahren wollen (nicht empfohlen, kann zu Datenverlust führen).</translation>
+        <translation type="vanished">DIe Sperrdatei konnte aufgrund fehlender Berechtigungen nicht erstellt werden. Ignorieren Sie diese Nachricht, wenn Sie fortfahren wollen (nicht empfohlen, kann zu Datenverlust führen).</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Ein unbekannter Fehler ist aufgetreten, zum Beispiel hat eine volle Festplattenpartition verhindert, dass die Sperrdatei geschrieben werden konnte. Ignorieren Sie diese Nachricht, wenn Sie fortfahren wollen (nicht empfohlen, kann zu Datenverlust führen).</translation>
+        <translation type="vanished">Ein unbekannter Fehler ist aufgetreten, zum Beispiel hat eine volle Festplattenpartition verhindert, dass die Sperrdatei geschrieben werden konnte. Ignorieren Sie diese Nachricht, wenn Sie fortfahren wollen (nicht empfohlen, kann zu Datenverlust führen).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions.</source>
-        <translation>Die Sperrdatei konnte aufgrund fehlender Berechtigungen nicht erstellt werden.</translation>
+        <translation type="vanished">Die Sperrdatei konnte aufgrund fehlender Berechtigungen nicht erstellt werden.</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation>Ein unbekannter Fehler ist aufgetreten, zum Beispiel hat eine volle Festplattenpartition verhindert, dass die Sperrdatei geschrieben werden konnte.</translation>
+        <translation type="vanished">Ein unbekannter Fehler ist aufgetreten, zum Beispiel hat eine volle Festplattenpartition verhindert, dass die Sperrdatei geschrieben werden konnte.</translation>
     </message>
     <message>
         <source>Export to CSV</source>
@@ -11413,15 +11700,15 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>The measurements document has no write permissions.</source>
-        <translation>Die Maß-Datei hat keine Schreibrechte.</translation>
+        <translation type="vanished">Die Maß-Datei hat keine Schreibrechte.</translation>
     </message>
     <message>
         <source>Cannot set permissions for %1 to writable.</source>
-        <translation>Berechtigungen für %1 können nicht auf beschreibbar gesetzt werden.</translation>
+        <translation type="vanished">Berechtigungen für %1 können nicht auf beschreibbar gesetzt werden.</translation>
     </message>
     <message>
         <source>Could not save the file.</source>
-        <translation>Datei konnte nicht gespeichert werden.</translation>
+        <translation type="vanished">Datei konnte nicht gespeichert werden.</translation>
     </message>
     <message>
         <source>Could not save the file</source>
@@ -11495,6 +11782,18 @@ Do you want to save your changes?</source>
         <source>Multisize measurements require at least 4 columns.</source>
         <translation>MultiMaß Maße erfordern mindestens 4 Spalten.</translation>
     </message>
+    <message>
+        <source>Cannot convert base size value to double in column 2.</source>
+        <translation type="vanished">Kann den Wert der Basis-Größe nicht in eine Fließkommazahl wandeln in Spalte 2.</translation>
+    </message>
+    <message>
+        <source>Cannot convert height increase value to double in column 3.</source>
+        <translation type="vanished">Kann den Wert der Höhen-Zunahme nicht in eine Fließkommazahl wandeln in Spalte 3.</translation>
+    </message>
+    <message>
+        <source>Cannot convert size increase value to double in column 4.</source>
+        <translation type="vanished">Kann den Wert der Größenzunahme nicht in eine Fließkommazahl wandeln in Spalte 4.</translation>
+    </message>
     <message>
         <source>Imported file must not contain the same name twice.</source>
         <translation>Importierte Datei darf die selbe Bezeichnung nicht zweimal enthalten.</translation>
@@ -11553,15 +11852,53 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Do you want to change the premissions?</source>
-        <translation>Wollen Sie die Berechtigung ändern ?</translation>
+        <translation type="vanished">Wollen Sie die Berechtigung ändern ?</translation>
     </message>
     <message>
         <source>Cannot read settings from a malformed .INI file.</source>
         <translation>Kann Einstellungen nicht aus fehlerhafter .INI Datei lesen.</translation>
     </message>
+    <message>
+        <source>Height (%1):</source>
+        <translation type="vanished">Höhe (%1):</translation>
+    </message>
+    <message>
+        <source>Size (%1):</source>
+        <translation type="vanished">Größe (%1):</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Vollständiger Name</translation>
+    </message>
+    <message>
+        <source>Calculated value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Berechneter Wert</translation>
+    </message>
+    <message>
+        <source>Formula</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Formel</translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Basiswert</translation>
+    </message>
+    <message>
+        <source>Correction</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Units:</source>
-        <translation>Einheiten:</translation>
+        <translation type="unfinished">Einheiten:</translation>
     </message>
     <message>
         <source>Shift B</source>
@@ -11661,44 +11998,14 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Inches</source>
-        <translation>Inch</translation>
-    </message>
-    <message>
-        <source>Centimeters</source>
-        <translation>Zentimeter</translation>
-    </message>
-    <message>
-        <source>Degrees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
-        <comment>measurement column</comment>
-        <translation>Name</translation>
+        <source>Centimeters</source>
+        <translation type="unfinished">Zentimeter</translation>
     </message>
     <message>
-        <source>Full name</source>
-        <comment>measurement column</comment>
-        <translation>Vollständiger Name</translation>
-    </message>
-    <message>
-        <source>Calculated value</source>
-        <comment>measurement column</comment>
-        <translation>Berechneter Wert</translation>
-    </message>
-    <message>
-        <source>Formula</source>
-        <comment>measurement column</comment>
-        <translation>Formel</translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <comment>measurement column</comment>
-        <translation>Basiswert</translation>
-    </message>
-    <message>
-        <source>Correction</source>
-        <comment>measurement column</comment>
+        <source>Degrees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -11779,6 +12086,10 @@ Do you want to save your changes?</source>
         <source>Labels</source>
         <translation>Beschriftungen</translation>
     </message>
+    <message>
+        <source>Detail label visible</source>
+        <translation type="vanished">Detailbeschriftung sichtbar</translation>
+    </message>
     <message>
         <source>Width:</source>
         <translation>Breite:</translation>
@@ -11885,31 +12196,31 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Edit pattern label</source>
-        <translation>Musterbezeichnung bearbeiten</translation>
+        <translation type="unfinished">Musterbezeichnung bearbeiten</translation>
     </message>
     <message>
         <source>Pattern name:</source>
-        <translation>Name des Schnittmusters:</translation>
+        <translation type="unfinished">Name des Schnittmusters:</translation>
     </message>
     <message>
         <source>Pattern number:</source>
-        <translation>Nummer des Schnittmusters:</translation>
+        <translation type="unfinished">Nummer des Schnittmusters:</translation>
     </message>
     <message>
         <source>Company/Designer name:</source>
-        <translation>Name der Firma/des Designers:</translation>
+        <translation type="unfinished">Name der Firma/des Designers:</translation>
     </message>
     <message>
         <source>Customer name:</source>
-        <translation>Kundenname:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date format:</source>
-        <translation>Datumsformat:</translation>
+        <translation type="unfinished">Datumsformat:</translation>
     </message>
     <message>
         <source>Time format:</source>
-        <translation>Zeitformat:</translation>
+        <translation type="unfinished">Zeitformat:</translation>
     </message>
     <message>
         <source>Customer birth date:</source>
@@ -11917,7 +12228,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>yyyy-MM-dd</source>
-        <translation>yyyy-MM-dd</translation>
+        <translation type="unfinished">yyyy-MM-dd</translation>
     </message>
     <message>
         <source>Customer email:</source>
@@ -11925,19 +12236,19 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Materials</source>
-        <translation>Materialien</translation>
+        <translation type="unfinished">Materialien</translation>
     </message>
     <message>
         <source>Pattern materials:</source>
-        <translation>Schnittmustermaterialien:</translation>
+        <translation type="unfinished">Schnittmustermaterialien:</translation>
     </message>
     <message>
         <source>Manage list of pattern materials</source>
-        <translation>Liste an Schnittmustermaterialien verwalten</translation>
+        <translation type="unfinished">Liste an Schnittmustermaterialien verwalten</translation>
     </message>
     <message>
         <source>Manage</source>
-        <translation>Verwalten</translation>
+        <translation type="unfinished">Verwalten</translation>
     </message>
     <message>
         <source>Piece label visible</source>
@@ -12030,6 +12341,10 @@ Do you want to save your changes?</source>
         <source>Intersection 2 (only right)</source>
         <translation>Überschneidung 2 (nur rechts)</translation>
     </message>
+    <message>
+        <source>Acute angle that looks intside of piece</source>
+        <translation type="vanished">Spitzer Winkel der in das Schnittteil hinein geht</translation>
+    </message>
     <message>
         <source>Acute angle that looks outside of piece</source>
         <translation>Spitzer Winkel der aus dem Schnittteil heraus schaut</translation>
@@ -12076,7 +12391,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Acute angle that looks inside of piece</source>
-        <translation>Spitzer Winkel der in das Schnittteil hinein geht</translation>
+        <translation type="unfinished">Spitzer Winkel der in das Schnittteil hinein geht</translation>
     </message>
 </context>
 <context>
@@ -12239,6 +12554,18 @@ Do you want to save your changes?</source>
         <comment>seam allowance</comment>
         <translation>Benutzerdefiniert</translation>
     </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Universally Unique IDentifier of piece. Used to identifier piece while updating manual layout. Left empty to generate new value.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TabPlaceLabels</name>
@@ -12247,6 +12574,13 @@ Do you want to save your changes?</source>
         <translation>Dialog</translation>
     </message>
 </context>
+<context>
+    <name>Tape</name>
+    <message>
+        <source>This test build is older than %1 days. To provide you with better quality service we restrict the lifetime you can use a test build. To continue using Tape please update to newer test build. The application will be shut down.</source>
+        <translation type="vanished">Diese Testversion ist älter als %1 Tage. Um Ihnen eine bessere Qualität bieten zu können, beschränken wir die Dauer der Nutzung einer Testversion. Um weiterhin Tape verwenden zu können, aktualisieren Sie bitte auf eine neuere Testversion. Die Anwendung wird geschloßen.</translation>
+    </message>
+</context>
 <context>
     <name>TapeConfigDialog</name>
     <message>
@@ -12414,6 +12748,18 @@ Do you want to save your changes?</source>
         <source>The text appears under the icon (recommended for beginners).</source>
         <translation>Der Text erscheint unter dem Icon (empfohlen für Anfangende).</translation>
     </message>
+    <message>
+        <source>Default height and size</source>
+        <translation type="vanished">Standard Höhe und Größe</translation>
+    </message>
+    <message>
+        <source>Default height:</source>
+        <translation type="vanished">Standardhöhe:</translation>
+    </message>
+    <message>
+        <source>Default size:</source>
+        <translation type="vanished">Standardgröße:</translation>
+    </message>
     <message>
         <source>With OS options</source>
         <translation>Mit Betriebssystem (OS) Optionen</translation>
@@ -12477,6 +12823,10 @@ Do you want to save your changes?</source>
         <source>My Patterns</source>
         <translation>Meine Schnittmuster</translation>
     </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished">Meine Layouts</translation>
+    </message>
 </context>
 <context>
     <name>ToggleDetailInLayout</name>
@@ -12528,19 +12878,15 @@ Do you want to save your changes?</source>
         <source>Base value invalid</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Size</source>
-        <translation>Größe</translation>
-    </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Höhe</translation>
+        <translation type="unfinished">Höhe</translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Größe</translation>
+        <translation type="unfinished">Größe</translation>
     </message>
     <message>
         <source>Waist</source>
@@ -12562,6 +12908,10 @@ Do you want to save your changes?</source>
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished">Größe</translation>
+    </message>
     <message>
         <source>Chest circumference</source>
         <comment>dimension</comment>
@@ -12752,7 +13102,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Comma-Separated Values</source>
-        <translation>Komma-Separierte Werte</translation>
+        <translation type="unfinished">Komma-Separierte Werte</translation>
     </message>
     <message>
         <source>values</source>
@@ -12760,7 +13110,51 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Export to CSV</source>
-        <translation>Als CSV exportieren</translation>
+        <translation type="unfinished">Als CSV exportieren</translation>
+    </message>
+    <message>
+        <source>The measurements document has no write permissions.</source>
+        <translation type="unfinished">Die Maß-Datei hat keine Schreibrechte.</translation>
+    </message>
+    <message>
+        <source>Do you want to change the premissions?</source>
+        <translation type="unfinished">Wollen Sie die Berechtigung ändern ?</translation>
+    </message>
+    <message>
+        <source>Cannot set permissions for %1 to writable.</source>
+        <translation type="unfinished">Berechtigungen für %1 können nicht auf beschreibbar gesetzt werden.</translation>
+    </message>
+    <message>
+        <source>Could not save the file.</source>
+        <translation type="unfinished">Datei konnte nicht gespeichert werden.</translation>
+    </message>
+    <message>
+        <source>Locking file</source>
+        <translation type="unfinished">Datei wird gesperrt</translation>
+    </message>
+    <message>
+        <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished">Diese Datei ist bereits in einem anderen Fenster geöffnet. Ignorieren Sie diese Nachricht, wenn Sie fortfahren wollen (nicht empfohlen, kann zu Datenverlust führen).</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This file already opened in another window.</source>
+        <translation type="unfinished">Diese Datei ist bereits geöffnet.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions.</source>
+        <translation type="unfinished">Die Sperrdatei konnte aufgrund fehlender Berechtigungen nicht erstellt werden.</translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -13543,6 +13937,34 @@ Do you want to save your changes?</source>
         <source>The dimension C base</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>The filename of exported layout file. Use it to enable console export mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The filename of layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pattern pieces form the raw layout data file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The raw layout data file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to output format (default = 0, export mode): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to tiled pdf page template (default = 0, export mode with tiled pdf format): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run the program in a test mode. The program in this mode loads a single layout file and silently quit without showing the main window. The key have priority before key &apos;%1&apos;.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VCommonSettings</name>
@@ -13570,6 +13992,10 @@ Do you want to save your changes?</source>
         <source>patterns</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VContainer</name>
@@ -13816,25 +14242,29 @@ Do you want to save your changes?</source>
 </context>
 <context>
     <name>VLayoutExporter</name>
+    <message>
+        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot set printer page size</source>
-        <translation>Kann die Seitengröße für den Druck nicht einstellen</translation>
+        <translation type="unfinished">Kann die Seitengröße für den Druck nicht einstellen</translation>
     </message>
     <message>
         <source>Cannot set printer margins</source>
-        <translation>Kann Druckränder nicht setzen</translation>
+        <translation type="unfinished">Kann Druckränder nicht setzen</translation>
     </message>
     <message>
         <source>Can&apos;t open file &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Creating file &apos;%1&apos; failed! %2</source>
-        <translation>Fehler beim Erstellen der Datei &apos;%1&apos;! %2</translation>
+        <source>Export raw layout data failed. %1.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
-        <translation type="unfinished"></translation>
+        <source>Creating file &apos;%1&apos; failed! %2</source>
+        <translation type="unfinished">Fehler beim Erstellen der Datei &apos;%1&apos;! %2</translation>
     </message>
     <message>
         <source>Can&apos;t create an flat dxf file.</source>
@@ -13868,15 +14298,15 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>None</source>
-        <translation>Keine</translation>
+        <translation type="unfinished">Keine</translation>
     </message>
     <message>
         <source>Height</source>
-        <translation>Höhe</translation>
+        <translation type="unfinished">Höhe</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Größe</translation>
+        <translation type="unfinished">Größe</translation>
     </message>
     <message>
         <source>Hip</source>
@@ -14022,6 +14452,114 @@ Do you want to save your changes?</source>
         <translation>Box Markierung</translation>
     </message>
 </context>
+<context>
+    <name>VPApplication</name>
+    <message>
+        <source>Error parsing file. Program will be terminated.</source>
+        <translation type="unfinished">Fehler beim Verarbeiten der Datei. Das Programm wird geschlossen.</translation>
+    </message>
+    <message>
+        <source>Error bad id. Program will be terminated.</source>
+        <translation type="unfinished">Fehler - unbekannte ID. Das Programm wird geschlossen.</translation>
+    </message>
+    <message>
+        <source>Error can&apos;t convert value. Program will be terminated.</source>
+        <translation type="unfinished">Fehler - Wert kann nicht konvertiert werden. Das Programm wird geschlossen.</translation>
+    </message>
+    <message>
+        <source>Error empty parameter. Program will be terminated.</source>
+        <translation type="unfinished">Fehler - leerer Parameter. Das Programm wird geschlossen.</translation>
+    </message>
+    <message>
+        <source>Error wrong id. Program will be terminated.</source>
+        <translation type="unfinished">Fehler - falsche ID. Das Programm wird geschlossen.</translation>
+    </message>
+    <message>
+        <source>Something&apos;s wrong!!</source>
+        <translation type="unfinished">Etwas ist schiefgegangen!</translation>
+    </message>
+    <message>
+        <source>Exception thrown: %1. Program will be terminated.</source>
+        <translation type="unfinished">Ausnahme ausgelöst: %1. Programm wird beendet.</translation>
+    </message>
+    <message>
+        <source>Can&apos;t begin to listen for incoming connections on name &apos;%1&apos;</source>
+        <translation type="unfinished">Eingehende Verbindung &apos;%1&apos; kann nicht aufgefangen werden</translation>
+    </message>
+    <message>
+        <source>Export mode doesn&apos;t support openning several files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import raw layout data does not support openning several layout files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, provide one input file.</source>
+        <translation type="unfinished">Bitte stellen Sie eine Eingabedatei zur Verfügung.</translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrousel</name>
+    <message>
+        <source>Pieces of </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrouselPieceList</name>
+    <message>
+        <source>Move to Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPDialogAbout</name>
+    <message>
+        <source>About Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Puzzle version</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Build revision:</source>
+        <translation type="unfinished">Build-Revision:</translation>
+    </message>
+    <message>
+        <source>This program is part of Valentina project.</source>
+        <translation type="unfinished">Dieses Programm ist Teil des Valentina-Projekts.</translation>
+    </message>
+    <message>
+        <source>Check For Updates</source>
+        <translation type="unfinished">Nach Updates suchen</translation>
+    </message>
+    <message>
+        <source>Cannot open your default browser</source>
+        <translation type="unfinished">Konnte den Standard-Browser nicht starten</translation>
+    </message>
+    <message>
+        <source>Build revision: %1</source>
+        <translation type="unfinished">Build-Revision: %1</translation>
+    </message>
+    <message>
+        <source>Built on %1 at %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Web site : %1</source>
+        <translation type="unfinished">Webseite: %1</translation>
+    </message>
+</context>
 <context>
     <name>VPE::VBoolProperty</name>
     <message>
@@ -14044,6 +14582,573 @@ Do you want to save your changes?</source>
         <translation>Datei öffnen</translation>
     </message>
 </context>
+<context>
+    <name>VPGraphicsPiece</name>
+    <message>
+        <source>Move to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPLayoutFileReader</name>
+    <message>
+        <source>Piece List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Got empty attribute &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPMainWindow</name>
+    <message>
+        <source>Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;Datei</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished">&amp;Hilfe</translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished">Menü</translation>
+    </message>
+    <message>
+        <source>Piece Carrousel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Infos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Name:</translation>
+    </message>
+    <message>
+        <source>DummyName</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UUID:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{7b2ce4ae-96f5-4905-bb34-405cb40ca208}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Geometry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mirror piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotation</source>
+        <translation type="unfinished">Drehung</translation>
+    </message>
+    <message>
+        <source>Angle:</source>
+        <translation type="unfinished">Winkel:</translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° anti-clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Placement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Y:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No piece selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple pieces selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Width</source>
+        <translation type="unfinished">Breite</translation>
+    </message>
+    <message>
+        <source>Length</source>
+        <translation type="unfinished">Länge</translation>
+    </message>
+    <message>
+        <source>Orientation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove unused length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right:</source>
+        <translation type="unfinished">Rechts:</translation>
+    </message>
+    <message>
+        <source>Top:</source>
+        <translation type="unfinished">Oben:</translation>
+    </message>
+    <message>
+        <source>Left:</source>
+        <translation type="unfinished">Links:</translation>
+    </message>
+    <message>
+        <source>Bottom:</source>
+        <translation type="unfinished">Unten:</translation>
+    </message>
+    <message>
+        <source>Placement Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Row height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Control</source>
+        <translation type="unfinished">Steuerung</translation>
+    </message>
+    <message>
+        <source>Follow grainline</source>
+        <translation type="unfinished">Folge der Fadenlauf-Linie</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vertical grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Horizontal grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pieces gap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sticky edges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation type="unfinished">Export</translation>
+    </message>
+    <message>
+        <source>Export Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiles properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiled Pdf Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Tiles on sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export Tiled Pdf</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation type="unfinished">Layout</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Beschreibung</translation>
+    </message>
+    <message>
+        <source>Unit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning superposition of pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning pieces out of bound</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation type="unfinished">&amp;Öffnen</translation>
+    </message>
+    <message>
+        <source>Ctrl+O</source>
+        <translation type="unfinished">Strg+O</translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Speichern</translation>
+    </message>
+    <message>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save &amp;As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Import Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation type="unfinished">Valentina &amp;beenden</translation>
+    </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation type="unfinished">&amp;Neu</translation>
+    </message>
+    <message>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation type="unfinished">Über &amp;Qt</translation>
+    </message>
+    <message>
+        <source>About &amp;Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom in</source>
+        <translation type="unfinished">Vergrößern</translation>
+    </message>
+    <message>
+        <source>Zoom out</source>
+        <translation type="unfinished">Verkleinern</translation>
+    </message>
+    <message>
+        <source>Zoom 1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom fit best</source>
+        <translation type="unfinished">In Ansicht einpassen</translation>
+    </message>
+    <message>
+        <source>Zoom sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished">Einstellungen</translation>
+    </message>
+    <message>
+        <source>File &apos;%1&apos; doesn&apos;t exist!</source>
+        <translation type="unfinished">Datei &apos;%1&apos; existiert nicht!</translation>
+    </message>
+    <message>
+        <source>File error.</source>
+        <translation type="unfinished">Dateifehler.</translation>
+    </message>
+    <message>
+        <source>Unable to read a layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fail to create layout.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not extract data from file &apos;%1&apos;. %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Centimeters</source>
+        <translation type="unfinished">Zentimeter</translation>
+    </message>
+    <message>
+        <source>Millimiters</source>
+        <translation type="unfinished">Millimeter</translation>
+    </message>
+    <message>
+        <source>Inches</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale:</source>
+        <translation type="unfinished">Maßstab:</translation>
+    </message>
+    <message>
+        <source>untitled %1.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>untitled.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read only</source>
+        <translation type="unfinished">schreibgeschützt</translation>
+    </message>
+    <message>
+        <source>Cannot read settings from a malformed .INI file.</source>
+        <translation type="unfinished">Kann Einstellungen nicht aus fehlerhafter .INI Datei lesen.</translation>
+    </message>
+    <message>
+        <source>Cannot save settings. Access denied.</source>
+        <translation type="unfinished">Kann Einstellungen nicht speichern. Zugriff verwehrt.</translation>
+    </message>
+    <message>
+        <source>Failed to open file, is it writable?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New Window</source>
+        <translation type="unfinished">&amp;Neues Fenster</translation>
+    </message>
+    <message>
+        <source>Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open file</source>
+        <translation type="unfinished">Datei öffnen</translation>
+    </message>
+    <message>
+        <source>Could not save the file</source>
+        <translation type="unfinished">Datei konnte nicht gespeichert werden</translation>
+    </message>
+    <message>
+        <source>layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window.</source>
+        <translation type="unfinished">Fehler beim Sperren. Diese Datei ist bereits in einem anderen Fenster geöffnet.</translation>
+    </message>
+    <message>
+        <source>Could not save file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window. Expect collissions when run 2 copies of the program.</source>
+        <translation type="unfinished">Fehler beim Sperren. Diese Datei ist bereits in einem anderen Fenster geöffnet. Bei zweifachem Ausführen kann es zu Konflikten kommen.</translation>
+    </message>
+    <message>
+        <source>Raw Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About Qt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PDF Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SVG Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPSheet</name>
+    <message>
+        <source>Letter</source>
+        <translation type="unfinished">Letter (US-Papiergröße)</translation>
+    </message>
+    <message>
+        <source>Legal</source>
+        <translation type="unfinished">Legal (US-Papiergröße)</translation>
+    </message>
+    <message>
+        <source>Tabloid</source>
+        <translation type="unfinished">Tablett</translation>
+    </message>
+    <message>
+        <source>Roll 24in</source>
+        <translation type="unfinished">Rolle 24 Zoll</translation>
+    </message>
+    <message>
+        <source>Roll 30in</source>
+        <translation type="unfinished">Rolle 30 Zoll</translation>
+    </message>
+    <message>
+        <source>Roll 36in</source>
+        <translation type="unfinished">Rolle 36 Zoll</translation>
+    </message>
+    <message>
+        <source>Roll 42in</source>
+        <translation type="unfinished">Rolle 42 Zoll</translation>
+    </message>
+    <message>
+        <source>Roll 44in</source>
+        <translation type="unfinished">Rolle 44 Zoll</translation>
+    </message>
+    <message>
+        <source>Roll 48in</source>
+        <translation type="unfinished">Rolle 44 Zoll {48 Zoll ?}</translation>
+    </message>
+    <message>
+        <source>Roll 62in</source>
+        <translation type="unfinished">Rolle 44 Zoll {62 Zoll ?}</translation>
+    </message>
+    <message>
+        <source>Roll 72in</source>
+        <translation type="unfinished">Rolle 44 Zoll {72 Zoll ?}</translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation type="unfinished">Benutzerdefiniert</translation>
+    </message>
+</context>
+<context>
+    <name>VPTileFactory</name>
+    <message>
+        <source>Grid ( %1 , %2 )</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page %1 of %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VPattern</name>
     <message>
@@ -14389,23 +15494,23 @@ Do you want to save your changes?</source>
     <name>VPrintLayout</name>
     <message>
         <source>For printing multipages document all sheet should have the same size.</source>
-        <translation>Zum Drucken eines mehrseitigen Dokuments müssen alle Blätter die gleiche Größe haben.</translation>
+        <translation type="unfinished">Zum Drucken eines mehrseitigen Dokuments müssen alle Blätter die gleiche Größe haben.</translation>
     </message>
     <message>
         <source>For previewing multipage document all sheet should have the same size.</source>
-        <translation>Zum Speichern eines mehrseitigen Dokuments müssen alle Blätter die gleiche Größe haben.</translation>
+        <translation type="unfinished">Zum Speichern eines mehrseitigen Dokuments müssen alle Blätter die gleiche Größe haben.</translation>
     </message>
     <message>
         <source>Pages will be cropped because they do not fit printer paper size.</source>
-        <translation>Seiten werden zugeschnitten weil sie nicht mit der Papiergröße des Druckers übereinstimmen.</translation>
+        <translation type="unfinished">Seiten werden zugeschnitten, da sie nicht mit der Papiergröße des Drucker übereinstimmen.</translation>
     </message>
     <message>
         <source>Print error</source>
-        <translation>Druckfehler</translation>
+        <translation type="unfinished">Druckfehler</translation>
     </message>
     <message>
         <source>Cannot proceed because there are no available printers in your system.</source>
-        <translation>Prozess kann nicht fortgesetzt werden, da keine verfügbaren Drucker in Ihrem System vorhanden sind.</translation>
+        <translation type="unfinished">Prozess kann nicht fortgesetzt werden, da keine verfügbaren Drucker in Ihrem System vorhanden sind.</translation>
     </message>
     <message>
         <source>Failed to open file, is it writable?</source>
@@ -14417,15 +15522,15 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Cannot set printer margins</source>
-        <translation>Kann Druckränder nicht setzen</translation>
+        <translation type="unfinished">Kann Druckränder nicht setzen</translation>
     </message>
     <message>
         <source>Cannot set custom printer page size</source>
-        <translation>Kann keine selbsterstellte Druck Seitengröße einstellen</translation>
+        <translation type="unfinished">Kann keine selbsterstellte Druck Seitengröße einstellen</translation>
     </message>
     <message>
         <source>Cannot set printer page size</source>
-        <translation>Kann die Seitengröße für den Druck nicht einstellen</translation>
+        <translation type="unfinished">Kann die Seitengröße für den Druck nicht einstellen</translation>
     </message>
     <message>
         <source>Cannot set printer tiled page size</source>
@@ -14441,7 +15546,7 @@ Do you want to save your changes?</source>
 %1
 
 %2</source>
-        <translation>Datei Fehler.
+        <translation type="unfinished">Datei Fehler.
 
 %1
 
@@ -14449,17 +15554,22 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>The layout is stale.</source>
-        <translation>Das Layout ist veraltet.</translation>
+        <translation type="unfinished">Das Layout ist veraltet.</translation>
     </message>
     <message>
         <source>The layout was not updated since last pattern modification. Do you want to continue?</source>
-        <translation>Das Layout wurde seit der letzten Änderung nicht aktualisiert. Möchten Sie fortfahren?</translation>
+        <translation type="unfinished">Das Layout wurde seit der letzten Änderung nicht aktualisiert. Möchten Sie fortfahren?</translation>
     </message>
 </context>
 <context>
-    <name>VSettings</name>
+    <name>VRawLayout</name>
     <message>
-        <source>layouts</source>
+        <source>VRawLayout::ReadFile() failed. Raw layout format prefix mismatch error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VRawLayout::ReadFile() failed.
+Raw layout format compatibility error: actualFileVersion = %1 and fileVersion = %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -15373,7 +16483,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Notes:</source>
-        <translation>Notiz:</translation>
+        <translation type="unfinished">Notiz:</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -17072,6 +18182,13 @@ Do you want to save your changes?</source>
         <translation type="vanished">Fehler beim Wiederherstellen aus Backupdatei %1.</translation>
     </message>
 </context>
+<context>
+    <name>VValentinaSettings</name>
+    <message>
+        <source>layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VWidgetDetails</name>
     <message>
@@ -17468,7 +18585,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Do you want to change the premissions?</source>
-        <translation>Wollen Sie die Berechtigung ändern ?</translation>
+        <translation type="unfinished">Wollen Sie die Berechtigung ändern ?</translation>
     </message>
 </context>
 <context>
diff --git a/share/translations/valentina_el_GR.ts b/share/translations/valentina_el_GR.ts
index 6b0b24a75..d55ee2980 100644
--- a/share/translations/valentina_el_GR.ts
+++ b/share/translations/valentina_el_GR.ts
@@ -564,7 +564,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -695,16 +695,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogArcWithLength</name>
@@ -822,16 +822,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogBisector</name>
@@ -953,7 +953,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -1020,16 +1020,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCubicBezierPath</name>
@@ -1075,16 +1075,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCurveIntersectAxis</name>
@@ -1186,7 +1186,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -1277,11 +1277,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1291,6 +1287,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCutSpline</name>
@@ -1368,11 +1368,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1382,6 +1378,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCutSplinePath</name>
@@ -1459,11 +1459,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1473,6 +1469,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogDateTimeFormats</name>
@@ -1751,15 +1751,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Value</source>
-        <translation>Τιμή</translation>
-    </message>
-    <message>
-        <source>Label</source>
+        <source>Dimension:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dimension:</source>
+        <source>Value</source>
+        <translation type="unfinished">Τιμή</translation>
+    </message>
+    <message>
+        <source>Label</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1914,6 +1914,14 @@
         <source>Measurments file name</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Μέγεθος</translation>
+    </message>
+    <message>
+        <source>Height</source>
+        <translation type="obsolete">Ύψος</translation>
+    </message>
     <message>
         <source>Measurments extension</source>
         <translation type="unfinished"></translation>
@@ -2042,19 +2050,15 @@
         <source>Customer email</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Measurement: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Ύψος</translation>
+        <translation type="unfinished">Ύψος</translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Μέγεθος</translation>
+        <translation type="unfinished">Μέγεθος</translation>
     </message>
     <message>
         <source>Hip</source>
@@ -2067,23 +2071,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No data for the height dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the size dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the hip dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the waist dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Final measurement: %1</source>
+        <source>Measurement: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2106,6 +2094,26 @@
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Final measurement: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the height dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the size dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the hip dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the waist dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogEditWrongFormula</name>
@@ -2338,16 +2346,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogEndLine</name>
@@ -2453,7 +2461,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -2683,11 +2691,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -2705,6 +2709,10 @@
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -2802,11 +2810,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -2824,6 +2828,10 @@
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -2976,7 +2984,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -3811,7 +3819,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -3878,7 +3886,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -4005,7 +4013,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -4160,11 +4168,11 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Full name:</source>
-        <translation>Πλήρες όνομα:</translation>
+        <translation type="unfinished">Πλήρες όνομα:</translation>
     </message>
     <message>
         <source>Description:</source>
-        <translation>Περιγραφή:</translation>
+        <translation type="unfinished">Περιγραφή:</translation>
     </message>
     <message>
         <source>Ready</source>
@@ -4172,20 +4180,50 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Name</source>
-        <translation>Όνομα</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Όνομα</translation>
     </message>
     <message>
         <source>Value</source>
-        <translation>Τιμή</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Τιμή</translation>
+    </message>
+    <message>
+        <source>Full name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Πλήρες όνομα</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Περιγραφή</translation>
     </message>
     <message>
         <source>Base value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift (%1):</source>
+        <comment>measurement column</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Skip</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Όνομα</translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished">Τιμή</translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Shift (%1)*:</source>
         <translation type="unfinished"></translation>
@@ -4206,36 +4244,6 @@ Apply settings anyway?</source>
         <source>Please, select unique number for each column</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Name</source>
-        <comment>measurement column</comment>
-        <translation>Όνομα</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <comment>measurement column</comment>
-        <translation>Τιμή</translation>
-    </message>
-    <message>
-        <source>Full name</source>
-        <comment>measurement column</comment>
-        <translation>Πλήρες όνομα</translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <comment>measurement column</comment>
-        <translation>Περιγραφή</translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shift (%1):</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DialogMove</name>
@@ -4329,11 +4337,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -4351,6 +4355,10 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -4590,7 +4598,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -4794,6 +4802,10 @@ Apply settings anyway?</source>
         <source>Label language:</source>
         <translation>Γλώσσα ετικέτας:</translation>
     </message>
+    <message>
+        <source>yyyy-MM-dd</source>
+        <translation type="obsolete">χχχχ-ΜΜ-ηη</translation>
+    </message>
     <message>
         <source>Passmark length:</source>
         <translation type="unfinished"></translation>
@@ -5487,7 +5499,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5586,7 +5598,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5681,7 +5693,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5740,7 +5752,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5807,7 +5819,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5922,7 +5934,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5969,7 +5981,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6018,6 +6030,28 @@ Apply settings anyway?</source>
         </translation>
     </message>
 </context>
+<context>
+    <name>DialogPuzzlePreferences</name>
+    <message>
+        <source>Puzzle preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paths</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>Followed %n option(s) require restart to take effect: %1.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+</context>
 <context>
     <name>DialogRestrictDimension</name>
     <message>
@@ -6129,11 +6163,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Alias</source>
@@ -6151,6 +6181,10 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -6389,6 +6423,10 @@ Apply settings anyway?</source>
         <source>Numerical control</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogSeamAllowance</name>
@@ -6647,6 +6685,11 @@ Apply settings anyway?</source>
         <source>Use full circumference</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Height</source>
+        <comment>dimension</comment>
+        <translation type="unfinished">Ύψος</translation>
+    </message>
     <message>
         <source>Min value:</source>
         <translation type="unfinished"></translation>
@@ -6679,10 +6722,25 @@ Apply settings anyway?</source>
         <source>The base value for the column</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <comment>dimension</comment>
+        <translation type="unfinished">Μέγεθος</translation>
+    </message>
     <message>
         <source>Circumference</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Waist</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hip</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Please, provide correct data for dimensions</source>
         <translation type="unfinished"></translation>
@@ -6699,26 +6757,6 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Height</source>
-        <comment>dimension</comment>
-        <translation>Ύψος</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <comment>dimension</comment>
-        <translation>Μέγεθος</translation>
-    </message>
-    <message>
-        <source>Waist</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hip</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DialogShoulderPoint</name>
@@ -6828,7 +6866,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6871,7 +6909,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -7018,16 +7056,16 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogSplinePath</name>
@@ -7177,16 +7215,16 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogTapePreferences</name>
@@ -7365,7 +7403,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -7476,7 +7514,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Εργαλείο</translation>
+        <translation type="unfinished">Εργαλείο</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -8191,7 +8229,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>This file already opened in another window.</source>
-        <translation>Αυτό το αρχείο είναι ήδη ανοιχτό σε ένα άλλο παράθυρο.</translation>
+        <translation type="vanished">Αυτό το αρχείο είναι ήδη ανοιχτό σε ένα άλλο παράθυρο.</translation>
     </message>
     <message>
         <source>Wrong units.</source>
@@ -8628,27 +8666,15 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Locking file</source>
-        <translation>Κλείδωμα αρχείου</translation>
+        <translation type="vanished">Κλείδωμα αρχείου</translation>
     </message>
     <message>
         <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Αυτό το αρχείο είναι ήδη ανοιχτό σε άλλο παράθυρο. Αγνοήστε αν θέλετε να συνεχίσετε (δε συνιστάται, μπορεί να προκαλέσει καταστροφή δεδομένων).</translation>
-    </message>
-    <message>
-        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The lock file could not be created, for lack of permissions.</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Αυτό το αρχείο είναι ήδη ανοιχτό σε άλλο παράθυρο. Αγνοήστε αν θέλετε να συνεχίσετε (δε συνιστάται, μπορεί να προκαλέσει καταστροφή δεδομένων).</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation>Παρουσιάστηκε άγνωστο σφάλμα, για παράδειγμα μία πλήρης διχοτόμηση εμπόδισε την εγγραφή του αρχείου κλειδώματος.</translation>
+        <translation type="vanished">Παρουσιάστηκε άγνωστο σφάλμα, για παράδειγμα μία πλήρης διχοτόμηση εμπόδισε την εγγραφή του αρχείου κλειδώματος.</translation>
     </message>
     <message>
         <source>Report Bug...</source>
@@ -8790,17 +8816,9 @@ Do you want to save your changes?</source>
         <source>Select main path objects clockwise.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>The document has no write permissions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cannot set permissions for %1 to writable.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Could not save the file.</source>
-        <translation>Could not save the file.</translation>
+        <translation type="vanished">Could not save the file.</translation>
     </message>
     <message>
         <source>Could not save the file</source>
@@ -9187,7 +9205,43 @@ Do you want to save your changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to change the premissions?</source>
+        <source>Manual Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open the Puzzle app</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished">Ενημέρωση</translation>
+    </message>
+    <message>
+        <source>Update manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to prepare raw layout data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select manual layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9361,6 +9415,10 @@ Do you want to save your changes?</source>
         <source>Measurement file contains invalid known measurement(s).</source>
         <translation>Το αρχείο μετρήσεων περιλαμβάνει μη έγκυρες γνωστές μετρήσεις.</translation>
     </message>
+    <message>
+        <source>Wrong units.</source>
+        <translation type="vanished">Λανθασμένες μονάδες.</translation>
+    </message>
     <message>
         <source>File error.</source>
         <translation>Σφάλμα στο αρχείο.</translation>
@@ -9749,6 +9807,10 @@ Do you want to save your changes?</source>
         <source>My label templates</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>My manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PreferencesPatternPage</name>
@@ -9890,6 +9952,111 @@ This option will take an affect after restart.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>Puzzle</name>
+    <message>
+        <source>Export options can be used with single input file only.</source>
+        <translation type="unfinished">Οι επιλογές εξαγωγής μπορούν να χρησιμοποιηθούν μόνο με ένα αρχείο εισαγωγής.</translation>
+    </message>
+    <message>
+        <source>Valentina&apos;s manual layout editor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The manual layout file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesConfigurationPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished">Γλώσσα</translation>
+    </message>
+    <message>
+        <source>GUI language:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The text appears under the icon (recommended for beginners).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate dark mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t use the native file dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dark mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesPathPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paths that Valentina uses</source>
+        <translation type="unfinished">Διαδρομές φακέλων που χρησιμοποιεί το Valentina</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished">Τύπος</translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished">Προεπιλογή</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished">Επεξεργασία</translation>
+    </message>
+    <message>
+        <source>Open Directory</source>
+        <translation type="unfinished">Άνοιγμα φακέλου</translation>
+    </message>
+    <message>
+        <source>My Individual Measurements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Multisize Measurements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Patterns</source>
+        <translation type="unfinished">Πατρόν μου</translation>
+    </message>
+    <message>
+        <source>My Templates</source>
+        <translation type="unfinished">Πρότυπά μου</translation>
+    </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished">Διατάξεις μου</translation>
+    </message>
+</context>
 <context>
     <name>QCommandLineParser</name>
     <message>
@@ -10212,6 +10379,10 @@ This option will take an affect after restart.</source>
         <source>Can&apos;t convert toInt parameter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Piece name &apos;%1&apos; is not unique.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Could not find the segment start.</source>
         <translation type="unfinished"></translation>
@@ -10228,6 +10399,10 @@ This option will take an affect after restart.</source>
         <source>Error calculating segment for curve &apos;%1&apos;. %2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot prepare builtin passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
@@ -10244,18 +10419,14 @@ This option will take an affect after restart.</source>
         <source>Cannot prepare passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Piece name &apos;%1&apos; is not unique.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Cannot get tokens from formula &apos;%1&apos;. Formula error: %2.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>No data for the height dimension.</source>
         <translation type="unfinished"></translation>
@@ -10277,11 +10448,15 @@ This option will take an affect after restart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
+        <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
+        <source>Unplaced pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet 1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -10847,7 +11022,7 @@ This option will take an affect after restart.</source>
     </message>
     <message>
         <source>untitled</source>
-        <translation type="vanished">ανώνυμο</translation>
+        <translation>ανώνυμο</translation>
     </message>
     <message>
         <source>&lt;Empty&gt;</source>
@@ -11064,27 +11239,15 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Locking file</source>
-        <translation>Κλείδωμα αρχείου</translation>
+        <translation type="vanished">Κλείδωμα αρχείου</translation>
     </message>
     <message>
         <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Αυτό το αρχείο είναι ήδη ανοιχτό σε άλλο παράθυρο. Αγνοήστε αν θέλετε να συνεχίσετε (δε συνιστάται, μπορεί να προκαλέσει καταστροφή δεδομένων).</translation>
-    </message>
-    <message>
-        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The lock file could not be created, for lack of permissions.</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Αυτό το αρχείο είναι ήδη ανοιχτό σε άλλο παράθυρο. Αγνοήστε αν θέλετε να συνεχίσετε (δε συνιστάται, μπορεί να προκαλέσει καταστροφή δεδομένων).</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation>Παρουσιάστηκε άγνωστο σφάλμα, για παράδειγμα μία πλήρης διχοτόμηση εμπόδισε την εγγραφή του αρχείου κλειδώματος.</translation>
+        <translation type="vanished">Παρουσιάστηκε άγνωστο σφάλμα, για παράδειγμα μία πλήρης διχοτόμηση εμπόδισε την εγγραφή του αρχείου κλειδώματος.</translation>
     </message>
     <message>
         <source>Export to CSV</source>
@@ -11130,17 +11293,9 @@ Do you want to save your changes?</source>
         <source>All files</source>
         <translation>Όλα τα αρχεία</translation>
     </message>
-    <message>
-        <source>The measurements document has no write permissions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cannot set permissions for %1 to writable.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Could not save the file.</source>
-        <translation>Could not save the file.</translation>
+        <translation type="vanished">Could not save the file.</translation>
     </message>
     <message>
         <source>Could not save the file</source>
@@ -11270,17 +11425,43 @@ Do you want to save your changes?</source>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Search measurements by term. &lt;/p&gt;&lt;p&gt;Prepend &amp;quot;/r/&amp;quot; to the front of the search string to search measurements by regex.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Do you want to change the premissions?</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Cannot read settings from a malformed .INI file.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Όνομα</translation>
+    </message>
+    <message>
+        <source>Full name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Πλήρες όνομα</translation>
+    </message>
+    <message>
+        <source>Calculated value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Υπολογισμένη τιμή</translation>
+    </message>
+    <message>
+        <source>Formula</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Φόρμουλα</translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Correction</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Units:</source>
-        <translation>Μονάδες μέτρησης:</translation>
+        <translation type="unfinished">Μονάδες μέτρησης:</translation>
     </message>
     <message>
         <source>Shift B</source>
@@ -11380,46 +11561,16 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Inches</source>
-        <translation>Ίντσες</translation>
+        <translation type="unfinished">Ίντσες</translation>
     </message>
     <message>
         <source>Centimeters</source>
-        <translation>Εκατοστά</translation>
+        <translation type="unfinished">Εκατοστά</translation>
     </message>
     <message>
         <source>Degrees</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Name</source>
-        <comment>measurement column</comment>
-        <translation>Όνομα</translation>
-    </message>
-    <message>
-        <source>Full name</source>
-        <comment>measurement column</comment>
-        <translation>Πλήρες όνομα</translation>
-    </message>
-    <message>
-        <source>Calculated value</source>
-        <comment>measurement column</comment>
-        <translation>Υπολογισμένη τιμή</translation>
-    </message>
-    <message>
-        <source>Formula</source>
-        <comment>measurement column</comment>
-        <translation>Φόρμουλα</translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Correction</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Restrict first dimension</source>
         <translation type="unfinished"></translation>
@@ -11498,6 +11649,10 @@ Do you want to save your changes?</source>
         <source>Labels</source>
         <translation>Ετικέτες</translation>
     </message>
+    <message>
+        <source>Detail label visible</source>
+        <translation type="obsolete">Εμφάνιση ετικέτας λεπτομέρειας</translation>
+    </message>
     <message>
         <source>Width:</source>
         <translation>Φάρδος:</translation>
@@ -11608,19 +11763,19 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Pattern name:</source>
-        <translation>Όνομα πατρόν:</translation>
+        <translation type="unfinished">Όνομα πατρόν:</translation>
     </message>
     <message>
         <source>Pattern number:</source>
-        <translation>Αριθμός πατρόν:</translation>
+        <translation type="unfinished">Αριθμός πατρόν:</translation>
     </message>
     <message>
         <source>Company/Designer name:</source>
-        <translation>Όνομα Επιχείρησης/Σχεδιαστή:</translation>
+        <translation type="unfinished">Όνομα Επιχείρησης/Σχεδιαστή:</translation>
     </message>
     <message>
         <source>Customer name:</source>
-        <translation>Όνομα πελάτη:</translation>
+        <translation type="unfinished">Όνομα πελάτη:</translation>
     </message>
     <message>
         <source>Date format:</source>
@@ -11636,7 +11791,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>yyyy-MM-dd</source>
-        <translation>χχχχ-ΜΜ-ηη</translation>
+        <translation type="unfinished">χχχχ-ΜΜ-ηη</translation>
     </message>
     <message>
         <source>Customer email:</source>
@@ -11958,6 +12113,18 @@ Do you want to save your changes?</source>
         <comment>seam allowance</comment>
         <translation>Προσαρμογή</translation>
     </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Universally Unique IDentifier of piece. Used to identifier piece while updating manual layout. Left empty to generate new value.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TabPlaceLabels</name>
@@ -12129,6 +12296,14 @@ Do you want to save your changes?</source>
         <source>The text appears under the icon (recommended for beginners).</source>
         <translation>Το κείμενο εμφανίζεται κάτω απο το εικονίδιο (συνιστάται για αρχάριους).</translation>
     </message>
+    <message>
+        <source>Default height and size</source>
+        <translation type="obsolete">Προεπιλεγμένο ύψος και μέγεθος</translation>
+    </message>
+    <message>
+        <source>Default size:</source>
+        <translation type="obsolete">Εξ&apos;ορισμού μέγεθος:</translation>
+    </message>
     <message>
         <source>With OS options</source>
         <translation>Με επιλογές του λειτουργικού συστήματος</translation>
@@ -12192,6 +12367,10 @@ Do you want to save your changes?</source>
         <source>My Patterns</source>
         <translation>Πατρόν μου</translation>
     </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished">Διατάξεις μου</translation>
+    </message>
 </context>
 <context>
     <name>TogglePieceForceForbidFlipping</name>
@@ -12236,19 +12415,15 @@ Do you want to save your changes?</source>
         <source>Base value invalid</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Size</source>
-        <translation>Μέγεθος</translation>
-    </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Ύψος</translation>
+        <translation type="unfinished">Ύψος</translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Μέγεθος</translation>
+        <translation type="unfinished">Μέγεθος</translation>
     </message>
     <message>
         <source>Waist</source>
@@ -12270,6 +12445,10 @@ Do you want to save your changes?</source>
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished">Μέγεθος</translation>
+    </message>
     <message>
         <source>Chest circumference</source>
         <comment>dimension</comment>
@@ -12447,7 +12626,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Comma-Separated Values</source>
-        <translation>Τιμές χωρισμένες με κόμμα</translation>
+        <translation type="unfinished">Τιμές χωρισμένες με κόμμα</translation>
     </message>
     <message>
         <source>values</source>
@@ -12455,7 +12634,51 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Export to CSV</source>
-        <translation>Εξαγωγή σε CSV</translation>
+        <translation type="unfinished">Εξαγωγή σε CSV</translation>
+    </message>
+    <message>
+        <source>The measurements document has no write permissions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to change the premissions?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot set permissions for %1 to writable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Locking file</source>
+        <translation type="unfinished">Κλείδωμα αρχείου</translation>
+    </message>
+    <message>
+        <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished">Αυτό το αρχείο είναι ήδη ανοιχτό σε άλλο παράθυρο. Αγνοήστε αν θέλετε να συνεχίσετε (δε συνιστάται, μπορεί να προκαλέσει καταστροφή δεδομένων).</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This file already opened in another window.</source>
+        <translation type="unfinished">Αυτό το αρχείο είναι ήδη ανοιχτό σε ένα άλλο παράθυρο.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
+        <translation type="unfinished">Παρουσιάστηκε άγνωστο σφάλμα, για παράδειγμα μία πλήρης διχοτόμηση εμπόδισε την εγγραφή του αρχείου κλειδώματος.</translation>
     </message>
 </context>
 <context>
@@ -13110,6 +13333,34 @@ Do you want to save your changes?</source>
         <source>The dimension C base</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>The filename of exported layout file. Use it to enable console export mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The filename of layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pattern pieces form the raw layout data file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The raw layout data file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to output format (default = 0, export mode): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to tiled pdf page template (default = 0, export mode with tiled pdf format): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run the program in a test mode. The program in this mode loads a single layout file and silently quit without showing the main window. The key have priority before key &apos;%1&apos;.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VCommonSettings</name>
@@ -13137,6 +13388,10 @@ Do you want to save your changes?</source>
         <source>patterns</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VContainer</name>
@@ -13341,6 +13596,10 @@ Do you want to save your changes?</source>
 </context>
 <context>
     <name>VLayoutExporter</name>
+    <message>
+        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot set printer page size</source>
         <translation type="unfinished"></translation>
@@ -13354,12 +13613,12 @@ Do you want to save your changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Creating file &apos;%1&apos; failed! %2</source>
-        <translation>Η δημιουργία αρχείου &apos;%1&apos; απέτυχε! %2</translation>
+        <source>Export raw layout data failed. %1.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
-        <translation type="unfinished"></translation>
+        <source>Creating file &apos;%1&apos; failed! %2</source>
+        <translation type="unfinished">Η δημιουργία αρχείου &apos;%1&apos; απέτυχε! %2</translation>
     </message>
     <message>
         <source>Can&apos;t create an flat dxf file.</source>
@@ -13393,15 +13652,15 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>None</source>
-        <translation>Κανένα</translation>
+        <translation type="unfinished">Κανένα</translation>
     </message>
     <message>
         <source>Height</source>
-        <translation>Ύψος</translation>
+        <translation type="unfinished">Ύψος</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Μέγεθος</translation>
+        <translation type="unfinished">Μέγεθος</translation>
     </message>
     <message>
         <source>Hip</source>
@@ -13547,6 +13806,114 @@ Do you want to save your changes?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>VPApplication</name>
+    <message>
+        <source>Error parsing file. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error bad id. Program will be terminated.</source>
+        <translation type="unfinished">Σφάλμα κακής ταυτότητας. Το πρόγραμμα θα τερματιστεί.</translation>
+    </message>
+    <message>
+        <source>Error can&apos;t convert value. Program will be terminated.</source>
+        <translation type="unfinished">Σφάλμα λόγω αδυναμίας μετατροπής της τιμής. Το πρόγραμμα θα τερματιστεί.</translation>
+    </message>
+    <message>
+        <source>Error empty parameter. Program will be terminated.</source>
+        <translation type="unfinished">Σφάλμα λόγω κενής παραμέτρου. Το πρόγραμμα θα τερματιστεί.</translation>
+    </message>
+    <message>
+        <source>Error wrong id. Program will be terminated.</source>
+        <translation type="unfinished">Σφάλμα λόγω λάθους ταυτότητας. Το πρόγραμμα θα τερματιστεί.</translation>
+    </message>
+    <message>
+        <source>Something&apos;s wrong!!</source>
+        <translation type="unfinished">Υπάρχει σφάλμα!!</translation>
+    </message>
+    <message>
+        <source>Exception thrown: %1. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t begin to listen for incoming connections on name &apos;%1&apos;</source>
+        <translation type="unfinished">Δεν μπορεί να αρχίσει να ακούει τις εισερχόμενες συνδέσεις στο όνομα &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <source>Export mode doesn&apos;t support openning several files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import raw layout data does not support openning several layout files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, provide one input file.</source>
+        <translation type="unfinished">Παρακαλώ, δώστε ένα αρχείο εισόδου.</translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrousel</name>
+    <message>
+        <source>Pieces of </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrouselPieceList</name>
+    <message>
+        <source>Move to Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Διαγραφή</translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPDialogAbout</name>
+    <message>
+        <source>About Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Puzzle version</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Build revision:</source>
+        <translation type="unfinished">Αναθεώρηση έκδοσης:</translation>
+    </message>
+    <message>
+        <source>This program is part of Valentina project.</source>
+        <translation type="unfinished">Αυτό το πρόγραμμα είναι μέρος του Valentina project.</translation>
+    </message>
+    <message>
+        <source>Check For Updates</source>
+        <translation type="unfinished">Έλεγχος για ενημερώσεις</translation>
+    </message>
+    <message>
+        <source>Cannot open your default browser</source>
+        <translation type="unfinished">Δεν είναι δυνατό το άνοιγμα του προεπιλεγμένου περιηγητή</translation>
+    </message>
+    <message>
+        <source>Build revision: %1</source>
+        <translation type="unfinished">Αναθεώρηση έκδοσης: %1</translation>
+    </message>
+    <message>
+        <source>Built on %1 at %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Web site : %1</source>
+        <translation type="unfinished">Ιστοσελίδα : %1</translation>
+    </message>
+</context>
 <context>
     <name>VPE::VBoolProperty</name>
     <message>
@@ -13569,6 +13936,573 @@ Do you want to save your changes?</source>
         <translation>Άνοιγμα αρχείου</translation>
     </message>
 </context>
+<context>
+    <name>VPGraphicsPiece</name>
+    <message>
+        <source>Move to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPLayoutFileReader</name>
+    <message>
+        <source>Piece List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Got empty attribute &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPMainWindow</name>
+    <message>
+        <source>Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;Αρχείο</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished">&amp;Βοήθεια</translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished">Μενού</translation>
+    </message>
+    <message>
+        <source>Piece Carrousel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Infos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Όνομα:</translation>
+    </message>
+    <message>
+        <source>DummyName</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UUID:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{7b2ce4ae-96f5-4905-bb34-405cb40ca208}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Geometry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mirror piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotation</source>
+        <translation type="unfinished">Περιστροφή</translation>
+    </message>
+    <message>
+        <source>Angle:</source>
+        <translation type="unfinished">Γωνία:</translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° anti-clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Placement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Y:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No piece selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple pieces selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Width</source>
+        <translation type="unfinished">Φάρδος</translation>
+    </message>
+    <message>
+        <source>Length</source>
+        <translation type="unfinished">Μήκος</translation>
+    </message>
+    <message>
+        <source>Orientation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove unused length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Margins</source>
+        <translation type="unfinished">Περιθώρια</translation>
+    </message>
+    <message>
+        <source>Right:</source>
+        <translation type="unfinished">Δεξιά:</translation>
+    </message>
+    <message>
+        <source>Top:</source>
+        <translation type="unfinished">Επάνω:</translation>
+    </message>
+    <message>
+        <source>Left:</source>
+        <translation type="unfinished">Αριστερά:</translation>
+    </message>
+    <message>
+        <source>Bottom:</source>
+        <translation type="unfinished">Κάτω:</translation>
+    </message>
+    <message>
+        <source>Placement Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Row height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Follow grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vertical grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Horizontal grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pieces gap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sticky edges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation type="unfinished">Εξαγωγή</translation>
+    </message>
+    <message>
+        <source>Export Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiles properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiled Pdf Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Tiles on sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export Tiled Pdf</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation type="unfinished">Τοποθέτηση</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Όνομα</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Περιγραφή</translation>
+    </message>
+    <message>
+        <source>Unit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning superposition of pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning pieces out of bound</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation type="unfinished">&amp;Άνοιγμα</translation>
+    </message>
+    <message>
+        <source>Ctrl+O</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Αποθήκευση</translation>
+    </message>
+    <message>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save &amp;As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Import Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation type="unfinished">Έ&amp;ξοδος</translation>
+    </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation type="unfinished">&amp;Νέο</translation>
+    </message>
+    <message>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation type="unfinished">Σχετικά &amp;Qt</translation>
+    </message>
+    <message>
+        <source>About &amp;Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom in</source>
+        <translation type="unfinished">Μεγέθυνση</translation>
+    </message>
+    <message>
+        <source>Zoom out</source>
+        <translation type="unfinished">Σμίκρυνση</translation>
+    </message>
+    <message>
+        <source>Zoom 1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom fit best</source>
+        <translation type="unfinished">Προσαρμογή zoom</translation>
+    </message>
+    <message>
+        <source>Zoom sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished">Προτιμήσεις</translation>
+    </message>
+    <message>
+        <source>File &apos;%1&apos; doesn&apos;t exist!</source>
+        <translation type="unfinished">Το αρχείο &apos;%1&apos; δεν υπάρχει!</translation>
+    </message>
+    <message>
+        <source>File error.</source>
+        <translation type="unfinished">Σφάλμα στο αρχείο.</translation>
+    </message>
+    <message>
+        <source>Unable to read a layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fail to create layout.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not extract data from file &apos;%1&apos;. %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Centimeters</source>
+        <translation type="unfinished">Εκατοστά</translation>
+    </message>
+    <message>
+        <source>Millimiters</source>
+        <translation type="unfinished">Χιλιοστά</translation>
+    </message>
+    <message>
+        <source>Inches</source>
+        <translation type="unfinished">Ίντσες</translation>
+    </message>
+    <message>
+        <source>Scale:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>untitled %1.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>untitled.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read only</source>
+        <translation type="unfinished">μόνο για ανάγνωση</translation>
+    </message>
+    <message>
+        <source>Cannot read settings from a malformed .INI file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save settings. Access denied.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to open file, is it writable?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New Window</source>
+        <translation type="unfinished">&amp;Νέο παράθυρο</translation>
+    </message>
+    <message>
+        <source>Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open file</source>
+        <translation type="unfinished">Άνοιγμα αρχείου</translation>
+    </message>
+    <message>
+        <source>Could not save the file</source>
+        <translation type="unfinished">Δεν ήταν δυνατή η αποθήκευση του αρχείου</translation>
+    </message>
+    <message>
+        <source>layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save as</source>
+        <translation type="unfinished">Αποθήκευση ως</translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window.</source>
+        <translation type="unfinished">Αποτυχία κλειδώματος. Το αρχείο έχει ήδη ανοιχτεί σε ένα άλλο παράθυρο.</translation>
+    </message>
+    <message>
+        <source>Could not save file</source>
+        <translation type="unfinished">Δεν είναι δυνατή η αποθήκευση αρχείου</translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window. Expect collissions when run 2 copies of the program.</source>
+        <translation type="unfinished">Αποτυχία κλειδώματος. Αυτό το αρχείο έχει ήδη ανοιχτεί σε ένα άλλο παράθυρο. Αναμένετε συγκρούσεις όταν τρέχετε 2 αντίγραφα του προγράμματος.</translation>
+    </message>
+    <message>
+        <source>Raw Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About Qt</source>
+        <translation type="unfinished">Σχετικά με το Qt</translation>
+    </message>
+    <message>
+        <source>PDF Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SVG Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPSheet</name>
+    <message>
+        <source>Letter</source>
+        <translation type="unfinished">Letter</translation>
+    </message>
+    <message>
+        <source>Legal</source>
+        <translation type="unfinished">Legal</translation>
+    </message>
+    <message>
+        <source>Tabloid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 24in</source>
+        <translation type="unfinished">Ρολό 24 ιντσών</translation>
+    </message>
+    <message>
+        <source>Roll 30in</source>
+        <translation type="unfinished">Ρολό 30 ιντσών</translation>
+    </message>
+    <message>
+        <source>Roll 36in</source>
+        <translation type="unfinished">Ρολό 36 ιντσών</translation>
+    </message>
+    <message>
+        <source>Roll 42in</source>
+        <translation type="unfinished">Ρολό 42 ιντσών</translation>
+    </message>
+    <message>
+        <source>Roll 44in</source>
+        <translation type="unfinished">Ρολό 44 ιντσών</translation>
+    </message>
+    <message>
+        <source>Roll 48in</source>
+        <translation type="unfinished">Ρολό 44 ιντσών {48i?}</translation>
+    </message>
+    <message>
+        <source>Roll 62in</source>
+        <translation type="unfinished">Ρολό 44 ιντσών {62i?}</translation>
+    </message>
+    <message>
+        <source>Roll 72in</source>
+        <translation type="unfinished">Ρολό 44 ιντσών {72i?}</translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation type="unfinished">Προσαρμογή</translation>
+    </message>
+</context>
+<context>
+    <name>VPTileFactory</name>
+    <message>
+        <source>Grid ( %1 , %2 )</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page %1 of %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VPattern</name>
     <message>
@@ -13926,11 +14860,11 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Print error</source>
-        <translation>Σφάλμα εκτύπωσης</translation>
+        <translation type="unfinished">Σφάλμα εκτύπωσης</translation>
     </message>
     <message>
         <source>Cannot proceed because there are no available printers in your system.</source>
-        <translation>Η συνέχεια είναι αδύνατη διότι δεν υπάρχουν διαθέσιμοι εκτυπωτές στ σύστημα.</translation>
+        <translation type="unfinished">Η συνέχεια είναι αδύνατη διότι δεν υπάρχουν διαθέσιμοι εκτυπωτές στ σύστημα.</translation>
     </message>
     <message>
         <source>Failed to open file, is it writable?</source>
@@ -13974,13 +14908,18 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>The layout was not updated since last pattern modification. Do you want to continue?</source>
-        <translation>Η τοποθέτηση δέν ενημερώθηκε μετά απο την τελευταία αλλαγή πατρόν. Θέλετε να συνεχίσετε;</translation>
+        <translation type="unfinished">Η τοποθέτηση δέν ενημερώθηκε μετά απο την τελευταία αλλαγή πατρόν. Θέλετε να συνεχίσετε;</translation>
     </message>
 </context>
 <context>
-    <name>VSettings</name>
+    <name>VRawLayout</name>
     <message>
-        <source>layouts</source>
+        <source>VRawLayout::ReadFile() failed. Raw layout format prefix mismatch error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VRawLayout::ReadFile() failed.
+Raw layout format compatibility error: actualFileVersion = %1 and fileVersion = %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -14910,7 +15849,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Notes:</source>
-        <translation>Σημειώσεις:</translation>
+        <translation type="unfinished">Σημειώσεις:</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -16535,6 +17474,13 @@ Do you want to save your changes?</source>
         <translation type="vanished">Σφάλμα στην επαναφορά του αρχείου ασφαλείας: %1.</translation>
     </message>
 </context>
+<context>
+    <name>VValentinaSettings</name>
+    <message>
+        <source>layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VWidgetDetails</name>
     <message>
diff --git a/share/translations/valentina_en_CA.ts b/share/translations/valentina_en_CA.ts
index 60b5ea23c..8ba81e745 100644
--- a/share/translations/valentina_en_CA.ts
+++ b/share/translations/valentina_en_CA.ts
@@ -576,7 +576,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -707,16 +707,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogArcWithLength</name>
@@ -834,16 +834,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogBisector</name>
@@ -965,7 +965,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -1036,16 +1036,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCubicBezierPath</name>
@@ -1095,16 +1095,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCurveIntersectAxis</name>
@@ -1206,7 +1206,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -1297,11 +1297,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1311,6 +1307,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCutSpline</name>
@@ -1388,11 +1388,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1402,6 +1398,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCutSplinePath</name>
@@ -1479,11 +1479,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1493,6 +1489,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogDateTimeFormats</name>
@@ -1795,15 +1795,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Value</source>
-        <translation>Value</translation>
-    </message>
-    <message>
-        <source>Label</source>
+        <source>Dimension:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dimension:</source>
+        <source>Value</source>
+        <translation type="unfinished">Value</translation>
+    </message>
+    <message>
+        <source>Label</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1958,6 +1958,14 @@
         <source>Measurments file name</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Size</translation>
+    </message>
+    <message>
+        <source>Height</source>
+        <translation type="obsolete">Height</translation>
+    </message>
     <message>
         <source>Measurments extension</source>
         <translation type="unfinished"></translation>
@@ -2086,19 +2094,15 @@
         <source>Customer email</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Measurement: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Height</translation>
+        <translation type="unfinished">Height</translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Size</translation>
+        <translation type="unfinished">Size</translation>
     </message>
     <message>
         <source>Hip</source>
@@ -2111,23 +2115,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No data for the height dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the size dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the hip dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the waist dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Final measurement: %1</source>
+        <source>Measurement: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2150,6 +2138,26 @@
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Final measurement: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the height dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the size dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the hip dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the waist dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogEditWrongFormula</name>
@@ -2382,16 +2390,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogEndLine</name>
@@ -2497,7 +2505,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -2727,11 +2735,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -2749,6 +2753,10 @@
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -2846,11 +2854,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -2868,6 +2872,10 @@
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -3020,7 +3028,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -3882,7 +3890,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -3949,7 +3957,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -4076,7 +4084,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -4231,11 +4239,11 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Full name:</source>
-        <translation>Full name:</translation>
+        <translation type="unfinished">Full name:</translation>
     </message>
     <message>
         <source>Description:</source>
-        <translation>Description:</translation>
+        <translation type="unfinished">Description:</translation>
     </message>
     <message>
         <source>Ready</source>
@@ -4243,20 +4251,50 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Name</source>
-        <translation>Name</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>Value</source>
-        <translation>Value</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Value</translation>
+    </message>
+    <message>
+        <source>Full name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Full name</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Description</translation>
     </message>
     <message>
         <source>Base value</source>
-        <translation>Base value</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Base value</translation>
+    </message>
+    <message>
+        <source>Shift (%1):</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Skip</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished">Value</translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <translation type="unfinished">Base value</translation>
+    </message>
     <message>
         <source>Shift (%1)*:</source>
         <translation type="unfinished"></translation>
@@ -4277,36 +4315,6 @@ Apply settings anyway?</source>
         <source>Please, select unique number for each column</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Name</source>
-        <comment>measurement column</comment>
-        <translation>Name</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <comment>measurement column</comment>
-        <translation>Value</translation>
-    </message>
-    <message>
-        <source>Full name</source>
-        <comment>measurement column</comment>
-        <translation>Full name</translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <comment>measurement column</comment>
-        <translation>Description</translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <comment>measurement column</comment>
-        <translation>Base value</translation>
-    </message>
-    <message>
-        <source>Shift (%1):</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DialogMove</name>
@@ -4400,11 +4408,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -4422,6 +4426,10 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -4661,7 +4669,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -4869,6 +4877,10 @@ Apply settings anyway?</source>
         <source>Label language:</source>
         <translation>Label language:</translation>
     </message>
+    <message>
+        <source>yyyy-MM-dd</source>
+        <translation type="obsolete">yyyy-MM-dd</translation>
+    </message>
     <message>
         <source>Passmark length:</source>
         <translation type="unfinished"></translation>
@@ -5570,7 +5582,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5669,7 +5681,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5764,7 +5776,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5823,7 +5835,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5890,7 +5902,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6005,7 +6017,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6052,7 +6064,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6101,6 +6113,28 @@ Apply settings anyway?</source>
         </translation>
     </message>
 </context>
+<context>
+    <name>DialogPuzzlePreferences</name>
+    <message>
+        <source>Puzzle preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished">Configuration</translation>
+    </message>
+    <message>
+        <source>Paths</source>
+        <translation type="unfinished">Paths</translation>
+    </message>
+    <message numerus="yes">
+        <source>Followed %n option(s) require restart to take effect: %1.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+</context>
 <context>
     <name>DialogRestrictDimension</name>
     <message>
@@ -6212,11 +6246,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias</source>
@@ -6234,6 +6264,10 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -6476,6 +6510,10 @@ Apply settings anyway?</source>
         <source>Numerical control</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogSeamAllowance</name>
@@ -6734,6 +6772,11 @@ Apply settings anyway?</source>
         <source>Use full circumference</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Height</source>
+        <comment>dimension</comment>
+        <translation type="unfinished">Height</translation>
+    </message>
     <message>
         <source>Min value:</source>
         <translation type="unfinished"></translation>
@@ -6766,10 +6809,25 @@ Apply settings anyway?</source>
         <source>The base value for the column</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <comment>dimension</comment>
+        <translation type="unfinished">Size</translation>
+    </message>
     <message>
         <source>Circumference</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Waist</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hip</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Please, provide correct data for dimensions</source>
         <translation type="unfinished"></translation>
@@ -6786,26 +6844,6 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Height</source>
-        <comment>dimension</comment>
-        <translation>Height</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <comment>dimension</comment>
-        <translation>Size</translation>
-    </message>
-    <message>
-        <source>Waist</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hip</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DialogShoulderPoint</name>
@@ -6915,7 +6953,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6958,7 +6996,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -7105,16 +7143,16 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogSplinePath</name>
@@ -7264,16 +7302,16 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogTapePreferences</name>
@@ -7456,7 +7494,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -7567,7 +7605,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -8306,7 +8344,7 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>This file already opened in another window.</source>
-        <translation>This file already opened in another window.</translation>
+        <translation type="vanished">This file already opened in another window.</translation>
     </message>
     <message>
         <source>Wrong units.</source>
@@ -8759,27 +8797,27 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>Locking file</source>
-        <translation>Locking file</translation>
+        <translation type="vanished">Locking file</translation>
     </message>
     <message>
         <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+        <translation type="vanished">This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+        <translation type="vanished">The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+        <translation type="vanished">Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions.</source>
-        <translation>The lock file could not be created, for lack of permissions.</translation>
+        <translation type="vanished">The lock file could not be created, for lack of permissions.</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation>Unknown error happened, for instance a full partition prevented writing out the lock file.</translation>
+        <translation type="vanished">Unknown error happened, for instance a full partition prevented writing out the lock file.</translation>
     </message>
     <message>
         <source>Report Bug...</source>
@@ -8939,15 +8977,15 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>The document has no write permissions.</source>
-        <translation>The document has no write permissions.</translation>
+        <translation type="vanished">The document has no write permissions.</translation>
     </message>
     <message>
         <source>Cannot set permissions for %1 to writable.</source>
-        <translation>Cannot set permissions for %1 to writable.</translation>
+        <translation type="vanished">Cannot set permissions for %1 to writable.</translation>
     </message>
     <message>
         <source>Could not save the file.</source>
-        <translation>Could not save the file.</translation>
+        <translation type="vanished">Could not save the file.</translation>
     </message>
     <message>
         <source>Could not save the file</source>
@@ -9334,7 +9372,43 @@ Do you want to save your changes?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to change the premissions?</source>
+        <source>Manual Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open the Puzzle app</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished">Update</translation>
+    </message>
+    <message>
+        <source>Update manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to prepare raw layout data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select manual layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9532,6 +9606,10 @@ Do you want to save your changes?</translation>
         <source>Measurement file contains invalid known measurement(s).</source>
         <translation>Measurement file contains invalid known measurement(s).</translation>
     </message>
+    <message>
+        <source>Wrong units.</source>
+        <translation type="vanished">Wrong units.</translation>
+    </message>
     <message>
         <source>File error.</source>
         <translation>File error.</translation>
@@ -9956,6 +10034,10 @@ Do you want to save your changes?</translation>
         <source>My label templates</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>My manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PreferencesPatternPage</name>
@@ -10097,6 +10179,111 @@ This option will take an affect after restart.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>Puzzle</name>
+    <message>
+        <source>Export options can be used with single input file only.</source>
+        <translation type="unfinished">Export options can be used with single input file only.</translation>
+    </message>
+    <message>
+        <source>Valentina&apos;s manual layout editor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The manual layout file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesConfigurationPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished">Language</translation>
+    </message>
+    <message>
+        <source>GUI language:</source>
+        <translation type="unfinished">GUI language:</translation>
+    </message>
+    <message>
+        <source>Toolbar</source>
+        <translation type="unfinished">Toolbar</translation>
+    </message>
+    <message>
+        <source>The text appears under the icon (recommended for beginners).</source>
+        <translation type="unfinished">The text appears under the icon (recommended for beginners).</translation>
+    </message>
+    <message>
+        <source>User Interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate dark mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t use the native file dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dark mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesPathPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <source>Paths that Valentina uses</source>
+        <translation type="unfinished">Paths that Valentina uses</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished">Type</translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished">Path</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished">Default</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished">Edit</translation>
+    </message>
+    <message>
+        <source>Open Directory</source>
+        <translation type="unfinished">Open Directory</translation>
+    </message>
+    <message>
+        <source>My Individual Measurements</source>
+        <translation type="unfinished">My Individual Measurements</translation>
+    </message>
+    <message>
+        <source>My Multisize Measurements</source>
+        <translation type="unfinished">My Multisize Measurements</translation>
+    </message>
+    <message>
+        <source>My Patterns</source>
+        <translation type="unfinished">My Patterns</translation>
+    </message>
+    <message>
+        <source>My Templates</source>
+        <translation type="unfinished">My Templates</translation>
+    </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished">My Layouts</translation>
+    </message>
+</context>
 <context>
     <name>QApplication</name>
     <message>
@@ -10442,6 +10629,10 @@ This option will take an affect after restart.</source>
         <source>Can&apos;t convert toInt parameter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Piece name &apos;%1&apos; is not unique.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Could not find the segment start.</source>
         <translation type="unfinished"></translation>
@@ -10458,6 +10649,10 @@ This option will take an affect after restart.</source>
         <source>Error calculating segment for curve &apos;%1&apos;. %2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot prepare builtin passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
@@ -10474,18 +10669,14 @@ This option will take an affect after restart.</source>
         <source>Cannot prepare passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Piece name &apos;%1&apos; is not unique.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Cannot get tokens from formula &apos;%1&apos;. Formula error: %2.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>No data for the height dimension.</source>
         <translation type="unfinished"></translation>
@@ -10507,11 +10698,15 @@ This option will take an affect after restart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
+        <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
+        <source>Unplaced pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet 1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -11107,7 +11302,7 @@ This option will take an affect after restart.</source>
     </message>
     <message>
         <source>untitled</source>
-        <translation type="vanished">untitled</translation>
+        <translation>untitled</translation>
     </message>
     <message>
         <source>&lt;Empty&gt;</source>
@@ -11344,27 +11539,27 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>Locking file</source>
-        <translation>Locking file</translation>
+        <translation type="vanished">Locking file</translation>
     </message>
     <message>
         <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+        <translation type="vanished">This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+        <translation type="vanished">The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+        <translation type="vanished">Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions.</source>
-        <translation>The lock file could not be created, for lack of permissions.</translation>
+        <translation type="vanished">The lock file could not be created, for lack of permissions.</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation>Unknown error happened, for instance a full partition prevented writing out the lock file.</translation>
+        <translation type="vanished">Unknown error happened, for instance a full partition prevented writing out the lock file.</translation>
     </message>
     <message>
         <source>Export to CSV</source>
@@ -11412,15 +11607,15 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>The measurements document has no write permissions.</source>
-        <translation>The measurements document has no write permissions.</translation>
+        <translation type="vanished">The measurements document has no write permissions.</translation>
     </message>
     <message>
         <source>Cannot set permissions for %1 to writable.</source>
-        <translation>Cannot set permissions for %1 to writable.</translation>
+        <translation type="vanished">Cannot set permissions for %1 to writable.</translation>
     </message>
     <message>
         <source>Could not save the file.</source>
-        <translation>Could not save the file.</translation>
+        <translation type="vanished">Could not save the file.</translation>
     </message>
     <message>
         <source>Could not save the file</source>
@@ -11550,17 +11745,43 @@ Do you want to save your changes?</translation>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Search measurements by term. &lt;/p&gt;&lt;p&gt;Prepend &amp;quot;/r/&amp;quot; to the front of the search string to search measurements by regex.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Do you want to change the premissions?</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Cannot read settings from a malformed .INI file.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <source>Full name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Full name</translation>
+    </message>
+    <message>
+        <source>Calculated value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Calculated value</translation>
+    </message>
+    <message>
+        <source>Formula</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Formula</translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Base value</translation>
+    </message>
+    <message>
+        <source>Correction</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Units:</source>
-        <translation>Units:</translation>
+        <translation type="unfinished">Units:</translation>
     </message>
     <message>
         <source>Shift B</source>
@@ -11660,46 +11881,16 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>Inches</source>
-        <translation>Inches</translation>
+        <translation type="unfinished">Inches</translation>
     </message>
     <message>
         <source>Centimeters</source>
-        <translation>Centimeters</translation>
+        <translation type="unfinished">Centimeters</translation>
     </message>
     <message>
         <source>Degrees</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Name</source>
-        <comment>measurement column</comment>
-        <translation>Name</translation>
-    </message>
-    <message>
-        <source>Full name</source>
-        <comment>measurement column</comment>
-        <translation>Full name</translation>
-    </message>
-    <message>
-        <source>Calculated value</source>
-        <comment>measurement column</comment>
-        <translation>Calculated value</translation>
-    </message>
-    <message>
-        <source>Formula</source>
-        <comment>measurement column</comment>
-        <translation>Formula</translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <comment>measurement column</comment>
-        <translation>Base value</translation>
-    </message>
-    <message>
-        <source>Correction</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Restrict first dimension</source>
         <translation type="unfinished"></translation>
@@ -11778,6 +11969,10 @@ Do you want to save your changes?</translation>
         <source>Labels</source>
         <translation>Labels</translation>
     </message>
+    <message>
+        <source>Detail label visible</source>
+        <translation type="vanished">Detail label visible</translation>
+    </message>
     <message>
         <source>Width:</source>
         <translation>Width:</translation>
@@ -11888,19 +12083,19 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>Pattern name:</source>
-        <translation>Pattern name:</translation>
+        <translation type="unfinished">Pattern name:</translation>
     </message>
     <message>
         <source>Pattern number:</source>
-        <translation>Pattern number:</translation>
+        <translation type="unfinished">Pattern number:</translation>
     </message>
     <message>
         <source>Company/Designer name:</source>
-        <translation>Company/Designer name:</translation>
+        <translation type="unfinished">Company/Designer name:</translation>
     </message>
     <message>
         <source>Customer name:</source>
-        <translation>Customer name:</translation>
+        <translation type="unfinished">Customer name:</translation>
     </message>
     <message>
         <source>Date format:</source>
@@ -11916,7 +12111,7 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>yyyy-MM-dd</source>
-        <translation>yyyy-MM-dd</translation>
+        <translation type="unfinished">yyyy-MM-dd</translation>
     </message>
     <message>
         <source>Customer email:</source>
@@ -12238,6 +12433,18 @@ Do you want to save your changes?</translation>
         <comment>seam allowance</comment>
         <translation>Custom</translation>
     </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Universally Unique IDentifier of piece. Used to identifier piece while updating manual layout. Left empty to generate new value.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TabPlaceLabels</name>
@@ -12413,6 +12620,18 @@ Do you want to save your changes?</translation>
         <source>The text appears under the icon (recommended for beginners).</source>
         <translation>The text appears under the icon (recommended for beginners).</translation>
     </message>
+    <message>
+        <source>Default height and size</source>
+        <translation type="vanished">Default height and size</translation>
+    </message>
+    <message>
+        <source>Default height:</source>
+        <translation type="vanished">Default height:</translation>
+    </message>
+    <message>
+        <source>Default size:</source>
+        <translation type="vanished">Default size:</translation>
+    </message>
     <message>
         <source>With OS options</source>
         <translation>With OS options</translation>
@@ -12476,6 +12695,10 @@ Do you want to save your changes?</translation>
         <source>My Patterns</source>
         <translation>My Patterns</translation>
     </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished">My Layouts</translation>
+    </message>
 </context>
 <context>
     <name>ToggleDetailInLayout</name>
@@ -12527,19 +12750,15 @@ Do you want to save your changes?</translation>
         <source>Base value invalid</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Size</source>
-        <translation>Size</translation>
-    </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Height</translation>
+        <translation type="unfinished">Height</translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Size</translation>
+        <translation type="unfinished">Size</translation>
     </message>
     <message>
         <source>Waist</source>
@@ -12561,6 +12780,10 @@ Do you want to save your changes?</translation>
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished">Size</translation>
+    </message>
     <message>
         <source>Chest circumference</source>
         <comment>dimension</comment>
@@ -12752,7 +12975,7 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>Comma-Separated Values</source>
-        <translation>Comma-Separated Values</translation>
+        <translation type="unfinished">Comma-Separated Values</translation>
     </message>
     <message>
         <source>values</source>
@@ -12760,7 +12983,51 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>Export to CSV</source>
-        <translation>Export to CSV</translation>
+        <translation type="unfinished">Export to CSV</translation>
+    </message>
+    <message>
+        <source>The measurements document has no write permissions.</source>
+        <translation type="unfinished">The measurements document has no write permissions.</translation>
+    </message>
+    <message>
+        <source>Do you want to change the premissions?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot set permissions for %1 to writable.</source>
+        <translation type="unfinished">Cannot set permissions for %1 to writable.</translation>
+    </message>
+    <message>
+        <source>Could not save the file.</source>
+        <translation type="unfinished">Could not save the file.</translation>
+    </message>
+    <message>
+        <source>Locking file</source>
+        <translation type="unfinished">Locking file</translation>
+    </message>
+    <message>
+        <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished">This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished">The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished">Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+    </message>
+    <message>
+        <source>This file already opened in another window.</source>
+        <translation type="unfinished">This file already opened in another window.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions.</source>
+        <translation type="unfinished">The lock file could not be created, for lack of permissions.</translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
+        <translation type="unfinished">Unknown error happened, for instance a full partition prevented writing out the lock file.</translation>
     </message>
 </context>
 <context>
@@ -13543,6 +13810,34 @@ Do you want to save your changes?</translation>
         <source>The dimension C base</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>The filename of exported layout file. Use it to enable console export mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The filename of layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pattern pieces form the raw layout data file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The raw layout data file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to output format (default = 0, export mode): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to tiled pdf page template (default = 0, export mode with tiled pdf format): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run the program in a test mode. The program in this mode loads a single layout file and silently quit without showing the main window. The key have priority before key &apos;%1&apos;.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VCommonSettings</name>
@@ -13570,6 +13865,10 @@ Do you want to save your changes?</translation>
         <source>patterns</source>
         <translation>patterns</translation>
     </message>
+    <message>
+        <source>manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VContainer</name>
@@ -13817,25 +14116,29 @@ Do you want to save your changes?</translation>
 </context>
 <context>
     <name>VLayoutExporter</name>
+    <message>
+        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot set printer page size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot set printer margins</source>
-        <translation>Cannot set printer margins</translation>
+        <translation type="unfinished">Cannot set printer margins</translation>
     </message>
     <message>
         <source>Can&apos;t open file &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Creating file &apos;%1&apos; failed! %2</source>
-        <translation>Creating file &apos;%1&apos; failed! %2</translation>
+        <source>Export raw layout data failed. %1.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
-        <translation type="unfinished"></translation>
+        <source>Creating file &apos;%1&apos; failed! %2</source>
+        <translation type="unfinished">Creating file &apos;%1&apos; failed! %2</translation>
     </message>
     <message>
         <source>Can&apos;t create an flat dxf file.</source>
@@ -13869,15 +14172,15 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>None</translation>
+        <translation type="unfinished">None</translation>
     </message>
     <message>
         <source>Height</source>
-        <translation>Height</translation>
+        <translation type="unfinished">Height</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Size</translation>
+        <translation type="unfinished">Size</translation>
     </message>
     <message>
         <source>Hip</source>
@@ -14023,6 +14326,114 @@ Do you want to save your changes?</translation>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>VPApplication</name>
+    <message>
+        <source>Error parsing file. Program will be terminated.</source>
+        <translation type="unfinished">Error parsing file. Program will be terminated.</translation>
+    </message>
+    <message>
+        <source>Error bad id. Program will be terminated.</source>
+        <translation type="unfinished">Error bad id. Program will be terminated.</translation>
+    </message>
+    <message>
+        <source>Error can&apos;t convert value. Program will be terminated.</source>
+        <translation type="unfinished">Error can&apos;t convert value. Program will be terminated.</translation>
+    </message>
+    <message>
+        <source>Error empty parameter. Program will be terminated.</source>
+        <translation type="unfinished">Error empty parameter. Program will be terminated.</translation>
+    </message>
+    <message>
+        <source>Error wrong id. Program will be terminated.</source>
+        <translation type="unfinished">Error wrong id. Program will be terminated.</translation>
+    </message>
+    <message>
+        <source>Something&apos;s wrong!!</source>
+        <translation type="unfinished">Something&apos;s wrong!!</translation>
+    </message>
+    <message>
+        <source>Exception thrown: %1. Program will be terminated.</source>
+        <translation type="unfinished">Exception thrown: %1. Program will be terminated.</translation>
+    </message>
+    <message>
+        <source>Can&apos;t begin to listen for incoming connections on name &apos;%1&apos;</source>
+        <translation type="unfinished">Can&apos;t begin to listen for incoming connections on name &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <source>Export mode doesn&apos;t support openning several files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import raw layout data does not support openning several layout files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, provide one input file.</source>
+        <translation type="unfinished">Please, provide one input file.</translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrousel</name>
+    <message>
+        <source>Pieces of </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrouselPieceList</name>
+    <message>
+        <source>Move to Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Delete</translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPDialogAbout</name>
+    <message>
+        <source>About Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Puzzle version</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Build revision:</source>
+        <translation type="unfinished">Build revision:</translation>
+    </message>
+    <message>
+        <source>This program is part of Valentina project.</source>
+        <translation type="unfinished">This program is part of Valentina project.</translation>
+    </message>
+    <message>
+        <source>Check For Updates</source>
+        <translation type="unfinished">Check For Updates</translation>
+    </message>
+    <message>
+        <source>Cannot open your default browser</source>
+        <translation type="unfinished">Cannot open your default browser</translation>
+    </message>
+    <message>
+        <source>Build revision: %1</source>
+        <translation type="unfinished">Build revision: %1</translation>
+    </message>
+    <message>
+        <source>Built on %1 at %2</source>
+        <translation type="unfinished">Built on %1 at %2</translation>
+    </message>
+    <message>
+        <source>Web site : %1</source>
+        <translation type="unfinished">Web site : %1</translation>
+    </message>
+</context>
 <context>
     <name>VPE::VBoolProperty</name>
     <message>
@@ -14045,6 +14456,573 @@ Do you want to save your changes?</translation>
         <translation>Open File</translation>
     </message>
 </context>
+<context>
+    <name>VPGraphicsPiece</name>
+    <message>
+        <source>Move to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPLayoutFileReader</name>
+    <message>
+        <source>Piece List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Got empty attribute &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPMainWindow</name>
+    <message>
+        <source>Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;File</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished">&amp;Help</translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished">Menu</translation>
+    </message>
+    <message>
+        <source>Piece Carrousel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Infos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Name:</translation>
+    </message>
+    <message>
+        <source>DummyName</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UUID:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{7b2ce4ae-96f5-4905-bb34-405cb40ca208}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Geometry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mirror piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotation</source>
+        <translation type="unfinished">Rotation</translation>
+    </message>
+    <message>
+        <source>Angle:</source>
+        <translation type="unfinished">Angle:</translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° anti-clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Placement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Y:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No piece selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple pieces selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Width</source>
+        <translation type="unfinished">Width</translation>
+    </message>
+    <message>
+        <source>Length</source>
+        <translation type="unfinished">Length</translation>
+    </message>
+    <message>
+        <source>Orientation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove unused length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right:</source>
+        <translation type="unfinished">Right:</translation>
+    </message>
+    <message>
+        <source>Top:</source>
+        <translation type="unfinished">Top:</translation>
+    </message>
+    <message>
+        <source>Left:</source>
+        <translation type="unfinished">Left:</translation>
+    </message>
+    <message>
+        <source>Bottom:</source>
+        <translation type="unfinished">Bottom:</translation>
+    </message>
+    <message>
+        <source>Placement Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Row height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Follow grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vertical grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Horizontal grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pieces gap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sticky edges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation type="unfinished">Export</translation>
+    </message>
+    <message>
+        <source>Export Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiles properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiled Pdf Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Tiles on sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export Tiled Pdf</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation type="unfinished">Layout</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Description</translation>
+    </message>
+    <message>
+        <source>Unit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning superposition of pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning pieces out of bound</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation type="unfinished">&amp;Open</translation>
+    </message>
+    <message>
+        <source>Ctrl+O</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Save</translation>
+    </message>
+    <message>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save &amp;As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Import Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation type="unfinished">E&amp;xit</translation>
+    </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation type="unfinished">&amp;New</translation>
+    </message>
+    <message>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation type="unfinished">About &amp;Qt</translation>
+    </message>
+    <message>
+        <source>About &amp;Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom in</source>
+        <translation type="unfinished">Zoom in</translation>
+    </message>
+    <message>
+        <source>Zoom out</source>
+        <translation type="unfinished">Zoom out</translation>
+    </message>
+    <message>
+        <source>Zoom 1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom fit best</source>
+        <translation type="unfinished">Zoom fit best</translation>
+    </message>
+    <message>
+        <source>Zoom sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished">Preferences</translation>
+    </message>
+    <message>
+        <source>File &apos;%1&apos; doesn&apos;t exist!</source>
+        <translation type="unfinished">File &apos;%1&apos; doesn&apos;t exist!</translation>
+    </message>
+    <message>
+        <source>File error.</source>
+        <translation type="unfinished">File error.</translation>
+    </message>
+    <message>
+        <source>Unable to read a layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fail to create layout.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not extract data from file &apos;%1&apos;. %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Centimeters</source>
+        <translation type="unfinished">Centimeters</translation>
+    </message>
+    <message>
+        <source>Millimiters</source>
+        <translation type="unfinished">Millimiters</translation>
+    </message>
+    <message>
+        <source>Inches</source>
+        <translation type="unfinished">Inches</translation>
+    </message>
+    <message>
+        <source>Scale:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>untitled %1.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>untitled.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read only</source>
+        <translation type="unfinished">read only</translation>
+    </message>
+    <message>
+        <source>Cannot read settings from a malformed .INI file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save settings. Access denied.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to open file, is it writable?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New Window</source>
+        <translation type="unfinished">&amp;New Window</translation>
+    </message>
+    <message>
+        <source>Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open file</source>
+        <translation type="unfinished">Open file</translation>
+    </message>
+    <message>
+        <source>Could not save the file</source>
+        <translation type="unfinished">Could not save the file</translation>
+    </message>
+    <message>
+        <source>layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save as</source>
+        <translation type="unfinished">Save as</translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window.</source>
+        <translation type="unfinished">Failed to lock. This file already opened in another window.</translation>
+    </message>
+    <message>
+        <source>Could not save file</source>
+        <translation type="unfinished">Could not save file</translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window. Expect collissions when run 2 copies of the program.</source>
+        <translation type="unfinished">Failed to lock. This file already opened in another window. Expect collissions when run 2 copies of the program.</translation>
+    </message>
+    <message>
+        <source>Raw Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About Qt</source>
+        <translation type="unfinished">About Qt</translation>
+    </message>
+    <message>
+        <source>PDF Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SVG Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPSheet</name>
+    <message>
+        <source>Letter</source>
+        <translation type="unfinished">Letter</translation>
+    </message>
+    <message>
+        <source>Legal</source>
+        <translation type="unfinished">Legal</translation>
+    </message>
+    <message>
+        <source>Tabloid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 24in</source>
+        <translation type="unfinished">Roll 24in</translation>
+    </message>
+    <message>
+        <source>Roll 30in</source>
+        <translation type="unfinished">Roll 30in</translation>
+    </message>
+    <message>
+        <source>Roll 36in</source>
+        <translation type="unfinished">Roll 36in</translation>
+    </message>
+    <message>
+        <source>Roll 42in</source>
+        <translation type="unfinished">Roll 42in</translation>
+    </message>
+    <message>
+        <source>Roll 44in</source>
+        <translation type="unfinished">Roll 44in</translation>
+    </message>
+    <message>
+        <source>Roll 48in</source>
+        <translation type="unfinished">Roll 44in {48i?}</translation>
+    </message>
+    <message>
+        <source>Roll 62in</source>
+        <translation type="unfinished">Roll 44in {62i?}</translation>
+    </message>
+    <message>
+        <source>Roll 72in</source>
+        <translation type="unfinished">Roll 44in {72i?}</translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation type="unfinished">Custom</translation>
+    </message>
+</context>
+<context>
+    <name>VPTileFactory</name>
+    <message>
+        <source>Grid ( %1 , %2 )</source>
+        <translation type="unfinished">Grid ( %1 , %2 )</translation>
+    </message>
+    <message>
+        <source>Page %1 of %2</source>
+        <translation type="unfinished">Page %1 of %2</translation>
+    </message>
+</context>
 <context>
     <name>VPattern</name>
     <message>
@@ -14390,23 +15368,23 @@ Do you want to save your changes?</translation>
     <name>VPrintLayout</name>
     <message>
         <source>For printing multipages document all sheet should have the same size.</source>
-        <translation>For printing multipages document all sheet should have the same size.</translation>
+        <translation type="unfinished">For printing multipages document all sheet should have the same size.</translation>
     </message>
     <message>
         <source>For previewing multipage document all sheet should have the same size.</source>
-        <translation>For previewing multipage document all sheet should have the same size.</translation>
+        <translation type="unfinished">For previewing multipage document all sheet should have the same size.</translation>
     </message>
     <message>
         <source>Pages will be cropped because they do not fit printer paper size.</source>
-        <translation>Pages will be cropped because they do not fit printer paper size.</translation>
+        <translation type="unfinished">Pages will be cropped because they do not fit printer paper size.</translation>
     </message>
     <message>
         <source>Print error</source>
-        <translation>Print error</translation>
+        <translation type="unfinished">Print error</translation>
     </message>
     <message>
         <source>Cannot proceed because there are no available printers in your system.</source>
-        <translation>Cannot proceed because there are no available printers in your system.</translation>
+        <translation type="unfinished">Cannot proceed because there are no available printers in your system.</translation>
     </message>
     <message>
         <source>Failed to open file, is it writable?</source>
@@ -14418,7 +15396,7 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>Cannot set printer margins</source>
-        <translation>Cannot set printer margins</translation>
+        <translation type="unfinished">Cannot set printer margins</translation>
     </message>
     <message>
         <source>Cannot set custom printer page size</source>
@@ -14446,18 +15424,30 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>The layout is stale.</source>
-        <translation>The layout is stale.</translation>
+        <translation type="unfinished">The layout is stale.</translation>
     </message>
     <message>
         <source>The layout was not updated since last pattern modification. Do you want to continue?</source>
-        <translation>The layout was not updated since last pattern modification. Do you want to continue?</translation>
+        <translation type="unfinished">The layout was not updated since last pattern modification. Do you want to continue?</translation>
+    </message>
+</context>
+<context>
+    <name>VRawLayout</name>
+    <message>
+        <source>VRawLayout::ReadFile() failed. Raw layout format prefix mismatch error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VRawLayout::ReadFile() failed.
+Raw layout format compatibility error: actualFileVersion = %1 and fileVersion = %2</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VSettings</name>
     <message>
         <source>layouts</source>
-        <translation>layouts</translation>
+        <translation type="vanished">layouts</translation>
     </message>
 </context>
 <context>
@@ -15406,7 +16396,7 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>Notes:</source>
-        <translation>Notes:</translation>
+        <translation type="unfinished">Notes:</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -17105,6 +18095,13 @@ Do you want to save your changes?</translation>
         <translation type="vanished">Error restoring backup file: %1.</translation>
     </message>
 </context>
+<context>
+    <name>VValentinaSettings</name>
+    <message>
+        <source>layouts</source>
+        <translation type="unfinished">layouts</translation>
+    </message>
+</context>
 <context>
     <name>VWidgetDetails</name>
     <message>
diff --git a/share/translations/valentina_en_IN.ts b/share/translations/valentina_en_IN.ts
index 185495b20..39c5349d6 100644
--- a/share/translations/valentina_en_IN.ts
+++ b/share/translations/valentina_en_IN.ts
@@ -576,7 +576,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -707,16 +707,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogArcWithLength</name>
@@ -834,16 +834,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogBisector</name>
@@ -965,7 +965,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -1036,16 +1036,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCubicBezierPath</name>
@@ -1095,16 +1095,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCurveIntersectAxis</name>
@@ -1206,7 +1206,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -1297,11 +1297,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1311,6 +1307,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCutSpline</name>
@@ -1388,11 +1388,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1402,6 +1398,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCutSplinePath</name>
@@ -1479,11 +1479,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1493,6 +1489,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogDateTimeFormats</name>
@@ -1795,15 +1795,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Value</source>
-        <translation>Value</translation>
-    </message>
-    <message>
-        <source>Label</source>
+        <source>Dimension:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dimension:</source>
+        <source>Value</source>
+        <translation type="unfinished">Value</translation>
+    </message>
+    <message>
+        <source>Label</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1958,6 +1958,14 @@
         <source>Measurments file name</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Size</translation>
+    </message>
+    <message>
+        <source>Height</source>
+        <translation type="obsolete">Height</translation>
+    </message>
     <message>
         <source>Measurments extension</source>
         <translation type="unfinished"></translation>
@@ -2086,19 +2094,15 @@
         <source>Customer email</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Measurement: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Height</translation>
+        <translation type="unfinished">Height</translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Size</translation>
+        <translation type="unfinished">Size</translation>
     </message>
     <message>
         <source>Hip</source>
@@ -2111,23 +2115,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No data for the height dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the size dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the hip dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the waist dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Final measurement: %1</source>
+        <source>Measurement: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2150,6 +2138,26 @@
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Final measurement: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the height dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the size dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the hip dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the waist dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogEditWrongFormula</name>
@@ -2382,16 +2390,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogEndLine</name>
@@ -2497,7 +2505,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -2727,11 +2735,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -2749,6 +2753,10 @@
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -2846,11 +2854,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -2868,6 +2872,10 @@
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -3020,7 +3028,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -3882,7 +3890,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -3949,7 +3957,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -4076,7 +4084,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -4231,11 +4239,11 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Full name:</source>
-        <translation>Full name:</translation>
+        <translation type="unfinished">Full name:</translation>
     </message>
     <message>
         <source>Description:</source>
-        <translation>Description:</translation>
+        <translation type="unfinished">Description:</translation>
     </message>
     <message>
         <source>Ready</source>
@@ -4243,20 +4251,50 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Name</source>
-        <translation>Name</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>Value</source>
-        <translation>Value</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Value</translation>
+    </message>
+    <message>
+        <source>Full name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Full name</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Description</translation>
     </message>
     <message>
         <source>Base value</source>
-        <translation>Base value</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Base value</translation>
+    </message>
+    <message>
+        <source>Shift (%1):</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Skip</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished">Value</translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <translation type="unfinished">Base value</translation>
+    </message>
     <message>
         <source>Shift (%1)*:</source>
         <translation type="unfinished"></translation>
@@ -4277,36 +4315,6 @@ Apply settings anyway?</source>
         <source>Please, select unique number for each column</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Name</source>
-        <comment>measurement column</comment>
-        <translation>Name</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <comment>measurement column</comment>
-        <translation>Value</translation>
-    </message>
-    <message>
-        <source>Full name</source>
-        <comment>measurement column</comment>
-        <translation>Full name</translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <comment>measurement column</comment>
-        <translation>Description</translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <comment>measurement column</comment>
-        <translation>Base value</translation>
-    </message>
-    <message>
-        <source>Shift (%1):</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DialogMove</name>
@@ -4400,11 +4408,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -4422,6 +4426,10 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -4661,7 +4669,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -4869,6 +4877,10 @@ Apply settings anyway?</source>
         <source>Label language:</source>
         <translation>Label language:</translation>
     </message>
+    <message>
+        <source>yyyy-MM-dd</source>
+        <translation type="obsolete">yyyy-MM-dd</translation>
+    </message>
     <message>
         <source>Passmark length:</source>
         <translation type="unfinished"></translation>
@@ -5570,7 +5582,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5669,7 +5681,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5764,7 +5776,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5823,7 +5835,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5890,7 +5902,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6005,7 +6017,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6052,7 +6064,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6101,6 +6113,28 @@ Apply settings anyway?</source>
         </translation>
     </message>
 </context>
+<context>
+    <name>DialogPuzzlePreferences</name>
+    <message>
+        <source>Puzzle preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished">Configuration</translation>
+    </message>
+    <message>
+        <source>Paths</source>
+        <translation type="unfinished">Paths</translation>
+    </message>
+    <message numerus="yes">
+        <source>Followed %n option(s) require restart to take effect: %1.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+</context>
 <context>
     <name>DialogRestrictDimension</name>
     <message>
@@ -6212,11 +6246,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias</source>
@@ -6234,6 +6264,10 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -6476,6 +6510,10 @@ Apply settings anyway?</source>
         <source>Numerical control</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogSeamAllowance</name>
@@ -6734,6 +6772,11 @@ Apply settings anyway?</source>
         <source>Use full circumference</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Height</source>
+        <comment>dimension</comment>
+        <translation type="unfinished">Height</translation>
+    </message>
     <message>
         <source>Min value:</source>
         <translation type="unfinished"></translation>
@@ -6766,10 +6809,25 @@ Apply settings anyway?</source>
         <source>The base value for the column</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <comment>dimension</comment>
+        <translation type="unfinished">Size</translation>
+    </message>
     <message>
         <source>Circumference</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Waist</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hip</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Please, provide correct data for dimensions</source>
         <translation type="unfinished"></translation>
@@ -6786,26 +6844,6 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Height</source>
-        <comment>dimension</comment>
-        <translation>Height</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <comment>dimension</comment>
-        <translation>Size</translation>
-    </message>
-    <message>
-        <source>Waist</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hip</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DialogShoulderPoint</name>
@@ -6915,7 +6953,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6958,7 +6996,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -7105,16 +7143,16 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogSplinePath</name>
@@ -7264,16 +7302,16 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogTapePreferences</name>
@@ -7456,7 +7494,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -7567,7 +7605,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -8306,7 +8344,7 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>This file already opened in another window.</source>
-        <translation>This file already opened in another window.</translation>
+        <translation type="vanished">This file already opened in another window.</translation>
     </message>
     <message>
         <source>Wrong units.</source>
@@ -8759,27 +8797,27 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>Locking file</source>
-        <translation>Locking file</translation>
+        <translation type="vanished">Locking file</translation>
     </message>
     <message>
         <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+        <translation type="vanished">This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+        <translation type="vanished">The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+        <translation type="vanished">Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions.</source>
-        <translation>The lock file could not be created, for lack of permissions.</translation>
+        <translation type="vanished">The lock file could not be created, for lack of permissions.</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation>Unknown error happened, for instance a full partition prevented writing out the lock file.</translation>
+        <translation type="vanished">Unknown error happened, for instance a full partition prevented writing out the lock file.</translation>
     </message>
     <message>
         <source>Report Bug...</source>
@@ -8939,15 +8977,15 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>The document has no write permissions.</source>
-        <translation>The document has no write permissions.</translation>
+        <translation type="vanished">The document has no write permissions.</translation>
     </message>
     <message>
         <source>Cannot set permissions for %1 to writable.</source>
-        <translation>Cannot set permissions for %1 to writable.</translation>
+        <translation type="vanished">Cannot set permissions for %1 to writable.</translation>
     </message>
     <message>
         <source>Could not save the file.</source>
-        <translation>Could not save the file.</translation>
+        <translation type="vanished">Could not save the file.</translation>
     </message>
     <message>
         <source>Could not save the file</source>
@@ -9334,7 +9372,43 @@ Do you want to save your changes?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to change the premissions?</source>
+        <source>Manual Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open the Puzzle app</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished">Update</translation>
+    </message>
+    <message>
+        <source>Update manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to prepare raw layout data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select manual layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9532,6 +9606,10 @@ Do you want to save your changes?</translation>
         <source>Measurement file contains invalid known measurement(s).</source>
         <translation>Measurement file contains invalid known measurement(s).</translation>
     </message>
+    <message>
+        <source>Wrong units.</source>
+        <translation type="vanished">Wrong units.</translation>
+    </message>
     <message>
         <source>File error.</source>
         <translation>File error.</translation>
@@ -9956,6 +10034,10 @@ Do you want to save your changes?</translation>
         <source>My label templates</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>My manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PreferencesPatternPage</name>
@@ -10097,6 +10179,111 @@ This option will take an affect after restart.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>Puzzle</name>
+    <message>
+        <source>Export options can be used with single input file only.</source>
+        <translation type="unfinished">Export options can be used with single input file only.</translation>
+    </message>
+    <message>
+        <source>Valentina&apos;s manual layout editor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The manual layout file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesConfigurationPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished">Language</translation>
+    </message>
+    <message>
+        <source>GUI language:</source>
+        <translation type="unfinished">GUI language:</translation>
+    </message>
+    <message>
+        <source>Toolbar</source>
+        <translation type="unfinished">Toolbar</translation>
+    </message>
+    <message>
+        <source>The text appears under the icon (recommended for beginners).</source>
+        <translation type="unfinished">The text appears under the icon (recommended for beginners).</translation>
+    </message>
+    <message>
+        <source>User Interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate dark mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t use the native file dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dark mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesPathPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <source>Paths that Valentina uses</source>
+        <translation type="unfinished">Paths that Valentina uses</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished">Type</translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished">Path</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished">Default</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished">Edit</translation>
+    </message>
+    <message>
+        <source>Open Directory</source>
+        <translation type="unfinished">Open Directory</translation>
+    </message>
+    <message>
+        <source>My Individual Measurements</source>
+        <translation type="unfinished">My Individual Measurements</translation>
+    </message>
+    <message>
+        <source>My Multisize Measurements</source>
+        <translation type="unfinished">My Multisize Measurements</translation>
+    </message>
+    <message>
+        <source>My Patterns</source>
+        <translation type="unfinished">My Patterns</translation>
+    </message>
+    <message>
+        <source>My Templates</source>
+        <translation type="unfinished">My Templates</translation>
+    </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished">My Layouts</translation>
+    </message>
+</context>
 <context>
     <name>QApplication</name>
     <message>
@@ -10442,6 +10629,10 @@ This option will take an affect after restart.</source>
         <source>Can&apos;t convert toInt parameter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Piece name &apos;%1&apos; is not unique.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Could not find the segment start.</source>
         <translation type="unfinished"></translation>
@@ -10458,6 +10649,10 @@ This option will take an affect after restart.</source>
         <source>Error calculating segment for curve &apos;%1&apos;. %2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot prepare builtin passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
@@ -10474,18 +10669,14 @@ This option will take an affect after restart.</source>
         <source>Cannot prepare passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Piece name &apos;%1&apos; is not unique.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Cannot get tokens from formula &apos;%1&apos;. Formula error: %2.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>No data for the height dimension.</source>
         <translation type="unfinished"></translation>
@@ -10507,11 +10698,15 @@ This option will take an affect after restart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
+        <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
+        <source>Unplaced pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet 1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -11107,7 +11302,7 @@ This option will take an affect after restart.</source>
     </message>
     <message>
         <source>untitled</source>
-        <translation type="vanished">untitled</translation>
+        <translation>untitled</translation>
     </message>
     <message>
         <source>&lt;Empty&gt;</source>
@@ -11344,27 +11539,27 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>Locking file</source>
-        <translation>Locking file</translation>
+        <translation type="vanished">Locking file</translation>
     </message>
     <message>
         <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+        <translation type="vanished">This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+        <translation type="vanished">The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+        <translation type="vanished">Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions.</source>
-        <translation>The lock file could not be created, for lack of permissions.</translation>
+        <translation type="vanished">The lock file could not be created, for lack of permissions.</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation>Unknown error happened, for instance a full partition prevented writing out the lock file.</translation>
+        <translation type="vanished">Unknown error happened, for instance a full partition prevented writing out the lock file.</translation>
     </message>
     <message>
         <source>Export to CSV</source>
@@ -11412,15 +11607,15 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>The measurements document has no write permissions.</source>
-        <translation>The measurements document has no write permissions.</translation>
+        <translation type="vanished">The measurements document has no write permissions.</translation>
     </message>
     <message>
         <source>Cannot set permissions for %1 to writable.</source>
-        <translation>Cannot set permissions for %1 to writable.</translation>
+        <translation type="vanished">Cannot set permissions for %1 to writable.</translation>
     </message>
     <message>
         <source>Could not save the file.</source>
-        <translation>Could not save the file.</translation>
+        <translation type="vanished">Could not save the file.</translation>
     </message>
     <message>
         <source>Could not save the file</source>
@@ -11550,17 +11745,43 @@ Do you want to save your changes?</translation>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Search measurements by term. &lt;/p&gt;&lt;p&gt;Prepend &amp;quot;/r/&amp;quot; to the front of the search string to search measurements by regex.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Do you want to change the premissions?</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Cannot read settings from a malformed .INI file.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <source>Full name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Full name</translation>
+    </message>
+    <message>
+        <source>Calculated value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Calculated value</translation>
+    </message>
+    <message>
+        <source>Formula</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Formula</translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Base value</translation>
+    </message>
+    <message>
+        <source>Correction</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Units:</source>
-        <translation>Units:</translation>
+        <translation type="unfinished">Units:</translation>
     </message>
     <message>
         <source>Shift B</source>
@@ -11660,46 +11881,16 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>Inches</source>
-        <translation>Inches</translation>
+        <translation type="unfinished">Inches</translation>
     </message>
     <message>
         <source>Centimeters</source>
-        <translation>Centimeters</translation>
+        <translation type="unfinished">Centimeters</translation>
     </message>
     <message>
         <source>Degrees</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Name</source>
-        <comment>measurement column</comment>
-        <translation>Name</translation>
-    </message>
-    <message>
-        <source>Full name</source>
-        <comment>measurement column</comment>
-        <translation>Full name</translation>
-    </message>
-    <message>
-        <source>Calculated value</source>
-        <comment>measurement column</comment>
-        <translation>Calculated value</translation>
-    </message>
-    <message>
-        <source>Formula</source>
-        <comment>measurement column</comment>
-        <translation>Formula</translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <comment>measurement column</comment>
-        <translation>Base value</translation>
-    </message>
-    <message>
-        <source>Correction</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Restrict first dimension</source>
         <translation type="unfinished"></translation>
@@ -11778,6 +11969,10 @@ Do you want to save your changes?</translation>
         <source>Labels</source>
         <translation>Labels</translation>
     </message>
+    <message>
+        <source>Detail label visible</source>
+        <translation type="vanished">Detail label visible</translation>
+    </message>
     <message>
         <source>Width:</source>
         <translation>Width:</translation>
@@ -11888,19 +12083,19 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>Pattern name:</source>
-        <translation>Pattern name:</translation>
+        <translation type="unfinished">Pattern name:</translation>
     </message>
     <message>
         <source>Pattern number:</source>
-        <translation>Pattern number:</translation>
+        <translation type="unfinished">Pattern number:</translation>
     </message>
     <message>
         <source>Company/Designer name:</source>
-        <translation>Company/Designer name:</translation>
+        <translation type="unfinished">Company/Designer name:</translation>
     </message>
     <message>
         <source>Customer name:</source>
-        <translation>Customer name:</translation>
+        <translation type="unfinished">Customer name:</translation>
     </message>
     <message>
         <source>Date format:</source>
@@ -11916,7 +12111,7 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>yyyy-MM-dd</source>
-        <translation>yyyy-MM-dd</translation>
+        <translation type="unfinished">yyyy-MM-dd</translation>
     </message>
     <message>
         <source>Customer email:</source>
@@ -12238,6 +12433,18 @@ Do you want to save your changes?</translation>
         <comment>seam allowance</comment>
         <translation>Custom</translation>
     </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Universally Unique IDentifier of piece. Used to identifier piece while updating manual layout. Left empty to generate new value.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TabPlaceLabels</name>
@@ -12413,6 +12620,18 @@ Do you want to save your changes?</translation>
         <source>The text appears under the icon (recommended for beginners).</source>
         <translation>The text appears under the icon (recommended for beginners).</translation>
     </message>
+    <message>
+        <source>Default height and size</source>
+        <translation type="vanished">Default height and size</translation>
+    </message>
+    <message>
+        <source>Default height:</source>
+        <translation type="vanished">Default height:</translation>
+    </message>
+    <message>
+        <source>Default size:</source>
+        <translation type="vanished">Default size:</translation>
+    </message>
     <message>
         <source>With OS options</source>
         <translation>With OS options</translation>
@@ -12476,6 +12695,10 @@ Do you want to save your changes?</translation>
         <source>My Patterns</source>
         <translation>My Patterns</translation>
     </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished">My Layouts</translation>
+    </message>
 </context>
 <context>
     <name>ToggleDetailInLayout</name>
@@ -12527,19 +12750,15 @@ Do you want to save your changes?</translation>
         <source>Base value invalid</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Size</source>
-        <translation>Size</translation>
-    </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Height</translation>
+        <translation type="unfinished">Height</translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Size</translation>
+        <translation type="unfinished">Size</translation>
     </message>
     <message>
         <source>Waist</source>
@@ -12561,6 +12780,10 @@ Do you want to save your changes?</translation>
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished">Size</translation>
+    </message>
     <message>
         <source>Chest circumference</source>
         <comment>dimension</comment>
@@ -12752,7 +12975,7 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>Comma-Separated Values</source>
-        <translation>Comma-Separated Values</translation>
+        <translation type="unfinished">Comma-Separated Values</translation>
     </message>
     <message>
         <source>values</source>
@@ -12760,7 +12983,51 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>Export to CSV</source>
-        <translation>Export to CSV</translation>
+        <translation type="unfinished">Export to CSV</translation>
+    </message>
+    <message>
+        <source>The measurements document has no write permissions.</source>
+        <translation type="unfinished">The measurements document has no write permissions.</translation>
+    </message>
+    <message>
+        <source>Do you want to change the premissions?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot set permissions for %1 to writable.</source>
+        <translation type="unfinished">Cannot set permissions for %1 to writable.</translation>
+    </message>
+    <message>
+        <source>Could not save the file.</source>
+        <translation type="unfinished">Could not save the file.</translation>
+    </message>
+    <message>
+        <source>Locking file</source>
+        <translation type="unfinished">Locking file</translation>
+    </message>
+    <message>
+        <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished">This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished">The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished">Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+    </message>
+    <message>
+        <source>This file already opened in another window.</source>
+        <translation type="unfinished">This file already opened in another window.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions.</source>
+        <translation type="unfinished">The lock file could not be created, for lack of permissions.</translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
+        <translation type="unfinished">Unknown error happened, for instance a full partition prevented writing out the lock file.</translation>
     </message>
 </context>
 <context>
@@ -13543,6 +13810,34 @@ Do you want to save your changes?</translation>
         <source>The dimension C base</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>The filename of exported layout file. Use it to enable console export mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The filename of layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pattern pieces form the raw layout data file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The raw layout data file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to output format (default = 0, export mode): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to tiled pdf page template (default = 0, export mode with tiled pdf format): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run the program in a test mode. The program in this mode loads a single layout file and silently quit without showing the main window. The key have priority before key &apos;%1&apos;.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VCommonSettings</name>
@@ -13570,6 +13865,10 @@ Do you want to save your changes?</translation>
         <source>patterns</source>
         <translation>patterns</translation>
     </message>
+    <message>
+        <source>manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VContainer</name>
@@ -13817,25 +14116,29 @@ Do you want to save your changes?</translation>
 </context>
 <context>
     <name>VLayoutExporter</name>
+    <message>
+        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot set printer page size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot set printer margins</source>
-        <translation>Cannot set printer margins</translation>
+        <translation type="unfinished">Cannot set printer margins</translation>
     </message>
     <message>
         <source>Can&apos;t open file &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Creating file &apos;%1&apos; failed! %2</source>
-        <translation>Creating file &apos;%1&apos; failed! %2</translation>
+        <source>Export raw layout data failed. %1.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
-        <translation type="unfinished"></translation>
+        <source>Creating file &apos;%1&apos; failed! %2</source>
+        <translation type="unfinished">Creating file &apos;%1&apos; failed! %2</translation>
     </message>
     <message>
         <source>Can&apos;t create an flat dxf file.</source>
@@ -13869,15 +14172,15 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>None</translation>
+        <translation type="unfinished">None</translation>
     </message>
     <message>
         <source>Height</source>
-        <translation>Height</translation>
+        <translation type="unfinished">Height</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Size</translation>
+        <translation type="unfinished">Size</translation>
     </message>
     <message>
         <source>Hip</source>
@@ -14023,6 +14326,114 @@ Do you want to save your changes?</translation>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>VPApplication</name>
+    <message>
+        <source>Error parsing file. Program will be terminated.</source>
+        <translation type="unfinished">Error parsing file. Program will be terminated.</translation>
+    </message>
+    <message>
+        <source>Error bad id. Program will be terminated.</source>
+        <translation type="unfinished">Error bad id. Program will be terminated.</translation>
+    </message>
+    <message>
+        <source>Error can&apos;t convert value. Program will be terminated.</source>
+        <translation type="unfinished">Error can&apos;t convert value. Program will be terminated.</translation>
+    </message>
+    <message>
+        <source>Error empty parameter. Program will be terminated.</source>
+        <translation type="unfinished">Error empty parameter. Program will be terminated.</translation>
+    </message>
+    <message>
+        <source>Error wrong id. Program will be terminated.</source>
+        <translation type="unfinished">Error wrong id. Program will be terminated.</translation>
+    </message>
+    <message>
+        <source>Something&apos;s wrong!!</source>
+        <translation type="unfinished">Something&apos;s wrong!!</translation>
+    </message>
+    <message>
+        <source>Exception thrown: %1. Program will be terminated.</source>
+        <translation type="unfinished">Exception thrown: %1. Program will be terminated.</translation>
+    </message>
+    <message>
+        <source>Can&apos;t begin to listen for incoming connections on name &apos;%1&apos;</source>
+        <translation type="unfinished">Can&apos;t begin to listen for incoming connections on name &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <source>Export mode doesn&apos;t support openning several files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import raw layout data does not support openning several layout files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, provide one input file.</source>
+        <translation type="unfinished">Please, provide one input file.</translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrousel</name>
+    <message>
+        <source>Pieces of </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrouselPieceList</name>
+    <message>
+        <source>Move to Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Delete</translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPDialogAbout</name>
+    <message>
+        <source>About Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Puzzle version</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Build revision:</source>
+        <translation type="unfinished">Build revision:</translation>
+    </message>
+    <message>
+        <source>This program is part of Valentina project.</source>
+        <translation type="unfinished">This program is part of Valentina project.</translation>
+    </message>
+    <message>
+        <source>Check For Updates</source>
+        <translation type="unfinished">Check For Updates</translation>
+    </message>
+    <message>
+        <source>Cannot open your default browser</source>
+        <translation type="unfinished">Cannot open your default browser</translation>
+    </message>
+    <message>
+        <source>Build revision: %1</source>
+        <translation type="unfinished">Build revision: %1</translation>
+    </message>
+    <message>
+        <source>Built on %1 at %2</source>
+        <translation type="unfinished">Built on %1 at %2</translation>
+    </message>
+    <message>
+        <source>Web site : %1</source>
+        <translation type="unfinished">Web site : %1</translation>
+    </message>
+</context>
 <context>
     <name>VPE::VBoolProperty</name>
     <message>
@@ -14045,6 +14456,573 @@ Do you want to save your changes?</translation>
         <translation>Open File</translation>
     </message>
 </context>
+<context>
+    <name>VPGraphicsPiece</name>
+    <message>
+        <source>Move to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPLayoutFileReader</name>
+    <message>
+        <source>Piece List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Got empty attribute &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPMainWindow</name>
+    <message>
+        <source>Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;File</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished">&amp;Help</translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished">Menu</translation>
+    </message>
+    <message>
+        <source>Piece Carrousel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Infos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Name:</translation>
+    </message>
+    <message>
+        <source>DummyName</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UUID:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{7b2ce4ae-96f5-4905-bb34-405cb40ca208}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Geometry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mirror piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotation</source>
+        <translation type="unfinished">Rotation</translation>
+    </message>
+    <message>
+        <source>Angle:</source>
+        <translation type="unfinished">Angle:</translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° anti-clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Placement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Y:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No piece selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple pieces selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Width</source>
+        <translation type="unfinished">Width</translation>
+    </message>
+    <message>
+        <source>Length</source>
+        <translation type="unfinished">Length</translation>
+    </message>
+    <message>
+        <source>Orientation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove unused length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right:</source>
+        <translation type="unfinished">Right:</translation>
+    </message>
+    <message>
+        <source>Top:</source>
+        <translation type="unfinished">Top:</translation>
+    </message>
+    <message>
+        <source>Left:</source>
+        <translation type="unfinished">Left:</translation>
+    </message>
+    <message>
+        <source>Bottom:</source>
+        <translation type="unfinished">Bottom:</translation>
+    </message>
+    <message>
+        <source>Placement Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Row height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Follow grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vertical grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Horizontal grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pieces gap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sticky edges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation type="unfinished">Export</translation>
+    </message>
+    <message>
+        <source>Export Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiles properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiled Pdf Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Tiles on sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export Tiled Pdf</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation type="unfinished">Layout</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Description</translation>
+    </message>
+    <message>
+        <source>Unit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning superposition of pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning pieces out of bound</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation type="unfinished">&amp;Open</translation>
+    </message>
+    <message>
+        <source>Ctrl+O</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Save</translation>
+    </message>
+    <message>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save &amp;As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Import Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation type="unfinished">E&amp;xit</translation>
+    </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation type="unfinished">&amp;New</translation>
+    </message>
+    <message>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation type="unfinished">About &amp;Qt</translation>
+    </message>
+    <message>
+        <source>About &amp;Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom in</source>
+        <translation type="unfinished">Zoom in</translation>
+    </message>
+    <message>
+        <source>Zoom out</source>
+        <translation type="unfinished">Zoom out</translation>
+    </message>
+    <message>
+        <source>Zoom 1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom fit best</source>
+        <translation type="unfinished">Zoom fit best</translation>
+    </message>
+    <message>
+        <source>Zoom sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished">Preferences</translation>
+    </message>
+    <message>
+        <source>File &apos;%1&apos; doesn&apos;t exist!</source>
+        <translation type="unfinished">File &apos;%1&apos; doesn&apos;t exist!</translation>
+    </message>
+    <message>
+        <source>File error.</source>
+        <translation type="unfinished">File error.</translation>
+    </message>
+    <message>
+        <source>Unable to read a layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fail to create layout.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not extract data from file &apos;%1&apos;. %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Centimeters</source>
+        <translation type="unfinished">Centimeters</translation>
+    </message>
+    <message>
+        <source>Millimiters</source>
+        <translation type="unfinished">Millimiters</translation>
+    </message>
+    <message>
+        <source>Inches</source>
+        <translation type="unfinished">Inches</translation>
+    </message>
+    <message>
+        <source>Scale:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>untitled %1.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>untitled.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read only</source>
+        <translation type="unfinished">read only</translation>
+    </message>
+    <message>
+        <source>Cannot read settings from a malformed .INI file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save settings. Access denied.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to open file, is it writable?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New Window</source>
+        <translation type="unfinished">&amp;New Window</translation>
+    </message>
+    <message>
+        <source>Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open file</source>
+        <translation type="unfinished">Open file</translation>
+    </message>
+    <message>
+        <source>Could not save the file</source>
+        <translation type="unfinished">Could not save the file</translation>
+    </message>
+    <message>
+        <source>layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save as</source>
+        <translation type="unfinished">Save as</translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window.</source>
+        <translation type="unfinished">Failed to lock. This file already opened in another window.</translation>
+    </message>
+    <message>
+        <source>Could not save file</source>
+        <translation type="unfinished">Could not save file</translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window. Expect collissions when run 2 copies of the program.</source>
+        <translation type="unfinished">Failed to lock. This file already opened in another window. Expect collissions when run 2 copies of the program.</translation>
+    </message>
+    <message>
+        <source>Raw Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About Qt</source>
+        <translation type="unfinished">About Qt</translation>
+    </message>
+    <message>
+        <source>PDF Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SVG Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPSheet</name>
+    <message>
+        <source>Letter</source>
+        <translation type="unfinished">Letter</translation>
+    </message>
+    <message>
+        <source>Legal</source>
+        <translation type="unfinished">Legal</translation>
+    </message>
+    <message>
+        <source>Tabloid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 24in</source>
+        <translation type="unfinished">Roll 24in</translation>
+    </message>
+    <message>
+        <source>Roll 30in</source>
+        <translation type="unfinished">Roll 30in</translation>
+    </message>
+    <message>
+        <source>Roll 36in</source>
+        <translation type="unfinished">Roll 36in</translation>
+    </message>
+    <message>
+        <source>Roll 42in</source>
+        <translation type="unfinished">Roll 42in</translation>
+    </message>
+    <message>
+        <source>Roll 44in</source>
+        <translation type="unfinished">Roll 44in</translation>
+    </message>
+    <message>
+        <source>Roll 48in</source>
+        <translation type="unfinished">Roll 44in {48i?}</translation>
+    </message>
+    <message>
+        <source>Roll 62in</source>
+        <translation type="unfinished">Roll 44in {62i?}</translation>
+    </message>
+    <message>
+        <source>Roll 72in</source>
+        <translation type="unfinished">Roll 44in {72i?}</translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation type="unfinished">Custom</translation>
+    </message>
+</context>
+<context>
+    <name>VPTileFactory</name>
+    <message>
+        <source>Grid ( %1 , %2 )</source>
+        <translation type="unfinished">Grid ( %1 , %2 )</translation>
+    </message>
+    <message>
+        <source>Page %1 of %2</source>
+        <translation type="unfinished">Page %1 of %2</translation>
+    </message>
+</context>
 <context>
     <name>VPattern</name>
     <message>
@@ -14390,23 +15368,23 @@ Do you want to save your changes?</translation>
     <name>VPrintLayout</name>
     <message>
         <source>For printing multipages document all sheet should have the same size.</source>
-        <translation>For printing multipages document all sheet should have the same size.</translation>
+        <translation type="unfinished">For printing multipages document all sheet should have the same size.</translation>
     </message>
     <message>
         <source>For previewing multipage document all sheet should have the same size.</source>
-        <translation>For previewing multipage document all sheet should have the same size.</translation>
+        <translation type="unfinished">For previewing multipage document all sheet should have the same size.</translation>
     </message>
     <message>
         <source>Pages will be cropped because they do not fit printer paper size.</source>
-        <translation>Pages will be cropped because they do not fit printer paper size.</translation>
+        <translation type="unfinished">Pages will be cropped because they do not fit printer paper size.</translation>
     </message>
     <message>
         <source>Print error</source>
-        <translation>Print error</translation>
+        <translation type="unfinished">Print error</translation>
     </message>
     <message>
         <source>Cannot proceed because there are no available printers in your system.</source>
-        <translation>Cannot proceed because there are no available printers in your system.</translation>
+        <translation type="unfinished">Cannot proceed because there are no available printers in your system.</translation>
     </message>
     <message>
         <source>Failed to open file, is it writable?</source>
@@ -14418,7 +15396,7 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>Cannot set printer margins</source>
-        <translation>Cannot set printer margins</translation>
+        <translation type="unfinished">Cannot set printer margins</translation>
     </message>
     <message>
         <source>Cannot set custom printer page size</source>
@@ -14446,18 +15424,30 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>The layout is stale.</source>
-        <translation>The layout is stale.</translation>
+        <translation type="unfinished">The layout is stale.</translation>
     </message>
     <message>
         <source>The layout was not updated since last pattern modification. Do you want to continue?</source>
-        <translation>The layout was not updated since last pattern modification. Do you want to continue?</translation>
+        <translation type="unfinished">The layout was not updated since last pattern modification. Do you want to continue?</translation>
+    </message>
+</context>
+<context>
+    <name>VRawLayout</name>
+    <message>
+        <source>VRawLayout::ReadFile() failed. Raw layout format prefix mismatch error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VRawLayout::ReadFile() failed.
+Raw layout format compatibility error: actualFileVersion = %1 and fileVersion = %2</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VSettings</name>
     <message>
         <source>layouts</source>
-        <translation>layouts</translation>
+        <translation type="vanished">layouts</translation>
     </message>
 </context>
 <context>
@@ -15406,7 +16396,7 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>Notes:</source>
-        <translation>Notes:</translation>
+        <translation type="unfinished">Notes:</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -17105,6 +18095,13 @@ Do you want to save your changes?</translation>
         <translation type="vanished">Error restoring backup file: %1.</translation>
     </message>
 </context>
+<context>
+    <name>VValentinaSettings</name>
+    <message>
+        <source>layouts</source>
+        <translation type="unfinished">layouts</translation>
+    </message>
+</context>
 <context>
     <name>VWidgetDetails</name>
     <message>
diff --git a/share/translations/valentina_en_US.ts b/share/translations/valentina_en_US.ts
index 911196cbb..f0572c348 100644
--- a/share/translations/valentina_en_US.ts
+++ b/share/translations/valentina_en_US.ts
@@ -576,7 +576,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -707,16 +707,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogArcWithLength</name>
@@ -834,16 +834,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogBisector</name>
@@ -965,7 +965,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -1036,16 +1036,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCubicBezierPath</name>
@@ -1095,16 +1095,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCurveIntersectAxis</name>
@@ -1206,7 +1206,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -1297,11 +1297,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1311,6 +1307,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCutSpline</name>
@@ -1388,11 +1388,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1402,6 +1398,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCutSplinePath</name>
@@ -1479,11 +1479,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1493,6 +1489,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogDateTimeFormats</name>
@@ -1795,15 +1795,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Value</source>
-        <translation>Value</translation>
-    </message>
-    <message>
-        <source>Label</source>
+        <source>Dimension:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dimension:</source>
+        <source>Value</source>
+        <translation type="unfinished">Value</translation>
+    </message>
+    <message>
+        <source>Label</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1958,6 +1958,14 @@
         <source>Measurments file name</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Size</translation>
+    </message>
+    <message>
+        <source>Height</source>
+        <translation type="obsolete">Height</translation>
+    </message>
     <message>
         <source>Measurments extension</source>
         <translation type="unfinished"></translation>
@@ -2086,19 +2094,15 @@
         <source>Customer email</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Measurement: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Height</translation>
+        <translation type="unfinished">Height</translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Size</translation>
+        <translation type="unfinished">Size</translation>
     </message>
     <message>
         <source>Hip</source>
@@ -2111,23 +2115,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No data for the height dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the size dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the hip dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the waist dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Final measurement: %1</source>
+        <source>Measurement: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2150,6 +2138,26 @@
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Final measurement: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the height dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the size dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the hip dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the waist dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogEditWrongFormula</name>
@@ -2382,16 +2390,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogEndLine</name>
@@ -2497,7 +2505,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -2727,11 +2735,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -2749,6 +2753,10 @@
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -2846,11 +2854,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -2868,6 +2872,10 @@
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -3020,7 +3028,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -3882,7 +3890,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -3949,7 +3957,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -4076,7 +4084,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -4231,11 +4239,11 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Full name:</source>
-        <translation>Full name:</translation>
+        <translation type="unfinished">Full name:</translation>
     </message>
     <message>
         <source>Description:</source>
-        <translation>Description:</translation>
+        <translation type="unfinished">Description:</translation>
     </message>
     <message>
         <source>Ready</source>
@@ -4243,20 +4251,50 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Name</source>
-        <translation>Name</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>Value</source>
-        <translation>Value</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Value</translation>
+    </message>
+    <message>
+        <source>Full name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Full name</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Description</translation>
     </message>
     <message>
         <source>Base value</source>
-        <translation>Base value</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Base value</translation>
+    </message>
+    <message>
+        <source>Shift (%1):</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Skip</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished">Value</translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <translation type="unfinished">Base value</translation>
+    </message>
     <message>
         <source>Shift (%1)*:</source>
         <translation type="unfinished"></translation>
@@ -4277,36 +4315,6 @@ Apply settings anyway?</source>
         <source>Please, select unique number for each column</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Name</source>
-        <comment>measurement column</comment>
-        <translation>Name</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <comment>measurement column</comment>
-        <translation>Value</translation>
-    </message>
-    <message>
-        <source>Full name</source>
-        <comment>measurement column</comment>
-        <translation>Full name</translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <comment>measurement column</comment>
-        <translation>Description</translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <comment>measurement column</comment>
-        <translation>Base value</translation>
-    </message>
-    <message>
-        <source>Shift (%1):</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DialogMove</name>
@@ -4400,11 +4408,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -4422,6 +4426,10 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -4661,7 +4669,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -4869,6 +4877,10 @@ Apply settings anyway?</source>
         <source>Label language:</source>
         <translation>Label language:</translation>
     </message>
+    <message>
+        <source>yyyy-MM-dd</source>
+        <translation type="obsolete">yyyy-MM-dd</translation>
+    </message>
     <message>
         <source>Passmark length:</source>
         <translation type="unfinished"></translation>
@@ -5570,7 +5582,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5669,7 +5681,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5764,7 +5776,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5823,7 +5835,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5890,7 +5902,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6005,7 +6017,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6052,7 +6064,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6101,6 +6113,28 @@ Apply settings anyway?</source>
         </translation>
     </message>
 </context>
+<context>
+    <name>DialogPuzzlePreferences</name>
+    <message>
+        <source>Puzzle preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished">Configuration</translation>
+    </message>
+    <message>
+        <source>Paths</source>
+        <translation type="unfinished">Paths</translation>
+    </message>
+    <message numerus="yes">
+        <source>Followed %n option(s) require restart to take effect: %1.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+</context>
 <context>
     <name>DialogRestrictDimension</name>
     <message>
@@ -6212,11 +6246,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias</source>
@@ -6234,6 +6264,10 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -6476,6 +6510,10 @@ Apply settings anyway?</source>
         <source>Numerical control</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogSeamAllowance</name>
@@ -6734,6 +6772,11 @@ Apply settings anyway?</source>
         <source>Use full circumference</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Height</source>
+        <comment>dimension</comment>
+        <translation type="unfinished">Height</translation>
+    </message>
     <message>
         <source>Min value:</source>
         <translation type="unfinished"></translation>
@@ -6766,10 +6809,25 @@ Apply settings anyway?</source>
         <source>The base value for the column</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <comment>dimension</comment>
+        <translation type="unfinished">Size</translation>
+    </message>
     <message>
         <source>Circumference</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Waist</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hip</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Please, provide correct data for dimensions</source>
         <translation type="unfinished"></translation>
@@ -6786,26 +6844,6 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Height</source>
-        <comment>dimension</comment>
-        <translation>Height</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <comment>dimension</comment>
-        <translation>Size</translation>
-    </message>
-    <message>
-        <source>Waist</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hip</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DialogShoulderPoint</name>
@@ -6915,7 +6953,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6958,7 +6996,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -7105,16 +7143,16 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogSplinePath</name>
@@ -7264,16 +7302,16 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogTapePreferences</name>
@@ -7456,7 +7494,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -7567,7 +7605,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Tool</translation>
+        <translation type="unfinished">Tool</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -8306,7 +8344,7 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>This file already opened in another window.</source>
-        <translation>This file already opened in another window.</translation>
+        <translation type="vanished">This file already opened in another window.</translation>
     </message>
     <message>
         <source>Wrong units.</source>
@@ -8759,27 +8797,27 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>Locking file</source>
-        <translation>Locking file</translation>
+        <translation type="vanished">Locking file</translation>
     </message>
     <message>
         <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+        <translation type="vanished">This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+        <translation type="vanished">The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+        <translation type="vanished">Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions.</source>
-        <translation>The lock file could not be created, for lack of permissions.</translation>
+        <translation type="vanished">The lock file could not be created, for lack of permissions.</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation>Unknown error happened, for instance a full partition prevented writing out the lock file.</translation>
+        <translation type="vanished">Unknown error happened, for instance a full partition prevented writing out the lock file.</translation>
     </message>
     <message>
         <source>Report Bug...</source>
@@ -8939,15 +8977,15 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>The document has no write permissions.</source>
-        <translation>The document has no write permissions.</translation>
+        <translation type="vanished">The document has no write permissions.</translation>
     </message>
     <message>
         <source>Cannot set permissions for %1 to writable.</source>
-        <translation>Cannot set permissions for %1 to writable.</translation>
+        <translation type="vanished">Cannot set permissions for %1 to writable.</translation>
     </message>
     <message>
         <source>Could not save the file.</source>
-        <translation>Could not save the file.</translation>
+        <translation type="vanished">Could not save the file.</translation>
     </message>
     <message>
         <source>Could not save the file</source>
@@ -9334,7 +9372,43 @@ Do you want to save your changes?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to change the premissions?</source>
+        <source>Manual Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open the Puzzle app</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished">Update</translation>
+    </message>
+    <message>
+        <source>Update manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to prepare raw layout data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select manual layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9532,6 +9606,10 @@ Do you want to save your changes?</translation>
         <source>Measurement file contains invalid known measurement(s).</source>
         <translation>Measurement file contains invalid known measurement(s).</translation>
     </message>
+    <message>
+        <source>Wrong units.</source>
+        <translation type="vanished">Wrong units.</translation>
+    </message>
     <message>
         <source>File error.</source>
         <translation>File error.</translation>
@@ -9956,6 +10034,10 @@ Do you want to save your changes?</translation>
         <source>My label templates</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>My manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PreferencesPatternPage</name>
@@ -10097,6 +10179,111 @@ This option will take an affect after restart.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>Puzzle</name>
+    <message>
+        <source>Export options can be used with single input file only.</source>
+        <translation type="unfinished">Export options can be used with single input file only.</translation>
+    </message>
+    <message>
+        <source>Valentina&apos;s manual layout editor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The manual layout file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesConfigurationPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished">Language</translation>
+    </message>
+    <message>
+        <source>GUI language:</source>
+        <translation type="unfinished">GUI language:</translation>
+    </message>
+    <message>
+        <source>Toolbar</source>
+        <translation type="unfinished">Toolbar</translation>
+    </message>
+    <message>
+        <source>The text appears under the icon (recommended for beginners).</source>
+        <translation type="unfinished">The text appears under the icon (recommended for beginners).</translation>
+    </message>
+    <message>
+        <source>User Interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate dark mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t use the native file dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dark mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesPathPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <source>Paths that Valentina uses</source>
+        <translation type="unfinished">Paths that Valentina uses</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished">Type</translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished">Path</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished">Default</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished">Edit</translation>
+    </message>
+    <message>
+        <source>Open Directory</source>
+        <translation type="unfinished">Open Directory</translation>
+    </message>
+    <message>
+        <source>My Individual Measurements</source>
+        <translation type="unfinished">My Individual Measurements</translation>
+    </message>
+    <message>
+        <source>My Multisize Measurements</source>
+        <translation type="unfinished">My Multisize Measurements</translation>
+    </message>
+    <message>
+        <source>My Patterns</source>
+        <translation type="unfinished">My Patterns</translation>
+    </message>
+    <message>
+        <source>My Templates</source>
+        <translation type="unfinished">My Templates</translation>
+    </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished">My Layouts</translation>
+    </message>
+</context>
 <context>
     <name>QApplication</name>
     <message>
@@ -10442,6 +10629,10 @@ This option will take an affect after restart.</source>
         <source>Can&apos;t convert toInt parameter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Piece name &apos;%1&apos; is not unique.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Could not find the segment start.</source>
         <translation type="unfinished"></translation>
@@ -10458,6 +10649,10 @@ This option will take an affect after restart.</source>
         <source>Error calculating segment for curve &apos;%1&apos;. %2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot prepare builtin passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
@@ -10474,18 +10669,14 @@ This option will take an affect after restart.</source>
         <source>Cannot prepare passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Piece name &apos;%1&apos; is not unique.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Cannot get tokens from formula &apos;%1&apos;. Formula error: %2.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>No data for the height dimension.</source>
         <translation type="unfinished"></translation>
@@ -10507,11 +10698,15 @@ This option will take an affect after restart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
+        <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
+        <source>Unplaced pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet 1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -11107,7 +11302,7 @@ This option will take an affect after restart.</source>
     </message>
     <message>
         <source>untitled</source>
-        <translation type="vanished">untitled</translation>
+        <translation>untitled</translation>
     </message>
     <message>
         <source>&lt;Empty&gt;</source>
@@ -11344,27 +11539,27 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>Locking file</source>
-        <translation>Locking file</translation>
+        <translation type="vanished">Locking file</translation>
     </message>
     <message>
         <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+        <translation type="vanished">This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+        <translation type="vanished">The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+        <translation type="vanished">Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions.</source>
-        <translation>The lock file could not be created, for lack of permissions.</translation>
+        <translation type="vanished">The lock file could not be created, for lack of permissions.</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation>Unknown error happened, for instance a full partition prevented writing out the lock file.</translation>
+        <translation type="vanished">Unknown error happened, for instance a full partition prevented writing out the lock file.</translation>
     </message>
     <message>
         <source>Export to CSV</source>
@@ -11412,15 +11607,15 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>The measurements document has no write permissions.</source>
-        <translation>The measurements document has no write permissions.</translation>
+        <translation type="vanished">The measurements document has no write permissions.</translation>
     </message>
     <message>
         <source>Cannot set permissions for %1 to writable.</source>
-        <translation>Cannot set permissions for %1 to writable.</translation>
+        <translation type="vanished">Cannot set permissions for %1 to writable.</translation>
     </message>
     <message>
         <source>Could not save the file.</source>
-        <translation>Could not save the file.</translation>
+        <translation type="vanished">Could not save the file.</translation>
     </message>
     <message>
         <source>Could not save the file</source>
@@ -11550,17 +11745,43 @@ Do you want to save your changes?</translation>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Search measurements by term. &lt;/p&gt;&lt;p&gt;Prepend &amp;quot;/r/&amp;quot; to the front of the search string to search measurements by regex.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Do you want to change the premissions?</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Cannot read settings from a malformed .INI file.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <source>Full name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Full name</translation>
+    </message>
+    <message>
+        <source>Calculated value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Calculated value</translation>
+    </message>
+    <message>
+        <source>Formula</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Formula</translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Base value</translation>
+    </message>
+    <message>
+        <source>Correction</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Units:</source>
-        <translation>Units:</translation>
+        <translation type="unfinished">Units:</translation>
     </message>
     <message>
         <source>Shift B</source>
@@ -11660,46 +11881,16 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>Inches</source>
-        <translation>Inches</translation>
+        <translation type="unfinished">Inches</translation>
     </message>
     <message>
         <source>Centimeters</source>
-        <translation>Centimeters</translation>
+        <translation type="unfinished">Centimeters</translation>
     </message>
     <message>
         <source>Degrees</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Name</source>
-        <comment>measurement column</comment>
-        <translation>Name</translation>
-    </message>
-    <message>
-        <source>Full name</source>
-        <comment>measurement column</comment>
-        <translation>Full name</translation>
-    </message>
-    <message>
-        <source>Calculated value</source>
-        <comment>measurement column</comment>
-        <translation>Calculated value</translation>
-    </message>
-    <message>
-        <source>Formula</source>
-        <comment>measurement column</comment>
-        <translation>Formula</translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <comment>measurement column</comment>
-        <translation>Base value</translation>
-    </message>
-    <message>
-        <source>Correction</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Restrict first dimension</source>
         <translation type="unfinished"></translation>
@@ -11778,6 +11969,10 @@ Do you want to save your changes?</translation>
         <source>Labels</source>
         <translation>Labels</translation>
     </message>
+    <message>
+        <source>Detail label visible</source>
+        <translation type="vanished">Detail label visible</translation>
+    </message>
     <message>
         <source>Width:</source>
         <translation>Width:</translation>
@@ -11888,19 +12083,19 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>Pattern name:</source>
-        <translation>Pattern name:</translation>
+        <translation type="unfinished">Pattern name:</translation>
     </message>
     <message>
         <source>Pattern number:</source>
-        <translation>Pattern number:</translation>
+        <translation type="unfinished">Pattern number:</translation>
     </message>
     <message>
         <source>Company/Designer name:</source>
-        <translation>Company/Designer name:</translation>
+        <translation type="unfinished">Company/Designer name:</translation>
     </message>
     <message>
         <source>Customer name:</source>
-        <translation>Customer name:</translation>
+        <translation type="unfinished">Customer name:</translation>
     </message>
     <message>
         <source>Date format:</source>
@@ -11916,7 +12111,7 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>yyyy-MM-dd</source>
-        <translation>yyyy-MM-dd</translation>
+        <translation type="unfinished">yyyy-MM-dd</translation>
     </message>
     <message>
         <source>Customer email:</source>
@@ -12238,6 +12433,18 @@ Do you want to save your changes?</translation>
         <comment>seam allowance</comment>
         <translation>Custom</translation>
     </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Universally Unique IDentifier of piece. Used to identifier piece while updating manual layout. Left empty to generate new value.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TabPlaceLabels</name>
@@ -12413,6 +12620,18 @@ Do you want to save your changes?</translation>
         <source>The text appears under the icon (recommended for beginners).</source>
         <translation>The text appears under the icon (recommended for beginners).</translation>
     </message>
+    <message>
+        <source>Default height and size</source>
+        <translation type="vanished">Default height and size</translation>
+    </message>
+    <message>
+        <source>Default height:</source>
+        <translation type="vanished">Default height:</translation>
+    </message>
+    <message>
+        <source>Default size:</source>
+        <translation type="vanished">Default size:</translation>
+    </message>
     <message>
         <source>With OS options</source>
         <translation>With OS options</translation>
@@ -12476,6 +12695,10 @@ Do you want to save your changes?</translation>
         <source>My Patterns</source>
         <translation>My Patterns</translation>
     </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished">My Layouts</translation>
+    </message>
 </context>
 <context>
     <name>ToggleDetailInLayout</name>
@@ -12527,19 +12750,15 @@ Do you want to save your changes?</translation>
         <source>Base value invalid</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Size</source>
-        <translation>Size</translation>
-    </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Height</translation>
+        <translation type="unfinished">Height</translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Size</translation>
+        <translation type="unfinished">Size</translation>
     </message>
     <message>
         <source>Waist</source>
@@ -12561,6 +12780,10 @@ Do you want to save your changes?</translation>
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished">Size</translation>
+    </message>
     <message>
         <source>Chest circumference</source>
         <comment>dimension</comment>
@@ -12752,7 +12975,7 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>Comma-Separated Values</source>
-        <translation>Comma-Separated Values</translation>
+        <translation type="unfinished">Comma-Separated Values</translation>
     </message>
     <message>
         <source>values</source>
@@ -12760,7 +12983,51 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>Export to CSV</source>
-        <translation>Export to CSV</translation>
+        <translation type="unfinished">Export to CSV</translation>
+    </message>
+    <message>
+        <source>The measurements document has no write permissions.</source>
+        <translation type="unfinished">The measurements document has no write permissions.</translation>
+    </message>
+    <message>
+        <source>Do you want to change the premissions?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot set permissions for %1 to writable.</source>
+        <translation type="unfinished">Cannot set permissions for %1 to writable.</translation>
+    </message>
+    <message>
+        <source>Could not save the file.</source>
+        <translation type="unfinished">Could not save the file.</translation>
+    </message>
+    <message>
+        <source>Locking file</source>
+        <translation type="unfinished">Locking file</translation>
+    </message>
+    <message>
+        <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished">This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished">The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished">Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</translation>
+    </message>
+    <message>
+        <source>This file already opened in another window.</source>
+        <translation type="unfinished">This file already opened in another window.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions.</source>
+        <translation type="unfinished">The lock file could not be created, for lack of permissions.</translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
+        <translation type="unfinished">Unknown error happened, for instance a full partition prevented writing out the lock file.</translation>
     </message>
 </context>
 <context>
@@ -13543,6 +13810,34 @@ Do you want to save your changes?</translation>
         <source>The dimension C base</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>The filename of exported layout file. Use it to enable console export mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The filename of layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pattern pieces form the raw layout data file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The raw layout data file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to output format (default = 0, export mode): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to tiled pdf page template (default = 0, export mode with tiled pdf format): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run the program in a test mode. The program in this mode loads a single layout file and silently quit without showing the main window. The key have priority before key &apos;%1&apos;.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VCommonSettings</name>
@@ -13570,6 +13865,10 @@ Do you want to save your changes?</translation>
         <source>patterns</source>
         <translation>patterns</translation>
     </message>
+    <message>
+        <source>manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VContainer</name>
@@ -13817,25 +14116,29 @@ Do you want to save your changes?</translation>
 </context>
 <context>
     <name>VLayoutExporter</name>
+    <message>
+        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot set printer page size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot set printer margins</source>
-        <translation>Cannot set printer margins</translation>
+        <translation type="unfinished">Cannot set printer margins</translation>
     </message>
     <message>
         <source>Can&apos;t open file &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Creating file &apos;%1&apos; failed! %2</source>
-        <translation>Creating file &apos;%1&apos; failed! %2</translation>
+        <source>Export raw layout data failed. %1.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
-        <translation type="unfinished"></translation>
+        <source>Creating file &apos;%1&apos; failed! %2</source>
+        <translation type="unfinished">Creating file &apos;%1&apos; failed! %2</translation>
     </message>
     <message>
         <source>Can&apos;t create an flat dxf file.</source>
@@ -13869,15 +14172,15 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>None</translation>
+        <translation type="unfinished">None</translation>
     </message>
     <message>
         <source>Height</source>
-        <translation>Height</translation>
+        <translation type="unfinished">Height</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Size</translation>
+        <translation type="unfinished">Size</translation>
     </message>
     <message>
         <source>Hip</source>
@@ -14023,6 +14326,114 @@ Do you want to save your changes?</translation>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>VPApplication</name>
+    <message>
+        <source>Error parsing file. Program will be terminated.</source>
+        <translation type="unfinished">Error parsing file. Program will be terminated.</translation>
+    </message>
+    <message>
+        <source>Error bad id. Program will be terminated.</source>
+        <translation type="unfinished">Error bad id. Program will be terminated.</translation>
+    </message>
+    <message>
+        <source>Error can&apos;t convert value. Program will be terminated.</source>
+        <translation type="unfinished">Error can&apos;t convert value. Program will be terminated.</translation>
+    </message>
+    <message>
+        <source>Error empty parameter. Program will be terminated.</source>
+        <translation type="unfinished">Error empty parameter. Program will be terminated.</translation>
+    </message>
+    <message>
+        <source>Error wrong id. Program will be terminated.</source>
+        <translation type="unfinished">Error wrong id. Program will be terminated.</translation>
+    </message>
+    <message>
+        <source>Something&apos;s wrong!!</source>
+        <translation type="unfinished">Something&apos;s wrong!!</translation>
+    </message>
+    <message>
+        <source>Exception thrown: %1. Program will be terminated.</source>
+        <translation type="unfinished">Exception thrown: %1. Program will be terminated.</translation>
+    </message>
+    <message>
+        <source>Can&apos;t begin to listen for incoming connections on name &apos;%1&apos;</source>
+        <translation type="unfinished">Can&apos;t begin to listen for incoming connections on name &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <source>Export mode doesn&apos;t support openning several files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import raw layout data does not support openning several layout files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, provide one input file.</source>
+        <translation type="unfinished">Please, provide one input file.</translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrousel</name>
+    <message>
+        <source>Pieces of </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrouselPieceList</name>
+    <message>
+        <source>Move to Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Delete</translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPDialogAbout</name>
+    <message>
+        <source>About Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Puzzle version</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Build revision:</source>
+        <translation type="unfinished">Build revision:</translation>
+    </message>
+    <message>
+        <source>This program is part of Valentina project.</source>
+        <translation type="unfinished">This program is part of Valentina project.</translation>
+    </message>
+    <message>
+        <source>Check For Updates</source>
+        <translation type="unfinished">Check For Updates</translation>
+    </message>
+    <message>
+        <source>Cannot open your default browser</source>
+        <translation type="unfinished">Cannot open your default browser</translation>
+    </message>
+    <message>
+        <source>Build revision: %1</source>
+        <translation type="unfinished">Build revision: %1</translation>
+    </message>
+    <message>
+        <source>Built on %1 at %2</source>
+        <translation type="unfinished">Built on %1 at %2</translation>
+    </message>
+    <message>
+        <source>Web site : %1</source>
+        <translation type="unfinished">Web site : %1</translation>
+    </message>
+</context>
 <context>
     <name>VPE::VBoolProperty</name>
     <message>
@@ -14045,6 +14456,573 @@ Do you want to save your changes?</translation>
         <translation>Open File</translation>
     </message>
 </context>
+<context>
+    <name>VPGraphicsPiece</name>
+    <message>
+        <source>Move to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPLayoutFileReader</name>
+    <message>
+        <source>Piece List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Got empty attribute &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPMainWindow</name>
+    <message>
+        <source>Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;File</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished">&amp;Help</translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished">Menu</translation>
+    </message>
+    <message>
+        <source>Piece Carrousel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Infos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Name:</translation>
+    </message>
+    <message>
+        <source>DummyName</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UUID:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{7b2ce4ae-96f5-4905-bb34-405cb40ca208}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Geometry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mirror piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotation</source>
+        <translation type="unfinished">Rotation</translation>
+    </message>
+    <message>
+        <source>Angle:</source>
+        <translation type="unfinished">Angle:</translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° anti-clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Placement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Y:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No piece selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple pieces selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Width</source>
+        <translation type="unfinished">Width</translation>
+    </message>
+    <message>
+        <source>Length</source>
+        <translation type="unfinished">Length</translation>
+    </message>
+    <message>
+        <source>Orientation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove unused length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right:</source>
+        <translation type="unfinished">Right:</translation>
+    </message>
+    <message>
+        <source>Top:</source>
+        <translation type="unfinished">Top:</translation>
+    </message>
+    <message>
+        <source>Left:</source>
+        <translation type="unfinished">Left:</translation>
+    </message>
+    <message>
+        <source>Bottom:</source>
+        <translation type="unfinished">Bottom:</translation>
+    </message>
+    <message>
+        <source>Placement Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Row height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Follow grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vertical grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Horizontal grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pieces gap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sticky edges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation type="unfinished">Export</translation>
+    </message>
+    <message>
+        <source>Export Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiles properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiled Pdf Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Tiles on sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export Tiled Pdf</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation type="unfinished">Layout</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Description</translation>
+    </message>
+    <message>
+        <source>Unit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning superposition of pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning pieces out of bound</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation type="unfinished">&amp;Open</translation>
+    </message>
+    <message>
+        <source>Ctrl+O</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Save</translation>
+    </message>
+    <message>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save &amp;As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Import Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation type="unfinished">E&amp;xit</translation>
+    </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation type="unfinished">&amp;New</translation>
+    </message>
+    <message>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation type="unfinished">About &amp;Qt</translation>
+    </message>
+    <message>
+        <source>About &amp;Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom in</source>
+        <translation type="unfinished">Zoom in</translation>
+    </message>
+    <message>
+        <source>Zoom out</source>
+        <translation type="unfinished">Zoom out</translation>
+    </message>
+    <message>
+        <source>Zoom 1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom fit best</source>
+        <translation type="unfinished">Zoom fit best</translation>
+    </message>
+    <message>
+        <source>Zoom sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished">Preferences</translation>
+    </message>
+    <message>
+        <source>File &apos;%1&apos; doesn&apos;t exist!</source>
+        <translation type="unfinished">File &apos;%1&apos; doesn&apos;t exist!</translation>
+    </message>
+    <message>
+        <source>File error.</source>
+        <translation type="unfinished">File error.</translation>
+    </message>
+    <message>
+        <source>Unable to read a layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fail to create layout.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not extract data from file &apos;%1&apos;. %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Centimeters</source>
+        <translation type="unfinished">Centimeters</translation>
+    </message>
+    <message>
+        <source>Millimiters</source>
+        <translation type="unfinished">Millimiters</translation>
+    </message>
+    <message>
+        <source>Inches</source>
+        <translation type="unfinished">Inches</translation>
+    </message>
+    <message>
+        <source>Scale:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>untitled %1.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>untitled.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read only</source>
+        <translation type="unfinished">read only</translation>
+    </message>
+    <message>
+        <source>Cannot read settings from a malformed .INI file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save settings. Access denied.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to open file, is it writable?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New Window</source>
+        <translation type="unfinished">&amp;New Window</translation>
+    </message>
+    <message>
+        <source>Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open file</source>
+        <translation type="unfinished">Open file</translation>
+    </message>
+    <message>
+        <source>Could not save the file</source>
+        <translation type="unfinished">Could not save the file</translation>
+    </message>
+    <message>
+        <source>layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save as</source>
+        <translation type="unfinished">Save as</translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window.</source>
+        <translation type="unfinished">Failed to lock. This file already opened in another window.</translation>
+    </message>
+    <message>
+        <source>Could not save file</source>
+        <translation type="unfinished">Could not save file</translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window. Expect collissions when run 2 copies of the program.</source>
+        <translation type="unfinished">Failed to lock. This file already opened in another window. Expect collissions when run 2 copies of the program.</translation>
+    </message>
+    <message>
+        <source>Raw Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About Qt</source>
+        <translation type="unfinished">About Qt</translation>
+    </message>
+    <message>
+        <source>PDF Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SVG Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPSheet</name>
+    <message>
+        <source>Letter</source>
+        <translation type="unfinished">Letter</translation>
+    </message>
+    <message>
+        <source>Legal</source>
+        <translation type="unfinished">Legal</translation>
+    </message>
+    <message>
+        <source>Tabloid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 24in</source>
+        <translation type="unfinished">Roll 24in</translation>
+    </message>
+    <message>
+        <source>Roll 30in</source>
+        <translation type="unfinished">Roll 30in</translation>
+    </message>
+    <message>
+        <source>Roll 36in</source>
+        <translation type="unfinished">Roll 36in</translation>
+    </message>
+    <message>
+        <source>Roll 42in</source>
+        <translation type="unfinished">Roll 42in</translation>
+    </message>
+    <message>
+        <source>Roll 44in</source>
+        <translation type="unfinished">Roll 44in</translation>
+    </message>
+    <message>
+        <source>Roll 48in</source>
+        <translation type="unfinished">Roll 44in {48i?}</translation>
+    </message>
+    <message>
+        <source>Roll 62in</source>
+        <translation type="unfinished">Roll 44in {62i?}</translation>
+    </message>
+    <message>
+        <source>Roll 72in</source>
+        <translation type="unfinished">Roll 44in {72i?}</translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation type="unfinished">Custom</translation>
+    </message>
+</context>
+<context>
+    <name>VPTileFactory</name>
+    <message>
+        <source>Grid ( %1 , %2 )</source>
+        <translation type="unfinished">Grid ( %1 , %2 )</translation>
+    </message>
+    <message>
+        <source>Page %1 of %2</source>
+        <translation type="unfinished">Page %1 of %2</translation>
+    </message>
+</context>
 <context>
     <name>VPattern</name>
     <message>
@@ -14390,23 +15368,23 @@ Do you want to save your changes?</translation>
     <name>VPrintLayout</name>
     <message>
         <source>For printing multipages document all sheet should have the same size.</source>
-        <translation>For printing multipages document all sheet should have the same size.</translation>
+        <translation type="unfinished">For printing multipages document all sheet should have the same size.</translation>
     </message>
     <message>
         <source>For previewing multipage document all sheet should have the same size.</source>
-        <translation>For previewing multipage document all sheet should have the same size.</translation>
+        <translation type="unfinished">For previewing multipage document all sheet should have the same size.</translation>
     </message>
     <message>
         <source>Pages will be cropped because they do not fit printer paper size.</source>
-        <translation>Pages will be cropped because they do not fit printer paper size.</translation>
+        <translation type="unfinished">Pages will be cropped because they do not fit printer paper size.</translation>
     </message>
     <message>
         <source>Print error</source>
-        <translation>Print error</translation>
+        <translation type="unfinished">Print error</translation>
     </message>
     <message>
         <source>Cannot proceed because there are no available printers in your system.</source>
-        <translation>Cannot proceed because there are no available printers in your system.</translation>
+        <translation type="unfinished">Cannot proceed because there are no available printers in your system.</translation>
     </message>
     <message>
         <source>Failed to open file, is it writable?</source>
@@ -14418,7 +15396,7 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>Cannot set printer margins</source>
-        <translation>Cannot set printer margins</translation>
+        <translation type="unfinished">Cannot set printer margins</translation>
     </message>
     <message>
         <source>Cannot set custom printer page size</source>
@@ -14446,18 +15424,30 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>The layout is stale.</source>
-        <translation>The layout is stale.</translation>
+        <translation type="unfinished">The layout is stale.</translation>
     </message>
     <message>
         <source>The layout was not updated since last pattern modification. Do you want to continue?</source>
-        <translation>The layout was not updated since last pattern modification. Do you want to continue?</translation>
+        <translation type="unfinished">The layout was not updated since last pattern modification. Do you want to continue?</translation>
+    </message>
+</context>
+<context>
+    <name>VRawLayout</name>
+    <message>
+        <source>VRawLayout::ReadFile() failed. Raw layout format prefix mismatch error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VRawLayout::ReadFile() failed.
+Raw layout format compatibility error: actualFileVersion = %1 and fileVersion = %2</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VSettings</name>
     <message>
         <source>layouts</source>
-        <translation>layouts</translation>
+        <translation type="vanished">layouts</translation>
     </message>
 </context>
 <context>
@@ -15406,7 +16396,7 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>Notes:</source>
-        <translation>Notes:</translation>
+        <translation type="unfinished">Notes:</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -17105,6 +18095,13 @@ Do you want to save your changes?</translation>
         <translation type="vanished">Error restoring backup file: %1.</translation>
     </message>
 </context>
+<context>
+    <name>VValentinaSettings</name>
+    <message>
+        <source>layouts</source>
+        <translation type="unfinished">layouts</translation>
+    </message>
+</context>
 <context>
     <name>VWidgetDetails</name>
     <message>
diff --git a/share/translations/valentina_es_ES.ts b/share/translations/valentina_es_ES.ts
index 4e71cb2e1..bc4138e73 100644
--- a/share/translations/valentina_es_ES.ts
+++ b/share/translations/valentina_es_ES.ts
@@ -576,11 +576,11 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -707,16 +707,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogArcWithLength</name>
@@ -834,16 +834,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogBisector</name>
@@ -965,11 +965,11 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1036,16 +1036,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCubicBezierPath</name>
@@ -1095,16 +1095,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCurveIntersectAxis</name>
@@ -1206,11 +1206,11 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1297,11 +1297,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1311,6 +1307,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCutSpline</name>
@@ -1388,11 +1388,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1402,6 +1398,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCutSplinePath</name>
@@ -1479,11 +1479,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1493,6 +1489,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogDateTimeFormats</name>
@@ -1792,19 +1792,19 @@
     <name>DialogDimensionLabels</name>
     <message>
         <source>Dimension labels</source>
-        <translation>Etiqueta de dimesion</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <translation>Valor</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dimension:</source>
-        <translation>Dimensión:</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished">Valor</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished">Etiqueta</translation>
     </message>
 </context>
 <context>
@@ -1958,6 +1958,14 @@
         <source>Measurments file name</source>
         <translation>Nombre del archivo de medidas</translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="vanished">Tamaño</translation>
+    </message>
+    <message>
+        <source>Height</source>
+        <translation type="vanished">Altura</translation>
+    </message>
     <message>
         <source>Measurments extension</source>
         <translation>Extensión de medidas</translation>
@@ -2068,66 +2076,46 @@
     </message>
     <message>
         <source>Measurements units</source>
-        <translation>Unidades de medidas</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pattern units</source>
-        <translation>Unidades del patrón</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size units</source>
-        <translation>Unidades de Talla</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Customer birth date</source>
-        <translation>Fecha nacimiento del cliente</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Customer email</source>
-        <translation>Correo electrónico del cliente</translation>
-    </message>
-    <message>
-        <source>Measurement: %1</source>
-        <translation>Medida: %1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Altura</translation>
+        <translation type="unfinished">Altura</translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Talla</translation>
+        <translation type="unfinished">Tamaño</translation>
     </message>
     <message>
         <source>Hip</source>
         <comment>dimension</comment>
-        <translation>Cadera</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Waist</source>
         <comment>dimension</comment>
-        <translation>Cintura</translation>
-    </message>
-    <message>
-        <source>No data for the height dimension.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No data for the size dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the hip dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the waist dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Final measurement: %1</source>
+        <source>Measurement: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2150,6 +2138,26 @@
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Final measurement: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the height dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the size dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the hip dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the waist dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogEditWrongFormula</name>
@@ -2382,16 +2390,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogEndLine</name>
@@ -2497,11 +2505,11 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -2727,11 +2735,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -2749,6 +2753,10 @@
         <source>Ready</source>
         <translation>Listo</translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -2846,11 +2854,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -2868,6 +2872,10 @@
         <source>Ready</source>
         <translation>Listo</translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -3020,11 +3028,11 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3883,11 +3891,11 @@ Aplicar características de todos modos?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3950,11 +3958,11 @@ Aplicar características de todos modos?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -4077,11 +4085,11 @@ Aplicar características de todos modos?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -4212,101 +4220,101 @@ Aplicar características de todos modos?</translation>
     <name>DialogMeasurementsCSVColumns</name>
     <message>
         <source>Setup columns</source>
-        <translation>Configurar columnas</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preview</source>
-        <translation>Vista previa</translation>
+        <translation type="unfinished">Vista previa</translation>
     </message>
     <message>
         <source>Input</source>
-        <translation>Entrada</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import</source>
-        <translation>Importar</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Columns</source>
-        <translation>Columnas</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full name:</source>
-        <translation>Nombre completo:</translation>
+        <translation type="unfinished">Nombre completo:</translation>
     </message>
     <message>
         <source>Description:</source>
-        <translation>Descripción:</translation>
+        <translation type="unfinished">Descripción:</translation>
     </message>
     <message>
         <source>Ready</source>
-        <translation>Listo</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation>Nombre</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <translation>Valor</translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <translation>Valor base</translation>
-    </message>
-    <message>
-        <source>Skip</source>
-        <translation>Saltar</translation>
-    </message>
-    <message>
-        <source>Shift (%1)*:</source>
-        <translation>Cambio (%1)*:</translation>
-    </message>
-    <message>
-        <source>File path is empty</source>
-        <translation>La ruta del archivo está vacía</translation>
-    </message>
-    <message>
-        <source>Not enough columns</source>
-        <translation>No hay suficientes columnas</translation>
-    </message>
-    <message>
-        <source>Not enough data to import</source>
-        <translation>No hay suficientes datos para importar</translation>
-    </message>
-    <message>
-        <source>Please, select unique number for each column</source>
-        <translation>Por favor, seleccione un número único para cada columna</translation>
+        <translation type="unfinished">Listo</translation>
     </message>
     <message>
         <source>Name</source>
         <comment>measurement column</comment>
-        <translation>Nombre</translation>
+        <translation type="unfinished">Nombre</translation>
     </message>
     <message>
         <source>Value</source>
         <comment>measurement column</comment>
-        <translation>Valor</translation>
+        <translation type="unfinished">Valor</translation>
     </message>
     <message>
         <source>Full name</source>
         <comment>measurement column</comment>
-        <translation>Apellido</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <comment>measurement column</comment>
-        <translation>Descripción</translation>
+        <translation type="unfinished">Descripción</translation>
     </message>
     <message>
         <source>Base value</source>
         <comment>measurement column</comment>
-        <translation>Valor base</translation>
+        <translation type="unfinished">Valor base</translation>
     </message>
     <message>
         <source>Shift (%1):</source>
         <comment>measurement column</comment>
-        <translation>Cambio (%1)*:</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Nombre</translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished">Valor</translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <translation type="unfinished">Valor base</translation>
+    </message>
+    <message>
+        <source>Shift (%1)*:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File path is empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not enough columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not enough data to import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, select unique number for each column</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -4401,11 +4409,7 @@ Aplicar características de todos modos?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -4423,6 +4427,10 @@ Aplicar características de todos modos?</translation>
         <source>Ready</source>
         <translation>Listo</translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -4662,11 +4670,11 @@ Aplicar características de todos modos?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -4858,6 +4866,10 @@ Aplicar características de todos modos?</translation>
         <source>Show measurements file</source>
         <translation type="vanished">Mostrar archivo de medidas</translation>
     </message>
+    <message>
+        <source>From multisize measurements</source>
+        <translation type="vanished">Desde medidas multitalla</translation>
+    </message>
     <message>
         <source>Pattern</source>
         <translation>Patrón</translation>
@@ -4866,10 +4878,66 @@ Aplicar características de todos modos?</translation>
         <source>For technical notes</source>
         <translation>Para notas técnicas</translation>
     </message>
+    <message>
+        <source>Label data</source>
+        <translation type="vanished">Etiqueta de datos</translation>
+    </message>
+    <message>
+        <source>Label template:</source>
+        <translation type="vanished">Etiqueta de plantilla:</translation>
+    </message>
+    <message>
+        <source>Edit pattern label</source>
+        <translation type="vanished">Editar etiqueta del patrón</translation>
+    </message>
+    <message>
+        <source>Edit template</source>
+        <translation type="vanished">Editar plantilla</translation>
+    </message>
+    <message>
+        <source>Date format:</source>
+        <translation type="vanished">Formato de fecha:</translation>
+    </message>
+    <message>
+        <source>Time format:</source>
+        <translation type="vanished">Formato de hora:</translation>
+    </message>
+    <message>
+        <source>Save label data.</source>
+        <translation type="vanished">Guardar etiqueta de datos.</translation>
+    </message>
+    <message>
+        <source>Label data were changed. Do you want to save them before editing label template?</source>
+        <translation type="vanished">La etiqueta de datos fueron modificados. ¿Quiere guardarlos antes de editar la etiqueta de plantilla?</translation>
+    </message>
+    <message>
+        <source>Materials</source>
+        <translation type="vanished">Materiales</translation>
+    </message>
+    <message>
+        <source>Pattern materials:</source>
+        <translation type="vanished">Materiales del patrón:</translation>
+    </message>
+    <message>
+        <source>Manage list of pattern materials</source>
+        <translation type="vanished">Administar lista de materiales del patrón</translation>
+    </message>
+    <message>
+        <source>Manage</source>
+        <translation type="vanished">Administrar</translation>
+    </message>
+    <message>
+        <source>The customer name from individual measurements</source>
+        <translation type="vanished">El nombre del cliente desde las medidas individuales</translation>
+    </message>
     <message>
         <source>Label language:</source>
         <translation>Idioma de etiquetas:</translation>
     </message>
+    <message>
+        <source>yyyy-MM-dd</source>
+        <translation type="obsolete">yyyy-MM-dd</translation>
+    </message>
     <message>
         <source>Passmark length:</source>
         <translation type="unfinished"></translation>
@@ -5571,11 +5639,11 @@ Aplicar características de todos modos?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -5670,11 +5738,11 @@ Aplicar características de todos modos?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -5765,11 +5833,11 @@ Aplicar características de todos modos?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -5824,11 +5892,11 @@ Aplicar características de todos modos?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -5891,11 +5959,11 @@ Aplicar características de todos modos?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -6006,11 +6074,11 @@ Aplicar características de todos modos?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -6053,11 +6121,11 @@ Aplicar características de todos modos?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Curve 1</source>
@@ -6102,31 +6170,53 @@ Aplicar características de todos modos?</translation>
         </translation>
     </message>
 </context>
+<context>
+    <name>DialogPuzzlePreferences</name>
+    <message>
+        <source>Puzzle preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished">Configuración</translation>
+    </message>
+    <message>
+        <source>Paths</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>Followed %n option(s) require restart to take effect: %1.</source>
+        <translation type="unfinished">
+            <numerusform>Para seguir %n opción(es) se requiere re-inicializar el programa: %1.</numerusform>
+            <numerusform>Para seguir %n opción(es) se requiere re-inicializar el programa: %1.</numerusform>
+        </translation>
+    </message>
+</context>
 <context>
     <name>DialogRestrictDimension</name>
     <message>
         <source>Restrict dimension</source>
-        <translation>Restringir dimensión</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dimension A:</source>
-        <translation>Dimensión A:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restriction</source>
-        <translation>Restricción</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Min:</source>
-        <translation>Min:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Max:</source>
-        <translation>Max:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Exclude</source>
-        <translation>Excluir</translation>
+        <translation type="unfinished">Excluir</translation>
     </message>
     <message>
         <source>Include</source>
@@ -6213,11 +6303,7 @@ Aplicar características de todos modos?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Alias</source>
@@ -6235,6 +6321,10 @@ Aplicar características de todos modos?</translation>
         <source>Ready</source>
         <translation>Listo</translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -6477,6 +6567,10 @@ Aplicar características de todos modos?</translation>
         <source>Numerical control</source>
         <translation>Control numerico</translation>
     </message>
+    <message>
+        <source>Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogSeamAllowance</name>
@@ -6706,54 +6800,59 @@ Aplicar características de todos modos?</translation>
     </message>
     <message>
         <source>The customer name from individual measurements</source>
-        <translation>El nombre del cliente desde las medidas individuales</translation>
+        <translation type="unfinished">El nombre del cliente desde las medidas individuales</translation>
     </message>
     <message>
         <source>The customer email from individual measurements</source>
-        <translation>El correo electrónico del cliente a partir de medidas individuales</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The customer birth date from individual measurements</source>
-        <translation>La fecha de nacimiento del cliente a partir de medidas individuales</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save label data.</source>
-        <translation>Guardar etiqueta de datos.</translation>
+        <translation type="unfinished">Guardar etiqueta de datos.</translation>
     </message>
     <message>
         <source>Label data were changed. Do you want to save them before editing label template?</source>
-        <translation>La etiqueta de datos fueron modificados. ¿Quiere guardarlos antes de editar la etiqueta de plantilla?</translation>
+        <translation type="unfinished">La etiqueta de datos fueron modificados. ¿Quiere guardarlos antes de editar la etiqueta de plantilla?</translation>
     </message>
 </context>
 <context>
     <name>DialogSetupMultisize</name>
     <message>
         <source>Setup multisize measurements</source>
-        <translation>Configurar medidas multitallas</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use full circumference</source>
-        <translation>Usar circunferencia completa</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Height</source>
+        <comment>dimension</comment>
+        <translation type="unfinished">Altura</translation>
     </message>
     <message>
         <source>Min value:</source>
-        <translation>Valor min:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minimal value described in the column</source>
-        <translation>Valor mínimo descrito en la columna</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Max value:</source>
-        <translation>Valor max:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maximal value described in the column</source>
-        <translation>Valor máximo descrito en la columna</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Step:</source>
-        <translation>Paso:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Single-step between the column values</source>
@@ -6765,15 +6864,30 @@ Aplicar características de todos modos?</translation>
     </message>
     <message>
         <source>The base value for the column</source>
-        <translation>El valor base para la columna</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <comment>dimension</comment>
+        <translation type="unfinished">Tamaño</translation>
     </message>
     <message>
         <source>Circumference</source>
-        <translation>Circunferencia</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Waist</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hip</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please, provide correct data for dimensions</source>
-        <translation>Por favor, proporcione los datos correctos para las dimensiones</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please, select at least one dimension</source>
@@ -6781,31 +6895,11 @@ Aplicar características de todos modos?</translation>
     </message>
     <message>
         <source>No more than 3 dimensions allowed</source>
-        <translation>No se permiten más de 3 dimensiones</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ready</source>
-        <translation>Listo</translation>
-    </message>
-    <message>
-        <source>Height</source>
-        <comment>dimension</comment>
-        <translation>Altura</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <comment>dimension</comment>
-        <translation>Talla</translation>
-    </message>
-    <message>
-        <source>Waist</source>
-        <comment>dimension</comment>
-        <translation>Cintura</translation>
-    </message>
-    <message>
-        <source>Hip</source>
-        <comment>dimension</comment>
-        <translation>Cadera</translation>
+        <translation type="unfinished">Listo</translation>
     </message>
 </context>
 <context>
@@ -6916,11 +7010,11 @@ Aplicar características de todos modos?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -6959,11 +7053,11 @@ Aplicar características de todos modos?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7106,16 +7200,16 @@ Aplicar características de todos modos?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogSplinePath</name>
@@ -7265,16 +7359,16 @@ Aplicar características de todos modos?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogTapePreferences</name>
@@ -7457,11 +7551,11 @@ Aplicar características de todos modos?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7568,11 +7662,11 @@ Aplicar características de todos modos?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Herramienta</translation>
+        <translation type="unfinished">Herramienta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7826,7 +7920,7 @@ Aplicar características de todos modos?</translation>
     </message>
     <message>
         <source>The dimension A base</source>
-        <translation>La base de dimensión A</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set base for dimension B in the table units.</source>
@@ -7834,7 +7928,7 @@ Aplicar características de todos modos?</translation>
     </message>
     <message>
         <source>The dimension B base</source>
-        <translation>La base de dimensión B</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set base for dimension C in the table units.</source>
@@ -7842,7 +7936,7 @@ Aplicar características de todos modos?</translation>
     </message>
     <message>
         <source>The dimension C base</source>
-        <translation>La base de la dimensión C</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set pattern file units: cm, mm, inch.</source>
@@ -7858,7 +7952,7 @@ Aplicar características de todos modos?</translation>
     </message>
     <message>
         <source>Invalid dimension B base value.</source>
-        <translation>Valor base de dimensión B no válido.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid dimension C base value.</source>
@@ -8307,7 +8401,7 @@ Quiere guardar los cambios?</translation>
     </message>
     <message>
         <source>This file already opened in another window.</source>
-        <translation>Este archivo ha sido abierto en otra ventana.</translation>
+        <translation type="vanished">Este archivo ha sido abierto en otra ventana.</translation>
     </message>
     <message>
         <source>Wrong units.</source>
@@ -8761,27 +8855,27 @@ el patrón.</translation>
     </message>
     <message>
         <source>Locking file</source>
-        <translation>Cerrando archivo</translation>
+        <translation type="vanished">Cerrando archivo</translation>
     </message>
     <message>
         <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Este archivo esta abierto en otra ventana. Si desea continuar: click en Ignorar (no recomendado puede causar datos erroneos).</translation>
+        <translation type="vanished">Este archivo esta abierto en otra ventana. Si desea continuar: click en Ignorar (no recomendado puede causar datos erroneos).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Archivo bloqueado, no puede ser mostrado por falta de permisos. Si desea continuar apriete ignorar (no recomendado, puede causar errores).</translation>
+        <translation type="vanished">Archivo bloqueado, no puede ser mostrado por falta de permisos. Si desea continuar apriete ignorar (no recomendado, puede causar errores).</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Ocurrió un error desconocido, por ejemplo una partición llena evitando que se escriba el archivo de bloqueo. Ignorelo si desea continuar (no se recomienda, puede causar corrupción de datos).</translation>
+        <translation type="vanished">Ocurrió un error desconocido, por ejemplo una partición llena evitando que se escriba el archivo de bloqueo. Ignorelo si desea continuar (no se recomienda, puede causar corrupción de datos).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions.</source>
-        <translation>No se pudo crear el archivo de bloqueo, por falta de permisos.</translation>
+        <translation type="vanished">No se pudo crear el archivo de bloqueo, por falta de permisos.</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation>Ocurrió un error desconocido, por ejemplo, una partición completa impedido escribir el archivo de bloqueo.</translation>
+        <translation type="vanished">Ocurrió un error desconocido, por ejemplo, una partición completa impedido escribir el archivo de bloqueo.</translation>
     </message>
     <message>
         <source>Report Bug...</source>
@@ -8941,15 +9035,15 @@ el patrón.</translation>
     </message>
     <message>
         <source>The document has no write permissions.</source>
-        <translation>El documento no tiene permisos de escritura.</translation>
+        <translation type="vanished">El documento no tiene permisos de escritura.</translation>
     </message>
     <message>
         <source>Cannot set permissions for %1 to writable.</source>
-        <translation>No se pueden establecer permisos para %1 para escribir.</translation>
+        <translation type="vanished">No se pueden establecer permisos para %1 para escribir.</translation>
     </message>
     <message>
         <source>Could not save the file.</source>
-        <translation>No pudo guardarse el archivo.</translation>
+        <translation type="vanished">No pudo guardarse el archivo.</translation>
     </message>
     <message>
         <source>Could not save the file</source>
@@ -9095,6 +9189,14 @@ el patrón.</translation>
         <source>Can&apos;t export details.</source>
         <translation>No se puede exportar detalles.</translation>
     </message>
+    <message>
+        <source>Couldn&apos;t set size. Need a file with multisize measurements.</source>
+        <translation type="vanished">No se pudo establecer la talla. Necesita un archivo con medidas multitalla.</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t set height. Need a file with multisize measurements.</source>
+        <translation type="vanished">No se pudo establecer la estatura. Necesita un archivo con medidas multitalla.</translation>
+    </message>
     <message>
         <source>Label template editor</source>
         <translation>Editor de plantilla de etiqueta</translation>
@@ -9335,9 +9437,49 @@ el patrón.</translation>
         <source>Watermark files</source>
         <translation>Archivos de marca de agua</translation>
     </message>
+    <message>
+        <source>Manual Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open the Puzzle app</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished">Actualizar</translation>
+    </message>
+    <message>
+        <source>Update manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Do you want to change the premissions?</source>
-        <translation>¿Quieres cambiar los permisos?</translation>
+        <translation type="obsolete">¿Quieres cambiar los permisos?</translation>
+    </message>
+    <message>
+        <source>Unable to prepare raw layout data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select manual layout</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not supported dimension A value &apos;%1&apos; for this pattern file.</source>
@@ -9369,7 +9511,7 @@ el patrón.</translation>
     </message>
     <message>
         <source>Couldn&apos;t set dimension C. Need a file with multisize measurements.</source>
-        <translation>No se pudo establecer la dimensión C. Necesita un archivo con medidas multitallas.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t set dimension C. File wasn&apos;t opened.</source>
@@ -9534,6 +9676,14 @@ el patrón.</translation>
         <source>Measurement file contains invalid known measurement(s).</source>
         <translation>El archivo de medidas contiene medida(s) conocidas no válidas.</translation>
     </message>
+    <message>
+        <source>Wrong units.</source>
+        <translation type="vanished">Unidades equivocadas.</translation>
+    </message>
+    <message>
+        <source>Application doesn&apos;t support multisize table with inches.</source>
+        <translation type="vanished">La aplicación no soporta la tabla multitalla en pulgadas.</translation>
+    </message>
     <message>
         <source>File error.</source>
         <translation>Error en archivo.</translation>
@@ -9554,10 +9704,30 @@ el patrón.</translation>
         <source>Timeout.</source>
         <translation>Tiempo agotado.</translation>
     </message>
+    <message>
+        <source>Cannot set printer page size</source>
+        <translation type="vanished">No se puede establecer el tamaño de página de la impresora</translation>
+    </message>
+    <message>
+        <source>Cannot set custom printer page size</source>
+        <translation type="vanished">No se puede establecer el tamaño de página de la impresora personalizada</translation>
+    </message>
     <message>
         <source>Process has been stoped because of exception.</source>
         <translation>El proceso se ha detenido debido a una excepción.</translation>
     </message>
+    <message>
+        <source>File error.
+
+%1
+
+%2</source>
+        <translation type="vanished">Error archivo.
+
+%1
+
+%2</translation>
+    </message>
 </context>
 <context>
     <name>MoveDoubleLabel</name>
@@ -9897,11 +10067,11 @@ el patrón.</translation>
     </message>
     <message>
         <source>Change the position of the tool panel to optimize for big screen resolutions. By default, the tool panel will take all available space.</source>
-        <translation>Cambie la posición del panel de herramientas para optimizar las resoluciones de pantalla grande. De forma predeterminada, el panel de herramientas ocupará todo el espacio disponible.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tool panel scaling</source>
-        <translation>Escala de panel de herramientas</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t use the native file dialog</source>
@@ -9958,6 +10128,10 @@ el patrón.</translation>
         <source>My label templates</source>
         <translation>Mis plantillas de etiquetas</translation>
     </message>
+    <message>
+        <source>My manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PreferencesPatternPage</name>
@@ -10100,6 +10274,111 @@ Esta opción surtirá efecto después de reiniciar.</translation>
         <translation>retratar una escena</translation>
     </message>
 </context>
+<context>
+    <name>Puzzle</name>
+    <message>
+        <source>Export options can be used with single input file only.</source>
+        <translation type="unfinished">Las opciones de exportación solo puede usarse con un solo archivo de entrada.</translation>
+    </message>
+    <message>
+        <source>Valentina&apos;s manual layout editor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The manual layout file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesConfigurationPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished">Idioma</translation>
+    </message>
+    <message>
+        <source>GUI language:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toolbar</source>
+        <translation type="unfinished">Barra de herramientas</translation>
+    </message>
+    <message>
+        <source>The text appears under the icon (recommended for beginners).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Interface</source>
+        <translation type="unfinished">Interfaz de usuario</translation>
+    </message>
+    <message>
+        <source>Activate dark mode</source>
+        <translation type="unfinished">Activar el modo oscuro</translation>
+    </message>
+    <message>
+        <source>Don&apos;t use the native file dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dark mode</source>
+        <translation type="unfinished">modo oscuro</translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesPathPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paths that Valentina uses</source>
+        <translation type="unfinished">Rutas que usa Valentina</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished">Tipo</translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished">Editar</translation>
+    </message>
+    <message>
+        <source>Open Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Individual Measurements</source>
+        <translation type="unfinished">Mis Medidas Individuales</translation>
+    </message>
+    <message>
+        <source>My Multisize Measurements</source>
+        <translation type="unfinished">Mis Medidas Multitalla</translation>
+    </message>
+    <message>
+        <source>My Patterns</source>
+        <translation type="unfinished">Mis Patrones</translation>
+    </message>
+    <message>
+        <source>My Templates</source>
+        <translation type="unfinished">Mis Plantillas</translation>
+    </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished">Mis Diseños</translation>
+    </message>
+</context>
 <context>
     <name>QApplication</name>
     <message>
@@ -10445,21 +10724,29 @@ Esta opción surtirá efecto después de reiniciar.</translation>
         <source>Can&apos;t convert toInt parameter</source>
         <translation>No se puede convertir el parámetro toInt</translation>
     </message>
+    <message>
+        <source>Piece name &apos;%1&apos; is not unique.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Could not find the segment start.</source>
-        <translation>No se pudo encontrar el inicio del segmento.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not find the segment end.</source>
-        <translation>No se pudo encontrar el final del segmento.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Segment is too short.</source>
-        <translation>El segmento es demasiado corto.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error calculating segment for curve &apos;%1&apos;. %2</source>
-        <translation>Error calculando el segmento para la curva &apos;%1&apos;. %2</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot prepare builtin passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
@@ -10471,24 +10758,20 @@ Esta opción surtirá efecto después de reiniciar.</translation>
     </message>
     <message>
         <source>Cannot prepare passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark base line is empty.</source>
-        <translation>No se puede preparar pique &apos;%1&apos; para la pieza &apos;%2&apos;. El pique de la línea base esta vacía.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot prepare passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Piece name &apos;%1&apos; is not unique.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Cannot get tokens from formula &apos;%1&apos;. Formula error: %2.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>No data for the height dimension.</source>
         <translation type="unfinished"></translation>
@@ -10510,11 +10793,15 @@ Esta opción surtirá efecto después de reiniciar.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
+        <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
+        <source>Unplaced pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet 1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -11110,7 +11397,7 @@ Esta opción surtirá efecto después de reiniciar.</translation>
     </message>
     <message>
         <source>untitled</source>
-        <translation type="vanished">Sin título</translation>
+        <translation>Sin título</translation>
     </message>
     <message>
         <source>&lt;Empty&gt;</source>
@@ -11347,27 +11634,27 @@ Quieres guardar los cambios?</translation>
     </message>
     <message>
         <source>Locking file</source>
-        <translation>Archivo de bloqueo</translation>
+        <translation type="vanished">Archivo de bloqueo</translation>
     </message>
     <message>
         <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Este archivo esta abierto en otra ventana. Si desea continuar: click en Ignorar (no recomendado puede causar datos erroneos).</translation>
+        <translation type="vanished">Este archivo esta abierto en otra ventana. Si desea continuar: click en Ignorar (no recomendado puede causar datos erroneos).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Archivo bloqueado, no puede ser mostrado por falta de permisos. Si desea continuar apriete ignorar (no recomendado, puede causar errores).</translation>
+        <translation type="vanished">Archivo bloqueado, no puede ser mostrado por falta de permisos. Si desea continuar apriete ignorar (no recomendado, puede causar errores).</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Ocurrió un error desconocido, por ejemplo una partición llena evitando que se escriba el archivo de bloqueo. Ignorelo si desea continuar (no se recomienda, puede causar corrupción de datos).</translation>
+        <translation type="vanished">Ocurrió un error desconocido, por ejemplo una partición llena evitando que se escriba el archivo de bloqueo. Ignorelo si desea continuar (no se recomienda, puede causar corrupción de datos).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions.</source>
-        <translation>No se pudo crear el archivo de bloqueo, por falta de permisos.</translation>
+        <translation type="vanished">No se pudo crear el archivo de bloqueo, por falta de permisos.</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation>Ocurrió un error desconocido, por ejemplo, una partición completa impedido escribir el archivo de bloqueo.</translation>
+        <translation type="vanished">Ocurrió un error desconocido, por ejemplo, una partición completa impedido escribir el archivo de bloqueo.</translation>
     </message>
     <message>
         <source>Export to CSV</source>
@@ -11415,15 +11702,15 @@ Quieres guardar los cambios?</translation>
     </message>
     <message>
         <source>The measurements document has no write permissions.</source>
-        <translation>El documento de medidas no tiene escrito permisos.</translation>
+        <translation type="vanished">El documento de medidas no tiene escrito permisos.</translation>
     </message>
     <message>
         <source>Cannot set permissions for %1 to writable.</source>
-        <translation>No se pueden establecer permisos para %1 para escribir.</translation>
+        <translation type="vanished">No se pueden establecer permisos para %1 para escribir.</translation>
     </message>
     <message>
         <source>Could not save the file.</source>
-        <translation>No ha podido guardar el archivo.</translation>
+        <translation type="vanished">No ha podido guardar el archivo.</translation>
     </message>
     <message>
         <source>Could not save the file</source>
@@ -11497,6 +11784,18 @@ Quieres guardar los cambios?</translation>
         <source>Multisize measurements require at least 4 columns.</source>
         <translation>Las medidas multitalla requiere al menos 4 columnas.</translation>
     </message>
+    <message>
+        <source>Cannot convert base size value to double in column 2.</source>
+        <translation type="vanished">No se puede convertir un valor de talla base a doble en columna 2.</translation>
+    </message>
+    <message>
+        <source>Cannot convert height increase value to double in column 3.</source>
+        <translation type="vanished">No se puede convertir un valor de incremento de altura a doble en columna 3.</translation>
+    </message>
+    <message>
+        <source>Cannot convert size increase value to double in column 4.</source>
+        <translation type="vanished">No se puede convertir un valor de incremento de talla a doble en columna 4.</translation>
+    </message>
     <message>
         <source>Imported file must not contain the same name twice.</source>
         <translation>Los archivos importados no deben contener el mismo nombre dos veces.</translation>
@@ -11555,15 +11854,53 @@ Quieres guardar los cambios?</translation>
     </message>
     <message>
         <source>Do you want to change the premissions?</source>
-        <translation>¿Quieres cambiar los permisos?</translation>
+        <translation type="vanished">¿Quieres cambiar los permisos?</translation>
     </message>
     <message>
         <source>Cannot read settings from a malformed .INI file.</source>
         <translation>No se puede leer la configuración desde un archivo .INI deforme.</translation>
     </message>
+    <message>
+        <source>Height (%1):</source>
+        <translation type="vanished">Altura (%1):</translation>
+    </message>
+    <message>
+        <source>Size (%1):</source>
+        <translation type="vanished">Talla (%1):</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Nombre</translation>
+    </message>
+    <message>
+        <source>Full name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Calculated value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Valor calculado</translation>
+    </message>
+    <message>
+        <source>Formula</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Valor base</translation>
+    </message>
+    <message>
+        <source>Correction</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Units:</source>
-        <translation>Unidades:</translation>
+        <translation type="unfinished">Unidades:</translation>
     </message>
     <message>
         <source>Shift B</source>
@@ -11575,11 +11912,11 @@ Quieres guardar los cambios?</translation>
     </message>
     <message>
         <source>Correction:</source>
-        <translation>Corrección:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dimension:</source>
-        <translation>Dimensión:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select one of the dimensions to later use the measurement value in piece label</source>
@@ -11591,7 +11928,7 @@ Quieres guardar los cambios?</translation>
     </message>
     <message>
         <source>Export to individual</source>
-        <translation>Exportar a individual</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export to individual measurements</source>
@@ -11599,7 +11936,7 @@ Quieres guardar los cambios?</translation>
     </message>
     <message>
         <source>Use full circumference</source>
-        <translation>Usar circunferencia completa</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restrict second dimension</source>
@@ -11611,11 +11948,11 @@ Quieres guardar los cambios?</translation>
     </message>
     <message>
         <source>Dimension labels</source>
-        <translation>Etiqueta de dimesion</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The table doesn&apos;t provide dimensions</source>
-        <translation>La tabla no provee dimensiones</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid base value for dimension A</source>
@@ -11635,7 +11972,7 @@ Quieres guardar los cambios?</translation>
     </message>
     <message>
         <source>Invalid base value for dimension C</source>
-        <translation>Valor base no válido para la dimensión C</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>measurements.vit</source>
@@ -11643,7 +11980,7 @@ Quieres guardar los cambios?</translation>
     </message>
     <message>
         <source>Shift (%1):</source>
-        <translation>Cambio (%1)*:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 shift</source>
@@ -11663,44 +12000,14 @@ Quieres guardar los cambios?</translation>
     </message>
     <message>
         <source>Inches</source>
-        <translation>Pulgadas</translation>
+        <translation type="unfinished">Pulgadas</translation>
     </message>
     <message>
         <source>Centimeters</source>
-        <translation>Centímetros</translation>
+        <translation type="unfinished">Centímetros</translation>
     </message>
     <message>
         <source>Degrees</source>
-        <translation>Grados</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <comment>measurement column</comment>
-        <translation>Nombre</translation>
-    </message>
-    <message>
-        <source>Full name</source>
-        <comment>measurement column</comment>
-        <translation>Apellido</translation>
-    </message>
-    <message>
-        <source>Calculated value</source>
-        <comment>measurement column</comment>
-        <translation>Valor calculado</translation>
-    </message>
-    <message>
-        <source>Formula</source>
-        <comment>measurement column</comment>
-        <translation>Formula</translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <comment>measurement column</comment>
-        <translation>Valor base</translation>
-    </message>
-    <message>
-        <source>Correction</source>
-        <comment>measurement column</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -11781,6 +12088,10 @@ Quieres guardar los cambios?</translation>
         <source>Labels</source>
         <translation>Etiquetas</translation>
     </message>
+    <message>
+        <source>Detail label visible</source>
+        <translation type="vanished">Etiqueta de detalle visible</translation>
+    </message>
     <message>
         <source>Width:</source>
         <translation>Ancho:</translation>
@@ -11887,59 +12198,59 @@ Quieres guardar los cambios?</translation>
     </message>
     <message>
         <source>Edit pattern label</source>
-        <translation>Editar etiqueta del patrón</translation>
+        <translation type="unfinished">Editar etiqueta del patrón</translation>
     </message>
     <message>
         <source>Pattern name:</source>
-        <translation>Nombre del Patrón:</translation>
+        <translation type="unfinished">Nombre del Patrón:</translation>
     </message>
     <message>
         <source>Pattern number:</source>
-        <translation>Número del Patrón:</translation>
+        <translation type="unfinished">Número del Patrón:</translation>
     </message>
     <message>
         <source>Company/Designer name:</source>
-        <translation>Nombre de la Empresa/Diseñador:</translation>
+        <translation type="unfinished">Nombre de la Empresa/Diseñador:</translation>
     </message>
     <message>
         <source>Customer name:</source>
-        <translation>Nombre del cliente:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date format:</source>
-        <translation>Formato de fecha:</translation>
+        <translation type="unfinished">Formato de fecha:</translation>
     </message>
     <message>
         <source>Time format:</source>
-        <translation>Formato de hora:</translation>
+        <translation type="unfinished">Formato de hora:</translation>
     </message>
     <message>
         <source>Customer birth date:</source>
-        <translation>Fecha nacimiento del cliente:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>yyyy-MM-dd</source>
-        <translation>yyyy-MM-dd</translation>
+        <translation type="unfinished">yyyy-MM-dd</translation>
     </message>
     <message>
         <source>Customer email:</source>
-        <translation>Correo electrónico del cliente:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Materials</source>
-        <translation>Materiales</translation>
+        <translation type="unfinished">Materiales</translation>
     </message>
     <message>
         <source>Pattern materials:</source>
-        <translation>Materiales del patrón:</translation>
+        <translation type="unfinished">Materiales del patrón:</translation>
     </message>
     <message>
         <source>Manage list of pattern materials</source>
-        <translation>Administar lista de materiales del patrón</translation>
+        <translation type="unfinished">Administar lista de materiales del patrón</translation>
     </message>
     <message>
         <source>Manage</source>
-        <translation>Administrar</translation>
+        <translation type="unfinished">Administrar</translation>
     </message>
     <message>
         <source>Piece label visible</source>
@@ -12032,6 +12343,10 @@ Quieres guardar los cambios?</translation>
         <source>Intersection 2 (only right)</source>
         <translation>Intersección 2 ( solamente derecho)</translation>
     </message>
+    <message>
+        <source>Acute angle that looks intside of piece</source>
+        <translation type="vanished">Angulo agudo que se ve dentro de la pieza</translation>
+    </message>
     <message>
         <source>Acute angle that looks outside of piece</source>
         <translation>Angulo agudo que se ve fuera de la pieza</translation>
@@ -12078,7 +12393,7 @@ Quieres guardar los cambios?</translation>
     </message>
     <message>
         <source>Acute angle that looks inside of piece</source>
-        <translation>Angulo agudo que se ve dentro de la pieza</translation>
+        <translation type="unfinished">Angulo agudo que se ve dentro de la pieza</translation>
     </message>
 </context>
 <context>
@@ -12241,6 +12556,18 @@ Quieres guardar los cambios?</translation>
         <comment>seam allowance</comment>
         <translation>Personalizado</translation>
     </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Universally Unique IDentifier of piece. Used to identifier piece while updating manual layout. Left empty to generate new value.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TabPlaceLabels</name>
@@ -12249,6 +12576,13 @@ Quieres guardar los cambios?</translation>
         <translation>Dialogo</translation>
     </message>
 </context>
+<context>
+    <name>Tape</name>
+    <message>
+        <source>This test build is older than %1 days. To provide you with better quality service we restrict the lifetime you can use a test build. To continue using Tape please update to newer test build. The application will be shut down.</source>
+        <translation type="vanished">Esta compilación de prueba es anterior a %1 días. Para proporcionarle un servicio de mejor calidad, restringimos la duración de la vida útil, puede usar una compilación de prueba. Para continuar usando Tape, actualice a la compilación de prueba más reciente. La aplicación se cerrará.</translation>
+    </message>
+</context>
 <context>
     <name>TapeConfigDialog</name>
     <message>
@@ -12416,6 +12750,18 @@ Quieres guardar los cambios?</translation>
         <source>The text appears under the icon (recommended for beginners).</source>
         <translation>El texto aparece debajo del icono (recomendado para principiantes).</translation>
     </message>
+    <message>
+        <source>Default height and size</source>
+        <translation type="vanished">Altura y talla predeterminada</translation>
+    </message>
+    <message>
+        <source>Default height:</source>
+        <translation type="vanished">Altura predeterminada:</translation>
+    </message>
+    <message>
+        <source>Default size:</source>
+        <translation type="vanished">Talla predeterminada:</translation>
+    </message>
     <message>
         <source>With OS options</source>
         <translation>Con opciones del Sistema Operativo</translation>
@@ -12479,6 +12825,10 @@ Quieres guardar los cambios?</translation>
         <source>My Patterns</source>
         <translation>Mis Patrones</translation>
     </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished">Mis Diseños</translation>
+    </message>
 </context>
 <context>
     <name>ToggleDetailInLayout</name>
@@ -12520,39 +12870,35 @@ Quieres guardar los cambios?</translation>
     <name>VAbstartMeasurementDimension</name>
     <message>
         <source>Invalid min/max range</source>
-        <translation>Rango min/max invalido</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid step</source>
-        <translation>Paso invalido</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Base value invalid</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Size</source>
-        <translation>Talla</translation>
-    </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Altura</translation>
+        <translation type="unfinished">Altura</translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Talla</translation>
+        <translation type="unfinished">Tamaño</translation>
     </message>
     <message>
         <source>Waist</source>
         <comment>dimension</comment>
-        <translation>Cintura</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hip</source>
         <comment>dimension</comment>
-        <translation>Cadera</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chest full circumference</source>
@@ -12564,6 +12910,10 @@ Quieres guardar los cambios?</translation>
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished">Tamaño</translation>
+    </message>
     <message>
         <source>Chest circumference</source>
         <comment>dimension</comment>
@@ -12747,15 +13097,15 @@ Quieres guardar los cambios?</translation>
     <name>VAbstractMainWindow</name>
     <message>
         <source>Confirm format rewriting</source>
-        <translation>Confirmar reescritura de formato</translation>
+        <translation type="unfinished">Confirmar reescritura de formato</translation>
     </message>
     <message>
         <source>This file is using previous format version v%1. The current is v%2. Saving the file with this app version will update the format version for this file. This may prevent you from be able to open the file with older app versions. Do you really want to continue?</source>
-        <translation>Este archivo esta usando un formato de version previo v%1. El actual es v%2. Guardando el archivo con esta version de la aplicación actualizara el formato de version para este archivo. Esto puede impedir que pueda abrir el archivo con versiones anteriores de la aplicación. ¿Realmente quieres continuar?</translation>
+        <translation type="unfinished">Este archivo esta usando un formato de version previo v%1. El actual es v%2. Guardando el archivo con esta version de la aplicación actualizara el formato de version para este archivo. Esto puede impedir que pueda abrir el archivo con versiones anteriores de la aplicación. ¿Realmente quieres continuar?</translation>
     </message>
     <message>
         <source>Comma-Separated Values</source>
-        <translation>Valores separados por coma</translation>
+        <translation type="unfinished">Valores separados por coma</translation>
     </message>
     <message>
         <source>values</source>
@@ -12763,7 +13113,51 @@ Quieres guardar los cambios?</translation>
     </message>
     <message>
         <source>Export to CSV</source>
-        <translation>Exportar a CSV</translation>
+        <translation type="unfinished">Exportar a CSV</translation>
+    </message>
+    <message>
+        <source>The measurements document has no write permissions.</source>
+        <translation type="unfinished">El documento de medidas no tiene escrito permisos.</translation>
+    </message>
+    <message>
+        <source>Do you want to change the premissions?</source>
+        <translation type="unfinished">¿Quieres cambiar los permisos?</translation>
+    </message>
+    <message>
+        <source>Cannot set permissions for %1 to writable.</source>
+        <translation type="unfinished">No se pueden establecer permisos para %1 para escribir.</translation>
+    </message>
+    <message>
+        <source>Could not save the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Locking file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished">Este archivo esta abierto en otra ventana. Si desea continuar: click en Ignorar (no recomendado puede causar datos erroneos).</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished">Archivo bloqueado, no puede ser mostrado por falta de permisos. Si desea continuar apriete ignorar (no recomendado, puede causar errores).</translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished">Ocurrió un error desconocido, por ejemplo una partición llena evitando que se escriba el archivo de bloqueo. Ignorelo si desea continuar (no se recomienda, puede causar corrupción de datos).</translation>
+    </message>
+    <message>
+        <source>This file already opened in another window.</source>
+        <translation type="unfinished">Este archivo ha sido abierto en otra ventana.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions.</source>
+        <translation type="unfinished">No se pudo crear el archivo de bloqueo, por falta de permisos.</translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
+        <translation type="unfinished">Ocurrió un error desconocido, por ejemplo, una partición completa impedido escribir el archivo de bloqueo.</translation>
     </message>
 </context>
 <context>
@@ -12993,7 +13387,7 @@ Quieres guardar los cambios?</translation>
     <name>VComboBoxDelegate</name>
     <message>
         <source>Select material</source>
-        <translation>Seleccionar material</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -13422,6 +13816,14 @@ Quieres guardar los cambios?</translation>
         <source>Page measure units (export mode). Valid values: %1.</source>
         <translation>Unidades de medida de paginas (modo exportación). Valores validos: %1.</translation>
     </message>
+    <message>
+        <source>Set size value for pattern file, that was opened with multisize measurements (export mode). Valid values: %1cm.</source>
+        <translation type="vanished">Ajustar el valor de la talla para un archivo de patrón, que fue abierto con medidas multitalla (modo exportación). Valores validos: %1cm.</translation>
+    </message>
+    <message>
+        <source>Set height value for pattern file, that was opened with multisize measurements (export mode). Valid values: %1cm.</source>
+        <translation type="vanished">Ajustar el valor de altura para un archivo de patrón, que fue abierto con medidas multitalla (modo exportación). Valores validos: %1cm.</translation>
+    </message>
     <message>
         <source>Use this option to override user material defined in pattern. The value must be in form &lt;number&gt;@&lt;user matrial name&gt;. The number should be in range from 1 to %1. For example, 1@Fabric2. The key can be used multiple times. Has no effect in GUI mode.</source>
         <translation>Use esta opción para anular el material del usuario definido en el patrón. El valor deberá estar en forma &lt;number&gt;@&lt;user matrial name&gt;. El numero deberá estar en un rango desde 1 a %1. Por ejemplo, 1@Tela2. La clave puede ser usada múltiples veces. No tiene efecto en el modo interfaz grafica de usuario.</translation>
@@ -13528,7 +13930,7 @@ Quieres guardar los cambios?</translation>
     </message>
     <message>
         <source>The dimension A base</source>
-        <translation>La dimensión base A</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set base for dimension B in the multisize measurements units (export mode).</source>
@@ -13536,7 +13938,7 @@ Quieres guardar los cambios?</translation>
     </message>
     <message>
         <source>The dimension B base</source>
-        <translation>La base de dimensión B</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set base for dimension C in the multisize measurements units (export mode).</source>
@@ -13544,7 +13946,35 @@ Quieres guardar los cambios?</translation>
     </message>
     <message>
         <source>The dimension C base</source>
-        <translation>La base de la dimensión C</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The filename of exported layout file. Use it to enable console export mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The filename of layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pattern pieces form the raw layout data file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The raw layout data file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to output format (default = 0, export mode): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to tiled pdf page template (default = 0, export mode with tiled pdf format): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run the program in a test mode. The program in this mode loads a single layout file and silently quit without showing the main window. The key have priority before key &apos;%1&apos;.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -13573,6 +14003,10 @@ Quieres guardar los cambios?</translation>
         <source>patterns</source>
         <translation>patrones</translation>
     </message>
+    <message>
+        <source>manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VContainer</name>
@@ -13820,25 +14254,29 @@ Quieres guardar los cambios?</translation>
 </context>
 <context>
     <name>VLayoutExporter</name>
+    <message>
+        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot set printer page size</source>
-        <translation>No se puede establecer el tamaño de página de la impresora</translation>
+        <translation type="unfinished">No se puede establecer el tamaño de página de la impresora</translation>
     </message>
     <message>
         <source>Cannot set printer margins</source>
-        <translation>No se pueden introducir márgenes de impresora</translation>
+        <translation type="unfinished">No se pueden introducir márgenes de impresora</translation>
     </message>
     <message>
         <source>Can&apos;t open file &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Creating file &apos;%1&apos; failed! %2</source>
-        <translation>¡La creación del archivo &apos;%1&apos; falló! %2</translation>
+        <source>Export raw layout data failed. %1.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
-        <translation type="unfinished"></translation>
+        <source>Creating file &apos;%1&apos; failed! %2</source>
+        <translation type="unfinished">¡La creación del archivo &apos;%1&apos; falló! %2</translation>
     </message>
     <message>
         <source>Can&apos;t create an flat dxf file.</source>
@@ -13872,23 +14310,23 @@ Quieres guardar los cambios?</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>Ninguno</translation>
+        <translation type="unfinished">Ninguno</translation>
     </message>
     <message>
         <source>Height</source>
-        <translation>Altura</translation>
+        <translation type="unfinished">Altura</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Talla</translation>
+        <translation type="unfinished">Tamaño</translation>
     </message>
     <message>
         <source>Hip</source>
-        <translation>Cadera</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Waist</source>
-        <translation>Cintura</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -14026,6 +14464,114 @@ Quieres guardar los cambios?</translation>
         <translation>Marca Caja</translation>
     </message>
 </context>
+<context>
+    <name>VPApplication</name>
+    <message>
+        <source>Error parsing file. Program will be terminated.</source>
+        <translation type="unfinished">Error al procesar el archivo. El programa se terminará.</translation>
+    </message>
+    <message>
+        <source>Error bad id. Program will be terminated.</source>
+        <translation type="unfinished">Error de identificación. El programa se cerrará.</translation>
+    </message>
+    <message>
+        <source>Error can&apos;t convert value. Program will be terminated.</source>
+        <translation type="unfinished">Error al convertir valor. El programa se cerrará.</translation>
+    </message>
+    <message>
+        <source>Error empty parameter. Program will be terminated.</source>
+        <translation type="unfinished">Error de parámetro vacío. El programa se cerrará.</translation>
+    </message>
+    <message>
+        <source>Error wrong id. Program will be terminated.</source>
+        <translation type="unfinished">Error de identidad equivocada. El programa se cerrará.</translation>
+    </message>
+    <message>
+        <source>Something&apos;s wrong!!</source>
+        <translation type="unfinished">¡¡Algo ha fallado!!</translation>
+    </message>
+    <message>
+        <source>Exception thrown: %1. Program will be terminated.</source>
+        <translation type="unfinished">Se ha lanzado una excepción: %1. El programa se terminará.</translation>
+    </message>
+    <message>
+        <source>Can&apos;t begin to listen for incoming connections on name &apos;%1&apos;</source>
+        <translation type="unfinished">No se puede comenzar a escuchar por conexiones entrantes en el nombre &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <source>Export mode doesn&apos;t support openning several files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import raw layout data does not support openning several layout files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, provide one input file.</source>
+        <translation type="unfinished">Por favor, proporcione un archivo de entrada.</translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrousel</name>
+    <message>
+        <source>Pieces of </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrouselPieceList</name>
+    <message>
+        <source>Move to Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPDialogAbout</name>
+    <message>
+        <source>About Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Puzzle version</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Build revision:</source>
+        <translation type="unfinished">Revisión de la construcción:</translation>
+    </message>
+    <message>
+        <source>This program is part of Valentina project.</source>
+        <translation type="unfinished">Este programa es parte del proyecto Valentina.</translation>
+    </message>
+    <message>
+        <source>Check For Updates</source>
+        <translation type="unfinished">Buscar actualizaciones</translation>
+    </message>
+    <message>
+        <source>Cannot open your default browser</source>
+        <translation type="unfinished">No se puede abrir su navegador predeterminado</translation>
+    </message>
+    <message>
+        <source>Build revision: %1</source>
+        <translation type="unfinished">Revisión de la construcción: %1</translation>
+    </message>
+    <message>
+        <source>Built on %1 at %2</source>
+        <translation type="unfinished">Construido el %1 a la %2</translation>
+    </message>
+    <message>
+        <source>Web site : %1</source>
+        <translation type="unfinished">Sitio web: %1</translation>
+    </message>
+</context>
 <context>
     <name>VPE::VBoolProperty</name>
     <message>
@@ -14048,6 +14594,573 @@ Quieres guardar los cambios?</translation>
         <translation>Abrir archivo</translation>
     </message>
 </context>
+<context>
+    <name>VPGraphicsPiece</name>
+    <message>
+        <source>Move to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPLayoutFileReader</name>
+    <message>
+        <source>Piece List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Got empty attribute &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPMainWindow</name>
+    <message>
+        <source>Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;Archivo</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished">&amp;Ventana</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished">&amp;Ayuda</translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished">Menú</translation>
+    </message>
+    <message>
+        <source>Piece Carrousel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Infos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Nombre:</translation>
+    </message>
+    <message>
+        <source>DummyName</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UUID:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{7b2ce4ae-96f5-4905-bb34-405cb40ca208}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Geometry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mirror piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotation</source>
+        <translation type="unfinished">Rotación</translation>
+    </message>
+    <message>
+        <source>Angle:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° anti-clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Placement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Y:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No piece selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple pieces selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Width</source>
+        <translation type="unfinished">Ancho</translation>
+    </message>
+    <message>
+        <source>Length</source>
+        <translation type="unfinished">Longitud</translation>
+    </message>
+    <message>
+        <source>Orientation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove unused length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Margins</source>
+        <translation type="unfinished">Margenes</translation>
+    </message>
+    <message>
+        <source>Right:</source>
+        <translation type="unfinished">Derecha:</translation>
+    </message>
+    <message>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left:</source>
+        <translation type="unfinished">Izquierda:</translation>
+    </message>
+    <message>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Placement Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Row height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Control</source>
+        <translation type="unfinished">Control</translation>
+    </message>
+    <message>
+        <source>Follow grainline</source>
+        <translation type="unfinished">Seguir hilo de la tela</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vertical grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Horizontal grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pieces gap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sticky edges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation type="unfinished">Exportar</translation>
+    </message>
+    <message>
+        <source>Export Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiles properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiled Pdf Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Tiles on sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export Tiled Pdf</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation type="unfinished">Diseño</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Nombre</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Descripción</translation>
+    </message>
+    <message>
+        <source>Unit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning superposition of pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning pieces out of bound</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished">Escala</translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation type="unfinished">&amp;Abrir</translation>
+    </message>
+    <message>
+        <source>Ctrl+O</source>
+        <translation type="unfinished">Ctrl+O</translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Guardar</translation>
+    </message>
+    <message>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save &amp;As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Import Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation type="unfinished">&amp;Salida</translation>
+    </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation type="unfinished">&amp;Nuevo</translation>
+    </message>
+    <message>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation type="unfinished">Sobre &amp;Qt</translation>
+    </message>
+    <message>
+        <source>About &amp;Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom in</source>
+        <translation type="unfinished">Aumentar zoom</translation>
+    </message>
+    <message>
+        <source>Zoom out</source>
+        <translation type="unfinished">Alejar zoom</translation>
+    </message>
+    <message>
+        <source>Zoom 1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom fit best</source>
+        <translation type="unfinished">Encajar a mejor zoom</translation>
+    </message>
+    <message>
+        <source>Zoom sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished">Preferencias</translation>
+    </message>
+    <message>
+        <source>File &apos;%1&apos; doesn&apos;t exist!</source>
+        <translation type="unfinished">¡El archivo &apos;%1&apos; no existe!</translation>
+    </message>
+    <message>
+        <source>File error.</source>
+        <translation type="unfinished">Error en archivo.</translation>
+    </message>
+    <message>
+        <source>Unable to read a layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fail to create layout.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not extract data from file &apos;%1&apos;. %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Centimeters</source>
+        <translation type="unfinished">Centímetros</translation>
+    </message>
+    <message>
+        <source>Millimiters</source>
+        <translation type="unfinished">Milímetros</translation>
+    </message>
+    <message>
+        <source>Inches</source>
+        <translation type="unfinished">Pulgadas</translation>
+    </message>
+    <message>
+        <source>Scale:</source>
+        <translation type="unfinished">Escala:</translation>
+    </message>
+    <message>
+        <source>untitled %1.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>untitled.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read only</source>
+        <translation type="unfinished">sólo lectura</translation>
+    </message>
+    <message>
+        <source>Cannot read settings from a malformed .INI file.</source>
+        <translation type="unfinished">No se puede leer la configuración desde un archivo .INI deforme.</translation>
+    </message>
+    <message>
+        <source>Cannot save settings. Access denied.</source>
+        <translation type="unfinished">No se puede guardar configuración. Acceso denegado.</translation>
+    </message>
+    <message>
+        <source>Failed to open file, is it writable?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New Window</source>
+        <translation type="unfinished">&amp;Nueva Ventana</translation>
+    </message>
+    <message>
+        <source>Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open file</source>
+        <translation type="unfinished">Abrir archivo</translation>
+    </message>
+    <message>
+        <source>Could not save the file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save as</source>
+        <translation type="unfinished">Guardar como</translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window. Expect collissions when run 2 copies of the program.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Raw Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About Qt</source>
+        <translation type="unfinished">Sobre Qt</translation>
+    </message>
+    <message>
+        <source>PDF Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SVG Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPSheet</name>
+    <message>
+        <source>Letter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Legal</source>
+        <translation type="unfinished">Legal</translation>
+    </message>
+    <message>
+        <source>Tabloid</source>
+        <translation type="unfinished">Tabloide</translation>
+    </message>
+    <message>
+        <source>Roll 24in</source>
+        <translation type="unfinished">Rollo 44 pulg {72i?} {24i?}</translation>
+    </message>
+    <message>
+        <source>Roll 30in</source>
+        <translation type="unfinished">Rollo 44 pulg {72i?} {30i?}</translation>
+    </message>
+    <message>
+        <source>Roll 36in</source>
+        <translation type="unfinished">Rollo 44 pulg {72i?} {36i?}</translation>
+    </message>
+    <message>
+        <source>Roll 42in</source>
+        <translation type="unfinished">Rollo 44 pulg {72i?} {42i?}</translation>
+    </message>
+    <message>
+        <source>Roll 44in</source>
+        <translation type="unfinished">Rollo 44 pulg {72i?} {44i?}</translation>
+    </message>
+    <message>
+        <source>Roll 48in</source>
+        <translation type="unfinished">Rollo 44 pulg {48 i?}</translation>
+    </message>
+    <message>
+        <source>Roll 62in</source>
+        <translation type="unfinished">Rollo 44 pulg {62i?}</translation>
+    </message>
+    <message>
+        <source>Roll 72in</source>
+        <translation type="unfinished">Rollo 44 pulg {72i?}</translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation type="unfinished">Personalizado</translation>
+    </message>
+</context>
+<context>
+    <name>VPTileFactory</name>
+    <message>
+        <source>Grid ( %1 , %2 )</source>
+        <translation type="unfinished">Cuadricula ( %1 , %2 )</translation>
+    </message>
+    <message>
+        <source>Page %1 of %2</source>
+        <translation type="unfinished">Pagina %1 de %2</translation>
+    </message>
+</context>
 <context>
     <name>VPattern</name>
     <message>
@@ -14393,23 +15506,23 @@ Quieres guardar los cambios?</translation>
     <name>VPrintLayout</name>
     <message>
         <source>For printing multipages document all sheet should have the same size.</source>
-        <translation>Para imprimir documentos de páginas múltiples todas las hojas deben tener el mismo tamaño.</translation>
+        <translation type="unfinished">Para imprimir documentos de páginas múltiples todas las hojas deben tener el mismo tamaño.</translation>
     </message>
     <message>
         <source>For previewing multipage document all sheet should have the same size.</source>
-        <translation>Para pre-visualizar documentos de páginas múltiples todas las hojas deben tener el mismo tamaño.</translation>
+        <translation type="unfinished">Para pre-visualizar documentos de páginas múltiples todas las hojas deben tener el mismo tamaño.</translation>
     </message>
     <message>
         <source>Pages will be cropped because they do not fit printer paper size.</source>
-        <translation>Las páginas serán recortadas porque no se ajustan al tamaño de papel de la impresora.</translation>
+        <translation type="unfinished">Las páginas serán recortadas porque no se ajustan al tamaño de papel de la impresora.</translation>
     </message>
     <message>
         <source>Print error</source>
-        <translation>Error de impresión</translation>
+        <translation type="unfinished">Error de impresión</translation>
     </message>
     <message>
         <source>Cannot proceed because there are no available printers in your system.</source>
-        <translation>No se puede continuar porque no hay impresoras disponibles en su sistema.</translation>
+        <translation type="unfinished">No se puede continuar porque no hay impresoras disponibles en su sistema.</translation>
     </message>
     <message>
         <source>Failed to open file, is it writable?</source>
@@ -14421,15 +15534,15 @@ Quieres guardar los cambios?</translation>
     </message>
     <message>
         <source>Cannot set printer margins</source>
-        <translation>No se pueden introducir márgenes de impresora</translation>
+        <translation type="unfinished">No se pueden introducir márgenes de impresora</translation>
     </message>
     <message>
         <source>Cannot set custom printer page size</source>
-        <translation>No se puede establecer el tamaño de página de la impresora personalizada</translation>
+        <translation type="unfinished">No se puede establecer el tamaño de página de la impresora personalizada</translation>
     </message>
     <message>
         <source>Cannot set printer page size</source>
-        <translation>No se puede establecer el tamaño de página de la impresora</translation>
+        <translation type="unfinished">No se puede establecer el tamaño de página de la impresora</translation>
     </message>
     <message>
         <source>Cannot set printer tiled page size</source>
@@ -14445,7 +15558,7 @@ Quieres guardar los cambios?</translation>
 %1
 
 %2</source>
-        <translation>Error archivo.
+        <translation type="unfinished">Error archivo.
 
 %1
 
@@ -14453,18 +15566,30 @@ Quieres guardar los cambios?</translation>
     </message>
     <message>
         <source>The layout is stale.</source>
-        <translation>El diseño es obsoleto.</translation>
+        <translation type="unfinished">El diseño es obsoleto.</translation>
     </message>
     <message>
         <source>The layout was not updated since last pattern modification. Do you want to continue?</source>
-        <translation>El diseño no se actualizó desde la última modificación del patrón. ¿Desea continuar?</translation>
+        <translation type="unfinished">El diseño no se actualizo desde la última modificación del patrón. ¿Desea continuar?</translation>
+    </message>
+</context>
+<context>
+    <name>VRawLayout</name>
+    <message>
+        <source>VRawLayout::ReadFile() failed. Raw layout format prefix mismatch error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VRawLayout::ReadFile() failed.
+Raw layout format compatibility error: actualFileVersion = %1 and fileVersion = %2</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VSettings</name>
     <message>
         <source>layouts</source>
-        <translation>diseños</translation>
+        <translation type="vanished">diseños</translation>
     </message>
 </context>
 <context>
@@ -15413,7 +16538,7 @@ Quieres guardar los cambios?</translation>
     </message>
     <message>
         <source>Notes:</source>
-        <translation>Notas:</translation>
+        <translation type="unfinished">Notas:</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -16874,6 +17999,131 @@ Quieres guardar los cambios?</translation>
         <comment>Left symbol _ in the name</comment>
         <translation>Angulo2ElArco_</translation>
     </message>
+    <message>
+        <source>date</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">fecha</translation>
+    </message>
+    <message>
+        <source>time</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">hora</translation>
+    </message>
+    <message>
+        <source>patternName</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">NombreDelPatron</translation>
+    </message>
+    <message>
+        <source>patternNumber</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">NumeroDelPatron</translation>
+    </message>
+    <message>
+        <source>author</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">autor</translation>
+    </message>
+    <message>
+        <source>customer</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">cliente</translation>
+    </message>
+    <message>
+        <source>pExt</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">pExtensión</translation>
+    </message>
+    <message>
+        <source>pFileName</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">pNombreArchivo</translation>
+    </message>
+    <message>
+        <source>mFileName</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">mNombreArchivo</translation>
+    </message>
+    <message>
+        <source>mExt</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">mExtensión</translation>
+    </message>
+    <message>
+        <source>pLetter</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">pLetra</translation>
+    </message>
+    <message>
+        <source>pAnnotation</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">pNota</translation>
+    </message>
+    <message>
+        <source>pOrientation</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">pOrientación</translation>
+    </message>
+    <message>
+        <source>pRotation</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">pRotación</translation>
+    </message>
+    <message>
+        <source>pTilt</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">pInclinación</translation>
+    </message>
+    <message>
+        <source>pFoldPosition</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">pPosiciónDoblez</translation>
+    </message>
+    <message>
+        <source>pName</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">pNombre</translation>
+    </message>
+    <message>
+        <source>pQuantity</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">pCantidad</translation>
+    </message>
+    <message>
+        <source>mFabric</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">mTela</translation>
+    </message>
+    <message>
+        <source>mLining</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">mForro</translation>
+    </message>
+    <message>
+        <source>mInterfacing</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">mEntretela</translation>
+    </message>
+    <message>
+        <source>mInterlining</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">mEntreforro</translation>
+    </message>
+    <message>
+        <source>wCut</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">wCortar</translation>
+    </message>
+    <message>
+        <source>wOnFold</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">wEnDoblez</translation>
+    </message>
+    <message>
+        <source>userMaterial</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">usuarioMaterial</translation>
+    </message>
     <message>
         <source>r2cm</source>
         <comment>round to up to 1 decimal</comment>
@@ -17112,6 +18362,13 @@ Quieres guardar los cambios?</translation>
         <translation type="vanished">Error restaurando el archivo de copia de seguridad: %1.</translation>
     </message>
 </context>
+<context>
+    <name>VValentinaSettings</name>
+    <message>
+        <source>layouts</source>
+        <translation type="unfinished">diseños</translation>
+    </message>
+</context>
 <context>
     <name>VWidgetDetails</name>
     <message>
@@ -17214,6 +18471,13 @@ Quieres guardar los cambios?</translation>
         <translation>Categoría: %1.</translation>
     </message>
 </context>
+<context>
+    <name>Valentina</name>
+    <message>
+        <source>This test build is older than %1 days. To provide you with better quality service we restrict the lifetime you can use a test build. To continue using Valentina please update to newer test build. The application will be shut down.</source>
+        <translation type="vanished">Esta compilación de prueba es anterior a %1 días. Para proporcionarle un servicio de mejor calidad, restringimos la duración de la vida útil, puede usar una compilación de prueba. Para continuar usando Valentina, actualice a la versión de prueba más reciente. La aplicación se cerrará.</translation>
+    </message>
+</context>
 <context>
     <name>VisToolCubicBezierPath</name>
     <message>
@@ -17525,7 +18789,7 @@ Quiere guardar los cambios?</translation>
     </message>
     <message>
         <source>Do you want to change the premissions?</source>
-        <translation>¿Quieres cambiar los permisos?</translation>
+        <translation type="unfinished">¿Quieres cambiar los permisos?</translation>
     </message>
 </context>
 <context>
diff --git a/share/translations/valentina_fi_FI.ts b/share/translations/valentina_fi_FI.ts
index 3593ab9aa..cd17bb294 100644
--- a/share/translations/valentina_fi_FI.ts
+++ b/share/translations/valentina_fi_FI.ts
@@ -452,7 +452,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -579,16 +579,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogArcWithLength</name>
@@ -702,16 +702,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogBisector</name>
@@ -833,7 +833,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -900,16 +900,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCubicBezierPath</name>
@@ -955,16 +955,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCurveIntersectAxis</name>
@@ -1066,7 +1066,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -1153,11 +1153,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1167,6 +1163,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCutSpline</name>
@@ -1240,11 +1240,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1254,6 +1250,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCutSplinePath</name>
@@ -1327,11 +1327,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1341,6 +1337,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogDateTimeFormats</name>
@@ -1431,15 +1431,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Value</source>
-        <translation>Arvo</translation>
-    </message>
-    <message>
-        <source>Label</source>
+        <source>Dimension:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dimension:</source>
+        <source>Value</source>
+        <translation type="unfinished">Arvo</translation>
+    </message>
+    <message>
+        <source>Label</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1594,6 +1594,14 @@
         <source>Measurments file name</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Koko</translation>
+    </message>
+    <message>
+        <source>Height</source>
+        <translation type="obsolete">Pituus</translation>
+    </message>
     <message>
         <source>Measurments extension</source>
         <translation type="unfinished"></translation>
@@ -1722,19 +1730,15 @@
         <source>Customer email</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Measurement: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Pituus</translation>
+        <translation type="unfinished">Pituus</translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Koko</translation>
+        <translation type="unfinished">Koko</translation>
     </message>
     <message>
         <source>Hip</source>
@@ -1747,23 +1751,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No data for the height dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the size dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the hip dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the waist dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Final measurement: %1</source>
+        <source>Measurement: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1786,6 +1774,26 @@
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Final measurement: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the height dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the size dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the hip dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the waist dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogEditWrongFormula</name>
@@ -2006,16 +2014,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogEndLine</name>
@@ -2121,7 +2129,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -2339,11 +2347,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -2361,6 +2365,10 @@
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -2454,11 +2462,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -2476,6 +2480,10 @@
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -2624,7 +2632,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -3383,7 +3391,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -3450,7 +3458,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -3577,7 +3585,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -3744,20 +3752,50 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Name</source>
-        <translation>Nimi</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Nimi</translation>
     </message>
     <message>
         <source>Value</source>
-        <translation>Arvo</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Arvo</translation>
+    </message>
+    <message>
+        <source>Full name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Kuvaus</translation>
     </message>
     <message>
         <source>Base value</source>
-        <translation>Alkuarvo</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Alkuarvo</translation>
+    </message>
+    <message>
+        <source>Shift (%1):</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Skip</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Nimi</translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished">Arvo</translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <translation type="unfinished">Alkuarvo</translation>
+    </message>
     <message>
         <source>Shift (%1)*:</source>
         <translation type="unfinished"></translation>
@@ -3778,36 +3816,6 @@ Apply settings anyway?</source>
         <source>Please, select unique number for each column</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Name</source>
-        <comment>measurement column</comment>
-        <translation>Nimi</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <comment>measurement column</comment>
-        <translation>Arvo</translation>
-    </message>
-    <message>
-        <source>Full name</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <comment>measurement column</comment>
-        <translation>Kuvaus</translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <comment>measurement column</comment>
-        <translation>Alkuarvo</translation>
-    </message>
-    <message>
-        <source>Shift (%1):</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DialogMove</name>
@@ -3897,11 +3905,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -3919,6 +3923,10 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -4146,7 +4154,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -4963,7 +4971,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5050,7 +5058,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5145,7 +5153,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5204,7 +5212,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5255,7 +5263,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5346,7 +5354,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5393,7 +5401,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5442,6 +5450,28 @@ Apply settings anyway?</source>
         </translation>
     </message>
 </context>
+<context>
+    <name>DialogPuzzlePreferences</name>
+    <message>
+        <source>Puzzle preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished">Asetukset</translation>
+    </message>
+    <message>
+        <source>Paths</source>
+        <translation type="unfinished">Polut</translation>
+    </message>
+    <message numerus="yes">
+        <source>Followed %n option(s) require restart to take effect: %1.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+</context>
 <context>
     <name>DialogRestrictDimension</name>
     <message>
@@ -5545,11 +5575,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Alias</source>
@@ -5567,6 +5593,10 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -5781,6 +5811,10 @@ Apply settings anyway?</source>
         <source>Numerical control</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogSeamAllowance</name>
@@ -6039,6 +6073,11 @@ Apply settings anyway?</source>
         <source>Use full circumference</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Height</source>
+        <comment>dimension</comment>
+        <translation type="unfinished">Pituus</translation>
+    </message>
     <message>
         <source>Min value:</source>
         <translation type="unfinished"></translation>
@@ -6071,10 +6110,25 @@ Apply settings anyway?</source>
         <source>The base value for the column</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <comment>dimension</comment>
+        <translation type="unfinished">Koko</translation>
+    </message>
     <message>
         <source>Circumference</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Waist</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hip</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Please, provide correct data for dimensions</source>
         <translation type="unfinished"></translation>
@@ -6091,26 +6145,6 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Height</source>
-        <comment>dimension</comment>
-        <translation>Pituus</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <comment>dimension</comment>
-        <translation>Koko</translation>
-    </message>
-    <message>
-        <source>Waist</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hip</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DialogShoulderPoint</name>
@@ -6220,7 +6254,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6263,7 +6297,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6390,16 +6424,16 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogSplinePath</name>
@@ -6529,16 +6563,16 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogTapePreferences</name>
@@ -6717,7 +6751,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6800,7 +6834,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Työkalu</translation>
+        <translation type="unfinished">Työkalu</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -7491,7 +7525,7 @@ Haluatko tallentaa muutokset?</translation>
     </message>
     <message>
         <source>This file already opened in another window.</source>
-        <translation>Tämä tiedosto on jo avattu toiseen ikkunaan.</translation>
+        <translation type="vanished">Tämä tiedosto on jo avattu toiseen ikkunaan.</translation>
     </message>
     <message>
         <source>Wrong units.</source>
@@ -7809,30 +7843,6 @@ Haluatko tallentaa muutokset?</translation>
         <source>Don&apos;t Save</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Locking file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The lock file could not be created, for lack of permissions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Point intersection curves</source>
         <translation type="unfinished"></translation>
@@ -7905,6 +7915,10 @@ Haluatko tallentaa muutokset?</translation>
         <source>Pattern Piece:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Height:</source>
+        <translation type="obsolete">Korkeus:</translation>
+    </message>
     <message>
         <source>The measurements file &lt;br/&gt;&lt;br/&gt; &lt;b&gt;%1&lt;/b&gt; &lt;br/&gt;&lt;br/&gt; could not be found. Do you want to update the file location?</source>
         <translation type="unfinished"></translation>
@@ -7945,18 +7959,6 @@ Haluatko tallentaa muutokset?</translation>
         <source>Select main path objects clockwise.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>The document has no write permissions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cannot set permissions for %1 to writable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not save the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Could not save the file</source>
         <translation type="unfinished"></translation>
@@ -8342,7 +8344,43 @@ Haluatko tallentaa muutokset?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to change the premissions?</source>
+        <source>Manual Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open the Puzzle app</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to prepare raw layout data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select manual layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8472,6 +8510,10 @@ Haluatko tallentaa muutokset?</translation>
         <source>Measurement file contains invalid known measurement(s).</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wrong units.</source>
+        <translation type="vanished">Väärät yksiköt.</translation>
+    </message>
     <message>
         <source>File error.</source>
         <translation>Tiedostovirhe.</translation>
@@ -8856,6 +8898,10 @@ Haluatko tallentaa muutokset?</translation>
         <source>My label templates</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>My manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PreferencesPatternPage</name>
@@ -8997,6 +9043,111 @@ This option will take an affect after restart.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>Puzzle</name>
+    <message>
+        <source>Export options can be used with single input file only.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Valentina&apos;s manual layout editor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The manual layout file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesConfigurationPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished">Kieli</translation>
+    </message>
+    <message>
+        <source>GUI language:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The text appears under the icon (recommended for beginners).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate dark mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t use the native file dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dark mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesPathPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paths that Valentina uses</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished">Tyyppi</translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished">Polku</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished">Oletus</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished">Muokkaa</translation>
+    </message>
+    <message>
+        <source>Open Directory</source>
+        <translation type="unfinished">Avaa kansio</translation>
+    </message>
+    <message>
+        <source>My Individual Measurements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Multisize Measurements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Patterns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Templates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>QCoreApplication</name>
     <message>
@@ -9280,6 +9431,10 @@ This option will take an affect after restart.</source>
         <source>Can&apos;t convert toInt parameter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Piece name &apos;%1&apos; is not unique.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Could not find the segment start.</source>
         <translation type="unfinished"></translation>
@@ -9296,6 +9451,10 @@ This option will take an affect after restart.</source>
         <source>Error calculating segment for curve &apos;%1&apos;. %2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot prepare builtin passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
@@ -9312,18 +9471,14 @@ This option will take an affect after restart.</source>
         <source>Cannot prepare passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Piece name &apos;%1&apos; is not unique.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Cannot get tokens from formula &apos;%1&apos;. Formula error: %2.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>No data for the height dimension.</source>
         <translation type="unfinished"></translation>
@@ -9345,11 +9500,15 @@ This option will take an affect after restart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
+        <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
+        <source>Unplaced pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet 1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -9848,7 +10007,7 @@ This option will take an affect after restart.</source>
     </message>
     <message>
         <source>untitled</source>
-        <translation type="vanished">nimetön</translation>
+        <translation>nimetön</translation>
     </message>
     <message>
         <source>Unsaved changes</source>
@@ -10022,30 +10181,6 @@ Do you want to save your changes?</source>
         <source>Don&apos;t Save</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Locking file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The lock file could not be created, for lack of permissions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Export to CSV</source>
         <translation type="unfinished"></translation>
@@ -10070,18 +10205,6 @@ Do you want to save your changes?</source>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>The measurements document has no write permissions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cannot set permissions for %1 to writable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not save the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Could not save the file</source>
         <translation type="unfinished"></translation>
@@ -10210,17 +10333,43 @@ Do you want to save your changes?</source>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Search measurements by term. &lt;/p&gt;&lt;p&gt;Prepend &amp;quot;/r/&amp;quot; to the front of the search string to search measurements by regex.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Do you want to change the premissions?</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Cannot read settings from a malformed .INI file.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Nimi</translation>
+    </message>
+    <message>
+        <source>Full name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Calculated value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Formula</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Matemaattinen kaava</translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Alkuarvo</translation>
+    </message>
+    <message>
+        <source>Correction</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Units:</source>
-        <translation>Mittayksiköt:</translation>
+        <translation type="unfinished">Mittayksiköt:</translation>
     </message>
     <message>
         <source>Shift B</source>
@@ -10320,46 +10469,16 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Inches</source>
-        <translation>Tuumaa</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Centimeters</source>
-        <translation>Senttimetriä</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Degrees</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Name</source>
-        <comment>measurement column</comment>
-        <translation>Nimi</translation>
-    </message>
-    <message>
-        <source>Full name</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calculated value</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Formula</source>
-        <comment>measurement column</comment>
-        <translation>Matemaattinen kaava</translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <comment>measurement column</comment>
-        <translation>Alkuarvo</translation>
-    </message>
-    <message>
-        <source>Correction</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Restrict first dimension</source>
         <translation type="unfinished"></translation>
@@ -10898,6 +11017,18 @@ Do you want to save your changes?</source>
         <comment>seam allowance</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Universally Unique IDentifier of piece. Used to identifier piece while updating manual layout. Left empty to generate new value.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TabPlaceLabels</name>
@@ -11096,6 +11227,10 @@ Do you want to save your changes?</source>
         <source>My Patterns</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TogglePieceForceForbidFlipping</name>
@@ -11140,19 +11275,15 @@ Do you want to save your changes?</source>
         <source>Base value invalid</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Size</source>
-        <translation>Koko</translation>
-    </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Pituus</translation>
+        <translation type="unfinished">Pituus</translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Koko</translation>
+        <translation type="unfinished">Koko</translation>
     </message>
     <message>
         <source>Waist</source>
@@ -11174,6 +11305,10 @@ Do you want to save your changes?</source>
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished">Koko</translation>
+    </message>
     <message>
         <source>Chest circumference</source>
         <comment>dimension</comment>
@@ -11367,6 +11502,50 @@ Do you want to save your changes?</source>
         <source>Export to CSV</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>The measurements document has no write permissions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to change the premissions?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot set permissions for %1 to writable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Locking file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This file already opened in another window.</source>
+        <translation type="unfinished">Tämä tiedosto on jo avattu toiseen ikkunaan.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VAbstractNode</name>
@@ -12008,6 +12187,34 @@ Do you want to save your changes?</source>
         <source>The dimension C base</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>The filename of exported layout file. Use it to enable console export mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The filename of layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pattern pieces form the raw layout data file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The raw layout data file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to output format (default = 0, export mode): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to tiled pdf page template (default = 0, export mode with tiled pdf format): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run the program in a test mode. The program in this mode loads a single layout file and silently quit without showing the main window. The key have priority before key &apos;%1&apos;.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VCommonSettings</name>
@@ -12035,6 +12242,10 @@ Do you want to save your changes?</source>
         <source>patterns</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VContainer</name>
@@ -12278,6 +12489,10 @@ Do you want to save your changes?</source>
 </context>
 <context>
     <name>VLayoutExporter</name>
+    <message>
+        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot set printer page size</source>
         <translation type="unfinished"></translation>
@@ -12291,12 +12506,12 @@ Do you want to save your changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Creating file &apos;%1&apos; failed! %2</source>
-        <translation>Tiedoston &apos;%1&apos; luonti epäonnistui! %2</translation>
+        <source>Export raw layout data failed. %1.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
-        <translation type="unfinished"></translation>
+        <source>Creating file &apos;%1&apos; failed! %2</source>
+        <translation type="unfinished">Tiedoston &apos;%1&apos; luonti epäonnistui! %2</translation>
     </message>
     <message>
         <source>Can&apos;t create an flat dxf file.</source>
@@ -12334,11 +12549,11 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Height</source>
-        <translation>Pituus</translation>
+        <translation type="unfinished">Pituus</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Koko</translation>
+        <translation type="unfinished">Koko</translation>
     </message>
     <message>
         <source>Hip</source>
@@ -12484,6 +12699,114 @@ Do you want to save your changes?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>VPApplication</name>
+    <message>
+        <source>Error parsing file. Program will be terminated.</source>
+        <translation type="unfinished">Jäsentämis virhe tiedostossa. Ohjelma lopetetaan.</translation>
+    </message>
+    <message>
+        <source>Error bad id. Program will be terminated.</source>
+        <translation type="unfinished">Väärä id. Ohjelma lopetetaan.</translation>
+    </message>
+    <message>
+        <source>Error can&apos;t convert value. Program will be terminated.</source>
+        <translation type="unfinished">Arvoa ei voi muuttaa. Ohjelma lopetetaan.</translation>
+    </message>
+    <message>
+        <source>Error empty parameter. Program will be terminated.</source>
+        <translation type="unfinished">Tyhjä parametri. Ohjelma lopetetaan.</translation>
+    </message>
+    <message>
+        <source>Error wrong id. Program will be terminated.</source>
+        <translation type="unfinished">Väärä id. Ohjelma lopetetaan.</translation>
+    </message>
+    <message>
+        <source>Something&apos;s wrong!!</source>
+        <translation type="unfinished">Joku on vialla!!</translation>
+    </message>
+    <message>
+        <source>Exception thrown: %1. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t begin to listen for incoming connections on name &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export mode doesn&apos;t support openning several files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import raw layout data does not support openning several layout files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, provide one input file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrousel</name>
+    <message>
+        <source>Pieces of </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrouselPieceList</name>
+    <message>
+        <source>Move to Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Poista</translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPDialogAbout</name>
+    <message>
+        <source>About Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Puzzle version</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Build revision:</source>
+        <translation type="unfinished">Käännös versio:</translation>
+    </message>
+    <message>
+        <source>This program is part of Valentina project.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check For Updates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open your default browser</source>
+        <translation type="unfinished">Oletus selaimen aukaiseminen epäonnistui</translation>
+    </message>
+    <message>
+        <source>Build revision: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Built on %1 at %2</source>
+        <translation type="unfinished">Käännetty %3 klo %2 {1 ?}</translation>
+    </message>
+    <message>
+        <source>Web site : %1</source>
+        <translation type="unfinished">Kotisivu: %1</translation>
+    </message>
+</context>
 <context>
     <name>VPE::VBoolProperty</name>
     <message>
@@ -12506,6 +12829,573 @@ Do you want to save your changes?</source>
         <translation>Avaa Tiedosto</translation>
     </message>
 </context>
+<context>
+    <name>VPGraphicsPiece</name>
+    <message>
+        <source>Move to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPLayoutFileReader</name>
+    <message>
+        <source>Piece List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Got empty attribute &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPMainWindow</name>
+    <message>
+        <source>Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;Tiedosto</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished">&amp;Apua</translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Piece Carrousel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Infos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Nmi:</translation>
+    </message>
+    <message>
+        <source>DummyName</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UUID:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{7b2ce4ae-96f5-4905-bb34-405cb40ca208}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Geometry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mirror piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Angle:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° anti-clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Placement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Y:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No piece selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple pieces selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Width</source>
+        <translation type="unfinished">Leveys</translation>
+    </message>
+    <message>
+        <source>Length</source>
+        <translation type="unfinished">Pituus</translation>
+    </message>
+    <message>
+        <source>Orientation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove unused length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Placement Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Row height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Follow grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vertical grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Horizontal grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pieces gap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sticky edges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiles properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiled Pdf Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Tiles on sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export Tiled Pdf</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation type="unfinished">Sommittelu</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Nimi</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Kuvaus</translation>
+    </message>
+    <message>
+        <source>Unit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning superposition of pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning pieces out of bound</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation type="unfinished">&amp;Avaa</translation>
+    </message>
+    <message>
+        <source>Ctrl+O</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Tallenna</translation>
+    </message>
+    <message>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save &amp;As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Import Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation type="unfinished">L&amp;opeta</translation>
+    </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation type="unfinished">&amp;Uusi</translation>
+    </message>
+    <message>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation type="unfinished">Tietoja &amp;Qt</translation>
+    </message>
+    <message>
+        <source>About &amp;Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom in</source>
+        <translation type="unfinished">Tarkenna</translation>
+    </message>
+    <message>
+        <source>Zoom out</source>
+        <translation type="unfinished">Loitonna</translation>
+    </message>
+    <message>
+        <source>Zoom 1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom fit best</source>
+        <translation type="unfinished">Tarkenna sopivasti</translation>
+    </message>
+    <message>
+        <source>Zoom sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished">Asetukset</translation>
+    </message>
+    <message>
+        <source>File &apos;%1&apos; doesn&apos;t exist!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File error.</source>
+        <translation type="unfinished">Tiedostovirhe.</translation>
+    </message>
+    <message>
+        <source>Unable to read a layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fail to create layout.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not extract data from file &apos;%1&apos;. %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Centimeters</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Millimiters</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Inches</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>untitled %1.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>untitled.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot read settings from a malformed .INI file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save settings. Access denied.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to open file, is it writable?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open file</source>
+        <translation type="unfinished">Avaa tiedosto</translation>
+    </message>
+    <message>
+        <source>Could not save the file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save as</source>
+        <translation type="unfinished">Talenna nimellä</translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save file</source>
+        <translation type="unfinished">Tiedostoa ei voitu tallentaa</translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window. Expect collissions when run 2 copies of the program.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Raw Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About Qt</source>
+        <translation type="unfinished">Tietoja Qt:stä</translation>
+    </message>
+    <message>
+        <source>PDF Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SVG Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPSheet</name>
+    <message>
+        <source>Letter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Legal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabloid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 24in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 30in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 36in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 42in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 44in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 48in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 62in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 72in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPTileFactory</name>
+    <message>
+        <source>Grid ( %1 , %2 )</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page %1 of %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VPattern</name>
     <message>
@@ -12915,9 +13805,14 @@ Do you want to save your changes?</source>
     </message>
 </context>
 <context>
-    <name>VSettings</name>
+    <name>VRawLayout</name>
     <message>
-        <source>layouts</source>
+        <source>VRawLayout::ReadFile() failed. Raw layout format prefix mismatch error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VRawLayout::ReadFile() failed.
+Raw layout format compatibility error: actualFileVersion = %1 and fileVersion = %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -15390,6 +16285,13 @@ Do you want to save your changes?</source>
         <translation type="vanished">Virhe palauttaessa varmuuskopio tiedostoa: %1.</translation>
     </message>
 </context>
+<context>
+    <name>VValentinaSettings</name>
+    <message>
+        <source>layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VWidgetDetails</name>
     <message>
diff --git a/share/translations/valentina_fr_FR.ts b/share/translations/valentina_fr_FR.ts
index 0ab5d502e..1fe8f6d7d 100644
--- a/share/translations/valentina_fr_FR.ts
+++ b/share/translations/valentina_fr_FR.ts
@@ -19,7 +19,7 @@
     <name>AddItemToGroup</name>
     <message>
         <source>Add item to group</source>
-        <translation>Ajouter un élément au groupe</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -54,21 +54,21 @@
     <name>ChangeGroupOptions</name>
     <message>
         <source>rename group</source>
-        <translation>renommer un groupe</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ChangeGroupVisibility</name>
     <message>
         <source>change group visibility</source>
-        <translation>modifier la visibilité d&apos;un groupe</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ChangeMultipleGroupsVisibility</name>
     <message>
         <source>change multiple groups visibility</source>
-        <translation>modifier la visibilité de plusieurs groupes</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -127,31 +127,31 @@
     </message>
     <message>
         <source>Server name/IP:</source>
-        <translation type="vanished">Nom du serveur/IP :</translation>
+        <translation type="vanished">Nom du serveur/IP:</translation>
     </message>
     <message>
         <source>Proxy address:</source>
-        <translation type="vanished">Adresse du proxy :</translation>
+        <translation type="vanished">Adresse du proxy:</translation>
     </message>
     <message>
         <source>Proxy port:</source>
-        <translation type="vanished">Port du proxy :</translation>
+        <translation type="vanished">Port du proxy:</translation>
     </message>
     <message>
         <source>Proxy user:</source>
-        <translation type="vanished">Nom d&apos;utilisateur du proxy :</translation>
+        <translation type="vanished">Nom d&apos;utilisateur du proxy:</translation>
     </message>
     <message>
         <source>Proxy pass:</source>
-        <translation type="vanished">Mot de passe du proxy :</translation>
+        <translation type="vanished">Mot de passe du proxy:</translation>
     </message>
     <message>
         <source>User Name:</source>
-        <translation type="vanished">Nom de l&apos;utilisateur :</translation>
+        <translation type="vanished">Nom de l&apos;utilisateur:</translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation type="vanished">Mot de passe :</translation>
+        <translation type="vanished">Mot de passe:</translation>
     </message>
 </context>
 <context>
@@ -186,7 +186,7 @@
     </message>
     <message>
         <source>Paths</source>
-        <translation type="vanished">Répertoires</translation>
+        <translation type="vanished">Chemins</translation>
     </message>
 </context>
 <context>
@@ -229,7 +229,7 @@
     </message>
     <message>
         <source>With OS options (%1)</source>
-        <translation type="vanished">Utiliser les réglages système (%1)</translation>
+        <translation type="vanished">Utiliser les réglages par défaut (%1)</translation>
     </message>
     <message>
         <source>Default unit</source>
@@ -253,11 +253,11 @@
     </message>
     <message>
         <source>Send crash reports</source>
-        <translation type="vanished">Envoyer les rapports de plantage</translation>
+        <translation type="vanished">Envoyer le rapport de plantage</translation>
     </message>
     <message>
         <source>Send crash reports (recommended)</source>
-        <translation type="vanished">Envoyer les rapports de plantage (recommandé)</translation>
+        <translation type="vanished">Envoyer le rapport de plantage (recommandé)</translation>
     </message>
     <message>
         <source>After each crash Valentina collect information that may help us fix a problem. We do not collect any personal information. Find more about what &lt;a href=&quot;https://bitbucket.org/dismine/valentina/wiki/manual/Crash_reports&quot;&gt;kind of information&lt;/a&gt; we collect.</source>
@@ -281,19 +281,19 @@
     </message>
     <message>
         <source>GUI language:</source>
-        <translation type="vanished">Langue de l&apos;interface :</translation>
+        <translation type="vanished">Langue de l&apos;interface:</translation>
     </message>
     <message>
         <source>Decimal separator parts:</source>
-        <translation type="vanished">Séparateur de décimale :</translation>
+        <translation type="vanished">Séparateur de décimale:</translation>
     </message>
     <message>
         <source>Default unit:</source>
-        <translation type="vanished">Unité par défaut :</translation>
+        <translation type="vanished">Unité par défaut:</translation>
     </message>
     <message>
         <source>Label language:</source>
-        <translation type="vanished">Langue :</translation>
+        <translation type="vanished">Langue:</translation>
     </message>
     <message>
         <source>Pattern making system</source>
@@ -301,15 +301,15 @@
     </message>
     <message>
         <source>Pattern making system:</source>
-        <translation type="vanished">Programme de réalisation de patrons :</translation>
+        <translation type="vanished">Programme de réalisation de patrons:</translation>
     </message>
     <message>
         <source>Author:</source>
-        <translation type="vanished">Auteur :</translation>
+        <translation type="vanished">Auteur:</translation>
     </message>
     <message>
         <source>Book:</source>
-        <translation type="vanished">Livre :</translation>
+        <translation type="vanished">Livre:</translation>
     </message>
     <message>
         <source>The Default unit has been updated and will be used as the default for the next pattern you create.</source>
@@ -371,7 +371,7 @@
     </message>
     <message>
         <source>Lining</source>
-        <translation type="vanished">Revêtement</translation>
+        <translation type="vanished">Lin</translation>
     </message>
     <message>
         <source>Interfacing</source>
@@ -524,7 +524,7 @@
     </message>
     <message>
         <source>Length:</source>
-        <translation>Longueur :</translation>
+        <translation>Longueur:</translation>
     </message>
     <message>
         <source>Formula wizard</source>
@@ -540,11 +540,11 @@
     </message>
     <message>
         <source>Point label:</source>
-        <translation>Nom du point :</translation>
+        <translation>Nom du point:</translation>
     </message>
     <message>
         <source>First point:</source>
-        <translation>Premier point :</translation>
+        <translation>Premier point:</translation>
     </message>
     <message>
         <source>First point of the line</source>
@@ -552,7 +552,7 @@
     </message>
     <message>
         <source>Second point:</source>
-        <translation>Deuxième point :</translation>
+        <translation>Deuxième point:</translation>
     </message>
     <message>
         <source>Second point of the line</source>
@@ -560,11 +560,11 @@
     </message>
     <message>
         <source>Type of line:</source>
-        <translation>Type de ligne :</translation>
+        <translation>Type de ligne:</translation>
     </message>
     <message>
         <source>Line color:</source>
-        <translation>Couleur de la ligne :</translation>
+        <translation>Couleur de la ligne:</translation>
     </message>
     <message>
         <source>Unique label</source>
@@ -576,11 +576,11 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -595,7 +595,7 @@
     </message>
     <message>
         <source>Value of radius</source>
-        <translation type="vanished">Valeur du rayon</translation>
+        <translation type="vanished">Valeur de rayon</translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Show full calculation in message box&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -655,7 +655,7 @@
     </message>
     <message>
         <source>Radius:</source>
-        <translation>Rayon :</translation>
+        <translation>Rayon:</translation>
     </message>
     <message>
         <source>Formula wizard</source>
@@ -671,7 +671,7 @@
     </message>
     <message>
         <source>First angle:</source>
-        <translation>Premier angle :</translation>
+        <translation>Premier angle:</translation>
     </message>
     <message>
         <source>Calculation</source>
@@ -683,7 +683,7 @@
     </message>
     <message>
         <source>Center point:</source>
-        <translation>Point central :</translation>
+        <translation>Point central:</translation>
     </message>
     <message>
         <source>Select center point of the arc</source>
@@ -695,11 +695,11 @@
     </message>
     <message>
         <source>Pen style:</source>
-        <translation>Style de stylo :</translation>
+        <translation>Style de stylo:</translation>
     </message>
     <message>
         <source>Approximation scale:</source>
-        <translation>Échelle approximative :</translation>
+        <translation>Echelle approximative:</translation>
     </message>
     <message>
         <source>Set approximation scale for this curve, 0 - use global value</source>
@@ -707,15 +707,15 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Alias :</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -790,7 +790,7 @@
     </message>
     <message>
         <source>Radius:</source>
-        <translation>Rayon :</translation>
+        <translation>Rayon:</translation>
     </message>
     <message>
         <source>Formula wizard</source>
@@ -806,27 +806,27 @@
     </message>
     <message>
         <source>First angle:</source>
-        <translation>Premier angle :</translation>
+        <translation>Premier angle:</translation>
     </message>
     <message>
         <source>Length:</source>
-        <translation>Longueur :</translation>
+        <translation>Longueur:</translation>
     </message>
     <message>
         <source>Center point:</source>
-        <translation>Point central :</translation>
+        <translation>Point central:</translation>
     </message>
     <message>
         <source>Color:</source>
-        <translation>Couleur :</translation>
+        <translation>Couleur:</translation>
     </message>
     <message>
         <source>Pen style:</source>
-        <translation>Style de stylo :</translation>
+        <translation>Style de stylo:</translation>
     </message>
     <message>
         <source>Approximation scale:</source>
-        <translation>Échelle approximative :</translation>
+        <translation>Echelle approximative:</translation>
     </message>
     <message>
         <source>Set approximation scale for this curve, 0 - use global value</source>
@@ -834,15 +834,15 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Alias :</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -917,7 +917,7 @@
     </message>
     <message>
         <source>Length:</source>
-        <translation>Longueur :</translation>
+        <translation>Longueur:</translation>
     </message>
     <message>
         <source>Formula wizard</source>
@@ -933,7 +933,7 @@
     </message>
     <message>
         <source>Point label:</source>
-        <translation>Nom du point :</translation>
+        <translation>Nom du point:</translation>
     </message>
     <message>
         <source>Unique label</source>
@@ -945,38 +945,38 @@
     </message>
     <message>
         <source>First point:</source>
-        <translation>Premier point :</translation>
+        <translation>Premier point:</translation>
     </message>
     <message>
         <source>Second point:</source>
-        <translation>Deuxième point :</translation>
+        <translation>Deuxième point:</translation>
     </message>
     <message>
         <source>Third point:</source>
-        <translation>Troisième point :</translation>
+        <translation>Troisième point:</translation>
     </message>
     <message>
         <source>Type of line:</source>
-        <translation>Type de ligne :</translation>
+        <translation>Type de ligne:</translation>
     </message>
     <message>
         <source>Line color:</source>
-        <translation>Couleur de la ligne :</translation>
+        <translation>Couleur de la ligne:</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DialogCubicBezier</name>
     <message>
         <source>Cubic bezier</source>
-        <translation type="vanished">Courbe de Bezier Cubique</translation>
+        <translation type="vanished">Bezier Cubique</translation>
     </message>
     <message>
         <source>Color:</source>
@@ -1000,7 +1000,7 @@
     </message>
     <message>
         <source>Fourth point:</source>
-        <translation>Quatrième point :</translation>
+        <translation>Quatrième point:</translation>
     </message>
     <message>
         <source>Select the second point of curve</source>
@@ -1024,7 +1024,7 @@
     </message>
     <message>
         <source>Pen Style:</source>
-        <translation>Style de stylo :</translation>
+        <translation>Style de stylo:</translation>
     </message>
     <message>
         <source>Approximation Scale:</source>
@@ -1036,15 +1036,15 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Alias :</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1091,19 +1091,19 @@
     </message>
     <message>
         <source>Cannot find point with id %1</source>
-        <translation>Impossible de trouver le point %1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Alias :</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1206,19 +1206,19 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias1:</source>
-        <translation>Alias1 :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias2:</source>
-        <translation>Alias2 :</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1297,19 +1297,19 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Alias1:</source>
-        <translation>Alias1 :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias2:</source>
-        <translation>Alias2 :</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1388,19 +1388,19 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Alias1:</source>
-        <translation>Alias1 :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias2:</source>
-        <translation>Alias2 :</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1479,19 +1479,19 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Alias1:</source>
-        <translation>Alias1 :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias2:</source>
-        <translation>Alias2 :</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1792,19 +1792,19 @@
     <name>DialogDimensionLabels</name>
     <message>
         <source>Dimension labels</source>
-        <translation>Etiquettes de dimensions</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <translation>Valeur</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Étiquette</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dimension:</source>
-        <translation>Dimension :</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished">Valeur</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1815,7 +1815,7 @@
     </message>
     <message>
         <source>Click to place duplicate</source>
-        <translation>Clickez pour placer la copie</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1958,6 +1958,14 @@
         <source>Measurments file name</source>
         <translation>Nom du fichier de mesures</translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="vanished">Taille</translation>
+    </message>
+    <message>
+        <source>Height</source>
+        <translation type="vanished">Hauteur</translation>
+    </message>
     <message>
         <source>Measurments extension</source>
         <translation>Extension de mesures</translation>
@@ -1984,7 +1992,7 @@
     </message>
     <message>
         <source>Piece fold position</source>
-        <translation>Position du pli de la pièce</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Piece name</source>
@@ -2028,7 +2036,7 @@
     </message>
     <message>
         <source>Word: Cut</source>
-        <translation>Mot : Couper</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cut</source>
@@ -2036,7 +2044,7 @@
     </message>
     <message>
         <source>Word: on fold</source>
-        <translation>Mot : au pli</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on fold</source>
@@ -2044,7 +2052,7 @@
     </message>
     <message>
         <source>User material</source>
-        <translation>Tissu de l&apos;utilisateur</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert…</source>
@@ -2052,103 +2060,103 @@
     </message>
     <message>
         <source>Move on top</source>
-        <translation>Déplacer au premier plan</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move up</source>
-        <translation>Déplacer vers le haut</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move down</source>
-        <translation>Déplacer vers le bas</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move on bottom</source>
-        <translation>Déplacer vers l&apos;arrière plan</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Measurements units</source>
-        <translation>Unités de mesure</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pattern units</source>
-        <translation>Unités du patron</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size units</source>
-        <translation>Unités de taille</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Customer birth date</source>
-        <translation>Date de naissance du client</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Customer email</source>
-        <translation>Adresse email du client</translation>
-    </message>
-    <message>
-        <source>Measurement: %1</source>
-        <translation>Mensuration : %1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Hauteur</translation>
+        <translation type="unfinished">Hauteur</translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Taille</translation>
+        <translation type="unfinished">Taille</translation>
     </message>
     <message>
         <source>Hip</source>
         <comment>dimension</comment>
-        <translation>Hanche</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Waist</source>
         <comment>dimension</comment>
-        <translation>Taille</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No data for the height dimension.</source>
-        <translation>Pas de valeur pour la mesure de la hauteur.</translation>
-    </message>
-    <message>
-        <source>No data for the size dimension.</source>
-        <translation>Pas de valeur pour la mesure de la taille.</translation>
-    </message>
-    <message>
-        <source>No data for the hip dimension.</source>
-        <translation>Pas de valeur pour la mesure du tour de hanche.</translation>
-    </message>
-    <message>
-        <source>No data for the waist dimension.</source>
-        <translation>Pas de valeur pour la mesure du tour de taille.</translation>
-    </message>
-    <message>
-        <source>Final measurement: %1</source>
-        <translation>Dimension finale : %1</translation>
+        <source>Measurement: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height label</source>
         <comment>dimension</comment>
-        <translation>Etiquette de hauteur</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size label</source>
         <comment>dimension</comment>
-        <translation>Etiquette de taille</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hip label</source>
         <comment>dimension</comment>
-        <translation>Etiquette de hanche</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Waist label</source>
         <comment>dimension</comment>
-        <translation>Etiquette de taille</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Final measurement: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the height dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the size dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the hip dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the waist dimension.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -2287,7 +2295,7 @@
     </message>
     <message>
         <source>Lengths to control points</source>
-        <translation>Longueur aux points de contrôle</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter list by keyword</source>
@@ -2382,15 +2390,15 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Alias :</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -2497,11 +2505,11 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -2596,15 +2604,15 @@
     </message>
     <message>
         <source>Formula:</source>
-        <translation>Formule :</translation>
+        <translation type="unfinished">Formule:</translation>
     </message>
     <message>
         <source>Calculation</source>
-        <translation>Calcul</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Show full calculation in message box&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Montrer le calcul complet dans une boite de dialogue &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Formula wizard</source>
@@ -2616,11 +2624,11 @@
     </message>
     <message>
         <source>Move measurement up</source>
-        <translation>Augmentez la dimension</translation>
+        <translation type="unfinished">Déplacer la mesure vers le haut</translation>
     </message>
     <message>
         <source>Move measurement down</source>
-        <translation>Diminuez la dimension</translation>
+        <translation type="unfinished">Déplacer la mesure vers le bas</translation>
     </message>
     <message>
         <source>measurement</source>
@@ -2644,7 +2652,7 @@
     </message>
     <message>
         <source>Invalid result. Value is infinite or NaN. Please, check your calculations.</source>
-        <translation>Résultat  non valide. La valeur est infinie ou NaN. Veuillez revoir vos calculs.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Value</source>
@@ -2652,7 +2660,7 @@
     </message>
     <message>
         <source>Parser error: %1</source>
-        <translation>Erreur de l&apos;interpréteur : %1</translation>
+        <translation type="unfinished">Erreur d&apos;analyse : %1</translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Search final measurements by term. &lt;/p&gt;&lt;p&gt;Prepend &amp;quot;/r/&amp;quot; to the front of the search string to search final measurements by regex.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -2695,15 +2703,15 @@
     </message>
     <message>
         <source>Flipping by axis</source>
-        <translation>Symétrie axiale</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable to create a visibility gropup from original objects</source>
-        <translation>Activer pour créer un groupe de visibilité à partir des objets d&apos;origine</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Visibility Group</source>
-        <translation>Groupe de visibilité</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
@@ -2715,27 +2723,23 @@
     </message>
     <message>
         <source>Tags:</source>
-        <translation>Marqueurs:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Separate each tag with comma.</source>
-        <translation>Séparez chaque balise par une virgule.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add tags</source>
-        <translation>Ajouter des balises</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Alias :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pen style:</source>
@@ -2747,19 +2751,23 @@
     </message>
     <message>
         <source>Ready</source>
-        <translation>Prêt</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid suffix</source>
-        <translation>Suffixe invalide</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid group name</source>
-        <translation>Nom de groupe non valide</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Label:</source>
-        <translation>Etiquette :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
@@ -2767,15 +2775,15 @@
     </message>
     <message>
         <source>Invalid point</source>
-        <translation>Point invalide</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid label</source>
-        <translation>Etiquette invalide</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid alias</source>
-        <translation>Alias invalide</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -2814,15 +2822,15 @@
     </message>
     <message>
         <source>Flipping by line</source>
-        <translation>Symétrie par rapport à une ligne</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable to create a visibility gropup from original objects</source>
-        <translation>Activer pour créer un groupe de visibilité à partir des objets d&apos;origine</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Visibility Group</source>
-        <translation>Groupe de visibilité</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
@@ -2834,27 +2842,23 @@
     </message>
     <message>
         <source>Tags:</source>
-        <translation>Marqueurs:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Separate each tag with comma.</source>
-        <translation>Séparez chaque balise par une virgule.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add tags</source>
-        <translation>Ajouter des balises</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Alias :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pen style:</source>
@@ -2866,19 +2870,23 @@
     </message>
     <message>
         <source>Ready</source>
-        <translation>Prêt</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid suffix</source>
-        <translation>Suffixe invalide</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid group name</source>
-        <translation>Nom de groupe non valide</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Label:</source>
-        <translation>Etiquette :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
@@ -2886,23 +2894,23 @@
     </message>
     <message>
         <source>Invalid line points</source>
-        <translation>Points de la ligne non valides</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid first line point</source>
-        <translation>Premier point de la ligne non valide</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid second line point</source>
-        <translation>Second point de la ligne non valide</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid label</source>
-        <translation>Etiquette invalide</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid alias</source>
-        <translation>Alias invalide</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -2929,15 +2937,15 @@
     </message>
     <message>
         <source>Tags:</source>
-        <translation>Marqueurs:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Separate each tag with comma.</source>
-        <translation>Séparez chaque balise par une virgule.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add tags</source>
-        <translation>Ajouter des balises</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3020,11 +3028,11 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3203,7 +3211,7 @@
     </message>
     <message>
         <source>Move objects. Suffix &apos;%1&apos;</source>
-        <translation>Déplacer des objets. Suffixe &apos;%1&apos;</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3366,15 +3374,15 @@
     </message>
     <message>
         <source>Curves control point lengths</source>
-        <translation>Longueurs des points de contrôle de courbes</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid result. Value is infinite or NaN. Please, check your calculations.</source>
-        <translation>Résultat invalide. La valeur est infinie ou NaN. Veuillez revoir vos calculs.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Refresh a pattern with all changes you made</source>
-        <translation>Mise à jour du patron après toutes les modifications</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Refresh</source>
@@ -3386,7 +3394,7 @@
     </message>
     <message>
         <source>Unique variable name</source>
-        <translation>Nom unique de variable</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Search increments by term. &lt;/p&gt;&lt;p&gt;Prepend &amp;quot;/r/&amp;quot; to the front of the search string to search increments by regex.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -3413,7 +3421,7 @@
     </message>
     <message>
         <source>The list of pieces is empty. Please, first create at least one piece for current pattern piece.</source>
-        <translation>La liste des pièces est vide. Créer d&apos;abord au moins une pièce pour le patron en cours.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert nodes</source>
@@ -3425,14 +3433,14 @@
     </message>
     <message>
         <source>Number:</source>
-        <translation>Nombre :</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DialogKnownMaterials</name>
     <message>
         <source>Known materials</source>
-        <translation>Matériaux connus</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Material:</source>
@@ -3444,7 +3452,7 @@
     </message>
     <message>
         <source>User material</source>
-        <translation>Tissu de l&apos;utilisateur</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3471,30 +3479,30 @@
     </message>
     <message>
         <source>Nesting. Please, wait.</source>
-        <translation>Mise en page, merci de patienter.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time left:</source>
-        <translation>Temps restant :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time left: %1</source>
-        <translation>Temps restant : %1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Efficiency coefficient: %1%</source>
-        <translation>Coefficient d’efficacité: %1%</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DialogLayoutScale</name>
     <message>
         <source>Layout scale</source>
-        <translation>Echelle de sortie</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Margins</source>
-        <translation>Marges</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Left:</source>
@@ -3518,15 +3526,15 @@
     </message>
     <message>
         <source>Scale</source>
-        <translation>Echelle</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Horizontal:</source>
-        <translation>horizontal :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vertical:</source>
-        <translation>vertical :</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3761,43 +3769,41 @@ Appliquer les réglages quand-même ?</translation>
     </message>
     <message>
         <source>Text will be converted to paths</source>
-        <translation>Le texte sera converti en tracés</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text as paths</source>
-        <translation>Exporter le texte en tracés</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Margins</source>
-        <translation>Marges</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ignore margins</source>
-        <translation>Ignorer les marges</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Margins go beyond printing. 
 
 Apply settings anyway?</source>
-        <translation>Les marges s’étendent au-delà de la zone d’impression.. 
-
-Appliquer quand même les réglages ?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Follow grainline</source>
-        <translation>Suivre le droit-fil</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time:</source>
-        <translation>Heure:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time given for the algorithm to find best layout.</source>
-        <translation>Temps estimé pour que l’algorithme trouve la meilleure mise en page.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Efficiency:</source>
-        <translation>Efficacité :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set layout efficiency coefficient. Layout efficiency coefficientt is the ratio of the area occupied by the pieces to the bounding rect of all pieces. If nesting reaches required level the process stops. If value is 0 no check will be made. </source>
@@ -3805,32 +3811,32 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Manual priority</source>
-        <translation>Priorité manuelle</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nest quantity of copies according to piece settings.</source>
-        <translation>Regrouper le nombre de copies selon les paramètres de la pièce.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nest quantity</source>
-        <translation>Quantité à regrouper</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto crop unused width</source>
-        <translation>Rogner automatiquement la largeur non utilisée</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer one sheet solution</source>
-        <translation>Préférer la solution à une feuille</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <comment>minutes</comment>
-        <translation>min</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable this option to prefer getting one sheet solutions.</source>
-        <translation>Activer cette option pour obtenir des solutions à une feuille.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3881,11 +3887,11 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3948,11 +3954,11 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -4075,11 +4081,11 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -4203,7 +4209,7 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Select measurement</source>
-        <translation>Selectionner la mensuration</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -4214,7 +4220,7 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Preview</source>
-        <translation>Prévisualiser</translation>
+        <translation type="unfinished">Prévisualiser</translation>
     </message>
     <message>
         <source>Input</source>
@@ -4222,89 +4228,89 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Import</source>
-        <translation>Importer</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Columns</source>
-        <translation>Colonne</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full name:</source>
-        <translation>Nom complet:</translation>
+        <translation type="unfinished">Nom complet:</translation>
     </message>
     <message>
         <source>Description:</source>
-        <translation>Description:</translation>
+        <translation type="unfinished">Description:</translation>
     </message>
     <message>
         <source>Ready</source>
-        <translation>Prêt</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation>Nom</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <translation>Valeur</translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <translation>Valeur de départ</translation>
-    </message>
-    <message>
-        <source>Skip</source>
-        <translation>Passer</translation>
-    </message>
-    <message>
-        <source>Shift (%1)*:</source>
-        <translation>Touche Majuscule (%1)*:</translation>
-    </message>
-    <message>
-        <source>File path is empty</source>
-        <translation>Le chemin d&apos;accès du ficihier est vide</translation>
-    </message>
-    <message>
-        <source>Not enough columns</source>
-        <translation>Nombre de colonnes insuffisant</translation>
-    </message>
-    <message>
-        <source>Not enough data to import</source>
-        <translation>Nombre de données à importer insuffisant</translation>
-    </message>
-    <message>
-        <source>Please, select unique number for each column</source>
-        <translation>Sélectionner pour chaque colonne un nombre unique</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>measurement column</comment>
-        <translation>Nom</translation>
+        <translation type="unfinished">Nom</translation>
     </message>
     <message>
         <source>Value</source>
         <comment>measurement column</comment>
-        <translation>Valeur</translation>
+        <translation type="unfinished">Valeur</translation>
     </message>
     <message>
         <source>Full name</source>
         <comment>measurement column</comment>
-        <translation>Nom complet</translation>
+        <translation type="unfinished">Nom complet</translation>
     </message>
     <message>
         <source>Description</source>
         <comment>measurement column</comment>
-        <translation>Description du patron</translation>
+        <translation type="unfinished">Description du patron</translation>
     </message>
     <message>
         <source>Base value</source>
         <comment>measurement column</comment>
-        <translation>Valeur de départ</translation>
+        <translation type="unfinished">Valeur de départ</translation>
     </message>
     <message>
         <source>Shift (%1):</source>
         <comment>measurement column</comment>
-        <translation>Majuscule (%1):</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Nom</translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished">Valeur</translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <translation type="unfinished">Valeur de départ</translation>
+    </message>
+    <message>
+        <source>Shift (%1)*:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File path is empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not enough columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not enough data to import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, select unique number for each column</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -4363,7 +4369,7 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Rotation origin point:</source>
-        <translation>Point d&apos;origine de la rotation:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Center point</source>
@@ -4371,11 +4377,11 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Enable to create a visibility gropup from original objects</source>
-        <translation>Activer pour créer un groupe de visibilité à partir des objets d&apos;origine</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Visibility Group</source>
-        <translation>Groupe de visibilité</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
@@ -4387,27 +4393,23 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Tags:</source>
-        <translation>Marqueurs:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Separate each tag with comma.</source>
-        <translation>Séparez chaque balise par une virgule.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add tags</source>
-        <translation>Ajouter des balises</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Alias :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pen style:</source>
@@ -4419,19 +4421,23 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Ready</source>
-        <translation>Prêt</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid suffix</source>
-        <translation>suffixe invalide</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid group name</source>
-        <translation>Nom de groupe non valide</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Label:</source>
-        <translation>Etiquette :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
@@ -4439,23 +4445,23 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Invalid angle formula</source>
-        <translation>La formule de l&apos;angle est invalide</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid rotation angle formula</source>
-        <translation>Formule d’angle de rotation invalide</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid length formula</source>
-        <translation>La formule de la longueur est invalide</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid label</source>
-        <translation>Etiquette invalide</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid alias</source>
-        <translation>Alias invalide</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -4502,7 +4508,7 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Multisize</source>
-        <translation>Multi-tailles</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -4660,11 +4666,11 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -4862,12 +4868,28 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>For technical notes</source>
-        <translation>Pour les notes techniques</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Label data</source>
+        <translation type="vanished">Données de l&apos;étiquette</translation>
+    </message>
+    <message>
+        <source>Materials</source>
+        <translation type="vanished">Matières</translation>
+    </message>
+    <message>
+        <source>Manage</source>
+        <translation type="vanished">Gérer</translation>
     </message>
     <message>
         <source>Label language:</source>
         <translation>Langue:</translation>
     </message>
+    <message>
+        <source>yyyy-MM-dd</source>
+        <translation type="obsolete">yyyy-MM-dd</translation>
+    </message>
     <message>
         <source>Passmark length:</source>
         <translation type="unfinished"></translation>
@@ -5176,11 +5198,11 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Straightforward</source>
-        <translation>Tout droit</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bisector</source>
-        <translation>Bissectrice</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passmark</source>
@@ -5212,7 +5234,7 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Intersection</source>
-        <translation>Intersection</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Each point in the &lt;b&gt;custom seam allowance&lt;/b&gt; path must be unique!</source>
@@ -5220,7 +5242,7 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Cut on fabric</source>
-        <translation>Couper le tissu</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select if need designate the corner point as a passmark. Show only left passmark.</source>
@@ -5240,11 +5262,11 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Control</source>
-        <translation>Contrôle</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Visible</source>
-        <translation>Visible</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create a formula that regulates visibility. Values different from &quot;0&quot; make a path visible.</source>
@@ -5256,7 +5278,7 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Control visibility</source>
-        <translation>Contrôle de la visibilité</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Intersection 2</source>
@@ -5264,31 +5286,31 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Intersection 2 (only left)</source>
-        <translation>Intersection 2 (gauche seulement)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Intersection 2 (only right)</source>
-        <translation>Intersection 2 (droite seulement)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check uniqueness</source>
-        <translation>Vérifier la spécificité</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move on top</source>
-        <translation>Déplacer au premier plan</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move up</source>
-        <translation>Déplacer vers le haut</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move down</source>
-        <translation>Déplacer vers le bas</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move on bottom</source>
-        <translation>Déplacer vers l&apos;arrière plan</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Continue the first point to the cutting contour</source>
@@ -5304,7 +5326,7 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>The list of pieces is empty. Please, first create at least one piece for current pattern piece.</source>
-        <translation>La liste des pièces est vide. Créer d&apos;abord au moins une pièce pour le patron en cours.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This option has effect only if the second passmark on seam line enabled in global preferences. The option helps disable the second passmark for this passmark only.</source>
@@ -5316,7 +5338,7 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Excluded</source>
-        <translation>Exclus</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The same curve repeats twice!</source>
@@ -5371,7 +5393,7 @@ Appliquer quand même les réglages ?</translation>
     <name>DialogPin</name>
     <message>
         <source>Pin tool</source>
-        <translation>Outil Epingle</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Point:</source>
@@ -5383,11 +5405,11 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Pin</source>
-        <translation>Epingle</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The list of pieces is empty. Please, first create at least one piece for current pattern piece.</source>
-        <translation>La liste des pièces est vide. Créer d&apos;abord au moins une pièce pour le patron en cours.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -5406,19 +5428,19 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Calculation</source>
-        <translation>Calcul</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Show full calculation in message box&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Montrer le calcul complet dans une boite de dialogue &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height:</source>
-        <translation>Hauteur:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Angle:</source>
-        <translation>Angle:</translation>
+        <translation type="unfinished">Angle:</translation>
     </message>
     <message>
         <source>0</source>
@@ -5426,7 +5448,7 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Point:</source>
-        <translation>Point :</translation>
+        <translation type="unfinished">Point :</translation>
     </message>
     <message>
         <source>Piece:</source>
@@ -5434,31 +5456,31 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Type:</source>
-        <translation>Type :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit rectangle width</source>
-        <translation>Modifier la largeur du rectangle</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit angle</source>
-        <translation>Éditer l&apos;angle</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Segment</source>
-        <translation>Segment</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rectangle</source>
-        <translation>Rectangle</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cross</source>
-        <translation>Croix</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T-shaped</source>
-        <translation>En forme de T</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Doubletree</source>
@@ -5466,31 +5488,31 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Corner</source>
-        <translation>Coin</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Triangle</source>
-        <translation>Triangle</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>H-shaped</source>
-        <translation>En forme de H</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Button</source>
-        <translation>Bouton</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Place label</source>
-        <translation>Placer l&apos;étiquette</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Control</source>
-        <translation>Contrôle</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Visible</source>
-        <translation>Visible</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create a formula that regulates visibility. Values different from &quot;0&quot; make a path visible.</source>
@@ -5502,15 +5524,15 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>The list of pieces is empty. Please, first create at least one piece for current pattern piece.</source>
-        <translation>La liste des pièces est vide. Créer d&apos;abord au moins une pièce pour le patron en cours.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Control visibility</source>
-        <translation>Contrôle de la visibilité</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Circle</source>
-        <translation>Cercle</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -5569,11 +5591,11 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -5668,11 +5690,11 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -5763,11 +5785,11 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -5822,11 +5844,11 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -5889,11 +5911,11 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -6004,11 +6026,11 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -6051,11 +6073,11 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Curve 1</source>
@@ -6063,11 +6085,11 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Alias1:</source>
-        <translation>Alias1:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias2:</source>
-        <translation>Alias2 :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Curve 2</source>
@@ -6078,11 +6100,11 @@ Appliquer quand même les réglages ?</translation>
     <name>DialogPreferences</name>
     <message>
         <source>Preferences</source>
-        <translation>Préférences</translation>
+        <translation type="unfinished">Préférences</translation>
     </message>
     <message>
         <source>Configuration</source>
-        <translation>Configuration</translation>
+        <translation type="unfinished">Configuration</translation>
     </message>
     <message>
         <source>Pattern</source>
@@ -6090,13 +6112,35 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Paths</source>
-        <translation>Répertoires</translation>
+        <translation type="unfinished">Chemins</translation>
     </message>
     <message numerus="yes">
         <source>Followed %n option(s) require restart to take effect: %1.</source>
         <translation type="unfinished">
-            <numerusform>Followed %n option(s) require restart to take effect: %1.</numerusform>
-            <numerusform>Followed %n option(s) require restart to take effect: %1.</numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+</context>
+<context>
+    <name>DialogPuzzlePreferences</name>
+    <message>
+        <source>Puzzle preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished">Configuration</translation>
+    </message>
+    <message>
+        <source>Paths</source>
+        <translation type="unfinished">Chemins</translation>
+    </message>
+    <message numerus="yes">
+        <source>Followed %n option(s) require restart to take effect: %1.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
         </translation>
     </message>
 </context>
@@ -6104,7 +6148,7 @@ Appliquer quand même les réglages ?</translation>
     <name>DialogRestrictDimension</name>
     <message>
         <source>Restrict dimension</source>
-        <translation>Restreindre les dimensions</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dimension A:</source>
@@ -6112,7 +6156,7 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Restriction</source>
-        <translation>Restriction</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Min:</source>
@@ -6124,11 +6168,11 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Exclude</source>
-        <translation>Exclure</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Include</source>
-        <translation>Inclure</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -6183,15 +6227,15 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>This point cannot be origin point. Please, select another origin point</source>
-        <translation>Ce point ne peut pas être le point de départ. Sélectionner un autre point de départ</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable to create a visibility gropup from original objects</source>
-        <translation>Activer pour créer un groupe de visibilité à partir des objets d&apos;origine</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Visibility Group</source>
-        <translation>Groupe de visibilité</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
@@ -6199,23 +6243,19 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Tags:</source>
-        <translation>Marqueurs:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Separate each tag with comma.</source>
-        <translation>Séparez chaque balise par une virgule.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add tags</source>
-        <translation>Ajouter des balises</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Alias</source>
@@ -6231,39 +6271,43 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Ready</source>
-        <translation>Prêt</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid suffix</source>
-        <translation>suffixe invalide</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid group name</source>
-        <translation>Nom de groupe non valide</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid rotation point</source>
-        <translation>Point de rotation invalide</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid label</source>
-        <translation>Etiquette invalide</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid alias</source>
-        <translation>Alias invalide</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid angle formula</source>
-        <translation>La formule de l&apos;angle est invalide</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Label:</source>
-        <translation>Etiquette :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Alias :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
@@ -6326,43 +6370,43 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Binary form</source>
-        <translation>Forme binaire</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text as paths</source>
-        <translation>Texte en tracés</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Margins</source>
-        <translation>Marges</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right:</source>
-        <translation>Droit:</translation>
+        <translation type="unfinished">Droite:</translation>
     </message>
     <message>
         <source>Left:</source>
-        <translation>Gauche:</translation>
+        <translation type="unfinished">Gauche:</translation>
     </message>
     <message>
         <source>Top:</source>
-        <translation>Haut :</translation>
+        <translation type="unfinished">Haut:</translation>
     </message>
     <message>
         <source>Bottom:</source>
-        <translation>Bas :</translation>
+        <translation type="unfinished">Bas:</translation>
     </message>
     <message>
         <source>Paper format</source>
-        <translation>Format du papier</translation>
+        <translation type="unfinished">Format du papier</translation>
     </message>
     <message>
         <source>Browse…</source>
-        <translation>Parcourir…</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
-        <translation>cm</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Templates:</source>
@@ -6370,7 +6414,7 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Orientation:</source>
-        <translation>Orientation :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
@@ -6378,15 +6422,15 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Scale</source>
-        <translation>Echelle</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Horizontal:</source>
-        <translation>horizontal :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vertical:</source>
-        <translation>vertical :</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -6475,6 +6519,10 @@ Appliquer quand même les réglages ?</translation>
         <source>Numerical control</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogSeamAllowance</name>
@@ -6508,7 +6556,7 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Error. Can&apos;t save piece path.</source>
-        <translation>Erreur : le chemin d&apos;accès de la pièce ne peut pas être sauvegardé.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Infinite/undefined result</source>
@@ -6516,11 +6564,11 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Length should be positive</source>
-        <translation>La longueur indiquée doit être positive</translation>
+        <translation type="unfinished">La longueur doit être positive</translation>
     </message>
     <message>
         <source>Parser error: %1</source>
-        <translation>Erreur de l&apos;interpréteur : %1</translation>
+        <translation type="unfinished">Erreur d&apos;analyse : %1</translation>
     </message>
     <message>
         <source>Current seam allowance</source>
@@ -6544,11 +6592,11 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>You have to choose points in a clockwise direction!</source>
-        <translation>Vous devez choisir les points dans le sens des aiguilles d&apos;une montre!</translation>
+        <translation type="unfinished">Vous devez choisir les points dans le sens des aiguilles d&apos;une montre!</translation>
     </message>
     <message>
         <source>First point cannot be equal to the last point!</source>
-        <translation>Le premier point ne peut être identique au dernier!</translation>
+        <translation type="unfinished">Le premier point ne peut être identique au dernier!</translation>
     </message>
     <message>
         <source>You have double points!</source>
@@ -6564,7 +6612,7 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>custom seam allowance</source>
-        <translation>Personnaliser la marge de couture</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Both</source>
@@ -6580,11 +6628,11 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Pins</source>
-        <translation>Epingles</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>no pin</source>
-        <translation>Pas d&apos;épingle</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Labels</source>
@@ -6596,27 +6644,27 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Edit length</source>
-        <translation>Éditer longueur</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit angle</source>
-        <translation>Éditer l&apos;angle</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit height</source>
-        <translation>Editer la stature</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit width</source>
-        <translation>Editer la largeur</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paths</source>
-        <translation>Répertoires</translation>
+        <translation type="unfinished">Chemins</translation>
     </message>
     <message>
         <source>Excluded</source>
-        <translation>Exclus</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passmark</source>
@@ -6624,7 +6672,7 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Each point in the path must be unique!</source>
-        <translation>Chaque point indiqué doit être unique !</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passmarks</source>
@@ -6636,19 +6684,19 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Segment</source>
-        <translation>Segment</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rectangle</source>
-        <translation>Rectangle</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cross</source>
-        <translation>Croix</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T-shaped</source>
-        <translation>En forme de T</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Doubletree</source>
@@ -6656,27 +6704,27 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Corner</source>
-        <translation>Coin</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Triangle</source>
-        <translation>Triangle</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>H-shaped</source>
-        <translation>En forme de H</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Button</source>
-        <translation>Bouton</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Place label</source>
-        <translation>Placer l&apos;étiquette</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check uniqueness</source>
-        <translation>Vérifier la spécificité</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To open all detail&apos;s features complete creating the main path. Please, press OK.</source>
@@ -6696,7 +6744,7 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Circle</source>
-        <translation>Cercle</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit passmark length</source>
@@ -6727,31 +6775,36 @@ Appliquer quand même les réglages ?</translation>
     <name>DialogSetupMultisize</name>
     <message>
         <source>Setup multisize measurements</source>
-        <translation>Définir les mensurations multi-tailles</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use full circumference</source>
-        <translation>Utiliser une circonférence entière</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Height</source>
+        <comment>dimension</comment>
+        <translation type="unfinished">Hauteur</translation>
     </message>
     <message>
         <source>Min value:</source>
-        <translation>Valaur minimale :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minimal value described in the column</source>
-        <translation>Valeur minimale définie dans la colonne</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Max value:</source>
-        <translation>Valeur maximale:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maximal value described in the column</source>
-        <translation>Valaue maximale définie dans la colonne</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Step:</source>
-        <translation>Etape :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Single-step between the column values</source>
@@ -6759,23 +6812,38 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Base:</source>
-        <translation>Base :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The base value for the column</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <comment>dimension</comment>
+        <translation type="unfinished">Taille</translation>
+    </message>
     <message>
         <source>Circumference</source>
-        <translation>Circonférence</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Waist</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hip</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please, provide correct data for dimensions</source>
-        <translation>Merci de fournir des dimensions correctes</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please, select at least one dimension</source>
-        <translation>Merci de sélectionner au moins une dimension</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more than 3 dimensions allowed</source>
@@ -6783,27 +6851,7 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Ready</source>
-        <translation>Prêt</translation>
-    </message>
-    <message>
-        <source>Height</source>
-        <comment>dimension</comment>
-        <translation>Hauteur</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <comment>dimension</comment>
-        <translation>Taille</translation>
-    </message>
-    <message>
-        <source>Waist</source>
-        <comment>dimension</comment>
-        <translation>Taille</translation>
-    </message>
-    <message>
-        <source>Hip</source>
-        <comment>dimension</comment>
-        <translation>Hanche</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -6914,11 +6962,11 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -6957,11 +7005,11 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7104,15 +7152,15 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Alias :</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7259,40 +7307,40 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Cannot find point with id %1</source>
-        <translation>Impossible de trouver le point %1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Alias :</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DialogTapePreferences</name>
     <message>
         <source>Preferences</source>
-        <translation>Préférences</translation>
+        <translation type="unfinished">Préférences</translation>
     </message>
     <message>
         <source>Configuration</source>
-        <translation>Configuration</translation>
+        <translation type="unfinished">Configuration</translation>
     </message>
     <message>
         <source>Paths</source>
-        <translation>Répertoires</translation>
+        <translation type="unfinished">Chemins</translation>
     </message>
     <message numerus="yes">
         <source>Followed %n option(s) require restart to take effect: %1.</source>
-        <translation>
-            <numerusform>Followed %n option(s) require restart to take effect: %1.</numerusform>
-            <numerusform>Followed %n option(s) require restart to take effect: %1.</numerusform>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
         </translation>
     </message>
 </context>
@@ -7356,19 +7404,19 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>by first edge symmetry</source>
-        <translation>par symétrie du premier côté</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>by second edge symmetry</source>
-        <translation>par symétrie du second côté</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>by first edge right angle</source>
-        <translation>par l&apos;angle droit du premier côté</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>by second edge right angle</source>
-        <translation>par l&apos;angle droit du second côté</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7455,11 +7503,11 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7566,11 +7614,11 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Outil</translation>
+        <translation type="unfinished">Outil</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Remarques</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7671,11 +7719,11 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>%1 update is available!</source>
-        <translation>Mise à jour %1 disponible !</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New %1 test version is now available. Would you like to download it now?</source>
-        <translation>Un nouvelle version de test %1 est disponible. Voulez-vous la télécharger maintenant ?</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7816,7 +7864,7 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>Disable high dpi scaling. Call this option if has problem with scaling (by default scaling enabled). Alternatively you can use the %1 environment variable.</source>
-        <translation>Désactiver la mise à l&apos;échelle haute précision. Choisissez cette option si vous avez un problème avec la mise à l&apos;échelle (activée par défaut). Sinon vous pouvez aussi utiliser la variable d’environnement %1.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set base for dimension A in the table units.</source>
@@ -7848,19 +7896,19 @@ Appliquer quand même les réglages ?</translation>
     </message>
     <message>
         <source>The pattern units</source>
-        <translation>Unités du patron</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid dimension A base value.</source>
-        <translation>Dimension invalide de base A.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid dimension B base value.</source>
-        <translation>Dimension invalide de base B.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid dimension C base value.</source>
-        <translation>Dimension invalide de base C.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Formula warning: %1. Program will be terminated.</source>
@@ -8305,7 +8353,7 @@ Voulez-vous sauvegarder les changements?</translation>
     </message>
     <message>
         <source>This file already opened in another window.</source>
-        <translation>Ce fichier est déjà ouvert dans une autre fenêtre.</translation>
+        <translation type="vanished">Ce fichier est déjà ouvert dans une autre fenêtre.</translation>
     </message>
     <message>
         <source>Wrong units.</source>
@@ -8758,27 +8806,27 @@ Voulez-vous sauvegarder les changements?</translation>
     </message>
     <message>
         <source>Locking file</source>
-        <translation>Verrouiller le fichier (en lecture seule)</translation>
+        <translation type="vanished">Verrouiller le fichier (en lecture seule)</translation>
     </message>
     <message>
         <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Le fichier est déjà ouvert dans une autre fenêtre. Ignorer pour continuer (déconseillé car pouvant causer une corruption de données).</translation>
+        <translation type="vanished">Le fichier est déjà ouvert dans une autre fenêtre. Ignorer pour continuer (déconseillé car pouvant causer une corruption de données).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Le fichier en lecture seule ne peut être créer par manque de permission. Ignorer pour continuer (déconseillé car pouvant causer une corruption de données).</translation>
+        <translation type="vanished">Le fichier en lecture seule ne peut être créer par manque de permission. Ignorer pour continuer (déconseillé car pouvant causer une corruption de données).</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Une erreur inconnue s&apos;est produite, par exemple une partition pleine empêche d&apos;écrire le fichier en lecture seule. Ignorer pour continuer (déconseillé car pouvant causer une corruption de données).</translation>
+        <translation type="vanished">Une erreur inconnue s&apos;est produite, par exemple une partition pleine empêche d&apos;écrire le fichier en lecture seule. Ignorer pour continuer (déconseillé car pouvant causer une corruption de données).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions.</source>
-        <translation>Le fichier en lecture seule ne peut être créer par manque de permission.</translation>
+        <translation type="vanished">Le fichier en lecture seule ne peut être créer par manque de permission.</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation>Une erreur inconnue s&apos;est produite, par exemple une partition pleine empêche d&apos;écrire le fichier en lecture seule.</translation>
+        <translation type="vanished">Une erreur inconnue s&apos;est produite, par exemple une partition pleine empêche d&apos;écrire le fichier en lecture seule.</translation>
     </message>
     <message>
         <source>Report Bug...</source>
@@ -8906,23 +8954,19 @@ Voulez-vous sauvegarder les changements?</translation>
     </message>
     <message>
         <source>Move objects</source>
-        <translation>Déplacer des objets</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Measurements were changed. Do you want to sync measurements now?</source>
-        <translation>Les mensurations ont changées. Voulez-vous les resynchroniser maintenant?</translation>
-    </message>
-    <message>
-        <source>Gradation doesn&apos;t support inches</source>
-        <translation type="vanished">Gradation en pouces impossible</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Measurements have been synced</source>
-        <translation>Les mensurations sont synchronisées</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tools for creating elliptical arcs.</source>
-        <translation>Outils pour créer des élipses.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Elliptical Arc</source>
@@ -8930,27 +8974,15 @@ Voulez-vous sauvegarder les changements?</translation>
     </message>
     <message>
         <source>Select point of center of elliptical arc</source>
-        <translation>Choisir le point central de l&apos;élipse</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select main path objects clockwise.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>The document has no write permissions.</source>
-        <translation>Le document n&apos;est pas accessible en écriture.</translation>
-    </message>
-    <message>
-        <source>Cannot set permissions for %1 to writable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not save the file.</source>
-        <translation>Le fichier n&apos;a pas pu etre enregistré.</translation>
-    </message>
     <message>
         <source>Could not save the file</source>
-        <translation>Le fichier n&apos;a pas pu etre enregistré</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read only</source>
@@ -8994,7 +9026,7 @@ Voulez-vous sauvegarder les changements?</translation>
     </message>
     <message>
         <source>Sync</source>
-        <translation>Synchroniser</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Synchronize linked to the pattern measurements after change</source>
@@ -9010,19 +9042,19 @@ Voulez-vous sauvegarder les changements?</translation>
     </message>
     <message>
         <source>Individual measurements</source>
-        <translation>Mensurations individuelles</translation>
+        <translation type="unfinished">Mesures individuelles</translation>
     </message>
     <message>
         <source>Multisize measurements</source>
-        <translation>Mensurations multi-tailles</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pattern files</source>
-        <translation>Fichiers de patron</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pin tool</source>
-        <translation>Outil Epingle</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select pin point</source>
@@ -9030,7 +9062,7 @@ Voulez-vous sauvegarder les changements?</translation>
     </message>
     <message>
         <source>Insert node tool</source>
-        <translation>Outil Insérer un noeud</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Tape app for creating or editing measurements file</source>
@@ -9046,7 +9078,7 @@ Voulez-vous sauvegarder les changements?</translation>
     </message>
     <message>
         <source>The calculated value</source>
-        <translation>Valeur calculée</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Formula</source>
@@ -9054,11 +9086,11 @@ Voulez-vous sauvegarder les changements?</translation>
     </message>
     <message>
         <source>You can&apos;t use Detail mode yet. Please, create at least one workpiece.</source>
-        <translation>Vous ne pouvez pas utiliser le mode Détails. Créez au moins un élément de patron.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You can&apos;t use Layout mode yet. Please, create at least one workpiece.</source>
-        <translation>Vous ne pouvez pas utiliser le mode plan de coupe maintenant. Créez au moins une pièce de patron.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You can&apos;t use Layout mode yet. Please, include at least one detail in layout.</source>
@@ -9070,11 +9102,11 @@ Voulez-vous sauvegarder les changements?</translation>
     </message>
     <message>
         <source>Zoom fit best current</source>
-        <translation>Ajustement automatique du zoom</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>zoom fit best current pattern piece</source>
-        <translation>Ajustement du zoom à l&apos;élément courant</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export details skiping the Layout stage</source>
@@ -9086,11 +9118,11 @@ Voulez-vous sauvegarder les changements?</translation>
     </message>
     <message>
         <source>Export details</source>
-        <translation>Exporter les détails</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t export details.</source>
-        <translation>Impossible d&apos;exporter les détails.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Label template editor</source>
@@ -9106,11 +9138,11 @@ Voulez-vous sauvegarder les changements?</translation>
     </message>
     <message>
         <source>Save &amp;As…</source>
-        <translation>Enregistrer sous…</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Report Bug…</source>
-        <translation>Reporter un bug…</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export As…</source>
@@ -9118,7 +9150,7 @@ Voulez-vous sauvegarder les changements?</translation>
     </message>
     <message>
         <source>Save…</source>
-        <translation>Enregistrer…</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Final measurements</source>
@@ -9142,7 +9174,7 @@ Voulez-vous sauvegarder les changements?</translation>
     </message>
     <message>
         <source>Next pattern piece</source>
-        <translation>Pièce de patron suivante</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ctrl+PgDown</source>
@@ -9150,7 +9182,7 @@ Voulez-vous sauvegarder les changements?</translation>
     </message>
     <message>
         <source>Previous pattern piece</source>
-        <translation>Pièce de patron précédente</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ctrl+PgUp</source>
@@ -9158,11 +9190,11 @@ Voulez-vous sauvegarder les changements?</translation>
     </message>
     <message>
         <source>Place label tool</source>
-        <translation>Outil Placer une étiquette</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate detail tool</source>
-        <translation>Outil Dupliquer les détails</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select placelabel center point</source>
@@ -9174,11 +9206,11 @@ Voulez-vous sauvegarder les changements?</translation>
     </message>
     <message>
         <source>Use these tools to create a pattern</source>
-        <translation>Utilisez ces outils pour créer un patron</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale:</source>
-        <translation>Echelle :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create new pattern piece to start working.</source>
@@ -9190,7 +9222,7 @@ Voulez-vous sauvegarder les changements?</translation>
     </message>
     <message>
         <source>Cannot save settings. Access denied.</source>
-        <translation>Les réglages ne peuvent pas être enregistrés. Accès refusé.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ctrl+O</source>
@@ -9198,7 +9230,7 @@ Voulez-vous sauvegarder les changements?</translation>
     </message>
     <message>
         <source>Cannot read settings from a malformed .INI file.</source>
-        <translation>Lecture des réglages impossible à cause d&apos;un fichier .INI invalide.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select path objects, &lt;b&gt;%1&lt;/b&gt; - reverse direction curve</source>
@@ -9218,19 +9250,19 @@ Voulez-vous sauvegarder les changements?</translation>
     </message>
     <message>
         <source>Increase label font</source>
-        <translation>Augmenter la taille de la police de caractères de l&apos;étiquette</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Decrease label font</source>
-        <translation>Diminuer la taille de la police de caractères de l&apos;étiquette</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Original label font</source>
-        <translation>Police par défaut de l&apos;étiquette</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide labels</source>
-        <translation>Cacher les étiquettes</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups of visibility</source>
@@ -9282,11 +9314,11 @@ Voulez-vous sauvegarder les changements?</translation>
     </message>
     <message>
         <source>DEBUG</source>
-        <translation>DEBUGAGE</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING</source>
-        <translation>AVERTISSEMENT</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CRITICAL</source>
@@ -9306,7 +9338,7 @@ Voulez-vous sauvegarder les changements?</translation>
     </message>
     <message>
         <source>Watermark</source>
-        <translation>Filigrane</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load</source>
@@ -9318,23 +9350,59 @@ Voulez-vous sauvegarder les changements?</translation>
     </message>
     <message>
         <source>Edit current</source>
-        <translation>Editer les mesures en cours d&apos;utilisation</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Editor</source>
-        <translation>Editeur</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create or edit a watermark</source>
-        <translation>Créer ou éditer un filigrane</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Watermark files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to change the premissions?</source>
-        <translation>Voulez-vous modifier les autorisations?</translation>
+        <source>Manual Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open the Puzzle app</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished">Mise à jour</translation>
+    </message>
+    <message>
+        <source>Update manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to prepare raw layout data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select manual layout</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not supported dimension A value &apos;%1&apos; for this pattern file.</source>
@@ -9376,22 +9444,6 @@ Voulez-vous sauvegarder les changements?</translation>
         <source>Could not create recipe file. %1</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Shop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scalable Vector Graphics files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save draw</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw export</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>MainWindowsNoGUI</name>
@@ -9479,13 +9531,9 @@ Voulez-vous sauvegarder les changements?</translation>
         <source>Can&apos;t create path</source>
         <translation type="vanished">Impossible de créer l&apos;emplacement</translation>
     </message>
-    <message>
-        <source>Cannot set printer margins</source>
-        <translation type="vanished">Impossible de définir les marges d&apos;impression</translation>
-    </message>
     <message>
         <source>Can&apos;t create a path</source>
-        <translation>Impossible de créer l&apos;emplacement</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pattern</source>
@@ -9521,7 +9569,7 @@ Voulez-vous sauvegarder les changements?</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Description</translation>
+        <translation type="unfinished">Description du patron</translation>
     </message>
     <message>
         <source>Measurement file has unknown format.</source>
@@ -9531,6 +9579,10 @@ Voulez-vous sauvegarder les changements?</translation>
         <source>Measurement file contains invalid known measurement(s).</source>
         <translation>Le tableau de mesure contient une ou plusieur valeurs connuse vides.</translation>
     </message>
+    <message>
+        <source>Wrong units.</source>
+        <translation type="vanished">Mauvaises unités de mesure.</translation>
+    </message>
     <message>
         <source>File error.</source>
         <translation>Erreur de fichier.</translation>
@@ -9549,11 +9601,11 @@ Voulez-vous sauvegarder les changements?</translation>
     </message>
     <message>
         <source>Timeout.</source>
-        <translation>Délai.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Process has been stoped because of exception.</source>
-        <translation>L&apos;opération a été stoppée en raison d&apos;une exception.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -9702,10 +9754,6 @@ Voulez-vous sauvegarder les changements?</translation>
         <source>Delete all</source>
         <translation type="vanished">Tout effacer</translation>
     </message>
-    <message>
-        <source>Workpiece</source>
-        <translation type="vanished">Pièce en cours</translation>
-    </message>
     <message>
         <source>Forbid flipping</source>
         <translation type="vanished">Rotation interdite</translation>
@@ -9767,7 +9815,7 @@ Voulez-vous sauvegarder les changements?</translation>
     </message>
     <message>
         <source>Pattern editing</source>
-        <translation>Édition du patron</translation>
+        <translation>Révision du patron</translation>
     </message>
     <message>
         <source>Reset warnings</source>
@@ -9909,7 +9957,7 @@ Voulez-vous sauvegarder les changements?</translation>
     </message>
     <message>
         <source>Path</source>
-        <translation>Chemin</translation>
+        <translation type="unfinished">Chemin</translation>
     </message>
     <message>
         <source>Default</source>
@@ -9921,46 +9969,50 @@ Voulez-vous sauvegarder les changements?</translation>
     </message>
     <message>
         <source>Open Directory</source>
-        <translation>Ouvrir Dossier</translation>
+        <translation type="unfinished">Ouvrir un dossier</translation>
     </message>
     <message>
         <source>My Individual Measurements</source>
-        <translation>Mes Mensurations</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>My Multisize Measurements</source>
-        <translation>Mes Mensurations Multi-tailles</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>My Patterns</source>
-        <translation>Mes patrons</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>My Layouts</source>
-        <translation>Mes plans de coupe</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>My Templates</source>
-        <translation>Mes Modèles</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>My label templates</source>
-        <translation>Mes modèles d&apos;étiquette</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My manual layouts</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PreferencesPatternPage</name>
     <message>
         <source>Graphical output</source>
-        <translation>Sortie graphique</translation>
+        <translation type="unfinished">Sortie graphique</translation>
     </message>
     <message>
         <source>Use antialiasing</source>
-        <translation>Utiliser l&apos;antialiasing</translation>
+        <translation type="unfinished">Utiliser l&apos;antialiasing</translation>
     </message>
     <message>
         <source>Undo</source>
-        <translation>Annuler</translation>
+        <translation type="unfinished">Annuler</translation>
     </message>
     <message>
         <source>Count steps (0 - no limit):</source>
@@ -9968,11 +10020,11 @@ Voulez-vous sauvegarder les changements?</translation>
     </message>
     <message>
         <source>Workpiece</source>
-        <translation>Pièce en cours</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Forbid flipping</source>
-        <translation>Rotation interdite</translation>
+        <translation type="unfinished">Rotation interdite</translation>
     </message>
     <message>
         <source>Show a passmark both in the seam allowance and on the seam line.</source>
@@ -9992,19 +10044,19 @@ Voulez-vous sauvegarder les changements?</translation>
     </message>
     <message>
         <source>Hide main path</source>
-        <translation>Cacher le chemin principal</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Label font:</source>
-        <translation>Police de caractères d&apos;étiquette:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Seam allowance</source>
-        <translation>Marge de couture</translation>
+        <translation type="unfinished">Marge de couture</translation>
     </message>
     <message>
         <source>Default value:</source>
-        <translation>Valeur par défaut:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Label data/time format</source>
@@ -10012,15 +10064,15 @@ Voulez-vous sauvegarder les changements?</translation>
     </message>
     <message>
         <source>Date:</source>
-        <translation>Date :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit formats</source>
-        <translation>Editer les formats</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time:</source>
-        <translation>Heure :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Materials</source>
@@ -10048,11 +10100,11 @@ Voulez-vous sauvegarder les changements?</translation>
     </message>
     <message>
         <source>Curve approximation:</source>
-        <translation>Courbe approximative :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set default curve approximation scale</source>
-        <translation>Définir les réglages par défaut de l&apos;échelle approximative de la courbe</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bold line width</source>
@@ -10081,13 +10133,118 @@ This option will take an affect after restart.</source>
     </message>
     <message>
         <source>antialiasing</source>
-        <translation>antialiasing</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>scene render</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>Puzzle</name>
+    <message>
+        <source>Export options can be used with single input file only.</source>
+        <translation type="unfinished">Les options d&apos;export ne peuvent être utilisé qu&apos;avec un fichier d&apos;entrée simple.</translation>
+    </message>
+    <message>
+        <source>Valentina&apos;s manual layout editor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The manual layout file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesConfigurationPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished">Formulaire</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished">Langue</translation>
+    </message>
+    <message>
+        <source>GUI language:</source>
+        <translation type="unfinished">Langue de l&apos;interface:</translation>
+    </message>
+    <message>
+        <source>Toolbar</source>
+        <translation type="unfinished">Barre d&apos;outils</translation>
+    </message>
+    <message>
+        <source>The text appears under the icon (recommended for beginners).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Interface</source>
+        <translation type="unfinished">Thème de l&apos;interface</translation>
+    </message>
+    <message>
+        <source>Activate dark mode</source>
+        <translation type="unfinished">Mode nuit</translation>
+    </message>
+    <message>
+        <source>Don&apos;t use the native file dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dark mode</source>
+        <translation type="unfinished">Mode nuit</translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesPathPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished">Formulaire</translation>
+    </message>
+    <message>
+        <source>Paths that Valentina uses</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished">Type</translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished">Chemin</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Directory</source>
+        <translation type="unfinished">Ouvrir un dossier</translation>
+    </message>
+    <message>
+        <source>My Individual Measurements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Multisize Measurements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Patterns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Templates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>QApplication</name>
     <message>
@@ -10267,7 +10424,7 @@ This option will take an affect after restart.</source>
     </message>
     <message>
         <source>Wrong tag name &apos;%1&apos;.</source>
-        <translation>Mauvais nom de tag &apos;%1&apos;.</translation>
+        <translation type="unfinished">Mauvais nom de tag &apos;%1&apos;.</translation>
     </message>
     <message>
         <source>Can&apos;t convert toUInt parameter</source>
@@ -10279,11 +10436,11 @@ This option will take an affect after restart.</source>
     </message>
     <message>
         <source>Got empty parameter</source>
-        <translation>Paramètre vide</translation>
+        <translation type="unfinished">Paramètre vide</translation>
     </message>
     <message>
         <source>Can&apos;t convert toDouble parameter</source>
-        <translation>Conversion du paramètre impossible vers toDouble</translation>
+        <translation type="unfinished">Conversion du paramètre impossible vers toDouble</translation>
     </message>
     <message>
         <source>Got wrong parameter id. Need only id &gt; 0.</source>
@@ -10291,11 +10448,11 @@ This option will take an affect after restart.</source>
     </message>
     <message>
         <source>United detail</source>
-        <translation>Pièces de patron fusionnées</translation>
+        <translation type="unfinished">Pièces de patron fusionnées</translation>
     </message>
     <message>
         <source>Fabric</source>
-        <translation>Tissu</translation>
+        <translation type="unfinished">Tissu</translation>
     </message>
     <message>
         <source>Lining</source>
@@ -10367,7 +10524,7 @@ This option will take an affect after restart.</source>
     </message>
     <message>
         <source>Invalid result. Value is infinite or NaN. Please, check your calculations.</source>
-        <translation>Résultat invalide. La valeur est infinie ou NaN. Veuillez revoir vos calculs.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Value can&apos;t be 0</source>
@@ -10433,6 +10590,10 @@ This option will take an affect after restart.</source>
         <source>Can&apos;t convert toInt parameter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Piece name &apos;%1&apos; is not unique.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Could not find the segment start.</source>
         <translation type="unfinished"></translation>
@@ -10449,6 +10610,10 @@ This option will take an affect after restart.</source>
         <source>Error calculating segment for curve &apos;%1&apos;. %2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot prepare builtin passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
@@ -10465,46 +10630,46 @@ This option will take an affect after restart.</source>
         <source>Cannot prepare passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Piece name &apos;%1&apos; is not unique.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Cannot get tokens from formula &apos;%1&apos;. Formula error: %2.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>No data for the height dimension.</source>
-        <translation>Pas de valeur pour la mesure de la hauteur.</translation>
-    </message>
-    <message>
-        <source>No data for the size dimension.</source>
-        <translation>Pas de valeur pour la mesure de la taille.</translation>
-    </message>
-    <message>
-        <source>No data for the hip dimension.</source>
-        <translation>Pas de valeur pour la mesure de la hanche.</translation>
-    </message>
-    <message>
-        <source>No data for the waist dimension.</source>
-        <translation>Pas de valeur pour la mesure du tour de taille.</translation>
-    </message>
-    <message>
-        <source>Piece &apos;%1&apos;. Grainline is not valid.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>No data for the height dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the size dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the hip dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the waist dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Piece &apos;%1&apos;. Grainline is not valid.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Unplaced pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet 1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QSaveFile</name>
@@ -10728,7 +10893,7 @@ This option will take an affect after restart.</source>
     <name>RenameGroup</name>
     <message>
         <source>rename group</source>
-        <translation>renommer un groupe</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -10802,7 +10967,7 @@ This option will take an affect after restart.</source>
     <name>TMainWindow</name>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:18pt;&quot;&gt;Select New for creation measurement file.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:18pt;&quot;&gt;Sélectionnez Nouveau pour créer un fichier de mesures.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:18pt;&quot;&gt;Sélectionnez Nouveau pour créer un fichier de mesures.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <source>Name</source>
@@ -11098,7 +11263,7 @@ This option will take an affect after restart.</source>
     </message>
     <message>
         <source>untitled</source>
-        <translation type="vanished">sans titre</translation>
+        <translation>sans titre</translation>
     </message>
     <message>
         <source>&lt;Empty&gt;</source>
@@ -11335,27 +11500,27 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Locking file</source>
-        <translation>Verrouiller le fichier (lecture seule)</translation>
+        <translation type="vanished">Verrouiller le fichier (lecture seule)</translation>
     </message>
     <message>
         <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Le fichier est déjà ouvert dans une autre fenêtre. Ignorer pour continuer (déconseillé car pouvant causer une corruption de données).</translation>
+        <translation type="vanished">Le fichier est déjà ouvert dans une autre fenêtre. Ignorer pour continuer (déconseillé car pouvant causer une corruption de données).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Le fichier en lecture seule ne peut être créer par manque de permission. Ignorer pour continuer (déconseillé car pouvant causer une corruption de données).</translation>
+        <translation type="vanished">Le fichier en lecture seule ne peut être créer par manque de permission. Ignorer pour continuer (déconseillé car pouvant causer une corruption de données).</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Une erreur inconnue s&apos;est produite, par exemple une partition pleine empêche d&apos;écrire le fichier en lecture seule. Ignorer pour continuer (déconseillé car pouvant causer une corruption de données).</translation>
+        <translation type="vanished">Une erreur inconnue s&apos;est produite, par exemple une partition pleine empêche d&apos;écrire le fichier en lecture seule. Ignorer pour continuer (déconseillé car pouvant causer une corruption de données).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions.</source>
-        <translation>Le fichier en lecture seule ne peut être créer par manque de permission.</translation>
+        <translation type="vanished">Le fichier en lecture seule ne peut être créer par manque de permission.</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation>Une erreur inconnue s&apos;est produite, par exemple une partition pleine empêche d&apos;écrire le fichier en lecture seule.</translation>
+        <translation type="vanished">Une erreur inconnue s&apos;est produite, par exemple une partition pleine empêche d&apos;écrire le fichier en lecture seule.</translation>
     </message>
     <message>
         <source>Export to CSV</source>
@@ -11401,21 +11566,9 @@ Voulez-vous enregistrer les changements?</translation>
         <source>All files</source>
         <translation>Tous les fichiers</translation>
     </message>
-    <message>
-        <source>The measurements document has no write permissions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cannot set permissions for %1 to writable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not save the file.</source>
-        <translation>Impossible de sauvegarder le fichier.</translation>
-    </message>
     <message>
         <source>Could not save the file</source>
-        <translation>Le fichier n&apos;a pas pu etre enregistré</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read only</source>
@@ -11423,11 +11576,11 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Multisize measurements</source>
-        <translation>Mensurations multi-tailles</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid result. Value is infinite or NaN. Please, check your calculations.</source>
-        <translation>Résultat invalide. La valeur est infinie ou NaN. Veuillez revoir vos calculs.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Empty</source>
@@ -11451,7 +11604,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Save…</source>
-        <translation>Enregistrer…</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import from CSV</source>
@@ -11495,7 +11648,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Cannot save settings. Access denied.</source>
-        <translation>Les préférences ne peuvent pas être enregistrées. Accès refusé.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;File</source>
@@ -11503,7 +11656,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>&amp;Window</source>
-        <translation>&amp;Fenêtre</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Help</source>
@@ -11511,7 +11664,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>&amp;Measurements</source>
-        <translation>&amp;Mesures</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Open individual …</source>
@@ -11542,16 +11695,42 @@ Voulez-vous enregistrer les changements?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to change the premissions?</source>
-        <translation>Voulez-vous modifier les autorisations?</translation>
+        <source>Cannot read settings from a malformed .INI file.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cannot read settings from a malformed .INI file.</source>
-        <translation>Lecture des réglages impossible à cause d&apos;un fichier .INI invalide.</translation>
+        <source>Name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Nom</translation>
+    </message>
+    <message>
+        <source>Full name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Nom complet</translation>
+    </message>
+    <message>
+        <source>Calculated value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Valeur calculée</translation>
+    </message>
+    <message>
+        <source>Formula</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Valeur de départ</translation>
+    </message>
+    <message>
+        <source>Correction</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Units:</source>
-        <translation>Unités:</translation>
+        <translation type="unfinished">Unités:</translation>
     </message>
     <message>
         <source>Shift B</source>
@@ -11567,7 +11746,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Dimension:</source>
-        <translation>Dimension :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select one of the dimensions to later use the measurement value in piece label</source>
@@ -11587,7 +11766,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Use full circumference</source>
-        <translation>Utiliser une circonférence entière</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restrict second dimension</source>
@@ -11599,7 +11778,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Dimension labels</source>
-        <translation>Etiquettes de dimensions</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The table doesn&apos;t provide dimensions</source>
@@ -11631,7 +11810,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Shift (%1):</source>
-        <translation>Majuscule (%1):</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 shift</source>
@@ -11651,54 +11830,20 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Inches</source>
-        <translation>Pouces</translation>
+        <translation type="unfinished">Pouces</translation>
     </message>
     <message>
         <source>Centimeters</source>
-        <translation>Centimètres</translation>
+        <translation type="unfinished">Centimètres</translation>
     </message>
     <message>
         <source>Degrees</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Name</source>
-        <comment>measurement column</comment>
-        <translation>Nom</translation>
-    </message>
-    <message>
-        <source>Full name</source>
-        <comment>measurement column</comment>
-        <translation>Nom complet</translation>
-    </message>
-    <message>
-        <source>Calculated value</source>
-        <comment>measurement column</comment>
-        <translation>Valeur calculée</translation>
-    </message>
-    <message>
-        <source>Formula</source>
-        <comment>measurement column</comment>
-        <translation>Formule</translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <comment>measurement column</comment>
-        <translation>Valeur de départ</translation>
-    </message>
-    <message>
-        <source>Correction</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Restrict first dimension</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:18pt;&quot;&gt;Select New to create a measurement file.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>TabGrainline</name>
@@ -11724,11 +11869,11 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Show full calculation in message box&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Montrer le calcul complet dans une boite de dialogue &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Length:</source>
-        <translation>Longueur :</translation>
+        <translation type="unfinished">Longueur:</translation>
     </message>
     <message>
         <source>Center pin:</source>
@@ -11769,6 +11914,10 @@ Voulez-vous enregistrer les changements?</translation>
         <source>Labels</source>
         <translation>Etiquettes</translation>
     </message>
+    <message>
+        <source>Detail label visible</source>
+        <translation type="vanished">étiquette pièce de patron visible</translation>
+    </message>
     <message>
         <source>Width:</source>
         <translation>Largeur :</translation>
@@ -11787,11 +11936,11 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Show full calculation in message box&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Montrer le calcul complet dans une boite de dialogue &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height:</source>
-        <translation>Hauteur:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Center pin:</source>
@@ -11807,7 +11956,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Angle:</source>
-        <translation>Angle:</translation>
+        <translation type="unfinished">Angle:</translation>
     </message>
     <message>
         <source>Pattern label visible</source>
@@ -11843,7 +11992,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Orientation:</source>
-        <translation>Orientation :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotation:</source>
@@ -11879,19 +12028,19 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Pattern name:</source>
-        <translation>Nom du patron :</translation>
+        <translation type="unfinished">Nom du patron :</translation>
     </message>
     <message>
         <source>Pattern number:</source>
-        <translation>Numéro de patron :</translation>
+        <translation type="unfinished">Numéro de patron :</translation>
     </message>
     <message>
         <source>Company/Designer name:</source>
-        <translation>Nom de Société/Modéliste :</translation>
+        <translation type="unfinished">Nom de Société/Modéliste :</translation>
     </message>
     <message>
         <source>Customer name:</source>
-        <translation>Nom du client :</translation>
+        <translation type="unfinished">Nom du client :</translation>
     </message>
     <message>
         <source>Date format:</source>
@@ -11907,7 +12056,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>yyyy-MM-dd</source>
-        <translation>yyyy-MM-dd</translation>
+        <translation type="unfinished">yyyy-MM-dd</translation>
     </message>
     <message>
         <source>Customer email:</source>
@@ -11915,7 +12064,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Materials</source>
-        <translation>Matières</translation>
+        <translation type="unfinished">Matières</translation>
     </message>
     <message>
         <source>Pattern materials:</source>
@@ -11927,7 +12076,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Manage</source>
-        <translation>Gérer</translation>
+        <translation type="unfinished">Gérer</translation>
     </message>
     <message>
         <source>Piece label visible</source>
@@ -11966,11 +12115,11 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Straightforward</source>
-        <translation>Tout droit</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bisector</source>
-        <translation>Bissectrice</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Marks</source>
@@ -11982,7 +12131,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Intersection</source>
-        <translation>Intersection</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the second passmark on seam line</source>
@@ -12014,11 +12163,11 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Intersection 2 (only left)</source>
-        <translation>Intersection 2 (gauche seulement)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Intersection 2 (only right)</source>
-        <translation>Intersection 2 (droite seulement)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Acute angle that looks outside of piece</source>
@@ -12085,7 +12234,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Forbid flipping</source>
-        <translation>Rotation interdite</translation>
+        <translation type="unfinished">Rotation interdite</translation>
     </message>
     <message>
         <source>Ready!</source>
@@ -12093,7 +12242,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Seam allowance</source>
-        <translation>Marge de couture</translation>
+        <translation type="unfinished">Marge de couture</translation>
     </message>
     <message>
         <source>Width:</source>
@@ -12113,7 +12262,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Show full calculation in message box&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Montrer le calcul complet dans une boite de dialogue &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nodes</source>
@@ -12141,7 +12290,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Angle:</source>
-        <translation>Angle:</translation>
+        <translation type="unfinished">Angle:</translation>
     </message>
     <message>
         <source>Start point:</source>
@@ -12173,7 +12322,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Hide main path</source>
-        <translation>Cacher le chemin principal</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of detail:</source>
@@ -12197,19 +12346,19 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Move on top</source>
-        <translation>Déplacer au premier plan</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move up</source>
-        <translation>Déplacer vers le haut</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move down</source>
-        <translation>Déplacer vers le bas</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move on bottom</source>
-        <translation>Déplacer vers l&apos;arrière plan</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority:</source>
@@ -12229,6 +12378,18 @@ Voulez-vous enregistrer les changements?</translation>
         <comment>seam allowance</comment>
         <translation>Personnalisé</translation>
     </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Universally Unique IDentifier of piece. Used to identifier piece while updating manual layout. Left empty to generate new value.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TabPlaceLabels</name>
@@ -12390,7 +12551,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Measurements editing</source>
-        <translation>Édition des mensurations</translation>
+        <translation>Révision des mensurations</translation>
     </message>
     <message>
         <source>Reset warnings</source>
@@ -12404,6 +12565,18 @@ Voulez-vous enregistrer les changements?</translation>
         <source>The text appears under the icon (recommended for beginners).</source>
         <translation>Un libellé accompagne les icônes (recommandé pour les débutants).</translation>
     </message>
+    <message>
+        <source>Default height and size</source>
+        <translation type="vanished">Taille et stature par défaut</translation>
+    </message>
+    <message>
+        <source>Default height:</source>
+        <translation type="vanished">Stature par défaut:</translation>
+    </message>
+    <message>
+        <source>Default size:</source>
+        <translation type="vanished">Taille par défaut:</translation>
+    </message>
     <message>
         <source>With OS options</source>
         <translation>Celui du système</translation>
@@ -12437,7 +12610,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Path</source>
-        <translation>Chemin</translation>
+        <translation type="unfinished">Chemin</translation>
     </message>
     <message>
         <source>Default</source>
@@ -12449,23 +12622,27 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Open Directory</source>
-        <translation>Ouvrir Dossier</translation>
+        <translation type="unfinished">Ouvrir un dossier</translation>
     </message>
     <message>
         <source>My Individual Measurements</source>
-        <translation>Mes Mensurations</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>My Multisize Measurements</source>
-        <translation>Mes Mensurations Multi-tailles</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>My Templates</source>
-        <translation>Mes Modèles</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>My Patterns</source>
-        <translation>Mes patrons</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -12518,29 +12695,25 @@ Voulez-vous enregistrer les changements?</translation>
         <source>Base value invalid</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Size</source>
-        <translation>Taille</translation>
-    </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Hauteur</translation>
+        <translation type="unfinished">Hauteur</translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Taille</translation>
+        <translation type="unfinished">Taille</translation>
     </message>
     <message>
         <source>Waist</source>
         <comment>dimension</comment>
-        <translation>Taille</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hip</source>
         <comment>dimension</comment>
-        <translation>Hanche</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chest full circumference</source>
@@ -12552,6 +12725,10 @@ Voulez-vous enregistrer les changements?</translation>
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished">Taille</translation>
+    </message>
     <message>
         <source>Chest circumference</source>
         <comment>dimension</comment>
@@ -12738,7 +12915,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Comma-Separated Values</source>
-        <translation>Valeur de signe de séparation</translation>
+        <translation type="unfinished">Valeur de signe de séparation</translation>
     </message>
     <message>
         <source>values</source>
@@ -12746,7 +12923,51 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Export to CSV</source>
-        <translation>Exporter vers CVS</translation>
+        <translation type="unfinished">Exporter vers CVS</translation>
+    </message>
+    <message>
+        <source>The measurements document has no write permissions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to change the premissions?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot set permissions for %1 to writable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Locking file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished">Le fichier est déjà ouvert dans une autre fenêtre. Ignorer pour continuer (déconseillé car pouvant causer une corruption de données).</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished">Le fichier en lecture seule ne peut être créer par manque de permission. Ignorer pour continuer (déconseillé car pouvant causer une corruption de données).</translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This file already opened in another window.</source>
+        <translation type="unfinished">Ce fichier est déjà ouvert dans une autre fenêtre.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions.</source>
+        <translation type="unfinished">Le fichier en lecture seule ne peut être créer par manque de permission.</translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
+        <translation type="unfinished">Une erreur inconnue s&apos;est produite, par exemple une partition pleine empêche d&apos;écrire le fichier en lecture seule.</translation>
     </message>
 </context>
 <context>
@@ -12760,11 +12981,11 @@ Voulez-vous enregistrer les changements?</translation>
     <name>VAbstractOperation</name>
     <message>
         <source>Label</source>
-        <translation>Étiquette</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Length</source>
-        <translation>Longueur</translation>
+        <translation type="unfinished">Longueur</translation>
     </message>
     <message>
         <source>operation options</source>
@@ -12806,7 +13027,7 @@ Voulez-vous enregistrer les changements?</translation>
     <name>VAbstractPiece</name>
     <message>
         <source>Piece &apos;%1&apos;. Not enough points to build seam allowance.</source>
-        <translation>Piece &apos;%1&apos;. Il n&apos;y pas assez de points pour établir la marge de couture.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -12820,11 +13041,11 @@ Voulez-vous enregistrer les changements?</translation>
     <name>VAbstractSpline</name>
     <message>
         <source>Length</source>
-        <translation>Longueur</translation>
+        <translation type="unfinished">Longueur</translation>
     </message>
     <message>
         <source>Label</source>
-        <translation>Étiquette</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -12867,7 +13088,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>light salmon</source>
-        <translation>saumon clair</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>orange</source>
@@ -12875,27 +13096,27 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>deep pink</source>
-        <translation>rose foncé</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>violet</source>
-        <translation>violet</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>dark violet</source>
-        <translation>violet foncé</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>medium sea green</source>
-        <translation>vert de mer moyen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>lime</source>
-        <translation>citron</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>deep sky blue</source>
-        <translation>bleu ciel</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>corn flower blue</source>
@@ -12946,7 +13167,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Invalid notch.</source>
-        <translation>Cran invalide.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Formula warning: %1. Program will be terminated.</source>
@@ -12972,7 +13193,7 @@ Voulez-vous enregistrer les changements?</translation>
     <name>VComboBoxDelegate</name>
     <message>
         <source>Select material</source>
-        <translation>Sélectionner le tissus</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -13279,11 +13500,11 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Disable high dpi scaling. Call this option if has problem with scaling (by default scaling enabled). Alternatively you can use the %1 environment variable.</source>
-        <translation>Désactiver la mise à l&apos;échelle haute précision. Choisissez cette option si vous avez un problème avec la mise à l&apos;échelle (activée par défaut). Sinon vous pouvez aussi utiliser la variable d’environnement %1.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export dxf in binary form.</source>
-        <translation>Export du fichier dxf en binaire.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text as paths.</source>
@@ -13295,11 +13516,11 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Export only details that match a piece name regex.</source>
-        <translation>Exporter seulement les éléments qui correspondent à une expression régulière.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name regex</source>
-        <translation>Expression régulière du nom</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export to csv with header. By default disabled.</source>
@@ -13311,7 +13532,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Codec name</source>
-        <translation>Nom du code</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Specify csv separator character. Default value is &apos;%1&apos;. Valid characters:</source>
@@ -13327,7 +13548,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Path to csv file</source>
-        <translation>Chemin d&apos;accès du fichier csv</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number corresponding to layout page template (default = 0, export mode):</source>
@@ -13347,7 +13568,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>The left margin</source>
-        <translation>La marge de gauche</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tiled page right margin in current units like 3.0 (export mode). If not set will be used default value 1 cm.</source>
@@ -13355,7 +13576,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>The right margin</source>
-        <translation>La marge de droite</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tiled page top margin in current units like 3.0 (export mode). If not set will be used value default value 1 cm.</source>
@@ -13363,7 +13584,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>The top margin</source>
-        <translation>La marge du haut</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tiled page bottom margin in current units like 3.0 (export mode). If not set will be used value default value 1 cm.</source>
@@ -13371,7 +13592,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>The bottom margin</source>
-        <translation>La marge du bas</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set tiled page orienatation to landscape (export mode). Default value if not set portrait.</source>
@@ -13407,7 +13628,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>User material</source>
-        <translation>Tissu de l&apos;utilisateur</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make all parsing warnings into errors. Have effect only in console mode. Use to force Valentina to immediately terminate if a pattern contains a parsing warning.</source>
@@ -13415,11 +13636,11 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Invalid user material &apos;%1&apos;. Separator is missing.</source>
-        <translation>Le tissu &apos;%1&apos; de l&apos;utilisateur est invalide : séparateur manquant.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid user material &apos;%1&apos;. Wrong material number.</source>
-        <translation>Le tissu &apos;%1&apos; de l&apos;utilisateur est invalide : numéro de tissu erroné.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch page template orientation to landscape (export mode). This option has effect only for one of predefined page templates.</source>
@@ -13427,7 +13648,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>The page height</source>
-        <translation>La hauteur de page</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Order detail to follow grainline direction (export mode).</source>
@@ -13443,11 +13664,11 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Coefficient</source>
-        <translation>Coefficient</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time must be in range from 1 minute to 60 minutes.</source>
-        <translation>Le temps indiqué doit être compris entre 1 et 60 minutes.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Follow manual priority over priority by square (export mode).</source>
@@ -13463,7 +13684,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Coefficient must be in range from 0 to 100.</source>
-        <translation>Le coefficient doit être compris entre 0 et 100.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto crop unused width (export mode).</source>
@@ -13525,6 +13746,34 @@ Voulez-vous enregistrer les changements?</translation>
         <source>The dimension C base</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>The filename of exported layout file. Use it to enable console export mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The filename of layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pattern pieces form the raw layout data file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The raw layout data file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to output format (default = 0, export mode): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to tiled pdf page template (default = 0, export mode with tiled pdf format): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run the program in a test mode. The program in this mode loads a single layout file and silently quit without showing the main window. The key have priority before key &apos;%1&apos;.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VCommonSettings</name>
@@ -13552,6 +13801,10 @@ Voulez-vous enregistrer les changements?</translation>
         <source>patterns</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VContainer</name>
@@ -13798,25 +14051,29 @@ Voulez-vous enregistrer les changements?</translation>
 </context>
 <context>
     <name>VLayoutExporter</name>
+    <message>
+        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot set printer page size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot set printer margins</source>
-        <translation>Impossible de définir les marges d&apos;impression</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t open file &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Creating file &apos;%1&apos; failed! %2</source>
-        <translation>Création du fichier &apos;%1&apos; A échoué ! %2</translation>
+        <source>Export raw layout data failed. %1.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
-        <translation type="unfinished"></translation>
+        <source>Creating file &apos;%1&apos; failed! %2</source>
+        <translation type="unfinished">Création du fichier &apos;%1&apos; A échoué ! %2</translation>
     </message>
     <message>
         <source>Can&apos;t create an flat dxf file.</source>
@@ -13850,23 +14107,23 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>Aucun</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height</source>
-        <translation>Hauteur</translation>
+        <translation type="unfinished">Hauteur</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Taille</translation>
+        <translation type="unfinished">Taille</translation>
     </message>
     <message>
         <source>Hip</source>
-        <translation>Hanche</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Waist</source>
-        <translation>Taille</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -13885,7 +14142,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Exclude</source>
-        <translation>Exclure</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
@@ -13909,19 +14166,19 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>by first edge symmetry</source>
-        <translation>par symétrie du premier côté</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>by second edge symmetry</source>
-        <translation>par symétrie du second côté</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>by first edge right angle</source>
-        <translation>par l&apos;angle droit du premier côté</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>by second edge right angle</source>
-        <translation>par l&apos;angle droit du second côté</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passmark</source>
@@ -13937,15 +14194,15 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Straightforward</source>
-        <translation>Tout droit</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bisector</source>
-        <translation>Bissectrice</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Intersection</source>
-        <translation>Intersection</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Intersection (only left)</source>
@@ -13961,11 +14218,11 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Intersection 2 (only left)</source>
-        <translation>Intersection 2 (gauche seulement)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Intersection 2 (only right)</source>
-        <translation>Intersection 2 (droite seulement)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passmark mark</source>
@@ -14004,6 +14261,114 @@ Voulez-vous enregistrer les changements?</translation>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>VPApplication</name>
+    <message>
+        <source>Error parsing file. Program will be terminated.</source>
+        <translation type="unfinished">Erreur d&apos;interprétation du fichier. Fin du programme.</translation>
+    </message>
+    <message>
+        <source>Error bad id. Program will be terminated.</source>
+        <translation type="unfinished">Erreur d&apos;identifiant. Fin du programme.</translation>
+    </message>
+    <message>
+        <source>Error can&apos;t convert value. Program will be terminated.</source>
+        <translation type="unfinished">Erreur : valeur non convertissable. Fin du programme.</translation>
+    </message>
+    <message>
+        <source>Error empty parameter. Program will be terminated.</source>
+        <translation type="unfinished">Erreur : paramètre vide. Fin du programme.</translation>
+    </message>
+    <message>
+        <source>Error wrong id. Program will be terminated.</source>
+        <translation type="unfinished">Erreur : mauvais identifiant. Fin du programme.</translation>
+    </message>
+    <message>
+        <source>Something&apos;s wrong!!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exception thrown: %1. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t begin to listen for incoming connections on name &apos;%1&apos;</source>
+        <translation type="unfinished">Ne peut être à l&apos;écoute des connexions entrantes de %1</translation>
+    </message>
+    <message>
+        <source>Export mode doesn&apos;t support openning several files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import raw layout data does not support openning several layout files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, provide one input file.</source>
+        <translation type="unfinished">Merci de choisir un fichier.</translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrousel</name>
+    <message>
+        <source>Pieces of </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrouselPieceList</name>
+    <message>
+        <source>Move to Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPDialogAbout</name>
+    <message>
+        <source>About Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Puzzle version</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Build revision:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This program is part of Valentina project.</source>
+        <translation type="unfinished">Ce programme fait partie du projet Valentina.</translation>
+    </message>
+    <message>
+        <source>Check For Updates</source>
+        <translation type="unfinished">Vérifier les Mises à Jour</translation>
+    </message>
+    <message>
+        <source>Cannot open your default browser</source>
+        <translation type="unfinished">Impossible d&apos;ouvrir votre navigateur par défaut</translation>
+    </message>
+    <message>
+        <source>Build revision: %1</source>
+        <translation type="unfinished">N° de version : %1</translation>
+    </message>
+    <message>
+        <source>Built on %1 at %2</source>
+        <translation type="unfinished">Compilé le %1 à %2</translation>
+    </message>
+    <message>
+        <source>Web site : %1</source>
+        <translation type="unfinished">Site web : %1</translation>
+    </message>
+</context>
 <context>
     <name>VPE::VBoolProperty</name>
     <message>
@@ -14026,6 +14391,573 @@ Voulez-vous enregistrer les changements?</translation>
         <translation>Ouvrir fichier</translation>
     </message>
 </context>
+<context>
+    <name>VPGraphicsPiece</name>
+    <message>
+        <source>Move to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPLayoutFileReader</name>
+    <message>
+        <source>Piece List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Got empty attribute &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPMainWindow</name>
+    <message>
+        <source>Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;Fichier</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished">Aid&amp;e</translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished">Menu</translation>
+    </message>
+    <message>
+        <source>Piece Carrousel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Infos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DummyName</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UUID:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{7b2ce4ae-96f5-4905-bb34-405cb40ca208}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Geometry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mirror piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotation</source>
+        <translation type="unfinished">Rotation</translation>
+    </message>
+    <message>
+        <source>Angle:</source>
+        <translation type="unfinished">Angle:</translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° anti-clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Placement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Y:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No piece selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple pieces selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Width</source>
+        <translation type="unfinished">Largeur</translation>
+    </message>
+    <message>
+        <source>Length</source>
+        <translation type="unfinished">Longueur</translation>
+    </message>
+    <message>
+        <source>Orientation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove unused length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right:</source>
+        <translation type="unfinished">Droite:</translation>
+    </message>
+    <message>
+        <source>Top:</source>
+        <translation type="unfinished">Haut:</translation>
+    </message>
+    <message>
+        <source>Left:</source>
+        <translation type="unfinished">Gauche:</translation>
+    </message>
+    <message>
+        <source>Bottom:</source>
+        <translation type="unfinished">Bas:</translation>
+    </message>
+    <message>
+        <source>Placement Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Row height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Follow grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vertical grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Horizontal grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pieces gap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sticky edges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation type="unfinished">Exporter</translation>
+    </message>
+    <message>
+        <source>Export Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiles properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiled Pdf Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Tiles on sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export Tiled Pdf</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation type="unfinished">Plan de coupe</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Nom</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Description du patron</translation>
+    </message>
+    <message>
+        <source>Unit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning superposition of pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning pieces out of bound</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation type="unfinished">&amp;Ouvrir</translation>
+    </message>
+    <message>
+        <source>Ctrl+O</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Sauver</translation>
+    </message>
+    <message>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save &amp;As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Import Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation type="unfinished">&amp;Quitter</translation>
+    </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation type="unfinished">&amp;Nouveau</translation>
+    </message>
+    <message>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation type="unfinished">À propos de &amp;Qt</translation>
+    </message>
+    <message>
+        <source>About &amp;Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom in</source>
+        <translation type="unfinished">Zoom avant</translation>
+    </message>
+    <message>
+        <source>Zoom out</source>
+        <translation type="unfinished">Zoom arrière</translation>
+    </message>
+    <message>
+        <source>Zoom 1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom fit best</source>
+        <translation type="unfinished">Zoom optimal</translation>
+    </message>
+    <message>
+        <source>Zoom sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished">Préférences</translation>
+    </message>
+    <message>
+        <source>File &apos;%1&apos; doesn&apos;t exist!</source>
+        <translation type="unfinished">Le fichier &apos;%1&apos; n&apos;existe pas!</translation>
+    </message>
+    <message>
+        <source>File error.</source>
+        <translation type="unfinished">Erreur de fichier.</translation>
+    </message>
+    <message>
+        <source>Unable to read a layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fail to create layout.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not extract data from file &apos;%1&apos;. %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Centimeters</source>
+        <translation type="unfinished">Centimètres</translation>
+    </message>
+    <message>
+        <source>Millimiters</source>
+        <translation type="unfinished">Millimètres</translation>
+    </message>
+    <message>
+        <source>Inches</source>
+        <translation type="unfinished">Pouces</translation>
+    </message>
+    <message>
+        <source>Scale:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>untitled %1.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>untitled.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read only</source>
+        <translation type="unfinished">Lecture seule</translation>
+    </message>
+    <message>
+        <source>Cannot read settings from a malformed .INI file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save settings. Access denied.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to open file, is it writable?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New Window</source>
+        <translation type="unfinished">&amp;Nouvelle Fenêtre</translation>
+    </message>
+    <message>
+        <source>Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open file</source>
+        <translation type="unfinished">Ouvrir fichier</translation>
+    </message>
+    <message>
+        <source>Could not save the file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save as</source>
+        <translation type="unfinished">Enregistrer sous</translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window.</source>
+        <translation type="unfinished">Impossible à verrouiller. Le fichier est déjà ouvert dans une autre fenêtre.</translation>
+    </message>
+    <message>
+        <source>Could not save file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window. Expect collissions when run 2 copies of the program.</source>
+        <translation type="unfinished">Impossible à verrouiller. Le fichier est déjà ouvert dans une autre fenêtre. cela arrive quand 2 copie du programme, tournent.</translation>
+    </message>
+    <message>
+        <source>Raw Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About Qt</source>
+        <translation type="unfinished">À propos de Qt</translation>
+    </message>
+    <message>
+        <source>PDF Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SVG Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPSheet</name>
+    <message>
+        <source>Letter</source>
+        <translation type="unfinished">Lettre</translation>
+    </message>
+    <message>
+        <source>Legal</source>
+        <translation type="unfinished">Légal</translation>
+    </message>
+    <message>
+        <source>Tabloid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 24in</source>
+        <translation type="unfinished">Roulleau 24 pouces</translation>
+    </message>
+    <message>
+        <source>Roll 30in</source>
+        <translation type="unfinished">Rouleau de 30po</translation>
+    </message>
+    <message>
+        <source>Roll 36in</source>
+        <translation type="unfinished">Rouleau de 36po</translation>
+    </message>
+    <message>
+        <source>Roll 42in</source>
+        <translation type="unfinished">Rouleau de 42po</translation>
+    </message>
+    <message>
+        <source>Roll 44in</source>
+        <translation type="unfinished">Rouleau de 44po</translation>
+    </message>
+    <message>
+        <source>Roll 48in</source>
+        <translation type="unfinished">Rouleau de 44po {48i?}</translation>
+    </message>
+    <message>
+        <source>Roll 62in</source>
+        <translation type="unfinished">Rouleau de 44po {62i?}</translation>
+    </message>
+    <message>
+        <source>Roll 72in</source>
+        <translation type="unfinished">Rouleau de 44po {72i?}</translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation type="unfinished">Personnalisé</translation>
+    </message>
+</context>
+<context>
+    <name>VPTileFactory</name>
+    <message>
+        <source>Grid ( %1 , %2 )</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page %1 of %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VPattern</name>
     <message>
@@ -14371,23 +15303,23 @@ Voulez-vous enregistrer les changements?</translation>
     <name>VPrintLayout</name>
     <message>
         <source>For printing multipages document all sheet should have the same size.</source>
-        <translation>Pour imprimer un document multipages, toutes les feuilles doivent faire la même taille.</translation>
+        <translation type="unfinished">Pour imprimer un document multipages, toutes les feuilles doivent faire la même taille.</translation>
     </message>
     <message>
         <source>For previewing multipage document all sheet should have the same size.</source>
-        <translation>Pour avoir un aperçu d&apos;un document multipages, toutes les feuilles doivent faire la même taille.</translation>
+        <translation type="unfinished">Pour avoir un aperçu d&apos;un document multipages, toutes les feuilles doivent faire la même taille.</translation>
     </message>
     <message>
         <source>Pages will be cropped because they do not fit printer paper size.</source>
-        <translation>Les pages vont être tronquées du fait de la taille du papier de l&apos;imprimante.</translation>
+        <translation type="unfinished">Les pages vont être tronquées du fait de la taille du papier de l&apos;imprimante.</translation>
     </message>
     <message>
         <source>Print error</source>
-        <translation>Erreur d&apos;impression</translation>
+        <translation type="unfinished">Erreur d&apos;impression</translation>
     </message>
     <message>
         <source>Cannot proceed because there are no available printers in your system.</source>
-        <translation>Impossible de continuer car il n&apos;y a aucune imprimantes disponibles.</translation>
+        <translation type="unfinished">Impossible de continuer car il n&apos;y a aucune imprimantes disponibles.</translation>
     </message>
     <message>
         <source>Failed to open file, is it writable?</source>
@@ -14399,7 +15331,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Cannot set printer margins</source>
-        <translation>Impossible de définir les marges d&apos;impression</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot set custom printer page size</source>
@@ -14427,17 +15359,22 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>The layout is stale.</source>
-        <translation>Le plan de coupe est figée.</translation>
+        <translation type="unfinished">Le plan de coupe est figée.</translation>
     </message>
     <message>
         <source>The layout was not updated since last pattern modification. Do you want to continue?</source>
-        <translation>Le plan de coupe n&apos;a pas été mise à jour depuis la dernière modification du patron. Voulez-vous continuer ?</translation>
+        <translation type="unfinished">Le plan de coupe n&apos;a pas été mise à jour depuis la dernière modification du patron. Voulez-vous continuer ?</translation>
     </message>
 </context>
 <context>
-    <name>VSettings</name>
+    <name>VRawLayout</name>
     <message>
-        <source>layouts</source>
+        <source>VRawLayout::ReadFile() failed. Raw layout format prefix mismatch error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VRawLayout::ReadFile() failed.
+Raw layout format compatibility error: actualFileVersion = %1 and fileVersion = %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -14494,7 +15431,7 @@ Voulez-vous enregistrer les changements?</translation>
     <name>VToolAlongLine</name>
     <message>
         <source>Length</source>
-        <translation>Longueur</translation>
+        <translation type="unfinished">Longueur</translation>
     </message>
     <message>
         <source>Angle</source>
@@ -14502,14 +15439,14 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Label</source>
-        <translation>Étiquette</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VToolArc</name>
     <message>
         <source>Length</source>
-        <translation>Longueur</translation>
+        <translation type="unfinished">Longueur</translation>
     </message>
     <message>
         <source>Radius</source>
@@ -14525,14 +15462,14 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Label</source>
-        <translation>Étiquette</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VToolArcWithLength</name>
     <message>
         <source>Length</source>
-        <translation>Longueur</translation>
+        <translation type="unfinished">Longueur</translation>
     </message>
     <message>
         <source>Radius</source>
@@ -14548,14 +15485,14 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Label</source>
-        <translation>Étiquette</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VToolBasePoint</name>
     <message>
         <source>Label</source>
-        <translation>Étiquette</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -14566,15 +15503,15 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Length</source>
-        <translation>Longueur</translation>
+        <translation type="unfinished">Longueur</translation>
     </message>
     <message>
         <source>Angle</source>
-        <translation>Angle</translation>
+        <translation type="unfinished">Angle</translation>
     </message>
     <message>
         <source>Label</source>
-        <translation>Étiquette</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Segment 1</source>
@@ -14689,14 +15626,14 @@ Voulez-vous enregistrer les changements?</translation>
     <name>VToolDoublePoint</name>
     <message>
         <source>Label</source>
-        <translation>Étiquette</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VToolEllipticalArc</name>
     <message>
         <source>Length</source>
-        <translation>Longueur</translation>
+        <translation type="unfinished">Longueur</translation>
     </message>
     <message>
         <source>Radius</source>
@@ -14712,7 +15649,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Label</source>
-        <translation>Étiquette</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotation</source>
@@ -14727,7 +15664,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Flipping by axis</source>
-        <translation>Symétrie axiale</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -14749,7 +15686,7 @@ Voulez-vous enregistrer les changements?</translation>
     <name>VToolHeight</name>
     <message>
         <source>Length</source>
-        <translation>Longueur</translation>
+        <translation type="unfinished">Longueur</translation>
     </message>
     <message>
         <source>Angle</source>
@@ -14757,14 +15694,14 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Label</source>
-        <translation>Étiquette</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VToolLine</name>
     <message>
         <source>Length</source>
-        <translation>Longueur</translation>
+        <translation type="unfinished">Longueur</translation>
     </message>
     <message>
         <source>Angle</source>
@@ -14775,7 +15712,7 @@ Voulez-vous enregistrer les changements?</translation>
     <name>VToolLineIntersect</name>
     <message>
         <source>Label</source>
-        <translation>Étiquette</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error calculating point &apos;%1&apos;. Lines (%2;%3) and (%4;%5) have no point of intersection</source>
@@ -14786,7 +15723,7 @@ Voulez-vous enregistrer les changements?</translation>
     <name>VToolLineIntersectAxis</name>
     <message>
         <source>Length</source>
-        <translation>Longueur</translation>
+        <translation type="unfinished">Longueur</translation>
     </message>
     <message>
         <source>Angle</source>
@@ -14794,7 +15731,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Label</source>
-        <translation>Étiquette</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error calculating point &apos;%1&apos;. Line (%2;%3) doesn&apos;t have intersection with axis through point &apos;%4&apos; and angle %5°</source>
@@ -14805,7 +15742,7 @@ Voulez-vous enregistrer les changements?</translation>
     <name>VToolLinePoint</name>
     <message>
         <source>Length</source>
-        <translation>Longueur</translation>
+        <translation type="unfinished">Longueur</translation>
     </message>
     <message>
         <source>Angle</source>
@@ -14813,7 +15750,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Label</source>
-        <translation>Étiquette</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -14824,7 +15761,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Length</source>
-        <translation>Longueur</translation>
+        <translation type="unfinished">Longueur</translation>
     </message>
     <message>
         <source>Center point</source>
@@ -15119,7 +16056,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Point label:</source>
-        <translation>Nom du point :</translation>
+        <translation type="unfinished">Nom du point:</translation>
     </message>
     <message>
         <source>Position:</source>
@@ -15135,35 +16072,35 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Line color:</source>
-        <translation>Couleur de la ligne :</translation>
+        <translation type="unfinished">Couleur de la ligne:</translation>
     </message>
     <message>
         <source>Length:</source>
-        <translation>Longueur :</translation>
+        <translation type="unfinished">Longueur:</translation>
     </message>
     <message>
         <source>Angle:</source>
-        <translation>Angle:</translation>
+        <translation type="unfinished">Angle:</translation>
     </message>
     <message>
         <source>First point:</source>
-        <translation>Premier point :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Second point:</source>
-        <translation>Deuxième point :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Center point:</source>
-        <translation>Point central :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Radius:</source>
-        <translation>Rayon :</translation>
+        <translation type="unfinished">Rayon:</translation>
     </message>
     <message>
         <source>First angle:</source>
-        <translation>Premier angle :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Second angle:</source>
@@ -15171,11 +16108,11 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Color:</source>
-        <translation>Couleur :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Third point:</source>
-        <translation>Troisième point :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Point 1 label:</source>
@@ -15359,7 +16296,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Fourth point:</source>
-        <translation>Quatrième point :</translation>
+        <translation type="unfinished">Quatrième point:</translation>
     </message>
     <message>
         <source>Pen style:</source>
@@ -15371,23 +16308,23 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Rotation origin point:</source>
-        <translation>Point d&apos;origine de la rotation:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
-        <translation>Notes:</translation>
+        <translation type="unfinished">Notes:</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Alias :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias1:</source>
-        <translation>Alias1:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias2:</source>
-        <translation>Alias2 :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Point of intersection circle and segment</source>
@@ -15412,7 +16349,7 @@ Voulez-vous enregistrer les changements?</translation>
     <name>VToolPointOfContact</name>
     <message>
         <source>Length</source>
-        <translation>Longueur</translation>
+        <translation type="unfinished">Longueur</translation>
     </message>
     <message>
         <source>Angle</source>
@@ -15420,7 +16357,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Label</source>
-        <translation>Étiquette</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error calculating point &apos;%1&apos;. Circle with center &apos;%2&apos; and radius &apos;%3&apos; doesn&apos;t have intersection with line (%4;%5)</source>
@@ -15449,7 +16386,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Label</source>
-        <translation>Étiquette</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Curve 1 segment 1</source>
@@ -15566,7 +16503,7 @@ Voulez-vous enregistrer les changements?</translation>
     <name>VToolShoulderPoint</name>
     <message>
         <source>Length</source>
-        <translation>Longueur</translation>
+        <translation type="unfinished">Longueur</translation>
     </message>
     <message>
         <source>Angle</source>
@@ -15574,7 +16511,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Label</source>
-        <translation>Étiquette</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -17074,6 +18011,13 @@ Voulez-vous enregistrer les changements?</translation>
         <translation type="vanished">Erreur de restauration du fichier de sauvegarde: %1.</translation>
     </message>
 </context>
+<context>
+    <name>VValentinaSettings</name>
+    <message>
+        <source>layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VWidgetDetails</name>
     <message>
@@ -17157,11 +18101,11 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Tags:</source>
-        <translation>Marqueurs:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Separate each tag with comma.</source>
-        <translation>Séparez chaque balise par une virgule.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter by tags</source>
@@ -17288,7 +18232,7 @@ Voulez-vous enregistrer les changements?</translation>
     <name>WatermarkWindow</name>
     <message>
         <source>Watermark</source>
-        <translation>Filigrane</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity:</source>
@@ -17337,7 +18281,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Browse…</source>
-        <translation>Parcourir…</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gray color</source>
@@ -17357,7 +18301,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Save &amp;As…</source>
-        <translation>Enregistrer sous…</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E&amp;xit</source>
@@ -17409,7 +18353,7 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>The document has no write permissions.</source>
-        <translation>Le document n&apos;est pas autorisé en écritures.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot set permissions for %1 to writable.</source>
@@ -17417,11 +18361,11 @@ Voulez-vous enregistrer les changements?</translation>
     </message>
     <message>
         <source>Could not save the file.</source>
-        <translation>Impossible de sauvegarder le fichier.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not save the file</source>
-        <translation>Le fichier n&apos;a pas pu etre enregistré</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open file</source>
@@ -17446,7 +18390,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>untitled.vwm</source>
-        <translation>sansTitre.vwm</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm format rewriting</source>
@@ -17478,14 +18422,14 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Do you want to change the premissions?</source>
-        <translation>Voulez-vous modifier les autorisations?</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>mNoisyHandler</name>
     <message>
         <source>DEBUG:</source>
-        <translation>DEBUGAGE:</translation>
+        <translation>DEBUGAGE :</translation>
     </message>
     <message>
         <source>WARNING:</source>
@@ -17540,7 +18484,7 @@ Do you want to save your changes?</source>
     <name>vNoisyHandler</name>
     <message>
         <source>DEBUG:</source>
-        <translation>DEBUGAGE:</translation>
+        <translation>DEBUGAGE :</translation>
     </message>
     <message>
         <source>WARNING:</source>
diff --git a/share/translations/valentina_he_IL.ts b/share/translations/valentina_he_IL.ts
index 90ac3a854..56c864dcd 100644
--- a/share/translations/valentina_he_IL.ts
+++ b/share/translations/valentina_he_IL.ts
@@ -391,11 +391,11 @@
         <translation type="unfinished">כלי</translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alias:</source>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -486,11 +486,11 @@
         <translation type="unfinished">כלי</translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alias:</source>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -660,11 +660,11 @@
         <translation type="unfinished">כלי</translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alias:</source>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -715,11 +715,11 @@
         <translation type="unfinished">כלי</translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alias:</source>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -876,10 +876,6 @@
         <source>Tool</source>
         <translation type="unfinished">כלי</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Alias1:</source>
         <translation type="unfinished"></translation>
@@ -888,6 +884,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCutSpline</name>
@@ -955,10 +955,6 @@
         <source>Tool</source>
         <translation type="unfinished">כלי</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Alias1:</source>
         <translation type="unfinished"></translation>
@@ -967,6 +963,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCutSplinePath</name>
@@ -1034,10 +1034,6 @@
         <source>Tool</source>
         <translation type="unfinished">כלי</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Alias1:</source>
         <translation type="unfinished"></translation>
@@ -1046,6 +1042,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogDateTimeFormats</name>
@@ -1091,6 +1091,10 @@
         <source>Dimension labels</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Dimension:</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Value</source>
         <translation type="unfinished"></translation>
@@ -1099,10 +1103,6 @@
         <source>Label</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Dimension:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DialogDuplicateDetail</name>
@@ -1383,10 +1383,6 @@
         <source>Customer email</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Measurement: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
@@ -1408,23 +1404,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No data for the height dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the size dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the hip dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the waist dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Final measurement: %1</source>
+        <source>Measurement: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1447,6 +1427,26 @@
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Final measurement: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the height dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the size dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the hip dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the waist dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogEditWrongFormula</name>
@@ -1638,11 +1638,11 @@
         <translation type="unfinished">כלי</translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alias:</source>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1950,10 +1950,6 @@
         <source>Tool</source>
         <translation type="unfinished">כלי</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
@@ -1970,6 +1966,10 @@
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -2065,10 +2065,6 @@
         <source>Tool</source>
         <translation type="unfinished">כלי</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
@@ -2085,6 +2081,10 @@
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -3243,42 +3243,6 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Skip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shift (%1)*:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File path is empty</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not enough columns</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not enough data to import</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please, select unique number for each column</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Name</source>
         <comment>measurement column</comment>
@@ -3309,6 +3273,42 @@ Apply settings anyway?</source>
         <comment>measurement column</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift (%1)*:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File path is empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not enough columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not enough data to import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, select unique number for each column</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogMove</name>
@@ -3400,10 +3400,6 @@ Apply settings anyway?</source>
         <source>Tool</source>
         <translation type="unfinished">כלי</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
@@ -3420,6 +3416,10 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -4716,6 +4716,28 @@ Apply settings anyway?</source>
         </translation>
     </message>
 </context>
+<context>
+    <name>DialogPuzzlePreferences</name>
+    <message>
+        <source>Puzzle preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paths</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>Followed %n option(s) require restart to take effect: %1.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+</context>
 <context>
     <name>DialogRestrictDimension</name>
     <message>
@@ -4821,10 +4843,6 @@ Apply settings anyway?</source>
         <source>Tool</source>
         <translation type="unfinished">כלי</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Alias</source>
         <translation type="unfinished"></translation>
@@ -4841,6 +4859,10 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -5035,6 +5057,10 @@ Apply settings anyway?</source>
         <source>Numerical control</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogSeamAllowance</name>
@@ -5293,6 +5319,11 @@ Apply settings anyway?</source>
         <source>Use full circumference</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Height</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Min value:</source>
         <translation type="unfinished"></translation>
@@ -5325,10 +5356,25 @@ Apply settings anyway?</source>
         <source>The base value for the column</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Circumference</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Waist</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hip</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Please, provide correct data for dimensions</source>
         <translation type="unfinished"></translation>
@@ -5345,26 +5391,6 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Height</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Waist</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hip</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DialogShoulderPoint</name>
@@ -5611,11 +5637,11 @@ Apply settings anyway?</source>
         <translation type="unfinished">כלי</translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alias:</source>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5722,11 +5748,11 @@ Apply settings anyway?</source>
         <translation type="unfinished">כלי</translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alias:</source>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -6550,10 +6576,6 @@ Do you want to save your changes?</source>
         <source>Enter a new label for the pattern piece.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>This file already opened in another window.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>File error.</source>
         <translation type="unfinished"></translation>
@@ -6834,30 +6856,6 @@ Do you want to save your changes?</source>
         <source>Don&apos;t Save</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Locking file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The lock file could not be created, for lack of permissions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Point intersection curves</source>
         <translation type="unfinished"></translation>
@@ -6970,18 +6968,6 @@ Do you want to save your changes?</source>
         <source>Select main path objects clockwise.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>The document has no write permissions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cannot set permissions for %1 to writable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not save the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Could not save the file</source>
         <translation type="unfinished"></translation>
@@ -7367,7 +7353,43 @@ Do you want to save your changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to change the premissions?</source>
+        <source>Manual Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open the Puzzle app</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to prepare raw layout data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select manual layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7803,6 +7825,10 @@ Do you want to save your changes?</source>
         <source>My label templates</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>My manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PreferencesPatternPage</name>
@@ -7944,6 +7970,111 @@ This option will take an affect after restart.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>Puzzle</name>
+    <message>
+        <source>Export options can be used with single input file only.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Valentina&apos;s manual layout editor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The manual layout file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesConfigurationPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GUI language:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The text appears under the icon (recommended for beginners).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate dark mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t use the native file dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dark mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesPathPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paths that Valentina uses</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Individual Measurements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Multisize Measurements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Patterns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Templates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>QCoreApplication</name>
     <message>
@@ -8223,6 +8354,10 @@ This option will take an affect after restart.</source>
         <source>Can&apos;t convert toInt parameter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Piece name &apos;%1&apos; is not unique.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Could not find the segment start.</source>
         <translation type="unfinished"></translation>
@@ -8239,6 +8374,10 @@ This option will take an affect after restart.</source>
         <source>Error calculating segment for curve &apos;%1&apos;. %2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot prepare builtin passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
@@ -8255,18 +8394,14 @@ This option will take an affect after restart.</source>
         <source>Cannot prepare passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Piece name &apos;%1&apos; is not unique.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Cannot get tokens from formula &apos;%1&apos;. Formula error: %2.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>No data for the height dimension.</source>
         <translation type="unfinished"></translation>
@@ -8288,11 +8423,15 @@ This option will take an affect after restart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
+        <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
+        <source>Unplaced pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet 1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -8913,30 +9052,6 @@ Do you want to save your changes?</source>
         <source>Don&apos;t Save</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Locking file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The lock file could not be created, for lack of permissions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Export to CSV</source>
         <translation type="unfinished"></translation>
@@ -8961,18 +9076,6 @@ Do you want to save your changes?</source>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>The measurements document has no write permissions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cannot set permissions for %1 to writable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not save the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Could not save the file</source>
         <translation type="unfinished"></translation>
@@ -9102,11 +9205,37 @@ Do you want to save your changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to change the premissions?</source>
+        <source>Cannot read settings from a malformed .INI file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cannot read settings from a malformed .INI file.</source>
+        <source>Name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Calculated value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Formula</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Correction</source>
+        <comment>measurement column</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9221,40 +9350,14 @@ Do you want to save your changes?</source>
         <source>Degrees</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Name</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full name</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calculated value</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Formula</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Correction</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Restrict first dimension</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>untitled</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:18pt;&quot;&gt;Select New to create a measurement file.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
@@ -9789,6 +9892,18 @@ Do you want to save your changes?</source>
         <comment>seam allowance</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Universally Unique IDentifier of piece. Used to identifier piece while updating manual layout. Left empty to generate new value.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TabPlaceLabels</name>
@@ -9906,6 +10021,10 @@ Do you want to save your changes?</source>
         <source>My Patterns</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TogglePieceForceForbidFlipping</name>
@@ -9950,10 +10069,6 @@ Do you want to save your changes?</source>
         <source>Base value invalid</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
@@ -9984,6 +10099,10 @@ Do you want to save your changes?</source>
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Chest circumference</source>
         <comment>dimension</comment>
@@ -10151,6 +10270,50 @@ Do you want to save your changes?</source>
         <source>Export to CSV</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>The measurements document has no write permissions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to change the premissions?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot set permissions for %1 to writable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Locking file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This file already opened in another window.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VAbstractNode</name>
@@ -10788,6 +10951,34 @@ Do you want to save your changes?</source>
         <source>The dimension C base</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>The filename of exported layout file. Use it to enable console export mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The filename of layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pattern pieces form the raw layout data file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The raw layout data file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to output format (default = 0, export mode): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to tiled pdf page template (default = 0, export mode with tiled pdf format): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run the program in a test mode. The program in this mode loads a single layout file and silently quit without showing the main window. The key have priority before key &apos;%1&apos;.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VCommonSettings</name>
@@ -10815,6 +11006,10 @@ Do you want to save your changes?</source>
         <source>patterns</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VContainer</name>
@@ -11003,6 +11198,10 @@ Do you want to save your changes?</source>
 </context>
 <context>
     <name>VLayoutExporter</name>
+    <message>
+        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot set printer page size</source>
         <translation type="unfinished"></translation>
@@ -11016,11 +11215,11 @@ Do you want to save your changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Creating file &apos;%1&apos; failed! %2</source>
+        <source>Export raw layout data failed. %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
+        <source>Creating file &apos;%1&apos; failed! %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -11209,6 +11408,114 @@ Do you want to save your changes?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>VPApplication</name>
+    <message>
+        <source>Error parsing file. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error bad id. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error can&apos;t convert value. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error empty parameter. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error wrong id. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Something&apos;s wrong!!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exception thrown: %1. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t begin to listen for incoming connections on name &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export mode doesn&apos;t support openning several files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import raw layout data does not support openning several layout files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, provide one input file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrousel</name>
+    <message>
+        <source>Pieces of </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrouselPieceList</name>
+    <message>
+        <source>Move to Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">למחוק</translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPDialogAbout</name>
+    <message>
+        <source>About Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Puzzle version</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Build revision:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This program is part of Valentina project.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check For Updates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open your default browser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Build revision: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Built on %1 at %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Web site : %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VPE::VBoolProperty</name>
     <message>
@@ -11231,6 +11538,573 @@ Do you want to save your changes?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>VPGraphicsPiece</name>
+    <message>
+        <source>Move to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPLayoutFileReader</name>
+    <message>
+        <source>Piece List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Got empty attribute &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPMainWindow</name>
+    <message>
+        <source>Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Piece Carrousel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Infos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DummyName</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UUID:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{7b2ce4ae-96f5-4905-bb34-405cb40ca208}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Geometry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mirror piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Angle:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° anti-clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Placement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Y:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No piece selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple pieces selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Width</source>
+        <translation type="unfinished">רוחב</translation>
+    </message>
+    <message>
+        <source>Length</source>
+        <translation type="unfinished">אורך</translation>
+    </message>
+    <message>
+        <source>Orientation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove unused length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Placement Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Row height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Follow grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vertical grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Horizontal grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pieces gap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sticky edges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiles properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiled Pdf Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Tiles on sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export Tiled Pdf</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning superposition of pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning pieces out of bound</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+O</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save &amp;As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Import Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About &amp;Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom 1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom fit best</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File &apos;%1&apos; doesn&apos;t exist!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to read a layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fail to create layout.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not extract data from file &apos;%1&apos;. %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Centimeters</source>
+        <translation type="unfinished">סנטימטרים</translation>
+    </message>
+    <message>
+        <source>Millimiters</source>
+        <translation type="unfinished">מילימטר</translation>
+    </message>
+    <message>
+        <source>Inches</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>untitled %1.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>untitled.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot read settings from a malformed .INI file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save settings. Access denied.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to open file, is it writable?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save the file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save as</source>
+        <translation type="unfinished">שמירה בשם</translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window. Expect collissions when run 2 copies of the program.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Raw Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About Qt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PDF Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SVG Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPSheet</name>
+    <message>
+        <source>Letter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Legal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabloid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 24in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 30in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 36in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 42in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 44in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 48in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 62in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 72in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPTileFactory</name>
+    <message>
+        <source>Grid ( %1 , %2 )</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page %1 of %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VPattern</name>
     <message>
@@ -11621,9 +12495,14 @@ Do you want to save your changes?</source>
     </message>
 </context>
 <context>
-    <name>VSettings</name>
+    <name>VRawLayout</name>
     <message>
-        <source>layouts</source>
+        <source>VRawLayout::ReadFile() failed. Raw layout format prefix mismatch error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VRawLayout::ReadFile() failed.
+Raw layout format compatibility error: actualFileVersion = %1 and fileVersion = %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -13960,6 +14839,13 @@ Do you want to save your changes?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>VValentinaSettings</name>
+    <message>
+        <source>layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VWidgetDetails</name>
     <message>
diff --git a/share/translations/valentina_id_ID.ts b/share/translations/valentina_id_ID.ts
index b4ebe7a88..8ea1379cd 100644
--- a/share/translations/valentina_id_ID.ts
+++ b/share/translations/valentina_id_ID.ts
@@ -554,11 +554,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alias:</source>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -661,11 +661,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alias:</source>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -855,11 +855,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alias:</source>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -910,11 +910,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alias:</source>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1091,10 +1091,6 @@
         <source>Tool</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Alias1:</source>
         <translation type="unfinished"></translation>
@@ -1103,6 +1099,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCutSpline</name>
@@ -1174,10 +1174,6 @@
         <source>Tool</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Alias1:</source>
         <translation type="unfinished"></translation>
@@ -1186,6 +1182,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCutSplinePath</name>
@@ -1257,10 +1257,6 @@
         <source>Tool</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Alias1:</source>
         <translation type="unfinished"></translation>
@@ -1269,6 +1265,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogDateTimeFormats</name>
@@ -1330,6 +1330,10 @@
         <source>Dimension labels</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Dimension:</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Value</source>
         <translation type="unfinished"></translation>
@@ -1338,10 +1342,6 @@
         <source>Label</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Dimension:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DialogDuplicateDetail</name>
@@ -1622,10 +1622,6 @@
         <source>Customer email</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Measurement: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
@@ -1647,23 +1643,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No data for the height dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the size dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the hip dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the waist dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Final measurement: %1</source>
+        <source>Measurement: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1686,6 +1666,26 @@
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Final measurement: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the height dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the size dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the hip dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the waist dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogEditWrongFormula</name>
@@ -1897,11 +1897,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alias:</source>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2221,10 +2221,6 @@
         <source>Tool</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
@@ -2241,6 +2237,10 @@
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -2336,10 +2336,6 @@
         <source>Tool</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
@@ -2356,6 +2352,10 @@
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -3526,42 +3526,6 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished">Nama</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Skip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shift (%1)*:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File path is empty</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not enough columns</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not enough data to import</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please, select unique number for each column</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Name</source>
         <comment>measurement column</comment>
@@ -3592,6 +3556,42 @@ Apply settings anyway?</source>
         <comment>measurement column</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Nama</translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift (%1)*:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File path is empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not enough columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not enough data to import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, select unique number for each column</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogMove</name>
@@ -3683,10 +3683,6 @@ Apply settings anyway?</source>
         <source>Tool</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
@@ -3703,6 +3699,10 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -5038,6 +5038,27 @@ Apply settings anyway?</source>
         </translation>
     </message>
 </context>
+<context>
+    <name>DialogPuzzlePreferences</name>
+    <message>
+        <source>Puzzle preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished">Konfigurasi</translation>
+    </message>
+    <message>
+        <source>Paths</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>Followed %n option(s) require restart to take effect: %1.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+</context>
 <context>
     <name>DialogRestrictDimension</name>
     <message>
@@ -5143,10 +5164,6 @@ Apply settings anyway?</source>
         <source>Tool</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Alias</source>
         <translation type="unfinished"></translation>
@@ -5163,6 +5180,10 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -5353,6 +5374,10 @@ Apply settings anyway?</source>
         <source>Numerical control</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogSeamAllowance</name>
@@ -5611,6 +5636,11 @@ Apply settings anyway?</source>
         <source>Use full circumference</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Height</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Min value:</source>
         <translation type="unfinished"></translation>
@@ -5643,10 +5673,25 @@ Apply settings anyway?</source>
         <source>The base value for the column</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Circumference</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Waist</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hip</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Please, provide correct data for dimensions</source>
         <translation type="unfinished"></translation>
@@ -5663,26 +5708,6 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Height</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Waist</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hip</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DialogShoulderPoint</name>
@@ -5933,11 +5958,11 @@ Apply settings anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alias:</source>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -6044,11 +6069,11 @@ Apply settings anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alias:</source>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -6888,10 +6913,6 @@ Apakah anda ingin menyimpan perubahan anda?</translation>
         <source>Enter a new label for the pattern piece.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>This file already opened in another window.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>File error.</source>
         <translation type="unfinished"></translation>
@@ -7172,30 +7193,6 @@ Apakah anda ingin menyimpan perubahan anda?</translation>
         <source>Don&apos;t Save</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Locking file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The lock file could not be created, for lack of permissions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Point intersection curves</source>
         <translation type="unfinished"></translation>
@@ -7308,18 +7305,6 @@ Apakah anda ingin menyimpan perubahan anda?</translation>
         <source>Select main path objects clockwise.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>The document has no write permissions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cannot set permissions for %1 to writable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not save the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Could not save the file</source>
         <translation type="unfinished"></translation>
@@ -7705,7 +7690,43 @@ Apakah anda ingin menyimpan perubahan anda?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to change the premissions?</source>
+        <source>Manual Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open the Puzzle app</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to prepare raw layout data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select manual layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8137,6 +8158,10 @@ Apakah anda ingin menyimpan perubahan anda?</translation>
         <source>My label templates</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>My manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PreferencesPatternPage</name>
@@ -8278,6 +8303,111 @@ This option will take an affect after restart.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>Puzzle</name>
+    <message>
+        <source>Export options can be used with single input file only.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Valentina&apos;s manual layout editor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The manual layout file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesConfigurationPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished">Bahasa</translation>
+    </message>
+    <message>
+        <source>GUI language:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The text appears under the icon (recommended for beginners).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate dark mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t use the native file dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dark mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesPathPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paths that Valentina uses</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Individual Measurements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Multisize Measurements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Patterns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Templates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>QCoreApplication</name>
     <message>
@@ -8557,6 +8687,10 @@ This option will take an affect after restart.</source>
         <source>Can&apos;t convert toInt parameter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Piece name &apos;%1&apos; is not unique.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Could not find the segment start.</source>
         <translation type="unfinished"></translation>
@@ -8573,6 +8707,10 @@ This option will take an affect after restart.</source>
         <source>Error calculating segment for curve &apos;%1&apos;. %2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot prepare builtin passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
@@ -8589,18 +8727,14 @@ This option will take an affect after restart.</source>
         <source>Cannot prepare passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Piece name &apos;%1&apos; is not unique.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Cannot get tokens from formula &apos;%1&apos;. Formula error: %2.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>No data for the height dimension.</source>
         <translation type="unfinished"></translation>
@@ -8622,11 +8756,15 @@ This option will take an affect after restart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
+        <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
+        <source>Unplaced pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet 1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -9247,30 +9385,6 @@ Do you want to save your changes?</source>
         <source>Don&apos;t Save</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Locking file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The lock file could not be created, for lack of permissions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Export to CSV</source>
         <translation type="unfinished"></translation>
@@ -9295,18 +9409,6 @@ Do you want to save your changes?</source>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>The measurements document has no write permissions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cannot set permissions for %1 to writable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not save the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Could not save the file</source>
         <translation type="unfinished"></translation>
@@ -9436,11 +9538,37 @@ Do you want to save your changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to change the premissions?</source>
+        <source>Cannot read settings from a malformed .INI file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cannot read settings from a malformed .INI file.</source>
+        <source>Name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Nama</translation>
+    </message>
+    <message>
+        <source>Full name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Calculated value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Formula</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">rumus</translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Correction</source>
+        <comment>measurement column</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9555,40 +9683,14 @@ Do you want to save your changes?</source>
         <source>Degrees</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Name</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished">Nama</translation>
-    </message>
-    <message>
-        <source>Full name</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calculated value</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Formula</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished">rumus</translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Correction</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Restrict first dimension</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>untitled</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:18pt;&quot;&gt;Select New to create a measurement file.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
@@ -10123,6 +10225,18 @@ Do you want to save your changes?</source>
         <comment>seam allowance</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Universally Unique IDentifier of piece. Used to identifier piece while updating manual layout. Left empty to generate new value.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TabPlaceLabels</name>
@@ -10282,6 +10396,10 @@ Do you want to save your changes?</source>
         <source>My Patterns</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TogglePieceForceForbidFlipping</name>
@@ -10326,10 +10444,6 @@ Do you want to save your changes?</source>
         <source>Base value invalid</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
@@ -10360,6 +10474,10 @@ Do you want to save your changes?</source>
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Chest circumference</source>
         <comment>dimension</comment>
@@ -10527,6 +10645,50 @@ Do you want to save your changes?</source>
         <source>Export to CSV</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>The measurements document has no write permissions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to change the premissions?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot set permissions for %1 to writable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Locking file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This file already opened in another window.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VAbstractNode</name>
@@ -11168,6 +11330,34 @@ Do you want to save your changes?</source>
         <source>The dimension C base</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>The filename of exported layout file. Use it to enable console export mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The filename of layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pattern pieces form the raw layout data file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The raw layout data file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to output format (default = 0, export mode): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to tiled pdf page template (default = 0, export mode with tiled pdf format): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run the program in a test mode. The program in this mode loads a single layout file and silently quit without showing the main window. The key have priority before key &apos;%1&apos;.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VCommonSettings</name>
@@ -11195,6 +11385,10 @@ Do you want to save your changes?</source>
         <source>patterns</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VContainer</name>
@@ -11383,6 +11577,10 @@ Do you want to save your changes?</source>
 </context>
 <context>
     <name>VLayoutExporter</name>
+    <message>
+        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot set printer page size</source>
         <translation type="unfinished"></translation>
@@ -11396,11 +11594,11 @@ Do you want to save your changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Creating file &apos;%1&apos; failed! %2</source>
+        <source>Export raw layout data failed. %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
+        <source>Creating file &apos;%1&apos; failed! %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -11589,6 +11787,114 @@ Do you want to save your changes?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>VPApplication</name>
+    <message>
+        <source>Error parsing file. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error bad id. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error can&apos;t convert value. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error empty parameter. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error wrong id. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Something&apos;s wrong!!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exception thrown: %1. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t begin to listen for incoming connections on name &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export mode doesn&apos;t support openning several files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import raw layout data does not support openning several layout files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, provide one input file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrousel</name>
+    <message>
+        <source>Pieces of </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrouselPieceList</name>
+    <message>
+        <source>Move to Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">hapus</translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPDialogAbout</name>
+    <message>
+        <source>About Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Puzzle version</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Build revision:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This program is part of Valentina project.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check For Updates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open your default browser</source>
+        <translation type="unfinished">Tidak dapat membuka peramban bawaan Anda</translation>
+    </message>
+    <message>
+        <source>Build revision: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Built on %1 at %2</source>
+        <translation type="unfinished">Dibuat pada %3 at %2 {1 ?}</translation>
+    </message>
+    <message>
+        <source>Web site : %1</source>
+        <translation type="unfinished">Situs web : %1</translation>
+    </message>
+</context>
 <context>
     <name>VPE::VBoolProperty</name>
     <message>
@@ -11611,6 +11917,573 @@ Do you want to save your changes?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>VPGraphicsPiece</name>
+    <message>
+        <source>Move to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPLayoutFileReader</name>
+    <message>
+        <source>Piece List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Got empty attribute &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPMainWindow</name>
+    <message>
+        <source>Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Piece Carrousel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Infos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DummyName</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UUID:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{7b2ce4ae-96f5-4905-bb34-405cb40ca208}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Geometry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mirror piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Angle:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° anti-clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Placement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Y:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No piece selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple pieces selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Width</source>
+        <translation type="unfinished">lebar</translation>
+    </message>
+    <message>
+        <source>Length</source>
+        <translation type="unfinished">panjang</translation>
+    </message>
+    <message>
+        <source>Orientation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove unused length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Placement Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Row height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Follow grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vertical grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Horizontal grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pieces gap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sticky edges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiles properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiled Pdf Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Tiles on sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export Tiled Pdf</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Nama</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning superposition of pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning pieces out of bound</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+O</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save &amp;As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Import Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About &amp;Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom 1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom fit best</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File &apos;%1&apos; doesn&apos;t exist!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to read a layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fail to create layout.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not extract data from file &apos;%1&apos;. %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Centimeters</source>
+        <translation type="unfinished">Centimeter</translation>
+    </message>
+    <message>
+        <source>Millimiters</source>
+        <translation type="unfinished">Milimeter</translation>
+    </message>
+    <message>
+        <source>Inches</source>
+        <translation type="unfinished">Inchi</translation>
+    </message>
+    <message>
+        <source>Scale:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>untitled %1.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>untitled.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot read settings from a malformed .INI file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save settings. Access denied.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to open file, is it writable?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open file</source>
+        <translation type="unfinished">Buka File</translation>
+    </message>
+    <message>
+        <source>Could not save the file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window. Expect collissions when run 2 copies of the program.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Raw Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About Qt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PDF Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SVG Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPSheet</name>
+    <message>
+        <source>Letter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Legal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabloid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 24in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 30in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 36in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 42in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 44in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 48in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 62in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 72in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPTileFactory</name>
+    <message>
+        <source>Grid ( %1 , %2 )</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page %1 of %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VPattern</name>
     <message>
@@ -12001,9 +12874,14 @@ Do you want to save your changes?</source>
     </message>
 </context>
 <context>
-    <name>VSettings</name>
+    <name>VRawLayout</name>
     <message>
-        <source>layouts</source>
+        <source>VRawLayout::ReadFile() failed. Raw layout format prefix mismatch error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VRawLayout::ReadFile() failed.
+Raw layout format compatibility error: actualFileVersion = %1 and fileVersion = %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -14357,6 +15235,13 @@ Do you want to save your changes?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>VValentinaSettings</name>
+    <message>
+        <source>layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VWidgetDetails</name>
     <message>
diff --git a/share/translations/valentina_it_IT.ts b/share/translations/valentina_it_IT.ts
index e959c3285..4b1364c09 100644
--- a/share/translations/valentina_it_IT.ts
+++ b/share/translations/valentina_it_IT.ts
@@ -576,7 +576,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -707,16 +707,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogArcWithLength</name>
@@ -834,16 +834,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogBisector</name>
@@ -965,7 +965,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -1036,16 +1036,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCubicBezierPath</name>
@@ -1091,16 +1091,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCurveIntersectAxis</name>
@@ -1202,7 +1202,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -1293,11 +1293,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1307,6 +1303,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCutSpline</name>
@@ -1384,11 +1384,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1398,6 +1394,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCutSplinePath</name>
@@ -1475,11 +1475,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1489,6 +1485,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogDateTimeFormats</name>
@@ -1786,17 +1786,17 @@
         <source>Dimension labels</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Dimension:</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Value</source>
-        <translation>Valore</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Label</source>
-        <translation>Etichetta</translation>
-    </message>
-    <message>
-        <source>Dimension:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Etichetta</translation>
     </message>
 </context>
 <context>
@@ -1950,6 +1950,14 @@
         <source>Measurments file name</source>
         <translation>Nome del file misurazioni</translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="vanished">Taglia</translation>
+    </message>
+    <message>
+        <source>Height</source>
+        <translation type="vanished">Altezza</translation>
+    </message>
     <message>
         <source>Measurments extension</source>
         <translation>Estensione misurazioni</translation>
@@ -2078,19 +2086,15 @@
         <source>Customer email</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Measurement: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Altezza</translation>
+        <translation type="unfinished">Altezza</translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Taglia</translation>
+        <translation type="unfinished">Taglia</translation>
     </message>
     <message>
         <source>Hip</source>
@@ -2103,23 +2107,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No data for the height dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the size dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the hip dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the waist dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Final measurement: %1</source>
+        <source>Measurement: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2142,6 +2130,26 @@
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Final measurement: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the height dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the size dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the hip dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the waist dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogEditWrongFormula</name>
@@ -2374,16 +2382,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogEndLine</name>
@@ -2489,7 +2497,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -2719,11 +2727,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -2741,6 +2745,10 @@
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -2838,11 +2846,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -2860,6 +2864,10 @@
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -3012,7 +3020,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -3876,7 +3884,7 @@ Applicare la configurazione comunque?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -3943,7 +3951,7 @@ Applicare la configurazione comunque?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -4070,7 +4078,7 @@ Applicare la configurazione comunque?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -4209,7 +4217,7 @@ Applicare la configurazione comunque?</translation>
     </message>
     <message>
         <source>Preview</source>
-        <translation>Anteprima</translation>
+        <translation type="unfinished">Anteprima</translation>
     </message>
     <message>
         <source>Input</source>
@@ -4225,11 +4233,11 @@ Applicare la configurazione comunque?</translation>
     </message>
     <message>
         <source>Full name:</source>
-        <translation>Nome intero:</translation>
+        <translation type="unfinished">Nome intero:</translation>
     </message>
     <message>
         <source>Description:</source>
-        <translation>Descrizione:</translation>
+        <translation type="unfinished">Descrizione:</translation>
     </message>
     <message>
         <source>Ready</source>
@@ -4237,20 +4245,50 @@ Applicare la configurazione comunque?</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation>Nome</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Value</source>
-        <translation>Valore</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Nome intero</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Descrizione</translation>
     </message>
     <message>
         <source>Base value</source>
-        <translation>Valore di base</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Valore di base</translation>
+    </message>
+    <message>
+        <source>Shift (%1):</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Skip</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <translation type="unfinished">Valore di base</translation>
+    </message>
     <message>
         <source>Shift (%1)*:</source>
         <translation type="unfinished"></translation>
@@ -4271,36 +4309,6 @@ Applicare la configurazione comunque?</translation>
         <source>Please, select unique number for each column</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Name</source>
-        <comment>measurement column</comment>
-        <translation>Nome</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <comment>measurement column</comment>
-        <translation>Valore</translation>
-    </message>
-    <message>
-        <source>Full name</source>
-        <comment>measurement column</comment>
-        <translation>Nome intero</translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <comment>measurement column</comment>
-        <translation>Descrizione</translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <comment>measurement column</comment>
-        <translation>Valore di base</translation>
-    </message>
-    <message>
-        <source>Shift (%1):</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DialogMove</name>
@@ -4394,11 +4402,7 @@ Applicare la configurazione comunque?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -4416,6 +4420,10 @@ Applicare la configurazione comunque?</translation>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -4655,7 +4663,7 @@ Applicare la configurazione comunque?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -4851,6 +4859,10 @@ Applicare la configurazione comunque?</translation>
         <source>Show measurements file</source>
         <translation type="vanished">Mostra il file delle misure</translation>
     </message>
+    <message>
+        <source>From multisize measurements</source>
+        <translation type="vanished">Da misure di più taglie</translation>
+    </message>
     <message>
         <source>Pattern</source>
         <translation type="unfinished">Modello</translation>
@@ -4859,10 +4871,62 @@ Applicare la configurazione comunque?</translation>
         <source>For technical notes</source>
         <translation>Per note tecniche</translation>
     </message>
+    <message>
+        <source>Label data</source>
+        <translation type="vanished">Dati di etichetta</translation>
+    </message>
+    <message>
+        <source>Label template:</source>
+        <translation type="vanished">Modello etichetta:</translation>
+    </message>
+    <message>
+        <source>Edit pattern label</source>
+        <translation type="vanished">Modifica il modello dell&apos;etichetta</translation>
+    </message>
+    <message>
+        <source>Edit template</source>
+        <translation type="vanished">Modifica formato</translation>
+    </message>
+    <message>
+        <source>Date format:</source>
+        <translation type="vanished">Formato Data:</translation>
+    </message>
+    <message>
+        <source>Time format:</source>
+        <translation type="vanished">Formato Ora:</translation>
+    </message>
+    <message>
+        <source>Save label data.</source>
+        <translation type="vanished">Salva i dati di etichetta.</translation>
+    </message>
+    <message>
+        <source>Label data were changed. Do you want to save them before editing label template?</source>
+        <translation type="vanished">I dati dell&apos;etichetta sono stati modificati. Vuoi salvarli prima di modificare il formato dell&apos;etichetta?</translation>
+    </message>
+    <message>
+        <source>Materials</source>
+        <translation type="vanished">Materiali</translation>
+    </message>
+    <message>
+        <source>Pattern materials:</source>
+        <translation type="vanished">Materiali modello:</translation>
+    </message>
+    <message>
+        <source>Manage list of pattern materials</source>
+        <translation type="vanished">Gestisci la lista di materiali di modello</translation>
+    </message>
+    <message>
+        <source>Manage</source>
+        <translation type="vanished">Gestisci</translation>
+    </message>
     <message>
         <source>Label language:</source>
         <translation>Lingua etichetta:</translation>
     </message>
+    <message>
+        <source>yyyy-MM-dd</source>
+        <translation type="obsolete">aaaa-MM-gg</translation>
+    </message>
     <message>
         <source>Passmark length:</source>
         <translation type="unfinished"></translation>
@@ -5564,7 +5628,7 @@ Applicare la configurazione comunque?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5663,7 +5727,7 @@ Applicare la configurazione comunque?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5758,7 +5822,7 @@ Applicare la configurazione comunque?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5817,7 +5881,7 @@ Applicare la configurazione comunque?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5884,7 +5948,7 @@ Applicare la configurazione comunque?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5999,7 +6063,7 @@ Applicare la configurazione comunque?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6046,7 +6110,7 @@ Applicare la configurazione comunque?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6095,6 +6159,28 @@ Applicare la configurazione comunque?</translation>
         </translation>
     </message>
 </context>
+<context>
+    <name>DialogPuzzlePreferences</name>
+    <message>
+        <source>Puzzle preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished">Configurazione</translation>
+    </message>
+    <message>
+        <source>Paths</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>Followed %n option(s) require restart to take effect: %1.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+</context>
 <context>
     <name>DialogRestrictDimension</name>
     <message>
@@ -6206,11 +6292,7 @@ Applicare la configurazione comunque?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Alias</source>
@@ -6228,6 +6310,10 @@ Applicare la configurazione comunque?</translation>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -6470,6 +6556,10 @@ Applicare la configurazione comunque?</translation>
         <source>Numerical control</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogSeamAllowance</name>
@@ -6711,11 +6801,11 @@ Applicare la configurazione comunque?</translation>
     </message>
     <message>
         <source>Save label data.</source>
-        <translation>Salva i dati di etichetta.</translation>
+        <translation type="unfinished">Salva i dati di etichetta.</translation>
     </message>
     <message>
         <source>Label data were changed. Do you want to save them before editing label template?</source>
-        <translation>I dati dell&apos;etichetta sono stati modificati. Vuoi salvarli prima di modificare il formato dell&apos;etichetta?</translation>
+        <translation type="unfinished">I dati dell&apos;etichetta sono stati modificati. Vuoi salvarli prima di modificare il formato dell&apos;etichetta?</translation>
     </message>
 </context>
 <context>
@@ -6728,6 +6818,11 @@ Applicare la configurazione comunque?</translation>
         <source>Use full circumference</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Height</source>
+        <comment>dimension</comment>
+        <translation type="unfinished">Altezza</translation>
+    </message>
     <message>
         <source>Min value:</source>
         <translation type="unfinished"></translation>
@@ -6760,10 +6855,25 @@ Applicare la configurazione comunque?</translation>
         <source>The base value for the column</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <comment>dimension</comment>
+        <translation type="unfinished">Taglia</translation>
+    </message>
     <message>
         <source>Circumference</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Waist</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hip</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Please, provide correct data for dimensions</source>
         <translation type="unfinished"></translation>
@@ -6780,26 +6890,6 @@ Applicare la configurazione comunque?</translation>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Height</source>
-        <comment>dimension</comment>
-        <translation>Altezza</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <comment>dimension</comment>
-        <translation>Taglia</translation>
-    </message>
-    <message>
-        <source>Waist</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hip</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DialogShoulderPoint</name>
@@ -6909,7 +6999,7 @@ Applicare la configurazione comunque?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6952,7 +7042,7 @@ Applicare la configurazione comunque?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -7099,16 +7189,16 @@ Applicare la configurazione comunque?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogSplinePath</name>
@@ -7258,16 +7348,16 @@ Applicare la configurazione comunque?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogTapePreferences</name>
@@ -7450,7 +7540,7 @@ Applicare la configurazione comunque?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -7561,7 +7651,7 @@ Applicare la configurazione comunque?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Strumento</translation>
+        <translation type="unfinished">Strumento</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -8300,7 +8390,7 @@ Vuoi salvare i cambiamenti?</translation>
     </message>
     <message>
         <source>This file already opened in another window.</source>
-        <translation>Questo file è già aperto in un&apos;altra finestra.</translation>
+        <translation type="vanished">Questo file è già aperto in un&apos;altra finestra.</translation>
     </message>
     <message>
         <source>Wrong units.</source>
@@ -8753,27 +8843,27 @@ Vuoi salvare i cambiamenti?</translation>
     </message>
     <message>
         <source>Locking file</source>
-        <translation>File bloccato</translation>
+        <translation type="vanished">File bloccato</translation>
     </message>
     <message>
         <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Questo file è già aperto in un&apos;altra finestra. Ignora se vuoi continuare (non consigliato, può provocare un danneggiamento dei dati).</translation>
+        <translation type="vanished">Questo file è già aperto in un&apos;altra finestra. Ignora se vuoi continuare (non consigliato, può provocare un danneggiamento dei dati).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Il file bloccato non può essere creato, per mancanza di autorizzazione. Ignora se vuoi continuare (scelta non consigliata, può causare un danneggiamento dei dati).</translation>
+        <translation type="vanished">Il file bloccato non può essere creato, per mancanza di autorizzazione. Ignora se vuoi continuare (scelta non consigliata, può causare un danneggiamento dei dati).</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Si è verificato un errore sconosciuto, come ad esempio il fallimento di una partizione completa durante la trascrizione di un file bloccato. Ignora se vuoi continuare (scelta non consigliata, può causare un danneggiamento dei dati).</translation>
+        <translation type="vanished">Si è verificato un errore sconosciuto, come ad esempio il fallimento di una partizione completa durante la trascrizione di un file bloccato. Ignora se vuoi continuare (scelta non consigliata, può causare un danneggiamento dei dati).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions.</source>
-        <translation>Il file bloccato non può essere creato, per mancanza di autorizzazione.</translation>
+        <translation type="vanished">Il file bloccato non può essere creato, per mancanza di autorizzazione.</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation>Si è verificato un errore sconosciuto, come ad esempio il fallimento di una partizione completa durante la trascrizione di un file bloccato.</translation>
+        <translation type="vanished">Si è verificato un errore sconosciuto, come ad esempio il fallimento di una partizione completa durante la trascrizione di un file bloccato.</translation>
     </message>
     <message>
         <source>Report Bug...</source>
@@ -8929,15 +9019,11 @@ Vuoi salvare i cambiamenti?</translation>
     </message>
     <message>
         <source>The document has no write permissions.</source>
-        <translation>Il documento è in sola lettura.</translation>
-    </message>
-    <message>
-        <source>Cannot set permissions for %1 to writable.</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Il documento è in sola lettura.</translation>
     </message>
     <message>
         <source>Could not save the file.</source>
-        <translation>Impossibile salvare il file.</translation>
+        <translation type="vanished">Impossibile salvare il file.</translation>
     </message>
     <message>
         <source>Could not save the file</source>
@@ -8997,7 +9083,7 @@ Vuoi salvare i cambiamenti?</translation>
     </message>
     <message>
         <source>Unload measurements if they were not used in a pattern file</source>
-        <translation>Rimuove misure se non sono usate nel disegno</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Individual measurements</source>
@@ -9083,6 +9169,14 @@ Vuoi salvare i cambiamenti?</translation>
         <source>Can&apos;t export details.</source>
         <translation>Impossibile esportare dettagli.</translation>
     </message>
+    <message>
+        <source>Couldn&apos;t set size. Need a file with multisize measurements.</source>
+        <translation type="vanished">Impossibile aggiungere la taglia. Inserire un file con misure multi taglia.</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t set height. Need a file with multisize measurements.</source>
+        <translation type="vanished">Impossibile aggiungere l&apos;altezza. Inserire un file con misure multi taglia.</translation>
+    </message>
     <message>
         <source>Label template editor</source>
         <translation>Editor dei modelli di etichetta</translation>
@@ -9324,7 +9418,43 @@ Vuoi salvare i cambiamenti?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to change the premissions?</source>
+        <source>Manual Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open the Puzzle app</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished">Aggiornamento</translation>
+    </message>
+    <message>
+        <source>Update manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to prepare raw layout data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select manual layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9522,6 +9652,14 @@ Vuoi salvare i cambiamenti?</translation>
         <source>Measurement file contains invalid known measurement(s).</source>
         <translation>Il file delle misure contiene misura(e) note come invalide.</translation>
     </message>
+    <message>
+        <source>Wrong units.</source>
+        <translation type="vanished">Unità sbagliate.</translation>
+    </message>
+    <message>
+        <source>Application doesn&apos;t support multisize table with inches.</source>
+        <translation type="vanished">L&apos;applicazione non supporta tabelle multitaglia con pollici.</translation>
+    </message>
     <message>
         <source>File error.</source>
         <translation>Errore nel file.</translation>
@@ -9900,7 +10038,7 @@ Vuoi salvare i cambiamenti?</translation>
     <name>PreferencesPathPage</name>
     <message>
         <source>Paths that Valentina uses</source>
-        <translation>Percorsi usati da Valentina</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
@@ -9946,6 +10084,10 @@ Vuoi salvare i cambiamenti?</translation>
         <source>My label templates</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>My manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PreferencesPatternPage</name>
@@ -10088,6 +10230,111 @@ Questa opzione sarà effettiva dopo il riavvio del programma.</translation>
         <translation>Render di scena</translation>
     </message>
 </context>
+<context>
+    <name>Puzzle</name>
+    <message>
+        <source>Export options can be used with single input file only.</source>
+        <translation type="unfinished">Le opzioni di esportazione posso venire utilizzate solo con file di input singoli.</translation>
+    </message>
+    <message>
+        <source>Valentina&apos;s manual layout editor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The manual layout file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesConfigurationPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished">Lingua</translation>
+    </message>
+    <message>
+        <source>GUI language:</source>
+        <translation type="unfinished">Lingua di interfaccia:</translation>
+    </message>
+    <message>
+        <source>Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The text appears under the icon (recommended for beginners).</source>
+        <translation type="unfinished">Il testo appare sotto l&apos;icona. (raccomandato per i principianti).</translation>
+    </message>
+    <message>
+        <source>User Interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate dark mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t use the native file dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dark mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesPathPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paths that Valentina uses</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished">Tipo</translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished">Percorso</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished">Default</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished">Modifica</translation>
+    </message>
+    <message>
+        <source>Open Directory</source>
+        <translation type="unfinished">Apri Cartella</translation>
+    </message>
+    <message>
+        <source>My Individual Measurements</source>
+        <translation type="unfinished">Le mie misure individuali</translation>
+    </message>
+    <message>
+        <source>My Multisize Measurements</source>
+        <translation type="unfinished">Le mie misure multitaglia</translation>
+    </message>
+    <message>
+        <source>My Patterns</source>
+        <translation type="unfinished">I miei modelli</translation>
+    </message>
+    <message>
+        <source>My Templates</source>
+        <translation type="unfinished">I miei Modelli</translation>
+    </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished">I miei Layout</translation>
+    </message>
+</context>
 <context>
     <name>QApplication</name>
     <message>
@@ -10355,7 +10602,7 @@ Questa opzione sarà effettiva dopo il riavvio del programma.</translation>
     </message>
     <message>
         <source>Cannot get tokens from formula &apos;%1&apos;. Parser error: %2.</source>
-        <translation>Impossibile ottenere risultato dalla formula &apos;%1&apos;. Errore analizzato: %2.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
@@ -10433,6 +10680,10 @@ Questa opzione sarà effettiva dopo il riavvio del programma.</translation>
         <source>Can&apos;t convert toInt parameter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Piece name &apos;%1&apos; is not unique.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Could not find the segment start.</source>
         <translation type="unfinished"></translation>
@@ -10449,6 +10700,10 @@ Questa opzione sarà effettiva dopo il riavvio del programma.</translation>
         <source>Error calculating segment for curve &apos;%1&apos;. %2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot prepare builtin passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
@@ -10465,18 +10720,14 @@ Questa opzione sarà effettiva dopo il riavvio del programma.</translation>
         <source>Cannot prepare passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Piece name &apos;%1&apos; is not unique.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Cannot get tokens from formula &apos;%1&apos;. Formula error: %2.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>No data for the height dimension.</source>
         <translation type="unfinished"></translation>
@@ -10498,11 +10749,15 @@ Questa opzione sarà effettiva dopo il riavvio del programma.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
+        <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
+        <source>Unplaced pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet 1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -11098,7 +11353,7 @@ Questa opzione sarà effettiva dopo il riavvio del programma.</translation>
     </message>
     <message>
         <source>untitled</source>
-        <translation type="vanished">senza titolo</translation>
+        <translation>senza titolo</translation>
     </message>
     <message>
         <source>&lt;Empty&gt;</source>
@@ -11335,27 +11590,27 @@ Vuoi salvare le tue modifiche?</translation>
     </message>
     <message>
         <source>Locking file</source>
-        <translation>File bloccato</translation>
+        <translation type="vanished">File bloccato</translation>
     </message>
     <message>
         <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Questo file è già aperto in un&apos;altra finestra. Ignora se vuoi continuare (non consigliato, può provocare un danneggiamento dei dati).</translation>
+        <translation type="vanished">Questo file è già aperto in un&apos;altra finestra. Ignora se vuoi continuare (non consigliato, può provocare un danneggiamento dei dati).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Il file bloccato non può essere creato, per mancanza di autorizzazione. Ignora se vuoi continuare (scelta non consigliata, può causare un danneggiamento dei dati).</translation>
+        <translation type="vanished">Il file bloccato non può essere creato, per mancanza di autorizzazione. Ignora se vuoi continuare (scelta non consigliata, può causare un danneggiamento dei dati).</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Si è verificato un errore sconosciuto, come ad esempio il fallimento di una partizione completa durante la trascrizione di un file bloccato. Ignora se vuoi continuare (scelta non consigliata, può causare un danneggiamento dei dati).</translation>
+        <translation type="vanished">Si è verificato un errore sconosciuto, come ad esempio il fallimento di una partizione completa durante la trascrizione di un file bloccato. Ignora se vuoi continuare (scelta non consigliata, può causare un danneggiamento dei dati).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions.</source>
-        <translation>Il file bloccato non può essere creato, per mancanza di autorizzazione.</translation>
+        <translation type="vanished">Il file bloccato non può essere creato, per mancanza di autorizzazione.</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation>Si è verificato un errore sconosciuto, come ad esempio il fallimento di una partizione completa durante la trascrizione di un file bloccato.</translation>
+        <translation type="vanished">Si è verificato un errore sconosciuto, come ad esempio il fallimento di una partizione completa durante la trascrizione di un file bloccato.</translation>
     </message>
     <message>
         <source>Export to CSV</source>
@@ -11403,15 +11658,11 @@ Vuoi salvare le tue modifiche?</translation>
     </message>
     <message>
         <source>The measurements document has no write permissions.</source>
-        <translation>Il file di misure è in sola lettura.</translation>
-    </message>
-    <message>
-        <source>Cannot set permissions for %1 to writable.</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Il file di misure è in sola lettura.</translation>
     </message>
     <message>
         <source>Could not save the file.</source>
-        <translation>Impossibile salvare il file.</translation>
+        <translation type="vanished">Impossibile salvare il file.</translation>
     </message>
     <message>
         <source>Could not save the file</source>
@@ -11541,17 +11792,43 @@ Vuoi salvare le tue modifiche?</translation>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Search measurements by term. &lt;/p&gt;&lt;p&gt;Prepend &amp;quot;/r/&amp;quot; to the front of the search string to search measurements by regex.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Do you want to change the premissions?</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Cannot read settings from a malformed .INI file.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Nome intero</translation>
+    </message>
+    <message>
+        <source>Calculated value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Valore calcolato</translation>
+    </message>
+    <message>
+        <source>Formula</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Formula</translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Valore di base</translation>
+    </message>
+    <message>
+        <source>Correction</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Units:</source>
-        <translation>Unità:</translation>
+        <translation type="unfinished">Unità:</translation>
     </message>
     <message>
         <source>Shift B</source>
@@ -11651,46 +11928,16 @@ Vuoi salvare le tue modifiche?</translation>
     </message>
     <message>
         <source>Inches</source>
-        <translation>Pollici</translation>
+        <translation type="unfinished">Pollici</translation>
     </message>
     <message>
         <source>Centimeters</source>
-        <translation>Centimetri</translation>
+        <translation type="unfinished">Centimetri</translation>
     </message>
     <message>
         <source>Degrees</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Name</source>
-        <comment>measurement column</comment>
-        <translation>Nome</translation>
-    </message>
-    <message>
-        <source>Full name</source>
-        <comment>measurement column</comment>
-        <translation>Nome intero</translation>
-    </message>
-    <message>
-        <source>Calculated value</source>
-        <comment>measurement column</comment>
-        <translation>Valore calcolato</translation>
-    </message>
-    <message>
-        <source>Formula</source>
-        <comment>measurement column</comment>
-        <translation>Formula</translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <comment>measurement column</comment>
-        <translation>Valore di base</translation>
-    </message>
-    <message>
-        <source>Correction</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Restrict first dimension</source>
         <translation type="unfinished"></translation>
@@ -11769,6 +12016,10 @@ Vuoi salvare le tue modifiche?</translation>
         <source>Labels</source>
         <translation>Etichetta</translation>
     </message>
+    <message>
+        <source>Detail label visible</source>
+        <translation type="vanished">Attiva/Disattiva Etichetta del Dettaglio</translation>
+    </message>
     <message>
         <source>Width:</source>
         <translation>Larghezza:</translation>
@@ -11875,31 +12126,31 @@ Vuoi salvare le tue modifiche?</translation>
     </message>
     <message>
         <source>Edit pattern label</source>
-        <translation>Modifica il modello dell&apos;etichetta</translation>
+        <translation type="unfinished">Modifica il modello dell&apos;etichetta</translation>
     </message>
     <message>
         <source>Pattern name:</source>
-        <translation>Nome modello:</translation>
+        <translation type="unfinished">Nome modello:</translation>
     </message>
     <message>
         <source>Pattern number:</source>
-        <translation>Numero modello:</translation>
+        <translation type="unfinished">Numero modello:</translation>
     </message>
     <message>
         <source>Company/Designer name:</source>
-        <translation>Nome Azienda/Stilista:</translation>
+        <translation type="unfinished">Nome Azienda/Stilista:</translation>
     </message>
     <message>
         <source>Customer name:</source>
-        <translation>Nome cliente:</translation>
+        <translation type="unfinished">Nome cliente:</translation>
     </message>
     <message>
         <source>Date format:</source>
-        <translation>Formato Data:</translation>
+        <translation type="unfinished">Formato Data:</translation>
     </message>
     <message>
         <source>Time format:</source>
-        <translation>Formato Ora:</translation>
+        <translation type="unfinished">Formato Ora:</translation>
     </message>
     <message>
         <source>Customer birth date:</source>
@@ -11907,7 +12158,7 @@ Vuoi salvare le tue modifiche?</translation>
     </message>
     <message>
         <source>yyyy-MM-dd</source>
-        <translation>aaaa-MM-gg</translation>
+        <translation type="unfinished">aaaa-MM-gg</translation>
     </message>
     <message>
         <source>Customer email:</source>
@@ -11915,19 +12166,19 @@ Vuoi salvare le tue modifiche?</translation>
     </message>
     <message>
         <source>Materials</source>
-        <translation>Materiali</translation>
+        <translation type="unfinished">Materiali</translation>
     </message>
     <message>
         <source>Pattern materials:</source>
-        <translation>Materiali modello:</translation>
+        <translation type="unfinished">Materiali modello:</translation>
     </message>
     <message>
         <source>Manage list of pattern materials</source>
-        <translation>Gestisci la lista di materiali di modello</translation>
+        <translation type="unfinished">Gestisci la lista di materiali di modello</translation>
     </message>
     <message>
         <source>Manage</source>
-        <translation>Gestisci</translation>
+        <translation type="unfinished">Gestisci</translation>
     </message>
     <message>
         <source>Piece label visible</source>
@@ -12229,6 +12480,18 @@ Vuoi salvare le tue modifiche?</translation>
         <comment>seam allowance</comment>
         <translation>Personalizzato</translation>
     </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Universally Unique IDentifier of piece. Used to identifier piece while updating manual layout. Left empty to generate new value.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TabPlaceLabels</name>
@@ -12404,6 +12667,18 @@ Vuoi salvare le tue modifiche?</translation>
         <source>The text appears under the icon (recommended for beginners).</source>
         <translation type="unfinished">Il testo appare sotto l&apos;icona. (raccomandato per i principianti).</translation>
     </message>
+    <message>
+        <source>Default height and size</source>
+        <translation type="obsolete">Altezza e taglia di default</translation>
+    </message>
+    <message>
+        <source>Default height:</source>
+        <translation type="obsolete">Altezza di default:</translation>
+    </message>
+    <message>
+        <source>Default size:</source>
+        <translation type="obsolete">Taglia di default:</translation>
+    </message>
     <message>
         <source>With OS options</source>
         <translation>Come da opzioni del Sistema Operativo</translation>
@@ -12429,7 +12704,7 @@ Vuoi salvare le tue modifiche?</translation>
     <name>TapePreferencesPathPage</name>
     <message>
         <source>Paths that Valentina uses</source>
-        <translation>Percorsi usati da Valentina</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
@@ -12467,6 +12742,10 @@ Vuoi salvare le tue modifiche?</translation>
         <source>My Patterns</source>
         <translation>I miei modelli</translation>
     </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished">I miei Layout</translation>
+    </message>
 </context>
 <context>
     <name>ToggleDetailInLayout</name>
@@ -12518,19 +12797,15 @@ Vuoi salvare le tue modifiche?</translation>
         <source>Base value invalid</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Size</source>
-        <translation>Taglia</translation>
-    </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Altezza</translation>
+        <translation type="unfinished">Altezza</translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Taglia</translation>
+        <translation type="unfinished">Taglia</translation>
     </message>
     <message>
         <source>Waist</source>
@@ -12552,6 +12827,10 @@ Vuoi salvare le tue modifiche?</translation>
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished">Taglia</translation>
+    </message>
     <message>
         <source>Chest circumference</source>
         <comment>dimension</comment>
@@ -12738,7 +13017,7 @@ Vuoi salvare le tue modifiche?</translation>
     </message>
     <message>
         <source>Comma-Separated Values</source>
-        <translation>Virgola-Valori Separati</translation>
+        <translation type="unfinished">Virgola-Valori Separati</translation>
     </message>
     <message>
         <source>values</source>
@@ -12746,7 +13025,51 @@ Vuoi salvare le tue modifiche?</translation>
     </message>
     <message>
         <source>Export to CSV</source>
-        <translation>Esporta in CSV</translation>
+        <translation type="unfinished">Esporta in CSV</translation>
+    </message>
+    <message>
+        <source>The measurements document has no write permissions.</source>
+        <translation type="unfinished">Il file di misure è in sola lettura.</translation>
+    </message>
+    <message>
+        <source>Do you want to change the premissions?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot set permissions for %1 to writable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save the file.</source>
+        <translation type="unfinished">Impossibile salvare il file.</translation>
+    </message>
+    <message>
+        <source>Locking file</source>
+        <translation type="unfinished">File bloccato</translation>
+    </message>
+    <message>
+        <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished">Questo file è già aperto in un&apos;altra finestra. Ignora se vuoi continuare (non consigliato, può provocare un danneggiamento dei dati).</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished">Il file bloccato non può essere creato, per mancanza di autorizzazione. Ignora se vuoi continuare (scelta non consigliata, può causare un danneggiamento dei dati).</translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished">Si è verificato un errore sconosciuto, come ad esempio il fallimento di una partizione completa durante la trascrizione di un file bloccato. Ignora se vuoi continuare (scelta non consigliata, può causare un danneggiamento dei dati).</translation>
+    </message>
+    <message>
+        <source>This file already opened in another window.</source>
+        <translation type="unfinished">Questo file è già aperto in un&apos;altra finestra.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions.</source>
+        <translation type="unfinished">Il file bloccato non può essere creato, per mancanza di autorizzazione.</translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
+        <translation type="unfinished">Si è verificato un errore sconosciuto, come ad esempio il fallimento di una partizione completa durante la trascrizione di un file bloccato.</translation>
     </message>
 </context>
 <context>
@@ -12831,31 +13154,31 @@ Vuoi salvare le tue modifiche?</translation>
     <name>VAbstractTool</name>
     <message>
         <source>black</source>
-        <translation>Nero</translation>
+        <translation>nero</translation>
     </message>
     <message>
         <source>green</source>
-        <translation>Verde</translation>
+        <translation>verde</translation>
     </message>
     <message>
         <source>blue</source>
-        <translation>Blu</translation>
+        <translation>blu</translation>
     </message>
     <message>
         <source>dark red</source>
-        <translation>Rosso scuro</translation>
+        <translation>rosso scuro</translation>
     </message>
     <message>
         <source>dark green</source>
-        <translation>Verde scuro</translation>
+        <translation>verde scuro</translation>
     </message>
     <message>
         <source>dark blue</source>
-        <translation>Blu scuro</translation>
+        <translation>blu scuro</translation>
     </message>
     <message>
         <source>yellow</source>
-        <translation>Giallo</translation>
+        <translation>giallo</translation>
     </message>
     <message>
         <source>Confirm deletion</source>
@@ -12976,7 +13299,7 @@ Vuoi salvare le tue modifiche?</translation>
     <name>VComboBoxDelegate</name>
     <message>
         <source>Select material</source>
-        <translation>Seleziona materiale</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -13497,6 +13820,34 @@ Vuoi salvare le tue modifiche?</translation>
         <source>The dimension C base</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>The filename of exported layout file. Use it to enable console export mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The filename of layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pattern pieces form the raw layout data file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The raw layout data file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to output format (default = 0, export mode): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to tiled pdf page template (default = 0, export mode with tiled pdf format): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run the program in a test mode. The program in this mode loads a single layout file and silently quit without showing the main window. The key have priority before key &apos;%1&apos;.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VCommonSettings</name>
@@ -13524,6 +13875,10 @@ Vuoi salvare le tue modifiche?</translation>
         <source>patterns</source>
         <translation>modelli</translation>
     </message>
+    <message>
+        <source>manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VContainer</name>
@@ -13733,25 +14088,29 @@ Vuoi salvare le tue modifiche?</translation>
 </context>
 <context>
     <name>VLayoutExporter</name>
+    <message>
+        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot set printer page size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot set printer margins</source>
-        <translation>Margini di stampa impossibili da impostare</translation>
+        <translation type="unfinished">Margini di stampa impossibili da impostare</translation>
     </message>
     <message>
         <source>Can&apos;t open file &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Creating file &apos;%1&apos; failed! %2</source>
-        <translation>Creare file &apos;%1&apos; respinto! %2</translation>
+        <source>Export raw layout data failed. %1.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
-        <translation type="unfinished"></translation>
+        <source>Creating file &apos;%1&apos; failed! %2</source>
+        <translation type="unfinished">Creare file &apos;%1&apos; respinto! %2</translation>
     </message>
     <message>
         <source>Can&apos;t create an flat dxf file.</source>
@@ -13785,15 +14144,15 @@ Vuoi salvare le tue modifiche?</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>Nessun</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height</source>
-        <translation>Altezza</translation>
+        <translation type="unfinished">Altezza</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Taglia</translation>
+        <translation type="unfinished">Taglia</translation>
     </message>
     <message>
         <source>Hip</source>
@@ -13939,6 +14298,114 @@ Vuoi salvare le tue modifiche?</translation>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>VPApplication</name>
+    <message>
+        <source>Error parsing file. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error bad id. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error can&apos;t convert value. Program will be terminated.</source>
+        <translation type="unfinished">Errore impossibile convertire errore. Il programma verrà interrotto.</translation>
+    </message>
+    <message>
+        <source>Error empty parameter. Program will be terminated.</source>
+        <translation type="unfinished">Errore parametro vuoto. Il programma verrà interrotto.</translation>
+    </message>
+    <message>
+        <source>Error wrong id. Program will be terminated.</source>
+        <translation type="unfinished">Errore id scorretto. Il programma verrà interrotto.</translation>
+    </message>
+    <message>
+        <source>Something&apos;s wrong!!</source>
+        <translation type="unfinished">Qualcosa non va!!</translation>
+    </message>
+    <message>
+        <source>Exception thrown: %1. Program will be terminated.</source>
+        <translation type="unfinished">Eccezione generata:%1. Il programma verrà terminato.</translation>
+    </message>
+    <message>
+        <source>Can&apos;t begin to listen for incoming connections on name &apos;%1&apos;</source>
+        <translation type="unfinished">Impossibile iniziare a registrare le connessioni in entrata sul nome &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <source>Export mode doesn&apos;t support openning several files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import raw layout data does not support openning several layout files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, provide one input file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrousel</name>
+    <message>
+        <source>Pieces of </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrouselPieceList</name>
+    <message>
+        <source>Move to Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Elimina</translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPDialogAbout</name>
+    <message>
+        <source>About Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Puzzle version</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Build revision:</source>
+        <translation type="unfinished">Costruisci revisione:</translation>
+    </message>
+    <message>
+        <source>This program is part of Valentina project.</source>
+        <translation type="unfinished">Questo programma è parte del progetto Valentina.</translation>
+    </message>
+    <message>
+        <source>Check For Updates</source>
+        <translation type="unfinished">Controlla gli aggiornamenti</translation>
+    </message>
+    <message>
+        <source>Cannot open your default browser</source>
+        <translation type="unfinished">Non è possibile aprire il browser predefinito</translation>
+    </message>
+    <message>
+        <source>Build revision: %1</source>
+        <translation type="unfinished">Costruisci revisione: %1</translation>
+    </message>
+    <message>
+        <source>Built on %1 at %2</source>
+        <translation type="unfinished">Compilato il %1 alle %2</translation>
+    </message>
+    <message>
+        <source>Web site : %1</source>
+        <translation type="unfinished">Sito web : %1</translation>
+    </message>
+</context>
 <context>
     <name>VPE::VBoolProperty</name>
     <message>
@@ -13961,6 +14428,573 @@ Vuoi salvare le tue modifiche?</translation>
         <translation>Apri file</translation>
     </message>
 </context>
+<context>
+    <name>VPGraphicsPiece</name>
+    <message>
+        <source>Move to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPLayoutFileReader</name>
+    <message>
+        <source>Piece List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Got empty attribute &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPMainWindow</name>
+    <message>
+        <source>Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;File</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished">&amp;Help</translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished">Menu</translation>
+    </message>
+    <message>
+        <source>Piece Carrousel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Infos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Nome:</translation>
+    </message>
+    <message>
+        <source>DummyName</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UUID:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{7b2ce4ae-96f5-4905-bb34-405cb40ca208}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Geometry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mirror piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotation</source>
+        <translation type="unfinished">Rotazione</translation>
+    </message>
+    <message>
+        <source>Angle:</source>
+        <translation type="unfinished">Angolo:</translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° anti-clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Placement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Y:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No piece selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple pieces selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Width</source>
+        <translation type="unfinished">Larghezza</translation>
+    </message>
+    <message>
+        <source>Length</source>
+        <translation type="unfinished">Lunghezza</translation>
+    </message>
+    <message>
+        <source>Orientation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove unused length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Margins</source>
+        <translation type="unfinished">Margini</translation>
+    </message>
+    <message>
+        <source>Right:</source>
+        <translation type="unfinished">Destra:</translation>
+    </message>
+    <message>
+        <source>Top:</source>
+        <translation type="unfinished">Top:</translation>
+    </message>
+    <message>
+        <source>Left:</source>
+        <translation type="unfinished">Sinistra:</translation>
+    </message>
+    <message>
+        <source>Bottom:</source>
+        <translation type="unfinished">Fondo:</translation>
+    </message>
+    <message>
+        <source>Placement Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Row height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Follow grainline</source>
+        <translation type="unfinished">Rispetta drittofilo</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vertical grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Horizontal grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pieces gap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sticky edges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation type="unfinished">Esporta</translation>
+    </message>
+    <message>
+        <source>Export Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiles properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiled Pdf Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Tiles on sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export Tiled Pdf</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation type="unfinished">Layout</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Descrizione</translation>
+    </message>
+    <message>
+        <source>Unit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning superposition of pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning pieces out of bound</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation type="unfinished">&amp;Apri</translation>
+    </message>
+    <message>
+        <source>Ctrl+O</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Salva</translation>
+    </message>
+    <message>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save &amp;As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Import Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation type="unfinished">U&amp;scita</translation>
+    </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation type="unfinished">&amp;Nuovo</translation>
+    </message>
+    <message>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation type="unfinished">About &amp;Qt</translation>
+    </message>
+    <message>
+        <source>About &amp;Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom in</source>
+        <translation type="unfinished">Ingrandire</translation>
+    </message>
+    <message>
+        <source>Zoom out</source>
+        <translation type="unfinished">Rimpicciolire</translation>
+    </message>
+    <message>
+        <source>Zoom 1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom fit best</source>
+        <translation type="unfinished">Zoom migliore adattamento</translation>
+    </message>
+    <message>
+        <source>Zoom sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished">Preferenze</translation>
+    </message>
+    <message>
+        <source>File &apos;%1&apos; doesn&apos;t exist!</source>
+        <translation type="unfinished">File &apos;%1&apos; non esiste!</translation>
+    </message>
+    <message>
+        <source>File error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to read a layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fail to create layout.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not extract data from file &apos;%1&apos;. %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Centimeters</source>
+        <translation type="unfinished">Centimetri</translation>
+    </message>
+    <message>
+        <source>Millimiters</source>
+        <translation type="unfinished">Millimetri</translation>
+    </message>
+    <message>
+        <source>Inches</source>
+        <translation type="unfinished">Pollici</translation>
+    </message>
+    <message>
+        <source>Scale:</source>
+        <translation type="unfinished">Scala:</translation>
+    </message>
+    <message>
+        <source>untitled %1.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>untitled.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read only</source>
+        <translation type="unfinished">Sola lettura</translation>
+    </message>
+    <message>
+        <source>Cannot read settings from a malformed .INI file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save settings. Access denied.</source>
+        <translation type="unfinished">Impossibile salvare le configurazioni. Accesso negato.</translation>
+    </message>
+    <message>
+        <source>Failed to open file, is it writable?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New Window</source>
+        <translation type="unfinished">&amp;New Window</translation>
+    </message>
+    <message>
+        <source>Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open file</source>
+        <translation type="unfinished">Apri il file</translation>
+    </message>
+    <message>
+        <source>Could not save the file</source>
+        <translation type="unfinished">Impossibile salvare il file</translation>
+    </message>
+    <message>
+        <source>layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save as</source>
+        <translation type="unfinished">Salva come</translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window.</source>
+        <translation type="unfinished">Impossibile bloccare. Questo file è già aperto in un&apos;altra finestra.</translation>
+    </message>
+    <message>
+        <source>Could not save file</source>
+        <translation type="unfinished">Impossibile salvare il file</translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window. Expect collissions when run 2 copies of the program.</source>
+        <translation type="unfinished">Impossibile bloccare. Questo file è già aperto in un altra finestra. Previsti conflitti quando 2 copie del programma sono in esecuzione.</translation>
+    </message>
+    <message>
+        <source>Raw Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About Qt</source>
+        <translation type="unfinished">About Qt</translation>
+    </message>
+    <message>
+        <source>PDF Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SVG Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPSheet</name>
+    <message>
+        <source>Letter</source>
+        <translation type="unfinished">Lettera</translation>
+    </message>
+    <message>
+        <source>Legal</source>
+        <translation type="unfinished">Legale</translation>
+    </message>
+    <message>
+        <source>Tabloid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 24in</source>
+        <translation type="unfinished">Rotolo 24pollici</translation>
+    </message>
+    <message>
+        <source>Roll 30in</source>
+        <translation type="unfinished">Rotolo 30pollici</translation>
+    </message>
+    <message>
+        <source>Roll 36in</source>
+        <translation type="unfinished">Rotolo 36pollici</translation>
+    </message>
+    <message>
+        <source>Roll 42in</source>
+        <translation type="unfinished">Rotolo 42pollici</translation>
+    </message>
+    <message>
+        <source>Roll 44in</source>
+        <translation type="unfinished">Rotolo 44pollici</translation>
+    </message>
+    <message>
+        <source>Roll 48in</source>
+        <translation type="unfinished">Rotolo 44pollici {48i?}</translation>
+    </message>
+    <message>
+        <source>Roll 62in</source>
+        <translation type="unfinished">Rotolo 44pollici {62i?}</translation>
+    </message>
+    <message>
+        <source>Roll 72in</source>
+        <translation type="unfinished">Rotolo 44pollici {72i?}</translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation type="unfinished">Personalizzato</translation>
+    </message>
+</context>
+<context>
+    <name>VPTileFactory</name>
+    <message>
+        <source>Grid ( %1 , %2 )</source>
+        <translation type="unfinished">Griglia ( %1 , %2 )</translation>
+    </message>
+    <message>
+        <source>Page %1 of %2</source>
+        <translation type="unfinished">Pagina %1 of %2</translation>
+    </message>
+</context>
 <context>
     <name>VPattern</name>
     <message>
@@ -14306,23 +15340,23 @@ Vuoi salvare le tue modifiche?</translation>
     <name>VPrintLayout</name>
     <message>
         <source>For printing multipages document all sheet should have the same size.</source>
-        <translation>Per stampare documenti con pagine multiple tutti i fogli devono avere la stessa dimensione.</translation>
+        <translation type="unfinished">Per stampare documenti con pagine multiple tutti i fogli devono avere la stessa dimensione.</translation>
     </message>
     <message>
         <source>For previewing multipage document all sheet should have the same size.</source>
-        <translation>Per avere l&apos;anteprima dei documenti con più pagine tutti i fogli dovrebbero avere la stessa dimensione.</translation>
+        <translation type="unfinished">Per avere l&apos;anteprima dei documenti con più pagine tutti i fogli dovrebbero avere la stessa dimensione.</translation>
     </message>
     <message>
         <source>Pages will be cropped because they do not fit printer paper size.</source>
-        <translation>Le pagine verranno tagliate perchè non si adattano al formato della carta della stampante.</translation>
+        <translation type="unfinished">Le pagine verranno tagliate perchè non si adattano al formato della carta della stampante.</translation>
     </message>
     <message>
         <source>Print error</source>
-        <translation>Errore di stampa</translation>
+        <translation type="unfinished">Errore di stampa</translation>
     </message>
     <message>
         <source>Cannot proceed because there are no available printers in your system.</source>
-        <translation>Impossibile procedere perché non ci sono stampanti disponibili nel sistema.</translation>
+        <translation type="unfinished">Impossibile procedere perché non ci sono stampanti disponibili nel sistema.</translation>
     </message>
     <message>
         <source>Failed to open file, is it writable?</source>
@@ -14334,7 +15368,7 @@ Vuoi salvare le tue modifiche?</translation>
     </message>
     <message>
         <source>Cannot set printer margins</source>
-        <translation>Margini di stampa impossibili da impostare</translation>
+        <translation type="unfinished">Margini di stampa impossibili da impostare</translation>
     </message>
     <message>
         <source>Cannot set custom printer page size</source>
@@ -14362,18 +15396,30 @@ Vuoi salvare le tue modifiche?</translation>
     </message>
     <message>
         <source>The layout is stale.</source>
-        <translation>Il layout è datato.</translation>
+        <translation type="unfinished">Il layout è datato.</translation>
     </message>
     <message>
         <source>The layout was not updated since last pattern modification. Do you want to continue?</source>
-        <translation>Il layout non è stato aggiornato dall&apos;ultima modifica del pattern. Vuoi continuare?</translation>
+        <translation type="unfinished">Il layout non è stato aggiornato dall&apos;ultima modifica del pattern. Vuoi continuare?</translation>
+    </message>
+</context>
+<context>
+    <name>VRawLayout</name>
+    <message>
+        <source>VRawLayout::ReadFile() failed. Raw layout format prefix mismatch error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VRawLayout::ReadFile() failed.
+Raw layout format compatibility error: actualFileVersion = %1 and fileVersion = %2</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VSettings</name>
     <message>
         <source>layouts</source>
-        <translation>layouts</translation>
+        <translation type="vanished">layouts</translation>
     </message>
 </context>
 <context>
@@ -15310,7 +16356,7 @@ Vuoi salvare le tue modifiche?</translation>
     </message>
     <message>
         <source>Notes:</source>
-        <translation>Note:</translation>
+        <translation type="unfinished">Note:</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -16614,7 +17660,7 @@ Vuoi salvare le tue modifiche?</translation>
     <message>
         <source>CurrentSeamAllowance</source>
         <comment>Do not add space between words</comment>
-        <translation>MargineCucituraAttuale</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>degTorad</source>
@@ -16721,6 +17767,36 @@ Vuoi salvare le tue modifiche?</translation>
         <comment>Left symbol _ in the name</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>date</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">data</translation>
+    </message>
+    <message>
+        <source>time</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">ora</translation>
+    </message>
+    <message>
+        <source>patternName</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">nomeModello</translation>
+    </message>
+    <message>
+        <source>patternNumber</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">numeroModello</translation>
+    </message>
+    <message>
+        <source>author</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">autore</translation>
+    </message>
+    <message>
+        <source>customer</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">cliente</translation>
+    </message>
     <message>
         <source>r2cm</source>
         <comment>round to up to 1 decimal</comment>
@@ -16959,6 +18035,13 @@ Vuoi salvare le tue modifiche?</translation>
         <translation type="vanished">Errore nella ripristinazione del file di backup: %1.</translation>
     </message>
 </context>
+<context>
+    <name>VValentinaSettings</name>
+    <message>
+        <source>layouts</source>
+        <translation type="unfinished">layouts</translation>
+    </message>
+</context>
 <context>
     <name>VWidgetDetails</name>
     <message>
diff --git a/share/translations/valentina_nl_NL.ts b/share/translations/valentina_nl_NL.ts
index 5a4a01e23..a584b5574 100644
--- a/share/translations/valentina_nl_NL.ts
+++ b/share/translations/valentina_nl_NL.ts
@@ -576,11 +576,11 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -707,15 +707,15 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Alias:</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -834,15 +834,15 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Alias:</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -965,11 +965,11 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1036,15 +1036,15 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Alias:</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1095,15 +1095,15 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Alias:</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1206,19 +1206,19 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias1:</source>
-        <translation>Alias1:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias2:</source>
-        <translation>Alias2:</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1297,19 +1297,19 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Alias1:</source>
-        <translation>Alias1:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias2:</source>
-        <translation>Alias2:</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1388,19 +1388,19 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Alias1:</source>
-        <translation>Alias1:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias2:</source>
-        <translation>Alias2:</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1479,19 +1479,19 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Alias1:</source>
-        <translation>Alias1:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias2:</source>
-        <translation>Alias2:</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1792,19 +1792,19 @@
     <name>DialogDimensionLabels</name>
     <message>
         <source>Dimension labels</source>
-        <translation>Dimensie labels</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <translation>Waarde</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Label</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dimension:</source>
-        <translation>Dimensie:</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished">Waarde</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished">Label</translation>
     </message>
 </context>
 <context>
@@ -1958,6 +1958,14 @@
         <source>Measurments file name</source>
         <translation>Maten bestandsnaam</translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="vanished">Maat</translation>
+    </message>
+    <message>
+        <source>Height</source>
+        <translation type="vanished">Hoogte</translation>
+    </message>
     <message>
         <source>Measurments extension</source>
         <translation>Maten uitbreiding</translation>
@@ -2068,67 +2076,47 @@
     </message>
     <message>
         <source>Measurements units</source>
-        <translation>Maateenheid</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pattern units</source>
-        <translation>Patroon eenheden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size units</source>
-        <translation>Maat eenheden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Customer birth date</source>
-        <translation>Klant geboortedatum</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Customer email</source>
-        <translation>Klant e-mail</translation>
-    </message>
-    <message>
-        <source>Measurement: %1</source>
-        <translation>Maat: %1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Hoogte</translation>
+        <translation type="unfinished">Hoogte</translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Maat</translation>
+        <translation type="unfinished">Maat</translation>
     </message>
     <message>
         <source>Hip</source>
         <comment>dimension</comment>
-        <translation>Heup</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Waist</source>
         <comment>dimension</comment>
-        <translation>Taille</translation>
-    </message>
-    <message>
-        <source>No data for the height dimension.</source>
-        <translation>Geen gegevens voor de lengte.</translation>
-    </message>
-    <message>
-        <source>No data for the size dimension.</source>
-        <translation>Geen gegevens voor de grootte.</translation>
-    </message>
-    <message>
-        <source>No data for the hip dimension.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No data for the waist dimension.</source>
-        <translation>Geen gegevens voor de taille.</translation>
-    </message>
-    <message>
-        <source>Final measurement: %1</source>
-        <translation>Definitieve maten: %1</translation>
+        <source>Measurement: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height label</source>
@@ -2150,6 +2138,26 @@
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Final measurement: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the height dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the size dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the hip dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the waist dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogEditWrongFormula</name>
@@ -2382,15 +2390,15 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Alias:</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -2497,11 +2505,11 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -2727,15 +2735,11 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Alias:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pen style:</source>
@@ -2749,17 +2753,21 @@
         <source>Ready</source>
         <translation>Klaar</translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
-        <translation>Ongeldig achtervoegsel</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid group name</source>
-        <translation>Ongeldige groepsnaam</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Label:</source>
-        <translation>Label:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
@@ -2767,15 +2775,15 @@
     </message>
     <message>
         <source>Invalid point</source>
-        <translation>Ongeldig punt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid label</source>
-        <translation>Ongeldige label</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid alias</source>
-        <translation>Ongeldige alias</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -2846,15 +2854,11 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Alias:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pen style:</source>
@@ -2868,17 +2872,21 @@
         <source>Ready</source>
         <translation>Klaar</translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
-        <translation>Ongeldig achtervoegsel</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid group name</source>
-        <translation>Ongeldige groepsnaam</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Label:</source>
-        <translation>Label:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
@@ -2886,23 +2894,23 @@
     </message>
     <message>
         <source>Invalid line points</source>
-        <translation>Ongeldig lijnpunt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid first line point</source>
-        <translation>Ongeldig eerste lijnpunt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid second line point</source>
-        <translation>Ongeldig tweede lijnpunt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid label</source>
-        <translation>Ongeldige label</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid alias</source>
-        <translation>Ongeldige alias</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3020,11 +3028,11 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3407,25 +3415,37 @@
 </context>
 <context>
     <name>DialogInsertNode</name>
+    <message>
+        <source>Insert node</source>
+        <translation type="vanished">Voeg knooppunt in</translation>
+    </message>
+    <message>
+        <source>Item:</source>
+        <translation type="vanished">Item:</translation>
+    </message>
     <message>
         <source>Piece:</source>
         <translation>Onderdeel:</translation>
     </message>
+    <message>
+        <source>Uknown</source>
+        <translation type="vanished">Onbekend</translation>
+    </message>
     <message>
         <source>The list of pieces is empty. Please, first create at least one piece for current pattern piece.</source>
         <translation>De lijst van patroondelen is leeg. Gelieve ten minste één patroondeel aan te maken voor het huidig patroon.</translation>
     </message>
     <message>
         <source>Insert nodes</source>
-        <translation>Knooppunt invoegen</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Verwijder</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number:</source>
-        <translation>Nummer:</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3884,11 +3904,11 @@ Toch de instellingen aanpassen?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3951,11 +3971,11 @@ Toch de instellingen aanpassen?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -4078,11 +4098,11 @@ Toch de instellingen aanpassen?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -4213,101 +4233,101 @@ Toch de instellingen aanpassen?</translation>
     <name>DialogMeasurementsCSVColumns</name>
     <message>
         <source>Setup columns</source>
-        <translation>Instellen kolommen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preview</source>
-        <translation>Voorbeeld</translation>
+        <translation type="unfinished">Voorbeeld</translation>
     </message>
     <message>
         <source>Input</source>
-        <translation>Ingave</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import</source>
-        <translation>Importeer</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Columns</source>
-        <translation>Kolommen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full name:</source>
-        <translation>Volledige naam:</translation>
+        <translation type="unfinished">Volledige naam:</translation>
     </message>
     <message>
         <source>Description:</source>
-        <translation>Beschrijving:</translation>
+        <translation type="unfinished">Beschrijving:</translation>
     </message>
     <message>
         <source>Ready</source>
-        <translation>Klaar</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation>Naam</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <translation>Waarde</translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <translation>Basis waarde</translation>
-    </message>
-    <message>
-        <source>Skip</source>
-        <translation>Overslaan</translation>
-    </message>
-    <message>
-        <source>Shift (%1)*:</source>
-        <translation>Shift (%1)*:</translation>
-    </message>
-    <message>
-        <source>File path is empty</source>
-        <translation>Bestandspad is leeg</translation>
-    </message>
-    <message>
-        <source>Not enough columns</source>
-        <translation>Niet genoeg kolommen</translation>
-    </message>
-    <message>
-        <source>Not enough data to import</source>
-        <translation>Onvoldoende gegevens om te importeren</translation>
-    </message>
-    <message>
-        <source>Please, select unique number for each column</source>
-        <translation>Gelieve een uniek nummer voor elke kolom te selecteren</translation>
+        <translation type="unfinished">Klaar</translation>
     </message>
     <message>
         <source>Name</source>
         <comment>measurement column</comment>
-        <translation>Naam</translation>
+        <translation type="unfinished">Naam</translation>
     </message>
     <message>
         <source>Value</source>
         <comment>measurement column</comment>
-        <translation>Waarde</translation>
+        <translation type="unfinished">Waarde</translation>
     </message>
     <message>
         <source>Full name</source>
         <comment>measurement column</comment>
-        <translation>Volledige naam</translation>
+        <translation type="unfinished">Volledige naam</translation>
     </message>
     <message>
         <source>Description</source>
         <comment>measurement column</comment>
-        <translation>Beschrijving</translation>
+        <translation type="unfinished">Beschrijving</translation>
     </message>
     <message>
         <source>Base value</source>
         <comment>measurement column</comment>
-        <translation>Basis waarde</translation>
+        <translation type="unfinished">Basis waarde</translation>
     </message>
     <message>
         <source>Shift (%1):</source>
         <comment>measurement column</comment>
-        <translation>Shift (%1):</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Naam</translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished">Waarde</translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <translation type="unfinished">Basis waarde</translation>
+    </message>
+    <message>
+        <source>Shift (%1)*:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File path is empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not enough columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not enough data to import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, select unique number for each column</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -4402,15 +4422,11 @@ Toch de instellingen aanpassen?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Alias:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pen style:</source>
@@ -4424,17 +4440,21 @@ Toch de instellingen aanpassen?</translation>
         <source>Ready</source>
         <translation>Klaar</translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
-        <translation>Ongeldig achtervoegsel</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid group name</source>
-        <translation>Ongeldige groepsnaam</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Label:</source>
-        <translation>Label:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
@@ -4442,23 +4462,23 @@ Toch de instellingen aanpassen?</translation>
     </message>
     <message>
         <source>Invalid angle formula</source>
-        <translation>Ongeldige hoek formule</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid rotation angle formula</source>
-        <translation>Ongeldige draaihoek formule</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid length formula</source>
-        <translation>Ongeldige lengte formule</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid label</source>
-        <translation>Ongeldige label</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid alias</source>
-        <translation>Ongeldige alias</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -4663,11 +4683,11 @@ Toch de instellingen aanpassen?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -4789,7 +4809,7 @@ Toch de instellingen aanpassen?</translation>
     </message>
     <message>
         <source>untitled</source>
-        <translation>naamloos</translation>
+        <translation>zonder titel</translation>
     </message>
     <message>
         <source>Path:</source>
@@ -4859,6 +4879,10 @@ Toch de instellingen aanpassen?</translation>
         <source>Show measurements file</source>
         <translation type="vanished">Toon matenbestand</translation>
     </message>
+    <message>
+        <source>From multisize measurements</source>
+        <translation type="vanished">Van multimaten maten metingen</translation>
+    </message>
     <message>
         <source>Pattern</source>
         <translation>Patroon</translation>
@@ -4867,10 +4891,66 @@ Toch de instellingen aanpassen?</translation>
         <source>For technical notes</source>
         <translation>Voor technische aantekeningen</translation>
     </message>
+    <message>
+        <source>Label data</source>
+        <translation type="vanished">Gegevens label</translation>
+    </message>
+    <message>
+        <source>Label template:</source>
+        <translation type="vanished">Sjabloon label:</translation>
+    </message>
+    <message>
+        <source>Edit pattern label</source>
+        <translation type="vanished">Verander patroon label</translation>
+    </message>
+    <message>
+        <source>Edit template</source>
+        <translation type="vanished">Verander sjabloon</translation>
+    </message>
+    <message>
+        <source>Date format:</source>
+        <translation type="vanished">Datum indeling:</translation>
+    </message>
+    <message>
+        <source>Time format:</source>
+        <translation type="vanished">Tijdsindeling:</translation>
+    </message>
+    <message>
+        <source>Save label data.</source>
+        <translation type="vanished">Sla gegevens label op.</translation>
+    </message>
+    <message>
+        <source>Label data were changed. Do you want to save them before editing label template?</source>
+        <translation type="vanished">Gegevens label is veranderd. Wil je deze eerst opslaan voordat u het sjabloon label veranderd?</translation>
+    </message>
+    <message>
+        <source>Materials</source>
+        <translation type="vanished">Materialen</translation>
+    </message>
+    <message>
+        <source>Pattern materials:</source>
+        <translation type="vanished">Patroon materialen:</translation>
+    </message>
+    <message>
+        <source>Manage list of pattern materials</source>
+        <translation type="vanished">Beheren van patroon materiaallijst</translation>
+    </message>
+    <message>
+        <source>Manage</source>
+        <translation type="vanished">Beheren</translation>
+    </message>
+    <message>
+        <source>The customer name from individual measurements</source>
+        <translation type="vanished">De naam van de klant van individuele maten</translation>
+    </message>
     <message>
         <source>Label language:</source>
         <translation>Taal label:</translation>
     </message>
+    <message>
+        <source>yyyy-MM-dd</source>
+        <translation type="obsolete">yyyy-MM-dd</translation>
+    </message>
     <message>
         <source>Passmark length:</source>
         <translation type="unfinished"></translation>
@@ -5572,11 +5652,11 @@ Toch de instellingen aanpassen?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -5671,11 +5751,11 @@ Toch de instellingen aanpassen?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -5766,11 +5846,11 @@ Toch de instellingen aanpassen?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -5825,11 +5905,11 @@ Toch de instellingen aanpassen?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -5892,11 +5972,11 @@ Toch de instellingen aanpassen?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -6007,11 +6087,11 @@ Toch de instellingen aanpassen?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -6054,11 +6134,11 @@ Toch de instellingen aanpassen?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Curve 1</source>
@@ -6066,11 +6146,11 @@ Toch de instellingen aanpassen?</translation>
     </message>
     <message>
         <source>Alias1:</source>
-        <translation>Alias1:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias2:</source>
-        <translation>Alias2:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Curve 2</source>
@@ -6103,35 +6183,57 @@ Toch de instellingen aanpassen?</translation>
         </translation>
     </message>
 </context>
+<context>
+    <name>DialogPuzzlePreferences</name>
+    <message>
+        <source>Puzzle preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paths</source>
+        <translation type="unfinished">Paden</translation>
+    </message>
+    <message numerus="yes">
+        <source>Followed %n option(s) require restart to take effect: %1.</source>
+        <translation type="unfinished">
+            <numerusform>Volgende optie vereist een herstart om geactiveerd te worden: %1.</numerusform>
+            <numerusform>Volgende %n optie(s) vereisen een herstart om geactiveerd te worden: %1.</numerusform>
+        </translation>
+    </message>
+</context>
 <context>
     <name>DialogRestrictDimension</name>
     <message>
         <source>Restrict dimension</source>
-        <translation>Beperk dimensies</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dimension A:</source>
-        <translation>Dimensie A:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restriction</source>
-        <translation>Beperking</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Min:</source>
-        <translation>Min:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Max:</source>
-        <translation>Max:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Exclude</source>
-        <translation>Uitsluiten</translation>
+        <translation type="unfinished">Uitsluiten</translation>
     </message>
     <message>
         <source>Include</source>
-        <translation>Hoort bij</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -6214,15 +6316,11 @@ Toch de instellingen aanpassen?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Alias</source>
-        <translation>Alias</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pen style:</source>
@@ -6236,37 +6334,41 @@ Toch de instellingen aanpassen?</translation>
         <source>Ready</source>
         <translation>Klaar</translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
-        <translation>Ongeldig achtervoegsel</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid group name</source>
-        <translation>Ongeldige groepsnaam</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid rotation point</source>
-        <translation>Ongeldig draaipunt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid label</source>
-        <translation>Ongeldige label</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid alias</source>
-        <translation>Ongeldige alias</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid angle formula</source>
-        <translation>Ongeldige hoek formule</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Label:</source>
-        <translation>Label:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Alias:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
@@ -6478,6 +6580,10 @@ Toch de instellingen aanpassen?</translation>
         <source>Numerical control</source>
         <translation>Numerieke controle</translation>
     </message>
+    <message>
+        <source>Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogSeamAllowance</name>
@@ -6707,106 +6813,106 @@ Toch de instellingen aanpassen?</translation>
     </message>
     <message>
         <source>The customer name from individual measurements</source>
-        <translation>De naam van de klant van individuele maten</translation>
+        <translation type="unfinished">De naam van de klant van individuele maten</translation>
     </message>
     <message>
         <source>The customer email from individual measurements</source>
-        <translation>E-mail klant uit persoonlijke maten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The customer birth date from individual measurements</source>
-        <translation>Geboortedatum klant uit persoonlijke maten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save label data.</source>
-        <translation>Sla gegevens label op.</translation>
+        <translation type="unfinished">Sla gegevens label op.</translation>
     </message>
     <message>
         <source>Label data were changed. Do you want to save them before editing label template?</source>
-        <translation>Gegevens label is veranderd. Wil je deze eerst opslaan voordat u het sjabloon label veranderd?</translation>
+        <translation type="unfinished">Gegevens label is veranderd. Wil je deze eerst opslaan voordat u het sjabloon label veranderd?</translation>
     </message>
 </context>
 <context>
     <name>DialogSetupMultisize</name>
     <message>
         <source>Setup multisize measurements</source>
-        <translation>Multimaten maten instellen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use full circumference</source>
-        <translation>Gebruik volledige omtrek</translation>
-    </message>
-    <message>
-        <source>Min value:</source>
-        <translation>Min waarde:</translation>
-    </message>
-    <message>
-        <source>Minimal value described in the column</source>
-        <translation>Minimale waarde beschreven in de kolom</translation>
-    </message>
-    <message>
-        <source>Max value:</source>
-        <translation>Max waarde:</translation>
-    </message>
-    <message>
-        <source>Maximal value described in the column</source>
-        <translation>Maximale waarde beschreven in de kolom</translation>
-    </message>
-    <message>
-        <source>Step:</source>
-        <translation>Stap:</translation>
-    </message>
-    <message>
-        <source>Single-step between the column values</source>
-        <translation>Enkele stap tussen de kolom waardes</translation>
-    </message>
-    <message>
-        <source>Base:</source>
-        <translation>Basis:</translation>
-    </message>
-    <message>
-        <source>The base value for the column</source>
-        <translation>Basiswaarde voor de kolom</translation>
-    </message>
-    <message>
-        <source>Circumference</source>
-        <translation>Omtrek</translation>
-    </message>
-    <message>
-        <source>Please, provide correct data for dimensions</source>
-        <translation>Gelieve de juiste gegevens aan te bieden voor de kolom</translation>
-    </message>
-    <message>
-        <source>Please, select at least one dimension</source>
-        <translation>Gelieve ten minste één dimensie te selecteren</translation>
-    </message>
-    <message>
-        <source>No more than 3 dimensions allowed</source>
-        <translation>Niet meer dan 3 dimensies toegelaten</translation>
-    </message>
-    <message>
-        <source>Ready</source>
-        <translation>Klaar</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Hoogte</translation>
+        <translation type="unfinished">Hoogte</translation>
+    </message>
+    <message>
+        <source>Min value:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimal value described in the column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max value:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maximal value described in the column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Step:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Single-step between the column values</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Base:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The base value for the column</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Maat</translation>
+        <translation type="unfinished">Maat</translation>
+    </message>
+    <message>
+        <source>Circumference</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Waist</source>
         <comment>dimension</comment>
-        <translation>Taille</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hip</source>
         <comment>dimension</comment>
-        <translation>Heup</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, provide correct data for dimensions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, select at least one dimension</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No more than 3 dimensions allowed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ready</source>
+        <translation type="unfinished">Klaar</translation>
     </message>
 </context>
 <context>
@@ -6917,11 +7023,11 @@ Toch de instellingen aanpassen?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -6960,11 +7066,11 @@ Toch de instellingen aanpassen?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7107,15 +7213,15 @@ Toch de instellingen aanpassen?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Alias:</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7266,15 +7372,15 @@ Toch de instellingen aanpassen?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Alias:</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7458,11 +7564,11 @@ Toch de instellingen aanpassen?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7569,11 +7675,11 @@ Toch de instellingen aanpassen?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Gereedschap</translation>
+        <translation type="unfinished">Gereedschap</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7678,7 +7784,7 @@ Toch de instellingen aanpassen?</translation>
     </message>
     <message>
         <source>New %1 test version is now available. Would you like to download it now?</source>
-        <translation>Nieuwe %1 test versie is beschikbaar. Wens je die nu te downloaden?</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7823,51 +7929,51 @@ Toch de instellingen aanpassen?</translation>
     </message>
     <message>
         <source>Set base for dimension A in the table units.</source>
-        <translation>Zet de basis voor dimensie A in de tabel eenheden.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The dimension A base</source>
-        <translation>Dimensie A basis</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set base for dimension B in the table units.</source>
-        <translation>Zet de basis voor dimensie B in de tabel eenheden.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The dimension B base</source>
-        <translation>Dimensie B basis</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set base for dimension C in the table units.</source>
-        <translation>Zet de basis voor dimensie C in de tabel eenheden.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The dimension C base</source>
-        <translation>Dimensie C basis</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set pattern file units: cm, mm, inch.</source>
-        <translation>Stel patroon bestand eenheid in: cm, mm, inches.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The pattern units</source>
-        <translation>Patroon eenheden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid dimension A base value.</source>
-        <translation>Ongeldige waarde voor dimensie A basis.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid dimension B base value.</source>
-        <translation>Ongeldige waarde voor dimensie B basis.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid dimension C base value.</source>
-        <translation>Ongeldige waarde voor dimensie C basis.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Formula warning: %1. Program will be terminated.</source>
-        <translation>Formule waarschuwing: %1. Programma wordt gestopt.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -8282,7 +8388,7 @@ Toch de instellingen aanpassen?</translation>
     </message>
     <message>
         <source>untitled.val</source>
-        <translation>naamloos.val</translation>
+        <translation>zonder titel.val</translation>
     </message>
     <message>
         <source>The pattern has been modified.
@@ -8307,7 +8413,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>This file already opened in another window.</source>
-        <translation>Dit bestand is al geopend in een ander venster.</translation>
+        <translation type="vanished">Dit bestand is al geopend in een ander venster.</translation>
     </message>
     <message>
         <source>Wrong units.</source>
@@ -8760,27 +8866,27 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Locking file</source>
-        <translation>Vergrendelingsbestand</translation>
+        <translation type="vanished">Vergrendelingsbestand</translation>
     </message>
     <message>
         <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Dit bestand is al geopend in een ander venster. Negeren als u wilt doorgaan (niet aanbevolen, kan leiden tot gegevensbeschadiging).</translation>
+        <translation type="vanished">Dit bestand is al geopend in een ander venster. Negeren als u wilt doorgaan (niet aanbevolen, kan leiden tot gegevensbeschadiging).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Het vergrendelingsbestand kon niet worden aangemaakt, wegens het ontbreken van machtigingen. Negeren als u wilt doorgaan  (niet aanbevolen, kan leiden tot gegevensbeschadiging).</translation>
+        <translation type="vanished">Het vergrendelingsbestand kon niet worden aangemaakt, wegens het ontbreken van machtigingen. Negeren als u wilt doorgaan  (niet aanbevolen, kan leiden tot gegevensbeschadiging).</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Onbekende fout gebeurd, bijvoorbeeld een volledige partitie voorkomt het schrijven uit het vergrendelingsbestand. Negeren als u wilt doorgaan (niet aanbevolen, kan leiden tot gegevensbeschadiging).</translation>
+        <translation type="vanished">Onbekende fout gebeurd, bijvoorbeeld een volledige partitie voorkomt het schrijven uit het vergrendelingsbestand. Negeren als u wilt doorgaan (niet aanbevolen, kan leiden tot gegevensbeschadiging).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions.</source>
-        <translation>Het vergrendelingsbestand kon niet worden aangemaakt, wegens het ontbreken van machtigingen.</translation>
+        <translation type="vanished">Het vergrendelingsbestand kon niet worden aangemaakt, wegens het ontbreken van machtigingen.</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation>Onbekende fout gebeurd, bijvoorbeeld een volledige partitie voorkomt het schrijven uit het vergrendelingsbestand.</translation>
+        <translation type="vanished">Onbekende fout gebeurd, bijvoorbeeld een volledige partitie voorkomt het schrijven uit het vergrendelingsbestand.</translation>
     </message>
     <message>
         <source>Report Bug...</source>
@@ -8940,15 +9046,15 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>The document has no write permissions.</source>
-        <translation>Dit document kan niet gewijzigd worden.</translation>
+        <translation type="vanished">Dit document kan niet gewijzigd worden.</translation>
     </message>
     <message>
         <source>Cannot set permissions for %1 to writable.</source>
-        <translation>Kan geen schrijftoestemming geven voor %1.</translation>
+        <translation type="vanished">Kan geen schrijftoestemming geven voor %1.</translation>
     </message>
     <message>
         <source>Could not save the file.</source>
-        <translation>Het bestand is niet bewaard.</translation>
+        <translation type="vanished">Het bestand is niet bewaard.</translation>
     </message>
     <message>
         <source>Could not save the file</source>
@@ -9034,6 +9140,10 @@ Do you want to save your changes?</source>
         <source>Insert node tool</source>
         <translation>Voeg knooppunt toe</translation>
     </message>
+    <message>
+        <source>Select an item to insert</source>
+        <translation type="vanished">Selecteer een item om in te voegen</translation>
+    </message>
     <message>
         <source>Open Tape app for creating or editing measurements file</source>
         <translation>Open de Tape app om een matenbestand te wijzigen of aan te maken</translation>
@@ -9094,6 +9204,14 @@ Do you want to save your changes?</source>
         <source>Can&apos;t export details.</source>
         <translation>Kan geen details exporteren.</translation>
     </message>
+    <message>
+        <source>Couldn&apos;t set size. Need a file with multisize measurements.</source>
+        <translation type="vanished">Kon de maat niet vaststellen. Heb een bestand nodig met multimaten maten metingen.</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t set height. Need a file with multisize measurements.</source>
+        <translation type="vanished">Kon de hoogte niet vaststellen. Heb een bestand nodig met multimaten metingen.</translation>
+    </message>
     <message>
         <source>Label template editor</source>
         <translation>Label sjabloon bewerker</translation>
@@ -9220,11 +9338,11 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Increase label font</source>
-        <translation>Vergroot fontgrootte label</translation>
+        <translation>Vermeerder label fontgrootte</translation>
     </message>
     <message>
         <source>Decrease label font</source>
-        <translation>Verklein fontgrootte label</translation>
+        <translation>Verminder label fontgrootte</translation>
     </message>
     <message>
         <source>Original label font</source>
@@ -9334,66 +9452,90 @@ Do you want to save your changes?</source>
         <source>Watermark files</source>
         <translation>Watermerk bestanden</translation>
     </message>
+    <message>
+        <source>Manual Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open the Puzzle app</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished">Opwaardering</translation>
+    </message>
+    <message>
+        <source>Update manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Do you want to change the premissions?</source>
-        <translation>Wens je de rechten te veranderen?</translation>
+        <translation type="obsolete">Wens je de rechten te veranderen?</translation>
+    </message>
+    <message>
+        <source>Unable to prepare raw layout data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select manual layout</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not supported dimension A value &apos;%1&apos; for this pattern file.</source>
-        <translation>Niet ondersteunde dimensie A waarde &apos;%1&apos; voor dit patroonbestand.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t set dimension A. Need a file with multisize measurements.</source>
-        <translation>Kan dimensie A niet instellen. Heb een bestand nodig met multimaat maten metingen.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t set dimension A. File wasn&apos;t opened.</source>
-        <translation>Kan dimensie A niet instellen. Bestand was niet geopend.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not supported dimension B value &apos;%1&apos; for this pattern file.</source>
-        <translation>Niet ondersteunde dimensie B waarde &apos;%1&apos; voor dit patroonbestand.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t set dimension B. Need a file with multisize measurements.</source>
-        <translation>Kan dimensie B niet instellen. Heb een bestand nodig met multimaat maten metingen.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t set dimension B. File wasn&apos;t opened.</source>
-        <translation>Kan dimensie B niet instellen. Bestand was niet geopend.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not supported dimension C value &apos;%1&apos; for this pattern file.</source>
-        <translation>Niet ondersteunde dimensie C waarde &apos;%1&apos; voor dit patroonbestand.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t set dimension C. Need a file with multisize measurements.</source>
-        <translation>Kan dimensie C niet instellen. Heb een bestand nodig met multimaat maten metingen.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t set dimension C. File wasn&apos;t opened.</source>
-        <translation>Kan dimensie C niet instellen. Bestand was niet geopend.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not create recipe file. %1</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Shop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scalable Vector Graphics files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save draw</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw export</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>MainWindowsNoGUI</name>
@@ -9533,6 +9675,14 @@ Do you want to save your changes?</source>
         <source>Measurement file contains invalid known measurement(s).</source>
         <translation>Maten bestand bevat ongeldige bekende ma(a)t(en).</translation>
     </message>
+    <message>
+        <source>Wrong units.</source>
+        <translation type="vanished">Verkeerde eenheden.</translation>
+    </message>
+    <message>
+        <source>Application doesn&apos;t support multisize table with inches.</source>
+        <translation type="vanished">Applicatie ondersteunt niet het multimaten maten tabel met inches.</translation>
+    </message>
     <message>
         <source>File error.</source>
         <translation>Bestandsfout.</translation>
@@ -9553,10 +9703,30 @@ Do you want to save your changes?</source>
         <source>Timeout.</source>
         <translation>Time-out.</translation>
     </message>
+    <message>
+        <source>Cannot set printer page size</source>
+        <translation type="vanished">Kan paginagrootte op printer niet instellen</translation>
+    </message>
+    <message>
+        <source>Cannot set custom printer page size</source>
+        <translation type="vanished">Kan aangepaste paginagrootte op printer niet instellen</translation>
+    </message>
     <message>
         <source>Process has been stoped because of exception.</source>
         <translation>Proces werd onderbroken ten gevolge van een uitzondering.</translation>
     </message>
+    <message>
+        <source>File error.
+
+%1
+
+%2</source>
+        <translation type="vanished">Bestandsfout.
+
+%1
+
+%2</translation>
+    </message>
 </context>
 <context>
     <name>MoveDoubleLabel</name>
@@ -9896,11 +10066,11 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Change the position of the tool panel to optimize for big screen resolutions. By default, the tool panel will take all available space.</source>
-        <translation>Verander de positie van het gereedschapspaneel om te optimatizeren voor hoge scherm resoluties. Standaard zal het gereedschapspaneel alle beschikbare plaats innemen.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tool panel scaling</source>
-        <translation>Paneel herschalings gereedschap</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t use the native file dialog</source>
@@ -9957,6 +10127,10 @@ Do you want to save your changes?</source>
         <source>My label templates</source>
         <translation>Mijn label sjablonen</translation>
     </message>
+    <message>
+        <source>My manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PreferencesPatternPage</name>
@@ -10099,6 +10273,111 @@ Deze optie wordt actief na een herstart..</translation>
         <translation>scene weergeven</translation>
     </message>
 </context>
+<context>
+    <name>Puzzle</name>
+    <message>
+        <source>Export options can be used with single input file only.</source>
+        <translation type="unfinished">Exportopties kunnen worden gebruikt met slechts één invoerbestand.</translation>
+    </message>
+    <message>
+        <source>Valentina&apos;s manual layout editor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The manual layout file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesConfigurationPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished">Vorm</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished">Taal</translation>
+    </message>
+    <message>
+        <source>GUI language:</source>
+        <translation type="unfinished">GUI taal:</translation>
+    </message>
+    <message>
+        <source>Toolbar</source>
+        <translation type="unfinished">Werkbalk</translation>
+    </message>
+    <message>
+        <source>The text appears under the icon (recommended for beginners).</source>
+        <translation type="unfinished">De tekst verschijnt onder het icoon. (Aanbevolen voor beginners).</translation>
+    </message>
+    <message>
+        <source>User Interface</source>
+        <translation type="unfinished">Gebruikers Interface</translation>
+    </message>
+    <message>
+        <source>Activate dark mode</source>
+        <translation type="unfinished">Activeer donkere modus</translation>
+    </message>
+    <message>
+        <source>Don&apos;t use the native file dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dark mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesPathPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished">Vorm</translation>
+    </message>
+    <message>
+        <source>Paths that Valentina uses</source>
+        <translation type="unfinished">Pad welke Valentina gebruikt</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished">Soort</translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished">Pad</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished">Verander</translation>
+    </message>
+    <message>
+        <source>Open Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Individual Measurements</source>
+        <translation type="unfinished">Mijn Individuele Maten</translation>
+    </message>
+    <message>
+        <source>My Multisize Measurements</source>
+        <translation type="unfinished">Mijn Multimaten Maten</translation>
+    </message>
+    <message>
+        <source>My Patterns</source>
+        <translation type="unfinished">Mijn patronen</translation>
+    </message>
+    <message>
+        <source>My Templates</source>
+        <translation type="unfinished">Mijn Sjablonen</translation>
+    </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished">Mijn opmaak</translation>
+    </message>
+</context>
 <context>
     <name>QApplication</name>
     <message>
@@ -10444,78 +10723,86 @@ Deze optie wordt actief na een herstart..</translation>
         <source>Can&apos;t convert toInt parameter</source>
         <translation>Kan toInt parameter niet omzetten</translation>
     </message>
-    <message>
-        <source>Could not find the segment start.</source>
-        <translation>Kon het segment begin niet vinden.</translation>
-    </message>
-    <message>
-        <source>Could not find the segment end.</source>
-        <translation>Kon het segement einde niet vinden.</translation>
-    </message>
-    <message>
-        <source>Segment is too short.</source>
-        <translation>Segment is te kort.</translation>
-    </message>
-    <message>
-        <source>Error calculating segment for curve &apos;%1&apos;. %2</source>
-        <translation>Fout bij berekenen segment voor boog &apos;%1&apos;. %2&#xa0;</translation>
-    </message>
-    <message>
-        <source>Cannot prepare builtin passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
-        <translation>Kan de ingebouwde pasmarkering &apos;%1&apos; voor werkstuk &apos;%2&apos; niet voorbereiden. Pasmarkering is leeg.</translation>
-    </message>
-    <message>
-        <source>Cannot prepare builtin  passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark base line is empty.</source>
-        <translation>Kan de ingebouwde pasmarkering &apos;%1&apos; voor werkstuk &apos;%2&apos; niet voorbereiden. Basislijn pasmarkering is leeg.</translation>
-    </message>
-    <message>
-        <source>Cannot prepare passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark base line is empty.</source>
-        <translation>Kan de pasmarkering &apos;%1&apos; voor werkstuk &apos;%2&apos; niet voorbereiden. Basislijn pasmarkering is leeg.</translation>
-    </message>
-    <message>
-        <source>Cannot prepare passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
-        <translation>Kan de pasmarkering &apos;%1&apos; voor werkstuk &apos;%2&apos; niet voorbereiden. Pasmarkering is leeg.</translation>
-    </message>
     <message>
         <source>Piece name &apos;%1&apos; is not unique.</source>
-        <translation>Deel naam &apos;%1&apos; is niet uniek.</translation>
-    </message>
-    <message>
-        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
-        <translation>Fout in pad &apos;%1&apos;. Berekening van segment voor boog &apos;%2&apos; is mislukt. %3</translation>
-    </message>
-    <message>
-        <source>Cannot get tokens from formula &apos;%1&apos;. Formula error: %2.</source>
-        <translation>Kan geen teken van de formule &apos;%1&apos; verkrijgen. Formule fout: %2.</translation>
-    </message>
-    <message>
-        <source>No data for the height dimension.</source>
-        <translation>Geen gegevens voor de lengte.</translation>
-    </message>
-    <message>
-        <source>No data for the size dimension.</source>
-        <translation>Geen gegevens voor de grootte.</translation>
-    </message>
-    <message>
-        <source>No data for the hip dimension.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No data for the waist dimension.</source>
-        <translation>Geen gegevens voor de taille.</translation>
+        <source>Could not find the segment start.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Piece &apos;%1&apos;. Grainline is not valid.</source>
+        <source>Could not find the segment end.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Segment is too short.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error calculating segment for curve &apos;%1&apos;. %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot prepare builtin passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot prepare builtin  passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark base line is empty.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot prepare passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark base line is empty.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot prepare passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot get tokens from formula &apos;%1&apos;. Formula error: %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>No data for the height dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the size dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the hip dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the waist dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Piece &apos;%1&apos;. Grainline is not valid.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Unplaced pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet 1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QSaveFile</name>
@@ -10813,7 +11100,7 @@ Deze optie wordt actief na een herstart..</translation>
     <name>TMainWindow</name>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:18pt;&quot;&gt;Select New for creation measurement file.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:18pt;&quot;&gt;Selecteer Nieuw voor creëeren maten bestand.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:18pt;&quot;&gt;Selecteer Nieuw voor creëeren maten bestand.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <source>Name</source>
@@ -11037,7 +11324,7 @@ Deze optie wordt actief na een herstart..</translation>
     </message>
     <message>
         <source>untitled %1</source>
-        <translation>naamloos %1</translation>
+        <translation>zonder titel %1</translation>
     </message>
     <message>
         <source>This file already opened in another window.</source>
@@ -11109,7 +11396,7 @@ Deze optie wordt actief na een herstart..</translation>
     </message>
     <message>
         <source>untitled</source>
-        <translation type="vanished">naamloos</translation>
+        <translation>zonder titel</translation>
     </message>
     <message>
         <source>&lt;Empty&gt;</source>
@@ -11346,27 +11633,27 @@ Wil je deze veranderingen opslaan?</translation>
     </message>
     <message>
         <source>Locking file</source>
-        <translation>Vergrendelingsbestand</translation>
+        <translation type="vanished">Vergrendelingsbestand</translation>
     </message>
     <message>
         <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Dit bestand is al geopend in een ander venster. Negeren als u wilt doorgaan (niet aanbevolen, kan leiden tot gegevensbeschadiging).</translation>
+        <translation type="vanished">Dit bestand is al geopend in een ander venster. Negeren als u wilt doorgaan (niet aanbevolen, kan leiden tot gegevensbeschadiging).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Het vergrendelingsbestand kon niet worden aangemaakt, wegens het ontbreken van machtigingen. Negeren als u wilt doorgaan  (niet aanbevolen, kan leiden tot gegevensbeschadiging).</translation>
+        <translation type="vanished">Het vergrendelingsbestand kon niet worden aangemaakt, wegens het ontbreken van machtigingen. Negeren als u wilt doorgaan  (niet aanbevolen, kan leiden tot gegevensbeschadiging).</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Onbekende fout gebeurd, bijvoorbeeld een volledige partitie voorkomt het schrijven uit het vergrendelingsbestand. Negeren als u wilt doorgaan (niet aanbevolen, kan leiden tot gegevensbeschadiging).</translation>
+        <translation type="vanished">Onbekende fout gebeurd, bijvoorbeeld een volledige partitie voorkomt het schrijven uit het vergrendelingsbestand. Negeren als u wilt doorgaan (niet aanbevolen, kan leiden tot gegevensbeschadiging).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions.</source>
-        <translation>Het vergrendelingsbestand kon niet worden aangemaakt, wegens het ontbreken van machtigingen.</translation>
+        <translation type="vanished">Het vergrendelingsbestand kon niet worden aangemaakt, wegens het ontbreken van machtigingen.</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation>Onbekende fout gebeurd, bijvoorbeeld een volledige partitie voorkomt het schrijven uit het vergrendelingsbestand.</translation>
+        <translation type="vanished">Onbekende fout gebeurd, bijvoorbeeld een volledige partitie voorkomt het schrijven uit het vergrendelingsbestand.</translation>
     </message>
     <message>
         <source>Export to CSV</source>
@@ -11414,15 +11701,15 @@ Wil je deze veranderingen opslaan?</translation>
     </message>
     <message>
         <source>The measurements document has no write permissions.</source>
-        <translation>Het maten-dokument heeft geen schrijftoestemming.</translation>
+        <translation type="vanished">Het maten-dokument heeft geen schrijftoestemming.</translation>
     </message>
     <message>
         <source>Cannot set permissions for %1 to writable.</source>
-        <translation>Kan geen toestemming geven voor %1 om te wijzigen.</translation>
+        <translation type="vanished">Kan geen toestemming geven voor %1 om te wijzigen.</translation>
     </message>
     <message>
         <source>Could not save the file.</source>
-        <translation>Het bestand is niet bewaard.</translation>
+        <translation type="vanished">Het bestand is niet bewaard.</translation>
     </message>
     <message>
         <source>Could not save the file</source>
@@ -11496,6 +11783,18 @@ Wil je deze veranderingen opslaan?</translation>
         <source>Multisize measurements require at least 4 columns.</source>
         <translation>Multimaten maten vereisen tenminste 4 kolommen.</translation>
     </message>
+    <message>
+        <source>Cannot convert base size value to double in column 2.</source>
+        <translation type="vanished">Kan de basis grootte waarde niet naar het dubbele omzetten in kolom 2.</translation>
+    </message>
+    <message>
+        <source>Cannot convert height increase value to double in column 3.</source>
+        <translation type="vanished">Kan de waarde van de hoogte toename niet omzetten naar het dubbele in kolom 3.</translation>
+    </message>
+    <message>
+        <source>Cannot convert size increase value to double in column 4.</source>
+        <translation type="vanished">Kan de waarde van de grootte toename niet omzetten naar het dubbele in kolom 4.</translation>
+    </message>
     <message>
         <source>Imported file must not contain the same name twice.</source>
         <translation>Geïmporteerd bestand mag geen tweemaal dezelfde naam bevatten.</translation>
@@ -11554,160 +11853,164 @@ Wil je deze veranderingen opslaan?</translation>
     </message>
     <message>
         <source>Do you want to change the premissions?</source>
-        <translation>Wens je de rechten te veranderen?</translation>
+        <translation type="vanished">Wens je de rechten te veranderen?</translation>
     </message>
     <message>
         <source>Cannot read settings from a malformed .INI file.</source>
         <translation>Kan instellingen niet inlezen wegens een niet-conform .INI-bestand.</translation>
     </message>
     <message>
-        <source>Units:</source>
-        <translation>Eenheden:</translation>
+        <source>Height (%1):</source>
+        <translation type="vanished">Hoogte (%1)::</translation>
     </message>
     <message>
-        <source>Shift B</source>
-        <translation>Shift B</translation>
-    </message>
-    <message>
-        <source>Shift C</source>
-        <translation>Shift C</translation>
-    </message>
-    <message>
-        <source>Correction:</source>
-        <translation>Aanpassing:</translation>
-    </message>
-    <message>
-        <source>Dimension:</source>
-        <translation>Dimensie:</translation>
-    </message>
-    <message>
-        <source>Select one of the dimensions to later use the measurement value in piece label</source>
-        <translation>Selecteer één van de dimensies om later de maatwaarde ervan in het deel label te gebruiken</translation>
-    </message>
-    <message>
-        <source>Base Values:</source>
-        <translation>Basis waarden:</translation>
-    </message>
-    <message>
-        <source>Export to individual</source>
-        <translation>Exporteer naar individueel</translation>
-    </message>
-    <message>
-        <source>Export to individual measurements</source>
-        <translation>Exporteer naar individuele maten</translation>
-    </message>
-    <message>
-        <source>Use full circumference</source>
-        <translation>Gebruik volledige omtrek</translation>
-    </message>
-    <message>
-        <source>Restrict second dimension</source>
-        <translation>Beperk tweede dimensie</translation>
-    </message>
-    <message>
-        <source>Restrict third dimension</source>
-        <translation>Beperk derde dimensie</translation>
-    </message>
-    <message>
-        <source>Dimension labels</source>
-        <translation>Dimensie labels</translation>
-    </message>
-    <message>
-        <source>The table doesn&apos;t provide dimensions</source>
-        <translation>De tabel toont geen dimensies</translation>
-    </message>
-    <message>
-        <source>Invalid base value for dimension A</source>
-        <translation>Ongeldige basiswaarde voor dimensie A</translation>
-    </message>
-    <message>
-        <source>The table doesn&apos;t support dimension B</source>
-        <translation>Tabel ondersteunt dimensie B niet</translation>
-    </message>
-    <message>
-        <source>Invalid base value for dimension B</source>
-        <translation>Ongeldige basiswaarde voor dimensie B</translation>
-    </message>
-    <message>
-        <source>The table doesn&apos;t support dimension C</source>
-        <translation>Tabel ondersteunt dimensie C niet</translation>
-    </message>
-    <message>
-        <source>Invalid base value for dimension C</source>
-        <translation>Ongeldige basiswaarde voor dimensie C</translation>
-    </message>
-    <message>
-        <source>measurements.vit</source>
-        <translation>measurements.vit</translation>
-    </message>
-    <message>
-        <source>Shift (%1):</source>
-        <translation>Shift (%1):</translation>
-    </message>
-    <message>
-        <source>%1 shift</source>
-        <translation>%1 shift</translation>
-    </message>
-    <message>
-        <source>Cannot convert base value to double in column 2.</source>
-        <translation>Kan de basiswaarde niet naar het dubbele omzetten in kolom 2.</translation>
-    </message>
-    <message>
-        <source>Cannot convert shift value to double in column %1.</source>
-        <translation>Kan de basiswaarde niet naar het dubbele omzetten in kolom %1.</translation>
-    </message>
-    <message>
-        <source>Millimeters</source>
-        <translation>Millimeters</translation>
-    </message>
-    <message>
-        <source>Inches</source>
-        <translation>Inches</translation>
-    </message>
-    <message>
-        <source>Centimeters</source>
-        <translation>Centimeters</translation>
-    </message>
-    <message>
-        <source>Degrees</source>
-        <translation>Graden</translation>
+        <source>Size (%1):</source>
+        <translation type="vanished">Maat (%1):</translation>
     </message>
     <message>
         <source>Name</source>
         <comment>measurement column</comment>
-        <translation>Naam</translation>
+        <translation type="unfinished">Naam</translation>
     </message>
     <message>
         <source>Full name</source>
         <comment>measurement column</comment>
-        <translation>Volledige naam</translation>
+        <translation type="unfinished">Volledige naam</translation>
     </message>
     <message>
         <source>Calculated value</source>
         <comment>measurement column</comment>
-        <translation>Berekende waarde</translation>
+        <translation type="unfinished">Berekende waarde</translation>
     </message>
     <message>
         <source>Formula</source>
         <comment>measurement column</comment>
-        <translation>Formule</translation>
+        <translation type="unfinished">Formule</translation>
     </message>
     <message>
         <source>Base value</source>
         <comment>measurement column</comment>
-        <translation>Basis waarde</translation>
+        <translation type="unfinished">Basis waarde</translation>
     </message>
     <message>
         <source>Correction</source>
         <comment>measurement column</comment>
-        <translation>Aanpassing</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Units:</source>
+        <translation type="unfinished">Eenheden:</translation>
+    </message>
+    <message>
+        <source>Shift B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Correction:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dimension:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select one of the dimensions to later use the measurement value in piece label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Base Values:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export to individual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export to individual measurements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use full circumference</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restrict second dimension</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restrict third dimension</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dimension labels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The table doesn&apos;t provide dimensions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid base value for dimension A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The table doesn&apos;t support dimension B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid base value for dimension B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The table doesn&apos;t support dimension C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid base value for dimension C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>measurements.vit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift (%1):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot convert base value to double in column 2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot convert shift value to double in column %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Millimeters</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Inches</source>
+        <translation type="unfinished">Inches</translation>
+    </message>
+    <message>
+        <source>Centimeters</source>
+        <translation type="unfinished">Centimeters</translation>
+    </message>
+    <message>
+        <source>Degrees</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restrict first dimension</source>
-        <translation>Beperk eerste meting</translation>
-    </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:18pt;&quot;&gt;Select New to create a measurement file.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -11780,6 +12083,10 @@ Wil je deze veranderingen opslaan?</translation>
         <source>Labels</source>
         <translation>Labels</translation>
     </message>
+    <message>
+        <source>Detail label visible</source>
+        <translation type="vanished">Zichtbare detail label</translation>
+    </message>
     <message>
         <source>Width:</source>
         <translation>Breedte:</translation>
@@ -11886,59 +12193,59 @@ Wil je deze veranderingen opslaan?</translation>
     </message>
     <message>
         <source>Edit pattern label</source>
-        <translation>Verander patroon label</translation>
+        <translation type="unfinished">Verander patroon label</translation>
     </message>
     <message>
         <source>Pattern name:</source>
-        <translation>Patroon naam:</translation>
+        <translation type="unfinished">Patroon naam:</translation>
     </message>
     <message>
         <source>Pattern number:</source>
-        <translation>Patroon nummer:</translation>
+        <translation type="unfinished">Patroon nummer:</translation>
     </message>
     <message>
         <source>Company/Designer name:</source>
-        <translation>Bedrijfs/ontwerpers naam:</translation>
+        <translation type="unfinished">Bedrijfs/ontwerpers naam:</translation>
     </message>
     <message>
         <source>Customer name:</source>
-        <translation>Klant naam:</translation>
+        <translation type="unfinished">Klant naam:</translation>
     </message>
     <message>
         <source>Date format:</source>
-        <translation>Datum indeling:</translation>
+        <translation type="unfinished">Datum indeling:</translation>
     </message>
     <message>
         <source>Time format:</source>
-        <translation>Tijdsindeling:</translation>
+        <translation type="unfinished">Tijdsindeling:</translation>
     </message>
     <message>
         <source>Customer birth date:</source>
-        <translation>Klant geboortedatum:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>yyyy-MM-dd</source>
-        <translation>yyyy-MM-dd</translation>
+        <translation type="unfinished">yyyy-MM-dd</translation>
     </message>
     <message>
         <source>Customer email:</source>
-        <translation>Klant e-mail:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Materials</source>
-        <translation>Materialen</translation>
+        <translation type="unfinished">Materialen</translation>
     </message>
     <message>
         <source>Pattern materials:</source>
-        <translation>Patroon materialen:</translation>
+        <translation type="unfinished">Patroon materialen:</translation>
     </message>
     <message>
         <source>Manage list of pattern materials</source>
-        <translation>Beheren van patroon materiaallijst</translation>
+        <translation type="unfinished">Beheren van patroon materiaallijst</translation>
     </message>
     <message>
         <source>Manage</source>
-        <translation>Beheren</translation>
+        <translation type="unfinished">Beheren</translation>
     </message>
     <message>
         <source>Piece label visible</source>
@@ -12031,6 +12338,10 @@ Wil je deze veranderingen opslaan?</translation>
         <source>Intersection 2 (only right)</source>
         <translation>Intersectie 2 (enkel rechts)</translation>
     </message>
+    <message>
+        <source>Acute angle that looks intside of piece</source>
+        <translation type="vanished">Scherpe hoek naar de binnenkant van een patroondeel</translation>
+    </message>
     <message>
         <source>Acute angle that looks outside of piece</source>
         <translation>Scherpe hoek naar de buitenkant van een patroondeel</translation>
@@ -12077,7 +12388,7 @@ Wil je deze veranderingen opslaan?</translation>
     </message>
     <message>
         <source>Acute angle that looks inside of piece</source>
-        <translation>Scherpe hoek naar de binnenkant van een patroondeel</translation>
+        <translation type="unfinished">Scherpe hoek naar de binnenkant van een patroondeel</translation>
     </message>
 </context>
 <context>
@@ -12240,6 +12551,18 @@ Wil je deze veranderingen opslaan?</translation>
         <comment>seam allowance</comment>
         <translation>Op maat</translation>
     </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Universally Unique IDentifier of piece. Used to identifier piece while updating manual layout. Left empty to generate new value.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TabPlaceLabels</name>
@@ -12248,6 +12571,13 @@ Wil je deze veranderingen opslaan?</translation>
         <translation>Dialoog</translation>
     </message>
 </context>
+<context>
+    <name>Tape</name>
+    <message>
+        <source>This test build is older than %1 days. To provide you with better quality service we restrict the lifetime you can use a test build. To continue using Tape please update to newer test build. The application will be shut down.</source>
+        <translation type="vanished">Deze testversie is ouder dan %1 dagen. Om je een betere dienst te verlenen beperken we de levensduur van een testversie. Om Tape verder te gebruiken, vragen we jou om bij te werken naar een nieuwere testversie. Het programma wordt nu gestopt.</translation>
+    </message>
+</context>
 <context>
     <name>TapeConfigDialog</name>
     <message>
@@ -12415,6 +12745,18 @@ Wil je deze veranderingen opslaan?</translation>
         <source>The text appears under the icon (recommended for beginners).</source>
         <translation>De tekst verschijnt onder het icoon. (Aanbevolen voor beginners).</translation>
     </message>
+    <message>
+        <source>Default height and size</source>
+        <translation type="vanished">Standaardhoogte en grootte</translation>
+    </message>
+    <message>
+        <source>Default height:</source>
+        <translation type="vanished">Standaard hoogte:</translation>
+    </message>
+    <message>
+        <source>Default size:</source>
+        <translation type="vanished">Standaard maat:</translation>
+    </message>
     <message>
         <source>With OS options</source>
         <translation>Met OS opties</translation>
@@ -12478,6 +12820,10 @@ Wil je deze veranderingen opslaan?</translation>
         <source>My Patterns</source>
         <translation>Mijn patronen</translation>
     </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished">Mijn opmaak</translation>
+    </message>
 </context>
 <context>
     <name>ToggleDetailInLayout</name>
@@ -12519,74 +12865,74 @@ Wil je deze veranderingen opslaan?</translation>
     <name>VAbstartMeasurementDimension</name>
     <message>
         <source>Invalid min/max range</source>
-        <translation>Ongeldig min/max bereik</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid step</source>
-        <translation>Ongeldige stap</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Base value invalid</source>
-        <translation>Ongeldige basiswaarde</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation>Maat</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Hoogte</translation>
+        <translation type="unfinished">Hoogte</translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Maat</translation>
+        <translation type="unfinished">Maat</translation>
     </message>
     <message>
         <source>Waist</source>
         <comment>dimension</comment>
-        <translation>Taille</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hip</source>
         <comment>dimension</comment>
-        <translation>Heup</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chest full circumference</source>
         <comment>dimension</comment>
-        <translation>Volledige borstomtrek</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chest half circumference</source>
         <comment>dimension</comment>
-        <translation>Borst halve omtrek</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished">Maat</translation>
     </message>
     <message>
         <source>Chest circumference</source>
         <comment>dimension</comment>
-        <translation>Borstomtrek</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Waist full circumference</source>
         <comment>dimension</comment>
-        <translation>Taille volledige omtrek</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Waist half circumference</source>
         <comment>dimension</comment>
-        <translation>Taille halve omtrek</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hip full circumference</source>
         <comment>dimension</comment>
-        <translation>Heup volledige omtrek</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hip half circumference</source>
         <comment>dimension</comment>
-        <translation>Heup halve omtrek</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -12746,23 +13092,67 @@ Wil je deze veranderingen opslaan?</translation>
     <name>VAbstractMainWindow</name>
     <message>
         <source>Confirm format rewriting</source>
-        <translation>Bevestig herschrijven formaat</translation>
+        <translation type="unfinished">Bevestig herschrijven formaat</translation>
     </message>
     <message>
         <source>This file is using previous format version v%1. The current is v%2. Saving the file with this app version will update the format version for this file. This may prevent you from be able to open the file with older app versions. Do you really want to continue?</source>
-        <translation>Dit bestand gebruikt een vorig formaat versie v%1. De huidige versie is v%2. Het opslaan van het bestand met deze applicatie zal het formaat voor dit bestand bijwerken. Dat kan je beletten om dit bestand met een oudere applicatie te openen. Verder gaan?</translation>
+        <translation type="unfinished">Dit bestand gebruikt een vorig formaat versie v%1. De huidige versie is v%2. Het opslaan van het bestand met deze applicatie zal het formaat voor dit bestand bijwerken. Dat kan je beletten om dit bestand met een oudere applicatie te openen. Verder gaan?</translation>
     </message>
     <message>
         <source>Comma-Separated Values</source>
-        <translation>Komma-scheidingsteken waardes</translation>
+        <translation type="unfinished">Komma-scheidingsteken waardes</translation>
     </message>
     <message>
         <source>values</source>
-        <translation>waarden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export to CSV</source>
-        <translation>Exporteer naar CSV</translation>
+        <translation type="unfinished">Exporteer naar CSV</translation>
+    </message>
+    <message>
+        <source>The measurements document has no write permissions.</source>
+        <translation type="unfinished">Het maten-dokument heeft geen schrijftoestemming.</translation>
+    </message>
+    <message>
+        <source>Do you want to change the premissions?</source>
+        <translation type="unfinished">Wens je de rechten te veranderen?</translation>
+    </message>
+    <message>
+        <source>Cannot set permissions for %1 to writable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save the file.</source>
+        <translation type="unfinished">Het bestand is niet bewaard.</translation>
+    </message>
+    <message>
+        <source>Locking file</source>
+        <translation type="unfinished">Vergrendelingsbestand</translation>
+    </message>
+    <message>
+        <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished">Dit bestand is al geopend in een ander venster. Negeren als u wilt doorgaan (niet aanbevolen, kan leiden tot gegevensbeschadiging).</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished">Het vergrendelingsbestand kon niet worden aangemaakt, wegens het ontbreken van machtigingen. Negeren als u wilt doorgaan  (niet aanbevolen, kan leiden tot gegevensbeschadiging).</translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished">Onbekende fout gebeurd, bijvoorbeeld een volledige partitie voorkomt het schrijven uit het vergrendelingsbestand. Negeren als u wilt doorgaan (niet aanbevolen, kan leiden tot gegevensbeschadiging).</translation>
+    </message>
+    <message>
+        <source>This file already opened in another window.</source>
+        <translation type="unfinished">Dit bestand is al geopend in een ander venster.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions.</source>
+        <translation type="unfinished">Het vergrendelingsbestand kon niet worden aangemaakt, wegens het ontbreken van machtigingen.</translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
+        <translation type="unfinished">Onbekende fout gebeurd, bijvoorbeeld een volledige partitie voorkomt het schrijven uit het vergrendelingsbestand.</translation>
     </message>
 </context>
 <context>
@@ -12796,7 +13186,7 @@ Wil je deze veranderingen opslaan?</translation>
     </message>
     <message>
         <source>default</source>
-        <translation>standaardwaarde</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -12970,7 +13360,7 @@ Wil je deze veranderingen opslaan?</translation>
     </message>
     <message>
         <source>Formula warning: %1. Program will be terminated.</source>
-        <translation>Formule waarschuwing: %1. Programma wordt gestopt.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -12992,7 +13382,7 @@ Wil je deze veranderingen opslaan?</translation>
     <name>VComboBoxDelegate</name>
     <message>
         <source>Select material</source>
-        <translation>Selecteer materiaal</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -13421,6 +13811,14 @@ Wil je deze veranderingen opslaan?</translation>
         <source>Page measure units (export mode). Valid values: %1.</source>
         <translation>Pagina maten eenheden (export modus). Geldige waardes: %1.</translation>
     </message>
+    <message>
+        <source>Set size value for pattern file, that was opened with multisize measurements (export mode). Valid values: %1cm.</source>
+        <translation type="vanished">Zet de maat voor het patroon dat geopend werd met multimaten maten (export modus). Geldige waarden: %1cm.</translation>
+    </message>
+    <message>
+        <source>Set height value for pattern file, that was opened with multisize measurements (export mode). Valid values: %1cm.</source>
+        <translation type="vanished">Zet de hoogte voor het patroon dat geopend werd met multimaten maten (export modus). Geldige waarden: %1cm.</translation>
+    </message>
     <message>
         <source>Use this option to override user material defined in pattern. The value must be in form &lt;number&gt;@&lt;user matrial name&gt;. The number should be in range from 1 to %1. For example, 1@Fabric2. The key can be used multiple times. Has no effect in GUI mode.</source>
         <translation>Gebruik deze optie om de door de gebruiker gedefineerde materialen te overschrijven. De waarde moet in de vorm &lt;number&gt;@&lt;user matrial name&gt;. Het nummer moet tussen 1 en %1 vallen. Bijvoorbeeld, 1@Fabric2. De sleutel kan meerdere keren gebruikt worden. Het heeft geen effect in GUI modus.</translation>
@@ -13511,39 +13909,67 @@ Wil je deze veranderingen opslaan?</translation>
     </message>
     <message>
         <source>Invalid dimension A value.</source>
-        <translation>Ongeldige waarde voor dimensie A.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid dimension B value.</source>
-        <translation>Ongeldige waarde voor dimensie B.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid dimension C value.</source>
-        <translation>Ongeldige waarde voor dimensie C.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set base for dimension A in the multisize measurements units (export mode).</source>
-        <translation>Zet de basis voor dimensie A in de multimaten maten eenheden (export modus).</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The dimension A base</source>
-        <translation>Dimensie A basis</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set base for dimension B in the multisize measurements units (export mode).</source>
-        <translation>Zet de basis voor dimensie B in de multimaten maten eenheden (export modus).</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The dimension B base</source>
-        <translation>Dimensie B basis</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set base for dimension C in the multisize measurements units (export mode).</source>
-        <translation>Zet de basis voor dimensie C in de multimaten maten eenheden (export modus).</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The dimension C base</source>
-        <translation>Dimensie C basis</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The filename of exported layout file. Use it to enable console export mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The filename of layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pattern pieces form the raw layout data file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The raw layout data file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to output format (default = 0, export mode): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to tiled pdf page template (default = 0, export mode with tiled pdf format): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run the program in a test mode. The program in this mode loads a single layout file and silently quit without showing the main window. The key have priority before key &apos;%1&apos;.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -13572,6 +13998,10 @@ Wil je deze veranderingen opslaan?</translation>
         <source>patterns</source>
         <translation>patronen</translation>
     </message>
+    <message>
+        <source>manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VContainer</name>
@@ -13742,7 +14172,7 @@ Wil je deze veranderingen opslaan?</translation>
     </message>
     <message>
         <source>Restore label position</source>
-        <translation>Herstel label positie</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -13819,25 +14249,29 @@ Wil je deze veranderingen opslaan?</translation>
 </context>
 <context>
     <name>VLayoutExporter</name>
+    <message>
+        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot set printer page size</source>
-        <translation>Kan paginagrootte op printer niet instellen</translation>
+        <translation type="unfinished">Kan paginagrootte op printer niet instellen</translation>
     </message>
     <message>
         <source>Cannot set printer margins</source>
-        <translation>Kan de printer marges niet bepalen</translation>
+        <translation type="unfinished">Kan de printer marges niet bepalen</translation>
     </message>
     <message>
         <source>Can&apos;t open file &apos;%1&apos;</source>
-        <translation>Kan bestand &apos;%1&apos; niet openen</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export raw layout data failed. %1.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating file &apos;%1&apos; failed! %2</source>
-        <translation>Bestand &apos;%1&apos; maken heeft gefaald! %2</translation>
-    </message>
-    <message>
-        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
-        <translation>Kan bestand &apos;%1&apos; niet opslaan. Fout %2.</translation>
+        <translation type="unfinished">Bestand &apos;%1&apos; maken heeft gefaald! %2</translation>
     </message>
     <message>
         <source>Can&apos;t create an flat dxf file.</source>
@@ -13871,23 +14305,23 @@ Wil je deze veranderingen opslaan?</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>Geen</translation>
+        <translation type="unfinished">Geen</translation>
     </message>
     <message>
         <source>Height</source>
-        <translation>Hoogte</translation>
+        <translation type="unfinished">Hoogte</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Maat</translation>
+        <translation type="unfinished">Maat</translation>
     </message>
     <message>
         <source>Hip</source>
-        <translation>Heup</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Waist</source>
-        <translation>Taille</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -14025,6 +14459,114 @@ Wil je deze veranderingen opslaan?</translation>
         <translation>Vierkant merkteken</translation>
     </message>
 </context>
+<context>
+    <name>VPApplication</name>
+    <message>
+        <source>Error parsing file. Program will be terminated.</source>
+        <translation type="unfinished">Fout bij opsplitsen bestand. Programma wordt beëindigd.</translation>
+    </message>
+    <message>
+        <source>Error bad id. Program will be terminated.</source>
+        <translation type="unfinished">Fout slechte ID. Programma wordt beëindigd.</translation>
+    </message>
+    <message>
+        <source>Error can&apos;t convert value. Program will be terminated.</source>
+        <translation type="unfinished">Fout kan waarde niet omzetten. Programma wordt beëindigd.</translation>
+    </message>
+    <message>
+        <source>Error empty parameter. Program will be terminated.</source>
+        <translation type="unfinished">Fout lege parameter. Programma wordt beëindigd.</translation>
+    </message>
+    <message>
+        <source>Error wrong id. Program will be terminated.</source>
+        <translation type="unfinished">Fout verkeerde ID. Programma wordt beëindigd.</translation>
+    </message>
+    <message>
+        <source>Something&apos;s wrong!!</source>
+        <translation type="unfinished">Er gaat iets verkeerd!!</translation>
+    </message>
+    <message>
+        <source>Exception thrown: %1. Program will be terminated.</source>
+        <translation type="unfinished">Uitgeworpen uitzondering: %1. Programma wordt beëindigd.</translation>
+    </message>
+    <message>
+        <source>Can&apos;t begin to listen for incoming connections on name &apos;%1&apos;</source>
+        <translation type="unfinished">Kan niet beginnen met verwerken van inkomende connecties op naam &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <source>Export mode doesn&apos;t support openning several files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import raw layout data does not support openning several layout files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, provide one input file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrousel</name>
+    <message>
+        <source>Pieces of </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrouselPieceList</name>
+    <message>
+        <source>Move to Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPDialogAbout</name>
+    <message>
+        <source>About Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Puzzle version</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Build revision:</source>
+        <translation type="unfinished">Herziene uitgave gebouwd:</translation>
+    </message>
+    <message>
+        <source>This program is part of Valentina project.</source>
+        <translation type="unfinished">Dit programma is een deel van het Valentina project.</translation>
+    </message>
+    <message>
+        <source>Check For Updates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open your default browser</source>
+        <translation type="unfinished">Kan uw standaard browser niet openen</translation>
+    </message>
+    <message>
+        <source>Build revision: %1</source>
+        <translation type="unfinished">Herziene uitgave gebouwd: %1</translation>
+    </message>
+    <message>
+        <source>Built on %1 at %2</source>
+        <translation type="unfinished">Gebouwd op %1 op %2</translation>
+    </message>
+    <message>
+        <source>Web site : %1</source>
+        <translation type="unfinished">Website: %1</translation>
+    </message>
+</context>
 <context>
     <name>VPE::VBoolProperty</name>
     <message>
@@ -14047,6 +14589,573 @@ Wil je deze veranderingen opslaan?</translation>
         <translation>Open bestand</translation>
     </message>
 </context>
+<context>
+    <name>VPGraphicsPiece</name>
+    <message>
+        <source>Move to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPLayoutFileReader</name>
+    <message>
+        <source>Piece List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Got empty attribute &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPMainWindow</name>
+    <message>
+        <source>Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;Bestand</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished">&amp;Venster</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished">&amp;Help</translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished">Menu</translation>
+    </message>
+    <message>
+        <source>Piece Carrousel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Infos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Naam:</translation>
+    </message>
+    <message>
+        <source>DummyName</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UUID:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{7b2ce4ae-96f5-4905-bb34-405cb40ca208}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Geometry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mirror piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotation</source>
+        <translation type="unfinished">Rotatie</translation>
+    </message>
+    <message>
+        <source>Angle:</source>
+        <translation type="unfinished">Hoek:</translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° anti-clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Placement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Y:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No piece selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple pieces selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Width</source>
+        <translation type="unfinished">Breedte</translation>
+    </message>
+    <message>
+        <source>Length</source>
+        <translation type="unfinished">Lengte</translation>
+    </message>
+    <message>
+        <source>Orientation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove unused length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Margins</source>
+        <translation type="unfinished">Marges</translation>
+    </message>
+    <message>
+        <source>Right:</source>
+        <translation type="unfinished">Rechts:</translation>
+    </message>
+    <message>
+        <source>Top:</source>
+        <translation type="unfinished">Bovenaan:</translation>
+    </message>
+    <message>
+        <source>Left:</source>
+        <translation type="unfinished">Links:</translation>
+    </message>
+    <message>
+        <source>Bottom:</source>
+        <translation type="unfinished">Onderaan:</translation>
+    </message>
+    <message>
+        <source>Placement Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Row height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Control</source>
+        <translation type="unfinished">Controle</translation>
+    </message>
+    <message>
+        <source>Follow grainline</source>
+        <translation type="unfinished">Langs de recht-van-draad</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vertical grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Horizontal grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pieces gap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sticky edges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation type="unfinished">Export</translation>
+    </message>
+    <message>
+        <source>Export Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiles properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiled Pdf Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Tiles on sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export Tiled Pdf</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation type="unfinished">Opmaak</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Naam</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Beschrijving</translation>
+    </message>
+    <message>
+        <source>Unit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning superposition of pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning pieces out of bound</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished">Schaal</translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation type="unfinished">&amp;Open</translation>
+    </message>
+    <message>
+        <source>Ctrl+O</source>
+        <translation type="unfinished">Ctrl+O</translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Opslaan</translation>
+    </message>
+    <message>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save &amp;As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Import Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation type="unfinished">E&amp;xit</translation>
+    </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation type="unfinished">&amp;Nieuw</translation>
+    </message>
+    <message>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation type="unfinished">Over &amp;Qt</translation>
+    </message>
+    <message>
+        <source>About &amp;Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom in</source>
+        <translation type="unfinished">Inzoomen</translation>
+    </message>
+    <message>
+        <source>Zoom out</source>
+        <translation type="unfinished">Uitzoomen</translation>
+    </message>
+    <message>
+        <source>Zoom 1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom fit best</source>
+        <translation type="unfinished">Zoom  naar best passend</translation>
+    </message>
+    <message>
+        <source>Zoom sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished">Voorkeuren</translation>
+    </message>
+    <message>
+        <source>File &apos;%1&apos; doesn&apos;t exist!</source>
+        <translation type="unfinished">Bestand &apos;%1&apos; bestaat niet!</translation>
+    </message>
+    <message>
+        <source>File error.</source>
+        <translation type="unfinished">Bestandsfout.</translation>
+    </message>
+    <message>
+        <source>Unable to read a layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fail to create layout.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not extract data from file &apos;%1&apos;. %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Centimeters</source>
+        <translation type="unfinished">Centimeters</translation>
+    </message>
+    <message>
+        <source>Millimiters</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Inches</source>
+        <translation type="unfinished">Inches</translation>
+    </message>
+    <message>
+        <source>Scale:</source>
+        <translation type="unfinished">Schaal:</translation>
+    </message>
+    <message>
+        <source>untitled %1.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>untitled.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read only</source>
+        <translation type="unfinished">alleen lezen</translation>
+    </message>
+    <message>
+        <source>Cannot read settings from a malformed .INI file.</source>
+        <translation type="unfinished">Kan instellingen niet inlezen wegens een niet-conform .INI-bestand.</translation>
+    </message>
+    <message>
+        <source>Cannot save settings. Access denied.</source>
+        <translation type="unfinished">Kan instellingen niet opslaan. Toegang geweigerd.</translation>
+    </message>
+    <message>
+        <source>Failed to open file, is it writable?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New Window</source>
+        <translation type="unfinished">&amp;Nieuw Venster</translation>
+    </message>
+    <message>
+        <source>Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open file</source>
+        <translation type="unfinished">Open bestand</translation>
+    </message>
+    <message>
+        <source>Could not save the file</source>
+        <translation type="unfinished">Het bestand is niet bewaard</translation>
+    </message>
+    <message>
+        <source>layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save as</source>
+        <translation type="unfinished">Opslaan als</translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window.</source>
+        <translation type="unfinished">Afsluiten is mislukt. Dit bestand is al geopend in een ander venster.</translation>
+    </message>
+    <message>
+        <source>Could not save file</source>
+        <translation type="unfinished">Kon bestand niet opslaan</translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window. Expect collissions when run 2 copies of the program.</source>
+        <translation type="unfinished">Afsluiten is mislukt. Dit bestand is al geopend in een ander venster. Verwacht een conflict als 2 kopieën van het programma gaan lopen.</translation>
+    </message>
+    <message>
+        <source>Raw Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About Qt</source>
+        <translation type="unfinished">Over Qt</translation>
+    </message>
+    <message>
+        <source>PDF Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SVG Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPSheet</name>
+    <message>
+        <source>Letter</source>
+        <translation type="unfinished">Letter</translation>
+    </message>
+    <message>
+        <source>Legal</source>
+        <translation type="unfinished">Legaal</translation>
+    </message>
+    <message>
+        <source>Tabloid</source>
+        <translation type="unfinished">Tablet</translation>
+    </message>
+    <message>
+        <source>Roll 24in</source>
+        <translation type="unfinished">Roll 44inch {72inch?} {24i?}</translation>
+    </message>
+    <message>
+        <source>Roll 30in</source>
+        <translation type="unfinished">Roll 44inch {72inch?} {30i?}</translation>
+    </message>
+    <message>
+        <source>Roll 36in</source>
+        <translation type="unfinished">Roll 44inch {72inch?} {36i?}</translation>
+    </message>
+    <message>
+        <source>Roll 42in</source>
+        <translation type="unfinished">Roll 44inch {72inch?} {42i?}</translation>
+    </message>
+    <message>
+        <source>Roll 44in</source>
+        <translation type="unfinished">Roll 44inch {72inch?} {44i?}</translation>
+    </message>
+    <message>
+        <source>Roll 48in</source>
+        <translation type="unfinished">Roll 44inch {48inch?}</translation>
+    </message>
+    <message>
+        <source>Roll 62in</source>
+        <translation type="unfinished">Roll 44inch {62inch?}</translation>
+    </message>
+    <message>
+        <source>Roll 72in</source>
+        <translation type="unfinished">Roll 44inch {72inch?}</translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation type="unfinished">Op maat</translation>
+    </message>
+</context>
+<context>
+    <name>VPTileFactory</name>
+    <message>
+        <source>Grid ( %1 , %2 )</source>
+        <translation type="unfinished">Raster ( %1 , %2 )</translation>
+    </message>
+    <message>
+        <source>Page %1 of %2</source>
+        <translation type="unfinished">Pagina %1 van %2</translation>
+    </message>
+</context>
 <context>
     <name>VPattern</name>
     <message>
@@ -14352,7 +15461,7 @@ Wil je deze veranderingen opslaan?</translation>
     </message>
     <message>
         <source>Main path of piece %1</source>
-        <translation>Hoofdpad voor deel %1</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -14392,27 +15501,27 @@ Wil je deze veranderingen opslaan?</translation>
     <name>VPrintLayout</name>
     <message>
         <source>For printing multipages document all sheet should have the same size.</source>
-        <translation>Voor het afdrukken van multipagina&apos;s document, moeten alle bladen dezelfde maat hebben.</translation>
+        <translation type="unfinished">Voor het afdrukken van multipagina&apos;s document, moeten alle bladen dezelfde maat hebben.</translation>
     </message>
     <message>
         <source>For previewing multipage document all sheet should have the same size.</source>
-        <translation>Voor de voorbeeldweergave van een multipagina document, moeten alle bladen dezelfde maat hebben.</translation>
+        <translation type="unfinished">Voor de voorbeeldweergave van een multipagina document, moeten alle bladen dezelfde maat hebben.</translation>
     </message>
     <message>
         <source>Pages will be cropped because they do not fit printer paper size.</source>
-        <translation>Pagina&apos;s zullen bijgesneden worden omdat deze niet het papierformaat van de printer hebben.</translation>
+        <translation type="unfinished">Pagina&apos;s zullen bijgesneden worden omdat deze niet het papierformaat van de printer hebben.</translation>
     </message>
     <message>
         <source>Print error</source>
-        <translation>Afdruk fout</translation>
+        <translation type="unfinished">Afdruk fout</translation>
     </message>
     <message>
         <source>Cannot proceed because there are no available printers in your system.</source>
-        <translation>Kan niet verder gaan omdat er geen beschikbare printers in het systeem zijn.</translation>
+        <translation type="unfinished">Kan niet verder gaan omdat er geen beschikbare printers in het systeem zijn.</translation>
     </message>
     <message>
         <source>Failed to open file, is it writable?</source>
-        <translation>Kan bestand niet openen. Is het beschrijfbaar?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed in flushing page to disk, disk full?</source>
@@ -14420,15 +15529,15 @@ Wil je deze veranderingen opslaan?</translation>
     </message>
     <message>
         <source>Cannot set printer margins</source>
-        <translation>Kan de printer marges niet bepalen</translation>
+        <translation type="unfinished">Kan de printer marges niet bepalen</translation>
     </message>
     <message>
         <source>Cannot set custom printer page size</source>
-        <translation>Kan aangepaste paginagrootte op printer niet instellen</translation>
+        <translation type="unfinished">Kan aangepaste paginagrootte op printer niet instellen</translation>
     </message>
     <message>
         <source>Cannot set printer page size</source>
-        <translation>Kan paginagrootte op printer niet instellen</translation>
+        <translation type="unfinished">Kan paginagrootte op printer niet instellen</translation>
     </message>
     <message>
         <source>Cannot set printer tiled page size</source>
@@ -14436,7 +15545,7 @@ Wil je deze veranderingen opslaan?</translation>
     </message>
     <message>
         <source>unamed</source>
-        <translation>naamloos</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File error.
@@ -14444,7 +15553,7 @@ Wil je deze veranderingen opslaan?</translation>
 %1
 
 %2</source>
-        <translation>Bestandsfout.
+        <translation type="unfinished">Bestandsfout.
 
 %1
 
@@ -14452,25 +15561,37 @@ Wil je deze veranderingen opslaan?</translation>
     </message>
     <message>
         <source>The layout is stale.</source>
-        <translation>De opmaak is verouderd.</translation>
+        <translation type="unfinished">De opmaak is verouderd.</translation>
     </message>
     <message>
         <source>The layout was not updated since last pattern modification. Do you want to continue?</source>
-        <translation>De opmaak is niet meer bijgewerkt sinds de laatste veranderingen. Wilt u verder gaan?</translation>
+        <translation type="unfinished">De opmaak is niet meer bijgewerkt sinds de laatste veranderingen. Wilt u verder gaan?</translation>
+    </message>
+</context>
+<context>
+    <name>VRawLayout</name>
+    <message>
+        <source>VRawLayout::ReadFile() failed. Raw layout format prefix mismatch error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VRawLayout::ReadFile() failed.
+Raw layout format compatibility error: actualFileVersion = %1 and fileVersion = %2</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VSettings</name>
     <message>
         <source>layouts</source>
-        <translation>opmaak</translation>
+        <translation type="vanished">opmaak</translation>
     </message>
 </context>
 <context>
     <name>VSimpleCurve</name>
     <message>
         <source>VSimpleCurve::RefreshGeometry: pointer to curve is null.</source>
-        <translation>VSimpleCurve::RefreshGeometry: pointer naar boog is null.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -14591,15 +15712,15 @@ Wil je deze veranderingen opslaan?</translation>
     </message>
     <message>
         <source>Length</source>
-        <translation>Lengte</translation>
+        <translation type="unfinished">Lengte</translation>
     </message>
     <message>
         <source>Angle</source>
-        <translation>Hoek</translation>
+        <translation type="unfinished">Hoek</translation>
     </message>
     <message>
         <source>Label</source>
-        <translation>Label</translation>
+        <translation type="unfinished">Label</translation>
     </message>
     <message>
         <source>Segment 1</source>
@@ -15412,23 +16533,23 @@ Wil je deze veranderingen opslaan?</translation>
     </message>
     <message>
         <source>Notes:</source>
-        <translation>Notities:</translation>
+        <translation type="unfinished">Notities:</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Alias:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias1:</source>
-        <translation>Alias1:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias2:</source>
-        <translation>Alias2:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Point of intersection circle and segment</source>
-        <translation>Kruispunt van cirkel en segment</translation>
+        <translation type="unfinished">Kruispunt van cirkel en segment</translation>
     </message>
 </context>
 <context>
@@ -15486,7 +16607,7 @@ Wil je deze veranderingen opslaan?</translation>
     </message>
     <message>
         <source>Label</source>
-        <translation>Label</translation>
+        <translation type="unfinished">Label</translation>
     </message>
     <message>
         <source>Curve 1 segment 1</source>
@@ -16873,6 +17994,131 @@ Wil je deze veranderingen opslaan?</translation>
         <comment>Left symbol _ in the name</comment>
         <translation>Hoek2ElHoek_</translation>
     </message>
+    <message>
+        <source>date</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">datum</translation>
+    </message>
+    <message>
+        <source>time</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">tijd</translation>
+    </message>
+    <message>
+        <source>patternName</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">patroonNaam</translation>
+    </message>
+    <message>
+        <source>patternNumber</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">patroonNummer</translation>
+    </message>
+    <message>
+        <source>author</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">auteur</translation>
+    </message>
+    <message>
+        <source>customer</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">klant</translation>
+    </message>
+    <message>
+        <source>pExt</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">pExt</translation>
+    </message>
+    <message>
+        <source>pFileName</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">pBestandsNaam</translation>
+    </message>
+    <message>
+        <source>mFileName</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">mBestandsNaam</translation>
+    </message>
+    <message>
+        <source>mExt</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">mExt</translation>
+    </message>
+    <message>
+        <source>pLetter</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">pLetter</translation>
+    </message>
+    <message>
+        <source>pAnnotation</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">pAantekening</translation>
+    </message>
+    <message>
+        <source>pOrientation</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">pOrientatie</translation>
+    </message>
+    <message>
+        <source>pRotation</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">pDraaiing</translation>
+    </message>
+    <message>
+        <source>pTilt</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">pTillen</translation>
+    </message>
+    <message>
+        <source>pFoldPosition</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">pVouwPostie</translation>
+    </message>
+    <message>
+        <source>pName</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">pNaam</translation>
+    </message>
+    <message>
+        <source>pQuantity</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">pKwantiteit</translation>
+    </message>
+    <message>
+        <source>mFabric</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">mStof</translation>
+    </message>
+    <message>
+        <source>mLining</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">mVoering</translation>
+    </message>
+    <message>
+        <source>mInterfacing</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">mVlieseline</translation>
+    </message>
+    <message>
+        <source>mInterlining</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">mTussenvoering</translation>
+    </message>
+    <message>
+        <source>wCut</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">wKnippen</translation>
+    </message>
+    <message>
+        <source>wOnFold</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">wOpVouw</translation>
+    </message>
+    <message>
+        <source>userMaterial</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">gebruikersMateriaal</translation>
+    </message>
     <message>
         <source>r2cm</source>
         <comment>round to up to 1 decimal</comment>
@@ -17081,12 +18327,12 @@ Wil je deze veranderingen opslaan?</translation>
     <message>
         <source>warning</source>
         <comment>Calculation warning</comment>
-        <translation>waarschuwing</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show a warning in calculations</source>
         <comment>function warning</comment>
-        <translation>Toon een waarschuwing in berekeningen</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -17111,6 +18357,13 @@ Wil je deze veranderingen opslaan?</translation>
         <translation type="vanished">Fout bij het inladen van reserve bestand: %1.</translation>
     </message>
 </context>
+<context>
+    <name>VValentinaSettings</name>
+    <message>
+        <source>layouts</source>
+        <translation type="unfinished">opmaak</translation>
+    </message>
+</context>
 <context>
     <name>VWidgetDetails</name>
     <message>
@@ -17213,6 +18466,13 @@ Wil je deze veranderingen opslaan?</translation>
         <translation>Categoriëen: %1.</translation>
     </message>
 </context>
+<context>
+    <name>Valentina</name>
+    <message>
+        <source>This test build is older than %1 days. To provide you with better quality service we restrict the lifetime you can use a test build. To continue using Valentina please update to newer test build. The application will be shut down.</source>
+        <translation type="vanished">Deze testversie is ouder dan %1 dagen. Om je een betere dienst te verlenen beperken we de levensduur van een testversie. Om Tape verder te gebruiken, vragen we jou om bij te werken naar een nieuwere testversie. Het programma wordt nu gestopt.</translation>
+    </message>
+</context>
 <context>
     <name>VisToolCubicBezierPath</name>
     <message>
@@ -17492,7 +18752,7 @@ Deze wijziging opslaan?</translation>
     </message>
     <message>
         <source>untitled.vwm</source>
-        <translation>naamloos.vwm</translation>
+        <translation>untitled.vwm</translation>
     </message>
     <message>
         <source>Confirm format rewriting</source>
@@ -17524,7 +18784,7 @@ Deze wijziging opslaan?</translation>
     </message>
     <message>
         <source>Do you want to change the premissions?</source>
-        <translation>Wens je de rechten te veranderen?</translation>
+        <translation type="unfinished">Wens je de rechten te veranderen?</translation>
     </message>
 </context>
 <context>
diff --git a/share/translations/valentina_pl_PL.ts b/share/translations/valentina_pl_PL.ts
index bc1a60bff..b81367ae8 100644
--- a/share/translations/valentina_pl_PL.ts
+++ b/share/translations/valentina_pl_PL.ts
@@ -576,7 +576,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
+        <translation type="unfinished">Narzędzie</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -707,16 +707,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
+        <translation type="unfinished">Narzędzie</translation>
+    </message>
+    <message>
+        <source>Alias:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Alias:</source>
-        <translation>Odnośnik:</translation>
-    </message>
 </context>
 <context>
     <name>DialogArcWithLength</name>
@@ -834,16 +834,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
+        <translation type="unfinished">Narzędzie</translation>
+    </message>
+    <message>
+        <source>Alias:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Alias:</source>
-        <translation>Odnośnik:</translation>
-    </message>
 </context>
 <context>
     <name>DialogBisector</name>
@@ -965,7 +965,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
+        <translation type="unfinished">Narzędzie</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -1036,16 +1036,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
+        <translation type="unfinished">Narzędzie</translation>
+    </message>
+    <message>
+        <source>Alias:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Alias:</source>
-        <translation>Odnośnik:</translation>
-    </message>
 </context>
 <context>
     <name>DialogCubicBezierPath</name>
@@ -1091,20 +1091,20 @@
     </message>
     <message>
         <source>Cannot find point with id %1</source>
-        <translation>Nie można odnaleźć punktu %1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
+        <translation type="unfinished">Narzędzie</translation>
+    </message>
+    <message>
+        <source>Alias:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Alias:</source>
-        <translation>Odnośnik:</translation>
-    </message>
 </context>
 <context>
     <name>DialogCurveIntersectAxis</name>
@@ -1206,7 +1206,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
+        <translation type="unfinished">Narzędzie</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -1214,11 +1214,11 @@
     </message>
     <message>
         <source>Alias1:</source>
-        <translation>Odnośnik1:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias2:</source>
-        <translation>Odnośnik2:</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1297,20 +1297,20 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
+        <translation type="unfinished">Narzędzie</translation>
+    </message>
+    <message>
+        <source>Alias1:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alias2:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Alias1:</source>
-        <translation>Odnośnik1:</translation>
-    </message>
-    <message>
-        <source>Alias2:</source>
-        <translation>Odnośnik2:</translation>
-    </message>
 </context>
 <context>
     <name>DialogCutSpline</name>
@@ -1388,20 +1388,20 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
+        <translation type="unfinished">Narzędzie</translation>
+    </message>
+    <message>
+        <source>Alias1:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alias2:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Alias1:</source>
-        <translation>Odnośnik1:</translation>
-    </message>
-    <message>
-        <source>Alias2:</source>
-        <translation>Odnośnik2:</translation>
-    </message>
 </context>
 <context>
     <name>DialogCutSplinePath</name>
@@ -1479,20 +1479,20 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
+        <translation type="unfinished">Narzędzie</translation>
+    </message>
+    <message>
+        <source>Alias1:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alias2:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Alias1:</source>
-        <translation>Odnośnik1:</translation>
-    </message>
-    <message>
-        <source>Alias2:</source>
-        <translation>Odnośnik2:</translation>
-    </message>
 </context>
 <context>
     <name>DialogDateTimeFormats</name>
@@ -1547,26 +1547,14 @@
         <source>Seam allowance tool</source>
         <translation type="vanished">Stwórz nowy szablon</translation>
     </message>
-    <message>
-        <source>Scroll down the list</source>
-        <translation type="vanished">Przesuń listę w dół</translation>
-    </message>
     <message>
         <source>...</source>
         <translation type="vanished">...</translation>
     </message>
-    <message>
-        <source>Scroll up the list</source>
-        <translation type="vanished">Przesuń listę w górę</translation>
-    </message>
     <message>
         <source>Ready!</source>
         <translation type="vanished">Gotowe!</translation>
     </message>
-    <message>
-        <source>You need more points!</source>
-        <translation type="vanished">Potrzebujesz więcej punktów!</translation>
-    </message>
     <message>
         <source>Width:</source>
         <translation type="vanished">Szerokość:</translation>
@@ -1579,10 +1567,6 @@
         <source>Cancel</source>
         <translation type="vanished">Anuluj</translation>
     </message>
-    <message>
-        <source>Remove</source>
-        <translation type="vanished">Usuń</translation>
-    </message>
     <message>
         <source>Fabric</source>
         <translation type="vanished">Tkanina</translation>
@@ -1599,10 +1583,6 @@
         <source>Interlining</source>
         <translation type="vanished">Ocieplina</translation>
     </message>
-    <message>
-        <source>Name can&apos;t be empty</source>
-        <translation type="vanished">Nazwa nie może być pusta</translation>
-    </message>
     <message>
         <source>Grainline</source>
         <translation type="vanished">Linia osnowy</translation>
@@ -1646,17 +1626,17 @@
         <source>Dimension labels</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Dimension:</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Value</source>
-        <translation>Wartość</translation>
+        <translation type="unfinished">Wartość</translation>
     </message>
     <message>
         <source>Label</source>
-        <translation>Etykieta</translation>
-    </message>
-    <message>
-        <source>Dimension:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Etykieta</translation>
     </message>
 </context>
 <context>
@@ -1695,16 +1675,16 @@
     <message>
         <source>Bold</source>
         <comment>Font formating</comment>
-        <translation>Pogrubienie</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italic</source>
         <comment>Font formating</comment>
-        <translation>Pochylenie</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aligns with the left edge</source>
-        <translation>Wyrównanie do lewej</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Centers horizontally in the available space</source>
@@ -1712,7 +1692,7 @@
     </message>
     <message>
         <source>Aligns with the right edge</source>
-        <translation>Wyrównanie do prawej</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Additional font size. Use to make a line bigger.</source>
@@ -1724,11 +1704,11 @@
     </message>
     <message>
         <source>Line of text</source>
-        <translation>Linia tekstu</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert placeholders</source>
-        <translation>Wstaw podpowiedź</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preview</source>
@@ -1740,7 +1720,7 @@
     </message>
     <message>
         <source>Create new template</source>
-        <translation>Utwórz nowy szablon</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating new template will overwrite the current, do you want to continue?</source>
@@ -1748,7 +1728,7 @@
     </message>
     <message>
         <source>Label template</source>
-        <translation>Etykieta szablonu</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export label template</source>
@@ -1764,7 +1744,7 @@
     </message>
     <message>
         <source>Import template</source>
-        <translation>Importuj szablon</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import template will overwrite the current, do you want to continue?</source>
@@ -1772,11 +1752,11 @@
     </message>
     <message>
         <source>File error.</source>
-        <translation>Błędny plik.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
-        <translation>Data</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
@@ -1792,7 +1772,7 @@
     </message>
     <message>
         <source>Company name or designer name</source>
-        <translation>Nazwa firmy lub projektanta</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Customer name</source>
@@ -1810,6 +1790,14 @@
         <source>Measurments file name</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="vanished">Rozmiar</translation>
+    </message>
+    <message>
+        <source>Height</source>
+        <translation type="vanished">Wysokość</translation>
+    </message>
     <message>
         <source>Measurments extension</source>
         <translation type="unfinished"></translation>
@@ -1844,11 +1832,11 @@
     </message>
     <message>
         <source>Quantity</source>
-        <translation>Ilość</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Material: Fabric</source>
-        <translation>Materiał: tkanina</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fabric</source>
@@ -1884,7 +1872,7 @@
     </message>
     <message>
         <source>Cut</source>
-        <translation>Wytnj</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Word: on fold</source>
@@ -1900,7 +1888,7 @@
     </message>
     <message>
         <source>Insert…</source>
-        <translation>Wstaw…</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move on top</source>
@@ -1920,7 +1908,7 @@
     </message>
     <message>
         <source>Measurements units</source>
-        <translation>Jednostki wymiarów</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pattern units</source>
@@ -1938,19 +1926,15 @@
         <source>Customer email</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Measurement: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Wysokość</translation>
+        <translation type="unfinished">Wysokość</translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Rozmiar</translation>
+        <translation type="unfinished">Rozmiar</translation>
     </message>
     <message>
         <source>Hip</source>
@@ -1963,23 +1947,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No data for the height dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the size dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the hip dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the waist dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Final measurement: %1</source>
+        <source>Measurement: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2002,6 +1970,26 @@
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Final measurement: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the height dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the size dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the hip dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the waist dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogEditWrongFormula</name>
@@ -2035,7 +2023,7 @@
     </message>
     <message>
         <source>Increments</source>
-        <translation>Zmienne</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Length of lines</source>
@@ -2051,16 +2039,12 @@
     </message>
     <message>
         <source>Angle of lines</source>
-        <translation>Kąt linii</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide empty measurements</source>
         <translation>Ukryj puste wymiary</translation>
     </message>
-    <message>
-        <source>Double click for add to formula</source>
-        <translation type="vanished">Dwa razy kliknij aby dodać formułę</translation>
-    </message>
     <message>
         <source>Height</source>
         <translation type="vanished">Wysokość</translation>
@@ -2071,7 +2055,7 @@
     </message>
     <message>
         <source>Line length</source>
-        <translation>Długość linii</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc length</source>
@@ -2079,23 +2063,19 @@
     </message>
     <message>
         <source>Curve length</source>
-        <translation>Długość krzywej</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line Angle</source>
-        <translation>Kąt linii</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Radius of arcs</source>
-        <translation>Promień łuku</translation>
-    </message>
-    <message>
-        <source>Angles of arcs</source>
-        <translation type="vanished">Kąt łuku</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Angles of curves</source>
-        <translation>Kąt krzywej</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc radius</source>
@@ -2226,16 +2206,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
+        <translation type="unfinished">Narzędzie</translation>
+    </message>
+    <message>
+        <source>Alias:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Alias:</source>
-        <translation>Odnośnik:</translation>
-    </message>
 </context>
 <context>
     <name>DialogEndLine</name>
@@ -2341,7 +2321,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
+        <translation type="unfinished">Narzędzie</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -2404,7 +2384,7 @@
     <name>DialogFinalMeasurements</name>
     <message>
         <source>Final measurements</source>
-        <translation>Wymiary końcowe</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find:</source>
@@ -2571,15 +2551,11 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Narzędzie</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Odnośnik:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pen style:</source>
@@ -2593,6 +2569,10 @@
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -2690,15 +2670,11 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Narzędzie</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Odnośnik:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pen style:</source>
@@ -2712,6 +2688,10 @@
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -2860,7 +2840,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
+        <translation type="unfinished">Narzędzie</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -3030,7 +3010,7 @@
     <name>DialogIncrements</name>
     <message>
         <source>Increments</source>
-        <translation>Zmienne</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
@@ -3152,13 +3132,9 @@
         <source>Parser error: %1</source>
         <translation>Błąd składni: %1</translation>
     </message>
-    <message>
-        <source>Increment_%1</source>
-        <translation type="vanished">zmienna_%1</translation>
-    </message>
     <message>
         <source>Edit increment</source>
-        <translation>Edytuj zmienną</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unique increment name</source>
@@ -3214,7 +3190,7 @@
     </message>
     <message>
         <source>Increment</source>
-        <translation>Zmienna</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Separator</source>
@@ -3347,10 +3323,6 @@
         <source>Height:</source>
         <translation>Wysokość:</translation>
     </message>
-    <message>
-        <source>degree</source>
-        <translation type="vanished">stopnień</translation>
-    </message>
     <message>
         <source>Three groups: big, middle, small</source>
         <translation type="unfinished"></translation>
@@ -3607,7 +3579,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
+        <translation type="unfinished">Narzędzie</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -3674,7 +3646,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
+        <translation type="unfinished">Narzędzie</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -3793,7 +3765,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
+        <translation type="unfinished">Narzędzie</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -3932,7 +3904,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Preview</source>
-        <translation>Podgląd</translation>
+        <translation type="unfinished">Podgląd</translation>
     </message>
     <message>
         <source>Input</source>
@@ -3948,11 +3920,11 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Full name:</source>
-        <translation>Pełna nazwa:</translation>
+        <translation type="unfinished">Pełna nazwa:</translation>
     </message>
     <message>
         <source>Description:</source>
-        <translation>Opis:</translation>
+        <translation type="unfinished">Opis:</translation>
     </message>
     <message>
         <source>Ready</source>
@@ -3960,20 +3932,50 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Name</source>
-        <translation>Nazwa</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Nazwa</translation>
     </message>
     <message>
         <source>Value</source>
-        <translation>Wartość</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Wartość</translation>
+    </message>
+    <message>
+        <source>Full name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Pełna nazwa</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Opis</translation>
     </message>
     <message>
         <source>Base value</source>
-        <translation>Wartość podstawowa</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Wartość podstawowa</translation>
+    </message>
+    <message>
+        <source>Shift (%1):</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Skip</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Nazwa</translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished">Wartość</translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <translation type="unfinished">Wartość podstawowa</translation>
+    </message>
     <message>
         <source>Shift (%1)*:</source>
         <translation type="unfinished"></translation>
@@ -3994,36 +3996,6 @@ Apply settings anyway?</source>
         <source>Please, select unique number for each column</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Name</source>
-        <comment>measurement column</comment>
-        <translation>Nazwa</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <comment>measurement column</comment>
-        <translation>Wartość</translation>
-    </message>
-    <message>
-        <source>Full name</source>
-        <comment>measurement column</comment>
-        <translation>Pełna nazwa</translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <comment>measurement column</comment>
-        <translation>Opis</translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <comment>measurement column</comment>
-        <translation>Wartość podstawowa</translation>
-    </message>
-    <message>
-        <source>Shift (%1):</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DialogMove</name>
@@ -4117,15 +4089,11 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Narzędzie</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Odnośnik:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pen style:</source>
@@ -4139,6 +4107,10 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -4157,11 +4129,11 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Invalid angle formula</source>
-        <translation>Nieprawidłowa formuła kąta</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid rotation angle formula</source>
-        <translation>Błędna formuła kąta obrotu</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid length formula</source>
@@ -4370,7 +4342,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
+        <translation type="unfinished">Narzędzie</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -4538,6 +4510,22 @@ Apply settings anyway?</source>
         <source>For technical notes</source>
         <translation>Notatki techniczne</translation>
     </message>
+    <message>
+        <source>Edit pattern label</source>
+        <translation type="vanished">Edytuj etykietę wykroju</translation>
+    </message>
+    <message>
+        <source>Edit template</source>
+        <translation type="vanished">Edytuj szablon</translation>
+    </message>
+    <message>
+        <source>Date format:</source>
+        <translation type="vanished">Format daty:</translation>
+    </message>
+    <message>
+        <source>Time format:</source>
+        <translation type="vanished">Format czasu:</translation>
+    </message>
     <message>
         <source>Label language:</source>
         <translation>Język etykiet:</translation>
@@ -4734,7 +4722,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>You need more points!</source>
-        <translation>Potrzebujesz więcej punktów!</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First point of &lt;b&gt;custom seam allowance&lt;/b&gt; cannot be equal to the last point!</source>
@@ -5044,7 +5032,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Rectangle</source>
-        <translation>Prostokąt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cross</source>
@@ -5064,7 +5052,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Triangle</source>
-        <translation>Trójkąt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>H-shaped</source>
@@ -5155,7 +5143,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
+        <translation type="unfinished">Narzędzie</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5242,7 +5230,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
+        <translation type="unfinished">Narzędzie</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5325,7 +5313,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
+        <translation type="unfinished">Narzędzie</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5376,7 +5364,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
+        <translation type="unfinished">Narzędzie</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5431,7 +5419,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
+        <translation type="unfinished">Narzędzie</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5526,7 +5514,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
+        <translation type="unfinished">Narzędzie</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5573,7 +5561,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
+        <translation type="unfinished">Narzędzie</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5585,11 +5573,11 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Alias1:</source>
-        <translation>Odnośnik1:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias2:</source>
-        <translation>Odnośnik2:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Curve 2</source>
@@ -5623,6 +5611,29 @@ Apply settings anyway?</source>
         </translation>
     </message>
 </context>
+<context>
+    <name>DialogPuzzlePreferences</name>
+    <message>
+        <source>Puzzle preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paths</source>
+        <translation type="unfinished">Ścieżki</translation>
+    </message>
+    <message numerus="yes">
+        <source>Followed %n option(s) require restart to take effect: %1.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+</context>
 <context>
     <name>DialogRestrictDimension</name>
     <message>
@@ -5730,11 +5741,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Narzędzie</translation>
     </message>
     <message>
         <source>Alias</source>
@@ -5752,6 +5759,10 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -5774,7 +5785,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Invalid angle formula</source>
-        <translation>Nieprawidłowa formuła kąta</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Label:</source>
@@ -5782,7 +5793,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Odnośnik:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
@@ -5857,7 +5868,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Browse…</source>
-        <translation>Przeglądaj…</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
@@ -5954,6 +5965,10 @@ Apply settings anyway?</source>
         <source>Numerical control</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogSeamAllowance</name>
@@ -6019,7 +6034,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>You need more points!</source>
-        <translation>Potrzebujesz więcej punktów!</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have to choose points in a clockwise direction!</source>
@@ -6119,7 +6134,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Rectangle</source>
-        <translation>Prostokąt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cross</source>
@@ -6139,7 +6154,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Triangle</source>
-        <translation>Trójkąt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>H-shaped</source>
@@ -6212,6 +6227,11 @@ Apply settings anyway?</source>
         <source>Use full circumference</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Height</source>
+        <comment>dimension</comment>
+        <translation type="unfinished">Wysokość</translation>
+    </message>
     <message>
         <source>Min value:</source>
         <translation type="unfinished"></translation>
@@ -6244,10 +6264,25 @@ Apply settings anyway?</source>
         <source>The base value for the column</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <comment>dimension</comment>
+        <translation type="unfinished">Rozmiar</translation>
+    </message>
     <message>
         <source>Circumference</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Waist</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hip</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Please, provide correct data for dimensions</source>
         <translation type="unfinished"></translation>
@@ -6264,26 +6299,6 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Height</source>
-        <comment>dimension</comment>
-        <translation>Wysokość</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <comment>dimension</comment>
-        <translation>Rozmiar</translation>
-    </message>
-    <message>
-        <source>Waist</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hip</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DialogShoulderPoint</name>
@@ -6389,7 +6404,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
+        <translation type="unfinished">Narzędzie</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6432,7 +6447,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
+        <translation type="unfinished">Narzędzie</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6547,16 +6562,16 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
+        <translation type="unfinished">Narzędzie</translation>
+    </message>
+    <message>
+        <source>Alias:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Alias:</source>
-        <translation>Odnośnik:</translation>
-    </message>
 </context>
 <context>
     <name>DialogSplinePath</name>
@@ -6666,20 +6681,20 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Cannot find point with id %1</source>
-        <translation>Nie można odnaleźć punktu %1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
+        <translation type="unfinished">Narzędzie</translation>
+    </message>
+    <message>
+        <source>Alias:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Alias:</source>
-        <translation>Odnośnik:</translation>
-    </message>
 </context>
 <context>
     <name>DialogTapePreferences</name>
@@ -6839,7 +6854,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
+        <translation type="unfinished">Narzędzie</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6930,7 +6945,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Narzędzie</translation>
+        <translation type="unfinished">Narzędzie</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -7347,7 +7362,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Save &amp;As...</source>
-        <translation type="vanished">Zapisz &amp;jako…</translation>
+        <translation type="vanished">Zapisz &amp;jako...</translation>
     </message>
     <message>
         <source>Save not yet saved pattern</source>
@@ -7399,7 +7414,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>Zakończ</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Exit the application</source>
@@ -7604,11 +7619,11 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>This file already opened in another window.</source>
-        <translation>Plik ten otwarty jest w innym oknie.</translation>
+        <translation type="vanished">Plik ten otwarty jest w innym oknie.</translation>
     </message>
     <message>
         <source>File error.</source>
-        <translation>Błędny plik.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Valentina didn&apos;t shut down correctly. Do you want reopen files (%1) you had open?</source>
@@ -7802,18 +7817,10 @@ Do you want to save your changes?</source>
         <source>Sync measurements</source>
         <translation type="vanished">Synchr. wymiary</translation>
     </message>
-    <message>
-        <source>Individual measurements (*.vit);;Standard measurements (*.vst)</source>
-        <translation type="vanished">Wymiary indywidualne (*.vit);;Wymiary standardowe (*.vst)</translation>
-    </message>
     <message>
         <source>Measurements loaded</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Standard measurements (*.vst);;Individual measurements (*.vit)</source>
-        <translation type="vanished">Wymiary standardowe (*.vst);;Wymiary indywidualne (*.vit)</translation>
-    </message>
     <message>
         <source>You can&apos;t export empty scene.</source>
         <translation type="unfinished"></translation>
@@ -7822,10 +7829,6 @@ Do you want to save your changes?</source>
         <source>Create new Layout</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Create/edit measurements</source>
-        <translation type="vanished">Utwórz/edytuj wymiary</translation>
-    </message>
     <message>
         <source>Failed to lock. This file already opened in another window.</source>
         <translation type="unfinished"></translation>
@@ -7842,10 +7845,6 @@ Do you want to save your changes?</source>
         <source>Measurement file has unknown format.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Measurement file doesn&apos;t include all required measurements.</source>
-        <translation type="vanished">Plik z wymiarami nie zawiera wszystkich wymaganych wymiarów.</translation>
-    </message>
     <message>
         <source>Measurement files types have not match.</source>
         <translation type="unfinished"></translation>
@@ -7856,15 +7855,11 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Couldn&apos;t update measurements.</source>
-        <translation>Nie można uaktualnić wymiarów.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The measurements file &apos;%1&apos; could not be found.</source>
-        <translation>Nie odnaleziono pliku &apos;%1&apos; z wymiarami.</translation>
-    </message>
-    <message>
-        <source>The measurements file &lt;br/&gt;&lt;br/&gt; &lt;b&gt;%1&lt;/b&gt; &lt;br/&gt;&lt;br/&gt; could not be found. Do you want to update the file location</source>
-        <translation type="vanished">Nie odnaleziono pliku &lt;br/&gt;&lt;br/&gt; &lt;b&gt;%1&lt;/b&gt; &lt;br/&gt;&lt;br/&gt; z wymiarami. Czy chcesz zmienić położenie pliku</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loading measurements file</source>
@@ -7938,30 +7933,6 @@ Do you want to save your changes?</source>
         <source>Don&apos;t Save</source>
         <translation>Nie zapisuj</translation>
     </message>
-    <message>
-        <source>Locking file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The lock file could not be created, for lack of permissions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Point intersection curves</source>
         <translation type="unfinished"></translation>
@@ -7984,7 +7955,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Operations</source>
-        <translation>Operacje</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create new group</source>
@@ -8082,21 +8053,9 @@ Do you want to save your changes?</source>
         <source>Select main path objects clockwise.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>The document has no write permissions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cannot set permissions for %1 to writable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not save the file.</source>
-        <translation>Nie można zapisać pliku.</translation>
-    </message>
     <message>
         <source>Could not save the file</source>
-        <translation>Nie można zapisać pliku</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read only</source>
@@ -8252,7 +8211,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Save &amp;As…</source>
-        <translation>Zapisz jako…</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Report Bug…</source>
@@ -8268,7 +8227,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Final measurements</source>
-        <translation>Wymiary końcowe</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export Final Measurements to CSV</source>
@@ -8452,7 +8411,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Watermark</source>
-        <translation>Znak wodny</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load</source>
@@ -8460,7 +8419,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Usuń</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit current</source>
@@ -8476,10 +8435,46 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Watermark files</source>
-        <translation>Plik znaku wodnego</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to change the premissions?</source>
+        <source>Manual Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open the Puzzle app</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to prepare raw layout data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select manual layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8522,22 +8517,6 @@ Do you want to save your changes?</source>
         <source>Could not create recipe file. %1</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Shop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scalable Vector Graphics files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save draw</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw export</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>MainWindowsNoGUI</name>
@@ -8607,11 +8586,11 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>File error.</source>
-        <translation>Błędny plik.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Measurement file doesn&apos;t include all required measurements.</source>
-        <translation>Plik z wymiarami nie zawiera wszystkich wymaganych wymiarów.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please, additionally provide: %1</source>
@@ -9005,6 +8984,10 @@ Do you want to save your changes?</source>
         <source>My label templates</source>
         <translation>Moje szablony etykiet</translation>
     </message>
+    <message>
+        <source>My manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PreferencesPatternPage</name>
@@ -9146,6 +9129,111 @@ This option will take an affect after restart.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>Puzzle</name>
+    <message>
+        <source>Export options can be used with single input file only.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Valentina&apos;s manual layout editor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The manual layout file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesConfigurationPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished">Język</translation>
+    </message>
+    <message>
+        <source>GUI language:</source>
+        <translation type="unfinished">Język interfejsu:</translation>
+    </message>
+    <message>
+        <source>Toolbar</source>
+        <translation type="unfinished">Pasek narzędzi</translation>
+    </message>
+    <message>
+        <source>The text appears under the icon (recommended for beginners).</source>
+        <translation type="unfinished">Wyświetl napisy pod ikonkami (zalecane dla początkujących).</translation>
+    </message>
+    <message>
+        <source>User Interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate dark mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t use the native file dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dark mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesPathPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paths that Valentina uses</source>
+        <translation type="unfinished">Ścieżki używane przez program</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished">Typ</translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished">Ścieżka</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished">Domyślny</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished">Edytuj</translation>
+    </message>
+    <message>
+        <source>Open Directory</source>
+        <translation type="unfinished">Otwórz katalog</translation>
+    </message>
+    <message>
+        <source>My Individual Measurements</source>
+        <translation type="unfinished">Moje osobiste wymiary</translation>
+    </message>
+    <message>
+        <source>My Multisize Measurements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Patterns</source>
+        <translation type="unfinished">Moje wykroje</translation>
+    </message>
+    <message>
+        <source>My Templates</source>
+        <translation type="unfinished">Moje szablony</translation>
+    </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>QApplication</name>
     <message>
@@ -9325,7 +9413,7 @@ This option will take an affect after restart.</source>
     </message>
     <message>
         <source>Cut</source>
-        <translation>Wytnj</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on fold</source>
@@ -9447,6 +9535,10 @@ This option will take an affect after restart.</source>
         <source>Can&apos;t convert toInt parameter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Piece name &apos;%1&apos; is not unique.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Could not find the segment start.</source>
         <translation type="unfinished"></translation>
@@ -9463,6 +9555,10 @@ This option will take an affect after restart.</source>
         <source>Error calculating segment for curve &apos;%1&apos;. %2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot prepare builtin passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
@@ -9479,18 +9575,14 @@ This option will take an affect after restart.</source>
         <source>Cannot prepare passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Piece name &apos;%1&apos; is not unique.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Cannot get tokens from formula &apos;%1&apos;. Formula error: %2.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>No data for the height dimension.</source>
         <translation type="unfinished"></translation>
@@ -9512,11 +9604,15 @@ This option will take an affect after restart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
+        <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
+        <source>Unplaced pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet 1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -9794,7 +9890,7 @@ This option will take an affect after restart.</source>
     <name>TMainWindow</name>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:18pt;&quot;&gt;Select New for creation measurement file.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:18pt;&quot;&gt;Wciśnij nowy aby utworzyć plik pomiarów.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:18pt;&quot;&gt;Wciśnij nowy aby utworzyć plik pomiarów.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <source>Name</source>
@@ -9998,7 +10094,7 @@ This option will take an affect after restart.</source>
     </message>
     <message>
         <source>File error.</source>
-        <translation>Błędny plik.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not save file</source>
@@ -10050,7 +10146,7 @@ This option will take an affect after restart.</source>
     </message>
     <message>
         <source>untitled</source>
-        <translation type="vanished">bez nazwy</translation>
+        <translation>bez nazwy</translation>
     </message>
     <message>
         <source>&lt;Empty&gt;</source>
@@ -10063,8 +10159,7 @@ This option will take an affect after restart.</source>
     <message>
         <source>Measurements have been modified.
 Do you want to save your changes?</source>
-        <translation>Wymiary zostały zmienione.
-Czy chcesz zapisać zmiany?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Empty field</source>
@@ -10257,30 +10352,6 @@ Czy chcesz zapisać zmiany?</translation>
         <source>Don&apos;t Save</source>
         <translation>Nie zapisuj</translation>
     </message>
-    <message>
-        <source>Locking file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The lock file could not be created, for lack of permissions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Export to CSV</source>
         <translation>Eksportuj do CSV</translation>
@@ -10317,21 +10388,9 @@ Czy chcesz zapisać zmiany?</translation>
         <source>All files</source>
         <translation>Wszystkie pliki</translation>
     </message>
-    <message>
-        <source>The measurements document has no write permissions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cannot set permissions for %1 to writable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not save the file.</source>
-        <translation>Nie można zapisać pliku.</translation>
-    </message>
     <message>
         <source>Could not save the file</source>
-        <translation>Nie można zapisać pliku</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read only</source>
@@ -10427,7 +10486,7 @@ Czy chcesz zapisać zmiany?</translation>
     </message>
     <message>
         <source>&amp;Measurements</source>
-        <translation>&amp;Wymiary</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Open individual …</source>
@@ -10457,17 +10516,43 @@ Czy chcesz zapisać zmiany?</translation>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Search measurements by term. &lt;/p&gt;&lt;p&gt;Prepend &amp;quot;/r/&amp;quot; to the front of the search string to search measurements by regex.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Do you want to change the premissions?</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Cannot read settings from a malformed .INI file.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Nazwa</translation>
+    </message>
+    <message>
+        <source>Full name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Pełna nazwa</translation>
+    </message>
+    <message>
+        <source>Calculated value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Wartość obliczona</translation>
+    </message>
+    <message>
+        <source>Formula</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Formuła</translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Wartość podstawowa</translation>
+    </message>
+    <message>
+        <source>Correction</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Units:</source>
-        <translation>Jednostki:</translation>
+        <translation type="unfinished">Jednostki:</translation>
     </message>
     <message>
         <source>Shift B</source>
@@ -10567,54 +10652,20 @@ Czy chcesz zapisać zmiany?</translation>
     </message>
     <message>
         <source>Inches</source>
-        <translation>Cale</translation>
+        <translation type="unfinished">Cale</translation>
     </message>
     <message>
         <source>Centimeters</source>
-        <translation>Centymetry</translation>
+        <translation type="unfinished">Centymetry</translation>
     </message>
     <message>
         <source>Degrees</source>
-        <translation>Stopnie</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <comment>measurement column</comment>
-        <translation>Nazwa</translation>
-    </message>
-    <message>
-        <source>Full name</source>
-        <comment>measurement column</comment>
-        <translation>Pełna nazwa</translation>
-    </message>
-    <message>
-        <source>Calculated value</source>
-        <comment>measurement column</comment>
-        <translation>Wartość obliczona</translation>
-    </message>
-    <message>
-        <source>Formula</source>
-        <comment>measurement column</comment>
-        <translation>Formuła</translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <comment>measurement column</comment>
-        <translation>Wartość podstawowa</translation>
-    </message>
-    <message>
-        <source>Correction</source>
-        <comment>measurement column</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restrict first dimension</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:18pt;&quot;&gt;Select New to create a measurement file.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>TabGrainline</name>
@@ -10791,31 +10842,31 @@ Czy chcesz zapisać zmiany?</translation>
     </message>
     <message>
         <source>Edit pattern label</source>
-        <translation>Edytuj etykietę wykroju</translation>
+        <translation type="unfinished">Edytuj etykietę wykroju</translation>
     </message>
     <message>
         <source>Pattern name:</source>
-        <translation>Nazwa wykroju:</translation>
+        <translation type="unfinished">Nazwa wykroju:</translation>
     </message>
     <message>
         <source>Pattern number:</source>
-        <translation>Numer wykroju:</translation>
+        <translation type="unfinished">Numer wykroju:</translation>
     </message>
     <message>
         <source>Company/Designer name:</source>
-        <translation>Firma/Nazwa projektanta:</translation>
+        <translation type="unfinished">Firma/Nazwa projektanta:</translation>
     </message>
     <message>
         <source>Customer name:</source>
-        <translation>Nazwa klienta:</translation>
+        <translation type="unfinished">Nazwa klienta:</translation>
     </message>
     <message>
         <source>Date format:</source>
-        <translation>Format daty:</translation>
+        <translation type="unfinished">Format daty:</translation>
     </message>
     <message>
         <source>Time format:</source>
-        <translation>Format czasu:</translation>
+        <translation type="unfinished">Format czasu:</translation>
     </message>
     <message>
         <source>Customer birth date:</source>
@@ -11101,7 +11152,7 @@ Czy chcesz zapisać zmiany?</translation>
     </message>
     <message>
         <source>Name can&apos;t be empty</source>
-        <translation>Nazwa nie może być pusta</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force piece to be always flipped in a layout.</source>
@@ -11145,6 +11196,18 @@ Czy chcesz zapisać zmiany?</translation>
         <comment>seam allowance</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Universally Unique IDentifier of piece. Used to identifier piece while updating manual layout. Left empty to generate new value.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TabPlaceLabels</name>
@@ -11320,6 +11383,18 @@ Czy chcesz zapisać zmiany?</translation>
         <source>The text appears under the icon (recommended for beginners).</source>
         <translation>Wyświetl napisy pod ikonkami (zalecane dla początkujących).</translation>
     </message>
+    <message>
+        <source>Default height and size</source>
+        <translation type="vanished">Domyślna wysokość i rozmiar</translation>
+    </message>
+    <message>
+        <source>Default height:</source>
+        <translation type="vanished">Domyślna wysokość:</translation>
+    </message>
+    <message>
+        <source>Default size:</source>
+        <translation type="vanished">Domyślny rozmiar:</translation>
+    </message>
     <message>
         <source>With OS options</source>
         <translation>Z opcjami systemu operacyjnego</translation>
@@ -11383,6 +11458,10 @@ Czy chcesz zapisać zmiany?</translation>
         <source>My Patterns</source>
         <translation>Moje wykroje</translation>
     </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TogglePieceForceForbidFlipping</name>
@@ -11427,19 +11506,15 @@ Czy chcesz zapisać zmiany?</translation>
         <source>Base value invalid</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Size</source>
-        <translation>Rozmiar</translation>
-    </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Wysokość</translation>
+        <translation type="unfinished">Wysokość</translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Rozmiar</translation>
+        <translation type="unfinished">Rozmiar</translation>
     </message>
     <message>
         <source>Waist</source>
@@ -11461,6 +11536,10 @@ Czy chcesz zapisać zmiany?</translation>
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished">Rozmiar</translation>
+    </message>
     <message>
         <source>Chest circumference</source>
         <comment>dimension</comment>
@@ -11646,7 +11725,51 @@ Czy chcesz zapisać zmiany?</translation>
     </message>
     <message>
         <source>Export to CSV</source>
-        <translation>Eksportuj do CSV</translation>
+        <translation type="unfinished">Eksportuj do CSV</translation>
+    </message>
+    <message>
+        <source>The measurements document has no write permissions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to change the premissions?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot set permissions for %1 to writable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Locking file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This file already opened in another window.</source>
+        <translation type="unfinished">Plik ten otwarty jest w innym oknie.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -12289,6 +12412,34 @@ Czy chcesz zapisać zmiany?</translation>
         <source>The dimension C base</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>The filename of exported layout file. Use it to enable console export mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The filename of layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pattern pieces form the raw layout data file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The raw layout data file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to output format (default = 0, export mode): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to tiled pdf page template (default = 0, export mode with tiled pdf format): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run the program in a test mode. The program in this mode loads a single layout file and silently quit without showing the main window. The key have priority before key &apos;%1&apos;.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VCommonSettings</name>
@@ -12316,6 +12467,10 @@ Czy chcesz zapisać zmiany?</translation>
         <source>patterns</source>
         <translation>wykroje</translation>
     </message>
+    <message>
+        <source>manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VContainer</name>
@@ -12508,6 +12663,10 @@ Czy chcesz zapisać zmiany?</translation>
 </context>
 <context>
     <name>VLayoutExporter</name>
+    <message>
+        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot set printer page size</source>
         <translation type="unfinished"></translation>
@@ -12521,11 +12680,11 @@ Czy chcesz zapisać zmiany?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Creating file &apos;%1&apos; failed! %2</source>
+        <source>Export raw layout data failed. %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
+        <source>Creating file &apos;%1&apos; failed! %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12564,11 +12723,11 @@ Czy chcesz zapisać zmiany?</translation>
     </message>
     <message>
         <source>Height</source>
-        <translation>Wysokość</translation>
+        <translation type="unfinished">Wysokość</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Rozmiar</translation>
+        <translation type="unfinished">Rozmiar</translation>
     </message>
     <message>
         <source>Hip</source>
@@ -12714,6 +12873,114 @@ Czy chcesz zapisać zmiany?</translation>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>VPApplication</name>
+    <message>
+        <source>Error parsing file. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error bad id. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error can&apos;t convert value. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error empty parameter. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error wrong id. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Something&apos;s wrong!!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exception thrown: %1. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t begin to listen for incoming connections on name &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export mode doesn&apos;t support openning several files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import raw layout data does not support openning several layout files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, provide one input file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrousel</name>
+    <message>
+        <source>Pieces of </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrouselPieceList</name>
+    <message>
+        <source>Move to Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Usuń</translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPDialogAbout</name>
+    <message>
+        <source>About Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Puzzle version</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Build revision:</source>
+        <translation type="unfinished">Rewizja:</translation>
+    </message>
+    <message>
+        <source>This program is part of Valentina project.</source>
+        <translation type="unfinished">Ten program jest częścią projektu Valentina.</translation>
+    </message>
+    <message>
+        <source>Check For Updates</source>
+        <translation type="unfinished">Sprawdź aktualizacje</translation>
+    </message>
+    <message>
+        <source>Cannot open your default browser</source>
+        <translation type="unfinished">Nie mogę otworzyć domyślnej przeglądarki</translation>
+    </message>
+    <message>
+        <source>Build revision: %1</source>
+        <translation type="unfinished">Rewizja: %1</translation>
+    </message>
+    <message>
+        <source>Built on %1 at %2</source>
+        <translation type="unfinished">Zdudowano %1 o %2</translation>
+    </message>
+    <message>
+        <source>Web site : %1</source>
+        <translation type="unfinished">Strona www : %1</translation>
+    </message>
+</context>
 <context>
     <name>VPE::VBoolProperty</name>
     <message>
@@ -12736,6 +13003,573 @@ Czy chcesz zapisać zmiany?</translation>
         <translation>Otwórz plik</translation>
     </message>
 </context>
+<context>
+    <name>VPGraphicsPiece</name>
+    <message>
+        <source>Move to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPLayoutFileReader</name>
+    <message>
+        <source>Piece List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Got empty attribute &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPMainWindow</name>
+    <message>
+        <source>Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;Plik</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished">P&amp;omoc</translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Piece Carrousel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Infos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Nazwa:</translation>
+    </message>
+    <message>
+        <source>DummyName</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UUID:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{7b2ce4ae-96f5-4905-bb34-405cb40ca208}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Geometry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mirror piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Angle:</source>
+        <translation type="unfinished">Kąt:</translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° anti-clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Placement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Y:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No piece selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple pieces selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Width</source>
+        <translation type="unfinished">Szerokość</translation>
+    </message>
+    <message>
+        <source>Length</source>
+        <translation type="unfinished">Długość</translation>
+    </message>
+    <message>
+        <source>Orientation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove unused length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Margins</source>
+        <translation type="unfinished">Marginesy</translation>
+    </message>
+    <message>
+        <source>Right:</source>
+        <translation type="unfinished">Prawy:</translation>
+    </message>
+    <message>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left:</source>
+        <translation type="unfinished">Lewy:</translation>
+    </message>
+    <message>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Placement Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Row height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Follow grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vertical grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Horizontal grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pieces gap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sticky edges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation type="unfinished">Eksport</translation>
+    </message>
+    <message>
+        <source>Export Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiles properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiled Pdf Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Tiles on sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export Tiled Pdf</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation type="unfinished">Układ</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Nazwa</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Opis</translation>
+    </message>
+    <message>
+        <source>Unit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning superposition of pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning pieces out of bound</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation type="unfinished">&amp;Otwórz</translation>
+    </message>
+    <message>
+        <source>Ctrl+O</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Save</translation>
+    </message>
+    <message>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save &amp;As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Import Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation type="unfinished">&amp;Nowy</translation>
+    </message>
+    <message>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation type="unfinished">O &amp;Qt</translation>
+    </message>
+    <message>
+        <source>About &amp;Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom in</source>
+        <translation type="unfinished">Przybliż</translation>
+    </message>
+    <message>
+        <source>Zoom out</source>
+        <translation type="unfinished">Oddal</translation>
+    </message>
+    <message>
+        <source>Zoom 1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom fit best</source>
+        <translation type="unfinished">Dopasuj przybliżenie</translation>
+    </message>
+    <message>
+        <source>Zoom sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished">Ustawienia</translation>
+    </message>
+    <message>
+        <source>File &apos;%1&apos; doesn&apos;t exist!</source>
+        <translation type="unfinished">Plik &apos;%1&apos; nie istnieje!</translation>
+    </message>
+    <message>
+        <source>File error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to read a layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fail to create layout.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not extract data from file &apos;%1&apos;. %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Centimeters</source>
+        <translation type="unfinished">Centymetry</translation>
+    </message>
+    <message>
+        <source>Millimiters</source>
+        <translation type="unfinished">Milimetry</translation>
+    </message>
+    <message>
+        <source>Inches</source>
+        <translation type="unfinished">Cale</translation>
+    </message>
+    <message>
+        <source>Scale:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>untitled %1.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>untitled.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read only</source>
+        <translation type="unfinished">tylko do odczytu</translation>
+    </message>
+    <message>
+        <source>Cannot read settings from a malformed .INI file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save settings. Access denied.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to open file, is it writable?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New Window</source>
+        <translation type="unfinished">&amp;Nowe okno</translation>
+    </message>
+    <message>
+        <source>Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open file</source>
+        <translation type="unfinished">Otwórz plik</translation>
+    </message>
+    <message>
+        <source>Could not save the file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save as</source>
+        <translation type="unfinished">Zapisz jako</translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save file</source>
+        <translation type="unfinished">Nie można zapisać pliku</translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window. Expect collissions when run 2 copies of the program.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Raw Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About Qt</source>
+        <translation type="unfinished">O Qt</translation>
+    </message>
+    <message>
+        <source>PDF Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SVG Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPSheet</name>
+    <message>
+        <source>Letter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Legal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabloid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 24in</source>
+        <translation type="unfinished">Rolka 24 cale</translation>
+    </message>
+    <message>
+        <source>Roll 30in</source>
+        <translation type="unfinished">Rolka 30 cali</translation>
+    </message>
+    <message>
+        <source>Roll 36in</source>
+        <translation type="unfinished">Rolka 36 cali</translation>
+    </message>
+    <message>
+        <source>Roll 42in</source>
+        <translation type="unfinished">Rolka 42 cale</translation>
+    </message>
+    <message>
+        <source>Roll 44in</source>
+        <translation type="unfinished">Rolka 44 cale</translation>
+    </message>
+    <message>
+        <source>Roll 48in</source>
+        <translation type="unfinished">Rolka 44 cale {48i?}</translation>
+    </message>
+    <message>
+        <source>Roll 62in</source>
+        <translation type="unfinished">Rolka 44 cale {62i?}</translation>
+    </message>
+    <message>
+        <source>Roll 72in</source>
+        <translation type="unfinished">Rolka 44 cale {72i?}</translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPTileFactory</name>
+    <message>
+        <source>Grid ( %1 , %2 )</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page %1 of %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VPattern</name>
     <message>
@@ -13062,7 +13896,7 @@ Czy chcesz zapisać zmiany?</translation>
     <message>
         <source>in</source>
         <comment>unit</comment>
-        <translation>cal</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open the watermark image.</source>
@@ -13137,9 +13971,14 @@ Czy chcesz zapisać zmiany?</translation>
     </message>
 </context>
 <context>
-    <name>VSettings</name>
+    <name>VRawLayout</name>
     <message>
-        <source>layouts</source>
+        <source>VRawLayout::ReadFile() failed. Raw layout format prefix mismatch error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VRawLayout::ReadFile() failed.
+Raw layout format compatibility error: actualFileVersion = %1 and fileVersion = %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -13161,13 +14000,6 @@ Czy chcesz zapisać zmiany?</translation>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>VTextManager</name>
-    <message>
-        <source>Cut</source>
-        <translation type="vanished">Wytnj</translation>
-    </message>
-</context>
 <context>
     <name>VToolAlongLine</name>
     <message>
@@ -13195,7 +14027,7 @@ Czy chcesz zapisać zmiany?</translation>
     </message>
     <message>
         <source>Start angle</source>
-        <translation>Początek kąta</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End angle</source>
@@ -13218,7 +14050,7 @@ Czy chcesz zapisać zmiany?</translation>
     </message>
     <message>
         <source>Start angle</source>
-        <translation>Początek kąta</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End angle</source>
@@ -13244,15 +14076,15 @@ Czy chcesz zapisać zmiany?</translation>
     </message>
     <message>
         <source>Length</source>
-        <translation>Długość</translation>
+        <translation type="unfinished">Długość</translation>
     </message>
     <message>
         <source>Angle</source>
-        <translation>Kąt</translation>
+        <translation type="unfinished">Kąt</translation>
     </message>
     <message>
         <source>Label</source>
-        <translation>Etykieta</translation>
+        <translation type="unfinished">Etykieta</translation>
     </message>
     <message>
         <source>Segment 1</source>
@@ -13362,7 +14194,7 @@ Czy chcesz zapisać zmiany?</translation>
     </message>
     <message>
         <source>Start angle</source>
-        <translation>Początek kąta</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End angle</source>
@@ -13961,19 +14793,19 @@ Czy chcesz zapisać zmiany?</translation>
     </message>
     <message>
         <source>Notes:</source>
-        <translation>Notatki:</translation>
+        <translation type="unfinished">Notatki:</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Odnośnik:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias1:</source>
-        <translation>Odnośnik1:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias2:</source>
-        <translation>Odnośnik2:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Point of intersection circle and segment</source>
@@ -14035,7 +14867,7 @@ Czy chcesz zapisać zmiany?</translation>
     </message>
     <message>
         <source>Label</source>
-        <translation>Etykieta</translation>
+        <translation type="unfinished">Etykieta</translation>
     </message>
     <message>
         <source>Curve 1 segment 1</source>
@@ -15041,77 +15873,72 @@ Czy chcesz zapisać zmiany?</translation>
     <message>
         <source>sinh</source>
         <comment>hyperbolic sine function</comment>
-        <translation>sinh</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cosh</source>
         <comment>hyperbolic cosine</comment>
-        <translation>cosh</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tanh</source>
         <comment>hyperbolic tangens function</comment>
-        <translation>tanh</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>asinh</source>
         <comment>hyperbolic arcus sine function</comment>
-        <translation>asinh</translation>
-    </message>
-    <message>
-        <source>acosh</source>
-        <comment>hyperbolic arcus tangens function</comment>
-        <translation type="vanished">acosh</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>atanh</source>
         <comment>hyperbolic arcur tangens function</comment>
-        <translation>atanh</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>log2</source>
         <comment>logarithm to the base 2</comment>
-        <translation>log2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>log10</source>
         <comment>logarithm to the base 10</comment>
-        <translation>log10</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>log</source>
         <comment>logarithm to the base 10</comment>
-        <translation>log</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ln</source>
         <comment>logarithm to base e (2.71828...)</comment>
-        <translation>ln</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>exp</source>
         <comment>e raised to the power of x</comment>
-        <translation>exp</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sqrt</source>
         <comment>square root of a value</comment>
-        <translation>sqrt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sign</source>
         <comment>sign function -1 if x&lt;0; 1 if x&gt;0</comment>
-        <translation>sign</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rint</source>
         <comment>round to nearest integer</comment>
-        <translation>rint</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>abs</source>
         <comment>absolute value</comment>
-        <translation>abs</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>min</source>
@@ -15121,22 +15948,22 @@ Czy chcesz zapisać zmiany?</translation>
     <message>
         <source>max</source>
         <comment>max of all arguments</comment>
-        <translation>max</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sum</source>
         <comment>sum of all arguments</comment>
-        <translation>sum</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>avg</source>
         <comment>mean value of all arguments</comment>
-        <translation>avg</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>fmod</source>
         <comment>Returns the floating-point remainder of numer/denom (rounded towards zero)</comment>
-        <translation>fmod</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
@@ -15148,11 +15975,6 @@ Czy chcesz zapisać zmiany?</translation>
         <comment>millimeter</comment>
         <translation type="vanished">mm</translation>
     </message>
-    <message>
-        <source>in</source>
-        <comment>inch</comment>
-        <translation type="vanished">cal</translation>
-    </message>
     <message>
         <source>Line_</source>
         <comment>Left symbol _ in the name</comment>
@@ -15226,7 +16048,7 @@ Czy chcesz zapisać zmiany?</translation>
     <message>
         <source>acosh</source>
         <comment>hyperbolic arcus cosine function</comment>
-        <translation>acosh</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>size</source>
@@ -15336,7 +16158,7 @@ Czy chcesz zapisać zmiany?</translation>
     <message>
         <source>Increment_</source>
         <comment>Left symbol _ in the name</comment>
-        <translation>Zmienna_</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ElArc_</source>
@@ -15386,147 +16208,147 @@ Czy chcesz zapisać zmiany?</translation>
     <message>
         <source>converts degrees to radian</source>
         <comment>functionm degTorad</comment>
-        <translation>konwertuje stopnie na radiany</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>converts radian to degrees</source>
         <comment>function radTodeg</comment>
-        <translation>konwertuje radiany na stopnie</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sine function working with radians</source>
         <comment>function sin</comment>
-        <translation>sinus kata wyrażonego w radianach</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cosine function working with radians</source>
         <comment>function cos</comment>
-        <translation>cosinus kąta wyrażonego w radianach</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tangens function working with radians</source>
         <comment>function tan</comment>
-        <translation>tangens kąta wyrażonego w radianach</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>arcus sine function working with radians</source>
         <comment>function asin</comment>
-        <translation>arcus sinus kąta wyrażonego w radianach</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>arcus cosine function working with radians</source>
         <comment>function acos</comment>
-        <translation>arcus cosinus kąta wyrażonego w radianach</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>arcus tangens function working with radians</source>
         <comment>function atan</comment>
-        <translation>arcus tangens kąta wyrażonego w radianach</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hyperbolic sine function</source>
         <comment>function sinh</comment>
-        <translation>sinus hiperboliczny</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hyperbolic cosine</source>
         <comment>function cosh</comment>
-        <translation>cosinus hiperboliczny</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hyperbolic tangens function</source>
         <comment>function tanh</comment>
-        <translation>tangens hiperboliczny</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hyperbolic arcus sine function</source>
         <comment>function asinh</comment>
-        <translation>arcus sinus hiperboliczny</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hyperbolic arcus cosine function</source>
         <comment>function acosh</comment>
-        <translation>arcus cosinus hiperboliczny</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hyperbolic arcur tangens function</source>
         <comment>function atanh</comment>
-        <translation>arcus tangens hiperboliczny</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sine function working with degrees</source>
         <comment>function sinD</comment>
-        <translation>sinus kąta wyrażonego w stopniach</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cosine function working with degrees</source>
         <comment>function cosD</comment>
-        <translation>cosinus kąta wyrażonego w stopniach</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tangens function working with degrees</source>
         <comment>function tanD</comment>
-        <translation>tangens kąta wyrażonego w stopniach</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>arcus sine function working with degrees</source>
         <comment>function asinD</comment>
-        <translation>arcus sinus kąta wyrażonego w stopniach</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>arcus cosine function working with degrees</source>
         <comment>function acosD</comment>
-        <translation>arcus cosinus kąta wyrażonego w stopniach</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>arcus tangens function working with degrees</source>
         <comment>function atanD</comment>
-        <translation>arcus tangens kąta wyrażonego w stopniach</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>logarithm to the base 2</source>
         <comment>function log2</comment>
-        <translation>logarytm przy podstawie 2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>logarithm to the base 10</source>
         <comment>function log10</comment>
-        <translation>logarytm dziesiętny (przy podstawie 10)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>logarithm to the base 10</source>
         <comment>function log</comment>
-        <translation>logarytm dziesiętny (przy podstawie 10)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>logarithm to base e (2.71828...)</source>
         <comment>function ln</comment>
-        <translation>logarytm naturalny - logarytm przy podstawie e (2.71828...)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>e raised to the power of x</source>
         <comment>function exp</comment>
-        <translation>funkcja eksponencjalna (e podniesione do potęgi x)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>square root of a value</source>
         <comment>function sqrt</comment>
-        <translation>kwadrat liczby</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sign function -1 if x&lt;0; 1 if x&gt;0</source>
         <comment>function sign</comment>
-        <translation>znak, funkcja zwraca  -1 jeśli  x&lt;0; 1 jeśli x&gt;0</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>round to nearest integer</source>
         <comment>function rint</comment>
-        <translation>zaokrągla do najbliższej całkowitej</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>round to up to 1 decimal</source>
         <comment>function r2cm</comment>
-        <translation>zaokrąglenie w górę do 1 dziesiętnej</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cut, split and rotate modeling operation. Takes cm units.</source>
@@ -15541,37 +16363,37 @@ Czy chcesz zapisać zmiany?</translation>
     <message>
         <source>absolute value</source>
         <comment>function abs</comment>
-        <translation>wartość bezwzględna</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>min of all arguments</source>
         <comment>function min</comment>
-        <translation>wartość minimalna z podanych argumentów</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>max of all arguments</source>
         <comment>function max</comment>
-        <translation>wartość maksymalna z podanych argumentów</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sum of all arguments</source>
         <comment>function sum</comment>
-        <translation>suma wszystkich argumentów</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mean value of all arguments</source>
         <comment>function avg</comment>
-        <translation>średnia z podanych argumentów</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Returns the floating-point remainder of numer/denom (rounded towards zero)</source>
         <comment>function fmod</comment>
-        <translation>reszta z dzielenia</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>warning</source>
         <comment>Calculation warning</comment>
-        <translation>ostrzeżenie</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show a warning in calculations</source>
@@ -15601,6 +16423,13 @@ Czy chcesz zapisać zmiany?</translation>
         <translation type="vanished">Błąd przywracania kopii zapasowej: %1.</translation>
     </message>
 </context>
+<context>
+    <name>VValentinaSettings</name>
+    <message>
+        <source>layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VWidgetDetails</name>
     <message>
@@ -15654,29 +16483,25 @@ Czy chcesz zapisać zmiany?</translation>
 </context>
 <context>
     <name>VWidgetGroups</name>
-    <message>
-        <source>Rename</source>
-        <translation type="vanished">Zmień nazwę</translation>
-    </message>
     <message>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
     <message>
         <source>Hide</source>
-        <translation>Ukryj</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show</source>
-        <translation>Pokaż</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide All</source>
-        <translation>Ukryj wszystko</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show All</source>
-        <translation>Pokaż wszystko</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tags:</source>
@@ -15795,11 +16620,11 @@ Czy chcesz zapisać zmiany?</translation>
     <name>WatermarkWindow</name>
     <message>
         <source>Watermark</source>
-        <translation>Znak wodny</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity:</source>
-        <translation>Przezroczystość:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
@@ -15811,7 +16636,7 @@ Czy chcesz zapisać zmiany?</translation>
     </message>
     <message>
         <source>watermark text</source>
-        <translation>tekst znaku wodnego</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotation:</source>
@@ -15819,7 +16644,7 @@ Czy chcesz zapisać zmiany?</translation>
     </message>
     <message>
         <source>Font:</source>
-        <translation>Czcionka:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The quick brown fox jumps over the lazy dog</source>
@@ -15828,11 +16653,11 @@ Czy chcesz zapisać zmiany?</translation>
     </message>
     <message>
         <source>Edit font</source>
-        <translation>Edytuj czionkę</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
-        <translation>Obraz</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Path:</source>
@@ -15840,15 +16665,15 @@ Czy chcesz zapisać zmiany?</translation>
     </message>
     <message>
         <source>path to image</source>
-        <translation>ścieżka do obrazu</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse…</source>
-        <translation>Przeglądaj…</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gray color</source>
-        <translation>Kolor szary</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;File</source>
@@ -15856,7 +16681,7 @@ Czy chcesz zapisać zmiany?</translation>
     </message>
     <message>
         <source>Operations</source>
-        <translation>Operacje</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
@@ -15864,11 +16689,11 @@ Czy chcesz zapisać zmiany?</translation>
     </message>
     <message>
         <source>Save &amp;As…</source>
-        <translation>Z&amp;apisz jako…</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>Zakończ</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
@@ -15884,15 +16709,15 @@ Czy chcesz zapisać zmiany?</translation>
     </message>
     <message>
         <source>Watermark image</source>
-        <translation>Obraz znaku wodnego</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File error.</source>
-        <translation>Błędny plik.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Watermark files</source>
-        <translation>Plik znaku wodnego</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save as</source>
@@ -15900,7 +16725,7 @@ Czy chcesz zapisać zmiany?</translation>
     </message>
     <message>
         <source>watermark</source>
-        <translation>znak wodny</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to lock. This file already opened in another window.</source>
@@ -15924,11 +16749,11 @@ Czy chcesz zapisać zmiany?</translation>
     </message>
     <message>
         <source>Could not save the file.</source>
-        <translation>Nie można zapisać pliku.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not save the file</source>
-        <translation>Nie można zapisać pliku</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open file</source>
@@ -15996,7 +16821,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>WARNING:</source>
-        <translation>OSTRZEŻENIE:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CRITICAL:</source>
@@ -16051,7 +16876,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>WARNING:</source>
-        <translation>OSTRZEŻENIE:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CRITICAL:</source>
diff --git a/share/translations/valentina_pt_BR.ts b/share/translations/valentina_pt_BR.ts
index 99991f337..999d92529 100644
--- a/share/translations/valentina_pt_BR.ts
+++ b/share/translations/valentina_pt_BR.ts
@@ -54,21 +54,21 @@
     <name>ChangeGroupOptions</name>
     <message>
         <source>rename group</source>
-        <translation>renomear grupo</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ChangeGroupVisibility</name>
     <message>
         <source>change group visibility</source>
-        <translation>alterar a visibilidade do grupo</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ChangeMultipleGroupsVisibility</name>
     <message>
         <source>change multiple groups visibility</source>
-        <translation>alterar a visibilidade de vários grupos</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -576,11 +576,11 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -707,15 +707,15 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Pseudônimo:</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -834,15 +834,15 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Pseudônimo:</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -965,11 +965,11 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1036,15 +1036,15 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Pseudônimo:</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1091,19 +1091,19 @@
     </message>
     <message>
         <source>Cannot find point with id %1</source>
-        <translation>Não consigo encontrar o ponto com id %1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Pseudônimo:</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1206,19 +1206,19 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias1:</source>
-        <translation>Pseudônimo1:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias2:</source>
-        <translation>Pseudônimo2:</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1297,19 +1297,19 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Alias1:</source>
-        <translation>Pseudônimo1:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias2:</source>
-        <translation>Pseudônimo2:</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1388,19 +1388,19 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Alias1:</source>
-        <translation>Pseudônimo1:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias2:</source>
-        <translation>Pseudônimo2:</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1479,19 +1479,19 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Alias1:</source>
-        <translation>Pseudônimo1:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias2:</source>
-        <translation>Pseudônimo2:</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1792,19 +1792,19 @@
     <name>DialogDimensionLabels</name>
     <message>
         <source>Dimension labels</source>
-        <translation>Rótulos de dimensão</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <translation>Valor</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Rótulo</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dimension:</source>
-        <translation>Dimensão:</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished">Valor</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished">Rótulo</translation>
     </message>
 </context>
 <context>
@@ -1876,7 +1876,7 @@
     </message>
     <message>
         <source>Insert placeholders</source>
-        <translation>Inserir marcadores de posição</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preview</source>
@@ -1958,6 +1958,14 @@
         <source>Measurments file name</source>
         <translation>Nome do arquivo de medidas</translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="vanished">Tamanho</translation>
+    </message>
+    <message>
+        <source>Height</source>
+        <translation type="vanished">Altura</translation>
+    </message>
     <message>
         <source>Measurments extension</source>
         <translation>Extensão de medidas</translation>
@@ -2020,11 +2028,11 @@
     </message>
     <message>
         <source>Material: Interlining</source>
-        <translation>Material: Entretela</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Interlining</source>
-        <translation>Entretela</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Word: Cut</source>
@@ -2068,7 +2076,7 @@
     </message>
     <message>
         <source>Measurements units</source>
-        <translation>Unidade de Medidas</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pattern units</source>
@@ -2080,75 +2088,75 @@
     </message>
     <message>
         <source>Customer birth date</source>
-        <translation>Data de Nascimento Cliente</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Customer email</source>
-        <translation>email Cliente</translation>
-    </message>
-    <message>
-        <source>Measurement: %1</source>
-        <translation>Medida: %1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Altura</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Tamanho</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hip</source>
         <comment>dimension</comment>
-        <translation>Quadril</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Waist</source>
         <comment>dimension</comment>
-        <translation>Cintura</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No data for the height dimension.</source>
-        <translation>Sem dados para dimensão altura.</translation>
-    </message>
-    <message>
-        <source>No data for the size dimension.</source>
-        <translation>Sem dados para dimensão tamanho.</translation>
-    </message>
-    <message>
-        <source>No data for the hip dimension.</source>
-        <translation>Sem dados para dimensão quadril.</translation>
-    </message>
-    <message>
-        <source>No data for the waist dimension.</source>
-        <translation>Sem dados para dimensão cintura.</translation>
-    </message>
-    <message>
-        <source>Final measurement: %1</source>
-        <translation>Medida final: %1</translation>
+        <source>Measurement: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height label</source>
         <comment>dimension</comment>
-        <translation>rótulo Altura</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size label</source>
         <comment>dimension</comment>
-        <translation>rótulo Tamanho</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hip label</source>
         <comment>dimension</comment>
-        <translation>rótulo Quadril</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Waist label</source>
         <comment>dimension</comment>
-        <translation>rótulo Cintura</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Final measurement: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the height dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the size dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the hip dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the waist dimension.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -2382,15 +2390,15 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Pseudônimo:</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -2497,11 +2505,11 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -2699,11 +2707,11 @@
     </message>
     <message>
         <source>Enable to create a visibility gropup from original objects</source>
-        <translation>Habilite para criar um grupo de visibilidade com os objetos originais</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Visibility Group</source>
-        <translation>Grupo de Visibilidade</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
@@ -2715,27 +2723,23 @@
     </message>
     <message>
         <source>Tags:</source>
-        <translation>Tags:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Separate each tag with comma.</source>
-        <translation>Separe cada rótulo com vírgula.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add tags</source>
-        <translation>Adicionar tags</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Pseudônimo:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pen style:</source>
@@ -2747,19 +2751,23 @@
     </message>
     <message>
         <source>Ready</source>
-        <translation>Pronto</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid suffix</source>
-        <translation>Sufixo Inválido</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid group name</source>
-        <translation>Nome do grupo inválido</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Label:</source>
-        <translation>Rótulo:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
@@ -2767,11 +2775,11 @@
     </message>
     <message>
         <source>Invalid point</source>
-        <translation>Ponto inválido</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid label</source>
-        <translation>Rótulo inválido</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid alias</source>
@@ -2818,11 +2826,11 @@
     </message>
     <message>
         <source>Enable to create a visibility gropup from original objects</source>
-        <translation>Habilite para criar um grupo de visibilidade com os objetos originais</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Visibility Group</source>
-        <translation>Grupo de Visibilidade</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
@@ -2834,27 +2842,23 @@
     </message>
     <message>
         <source>Tags:</source>
-        <translation>Tags:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Separate each tag with comma.</source>
-        <translation>Separe cada tag com vírgula.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add tags</source>
-        <translation>Adicionar tags</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Pseudônimo:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pen style:</source>
@@ -2866,19 +2870,23 @@
     </message>
     <message>
         <source>Ready</source>
-        <translation>Pronto</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid suffix</source>
-        <translation>Sufixo Inválido</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid group name</source>
-        <translation>Nome do grupo inválido</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Label:</source>
-        <translation>Rótulo:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
@@ -2898,7 +2906,7 @@
     </message>
     <message>
         <source>Invalid label</source>
-        <translation>Rótulo inválida</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid alias</source>
@@ -2929,15 +2937,15 @@
     </message>
     <message>
         <source>Tags:</source>
-        <translation>Tags:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Separate each tag with comma.</source>
-        <translation>Separe cada tag com vírgula.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add tags</source>
-        <translation>Adicionar tags</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3020,11 +3028,11 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3191,7 +3199,7 @@
     </message>
     <message>
         <source>Rotate objects around point %1. Suffix &apos;%2&apos;</source>
-        <translation>Gire objetos ao redor do ponto %1. Sufixo &apos;%2&apos;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Flipping by line %1_%2. Suffix &apos;%3&apos;</source>
@@ -3203,7 +3211,7 @@
     </message>
     <message>
         <source>Move objects. Suffix &apos;%1&apos;</source>
-        <translation>Mover objetos. Sufixo &apos;%1&apos;</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3398,7 +3406,7 @@
     </message>
     <message>
         <source>Increment</source>
-        <translation>Incremento</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Separator</source>
@@ -3413,7 +3421,7 @@
     </message>
     <message>
         <source>The list of pieces is empty. Please, first create at least one piece for current pattern piece.</source>
-        <translation>A lista de peças está vazia. Por favor, primeiro crie ao menos uma peça para o molde atual.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert nodes</source>
@@ -3425,7 +3433,7 @@
     </message>
     <message>
         <source>Number:</source>
-        <translation>Número:</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3471,26 +3479,26 @@
     </message>
     <message>
         <source>Nesting. Please, wait.</source>
-        <translation>Agrupando. Por favor, aguarde.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time left:</source>
-        <translation>Tempo restante:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time left: %1</source>
-        <translation>Tempo restante: %1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Efficiency coefficient: %1%</source>
-        <translation>Coeficiente de eficiência: %1%</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DialogLayoutScale</name>
     <message>
         <source>Layout scale</source>
-        <translation>Escala do layout</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Margins</source>
@@ -3518,15 +3526,15 @@
     </message>
     <message>
         <source>Scale</source>
-        <translation>Escala</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Horizontal:</source>
-        <translation>Horizontal:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vertical:</source>
-        <translation>Vertical:</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3717,10 +3725,6 @@ Aplicar configurações assim mesmo?</translation>
         <source>Layout options</source>
         <translation>Opções de layout</translation>
     </message>
-    <message>
-        <source>Shift/Offset length:</source>
-        <translation type="vanished">Comprimento de Deslocamento </translation>
-    </message>
     <message>
         <source>Rule for choosing the next workpiece</source>
         <translation>Regra para escolha da próxima peça</translation>
@@ -3788,7 +3792,7 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Follow grainline</source>
-        <translation>Seguir sentido do fio</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time:</source>
@@ -3796,11 +3800,11 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Time given for the algorithm to find best layout.</source>
-        <translation>Tempo para o algoritmo encontrar o melhor layout.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Efficiency:</source>
-        <translation>Eficiência:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set layout efficiency coefficient. Layout efficiency coefficientt is the ratio of the area occupied by the pieces to the bounding rect of all pieces. If nesting reaches required level the process stops. If value is 0 no check will be made. </source>
@@ -3808,23 +3812,23 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Manual priority</source>
-        <translation>Prioridade manual</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nest quantity of copies according to piece settings.</source>
-        <translation>Agrupar quantidade de cópias de acordo com as definições da peça.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nest quantity</source>
-        <translation>Agrupar quantidade</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto crop unused width</source>
-        <translation>Cortar automaticamente largura não utilizada</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer one sheet solution</source>
-        <translation>Preferir solução de uma folha</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
@@ -3833,7 +3837,7 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Enable this option to prefer getting one sheet solutions.</source>
-        <translation>Habilite essa opção para preferir a solução de uma página.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3884,11 +3888,11 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3951,11 +3955,11 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -4078,11 +4082,11 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -4217,7 +4221,7 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Preview</source>
-        <translation>Visualização</translation>
+        <translation type="unfinished">Visualização</translation>
     </message>
     <message>
         <source>Input</source>
@@ -4225,39 +4229,69 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Import</source>
-        <translation>Importar</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Columns</source>
-        <translation>Colunas</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full name:</source>
-        <translation>Nome completo:</translation>
+        <translation type="unfinished">Nome completo:</translation>
     </message>
     <message>
         <source>Description:</source>
-        <translation>Descrição:</translation>
+        <translation type="unfinished">Descrição:</translation>
     </message>
     <message>
         <source>Ready</source>
-        <translation>Pronto</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
-        <translation>Nome</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Nome</translation>
     </message>
     <message>
         <source>Value</source>
-        <translation>Valor</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Valor</translation>
+    </message>
+    <message>
+        <source>Full name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Nome completo</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Descrição</translation>
     </message>
     <message>
         <source>Base value</source>
-        <translation>Valor base</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Valor base</translation>
+    </message>
+    <message>
+        <source>Shift (%1):</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Skip</source>
-        <translation>Pular</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Nome</translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished">Valor</translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <translation type="unfinished">Valor base</translation>
     </message>
     <message>
         <source>Shift (%1)*:</source>
@@ -4279,36 +4313,6 @@ Aplicar configurações de qualquer forma?</translation>
         <source>Please, select unique number for each column</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Name</source>
-        <comment>measurement column</comment>
-        <translation>Nome</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <comment>measurement column</comment>
-        <translation>Valor</translation>
-    </message>
-    <message>
-        <source>Full name</source>
-        <comment>measurement column</comment>
-        <translation>Nome completo</translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <comment>measurement column</comment>
-        <translation>Descrição</translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <comment>measurement column</comment>
-        <translation>Valor base</translation>
-    </message>
-    <message>
-        <source>Shift (%1):</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DialogMove</name>
@@ -4374,11 +4378,11 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Enable to create a visibility gropup from original objects</source>
-        <translation>Habilite para criar um grupo de visibilidade com os objetos originais</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Visibility Group</source>
-        <translation>Grupo de Visibilidade</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
@@ -4390,27 +4394,23 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Tags:</source>
-        <translation>Tags:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Separate each tag with comma.</source>
-        <translation>Separe cada tags com vírgula.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add tags</source>
-        <translation>Adicionar rótulos</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Pseudônimo:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pen style:</source>
@@ -4422,19 +4422,23 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Ready</source>
-        <translation>Pronto</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid suffix</source>
-        <translation>Sufixo Inválido</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid group name</source>
-        <translation>Nome do grupo inválido</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Label:</source>
-        <translation>Rótulo:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
@@ -4454,7 +4458,7 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Invalid label</source>
-        <translation>Rótulo inválido</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid alias</source>
@@ -4663,11 +4667,11 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -4859,6 +4863,10 @@ Aplicar configurações de qualquer forma?</translation>
         <source>Show measurements file</source>
         <translation type="vanished">Mostrar arquivo de medidas</translation>
     </message>
+    <message>
+        <source>From multisize measurements</source>
+        <translation type="vanished">De medidas multisize</translation>
+    </message>
     <message>
         <source>Pattern</source>
         <translation>Molde</translation>
@@ -4867,13 +4875,69 @@ Aplicar configurações de qualquer forma?</translation>
         <source>For technical notes</source>
         <translation>Notas técnicas</translation>
     </message>
+    <message>
+        <source>Label data</source>
+        <translation type="vanished">Dados do rótulo</translation>
+    </message>
+    <message>
+        <source>Label template:</source>
+        <translation type="vanished">Modelo de rótulo:</translation>
+    </message>
+    <message>
+        <source>Edit pattern label</source>
+        <translation type="vanished">Editar o rótulo do molde</translation>
+    </message>
+    <message>
+        <source>Edit template</source>
+        <translation type="vanished">Editar modelo</translation>
+    </message>
+    <message>
+        <source>Date format:</source>
+        <translation type="vanished">Formato da data:</translation>
+    </message>
+    <message>
+        <source>Time format:</source>
+        <translation type="vanished">Formato do tempo:</translation>
+    </message>
+    <message>
+        <source>Save label data.</source>
+        <translation type="vanished">Salvar dados do rótulo.</translation>
+    </message>
+    <message>
+        <source>Label data were changed. Do you want to save them before editing label template?</source>
+        <translation type="vanished">Os dados do rótulo foram alterados. Deseja salvá-los antes de editar o modelo de rótulo?</translation>
+    </message>
+    <message>
+        <source>Materials</source>
+        <translation type="vanished">Materiais</translation>
+    </message>
+    <message>
+        <source>Pattern materials:</source>
+        <translation type="vanished">Materiais do molde:</translation>
+    </message>
+    <message>
+        <source>Manage list of pattern materials</source>
+        <translation type="vanished">Gerenciar lista de materiais do molde</translation>
+    </message>
+    <message>
+        <source>Manage</source>
+        <translation type="vanished">Gerenciar</translation>
+    </message>
+    <message>
+        <source>The customer name from individual measurements</source>
+        <translation type="vanished">O nome do cliente das medidas individuais</translation>
+    </message>
     <message>
         <source>Label language:</source>
         <translation>Idioma:</translation>
     </message>
+    <message>
+        <source>yyyy-MM-dd</source>
+        <translation type="obsolete">yyyy-MM-dd</translation>
+    </message>
     <message>
         <source>Passmark length:</source>
-        <translation>Tamanho do Pique:</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -5191,15 +5255,15 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Marks</source>
-        <translation>Marcações</translation>
+        <translation>Marcas</translation>
     </message>
     <message>
         <source>T mark</source>
-        <translation>Marcação T</translation>
+        <translation>Marca T</translation>
     </message>
     <message>
         <source>V mark</source>
-        <translation>Marcação V</translation>
+        <translation>Marca V</translation>
     </message>
     <message>
         <source>Please, select a detail to insert into!</source>
@@ -5307,7 +5371,7 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>The list of pieces is empty. Please, first create at least one piece for current pattern piece.</source>
-        <translation>A lista de peças está vazia. Por favor, primeiro crie ao menos uma peça para o molde atual.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This option has effect only if the second passmark on seam line enabled in global preferences. The option helps disable the second passmark for this passmark only.</source>
@@ -5323,7 +5387,7 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>The same curve repeats twice!</source>
-        <translation>A mesma curva repete duas vezes!</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;Empty&gt;</source>
@@ -5343,7 +5407,7 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>V mark 2</source>
-        <translation>Marcação V 2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select main path objects, &lt;b&gt;%1&lt;/b&gt; - reverse direction curve, &lt;b&gt;%2&lt;/b&gt; - finish creation</source>
@@ -5351,7 +5415,7 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Manual length</source>
-        <translation>comprimento manual</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Length:</source>
@@ -5359,15 +5423,15 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>U mark</source>
-        <translation>Marcação U</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Box mark</source>
-        <translation>Marcação quadrada</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit passmark length</source>
-        <translation>Editar tamanho do pique</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -5390,7 +5454,7 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>The list of pieces is empty. Please, first create at least one piece for current pattern piece.</source>
-        <translation>A lista de peças está vazia. Por favor, primeiro crie ao menos uma peça para o molde atual.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -5505,7 +5569,7 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>The list of pieces is empty. Please, first create at least one piece for current pattern piece.</source>
-        <translation>A lista de peças está vazia. Por favor, primeiro crie ao menos uma peça para o molde atual.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Control visibility</source>
@@ -5513,7 +5577,7 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Circle</source>
-        <translation>Círculo</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -5572,11 +5636,11 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -5671,11 +5735,11 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -5766,11 +5830,11 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -5825,11 +5889,11 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -5892,11 +5956,11 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -6007,11 +6071,11 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -6054,27 +6118,27 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Curve 1</source>
-        <translation>Curva 1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias1:</source>
-        <translation>Pseudônimo1:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias2:</source>
-        <translation>Pseudônimo2:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Curve 2</source>
-        <translation>Curva 2</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -6103,6 +6167,28 @@ Aplicar configurações de qualquer forma?</translation>
         </translation>
     </message>
 </context>
+<context>
+    <name>DialogPuzzlePreferences</name>
+    <message>
+        <source>Puzzle preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished">Configuração</translation>
+    </message>
+    <message>
+        <source>Paths</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>Followed %n option(s) require restart to take effect: %1.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+</context>
 <context>
     <name>DialogRestrictDimension</name>
     <message>
@@ -6119,19 +6205,19 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Min:</source>
-        <translation>Mín:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Max:</source>
-        <translation>Máx:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Exclude</source>
-        <translation>Excluir</translation>
+        <translation type="unfinished">Excluir</translation>
     </message>
     <message>
         <source>Include</source>
-        <translation>Incluir</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -6186,15 +6272,15 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>This point cannot be origin point. Please, select another origin point</source>
-        <translation>Este ponto não pode ser o ponto de origem. Por favor, selecione outro ponto de origem</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable to create a visibility gropup from original objects</source>
-        <translation>Habilite para criar um grupo de visibilidade com os objetos originais</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Visibility Group</source>
-        <translation>Grupo de Visibilidade</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
@@ -6202,23 +6288,19 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Tags:</source>
-        <translation>Tags:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Separate each tag with comma.</source>
-        <translation>Separe cada tag com vírgula.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add tags</source>
-        <translation>Adicionar tags</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Alias</source>
@@ -6234,23 +6316,27 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Ready</source>
-        <translation>Pronto</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid suffix</source>
-        <translation>Sufixo Inválido</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid group name</source>
-        <translation>Nome do grupo inválido</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid rotation point</source>
-        <translation>Ponto de rotação inválido</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid label</source>
-        <translation>Rótulo inválido</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid alias</source>
@@ -6262,11 +6348,11 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Label:</source>
-        <translation>Rótulo:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Pseudônimo:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
@@ -6377,15 +6463,15 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Scale</source>
-        <translation>Escala</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Horizontal:</source>
-        <translation>Horizontal:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vertical:</source>
-        <translation>Vertical:</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -6474,6 +6560,10 @@ Aplicar configurações de qualquer forma?</translation>
         <source>Numerical control</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogSeamAllowance</name>
@@ -6683,7 +6773,7 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>The same curve repeats twice!</source>
-        <translation>A mesma curva repete duas vezes!</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;Empty&gt;</source>
@@ -6695,58 +6785,63 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Circle</source>
-        <translation>Círculo</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit passmark length</source>
-        <translation>Editar tamanho do pique</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The customer name from individual measurements</source>
-        <translation>O nome do cliente das medidas individuais</translation>
+        <translation type="unfinished">O nome do cliente das medidas individuais</translation>
     </message>
     <message>
         <source>The customer email from individual measurements</source>
-        <translation>O email do cliente das medidas individuais</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The customer birth date from individual measurements</source>
-        <translation>Data de nascimento do cliente das medidas individuais</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save label data.</source>
-        <translation>Salvar dados do rótulo.</translation>
+        <translation type="unfinished">Salvar dados do rótulo.</translation>
     </message>
     <message>
         <source>Label data were changed. Do you want to save them before editing label template?</source>
-        <translation>Os dados do rótulo foram alterados. Deseja salvá-los antes de editar o modelo de rótulo?</translation>
+        <translation type="unfinished">Os dados do rótulo foram alterados. Deseja salvá-los antes de editar o modelo de rótulo?</translation>
     </message>
 </context>
 <context>
     <name>DialogSetupMultisize</name>
     <message>
         <source>Setup multisize measurements</source>
-        <translation>Configurar medidas multi-tamanhos</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use full circumference</source>
-        <translation>Usar circunferência completa</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Height</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Min value:</source>
-        <translation>Valor mínimo:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minimal value described in the column</source>
-        <translation>Valor mínimo descrito na coluna</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Max value:</source>
-        <translation>Valor Máximo:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maximal value described in the column</source>
-        <translation>Valor máximo descrito na coluna</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Step:</source>
@@ -6758,51 +6853,46 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Base:</source>
-        <translation>Base:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The base value for the column</source>
-        <translation>Valor de base para a coluna</translation>
-    </message>
-    <message>
-        <source>Circumference</source>
-        <translation>Circunferência</translation>
-    </message>
-    <message>
-        <source>Please, provide correct data for dimensions</source>
-        <translation>Por favor, forneça dados corretos para as dimensões</translation>
-    </message>
-    <message>
-        <source>Please, select at least one dimension</source>
-        <translation>Por favor, selecione ao menos uma dimensão</translation>
-    </message>
-    <message>
-        <source>No more than 3 dimensions allowed</source>
-        <translation>Não são permitidas mais de 3 dimensões</translation>
-    </message>
-    <message>
-        <source>Ready</source>
-        <translation>Pronto</translation>
-    </message>
-    <message>
-        <source>Height</source>
-        <comment>dimension</comment>
-        <translation>Altura</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Tamanho</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Circumference</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Waist</source>
         <comment>dimension</comment>
-        <translation>Cintura</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hip</source>
         <comment>dimension</comment>
-        <translation>Quadril</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, provide correct data for dimensions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, select at least one dimension</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No more than 3 dimensions allowed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ready</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -6913,11 +7003,11 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -6956,11 +7046,11 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7103,15 +7193,15 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Pseudônimo:</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7258,19 +7348,19 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Cannot find point with id %1</source>
-        <translation>Não consigo encontrar o ponto com id %1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Pseudônimo:</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7454,11 +7544,11 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7565,11 +7655,11 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Ferramenta</translation>
+        <translation type="unfinished">Ferramenta</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Anotações</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7843,11 +7933,11 @@ Aplicar configurações de qualquer forma?</translation>
     </message>
     <message>
         <source>Set pattern file units: cm, mm, inch.</source>
-        <translation>Configurar unidade de medida do arquivo do molde: cm, mm, pol.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The pattern units</source>
-        <translation>Unidade de medidas do molde</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid dimension A base value.</source>
@@ -8304,7 +8394,7 @@ Você quer salvar suas mudanças?</translation>
     </message>
     <message>
         <source>This file already opened in another window.</source>
-        <translation>Este arquivo já foi aberto em outra janela.</translation>
+        <translation type="vanished">Este arquivo já foi aberto em outra janela.</translation>
     </message>
     <message>
         <source>Wrong units.</source>
@@ -8757,27 +8847,27 @@ Você quer salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Locking file</source>
-        <translation>Arquivo bloqueado</translation>
+        <translation type="vanished">Arquivo bloqueado</translation>
     </message>
     <message>
         <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Este arquivo já foi aberto em outra janela. Ignore caso deseje continuar (não recomendado, pode causar uma corrupção de dados).</translation>
+        <translation type="vanished">Este arquivo já foi aberto em outra janela. Ignore caso deseje continuar (não recomendado, pode causar uma corrupção de dados).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Não foi possível criar o arquivo blequado, por falta de permissões. Ignore caso deseje continuar (não recomendado, pode causar uma corrupção de dados).</translation>
+        <translation type="vanished">Não foi possível criar o arquivo blequado, por falta de permissões. Ignore caso deseje continuar (não recomendado, pode causar uma corrupção de dados).</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Ocorreu um erro desconhecido, como por exemplo, uma partição cheia impediu a gravação do arquivo bloqueado. Ignore caso deseje continuar (não recomendado, pode causar uma corrupção de dados).</translation>
+        <translation type="vanished">Ocorreu um erro desconhecido, como por exemplo, uma partição cheia impediu a gravação do arquivo bloqueado. Ignore caso deseje continuar (não recomendado, pode causar uma corrupção de dados).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions.</source>
-        <translation>Não foi possível criar o arquivo blequado, por falta de permissões.</translation>
+        <translation type="vanished">Não foi possível criar o arquivo blequado, por falta de permissões.</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation>Ocorreu um erro desconhecido, como por exemplo, uma partição cheia impediu a gravação do arquivo bloqueado.</translation>
+        <translation type="vanished">Ocorreu um erro desconhecido, como por exemplo, uma partição cheia impediu a gravação do arquivo bloqueado.</translation>
     </message>
     <message>
         <source>Report Bug...</source>
@@ -8937,15 +9027,15 @@ Você quer salvar suas mudanças?</translation>
     </message>
     <message>
         <source>The document has no write permissions.</source>
-        <translation>O documento não tem permissões para gravação.</translation>
+        <translation type="vanished">O documento não tem permissões para gravação.</translation>
     </message>
     <message>
         <source>Cannot set permissions for %1 to writable.</source>
-        <translation>Não é possível definir permissões para %1 para gravável.</translation>
+        <translation type="vanished">Não é possível definir permissões para %1 para gravável.</translation>
     </message>
     <message>
         <source>Could not save the file.</source>
-        <translation>Não foi possível salvar o arquivo.</translation>
+        <translation type="vanished">Não foi possível salvar o arquivo.</translation>
     </message>
     <message>
         <source>Could not save the file</source>
@@ -9091,6 +9181,14 @@ Você quer salvar suas mudanças?</translation>
         <source>Can&apos;t export details.</source>
         <translation>Impossível exportar detalhes.</translation>
     </message>
+    <message>
+        <source>Couldn&apos;t set size. Need a file with multisize measurements.</source>
+        <translation type="vanished">Não foi possível definir o tamanho. Precisa de um arquivo com medidas multisize.</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t set height. Need a file with multisize measurements.</source>
+        <translation type="vanished">Não foi possível definir a altura. Precisa de um arquivo com medidas multisize.</translation>
+    </message>
     <message>
         <source>Label template editor</source>
         <translation>Editor de modelo de rótulo</translation>
@@ -9189,7 +9287,7 @@ Você quer salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Cannot save settings. Access denied.</source>
-        <translation>Acesso negado. Configuração não pode ser salva.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ctrl+O</source>
@@ -9213,27 +9311,27 @@ Você quer salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Point of intersection circle and segment</source>
-        <translation>Ponto de interseção circulo e segmento</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Increase label font</source>
-        <translation>Aumentar fonte do rótulo</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Decrease label font</source>
-        <translation>Diminuir fonte do rótulo</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Original label font</source>
-        <translation>Fonte original do rótulo</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide labels</source>
-        <translation>Esconder rótulos</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups of visibility</source>
-        <translation>Grupos de visibilidade</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export recipe</source>
@@ -9253,15 +9351,15 @@ Você quer salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Curved path tool which uses point as control handle</source>
-        <translation>Ferramenta de caminho curvo que usa o ponto como alça de controle</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Point of intersection arc and axis</source>
-        <translation>Ponto de interseção arco e eixo</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show main path</source>
-        <translation>Mostrar caminho principal</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Globally show pieces main path</source>
@@ -9269,15 +9367,15 @@ Você quer salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Pattern messages</source>
-        <translation>Mensagens Modelagem</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear all messages</source>
-        <translation>Limpar todas as mensagens</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter</source>
-        <translation>Filtrar</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DEBUG</source>
@@ -9305,11 +9403,11 @@ Você quer salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Watermark</source>
-        <translation>Marca D&apos;água</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load</source>
-        <translation>Carregar</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
@@ -9317,23 +9415,59 @@ Você quer salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Edit current</source>
-        <translation>Editar atual</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Editor</source>
-        <translation>Editor</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create or edit a watermark</source>
-        <translation>Criar ou editar marca d&apos;água</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Watermark files</source>
-        <translation>Arquivos de marca d&apos;água</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to change the premissions?</source>
-        <translation>Você quer alterar as permissões?</translation>
+        <source>Manual Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open the Puzzle app</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished">Atualizar</translation>
+    </message>
+    <message>
+        <source>Update manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to prepare raw layout data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select manual layout</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not supported dimension A value &apos;%1&apos; for this pattern file.</source>
@@ -9375,22 +9509,6 @@ Você quer salvar suas mudanças?</translation>
         <source>Could not create recipe file. %1</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Shop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scalable Vector Graphics files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save draw</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw export</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>MainWindowsNoGUI</name>
@@ -9398,14 +9516,6 @@ Você quer salvar suas mudanças?</translation>
         <source>For saving multypage document all sheet should have the same size. Use export function instead.</source>
         <translation type="vanished">Para salvar o documento multypage, todas as folhas devem ter o mesmo tamanho. Use a função de exportação.</translation>
     </message>
-    <message>
-        <source>For previewing multypage document all sheet should have the same size.</source>
-        <translation type="vanished">Para visualizar documentos de várias páginas, todas as folhas devem ter o mesmo tamanho.</translation>
-    </message>
-    <message>
-        <source>For printing multypages document all sheet should have the same size.</source>
-        <translation type="vanished">Para imprimir documentos de várias páginas, todas as folhas devem ter o mesmo tamanho.</translation>
-    </message>
     <message>
         <source>Creating file &apos;%1&apos; failed! %2</source>
         <translation type="vanished">Criação do arquivo &apos;%1&apos; falhou! %2</translation>
@@ -9458,18 +9568,6 @@ Você quer salvar suas mudanças?</translation>
         <source>Export error.</source>
         <translation type="vanished">Erro de exportação.</translation>
     </message>
-    <message>
-        <source>For saving multipage document all sheet should have the same size. Use export function instead.</source>
-        <translation type="vanished">Para salvar documentos de várias páginas, todas as folhas devem ter o mesmo tamanho. Em vez disso, use a função de exportação.</translation>
-    </message>
-    <message>
-        <source>For previewing multipage document all sheet should have the same size.</source>
-        <translation type="vanished">Para visualizar documentos de várias páginas, todas as folhas devem ter o mesmo tamanho.</translation>
-    </message>
-    <message>
-        <source>For printing multipages document all sheet should have the same size.</source>
-        <translation type="vanished">Para imprimir documentos de várias páginas, todas as folhas devem ter o mesmo tamanho.</translation>
-    </message>
     <message>
         <source>Pages will be cropped because they do not fit printer paper size.</source>
         <translation type="vanished">As páginas serão cortadas porque não correspondem ao tamanho do papel da impressora.</translation>
@@ -9530,6 +9628,14 @@ Você quer salvar suas mudanças?</translation>
         <source>Measurement file contains invalid known measurement(s).</source>
         <translation>O arquivo de medidas contém medida(s) conhecidas inválidas.</translation>
     </message>
+    <message>
+        <source>Wrong units.</source>
+        <translation type="vanished">Unidades erradas.</translation>
+    </message>
+    <message>
+        <source>Application doesn&apos;t support multisize table with inches.</source>
+        <translation type="vanished">A aplicação não suporta tabela multisize com polegadas.</translation>
+    </message>
     <message>
         <source>File error.</source>
         <translation>Erro de arquivo.</translation>
@@ -9544,7 +9650,7 @@ Você quer salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Preparing details for layout</source>
-        <translation>Preparando detalhes para o layout</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timeout.</source>
@@ -9822,7 +9928,7 @@ Você quer salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Double click calls Zoom fit best for current pattern piece</source>
-        <translation>Duplo clique para ajustar para a melhor visualização para peça atual</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scrolling</source>
@@ -9885,19 +9991,19 @@ Você quer salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Activate dark mode</source>
-        <translation>Ativar modo escuro</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>dark mode</source>
-        <translation>modo escuro</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change the position of the tool panel to optimize for big screen resolutions. By default, the tool panel will take all available space.</source>
-        <translation>Altere a posição do painel de ferramentas para otimizar para resoluções de tela grande. Por padrão, o painel de ferramentas ocupará todo o espaço disponível.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tool panel scaling</source>
-        <translation>Dimensionamento do painel de ferramentas</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t use the native file dialog</source>
@@ -9954,6 +10060,10 @@ Você quer salvar suas mudanças?</translation>
         <source>My label templates</source>
         <translation>Meus modelos de rótulo</translation>
     </message>
+    <message>
+        <source>My manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PreferencesPatternPage</name>
@@ -10096,6 +10206,111 @@ Esta opção terá um efeito após o reinício.</translation>
         <translation>cena renderizada</translation>
     </message>
 </context>
+<context>
+    <name>Puzzle</name>
+    <message>
+        <source>Export options can be used with single input file only.</source>
+        <translation type="unfinished">As opções de exportação podem ser usadas apenas com um único arquivo de entrada.</translation>
+    </message>
+    <message>
+        <source>Valentina&apos;s manual layout editor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The manual layout file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesConfigurationPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished">Forma</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished">Idioma</translation>
+    </message>
+    <message>
+        <source>GUI language:</source>
+        <translation type="unfinished">Linguagem GUI:</translation>
+    </message>
+    <message>
+        <source>Toolbar</source>
+        <translation type="unfinished">Barra de ferramentas</translation>
+    </message>
+    <message>
+        <source>The text appears under the icon (recommended for beginners).</source>
+        <translation type="unfinished">A legenda aparece sob o ícone. (recomendado para iniciantes).</translation>
+    </message>
+    <message>
+        <source>User Interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate dark mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t use the native file dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dark mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesPathPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished">Forma</translation>
+    </message>
+    <message>
+        <source>Paths that Valentina uses</source>
+        <translation type="unfinished">Caminhos que Valentina usa</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished">Tipo</translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished">Caminho</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished">Padrão</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished">Editar</translation>
+    </message>
+    <message>
+        <source>Open Directory</source>
+        <translation type="unfinished">Abrir Diretório</translation>
+    </message>
+    <message>
+        <source>My Individual Measurements</source>
+        <translation type="unfinished">Minhas Medidas Individuais</translation>
+    </message>
+    <message>
+        <source>My Multisize Measurements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Patterns</source>
+        <translation type="unfinished">Meus Moldes</translation>
+    </message>
+    <message>
+        <source>My Templates</source>
+        <translation type="unfinished">Meus modelos</translation>
+    </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished">Meus Layouts</translation>
+    </message>
+</context>
 <context>
     <name>QApplication</name>
     <message>
@@ -10315,7 +10530,7 @@ Esta opção terá um efeito após o reinício.</translation>
     </message>
     <message>
         <source>Interlining</source>
-        <translation>Entretela</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cut</source>
@@ -10343,11 +10558,11 @@ Esta opção terá um efeito após o reinício.</translation>
     </message>
     <message>
         <source>Cannot calculate a notch for point &apos;%1&apos; in piece &apos;%2&apos;. Seam allowance is empty.</source>
-        <translation>Não foi possível calcular pique para ponto &apos;%1&apos; na peça &apos;%2&apos;. Margem de costura vazia.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot calculate a notch for point &apos;%1&apos; in piece &apos;%2&apos;. Cannot find position for a notch.</source>
-        <translation>Não foi possível calcular pique para ponto &apos;%1&apos; na peça &apos;%2&apos;. Posição do pique não encontrada.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot calculate a notch for point &apos;%1&apos; in piece &apos;%2&apos;. Unable to fix a notch position.</source>
@@ -10371,7 +10586,7 @@ Esta opção terá um efeito após o reinício.</translation>
     </message>
     <message>
         <source>Empty formula</source>
-        <translation>Fórmula vazia</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid result. Value is infinite or NaN. Please, check your calculations.</source>
@@ -10395,7 +10610,7 @@ Esta opção terá um efeito após o reinício.</translation>
     </message>
     <message>
         <source>Piece &apos;%1&apos;. Seam allowance is not valid.</source>
-        <translation>Peça &apos;%1&apos;. Margem de costura inválida.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Found null notch for point &apos;%1&apos; in piece &apos;%2&apos;. Length is less than minimal allowed.</source>
@@ -10407,11 +10622,11 @@ Esta opção terá um efeito após o reinício.</translation>
     </message>
     <message>
         <source>Cannot calculate seam allowance before for point &apos;%1&apos;. Reason: %2.</source>
-        <translation>Não foi possível calcular margem de costura antes do ponto &apos;%1&apos;. Motivo: %2.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot calculate seam allowance after for point &apos;%1&apos;. Reason: %2.</source>
-        <translation>Não foi possível calcular margem de costura depois do ponto &apos;%1&apos;. Motivo: %2.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot calculate seam allowance after for point &apos;%1&apos;. Reason: </source>
@@ -10419,11 +10634,11 @@ Esta opção terá um efeito após o reinício.</translation>
     </message>
     <message>
         <source>Cannot calculate passmark length for point &apos;%1&apos;. Reason: %2.</source>
-        <translation>Impossível calcular tamanho do pique para ponto &apos;%1&apos;. Motivo: %2.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passmark &apos;%1&apos; is not part of piece &apos;%2&apos;.</source>
-        <translation>Pique &apos;%1&apos; não é parte da peça &apos;%2&apos;.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot cast tool with id &apos;%1&apos;.</source>
@@ -10441,6 +10656,10 @@ Esta opção terá um efeito após o reinício.</translation>
         <source>Can&apos;t convert toInt parameter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Piece name &apos;%1&apos; is not unique.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Could not find the segment start.</source>
         <translation type="unfinished"></translation>
@@ -10451,12 +10670,16 @@ Esta opção terá um efeito após o reinício.</translation>
     </message>
     <message>
         <source>Segment is too short.</source>
-        <translation>Segmento é muito curto.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error calculating segment for curve &apos;%1&apos;. %2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot prepare builtin passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
@@ -10473,46 +10696,46 @@ Esta opção terá um efeito após o reinício.</translation>
         <source>Cannot prepare passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Piece name &apos;%1&apos; is not unique.</source>
-        <translation>Nome da peça &apos;%1&apos; não é único.</translation>
-    </message>
-    <message>
-        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Cannot get tokens from formula &apos;%1&apos;. Formula error: %2.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>No data for the height dimension.</source>
-        <translation>Sem dados para dimensão altura.</translation>
-    </message>
-    <message>
-        <source>No data for the size dimension.</source>
-        <translation>Sem dados para dimensão tamanho.</translation>
-    </message>
-    <message>
-        <source>No data for the hip dimension.</source>
-        <translation>Sem dados para dimensão quadril.</translation>
-    </message>
-    <message>
-        <source>No data for the waist dimension.</source>
-        <translation>Sem dados para dimensão cintura.</translation>
-    </message>
-    <message>
-        <source>Piece &apos;%1&apos;. Grainline is not valid.</source>
-        <translation>Peça &apos;%1&apos;. Sentido do fio é inválido.</translation>
-    </message>
     <message>
         <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>No data for the height dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the size dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the hip dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the waist dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Piece &apos;%1&apos;. Grainline is not valid.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Unplaced pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet 1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QSaveFile</name>
@@ -10729,14 +10952,14 @@ Esta opção terá um efeito após o reinício.</translation>
     <name>RemoveItemFromGroup</name>
     <message>
         <source>Remove item from group</source>
-        <translation>Remover item do grupo</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RenameGroup</name>
     <message>
         <source>rename group</source>
-        <translation>renomear grupo</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -10778,7 +11001,7 @@ Esta opção terá um efeito após o reinício.</translation>
     <name>SavePlaceLabelOptions</name>
     <message>
         <source>save place label options</source>
-        <translation>salvar opções de localização de rótulo</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -10810,7 +11033,7 @@ Esta opção terá um efeito após o reinício.</translation>
     <name>TMainWindow</name>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:18pt;&quot;&gt;Select New for creation measurement file.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:18pt;&quot;&gt;Selecionar Novo para o arquivo de criação de medida.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:18pt;&quot;&gt;Selecionar Novo para o arquivo de criação de medida.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <source>Name</source>
@@ -11106,7 +11329,7 @@ Esta opção terá um efeito após o reinício.</translation>
     </message>
     <message>
         <source>untitled</source>
-        <translation type="vanished">sem título</translation>
+        <translation>sem título</translation>
     </message>
     <message>
         <source>&lt;Empty&gt;</source>
@@ -11343,27 +11566,27 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Locking file</source>
-        <translation>Arquivo bloqueado</translation>
+        <translation type="vanished">Arquivo bloqueado</translation>
     </message>
     <message>
         <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Este arquivo já foi aberto em outra janela. Ignore se deseja continuar (não recomendado, pode causar uma corrupção de dados).</translation>
+        <translation type="vanished">Este arquivo já foi aberto em outra janela. Ignore se deseja continuar (não recomendado, pode causar uma corrupção de dados).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Não foi possível criar o arquivo blequado, por falta de permissões. Ignore caso deseje continuar (não recomendado, pode causar uma corrupção de dados).</translation>
+        <translation type="vanished">Não foi possível criar o arquivo blequado, por falta de permissões. Ignore caso deseje continuar (não recomendado, pode causar uma corrupção de dados).</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Ocorreu um erro desconhecido, como por exemplo, uma partição cheia impediu a gravação do arquivo bloqueado. Ignore caso deseje continuar (não recomendado, pode causar uma corrupção de dados).</translation>
+        <translation type="vanished">Ocorreu um erro desconhecido, como por exemplo, uma partição cheia impediu a gravação do arquivo bloqueado. Ignore caso deseje continuar (não recomendado, pode causar uma corrupção de dados).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions.</source>
-        <translation>Não foi possível criar o arquivo blequado, por falta de permissões.</translation>
+        <translation type="vanished">Não foi possível criar o arquivo blequado, por falta de permissões.</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation>Ocorreu um erro desconhecido, como por exemplo, uma partição cheia impediu a gravação do arquivo bloqueado.</translation>
+        <translation type="vanished">Ocorreu um erro desconhecido, como por exemplo, uma partição cheia impediu a gravação do arquivo bloqueado.</translation>
     </message>
     <message>
         <source>Export to CSV</source>
@@ -11411,15 +11634,15 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>The measurements document has no write permissions.</source>
-        <translation>O documento de medidas não possui permissões de gravação.</translation>
+        <translation type="vanished">O documento de medidas não possui permissões de gravação.</translation>
     </message>
     <message>
         <source>Cannot set permissions for %1 to writable.</source>
-        <translation>Não é possível definir permissões para %1 para gravável.</translation>
+        <translation type="vanished">Não é possível definir permissões para %1 para gravável.</translation>
     </message>
     <message>
         <source>Could not save the file.</source>
-        <translation>Não foi possível salvar o arquivo.</translation>
+        <translation type="vanished">Não foi possível salvar o arquivo.</translation>
     </message>
     <message>
         <source>Could not save the file</source>
@@ -11443,7 +11666,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Export from multisize measurements is not supported.</source>
-        <translation>Exportar medidas multi-tamanho não é suportado.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Customer name:</source>
@@ -11451,7 +11674,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Open multisize …</source>
-        <translation>Abrir multi-tamanhos …</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create from existing …</source>
@@ -11491,7 +11714,19 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Multisize measurements require at least 4 columns.</source>
-        <translation>Medidas multi-tamanhos requerem ao menos 4 colunas.</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot convert base size value to double in column 2.</source>
+        <translation type="vanished">Impossível converter o valor do tamanho da base para duplo na coluna 2.</translation>
+    </message>
+    <message>
+        <source>Cannot convert height increase value to double in column 3.</source>
+        <translation type="vanished">Impossível converter o valor do incremento de altura para duplo na coluna 3.</translation>
+    </message>
+    <message>
+        <source>Cannot convert size increase value to double in column 4.</source>
+        <translation type="vanished">Impossível converter o valor do incremento de tamanho para duplo na coluna 4.</translation>
     </message>
     <message>
         <source>Imported file must not contain the same name twice.</source>
@@ -11503,7 +11738,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Cannot save settings. Access denied.</source>
-        <translation>Acesso negado. Configuração não pode ser salva.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;File</source>
@@ -11511,7 +11746,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>&amp;Window</source>
-        <translation>&amp;Janela</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Help</source>
@@ -11519,11 +11754,11 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>&amp;Measurements</source>
-        <translation>&amp;Medidas</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Open individual …</source>
-        <translation>&amp;Abrir Individual …</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Save</source>
@@ -11531,15 +11766,15 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Save &amp;As …</source>
-        <translation>Salvar Como …</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Quit</source>
-        <translation>&amp;Encerrar</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;About Tape</source>
-        <translation>&amp;Sobre Tape</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;New</source>
@@ -11549,17 +11784,43 @@ Deseja salvar suas mudanças?</translation>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Search measurements by term. &lt;/p&gt;&lt;p&gt;Prepend &amp;quot;/r/&amp;quot; to the front of the search string to search measurements by regex.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Do you want to change the premissions?</source>
-        <translation>Você quer alterar as permissões?</translation>
-    </message>
     <message>
         <source>Cannot read settings from a malformed .INI file.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Nome</translation>
+    </message>
+    <message>
+        <source>Full name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Nome completo</translation>
+    </message>
+    <message>
+        <source>Calculated value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Valor calculado</translation>
+    </message>
+    <message>
+        <source>Formula</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Fórmula</translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Valor base</translation>
+    </message>
+    <message>
+        <source>Correction</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Units:</source>
-        <translation>Unidades:</translation>
+        <translation type="unfinished">Unidades:</translation>
     </message>
     <message>
         <source>Shift B</source>
@@ -11571,11 +11832,11 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Correction:</source>
-        <translation>Correção:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dimension:</source>
-        <translation>Dimensão:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select one of the dimensions to later use the measurement value in piece label</source>
@@ -11583,19 +11844,19 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Base Values:</source>
-        <translation>Valores Base:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export to individual</source>
-        <translation>Exportar para individual</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export to individual measurements</source>
-        <translation>Exportar para medidas individuais</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use full circumference</source>
-        <translation>Usar circunferência completa</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restrict second dimension</source>
@@ -11607,7 +11868,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Dimension labels</source>
-        <translation>Rótulos de dimensão</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The table doesn&apos;t provide dimensions</source>
@@ -11635,7 +11896,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>measurements.vit</source>
-        <translation>medidas.vit</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift (%1):</source>
@@ -11655,56 +11916,22 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Millimeters</source>
-        <translation>Milímetros</translation>
-    </message>
-    <message>
-        <source>Inches</source>
-        <translation>Polegadas</translation>
-    </message>
-    <message>
-        <source>Centimeters</source>
-        <translation>Centímetros</translation>
-    </message>
-    <message>
-        <source>Degrees</source>
-        <translation>Graus</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <comment>measurement column</comment>
-        <translation>Nome</translation>
-    </message>
-    <message>
-        <source>Full name</source>
-        <comment>measurement column</comment>
-        <translation>Nome completo</translation>
-    </message>
-    <message>
-        <source>Calculated value</source>
-        <comment>measurement column</comment>
-        <translation>Valor calculado</translation>
-    </message>
-    <message>
-        <source>Formula</source>
-        <comment>measurement column</comment>
-        <translation>Fórmula</translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <comment>measurement column</comment>
-        <translation>Valor base</translation>
-    </message>
-    <message>
-        <source>Correction</source>
-        <comment>measurement column</comment>
-        <translation>Correção</translation>
-    </message>
-    <message>
-        <source>Restrict first dimension</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:18pt;&quot;&gt;Select New to create a measurement file.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <source>Inches</source>
+        <translation type="unfinished">Polegadas</translation>
+    </message>
+    <message>
+        <source>Centimeters</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Degrees</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restrict first dimension</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -11777,6 +12004,10 @@ Deseja salvar suas mudanças?</translation>
         <source>Labels</source>
         <translation>Rótulos</translation>
     </message>
+    <message>
+        <source>Detail label visible</source>
+        <translation type="vanished">Etiqueta de detalhes visível</translation>
+    </message>
     <message>
         <source>Width:</source>
         <translation>Largura:</translation>
@@ -11879,67 +12110,67 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Pattern label data</source>
-        <translation>Informação de rótulo do molde</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit pattern label</source>
-        <translation>Editar o rótulo do molde</translation>
+        <translation type="unfinished">Editar o rótulo do molde</translation>
     </message>
     <message>
         <source>Pattern name:</source>
-        <translation>Nome do molde:</translation>
+        <translation type="unfinished">Nome do molde:</translation>
     </message>
     <message>
         <source>Pattern number:</source>
-        <translation>Número do molde:</translation>
+        <translation type="unfinished">Número do molde:</translation>
     </message>
     <message>
         <source>Company/Designer name:</source>
-        <translation>Nome da Empresa/Modelista:</translation>
+        <translation type="unfinished">Nome da Empresa/Modelista:</translation>
     </message>
     <message>
         <source>Customer name:</source>
-        <translation>Nome do cliente:</translation>
+        <translation type="unfinished">Nome do cliente:</translation>
     </message>
     <message>
         <source>Date format:</source>
-        <translation>Formato da data:</translation>
+        <translation type="unfinished">Formato da data:</translation>
     </message>
     <message>
         <source>Time format:</source>
-        <translation>Formato do tempo:</translation>
+        <translation type="unfinished">Formato do tempo:</translation>
     </message>
     <message>
         <source>Customer birth date:</source>
-        <translation>Data de nascimento do cliente:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>yyyy-MM-dd</source>
-        <translation>yyyy-MM-dd</translation>
+        <translation type="unfinished">yyyy-MM-dd</translation>
     </message>
     <message>
         <source>Customer email:</source>
-        <translation>Email do cliente:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Materials</source>
-        <translation>Materiais</translation>
+        <translation type="unfinished">Materiais</translation>
     </message>
     <message>
         <source>Pattern materials:</source>
-        <translation>Materiais do molde:</translation>
+        <translation type="unfinished">Materiais do molde:</translation>
     </message>
     <message>
         <source>Manage list of pattern materials</source>
-        <translation>Gerenciar lista de materiais do molde</translation>
+        <translation type="unfinished">Gerenciar lista de materiais do molde</translation>
     </message>
     <message>
         <source>Manage</source>
-        <translation>Gerenciar</translation>
+        <translation type="unfinished">Gerenciar</translation>
     </message>
     <message>
         <source>Piece label visible</source>
-        <translation>Rótulo da peça visível</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -11962,11 +12193,11 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>T mark</source>
-        <translation>Marcação T</translation>
+        <translation>Marca T</translation>
     </message>
     <message>
         <source>V mark</source>
-        <translation>Marcação V</translation>
+        <translation>Marca V</translation>
     </message>
     <message>
         <source>Angle</source>
@@ -11982,7 +12213,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Marks</source>
-        <translation>Marcações</translation>
+        <translation>Marcas</translation>
     </message>
     <message>
         <source>Select if need designate the corner point as a passmark</source>
@@ -12034,11 +12265,11 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>V mark 2</source>
-        <translation>Marcação V 2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manual length</source>
-        <translation>comprimento manual</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Length:</source>
@@ -12062,11 +12293,11 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>U mark</source>
-        <translation>Marcação U</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Box mark</source>
-        <translation>Marcação quadrada</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List of all defined passmarks. To define a passmark return to the Main Path tab, call context menu for a point item and make it a passmark.</source>
@@ -12221,7 +12452,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Priority:</source>
-        <translation>Prioridade:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Controls priority in layout. 0 - no priority.</source>
@@ -12237,6 +12468,18 @@ Deseja salvar suas mudanças?</translation>
         <comment>seam allowance</comment>
         <translation>Personalizado</translation>
     </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Universally Unique IDentifier of piece. Used to identifier piece while updating manual layout. Left empty to generate new value.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TabPlaceLabels</name>
@@ -12412,6 +12655,18 @@ Deseja salvar suas mudanças?</translation>
         <source>The text appears under the icon (recommended for beginners).</source>
         <translation>A legenda aparece sob o ícone. (recomendado para iniciantes).</translation>
     </message>
+    <message>
+        <source>Default height and size</source>
+        <translation type="vanished">Altura e tamanho padrões</translation>
+    </message>
+    <message>
+        <source>Default height:</source>
+        <translation type="vanished">Altura padrão:</translation>
+    </message>
+    <message>
+        <source>Default size:</source>
+        <translation type="vanished">Tamanho padrão:</translation>
+    </message>
     <message>
         <source>With OS options</source>
         <translation>Com opções de OS</translation>
@@ -12422,11 +12677,11 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Activate dark mode</source>
-        <translation>Ativar modo escuro</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>dark mode</source>
-        <translation>modo escuro</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t use the native file dialog</source>
@@ -12475,6 +12730,10 @@ Deseja salvar suas mudanças?</translation>
         <source>My Patterns</source>
         <translation>Meus Moldes</translation>
     </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished">Meus Layouts</translation>
+    </message>
 </context>
 <context>
     <name>ToggleDetailInLayout</name>
@@ -12526,29 +12785,25 @@ Deseja salvar suas mudanças?</translation>
         <source>Base value invalid</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Size</source>
-        <translation>Tamanho</translation>
-    </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Altura</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Tamanho</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Waist</source>
         <comment>dimension</comment>
-        <translation>Cintura</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hip</source>
         <comment>dimension</comment>
-        <translation>Quadril</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chest full circumference</source>
@@ -12560,6 +12815,10 @@ Deseja salvar suas mudanças?</translation>
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Chest circumference</source>
         <comment>dimension</comment>
@@ -12739,15 +12998,15 @@ Deseja salvar suas mudanças?</translation>
     <name>VAbstractMainWindow</name>
     <message>
         <source>Confirm format rewriting</source>
-        <translation>Confirmar reescrever formato</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This file is using previous format version v%1. The current is v%2. Saving the file with this app version will update the format version for this file. This may prevent you from be able to open the file with older app versions. Do you really want to continue?</source>
-        <translation>Este arquivo está usando formato de versão anterior v%1. A atual é v%2. Salvar o arquivo com esta versão do aplicativo atualizará a versão do formato deste arquivo. Isso pode impedir que você consiga abrir o arquivo com versões mais antigas do aplicativo. Você realmente deseja continuar?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comma-Separated Values</source>
-        <translation>Valores separados por vírgula</translation>
+        <translation type="unfinished">Valores separados por vírgula</translation>
     </message>
     <message>
         <source>values</source>
@@ -12755,14 +13014,58 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Export to CSV</source>
-        <translation>Exportar para CSV</translation>
+        <translation type="unfinished">Exportar para CSV</translation>
+    </message>
+    <message>
+        <source>The measurements document has no write permissions.</source>
+        <translation type="unfinished">O documento de medidas não possui permissões de gravação.</translation>
+    </message>
+    <message>
+        <source>Do you want to change the premissions?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot set permissions for %1 to writable.</source>
+        <translation type="unfinished">Não é possível definir permissões para %1 para gravável.</translation>
+    </message>
+    <message>
+        <source>Could not save the file.</source>
+        <translation type="unfinished">Não foi possível salvar o arquivo.</translation>
+    </message>
+    <message>
+        <source>Locking file</source>
+        <translation type="unfinished">Arquivo bloqueado</translation>
+    </message>
+    <message>
+        <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished">Não foi possível criar o arquivo blequado, por falta de permissões. Ignore caso deseje continuar (não recomendado, pode causar uma corrupção de dados).</translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished">Ocorreu um erro desconhecido, como por exemplo, uma partição cheia impediu a gravação do arquivo bloqueado. Ignore caso deseje continuar (não recomendado, pode causar uma corrupção de dados).</translation>
+    </message>
+    <message>
+        <source>This file already opened in another window.</source>
+        <translation type="unfinished">Este arquivo já foi aberto em outra janela.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions.</source>
+        <translation type="unfinished">Não foi possível criar o arquivo blequado, por falta de permissões.</translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
+        <translation type="unfinished">Ocorreu um erro desconhecido, como por exemplo, uma partição cheia impediu a gravação do arquivo bloqueado.</translation>
     </message>
 </context>
 <context>
     <name>VAbstractNode</name>
     <message>
         <source>This id (%1) is not unique.</source>
-        <translation>Esta id (%1) não é única.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -12781,15 +13084,15 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>delete operation</source>
-        <translation>apagar operação</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Visibility group</source>
-        <translation>Grupo de Visibilidade</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
-        <translation>padrão</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -12815,7 +13118,7 @@ Deseja salvar suas mudanças?</translation>
     <name>VAbstractPiece</name>
     <message>
         <source>Piece &apos;%1&apos;. Not enough points to build seam allowance.</source>
-        <translation>Peça &apos;%1&apos;. Sem pontos suficientes para criar margem de costura.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -12959,7 +13262,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Invalid notch.</source>
-        <translation>Pique inválido.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Formula warning: %1. Program will be terminated.</source>
@@ -12985,7 +13288,7 @@ Deseja salvar suas mudanças?</translation>
     <name>VComboBoxDelegate</name>
     <message>
         <source>Select material</source>
-        <translation>Selecionar material</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -13284,7 +13587,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Export to csv with header. By default disabled.</source>
-        <translation>Exportar para csv com cabeçalho. Desabilitado por padrão.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Specify codec that will be used to save data. List of supported codecs provided by Qt. Default value depend from system. On Windows, the codec will be based on a system locale. On Unix systems, the codec will might fall back to using the iconv library if no builtin codec for the locale can be found. Valid values for this installation:</source>
@@ -13328,7 +13631,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>The left margin</source>
-        <translation>margem esquerda</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tiled page right margin in current units like 3.0 (export mode). If not set will be used default value 1 cm.</source>
@@ -13336,7 +13639,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>The right margin</source>
-        <translation>Margem direita</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tiled page top margin in current units like 3.0 (export mode). If not set will be used value default value 1 cm.</source>
@@ -13344,7 +13647,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>The top margin</source>
-        <translation>Margem superior</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tiled page bottom margin in current units like 3.0 (export mode). If not set will be used value default value 1 cm.</source>
@@ -13352,7 +13655,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>The bottom margin</source>
-        <translation>Margem inferior</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set tiled page orienatation to landscape (export mode). Default value if not set portrait.</source>
@@ -13408,7 +13711,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>The page height</source>
-        <translation>Altura da página</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Order detail to follow grainline direction (export mode).</source>
@@ -13424,7 +13727,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Coefficient</source>
-        <translation>Coeficiente</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time must be in range from 1 minute to 60 minutes.</source>
@@ -13456,7 +13759,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Horizontal scale</source>
-        <translation>Escala horizontal</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set vertical scale factor from 0.01 to 3.0 (default = 1.0, export mode).</source>
@@ -13464,7 +13767,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Vertical scale</source>
-        <translation>Escala vertical</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer one sheet layout solution (export mode).</source>
@@ -13506,6 +13809,34 @@ Deseja salvar suas mudanças?</translation>
         <source>The dimension C base</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>The filename of exported layout file. Use it to enable console export mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The filename of layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pattern pieces form the raw layout data file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The raw layout data file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to output format (default = 0, export mode): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to tiled pdf page template (default = 0, export mode with tiled pdf format): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run the program in a test mode. The program in this mode loads a single layout file and silently quit without showing the main window. The key have priority before key &apos;%1&apos;.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VCommonSettings</name>
@@ -13515,24 +13846,28 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>individual</source>
-        <translation>individual</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>multisize</source>
-        <translation>multi-tamanhos</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>templates</source>
-        <translation>modelos</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>label templates</source>
-        <translation>modelos de rótulo</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>patterns</source>
         <translation>moldes</translation>
     </message>
+    <message>
+        <source>manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VContainer</name>
@@ -13622,10 +13957,6 @@ Deseja salvar suas mudanças?</translation>
         <source>Got wrong parameter id. Need only id &gt; 0.</source>
         <translation type="vanished">Obteve parâmetro de identidade errado. Permitido somente Identidade &gt; 0.</translation>
     </message>
-    <message>
-        <source>This id is not unique.</source>
-        <translation type="vanished">Esta id não é única.</translation>
-    </message>
     <message>
         <source>Fail to write Canonical XML.</source>
         <translation type="unfinished"></translation>
@@ -13640,7 +13971,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>This id (%1) is not unique.</source>
-        <translation>Esta id (%1) não é única.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t get version information.</source>
@@ -13675,15 +14006,15 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>This id (%1) is not unique.</source>
-        <translation>Esta id (%1) não é única.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add to group</source>
-        <translation>Adicionar ao grupo</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove from group</source>
-        <translation>Remover do grupo</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show label</source>
@@ -13691,7 +14022,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Restore label position</source>
-        <translation>Restaurar posição do rótulo</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -13717,34 +14048,34 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Result is infinite</source>
-        <translation>Resultado é infinite</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Result is NaN</source>
-        <translation>Resultado é NaN</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Result is zero</source>
-        <translation>Resultado é zero</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Result less than zero</source>
-        <translation>Resultado menor de zero</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Formula is empty</source>
-        <translation>Fórmula está vazia</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not evaluated</source>
-        <translation>Não avaliado</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VFormulaData</name>
     <message>
         <source>Not evaluated</source>
-        <translation>Não avaliado</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
@@ -13752,7 +14083,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Formula is empty</source>
-        <translation>Fórmula está vazia</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -13768,37 +14099,41 @@ Deseja salvar suas mudanças?</translation>
 </context>
 <context>
     <name>VLayoutExporter</name>
+    <message>
+        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot set printer page size</source>
-        <translation>Impossível definir tamanho da página</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot set printer margins</source>
-        <translation>Impossível definir as margens da impressora</translation>
+        <translation type="unfinished">Impossível definir as margens da impressora</translation>
     </message>
     <message>
         <source>Can&apos;t open file &apos;%1&apos;</source>
-        <translation>Impossível abrir arquivo &apos;%1&apos;</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export raw layout data failed. %1.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating file &apos;%1&apos; failed! %2</source>
-        <translation>Criação do arquivo &apos;%1&apos; falhou! %2</translation>
-    </message>
-    <message>
-        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
-        <translation>Impossível salvar arquivo &apos;%1&apos;. Erro: %2.</translation>
+        <translation type="unfinished">Criação do arquivo &apos;%1&apos; falhou! %2</translation>
     </message>
     <message>
         <source>Can&apos;t create an flat dxf file.</source>
-        <translation>Impossível criar um arquivo flat dxf.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t create an AAMA dxf file.</source>
-        <translation>Impossível criar um arquivo AAMA dxf.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t create an ASTM dxf file.</source>
-        <translation>Impossível criaram arquivo ASTM dxf.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -13820,23 +14155,23 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>Nenhum</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height</source>
-        <translation>Altura</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Tamanho</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hip</source>
-        <translation>Quadril</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Waist</source>
-        <translation>Cintura</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -13899,11 +14234,11 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Seam allowance angle</source>
-        <translation>Ângulo margem de costura</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passmark angle</source>
-        <translation>ângulo do pique</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Straightforward</source>
@@ -13939,7 +14274,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Passmark mark</source>
-        <translation>Marcação de Pique</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>One line</source>
@@ -13955,23 +14290,131 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>T mark</source>
-        <translation>Marcação T</translation>
+        <translation>Marca T</translation>
     </message>
     <message>
         <source>V mark</source>
-        <translation>Marcação V</translation>
+        <translation>Marca V</translation>
     </message>
     <message>
         <source>V mark 2</source>
-        <translation>Marcação V 2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>U mark</source>
-        <translation>Marcação U</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Box mark</source>
-        <translation>Marcação quadrada</translation>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPApplication</name>
+    <message>
+        <source>Error parsing file. Program will be terminated.</source>
+        <translation type="unfinished">Erro ao analisar o arquivo. O programa será encerrado.</translation>
+    </message>
+    <message>
+        <source>Error bad id. Program will be terminated.</source>
+        <translation type="unfinished">Erro de identidade incorreta. O programa será encerrado.</translation>
+    </message>
+    <message>
+        <source>Error can&apos;t convert value. Program will be terminated.</source>
+        <translation type="unfinished">Erro impossível converter o valor. O programa será encerrado.</translation>
+    </message>
+    <message>
+        <source>Error empty parameter. Program will be terminated.</source>
+        <translation type="unfinished">Erro de parâmetro vazio. O programa será encerrado.</translation>
+    </message>
+    <message>
+        <source>Error wrong id. Program will be terminated.</source>
+        <translation type="unfinished">Erro de identidate errada. O programa será encerrado.</translation>
+    </message>
+    <message>
+        <source>Something&apos;s wrong!!</source>
+        <translation type="unfinished">Algo está errado!!</translation>
+    </message>
+    <message>
+        <source>Exception thrown: %1. Program will be terminated.</source>
+        <translation type="unfinished">Exceção jogada: %1. O programa será encerrado.</translation>
+    </message>
+    <message>
+        <source>Can&apos;t begin to listen for incoming connections on name &apos;%1&apos;</source>
+        <translation type="unfinished">Não é possível começar a ouvir conexões recebidas no nome &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <source>Export mode doesn&apos;t support openning several files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import raw layout data does not support openning several layout files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, provide one input file.</source>
+        <translation type="unfinished">Por favor, forneça um arquivo de entrada.</translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrousel</name>
+    <message>
+        <source>Pieces of </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrouselPieceList</name>
+    <message>
+        <source>Move to Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Excluir</translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPDialogAbout</name>
+    <message>
+        <source>About Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Puzzle version</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Build revision:</source>
+        <translation type="unfinished">Versão revista:</translation>
+    </message>
+    <message>
+        <source>This program is part of Valentina project.</source>
+        <translation type="unfinished">Este programa é parte do projero Valentina.</translation>
+    </message>
+    <message>
+        <source>Check For Updates</source>
+        <translation type="unfinished">Checar atualizações</translation>
+    </message>
+    <message>
+        <source>Cannot open your default browser</source>
+        <translation type="unfinished">Não é possível abrir seu navegador padrão</translation>
+    </message>
+    <message>
+        <source>Build revision: %1</source>
+        <translation type="unfinished">Criar revisão: %1</translation>
+    </message>
+    <message>
+        <source>Built on %1 at %2</source>
+        <translation type="unfinished">Construído de %1 a %2</translation>
+    </message>
+    <message>
+        <source>Web site : %1</source>
+        <translation type="unfinished">Web site: %1</translation>
     </message>
 </context>
 <context>
@@ -13996,6 +14439,573 @@ Deseja salvar suas mudanças?</translation>
         <translation>Abrir arquivo</translation>
     </message>
 </context>
+<context>
+    <name>VPGraphicsPiece</name>
+    <message>
+        <source>Move to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPLayoutFileReader</name>
+    <message>
+        <source>Piece List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Got empty attribute &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPMainWindow</name>
+    <message>
+        <source>Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;Arquivo</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished">&amp;Ajuda</translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished">Menu</translation>
+    </message>
+    <message>
+        <source>Piece Carrousel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Infos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Nome:</translation>
+    </message>
+    <message>
+        <source>DummyName</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UUID:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{7b2ce4ae-96f5-4905-bb34-405cb40ca208}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Geometry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mirror piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotation</source>
+        <translation type="unfinished">Rotação</translation>
+    </message>
+    <message>
+        <source>Angle:</source>
+        <translation type="unfinished">Ângulo:</translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° anti-clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Placement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Y:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No piece selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple pieces selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Width</source>
+        <translation type="unfinished">Largura</translation>
+    </message>
+    <message>
+        <source>Length</source>
+        <translation type="unfinished">Comprimento</translation>
+    </message>
+    <message>
+        <source>Orientation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove unused length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Margins</source>
+        <translation type="unfinished">Margens</translation>
+    </message>
+    <message>
+        <source>Right:</source>
+        <translation type="unfinished">Direita:</translation>
+    </message>
+    <message>
+        <source>Top:</source>
+        <translation type="unfinished">Topo:</translation>
+    </message>
+    <message>
+        <source>Left:</source>
+        <translation type="unfinished">Esquerda:</translation>
+    </message>
+    <message>
+        <source>Bottom:</source>
+        <translation type="unfinished">Base:</translation>
+    </message>
+    <message>
+        <source>Placement Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Row height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Control</source>
+        <translation type="unfinished">Controle</translation>
+    </message>
+    <message>
+        <source>Follow grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vertical grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Horizontal grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pieces gap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sticky edges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation type="unfinished">Exportar</translation>
+    </message>
+    <message>
+        <source>Export Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiles properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiled Pdf Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Tiles on sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export Tiled Pdf</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation type="unfinished">Layout</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Nome</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Descrição</translation>
+    </message>
+    <message>
+        <source>Unit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning superposition of pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning pieces out of bound</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation type="unfinished">&amp;Abrir</translation>
+    </message>
+    <message>
+        <source>Ctrl+O</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Salvar</translation>
+    </message>
+    <message>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save &amp;As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Import Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation type="unfinished">S&amp;air</translation>
+    </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation type="unfinished">&amp;Novo</translation>
+    </message>
+    <message>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation type="unfinished">Sobre &amp;Qt</translation>
+    </message>
+    <message>
+        <source>About &amp;Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom in</source>
+        <translation type="unfinished">Ampliar</translation>
+    </message>
+    <message>
+        <source>Zoom out</source>
+        <translation type="unfinished">Reduzir</translation>
+    </message>
+    <message>
+        <source>Zoom 1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom fit best</source>
+        <translation type="unfinished">Ajustar à janela</translation>
+    </message>
+    <message>
+        <source>Zoom sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished">Preferências</translation>
+    </message>
+    <message>
+        <source>File &apos;%1&apos; doesn&apos;t exist!</source>
+        <translation type="unfinished">O arquivo &apos;%1&apos; não existe!</translation>
+    </message>
+    <message>
+        <source>File error.</source>
+        <translation type="unfinished">Erro de arquivo.</translation>
+    </message>
+    <message>
+        <source>Unable to read a layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fail to create layout.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not extract data from file &apos;%1&apos;. %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Centimeters</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Millimiters</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Inches</source>
+        <translation type="unfinished">Polegadas</translation>
+    </message>
+    <message>
+        <source>Scale:</source>
+        <translation type="unfinished">Escala:</translation>
+    </message>
+    <message>
+        <source>untitled %1.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>untitled.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read only</source>
+        <translation type="unfinished">somente leitura</translation>
+    </message>
+    <message>
+        <source>Cannot read settings from a malformed .INI file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save settings. Access denied.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to open file, is it writable?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New Window</source>
+        <translation type="unfinished">&amp;Nova Janela</translation>
+    </message>
+    <message>
+        <source>Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open file</source>
+        <translation type="unfinished">Abrir arquivo</translation>
+    </message>
+    <message>
+        <source>Could not save the file</source>
+        <translation type="unfinished">Não foi possível salvar o arquivo</translation>
+    </message>
+    <message>
+        <source>layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save as</source>
+        <translation type="unfinished">Salvar como</translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window.</source>
+        <translation type="unfinished">Falha ao bloquear. Este arquivo já foi aberto em outra janela.</translation>
+    </message>
+    <message>
+        <source>Could not save file</source>
+        <translation type="unfinished">Não foi possível salvar o arquivo</translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window. Expect collissions when run 2 copies of the program.</source>
+        <translation type="unfinished">Falha ao bloquear. Este arquivo já foi aberto em outra janela. Expectativa de colisão ao executar 2 cópias do programa.</translation>
+    </message>
+    <message>
+        <source>Raw Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About Qt</source>
+        <translation type="unfinished">Sobre Qt</translation>
+    </message>
+    <message>
+        <source>PDF Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SVG Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPSheet</name>
+    <message>
+        <source>Letter</source>
+        <translation type="unfinished">Carta</translation>
+    </message>
+    <message>
+        <source>Legal</source>
+        <translation type="unfinished">Ofício</translation>
+    </message>
+    <message>
+        <source>Tabloid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 24in</source>
+        <translation type="unfinished">Rolo de 24&quot;</translation>
+    </message>
+    <message>
+        <source>Roll 30in</source>
+        <translation type="unfinished">Rolo de 30&quot;</translation>
+    </message>
+    <message>
+        <source>Roll 36in</source>
+        <translation type="unfinished">Rolo de 36&quot;</translation>
+    </message>
+    <message>
+        <source>Roll 42in</source>
+        <translation type="unfinished">Rolo de 42&quot;</translation>
+    </message>
+    <message>
+        <source>Roll 44in</source>
+        <translation type="unfinished">Rolo de 44&quot;</translation>
+    </message>
+    <message>
+        <source>Roll 48in</source>
+        <translation type="unfinished">Rolo de 44&quot; {481?}</translation>
+    </message>
+    <message>
+        <source>Roll 62in</source>
+        <translation type="unfinished">Rolo de 44&quot; {62i?}</translation>
+    </message>
+    <message>
+        <source>Roll 72in</source>
+        <translation type="unfinished">Rolo de 44&quot; {72i?}</translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation type="unfinished">Personalizado</translation>
+    </message>
+</context>
+<context>
+    <name>VPTileFactory</name>
+    <message>
+        <source>Grid ( %1 , %2 )</source>
+        <translation type="unfinished">Grade ( %1, %2 )</translation>
+    </message>
+    <message>
+        <source>Page %1 of %2</source>
+        <translation type="unfinished">Página %1 de %2</translation>
+    </message>
+</context>
 <context>
     <name>VPattern</name>
     <message>
@@ -14282,26 +15292,26 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Value for final measurtement &apos;%1&apos; is infinite or NaN. Please, check your calculations.</source>
-        <translation>Valor para medida final &apos;%1&apos; é infinito ou NaN. Por favor, verifique seus cálculos.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to create record for final measurement &apos;%1&apos;. Error: %2</source>
-        <translation>Impossível criar registro para medida final &apos;%1&apos;. Erro: %2</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VPiece</name>
     <message>
         <source>Cannot calculate a notch for point &apos;%1&apos; in piece &apos;%2&apos;.</source>
-        <translation>Não foi possível calcular pique para ponto &apos;%1&apos; na peça &apos;%2&apos;.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notch for point &apos;%1&apos; in piece &apos;%2&apos; will be disabled. Manual length is less than allowed value.</source>
-        <translation>Pique para ponto &apos;%1&apos; em peça &apos;%2&apos; será desabilitado. Comprimento manual é menor que o valor permitido.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main path of piece %1</source>
-        <translation>Caminho principal da peça %1</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -14320,7 +15330,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Not supported file suffix &apos;%1&apos;</source>
-        <translation>Arquivo sufixo &apos;%1&apos; não suportado</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
@@ -14330,34 +15340,34 @@ Deseja salvar suas mudanças?</translation>
     <message>
         <source>in</source>
         <comment>unit</comment>
-        <translation>em</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open the watermark image.</source>
-        <translation>Impossível abrir imagem marca d&apos;água.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VPrintLayout</name>
     <message>
         <source>For printing multipages document all sheet should have the same size.</source>
-        <translation>Para imprimir documentos de várias páginas, todas as folhas devem ter o mesmo tamanho.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>For previewing multipage document all sheet should have the same size.</source>
-        <translation>Para visualizar documentos de várias páginas, todas as folhas devem ter o mesmo tamanho.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pages will be cropped because they do not fit printer paper size.</source>
-        <translation>As páginas serão cortadas porque não correspondem ao tamanho do papel da impressora.</translation>
+        <translation type="unfinished">As páginas serão cortadas porque não correspondem ao tamanho do papel da impressora.</translation>
     </message>
     <message>
         <source>Print error</source>
-        <translation>Erro de impressão</translation>
+        <translation type="unfinished">Erro de impressão</translation>
     </message>
     <message>
         <source>Cannot proceed because there are no available printers in your system.</source>
-        <translation>Impossível continuar porque não existem impressoras disponíveis no seu sistema.</translation>
+        <translation type="unfinished">Impossível continuar porque não existem impressoras disponíveis no seu sistema.</translation>
     </message>
     <message>
         <source>Failed to open file, is it writable?</source>
@@ -14369,15 +15379,15 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Cannot set printer margins</source>
-        <translation>Impossível definir as margens da impressora</translation>
+        <translation type="unfinished">Impossível definir as margens da impressora</translation>
     </message>
     <message>
         <source>Cannot set custom printer page size</source>
-        <translation>Impossível definir tamanho personalizado da página</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot set printer page size</source>
-        <translation>Impossível definir tamanho da página</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot set printer tiled page size</source>
@@ -14397,18 +15407,30 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>The layout is stale.</source>
-        <translation>O layout está obsoleto.</translation>
+        <translation type="unfinished">O layout está obsoleto.</translation>
     </message>
     <message>
         <source>The layout was not updated since last pattern modification. Do you want to continue?</source>
-        <translation>O layout não foi atualizado desde a última modificação do molde. Você deseja continuar?</translation>
+        <translation type="unfinished">O layout não foi atualizado desde a última modificação do molde. Você deseja continuar?</translation>
+    </message>
+</context>
+<context>
+    <name>VRawLayout</name>
+    <message>
+        <source>VRawLayout::ReadFile() failed. Raw layout format prefix mismatch error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VRawLayout::ReadFile() failed.
+Raw layout format compatibility error: actualFileVersion = %1 and fileVersion = %2</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VSettings</name>
     <message>
         <source>layouts</source>
-        <translation>layouts</translation>
+        <translation type="vanished">layouts</translation>
     </message>
 </context>
 <context>
@@ -14532,27 +15554,27 @@ Deseja salvar suas mudanças?</translation>
     <name>VToolCurveIntersectAxis</name>
     <message>
         <source>Error calculating point &apos;%1&apos;. There is no intersection with curve &apos;%2&apos; and axis through point &apos;%3&apos; with angle %4°</source>
-        <translation>Erro calculando ponto &apos;%1&apos;. Não há interseção com a curva &apos;%2&apos; e eixo através do ponto &apos;%3&apos; com ângulo %4°</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Length</source>
-        <translation>Comprimento</translation>
+        <translation type="unfinished">Comprimento</translation>
     </message>
     <message>
         <source>Angle</source>
-        <translation>Ângulo</translation>
+        <translation type="unfinished">Ângulo</translation>
     </message>
     <message>
         <source>Label</source>
-        <translation>Rótulo</translation>
+        <translation type="unfinished">Rótulo</translation>
     </message>
     <message>
         <source>Segment 1</source>
-        <translation>Segmento 1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Segment 2</source>
-        <translation>Segmento 2</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -14720,7 +15742,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>flipping by line</source>
-        <translation>virar pela linha</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -14757,7 +15779,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Error calculating point &apos;%1&apos;. Lines (%2;%3) and (%4;%5) have no point of intersection</source>
-        <translation>Erro calculando ponto &apos;%1&apos;. Linhas (%2;%3) e (%4;%5) não tem ponto de interseção</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -14776,7 +15798,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Error calculating point &apos;%1&apos;. Line (%2;%3) doesn&apos;t have intersection with axis through point &apos;%4&apos; and angle %5°</source>
-        <translation>Erro calculando ponto &apos;%1&apos;. Linha (%2;%3) não tem interseção com eixo através do ponto &apos;%4&apos; e ângulo %5°</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -14818,7 +15840,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>move</source>
-        <translation>mover</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -15357,37 +16379,37 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Notes:</source>
-        <translation>Notas:</translation>
+        <translation type="unfinished">Notas:</translation>
     </message>
     <message>
         <source>Alias:</source>
-        <translation>Pseudônimo:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias1:</source>
-        <translation>Pseudônimo1:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias2:</source>
-        <translation>Pseudônimo2:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Point of intersection circle and segment</source>
-        <translation>Ponto de interseção circulo e segmento</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VToolPointFromArcAndTangent</name>
     <message>
         <source>Error calculating point &apos;%1&apos;. Tangent to arc &apos;%2&apos; from point &apos;%3&apos; cannot be found</source>
-        <translation>Erro calculando ponto &apos;%1&apos;. Tangente ao arco &apos;%2&apos; do ponto &apos;%3&apos; não encontrado</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VToolPointFromCircleAndTangent</name>
     <message>
         <source>Error calculating point &apos;%1&apos;. Tangent to circle with center &apos;%2&apos; and radius &apos;%3&apos; from point &apos;%4&apos; cannot be found</source>
-        <translation>Erro calculando ponto &apos;%1&apos;. Tangente ao círculo com centro &apos;%2&apos; e raio &apos;%3&apos; do ponto &apos;%4&apos; não encontrado</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -15406,48 +16428,48 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Error calculating point &apos;%1&apos;. Circle with center &apos;%2&apos; and radius &apos;%3&apos; doesn&apos;t have intersection with line (%4;%5)</source>
-        <translation>Erro calculando ponto &apos;%1&apos;. Círculo com centro &apos;%2&apos; e raio &apos;%3&apos; não tem ponto de interseção com linha (%4;%5)</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VToolPointOfIntersectionArcs</name>
     <message>
         <source>Error calculating point &apos;%1&apos;. Arcs &apos;%2&apos; and &apos;%3&apos; have no point of intersection</source>
-        <translation>Erro calculando ponto &apos;%1&apos;. Arcos &apos;%2&apos; e &apos;%3&apos; não tem ponto de interseção</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VToolPointOfIntersectionCircles</name>
     <message>
         <source>Error calculating point &apos;%1&apos;. Circles with centers in points &apos;%2&apos; and &apos;%3&apos; have no point of intersection</source>
-        <translation>Erro calculando ponto &apos;%1&apos;. Círculos com centros em pontos &apos;%2&apos; e &apos;%3&apos; não tem ponto de interseção</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VToolPointOfIntersectionCurves</name>
     <message>
         <source>Error calculating point &apos;%1&apos;. Curves &apos;%2&apos; and &apos;%3&apos; have no point of intersection</source>
-        <translation>Erro calculando ponto &apos;%1&apos;. Curvas &apos;%2&apos; and &apos;%3&apos; não tem ponto de interseção</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Label</source>
-        <translation>Rótulo</translation>
+        <translation type="unfinished">Rótulo</translation>
     </message>
     <message>
         <source>Curve 1 segment 1</source>
-        <translation>Curva 1 segmento 1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Curve 1 segment 2</source>
-        <translation>Curva 1 segmento 2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Curve 2 segment 1</source>
-        <translation>Curva 2 segmento 1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Curve 2 segment 2</source>
-        <translation>Curva 2 segmento 2</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -15462,7 +16484,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>rotate</source>
-        <translation>rotacionar</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -15537,11 +16559,11 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>This id (%1) is not unique.</source>
-        <translation>Esta id (%1) não é única.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tool was used after deleting.</source>
-        <translation>Ferramenta foi utilizada após apagar.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -15563,7 +16585,7 @@ Deseja salvar suas mudanças?</translation>
     <name>VToolTriangle</name>
     <message>
         <source>Error calculating point &apos;%1&apos;. Point of intersection cannot be found</source>
-        <translation>Erro calculando ponto &apos;%1&apos;. Ponto de interseção não encontrado</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -15578,7 +16600,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>This id (%1) is not unique.</source>
-        <translation>Esta id (%1) não é única.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -16558,11 +17580,6 @@ Deseja salvar suas mudanças?</translation>
         <comment>millimeter</comment>
         <translation type="vanished">mm</translation>
     </message>
-    <message>
-        <source>in</source>
-        <comment>inch</comment>
-        <translation type="vanished">em</translation>
-    </message>
     <message>
         <source>Line_</source>
         <comment>Left symbol _ in the name</comment>
@@ -16631,7 +17648,7 @@ Deseja salvar suas mudanças?</translation>
     <message>
         <source>CurrentLength</source>
         <comment>Do not add space between words</comment>
-        <translation>ComprimentoAtual</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acosh</source>
@@ -16643,11 +17660,6 @@ Deseja salvar suas mudanças?</translation>
         <comment>placeholder</comment>
         <translation type="vanished">tamanho</translation>
     </message>
-    <message>
-        <source>height</source>
-        <comment>placeholder</comment>
-        <translation type="vanished">altura</translation>
-    </message>
     <message>
         <source>C1LengthSpl_</source>
         <comment>Left symbol _ in the name</comment>
@@ -16778,6 +17790,36 @@ Deseja salvar suas mudanças?</translation>
         <comment>Left symbol _ in the name</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>date</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">data</translation>
+    </message>
+    <message>
+        <source>time</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">hora</translation>
+    </message>
+    <message>
+        <source>patternName</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">nomeDoMolde</translation>
+    </message>
+    <message>
+        <source>patternNumber</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">númeroDoMolde</translation>
+    </message>
+    <message>
+        <source>author</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">autor</translation>
+    </message>
+    <message>
+        <source>customer</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">cliente</translation>
+    </message>
     <message>
         <source>r2cm</source>
         <comment>round to up to 1 decimal</comment>
@@ -16986,12 +18028,12 @@ Deseja salvar suas mudanças?</translation>
     <message>
         <source>warning</source>
         <comment>Calculation warning</comment>
-        <translation>alerta</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show a warning in calculations</source>
         <comment>function warning</comment>
-        <translation>Mostrar um alerta nos cálculos</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -17016,6 +18058,13 @@ Deseja salvar suas mudanças?</translation>
         <translation type="vanished">Erro, restaurando backup do documento: %1.</translation>
     </message>
 </context>
+<context>
+    <name>VValentinaSettings</name>
+    <message>
+        <source>layouts</source>
+        <translation type="unfinished">layouts</translation>
+    </message>
+</context>
 <context>
     <name>VWidgetDetails</name>
     <message>
@@ -17056,15 +18105,15 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Piece options</source>
-        <translation>Opções peça</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete piece</source>
-        <translation>Deletar peça</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot find piece by id &apos;%1&apos;</source>
-        <translation>Não é possível encontrar peça id &apos;%1&apos;</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -17083,31 +18132,31 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Hide</source>
-        <translation>Ocultar</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show</source>
-        <translation>Exibir</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide All</source>
-        <translation>Ocultar Todos</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show All</source>
-        <translation>Exibir Todos</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tags:</source>
-        <translation>Tags:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Separate each tag with comma.</source>
-        <translation>Separe cada tag com vírgula.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter by tags</source>
-        <translation>Filtrar por tag</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preferences</source>
@@ -17115,7 +18164,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Categories: %1.</source>
-        <translation>Categorias: %1.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -17134,59 +18183,39 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>&lt;b&gt;Curved path&lt;/b&gt;: select seven or more points, &lt;b&gt;%1&lt;/b&gt; - finish creation</source>
-        <translation>&lt;b&gt;Caminho curvo&lt;/b&gt;: selecione sete ou mais pontos, &lt;b&gt;%1&lt;/b&gt; - finaliza criação</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VisToolCurveIntersectAxis</name>
-    <message>
-        <source>&lt;b&gt;Intersection curve and axis&lt;/b&gt;: angle = %1°; &lt;b&gt;Shift&lt;/b&gt; - sticking angle, &lt;b&gt;Enter&lt;/b&gt; - finish creation</source>
-        <translation type="vanished">&lt;b&gt;Interseção curva e eixo&lt;/b&gt;: ângulo = %1°; &lt;b&gt;Shift&lt;/b&gt; - fixa ângulo, &lt;b&gt;Enter&lt;/b&gt; - finaliza</translation>
-    </message>
     <message>
         <source>&lt;b&gt;Intersection curve and axis&lt;/b&gt;: angle = %1°; &lt;b&gt;%2&lt;/b&gt; - sticking angle, &lt;b&gt;%3&lt;/b&gt; - finish creation</source>
-        <translation>&lt;b&gt;Interseção curva e eixo&lt;/b&gt;: ângulo = %1°; &lt;b&gt;%2&lt;/b&gt; - fixa ângulo, &lt;b&gt;%3&lt;/b&gt; - finaliza</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VisToolEndLine</name>
-    <message>
-        <source>&lt;b&gt;Point at distance and angle&lt;/b&gt;: angle = %1°; &lt;b&gt;Shift&lt;/b&gt; - sticking angle, &lt;b&gt;Enter&lt;/b&gt; - finish creation</source>
-        <translation type="vanished">&lt;b&gt;Ponto a distância e ângulo&lt;/b&gt;: ângulo = %1°; &lt;b&gt;Shift&lt;/b&gt; - fixa ângulo, &lt;b&gt;Enter&lt;/b&gt; - finaliza</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Point at distance and angle&lt;/b&gt;: angle = %1°, length = %2%3; &lt;b&gt;Shift&lt;/b&gt; - sticking angle, &lt;b&gt;Enter&lt;/b&gt; - finish creation</source>
-        <translation type="vanished">&lt;b&gt;Ponto em distância e ângulo&lt;/b&gt;: ângulo = %1°, comprimento = %2%3; &lt;b&gt;Shift&lt;/b&gt; - fixa ângulo, &lt;b&gt;Enter&lt;/b&gt; - finaliza</translation>
-    </message>
     <message>
         <source>&lt;b&gt;Point at distance and angle&lt;/b&gt;: angle = %1°, length = %2%3; &lt;b&gt;%4&lt;/b&gt; - sticking angle, &lt;b&gt;%5&lt;/b&gt; - finish creation</source>
-        <translation>&lt;b&gt;Ponto a distância e ângulo&lt;/b&gt;: ângulo = %1°, comprimento = %2%3; &lt;b&gt;%4&lt;/b&gt; - fixar ângulo, &lt;b&gt;%5&lt;/b&gt; - finalizar</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VisToolLineIntersectAxis</name>
-    <message>
-        <source>&lt;b&gt;Intersection line and axis&lt;/b&gt;: angle = %1°; &lt;b&gt;Shift&lt;/b&gt; - sticking angle, &lt;b&gt;Enter&lt;/b&gt; - finish creation</source>
-        <translation type="vanished">&lt;b&gt;Interseção linha e eixo&lt;/b&gt;: ângulo = %1°; &lt;b&gt;Shift&lt;/b&gt; - fixar ângulo, &lt;b&gt;Enter&lt;/b&gt; - finaliza criação</translation>
-    </message>
     <message>
         <source>&lt;b&gt;Intersection line and axis&lt;/b&gt;: angle = %1°; &lt;b&gt;%2&lt;/b&gt; - sticking angle, &lt;b&gt;%3&lt;/b&gt; - finish creation</source>
-        <translation>&lt;b&gt;Interseção linha e eixo&lt;/b&gt;: ângulo = %1°; &lt;b&gt;%2&lt;/b&gt; - fixar ângulo, &lt;b&gt;%3&lt;/b&gt; - finalizar</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VisToolMove</name>
-    <message>
-        <source>Length = %1%2, angle = %3°, &lt;b&gt;Shift&lt;/b&gt; - sticking angle, &lt;b&gt;Mouse click&lt;/b&gt; - finish creation</source>
-        <translation type="vanished">Comprimento = %1%2, angle = %3°, &lt;b&gt;Shift&lt;/b&gt; - fixar ângulo, &lt;b&gt;Mouse click&lt;/b&gt; - finaliza criação</translation>
-    </message>
     <message>
         <source>Length = %1%2, angle = %3°, &lt;b&gt;%4&lt;/b&gt; - sticking angle, &lt;b&gt;Mouse click&lt;/b&gt; - finish selecting a position</source>
-        <translation>Comprimento = %1%2, ângulo = %3°, &lt;b&gt;%4&lt;/b&gt; - fixar ângulo, &lt;b&gt;Mouse click&lt;/b&gt; - finalizar a seleção da posição</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Length = %1%2, angle = %3°, rotation angle = %4°, &lt;b&gt;%5&lt;/b&gt; - sticking angle, &lt;b&gt;%6&lt;/b&gt; - change rotation origin point, &lt;b&gt;Mouse click&lt;/b&gt; - finish creating</source>
-        <translation>Comprimento = %1%2, ângulo = %3°, ângulo de rotação = %4°, &lt;b&gt;%5&lt;/b&gt; - fixar ângulo, &lt;b&gt;%6&lt;/b&gt; - mudar ponto de origem da rotação, &lt;b&gt;Mouse click&lt;/b&gt; - para finalizar</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -17197,7 +18226,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Rotating angle = %1°, &lt;b&gt;%2&lt;/b&gt; - sticking angle, &lt;b&gt;Mouse click&lt;/b&gt; - finish creation</source>
-        <translation>Ângulo de rotação = %1°, &lt;b&gt;%2&lt;/b&gt; - fixar ângulo, &lt;b&gt;Mouse click&lt;/b&gt; - finalizar</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -17208,7 +18237,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Use &lt;b&gt;%1&lt;/b&gt; for sticking angle!</source>
-        <translation>Use &lt;b&gt;%1&lt;/b&gt; para fixar ângulo!</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -17227,22 +18256,22 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>&lt;b&gt;Curved path&lt;/b&gt;: select three or more points, &lt;b&gt;%1&lt;/b&gt; - finish creation</source>
-        <translation>&lt;b&gt;Caminho curvo&lt;/b&gt;: selecione três ou mais pontos, &lt;b&gt;%1&lt;/b&gt; - para finalizar</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use &lt;b&gt;%1&lt;/b&gt; for sticking angle!</source>
-        <translation>Use &lt;b&gt;%1&lt;/b&gt; para fixar ângulo!</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WatermarkWindow</name>
     <message>
         <source>Watermark</source>
-        <translation>Marca D&apos;água</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity:</source>
-        <translation>Opacidade:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
@@ -17254,7 +18283,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>watermark text</source>
-        <translation>texto marca d&apos;água</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotation:</source>
@@ -17262,20 +18291,20 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Font:</source>
-        <translation>Fonte:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The quick brown fox jumps over the lazy dog</source>
         <extracomment>Use native text to test a font options</extracomment>
-        <translation>Um pequeno jabuti xereta viu dez cegonhas felizes</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit font</source>
-        <translation>Editar fonte</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
-        <translation>Imagem</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Path:</source>
@@ -17283,7 +18312,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>path to image</source>
-        <translation>caminho para imagem</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse…</source>
@@ -17291,7 +18320,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Gray color</source>
-        <translation>Cor Cinza</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;File</source>
@@ -17327,7 +18356,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Watermark image</source>
-        <translation>Imagem marca d&apos;água</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File error.</source>
@@ -17335,7 +18364,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>Watermark files</source>
-        <translation>Arquivos de marca d&apos;água</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save as</source>
@@ -17343,7 +18372,7 @@ Deseja salvar suas mudanças?</translation>
     </message>
     <message>
         <source>watermark</source>
-        <translation>marca d&apos;água</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to lock. This file already opened in another window.</source>
@@ -17384,8 +18413,7 @@ Deseja salvar suas mudanças?</translation>
     <message>
         <source>The watermark has been modified.
 Do you want to save your changes?</source>
-        <translation>A marca d&apos;água foi modificada.
-Deseja salvar as alterações?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t Save</source>
@@ -17397,15 +18425,15 @@ Deseja salvar as alterações?</translation>
     </message>
     <message>
         <source>untitled.vwm</source>
-        <translation>sem_titulo.vwm</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm format rewriting</source>
-        <translation>Confirmar reescrever formato</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This file is using previous format version v%1. The current is v%2. Saving the file with this app version will update the format version for this file. This may prevent you from be able to open the file with older app versions. Do you really want to continue?</source>
-        <translation>Este arquivo está usando formato de versão anterior v%1. A atual é v%2. Salvar o arquivo com esta versão do aplicativo atualizará a versão do formato deste arquivo. Isso pode impedir que você consiga abrir o arquivo com versões mais antigas do aplicativo. Você realmente deseja continuar?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File saved</source>
@@ -17429,7 +18457,7 @@ Deseja salvar as alterações?</translation>
     </message>
     <message>
         <source>Do you want to change the premissions?</source>
-        <translation>Você quer alterar as permissões?</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
diff --git a/share/translations/valentina_ro_RO.ts b/share/translations/valentina_ro_RO.ts
index e0cfbb0dc..e86ba4205 100644
--- a/share/translations/valentina_ro_RO.ts
+++ b/share/translations/valentina_ro_RO.ts
@@ -549,7 +549,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -680,16 +680,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogArcWithLength</name>
@@ -807,16 +807,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogBisector</name>
@@ -938,7 +938,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -1005,16 +1005,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCubicBezierPath</name>
@@ -1060,16 +1060,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCurveIntersectAxis</name>
@@ -1171,7 +1171,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -1262,11 +1262,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1276,6 +1272,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCutSpline</name>
@@ -1353,11 +1353,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1367,6 +1363,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCutSplinePath</name>
@@ -1444,11 +1444,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1458,6 +1454,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogDateTimeFormats</name>
@@ -1596,15 +1596,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Value</source>
-        <translation>Valoare</translation>
-    </message>
-    <message>
-        <source>Label</source>
+        <source>Dimension:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dimension:</source>
+        <source>Value</source>
+        <translation type="unfinished">Valoare</translation>
+    </message>
+    <message>
+        <source>Label</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1759,6 +1759,14 @@
         <source>Measurments file name</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Dimensiune</translation>
+    </message>
+    <message>
+        <source>Height</source>
+        <translation type="obsolete">Înălțime</translation>
+    </message>
     <message>
         <source>Measurments extension</source>
         <translation type="unfinished"></translation>
@@ -1887,19 +1895,15 @@
         <source>Customer email</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Measurement: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Înălțime</translation>
+        <translation type="unfinished">Înălțime</translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Dimensiune</translation>
+        <translation type="unfinished">Dimensiune</translation>
     </message>
     <message>
         <source>Hip</source>
@@ -1912,23 +1916,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No data for the height dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the size dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the hip dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the waist dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Final measurement: %1</source>
+        <source>Measurement: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1951,6 +1939,26 @@
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Final measurement: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the height dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the size dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the hip dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the waist dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogEditWrongFormula</name>
@@ -2175,16 +2183,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogEndLine</name>
@@ -2290,7 +2298,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -2508,11 +2516,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -2530,6 +2534,10 @@
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -2623,11 +2631,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -2645,6 +2649,10 @@
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -2793,7 +2801,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -3556,7 +3564,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -3623,7 +3631,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -3750,7 +3758,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -3917,20 +3925,50 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Name</source>
-        <translation>Nume</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Nume</translation>
     </message>
     <message>
         <source>Value</source>
-        <translation>Valoare</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Valoare</translation>
+    </message>
+    <message>
+        <source>Full name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Descriere</translation>
     </message>
     <message>
         <source>Base value</source>
-        <translation>Valoarea de bază</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Valoarea de bază</translation>
+    </message>
+    <message>
+        <source>Shift (%1):</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Skip</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Nume</translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished">Valoare</translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <translation type="unfinished">Valoarea de bază</translation>
+    </message>
     <message>
         <source>Shift (%1)*:</source>
         <translation type="unfinished"></translation>
@@ -3951,36 +3989,6 @@ Apply settings anyway?</source>
         <source>Please, select unique number for each column</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Name</source>
-        <comment>measurement column</comment>
-        <translation>Nume</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <comment>measurement column</comment>
-        <translation>Valoare</translation>
-    </message>
-    <message>
-        <source>Full name</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <comment>measurement column</comment>
-        <translation>Descriere</translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <comment>measurement column</comment>
-        <translation>Valoarea de bază</translation>
-    </message>
-    <message>
-        <source>Shift (%1):</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DialogMove</name>
@@ -4070,11 +4078,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -4092,6 +4096,10 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -4319,7 +4327,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5052,7 +5060,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5139,7 +5147,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5222,7 +5230,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5273,7 +5281,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5328,7 +5336,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5423,7 +5431,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5470,7 +5478,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5520,6 +5528,29 @@ Apply settings anyway?</source>
         </translation>
     </message>
 </context>
+<context>
+    <name>DialogPuzzlePreferences</name>
+    <message>
+        <source>Puzzle preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished">Configurație</translation>
+    </message>
+    <message>
+        <source>Paths</source>
+        <translation type="unfinished">Căi</translation>
+    </message>
+    <message numerus="yes">
+        <source>Followed %n option(s) require restart to take effect: %1.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+</context>
 <context>
     <name>DialogRestrictDimension</name>
     <message>
@@ -5623,11 +5654,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Alias</source>
@@ -5645,6 +5672,10 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -5835,6 +5866,10 @@ Apply settings anyway?</source>
         <source>Numerical control</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogSeamAllowance</name>
@@ -6093,6 +6128,11 @@ Apply settings anyway?</source>
         <source>Use full circumference</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Height</source>
+        <comment>dimension</comment>
+        <translation type="unfinished">Înălțime</translation>
+    </message>
     <message>
         <source>Min value:</source>
         <translation type="unfinished"></translation>
@@ -6125,10 +6165,25 @@ Apply settings anyway?</source>
         <source>The base value for the column</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <comment>dimension</comment>
+        <translation type="unfinished">Dimensiune</translation>
+    </message>
     <message>
         <source>Circumference</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Waist</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hip</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Please, provide correct data for dimensions</source>
         <translation type="unfinished"></translation>
@@ -6145,26 +6200,6 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Height</source>
-        <comment>dimension</comment>
-        <translation>Înălțime</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <comment>dimension</comment>
-        <translation>Dimensiune</translation>
-    </message>
-    <message>
-        <source>Waist</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hip</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DialogShoulderPoint</name>
@@ -6274,7 +6309,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6317,7 +6352,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6444,16 +6479,16 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogSplinePath</name>
@@ -6583,16 +6618,16 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogTapePreferences</name>
@@ -6772,7 +6807,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6855,7 +6890,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Instrument</translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -7543,10 +7578,6 @@ Do you want to save your changes?</source>
         <source>Enter a new label for the pattern piece.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>This file already opened in another window.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Wrong units.</source>
         <translation type="vanished">Unități de măsură greșite.</translation>
@@ -7843,30 +7874,6 @@ Do you want to save your changes?</source>
         <source>Don&apos;t Save</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Locking file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The lock file could not be created, for lack of permissions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Point intersection curves</source>
         <translation type="unfinished"></translation>
@@ -7939,6 +7946,10 @@ Do you want to save your changes?</source>
         <source>Pattern Piece:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Height:</source>
+        <translation type="obsolete">Înălțime:</translation>
+    </message>
     <message>
         <source>The measurements file &lt;br/&gt;&lt;br/&gt; &lt;b&gt;%1&lt;/b&gt; &lt;br/&gt;&lt;br/&gt; could not be found. Do you want to update the file location?</source>
         <translation type="unfinished"></translation>
@@ -7979,18 +7990,6 @@ Do you want to save your changes?</source>
         <source>Select main path objects clockwise.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>The document has no write permissions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cannot set permissions for %1 to writable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not save the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Could not save the file</source>
         <translation type="unfinished"></translation>
@@ -8376,7 +8375,43 @@ Do you want to save your changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to change the premissions?</source>
+        <source>Manual Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open the Puzzle app</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to prepare raw layout data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select manual layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8498,6 +8533,10 @@ Do you want to save your changes?</source>
         <source>Measurement file contains invalid known measurement(s).</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wrong units.</source>
+        <translation type="vanished">Unități de măsură greșite.</translation>
+    </message>
     <message>
         <source>File error.</source>
         <translation>Eroare de fișier.</translation>
@@ -8819,6 +8858,10 @@ Do you want to save your changes?</source>
         <source>My label templates</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>My manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PreferencesPatternPage</name>
@@ -8960,6 +9003,111 @@ This option will take an affect after restart.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>Puzzle</name>
+    <message>
+        <source>Export options can be used with single input file only.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Valentina&apos;s manual layout editor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The manual layout file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesConfigurationPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished">Limba</translation>
+    </message>
+    <message>
+        <source>GUI language:</source>
+        <translation type="unfinished">Limbaj GUI:</translation>
+    </message>
+    <message>
+        <source>Toolbar</source>
+        <translation type="unfinished">Bară de instrumente</translation>
+    </message>
+    <message>
+        <source>The text appears under the icon (recommended for beginners).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate dark mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t use the native file dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dark mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesPathPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paths that Valentina uses</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Individual Measurements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Multisize Measurements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Patterns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Templates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>QCoreApplication</name>
     <message>
@@ -9239,6 +9387,10 @@ This option will take an affect after restart.</source>
         <source>Can&apos;t convert toInt parameter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Piece name &apos;%1&apos; is not unique.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Could not find the segment start.</source>
         <translation type="unfinished"></translation>
@@ -9255,6 +9407,10 @@ This option will take an affect after restart.</source>
         <source>Error calculating segment for curve &apos;%1&apos;. %2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot prepare builtin passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
@@ -9271,18 +9427,14 @@ This option will take an affect after restart.</source>
         <source>Cannot prepare passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Piece name &apos;%1&apos; is not unique.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Cannot get tokens from formula &apos;%1&apos;. Formula error: %2.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>No data for the height dimension.</source>
         <translation type="unfinished"></translation>
@@ -9304,11 +9456,15 @@ This option will take an affect after restart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
+        <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
+        <source>Unplaced pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet 1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -9977,30 +10133,6 @@ Do you want to save your changes?</source>
         <source>Don&apos;t Save</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Locking file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The lock file could not be created, for lack of permissions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Export to CSV</source>
         <translation type="unfinished"></translation>
@@ -10025,18 +10157,6 @@ Do you want to save your changes?</source>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>The measurements document has no write permissions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cannot set permissions for %1 to writable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not save the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Could not save the file</source>
         <translation type="unfinished"></translation>
@@ -10165,17 +10285,43 @@ Do you want to save your changes?</source>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Search measurements by term. &lt;/p&gt;&lt;p&gt;Prepend &amp;quot;/r/&amp;quot; to the front of the search string to search measurements by regex.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Do you want to change the premissions?</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Cannot read settings from a malformed .INI file.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Nume</translation>
+    </message>
+    <message>
+        <source>Full name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Calculated value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Formula</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Formula</translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Valoarea de bază</translation>
+    </message>
+    <message>
+        <source>Correction</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Units:</source>
-        <translation>Unități:</translation>
+        <translation type="unfinished">Unități:</translation>
     </message>
     <message>
         <source>Shift B</source>
@@ -10275,50 +10421,24 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Inches</source>
-        <translation>Inci</translation>
+        <translation type="unfinished">Inci</translation>
     </message>
     <message>
         <source>Centimeters</source>
-        <translation>Centimetrii</translation>
+        <translation type="unfinished">Centimetrii</translation>
     </message>
     <message>
         <source>Degrees</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Name</source>
-        <comment>measurement column</comment>
-        <translation>Nume</translation>
-    </message>
-    <message>
-        <source>Full name</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calculated value</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Formula</source>
-        <comment>measurement column</comment>
-        <translation>Formula</translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <comment>measurement column</comment>
-        <translation>Valoarea de bază</translation>
-    </message>
-    <message>
-        <source>Correction</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Restrict first dimension</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>untitled</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:18pt;&quot;&gt;Select New to create a measurement file.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
@@ -10853,6 +10973,18 @@ Do you want to save your changes?</source>
         <comment>seam allowance</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Universally Unique IDentifier of piece. Used to identifier piece while updating manual layout. Left empty to generate new value.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TabPlaceLabels</name>
@@ -11047,6 +11179,10 @@ Do you want to save your changes?</source>
         <source>My Patterns</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TogglePieceForceForbidFlipping</name>
@@ -11091,19 +11227,15 @@ Do you want to save your changes?</source>
         <source>Base value invalid</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Size</source>
-        <translation>Dimensiune</translation>
-    </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Înălțime</translation>
+        <translation type="unfinished">Înălțime</translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Dimensiune</translation>
+        <translation type="unfinished">Dimensiune</translation>
     </message>
     <message>
         <source>Waist</source>
@@ -11125,6 +11257,10 @@ Do you want to save your changes?</source>
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished">Dimensiune</translation>
+    </message>
     <message>
         <source>Chest circumference</source>
         <comment>dimension</comment>
@@ -11292,6 +11428,50 @@ Do you want to save your changes?</source>
         <source>Export to CSV</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>The measurements document has no write permissions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to change the premissions?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot set permissions for %1 to writable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Locking file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This file already opened in another window.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VAbstractNode</name>
@@ -11933,6 +12113,34 @@ Do you want to save your changes?</source>
         <source>The dimension C base</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>The filename of exported layout file. Use it to enable console export mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The filename of layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pattern pieces form the raw layout data file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The raw layout data file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to output format (default = 0, export mode): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to tiled pdf page template (default = 0, export mode with tiled pdf format): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run the program in a test mode. The program in this mode loads a single layout file and silently quit without showing the main window. The key have priority before key &apos;%1&apos;.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VCommonSettings</name>
@@ -11960,6 +12168,10 @@ Do you want to save your changes?</source>
         <source>patterns</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VContainer</name>
@@ -12152,6 +12364,10 @@ Do you want to save your changes?</source>
 </context>
 <context>
     <name>VLayoutExporter</name>
+    <message>
+        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot set printer page size</source>
         <translation type="unfinished"></translation>
@@ -12165,11 +12381,11 @@ Do you want to save your changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Creating file &apos;%1&apos; failed! %2</source>
+        <source>Export raw layout data failed. %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
+        <source>Creating file &apos;%1&apos; failed! %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12208,11 +12424,11 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Height</source>
-        <translation>Înălțime</translation>
+        <translation type="unfinished">Înălțime</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Dimensiune</translation>
+        <translation type="unfinished">Dimensiune</translation>
     </message>
     <message>
         <source>Hip</source>
@@ -12358,6 +12574,114 @@ Do you want to save your changes?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>VPApplication</name>
+    <message>
+        <source>Error parsing file. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error bad id. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error can&apos;t convert value. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error empty parameter. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error wrong id. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Something&apos;s wrong!!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exception thrown: %1. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t begin to listen for incoming connections on name &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export mode doesn&apos;t support openning several files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import raw layout data does not support openning several layout files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, provide one input file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrousel</name>
+    <message>
+        <source>Pieces of </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrouselPieceList</name>
+    <message>
+        <source>Move to Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Șterge</translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPDialogAbout</name>
+    <message>
+        <source>About Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Puzzle version</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Build revision:</source>
+        <translation type="unfinished">Revizie Versiune:</translation>
+    </message>
+    <message>
+        <source>This program is part of Valentina project.</source>
+        <translation type="unfinished">Acest program face parte din proiectul Valentina.</translation>
+    </message>
+    <message>
+        <source>Check For Updates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open your default browser</source>
+        <translation type="unfinished">Nu pot deschide browser-ul implicit</translation>
+    </message>
+    <message>
+        <source>Build revision: %1</source>
+        <translation type="unfinished">Revizie Versiune: %1</translation>
+    </message>
+    <message>
+        <source>Built on %1 at %2</source>
+        <translation type="unfinished">Construit pe %1 la %2</translation>
+    </message>
+    <message>
+        <source>Web site : %1</source>
+        <translation type="unfinished">Site Web: %1</translation>
+    </message>
+</context>
 <context>
     <name>VPE::VBoolProperty</name>
     <message>
@@ -12380,6 +12704,573 @@ Do you want to save your changes?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>VPGraphicsPiece</name>
+    <message>
+        <source>Move to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPLayoutFileReader</name>
+    <message>
+        <source>Piece List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Got empty attribute &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPMainWindow</name>
+    <message>
+        <source>Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp; Fișier</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished">&amp; Ajutor</translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Piece Carrousel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Infos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DummyName</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UUID:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{7b2ce4ae-96f5-4905-bb34-405cb40ca208}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Geometry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mirror piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Angle:</source>
+        <translation type="unfinished">Unghi:</translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° anti-clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Placement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Y:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No piece selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple pieces selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Width</source>
+        <translation type="unfinished">Lățime</translation>
+    </message>
+    <message>
+        <source>Length</source>
+        <translation type="unfinished">Lungime</translation>
+    </message>
+    <message>
+        <source>Orientation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove unused length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Placement Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Row height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Follow grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vertical grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Horizontal grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pieces gap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sticky edges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiles properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiled Pdf Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Tiles on sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export Tiled Pdf</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Nume</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Descriere</translation>
+    </message>
+    <message>
+        <source>Unit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning superposition of pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning pieces out of bound</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation type="unfinished">&amp;Deschide</translation>
+    </message>
+    <message>
+        <source>Ctrl+O</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Salvează</translation>
+    </message>
+    <message>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save &amp;As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Import Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation type="unfinished">E&amp;xit</translation>
+    </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation type="unfinished">&amp; Nou</translation>
+    </message>
+    <message>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation type="unfinished">Despre&amp;Qt</translation>
+    </message>
+    <message>
+        <source>About &amp;Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom in</source>
+        <translation type="unfinished">Mărește</translation>
+    </message>
+    <message>
+        <source>Zoom out</source>
+        <translation type="unfinished">Micșorează</translation>
+    </message>
+    <message>
+        <source>Zoom 1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom fit best</source>
+        <translation type="unfinished">Zoom se potrivesc cel mai bine</translation>
+    </message>
+    <message>
+        <source>Zoom sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished">Preferințe</translation>
+    </message>
+    <message>
+        <source>File &apos;%1&apos; doesn&apos;t exist!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File error.</source>
+        <translation type="unfinished">Eroare de fișier.</translation>
+    </message>
+    <message>
+        <source>Unable to read a layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fail to create layout.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not extract data from file &apos;%1&apos;. %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Centimeters</source>
+        <translation type="unfinished">Centimetrii</translation>
+    </message>
+    <message>
+        <source>Millimiters</source>
+        <translation type="unfinished">Milimetrii</translation>
+    </message>
+    <message>
+        <source>Inches</source>
+        <translation type="unfinished">Inci</translation>
+    </message>
+    <message>
+        <source>Scale:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>untitled %1.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>untitled.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot read settings from a malformed .INI file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save settings. Access denied.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to open file, is it writable?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open file</source>
+        <translation type="unfinished">Deschide fișier</translation>
+    </message>
+    <message>
+        <source>Could not save the file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save as</source>
+        <translation type="unfinished">Salvează ca și</translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save file</source>
+        <translation type="unfinished">Fișierul nu a putut fii salvat</translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window. Expect collissions when run 2 copies of the program.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Raw Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About Qt</source>
+        <translation type="unfinished">Despre Qt</translation>
+    </message>
+    <message>
+        <source>PDF Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SVG Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPSheet</name>
+    <message>
+        <source>Letter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Legal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabloid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 24in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 30in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 36in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 42in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 44in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 48in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 62in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 72in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPTileFactory</name>
+    <message>
+        <source>Grid ( %1 , %2 )</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page %1 of %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VPattern</name>
     <message>
@@ -12770,9 +13661,14 @@ Do you want to save your changes?</source>
     </message>
 </context>
 <context>
-    <name>VSettings</name>
+    <name>VRawLayout</name>
     <message>
-        <source>layouts</source>
+        <source>VRawLayout::ReadFile() failed. Raw layout format prefix mismatch error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VRawLayout::ReadFile() failed.
+Raw layout format compatibility error: actualFileVersion = %1 and fileVersion = %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -15168,6 +16064,13 @@ Do you want to save your changes?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>VValentinaSettings</name>
+    <message>
+        <source>layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VWidgetDetails</name>
     <message>
diff --git a/share/translations/valentina_ru_RU.ts b/share/translations/valentina_ru_RU.ts
index ebafd9ae8..557e00887 100644
--- a/share/translations/valentina_ru_RU.ts
+++ b/share/translations/valentina_ru_RU.ts
@@ -261,7 +261,7 @@
     </message>
     <message>
         <source>After each crash Valentina collect information that may help us fix a problem. We do not collect any personal information. Find more about what &lt;a href=&quot;https://bitbucket.org/dismine/valentina/wiki/manual/Crash_reports&quot;&gt;kind of information&lt;/a&gt; we collect.</source>
-        <translation type="vanished">После каждого падения Valentina собирает информацию, которая может помочь нам исправить ошибки. Мы не собираем персональную информацию пользователей. Узнать больше об &lt;a href=https://bitbucket.org/dismine/valentina/wiki/manual/Crash_reports&gt;информации&lt;/a&gt;, которую мы собираем.</translation>
+        <translation type="vanished">После каждого падения Valentina собирает информацию, которая может помочь нам в исправлении ошибки. Мы не собираем персональную информацию пользователей. Узнать больше об &lt;a href=https://bitbucket.org/dismine/valentina/wiki/manual/Crash_reports&gt;информации&lt;/a&gt;, которую мы собираем.</translation>
     </message>
     <message>
         <source>Pattern Editing</source>
@@ -429,7 +429,7 @@
     </message>
     <message>
         <source>Tape version</source>
-        <translation>Версия Tape</translation>
+        <translation>Версия  Tape</translation>
     </message>
     <message>
         <source>Build revision:</source>
@@ -576,7 +576,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Инструмент</translation>
+        <translation type="unfinished">Инструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -709,14 +709,14 @@
         <source>Tool</source>
         <translation>Инструмент</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation>Заметки</translation>
-    </message>
     <message>
         <source>Alias:</source>
         <translation>Псевдоним:</translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation>Заметки</translation>
+    </message>
 </context>
 <context>
     <name>DialogArcWithLength</name>
@@ -836,14 +836,14 @@
         <source>Tool</source>
         <translation>Инструмент</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation>Заметки</translation>
-    </message>
     <message>
         <source>Alias:</source>
         <translation>Псевдоним:</translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation>Заметки</translation>
+    </message>
 </context>
 <context>
     <name>DialogBisector</name>
@@ -965,7 +965,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Инструмент</translation>
+        <translation type="unfinished">Инструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -1038,14 +1038,14 @@
         <source>Tool</source>
         <translation>Инструмент</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation>Заметки</translation>
-    </message>
     <message>
         <source>Alias:</source>
         <translation>Псевдоним:</translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation>Заметки</translation>
+    </message>
 </context>
 <context>
     <name>DialogCubicBezierPath</name>
@@ -1097,14 +1097,14 @@
         <source>Tool</source>
         <translation>Инструмент</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation>Заметки</translation>
-    </message>
     <message>
         <source>Alias:</source>
         <translation>Псевдоним:</translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation>Заметки</translation>
+    </message>
 </context>
 <context>
     <name>DialogCurveIntersectAxis</name>
@@ -1206,7 +1206,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Инструмент</translation>
+        <translation type="unfinished">Инструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -1214,11 +1214,11 @@
     </message>
     <message>
         <source>Alias1:</source>
-        <translation>Псевдоним 1:</translation>
+        <translation type="unfinished">Псевдоним 1:</translation>
     </message>
     <message>
         <source>Alias2:</source>
-        <translation>Псевдоним 2:</translation>
+        <translation type="unfinished">Псевдоним 2:</translation>
     </message>
 </context>
 <context>
@@ -1299,10 +1299,6 @@
         <source>Tool</source>
         <translation>Инструмент</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation>Заметки</translation>
-    </message>
     <message>
         <source>Alias1:</source>
         <translation>Псевдоним 1:</translation>
@@ -1311,6 +1307,10 @@
         <source>Alias2:</source>
         <translation>Псевдоним 2:</translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation>Заметки</translation>
+    </message>
 </context>
 <context>
     <name>DialogCutSpline</name>
@@ -1390,10 +1390,6 @@
         <source>Tool</source>
         <translation>Инструмент</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation>Заметки</translation>
-    </message>
     <message>
         <source>Alias1:</source>
         <translation>Псевдоним 1:</translation>
@@ -1402,6 +1398,10 @@
         <source>Alias2:</source>
         <translation>Псевдоним 2:</translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation>Заметки</translation>
+    </message>
 </context>
 <context>
     <name>DialogCutSplinePath</name>
@@ -1481,10 +1481,6 @@
         <source>Tool</source>
         <translation>Инструмент</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation>Заметки</translation>
-    </message>
     <message>
         <source>Alias1:</source>
         <translation>Псевдоним 1:</translation>
@@ -1493,6 +1489,10 @@
         <source>Alias2:</source>
         <translation>Псевдоним 2:</translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation>Заметки</translation>
+    </message>
 </context>
 <context>
     <name>DialogDateTimeFormats</name>
@@ -1537,7 +1537,7 @@
     </message>
     <message>
         <source>Name of detail</source>
-        <translation type="vanished">Название детали</translation>
+        <translation type="vanished">Имя детали</translation>
     </message>
     <message>
         <source>Seam allowance</source>
@@ -1613,7 +1613,7 @@
     </message>
     <message>
         <source>Name of detail:</source>
-        <translation type="vanished">Название детали:</translation>
+        <translation type="vanished">Имя детали:</translation>
     </message>
     <message>
         <source>Width:</source>
@@ -1792,19 +1792,19 @@
     <name>DialogDimensionLabels</name>
     <message>
         <source>Dimension labels</source>
-        <translation>Псевдонимы измерения</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <translation>Значение</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Псевдоним</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dimension:</source>
-        <translation>Измерение:</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished">Значение</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished">Метка</translation>
     </message>
 </context>
 <context>
@@ -1958,6 +1958,14 @@
         <source>Measurments file name</source>
         <translation>Имя файла мерок</translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="vanished">Размер</translation>
+    </message>
+    <message>
+        <source>Height</source>
+        <translation type="vanished">Высота</translation>
+    </message>
     <message>
         <source>Measurments extension</source>
         <translation>Расширение файла мерок</translation>
@@ -2068,87 +2076,87 @@
     </message>
     <message>
         <source>Measurements units</source>
-        <translation>Единицы измерения мерок</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pattern units</source>
-        <translation>Единицы измерения выкройки</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size units</source>
-        <translation>Единицы измерения размера</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Customer birth date</source>
-        <translation>Дата рождения клиента</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Customer email</source>
-        <translation>Электронная почта клиента</translation>
-    </message>
-    <message>
-        <source>Measurement: %1</source>
-        <translation>Мерка: %1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Высота</translation>
+        <translation type="unfinished">Высота</translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Размер</translation>
+        <translation type="unfinished">Размер</translation>
     </message>
     <message>
         <source>Hip</source>
         <comment>dimension</comment>
-        <translation>Бёдра</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Waist</source>
         <comment>dimension</comment>
-        <translation>Талия</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No data for the height dimension.</source>
-        <translation>Нет данных для измерения рост.</translation>
-    </message>
-    <message>
-        <source>No data for the size dimension.</source>
-        <translation>Нет данных для измерения размер.</translation>
-    </message>
-    <message>
-        <source>No data for the hip dimension.</source>
-        <translation>Нет данных для измерения бёдра.</translation>
-    </message>
-    <message>
-        <source>No data for the waist dimension.</source>
-        <translation>Нет данных для измерения талия.</translation>
-    </message>
-    <message>
-        <source>Final measurement: %1</source>
-        <translation>Финальное измерение: %1</translation>
+        <source>Measurement: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height label</source>
         <comment>dimension</comment>
-        <translation>Псевдоним роста</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size label</source>
         <comment>dimension</comment>
-        <translation>Псевдоним размера</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hip label</source>
         <comment>dimension</comment>
-        <translation>Псевдоним бёдер</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Waist label</source>
         <comment>dimension</comment>
-        <translation>Псевдоним талии</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Final measurement: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the height dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the size dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the hip dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the waist dimension.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -2384,14 +2392,14 @@
         <source>Tool</source>
         <translation>Инструмент</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation>Заметки</translation>
-    </message>
     <message>
         <source>Alias:</source>
         <translation>Псевдоним:</translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation>Заметки</translation>
+    </message>
 </context>
 <context>
     <name>DialogEndLine</name>
@@ -2497,7 +2505,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Инструмент</translation>
+        <translation type="unfinished">Инструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -2656,7 +2664,7 @@
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Search final measurements by term. &lt;/p&gt;&lt;p&gt;Prepend &amp;quot;/r/&amp;quot; to the front of the search string to search final measurements by regex.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Поиск финальных измерений по ключевым параметрам. &lt;/p&gt;&lt;p&gt; Прибавьте &amp;quot;/r/&amp;quot; к передней части строки поиска для поиска финальных измерений по регулярному выражению. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -2729,10 +2737,6 @@
         <source>Tool</source>
         <translation>Инструмент</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation>Заметки</translation>
-    </message>
     <message>
         <source>Alias:</source>
         <translation>Псевдоним:</translation>
@@ -2749,6 +2753,10 @@
         <source>Ready</source>
         <translation>Готово</translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation>Заметки</translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation>Неправильный суффикс</translation>
@@ -2848,10 +2856,6 @@
         <source>Tool</source>
         <translation>Инструмент</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation>Заметки</translation>
-    </message>
     <message>
         <source>Alias:</source>
         <translation>Псевдоним:</translation>
@@ -2868,6 +2872,10 @@
         <source>Ready</source>
         <translation>Готово</translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation>Заметки</translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation>Неправильный суффикс</translation>
@@ -2890,11 +2898,11 @@
     </message>
     <message>
         <source>Invalid first line point</source>
-        <translation>Неправильная первая точка линии</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid second line point</source>
-        <translation>Неправильная вторая точка линии</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid label</source>
@@ -3020,7 +3028,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Инструмент</translation>
+        <translation type="unfinished">Инструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -3390,11 +3398,11 @@
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Search increments by term. &lt;/p&gt;&lt;p&gt;Prepend &amp;quot;/r/&amp;quot; to the front of the search string to search increments by regex.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Поиск прибавок по ключевым параметрам. &lt;/p&gt;&lt;p&gt; Прибавьте &amp;quot;/r/&amp;quot; к передней части строки поиска для поиска прибавок по регулярному выражению. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Search preview calculations by term. &lt;/p&gt;&lt;p&gt;Prepend &amp;quot;/r/&amp;quot; to the front of the search string to search preview calculations by regex.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Поиск предварительных расчетов по ключевым параметрам. &lt;/p&gt;&lt;p&gt; Прибавьте &amp;quot;/r/&amp;quot; к передней части строки поиска для поиска предварительных расчетов по регулярному выражению. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Increment</source>
@@ -3425,7 +3433,7 @@
     </message>
     <message>
         <source>Number:</source>
-        <translation>Количество:</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3829,11 +3837,11 @@ Apply settings anyway?</source>
     <message>
         <source> min</source>
         <comment>minutes</comment>
-        <translation>мин</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable this option to prefer getting one sheet solutions.</source>
-        <translation>Включите эту опцию, чтобы предпочесть получать решения на одном листе.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3884,7 +3892,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Инструмент</translation>
+        <translation type="unfinished">Инструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -3951,7 +3959,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Инструмент</translation>
+        <translation type="unfinished">Инструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -4026,7 +4034,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Edit angle</source>
-        <translation>Редактировать угол</translation>
+        <translation>Редактрировать угол</translation>
     </message>
     <message>
         <source>Angle:</source>
@@ -4078,7 +4086,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Инструмент</translation>
+        <translation type="unfinished">Инструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -4213,101 +4221,101 @@ Apply settings anyway?</source>
     <name>DialogMeasurementsCSVColumns</name>
     <message>
         <source>Setup columns</source>
-        <translation>Настройки колонок</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preview</source>
-        <translation>Предварительный просмотр</translation>
+        <translation type="unfinished">Предварительный просмотр</translation>
     </message>
     <message>
         <source>Input</source>
-        <translation>Входные данные</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import</source>
-        <translation>Данные, необходимые для импорта</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Columns</source>
-        <translation>Колонки</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full name:</source>
-        <translation>Полное имя:</translation>
+        <translation type="unfinished">Полное имя:</translation>
     </message>
     <message>
         <source>Description:</source>
-        <translation>Описание:</translation>
+        <translation type="unfinished">Описание:</translation>
     </message>
     <message>
         <source>Ready</source>
-        <translation>Готово</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation>Имя</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <translation>Значение</translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <translation>Базовое значение</translation>
-    </message>
-    <message>
-        <source>Skip</source>
-        <translation>Пропустить</translation>
-    </message>
-    <message>
-        <source>Shift (%1)*:</source>
-        <translation>Смещение (%1)*:</translation>
-    </message>
-    <message>
-        <source>File path is empty</source>
-        <translation>Путь к файлу пуст</translation>
-    </message>
-    <message>
-        <source>Not enough columns</source>
-        <translation>Недостаточно колонок</translation>
-    </message>
-    <message>
-        <source>Not enough data to import</source>
-        <translation>Недостаточно данных для импорта</translation>
-    </message>
-    <message>
-        <source>Please, select unique number for each column</source>
-        <translation>Пожалуйста, выберите уникальный номер для каждой колонки</translation>
+        <translation type="unfinished">Готово</translation>
     </message>
     <message>
         <source>Name</source>
         <comment>measurement column</comment>
-        <translation>Имя</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Value</source>
         <comment>measurement column</comment>
-        <translation>Значение</translation>
+        <translation type="unfinished">Значение</translation>
     </message>
     <message>
         <source>Full name</source>
         <comment>measurement column</comment>
-        <translation>Полное имя</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <comment>measurement column</comment>
-        <translation>Описание</translation>
+        <translation type="unfinished">Описание</translation>
     </message>
     <message>
         <source>Base value</source>
         <comment>measurement column</comment>
-        <translation>Базовое значение</translation>
+        <translation type="unfinished">Базовое значение</translation>
     </message>
     <message>
         <source>Shift (%1):</source>
         <comment>measurement column</comment>
-        <translation>Смещение (%1):</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished">Значение</translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <translation type="unfinished">Базовое значение</translation>
+    </message>
+    <message>
+        <source>Shift (%1)*:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File path is empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not enough columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not enough data to import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, select unique number for each column</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -4404,10 +4412,6 @@ Apply settings anyway?</source>
         <source>Tool</source>
         <translation>Инструмент</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation>Заметки</translation>
-    </message>
     <message>
         <source>Alias:</source>
         <translation>Псевдоним:</translation>
@@ -4424,6 +4428,10 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation>Готово</translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation>Заметки</translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation>Неправильный суффикс</translation>
@@ -4663,7 +4671,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Инструмент</translation>
+        <translation type="unfinished">Инструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -4859,6 +4867,10 @@ Apply settings anyway?</source>
         <source>Show measurements file</source>
         <translation type="vanished">Показать файл мерок</translation>
     </message>
+    <message>
+        <source>From multisize measurements</source>
+        <translation type="vanished">Для мультиразмерных мерок</translation>
+    </message>
     <message>
         <source>Pattern</source>
         <translation>Выкройка</translation>
@@ -4867,13 +4879,69 @@ Apply settings anyway?</source>
         <source>For technical notes</source>
         <translation>Для технических заметок</translation>
     </message>
+    <message>
+        <source>Label data</source>
+        <translation type="vanished">Данные метки</translation>
+    </message>
+    <message>
+        <source>Label template:</source>
+        <translation type="vanished">Шаблон метки:</translation>
+    </message>
+    <message>
+        <source>Edit pattern label</source>
+        <translation type="vanished">Редактировать метку выкройки</translation>
+    </message>
+    <message>
+        <source>Edit template</source>
+        <translation type="vanished">Редактировать шаблон</translation>
+    </message>
+    <message>
+        <source>Date format:</source>
+        <translation type="vanished">Формат даты:</translation>
+    </message>
+    <message>
+        <source>Time format:</source>
+        <translation type="vanished">Формат времени:</translation>
+    </message>
+    <message>
+        <source>Save label data.</source>
+        <translation type="vanished">Сохранить данные метки.</translation>
+    </message>
+    <message>
+        <source>Label data were changed. Do you want to save them before editing label template?</source>
+        <translation type="vanished">Данные метки были изменены. Вы хотите сохранить их перед редактированием шаблона метки?</translation>
+    </message>
+    <message>
+        <source>Materials</source>
+        <translation type="vanished">Материалы</translation>
+    </message>
+    <message>
+        <source>Pattern materials:</source>
+        <translation type="vanished">Материалы выкройки:</translation>
+    </message>
+    <message>
+        <source>Manage list of pattern materials</source>
+        <translation type="vanished">Управлять списком материалов выкройки</translation>
+    </message>
+    <message>
+        <source>Manage</source>
+        <translation type="vanished">Управление</translation>
+    </message>
+    <message>
+        <source>The customer name from individual measurements</source>
+        <translation type="vanished">Имя клиента из индивидуальных мерок</translation>
+    </message>
     <message>
         <source>Label language:</source>
         <translation>Язык метки точки:</translation>
     </message>
+    <message>
+        <source>yyyy-MM-dd</source>
+        <translation type="obsolete">гггг-мм-дд</translation>
+    </message>
     <message>
         <source>Passmark length:</source>
-        <translation>Длина надсечек:</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -5335,11 +5403,11 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Acute angle that looks inside of piece</source>
-        <translation>Острый угол, который смотрит внутрь детали</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Acute angle that looks outside of piece</source>
-        <translation>Острый угол, который смотрит наружу детали</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>V mark 2</source>
@@ -5572,7 +5640,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Инструмент</translation>
+        <translation type="unfinished">Инструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5671,7 +5739,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Инструмент</translation>
+        <translation type="unfinished">Инструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5766,7 +5834,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Инструмент</translation>
+        <translation type="unfinished">Инструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5801,7 +5869,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Select point for Y value (horizontal)</source>
-        <translation>Выберите точку по горизонтали</translation>
+        <translation>Выберите точку по горозинтали</translation>
     </message>
     <message>
         <source>Point label:</source>
@@ -5825,7 +5893,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Инструмент</translation>
+        <translation type="unfinished">Инструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5892,7 +5960,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Инструмент</translation>
+        <translation type="unfinished">Инструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6007,7 +6075,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Инструмент</translation>
+        <translation type="unfinished">Инструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6054,7 +6122,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Инструмент</translation>
+        <translation type="unfinished">Инструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6062,19 +6130,19 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Curve 1</source>
-        <translation>Кривая 1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alias1:</source>
-        <translation>Псевдоним 1:</translation>
+        <translation type="unfinished">Псевдоним 1:</translation>
     </message>
     <message>
         <source>Alias2:</source>
-        <translation>Псевдоним 2:</translation>
+        <translation type="unfinished">Псевдоним 2:</translation>
     </message>
     <message>
         <source>Curve 2</source>
-        <translation>Кривая 2</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -6104,35 +6172,58 @@ Apply settings anyway?</source>
         </translation>
     </message>
 </context>
+<context>
+    <name>DialogPuzzlePreferences</name>
+    <message>
+        <source>Puzzle preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished">Настройки</translation>
+    </message>
+    <message>
+        <source>Paths</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>Followed %n option(s) require restart to take effect: %1.</source>
+        <translation type="unfinished">
+            <numerusform>Следующий %n параметр требует перезапуск, чтобы вступить в силу: %1.</numerusform>
+            <numerusform>Следующие %n параметры требуют перезапуск, чтобы вступить в силу: %1.</numerusform>
+            <numerusform>Следующие %n параметров требуют перезапуск, чтобы вступить в силу: %1.</numerusform>
+        </translation>
+    </message>
+</context>
 <context>
     <name>DialogRestrictDimension</name>
     <message>
         <source>Restrict dimension</source>
-        <translation>Ограничить измерение</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dimension A:</source>
-        <translation>Измерение A:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restriction</source>
-        <translation>Ограничение</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Min:</source>
-        <translation>Мин:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Max:</source>
-        <translation>Макс:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Exclude</source>
-        <translation>Исключить</translation>
+        <translation type="unfinished">Исключить</translation>
     </message>
     <message>
         <source>Include</source>
-        <translation>Включить</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -6217,10 +6308,6 @@ Apply settings anyway?</source>
         <source>Tool</source>
         <translation>Инструмент</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation>Заметки</translation>
-    </message>
     <message>
         <source>Alias</source>
         <translation>Псевдоним</translation>
@@ -6237,6 +6324,10 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation>Готово</translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation>Заметки</translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation>Неправильный суффикс</translation>
@@ -6477,7 +6568,11 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Numerical control</source>
-        <translation>Числовое управление</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Raw Layout Data</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -6708,106 +6803,106 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>The customer name from individual measurements</source>
-        <translation>Имя клиента из индивидуальных мерок</translation>
+        <translation type="unfinished">Имя клиента из индивидуальных мерок</translation>
     </message>
     <message>
         <source>The customer email from individual measurements</source>
-        <translation>Электронная почта клиента с индивидуальными мерками</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The customer birth date from individual measurements</source>
-        <translation>Дата рождения клиента с индивидуальными мерками</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save label data.</source>
-        <translation>Сохранить данные метки.</translation>
+        <translation type="unfinished">Сохранить данные метки.</translation>
     </message>
     <message>
         <source>Label data were changed. Do you want to save them before editing label template?</source>
-        <translation>Данные метки были изменены. Вы хотите сохранить их перед редактированием шаблона метки?</translation>
+        <translation type="unfinished">Данные метки были изменены. Вы хотите сохранить их перед редактированием шаблона метки?</translation>
     </message>
 </context>
 <context>
     <name>DialogSetupMultisize</name>
     <message>
         <source>Setup multisize measurements</source>
-        <translation>Настройка мультиразмерных мерок</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use full circumference</source>
-        <translation>Использовать полный обхват</translation>
-    </message>
-    <message>
-        <source>Min value:</source>
-        <translation>Минимальное значение:</translation>
-    </message>
-    <message>
-        <source>Minimal value described in the column</source>
-        <translation>Минимальное значение, указанное в колонке</translation>
-    </message>
-    <message>
-        <source>Max value:</source>
-        <translation>Максимальное значение:</translation>
-    </message>
-    <message>
-        <source>Maximal value described in the column</source>
-        <translation>Максимальное значение, указанное в колонке</translation>
-    </message>
-    <message>
-        <source>Step:</source>
-        <translation>Шаг:</translation>
-    </message>
-    <message>
-        <source>Single-step between the column values</source>
-        <translation>Шаг между значениями в колонке</translation>
-    </message>
-    <message>
-        <source>Base:</source>
-        <translation>База:</translation>
-    </message>
-    <message>
-        <source>The base value for the column</source>
-        <translation>Базовое значение колонки</translation>
-    </message>
-    <message>
-        <source>Circumference</source>
-        <translation>Обхват</translation>
-    </message>
-    <message>
-        <source>Please, provide correct data for dimensions</source>
-        <translation>Пожалуйста, укажите правильные данные для измерений</translation>
-    </message>
-    <message>
-        <source>Please, select at least one dimension</source>
-        <translation>Пожалуйста, выберите хотя бы одно измерение</translation>
-    </message>
-    <message>
-        <source>No more than 3 dimensions allowed</source>
-        <translation>Допускается не более 3 измерений</translation>
-    </message>
-    <message>
-        <source>Ready</source>
-        <translation>Готово</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Рост</translation>
+        <translation type="unfinished">Высота</translation>
+    </message>
+    <message>
+        <source>Min value:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimal value described in the column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max value:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maximal value described in the column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Step:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Single-step between the column values</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Base:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The base value for the column</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Размер</translation>
+        <translation type="unfinished">Размер</translation>
+    </message>
+    <message>
+        <source>Circumference</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Waist</source>
         <comment>dimension</comment>
-        <translation>Талия</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hip</source>
         <comment>dimension</comment>
-        <translation>Бёдра</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, provide correct data for dimensions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, select at least one dimension</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No more than 3 dimensions allowed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ready</source>
+        <translation type="unfinished">Готово</translation>
     </message>
 </context>
 <context>
@@ -6918,7 +7013,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Инструмент</translation>
+        <translation type="unfinished">Инструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6961,7 +7056,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Инструмент</translation>
+        <translation type="unfinished">Инструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -7110,14 +7205,14 @@ Apply settings anyway?</source>
         <source>Tool</source>
         <translation>Инструмент</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation>Заметки</translation>
-    </message>
     <message>
         <source>Alias:</source>
         <translation>Псевдоним:</translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation>Заметки</translation>
+    </message>
 </context>
 <context>
     <name>DialogSplinePath</name>
@@ -7269,14 +7364,14 @@ Apply settings anyway?</source>
         <source>Tool</source>
         <translation>Инструмент</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation>Заметки</translation>
-    </message>
     <message>
         <source>Alias:</source>
         <translation>Псевдоним:</translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation>Заметки</translation>
+    </message>
 </context>
 <context>
     <name>DialogTapePreferences</name>
@@ -7294,9 +7389,9 @@ Apply settings anyway?</source>
     </message>
     <message numerus="yes">
         <source>Followed %n option(s) require restart to take effect: %1.</source>
-        <translation>
+        <translation type="unfinished">
             <numerusform>Следующий %n параметр требует перезапуск, чтобы вступить в силу: %1.</numerusform>
-            <numerusform>Следующие %n параметра требуют перезапуск, чтобы вступить в силу: %1.</numerusform>
+            <numerusform>Следующие %n параметры требуют перезапуск, чтобы вступить в силу: %1.</numerusform>
             <numerusform>Следующие %n параметров требуют перезапуск, чтобы вступить в силу: %1.</numerusform>
         </translation>
     </message>
@@ -7460,7 +7555,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Инструмент</translation>
+        <translation type="unfinished">Инструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -7571,7 +7666,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Инструмент</translation>
+        <translation type="unfinished">Инструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -7645,7 +7740,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Retain original pieces</source>
-        <translation>Сохранить оригинальные детали</translation>
+        <translation>Сохранить оригинальную выкройку</translation>
     </message>
 </context>
 <context>
@@ -7680,7 +7775,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>New %1 test version is now available. Would you like to download it now?</source>
-        <translation>Новая тестовая версия %1 доступна для скачивания. Хотите скачать ее сейчас?</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7825,51 +7920,51 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Set base for dimension A in the table units.</source>
-        <translation>Установите базу для измерения A в единицах измерения таблицы.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The dimension A base</source>
-        <translation>Измерение А - база</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set base for dimension B in the table units.</source>
-        <translation>Установите базу для измерения B в единицах измерения таблицы.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The dimension B base</source>
-        <translation>Измерение B - база</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set base for dimension C in the table units.</source>
-        <translation>Установите базу для измерения C в единицах измерения таблицы.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The dimension C base</source>
-        <translation>Измерение C - база</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set pattern file units: cm, mm, inch.</source>
-        <translation>Установите единицу измерения файла выкройки: см, мм, дюйм.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The pattern units</source>
-        <translation>Единицы измерения выкройки</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid dimension A base value.</source>
-        <translation>Недопустимое базовое значение измерения A.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid dimension B base value.</source>
-        <translation>Недопустимое базовое значение измерения В.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid dimension C base value.</source>
-        <translation>Недопустимое базовое значение измерения С.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Formula warning: %1. Program will be terminated.</source>
-        <translation>Предупреждение в формуле: %1. Программа будет завершена.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -8032,7 +8127,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Save not yet saved pattern</source>
-        <translation>Сохранить еще несохраненную выкройку</translation>
+        <translation>Сохранить еще не сохраненную выкройку</translation>
     </message>
     <message>
         <source>Draw</source>
@@ -8309,7 +8404,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>This file already opened in another window.</source>
-        <translation>Этот файл уже открыт в другом окне.</translation>
+        <translation type="vanished">Этот файл уже открыт в другом окне.</translation>
     </message>
     <message>
         <source>Wrong units.</source>
@@ -8329,7 +8424,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Valentina didn&apos;t shut down correctly. Do you want reopen files (%1) you had open?</source>
-        <translation>Valentina не была закрыта корректно. Вы хотите восстановить файлы (%1) которые были открыты раньше?</translation>
+        <translation>Валентина не была закрыта корректно. Вы хотите восстановить файлы (%1) которые былы открыты раньше?</translation>
     </message>
     <message>
         <source>Reopen files.</source>
@@ -8565,7 +8660,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Show ...</source>
-        <translation type="vanished">Показать ...</translation>
+        <translation type="vanished">Показать...</translation>
     </message>
     <message>
         <source>Show measurements</source>
@@ -8614,7 +8709,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Failed to lock. This file already opened in another window. Expect collissions when run 2 copies of the program.</source>
-        <translation>Невозможно заблокировать. Этот файл уже открыт в другом окне. Возможны конфликты, если одновременно запущено 2 окна программы.</translation>
+        <translation>Невозможно заблокировать. Этот файл уже открыт в другом окне. Возможны конфликты, если одновременно запущено несколько экземпляров программы.</translation>
     </message>
     <message>
         <source>Measurement file contains invalid known measurement(s).</source>
@@ -8762,27 +8857,27 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Locking file</source>
-        <translation>Блокировка файла</translation>
+        <translation type="vanished">Блокировка файла</translation>
     </message>
     <message>
         <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Этот файл уже открыт в другом окне. Игнорируйте, если вы хотите продолжить (не рекомендуется, может привести к повреждению данных).</translation>
+        <translation type="vanished">Этот файл уже открыт в другом окне. Игнорируйте, если вы хотите продолжить (не рекомендуется, может привести к повреждению данных).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Файл блокировки не может быть создан из-за отсутствия разрешений. Игнорируйте, если вы хотите продолжить (не рекомендуется, может привести к повреждению данных).</translation>
+        <translation type="vanished">Файл блокировки не может быть создан из-за отсутствия разрешений. Игнорируйте, если вы хотите продолжить (не рекомендуется, может привести к повреждению данных).</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Произошла неизвестная ошибка, например, полностью заполненный раздел предотвращает запись файла блокировки. Игнорируйте, если вы хотите продолжить (не рекомендуется, может привести к повреждению данных).</translation>
+        <translation type="vanished">Произошла неизвестная ошибка, например, полностью заполненный раздел предотвращает запись файла блокировки. Игнорируйте, если вы хотите продолжить (не рекомендуется, может привести к повреждению данных).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions.</source>
-        <translation>Файл блокировки не может быть создан, не хватает прав доступа.</translation>
+        <translation type="vanished">Файл блокировки не может быть создан, не хватает прав доступа.</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation>Произошла неизвестная ошибка, например, полностью заполненный раздел предотвращает запись файла блокировки.</translation>
+        <translation type="vanished">Произошла неизвестная ошибка, например, полностью заполненный раздел предотвращает запись файла блокировки.</translation>
     </message>
     <message>
         <source>Report Bug...</source>
@@ -8942,15 +9037,15 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>The document has no write permissions.</source>
-        <translation>Документ не имеет прав на запись.</translation>
+        <translation type="vanished">Документ не имеет прав на запись.</translation>
     </message>
     <message>
         <source>Cannot set permissions for %1 to writable.</source>
-        <translation>Невозможно установить разрешения для %1 для записи.</translation>
+        <translation type="vanished">Невозможно установить разрешения для %1 для записи.</translation>
     </message>
     <message>
         <source>Could not save the file.</source>
-        <translation>Не удалось сохранить файл.</translation>
+        <translation type="vanished">Не удалось сохранить файл.</translation>
     </message>
     <message>
         <source>Could not save the file</source>
@@ -9096,6 +9191,14 @@ Do you want to save your changes?</source>
         <source>Can&apos;t export details.</source>
         <translation>Невозможно экспортировать детали.</translation>
     </message>
+    <message>
+        <source>Couldn&apos;t set size. Need a file with multisize measurements.</source>
+        <translation type="vanished">Невозможно установить размер. Нужен файл мультиразмерных мерок.</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t set height. Need a file with multisize measurements.</source>
+        <translation type="vanished">Невозможно установить рост. Необходим файл мультиразмерных мерок.</translation>
+    </message>
     <message>
         <source>Label template editor</source>
         <translation>Редактор шаблона метки</translation>
@@ -9202,7 +9305,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Cannot read settings from a malformed .INI file.</source>
-        <translation>Невозможно прочитать настройки из некорректного .INI файла.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select path objects, &lt;b&gt;%1&lt;/b&gt; - reverse direction curve</source>
@@ -9258,7 +9361,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Curved path tool which uses point as control handle</source>
-        <translation>Инструмент сложная кривая, которая использует точки чертежа как контрольные точки</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Point of intersection arc and axis</source>
@@ -9270,7 +9373,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Globally show pieces main path</source>
-        <translation>На глобальном уровне показать основной контур деталей</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pattern messages</source>
@@ -9336,64 +9439,88 @@ Do you want to save your changes?</source>
         <source>Watermark files</source>
         <translation>Файлы водяных знаков</translation>
     </message>
+    <message>
+        <source>Manual Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open the Puzzle app</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished">Обновление</translation>
+    </message>
+    <message>
+        <source>Update manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Do you want to change the premissions?</source>
-        <translation>Вы хотите изменить права?</translation>
+        <translation type="obsolete">Вы хотите изменить настройки?</translation>
+    </message>
+    <message>
+        <source>Unable to prepare raw layout data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select manual layout</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not supported dimension A value &apos;%1&apos; for this pattern file.</source>
-        <translation>Не поддерживаемое значение измерения А &quot;%1&quot; для данного файла выкройки.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t set dimension A. Need a file with multisize measurements.</source>
-        <translation>Не удалось установить измерение A. Нужен файл с мультиразмерными мерками.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t set dimension A. File wasn&apos;t opened.</source>
-        <translation>Не удалось установить измерение A. Файл не открыт.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not supported dimension B value &apos;%1&apos; for this pattern file.</source>
-        <translation>Не поддерживаемое значение измерения B &quot;%1&quot; для данного файла выкройки.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t set dimension B. Need a file with multisize measurements.</source>
-        <translation>Не удалось установить измерение B. Нужен файл с мультиразмерными мерками.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t set dimension B. File wasn&apos;t opened.</source>
-        <translation>Не удалось установить измерение B. Файл не открыт.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not supported dimension C value &apos;%1&apos; for this pattern file.</source>
-        <translation>Не поддерживаемое значение измерения C &quot;%1&quot; для данного файла выкройки.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t set dimension C. Need a file with multisize measurements.</source>
-        <translation>Не удалось установить измерение C. Нужен файл с мультиразмерными мерками.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t set dimension C. File wasn&apos;t opened.</source>
-        <translation>Не удалось установить измерение C. Файл не открыт.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not create recipe file. %1</source>
-        <translation>Не удалось создать файл рецепта. %1</translation>
-    </message>
-    <message>
-        <source>Shop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scalable Vector Graphics files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save draw</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw export</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -9535,6 +9662,14 @@ Do you want to save your changes?</source>
         <source>Measurement file contains invalid known measurement(s).</source>
         <translation>Файл мерок содержит неправильные мерки.</translation>
     </message>
+    <message>
+        <source>Wrong units.</source>
+        <translation type="vanished">Неправильные единицы измерения.</translation>
+    </message>
+    <message>
+        <source>Application doesn&apos;t support multisize table with inches.</source>
+        <translation type="vanished">Приложение не поддерживает мультиразмерную таблицу в дюймах.</translation>
+    </message>
     <message>
         <source>File error.</source>
         <translation>Ошибка файла.</translation>
@@ -9555,10 +9690,30 @@ Do you want to save your changes?</source>
         <source>Timeout.</source>
         <translation>Закончилось время.</translation>
     </message>
+    <message>
+        <source>Cannot set printer page size</source>
+        <translation type="vanished">Невозможно установить размер страницы принтера</translation>
+    </message>
+    <message>
+        <source>Cannot set custom printer page size</source>
+        <translation type="vanished">Невозможно установить пользовательский размер страницы принтера</translation>
+    </message>
     <message>
         <source>Process has been stoped because of exception.</source>
         <translation>Процесс был остановлен из-за исключения.</translation>
     </message>
+    <message>
+        <source>File error.
+
+%1
+
+%2</source>
+        <translation type="vanished">Ошибка файла.
+
+%1
+
+%2</translation>
+    </message>
 </context>
 <context>
     <name>MoveDoubleLabel</name>
@@ -9621,7 +9776,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Path that use Valentina</source>
-        <translation type="vanished">Путь, что использует Valentina</translation>
+        <translation type="vanished">Путь, что использует Валентина</translation>
     </message>
     <message>
         <source>Default</source>
@@ -9898,15 +10053,15 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Change the position of the tool panel to optimize for big screen resolutions. By default, the tool panel will take all available space.</source>
-        <translation>Измените положение панели инструментов, чтобы оптимизировать место для больших разрешений экрана. По умолчанию панель инструментов займет все доступное пространство.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tool panel scaling</source>
-        <translation>Масштабирование панели инструментов</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t use the native file dialog</source>
-        <translation>Не использовать родной диалог файлов</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -9959,6 +10114,10 @@ Do you want to save your changes?</source>
         <source>My label templates</source>
         <translation>Мои шаблоны меток</translation>
     </message>
+    <message>
+        <source>My manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PreferencesPatternPage</name>
@@ -10101,6 +10260,111 @@ This option will take an affect after restart.</source>
         <translation>рендер сцены</translation>
     </message>
 </context>
+<context>
+    <name>Puzzle</name>
+    <message>
+        <source>Export options can be used with single input file only.</source>
+        <translation type="unfinished">Параметры экспорта могут использоваться только с одним входным файлом.</translation>
+    </message>
+    <message>
+        <source>Valentina&apos;s manual layout editor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The manual layout file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesConfigurationPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished">Форма</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished">Язык</translation>
+    </message>
+    <message>
+        <source>GUI language:</source>
+        <translation type="unfinished">Язык интерфейса:</translation>
+    </message>
+    <message>
+        <source>Toolbar</source>
+        <translation type="unfinished">Панель инструментов</translation>
+    </message>
+    <message>
+        <source>The text appears under the icon (recommended for beginners).</source>
+        <translation type="unfinished">Текст отображается под иконками (рекомендуется для начинающих).</translation>
+    </message>
+    <message>
+        <source>User Interface</source>
+        <translation type="unfinished">Пользовательский интерфейс</translation>
+    </message>
+    <message>
+        <source>Activate dark mode</source>
+        <translation type="unfinished">Активировать тёмный режим</translation>
+    </message>
+    <message>
+        <source>Don&apos;t use the native file dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dark mode</source>
+        <translation type="unfinished">тёмный режим</translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesPathPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished">Форма</translation>
+    </message>
+    <message>
+        <source>Paths that Valentina uses</source>
+        <translation type="unfinished">Пути, что использует Валентина</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished">Тип</translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished">По умолчанию</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Individual Measurements</source>
+        <translation type="unfinished">Мои индивидуальные мерки</translation>
+    </message>
+    <message>
+        <source>My Multisize Measurements</source>
+        <translation type="unfinished">Мои мультиразмерные мерки</translation>
+    </message>
+    <message>
+        <source>My Patterns</source>
+        <translation type="unfinished">Мои выкройки</translation>
+    </message>
+    <message>
+        <source>My Templates</source>
+        <translation type="unfinished">Мои шаблоны</translation>
+    </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished">Мои раскладки</translation>
+    </message>
+</context>
 <context>
     <name>QApplication</name>
     <message>
@@ -10163,75 +10427,75 @@ This option will take an affect after restart.</source>
     </message>
     <message>
         <source>VLayoutPassmark prefix mismatch error: actualStreamHeader = 0x%1 and streamHeader = 0x%2</source>
-        <translation>Ошибка несовпадения префикса VLayoutPassmark: actualStreamHeader = 0x%1 и streamHeader = 0x%2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VLayoutPassmark compatibility error: actualClassVersion = %1 and classVersion = %2</source>
-        <translation>Ошибка совместимости VLayoutPassmark: actualClassVersion = %1 и classVersion = %2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VLayoutPlaceLabel prefix mismatch error: actualStreamHeader = 0x%1 and streamHeader = 0x%2</source>
-        <translation>Ошибка несовпадения префикса VLayoutPlaceLabel: actualStreamHeader = 0x%1 и streamHeader = 0x%2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VLayoutPlaceLabel compatibility error: actualClassVersion = %1 and classVersion = %2</source>
-        <translation>Ошибка совместимости VLayoutPlaceLabel: actualClassVersion = %1 и classVersion = %2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VAbstractPieceData prefix mismatch error: actualStreamHeader = 0x%1 and streamHeader = 0x%2</source>
-        <translation>Ошибка несовпадения префикса VAbstractPieceData: actualStreamHeader = 0x%1 и streamHeader = 0x%2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VAbstractPieceData compatibility error: actualClassVersion = %1 and classVersion = %2</source>
-        <translation>Ошибка совместимости VAbstractPieceData: actualClassVersion = %1 и classVersion = %2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VRawLayoutData prefix mismatch error: actualStreamHeader = 0x%1 and streamHeader = 0x%2</source>
-        <translation>Ошибка несовпадения префикса VRawLayoutData: actualStreamHeader = 0x%1 и streamHeader = 0x%2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VRawLayoutData compatibility error: actualClassVersion = %1 and classVersion = %2</source>
-        <translation>Ошибка совместимости VRawLayoutData: actualClassVersion = %1 и classVersion = %2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VLayoutPiecePathData prefix mismatch error: actualStreamHeader = 0x%1 and streamHeader = 0x%2</source>
-        <translation>Ошибка несовпадения префикса VLayoutPiecePathData: actualStreamHeader = 0x%1 и streamHeader = 0x%2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VLayoutPiecePathData compatibility error: actualClassVersion = %1 and classVersion = %2</source>
-        <translation>Ошибка совместимости VLayoutPiecePathData: actualClassVersion = %1, а classVersion = %2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLine prefix mismatch error: actualStreamHeader = 0x%1 and streamHeader = 0x%2</source>
-        <translation>Ошибка несовпадения префикса TextLine: actualStreamHeader = 0x%1 и streamHeader = 0x%2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLine compatibility error: actualClassVersion = %1 and classVersion = %2</source>
-        <translation>Ошибка совместимости TextLine: actualClassVersion = %1 и classVersion = %2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VTextManager prefix mismatch error: actualStreamHeader = 0x%1 and streamHeader = 0x%2</source>
-        <translation>Ошибка несовпадения префикса VTextManager: actualStreamHeader = 0x%1 и streamHeader = 0x%2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VTextManager compatibility error: actualClassVersion = %1 and classVersion = %2</source>
-        <translation>Ошибка совместимости VTextManager: actualClassVersion = %1 и classVersion = %2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CustomSARecord prefix mismatch error: actualStreamHeader = 0x%1 and streamHeader = 0x%2</source>
-        <translation>Ошибка несоответствия префикса CustomSARecord: actualStreamHeader = 0x%1 и streamHeader = 0x%2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CustomSARecord compatibility error: actualClassVersion = %1 and classVersion = %2</source>
-        <translation>Ошибка совместимости CustomSARecord: actualClassVersion = %1 и classVersion = %2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VPieceNodeData prefix mismatch error: actualStreamHeader = 0x%1 and streamHeader = 0x%2</source>
-        <translation>Ошибка несовпадения префикса VPieceNodeData: actualStreamHeader = 0x%1 и streamHeader = 0x%2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VPieceNodeData compatibility error: actualClassVersion = %1 and classVersion = %2</source>
-        <translation>Ошибка совместимости VPieceNodeData: actualClassVersion = %1 и classVersion = %2</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -10360,15 +10624,15 @@ This option will take an affect after restart.</source>
     </message>
     <message>
         <source>Cannot calculate a notch for point &apos;%1&apos; in piece &apos;%2&apos;. Notch collapse.</source>
-        <translation>Невозможно рассчитать надсечку для точки &quot;%1&quot; в детали &quot;%2&quot;. Тип ошибки - коллапс надсечки.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot calculate a notch for point &apos;%1&apos; in piece &apos;%2&apos;. Cannot find intersection.</source>
-        <translation>Невозможно рассчитать надсечку для точки &quot;%1&quot; в части &quot;%2&quot;. Нет пересечения.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot get tokens from formula &apos;%1&apos;. Parser error: %2.</source>
-        <translation>Не могу получить токены из формулы &quot;%1&quot;. Ошибка парсера: %2.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
@@ -10396,7 +10660,7 @@ This option will take an affect after restart.</source>
     </message>
     <message>
         <source>Piece &apos;%1&apos; has invalid layout allowance. Please, check seam allowance to check how seam allowance behave.</source>
-        <translation>Деталь &apos;%1&apos; имеет недействительный припуск на раскладку. Пожалуйста, проверьте припуск на шов, чтобы проверить, как ведет себя припуск на шов.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Piece &apos;%1&apos;. Seam allowance is not valid.</source>
@@ -10432,11 +10696,11 @@ This option will take an affect after restart.</source>
     </message>
     <message>
         <source>Cannot cast tool with id &apos;%1&apos;.</source>
-        <translation>Невозможно преобразовать инструмент с id &apos;%1&apos;.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Empty list of nodes for tool with id &apos;%1&apos;.</source>
-        <translation>Пустой список узлов для инструмента с id &apos;%1&apos;.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid formula &apos;%1&apos; for tool with id &apos;%2&apos;. %3.</source>
@@ -10444,79 +10708,87 @@ This option will take an affect after restart.</source>
     </message>
     <message>
         <source>Can&apos;t convert toInt parameter</source>
-        <translation>Не может преобразовать параметр toInt</translation>
-    </message>
-    <message>
-        <source>Could not find the segment start.</source>
-        <translation>Не удалось найти начало сегмента.</translation>
-    </message>
-    <message>
-        <source>Could not find the segment end.</source>
-        <translation>Не удалось найти конец сегмента.</translation>
-    </message>
-    <message>
-        <source>Segment is too short.</source>
-        <translation>Сегмент слишком короткий.</translation>
-    </message>
-    <message>
-        <source>Error calculating segment for curve &apos;%1&apos;. %2</source>
-        <translation>Ошибка расчёта сегмента для кривой &apos;%1&apos;. %2</translation>
-    </message>
-    <message>
-        <source>Cannot prepare builtin passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
-        <translation>Невозможно подготовить встроенную надсечку &apos;%1&apos; для детали &apos;%2&apos;. Надсечка пуста.</translation>
-    </message>
-    <message>
-        <source>Cannot prepare builtin  passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark base line is empty.</source>
-        <translation>Невозможно приготовить встроенную надсечку &apos;%1&apos; для детали &apos;%2&apos;. Базовая линия надсечки пуста.</translation>
-    </message>
-    <message>
-        <source>Cannot prepare passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark base line is empty.</source>
-        <translation>Невозможно приготовить надсечку &apos;%1&apos; для детали &apos;%2&apos;. Базовая линия надсечки пуста.</translation>
-    </message>
-    <message>
-        <source>Cannot prepare passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
-        <translation>Невозможно приготовить надсечку &apos;%1&apos; для детали &apos;%2&apos;. Надсечка пустая.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Piece name &apos;%1&apos; is not unique.</source>
-        <translation>Имя детали &quot;%1&quot; не уникальное.</translation>
+        <translation type="unfinished">Имя детали &quot;%1&quot; не уникальное.</translation>
+    </message>
+    <message>
+        <source>Could not find the segment start.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not find the segment end.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Segment is too short.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error calculating segment for curve &apos;%1&apos;. %2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
-        <translation>Ошибка в кривой &quot;%1&quot;. Не удалось вычислить сегмент для кривой &apos;%2&apos;. %3</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot prepare builtin passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot prepare builtin  passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark base line is empty.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot prepare passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark base line is empty.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot prepare passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot get tokens from formula &apos;%1&apos;. Formula error: %2.</source>
-        <translation>Не могу получить токены из формулы &quot;%1&quot;. Ошибка формулы: %2.</translation>
-    </message>
-    <message>
-        <source>No data for the height dimension.</source>
-        <translation>Нет данных для измерения рост.</translation>
-    </message>
-    <message>
-        <source>No data for the size dimension.</source>
-        <translation>Нет данных для измерения размер.</translation>
-    </message>
-    <message>
-        <source>No data for the hip dimension.</source>
-        <translation>Нет данных для измерения бёдра.</translation>
-    </message>
-    <message>
-        <source>No data for the waist dimension.</source>
-        <translation>Нет данных для измерения Талия.</translation>
-    </message>
-    <message>
-        <source>Piece &apos;%1&apos;. Grainline is not valid.</source>
-        <translation>Деталь &quot;%1&quot;. Долевая линия неправильная.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
-        <translation>Не удалось подготовить заполнитель для финального измерения. Ошибка синтаксического анализатора в строке %1: %2.</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the height dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the size dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the hip dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the waist dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Piece &apos;%1&apos;. Grainline is not valid.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
-        <translation>Недопустимое глобальное значение длины надсечек. Деталь &quot;%1&quot;. Длина меньше минимально допустимой.</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unplaced pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet 1</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -10815,7 +11087,7 @@ This option will take an affect after restart.</source>
     <name>TMainWindow</name>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:18pt;&quot;&gt;Select New for creation measurement file.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:18pt;&quot;&gt;Выберите Новый для создания файла мерок.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:18pt;&quot;&gt;Выберите Новый для создания файла мерок.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <source>Name</source>
@@ -11019,7 +11291,7 @@ This option will take an affect after restart.</source>
     </message>
     <message>
         <source>Open standard ...</source>
-        <translation type="vanished">Открыть стандартные ...</translation>
+        <translation type="vanished">Открыть стандартные...</translation>
     </message>
     <message>
         <source>Open template</source>
@@ -11111,7 +11383,7 @@ This option will take an affect after restart.</source>
     </message>
     <message>
         <source>untitled</source>
-        <translation type="vanished">безымянный</translation>
+        <translation>безымянный</translation>
     </message>
     <message>
         <source>&lt;Empty&gt;</source>
@@ -11189,7 +11461,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Failed to lock. This file already opened in another window. Expect collissions when run 2 copies of the program.</source>
-        <translation>Невозможно заблокировать. Этот файл уже открыт в другом окне. Возможны конфликты, если одновременно запущено 2 окна программы.</translation>
+        <translation>Невозможно заблокировать. Этот файл уже открыт в другом окне. Возможны конфликты, если одновременно запущено несколько экземпляров программы.</translation>
     </message>
     <message>
         <source>File contains invalid known measurement(s).</source>
@@ -11229,7 +11501,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>The full name of known measurement forbidden to change.</source>
-        <translation>Нельзя изменить полное имя известной мерки.</translation>
+        <translation>Нельзя изменить полное название известной мерки.</translation>
     </message>
     <message>
         <source>Name in formula</source>
@@ -11348,27 +11620,27 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Locking file</source>
-        <translation>Файл блокировки</translation>
+        <translation type="vanished">Файл блокировки</translation>
     </message>
     <message>
         <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Этот файл уже открыт в другом окне. Игнорируйте, если вы хотите продолжить (не рекомендуется, может привести к повреждению данных).</translation>
+        <translation type="vanished">Этот файл уже открыт в другом окне. Игнорируйте, если вы хотите продолжить (не рекомендуется, может привести к повреждению данных).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Файл блокировки не может быть создан из-за отсутствия разрешений. Игнорируйте, если вы хотите продолжить (не рекомендуется, может привести к повреждению данных).</translation>
+        <translation type="vanished">Файл блокировки не может быть создан из-за отсутствия разрешений. Игнорируйте, если вы хотите продолжить (не рекомендуется, может привести к повреждению данных).</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Произошла неизвестная ошибка, например, полностью заполненный раздел предотвращает запись файла блокировки. Игнорируйте, если вы хотите продолжить (не рекомендуется, может привести к повреждению данных).</translation>
+        <translation type="vanished">Произошла неизвестная ошибка, например, полностью заполненный раздел предотвращает запись файла блокировки. Игнорируйте, если вы хотите продолжить (не рекомендуется, может привести к повреждению данных).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions.</source>
-        <translation>Файл блокировки не может быть создан, не хватает прав доступа.</translation>
+        <translation type="vanished">Файл блокировки не может быть создан, не хватает прав доступа.</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation>Произошла неизвестная ошибка, например, полностью заполненный раздел предотвращает запись lock файла.</translation>
+        <translation type="vanished">Произошла неизвестная ошибка, например, полностью заполненный раздел предотвращает запись lock файла.</translation>
     </message>
     <message>
         <source>Export to CSV</source>
@@ -11416,15 +11688,15 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>The measurements document has no write permissions.</source>
-        <translation>Документ мерок не имеет прав на запись.</translation>
+        <translation type="vanished">Документ мерок не имеет прав на запись.</translation>
     </message>
     <message>
         <source>Cannot set permissions for %1 to writable.</source>
-        <translation>Невозможно установить разрешения для %1 для записи.</translation>
+        <translation type="vanished">Невозможно установить разрешения для %1 для записи.</translation>
     </message>
     <message>
         <source>Could not save the file.</source>
-        <translation>Не удалось сохранить файл.</translation>
+        <translation type="vanished">Не удалось сохранить файл.</translation>
     </message>
     <message>
         <source>Could not save the file</source>
@@ -11498,6 +11770,18 @@ Do you want to save your changes?</source>
         <source>Multisize measurements require at least 4 columns.</source>
         <translation>Мультиразмерные мерки требуют как минимум 4 колонки.</translation>
     </message>
+    <message>
+        <source>Cannot convert base size value to double in column 2.</source>
+        <translation type="vanished">Невозможно конвертировать значение базового размера для дублирования в колонку 2.</translation>
+    </message>
+    <message>
+        <source>Cannot convert height increase value to double in column 3.</source>
+        <translation type="vanished">Невозможно конвертировать значение увеличения роста для дублирования в колонку 3.</translation>
+    </message>
+    <message>
+        <source>Cannot convert size increase value to double in column 4.</source>
+        <translation type="vanished">Невозможно конвертировать значение увеличения размера для дублирования в колонку 4.</translation>
+    </message>
     <message>
         <source>Imported file must not contain the same name twice.</source>
         <translation>Импортируемый файл не должен содержать то же самое имя дважды.</translation>
@@ -11552,164 +11836,168 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Search measurements by term. &lt;/p&gt;&lt;p&gt;Prepend &amp;quot;/r/&amp;quot; to the front of the search string to search measurements by regex.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Поиск мерок по ключевым параметрам. &lt;/p&gt;&lt;p&gt; Прибавьте &amp;quot;/r/&amp;quot; к передней части строки поиска для поиска мерок по регулярному выражению. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to change the premissions?</source>
-        <translation>Вы хотите изменить права?</translation>
+        <translation type="vanished">Вы хотите изменить настройки?</translation>
     </message>
     <message>
         <source>Cannot read settings from a malformed .INI file.</source>
-        <translation>Невозможно прочитать настройки из некорректного .INI файла.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Units:</source>
-        <translation>Единицы измерения:</translation>
+        <source>Height (%1):</source>
+        <translation type="vanished">Рост (%1):</translation>
     </message>
     <message>
-        <source>Shift B</source>
-        <translation>Смещение B</translation>
-    </message>
-    <message>
-        <source>Shift C</source>
-        <translation>Смещение C</translation>
-    </message>
-    <message>
-        <source>Correction:</source>
-        <translation>Коррекция:</translation>
-    </message>
-    <message>
-        <source>Dimension:</source>
-        <translation>Измерение:</translation>
-    </message>
-    <message>
-        <source>Select one of the dimensions to later use the measurement value in piece label</source>
-        <translation>Выберите одно из измерений, чтобы в дальнейшем использовать значение мерки в метке детали</translation>
-    </message>
-    <message>
-        <source>Base Values:</source>
-        <translation>Базовые значения:</translation>
-    </message>
-    <message>
-        <source>Export to individual</source>
-        <translation>Экспорт в индивидуальные</translation>
-    </message>
-    <message>
-        <source>Export to individual measurements</source>
-        <translation>Экспорт в индивидуальные мерки</translation>
-    </message>
-    <message>
-        <source>Use full circumference</source>
-        <translation>Использовать полный обхват</translation>
-    </message>
-    <message>
-        <source>Restrict second dimension</source>
-        <translation>Ограничить второе измерение</translation>
-    </message>
-    <message>
-        <source>Restrict third dimension</source>
-        <translation>Ограничить третье измерение</translation>
-    </message>
-    <message>
-        <source>Dimension labels</source>
-        <translation>Псевдонимы измерения</translation>
-    </message>
-    <message>
-        <source>The table doesn&apos;t provide dimensions</source>
-        <translation>В таблице не указаны измерения</translation>
-    </message>
-    <message>
-        <source>Invalid base value for dimension A</source>
-        <translation>Недопустимое базовое значение для измерения A</translation>
-    </message>
-    <message>
-        <source>The table doesn&apos;t support dimension B</source>
-        <translation>Таблица не поддерживает измерение B</translation>
-    </message>
-    <message>
-        <source>Invalid base value for dimension B</source>
-        <translation>Недопустимое базовое значение для измерения B</translation>
-    </message>
-    <message>
-        <source>The table doesn&apos;t support dimension C</source>
-        <translation>Таблица не поддерживает измерение C</translation>
-    </message>
-    <message>
-        <source>Invalid base value for dimension C</source>
-        <translation>Недопустимое базовое значение для измерения C</translation>
-    </message>
-    <message>
-        <source>measurements.vit</source>
-        <translation>мерки.vit</translation>
-    </message>
-    <message>
-        <source>Shift (%1):</source>
-        <translation>Смещение (%1):</translation>
-    </message>
-    <message>
-        <source>%1 shift</source>
-        <translation>Смещение. %1</translation>
-    </message>
-    <message>
-        <source>Cannot convert base value to double in column 2.</source>
-        <translation>Невозможно преобразовать базовое значение в дробное число во втором столбце 2.</translation>
-    </message>
-    <message>
-        <source>Cannot convert shift value to double in column %1.</source>
-        <translation>Невозможно преобразовать значение сдвига в дробное число в столбце %1.</translation>
-    </message>
-    <message>
-        <source>Millimeters</source>
-        <translation>Миллиметры</translation>
-    </message>
-    <message>
-        <source>Inches</source>
-        <translation>Дюймы</translation>
-    </message>
-    <message>
-        <source>Centimeters</source>
-        <translation>Сантиметры</translation>
-    </message>
-    <message>
-        <source>Degrees</source>
-        <translation>Градусы</translation>
+        <source>Size (%1):</source>
+        <translation type="vanished">Размер (%1):</translation>
     </message>
     <message>
         <source>Name</source>
         <comment>measurement column</comment>
-        <translation>Имя</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full name</source>
         <comment>measurement column</comment>
-        <translation>Полное имя</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculated value</source>
         <comment>measurement column</comment>
-        <translation>Рассчитанное значение</translation>
+        <translation type="unfinished">Рассчитанное значение</translation>
     </message>
     <message>
         <source>Formula</source>
         <comment>measurement column</comment>
-        <translation>Формула</translation>
+        <translation type="unfinished">Формула</translation>
     </message>
     <message>
         <source>Base value</source>
         <comment>measurement column</comment>
-        <translation>Базовое значение</translation>
+        <translation type="unfinished">Базовое значение</translation>
     </message>
     <message>
         <source>Correction</source>
         <comment>measurement column</comment>
-        <translation>Коррекция</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Units:</source>
+        <translation type="unfinished">Единицы измерения:</translation>
+    </message>
+    <message>
+        <source>Shift B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Correction:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dimension:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select one of the dimensions to later use the measurement value in piece label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Base Values:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export to individual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export to individual measurements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use full circumference</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restrict second dimension</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restrict third dimension</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dimension labels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The table doesn&apos;t provide dimensions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid base value for dimension A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The table doesn&apos;t support dimension B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid base value for dimension B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The table doesn&apos;t support dimension C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid base value for dimension C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>measurements.vit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift (%1):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot convert base value to double in column 2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot convert shift value to double in column %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Millimeters</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Inches</source>
+        <translation type="unfinished">Дюймы</translation>
+    </message>
+    <message>
+        <source>Centimeters</source>
+        <translation type="unfinished">Сантиметры</translation>
+    </message>
+    <message>
+        <source>Degrees</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restrict first dimension</source>
-        <translation>Ограничить первое измерение</translation>
-    </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:18pt;&quot;&gt;Select New to create a measurement file.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -11782,6 +12070,10 @@ Do you want to save your changes?</source>
         <source>Labels</source>
         <translation>Метки</translation>
     </message>
+    <message>
+        <source>Detail label visible</source>
+        <translation type="vanished">Видимость метки детали</translation>
+    </message>
     <message>
         <source>Width:</source>
         <translation>Ширина:</translation>
@@ -11884,67 +12176,67 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Pattern label data</source>
-        <translation>Данные метки выкройки</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit pattern label</source>
-        <translation>Редактировать метку выкройки</translation>
+        <translation type="unfinished">Редактировать метку выкройки</translation>
     </message>
     <message>
         <source>Pattern name:</source>
-        <translation>Название модели:</translation>
+        <translation type="unfinished">Название модели:</translation>
     </message>
     <message>
         <source>Pattern number:</source>
-        <translation>Номер модели:</translation>
+        <translation type="unfinished">Номер модели:</translation>
     </message>
     <message>
         <source>Company/Designer name:</source>
-        <translation>Название компании / имя разработчика:</translation>
+        <translation type="unfinished">Название компании / имя разработчика:</translation>
     </message>
     <message>
         <source>Customer name:</source>
-        <translation>Имя клиента:</translation>
+        <translation type="unfinished">Имя клиента:</translation>
     </message>
     <message>
         <source>Date format:</source>
-        <translation>Формат даты:</translation>
+        <translation type="unfinished">Формат даты:</translation>
     </message>
     <message>
         <source>Time format:</source>
-        <translation>Формат времени:</translation>
+        <translation type="unfinished">Формат времени:</translation>
     </message>
     <message>
         <source>Customer birth date:</source>
-        <translation>Дата рождения клиента:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>yyyy-MM-dd</source>
-        <translation>гггг-мм-дд</translation>
+        <translation type="unfinished">гггг-мм-дд</translation>
     </message>
     <message>
         <source>Customer email:</source>
-        <translation>Электронная почта клиента:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Materials</source>
-        <translation>Материалы</translation>
+        <translation type="unfinished">Материалы</translation>
     </message>
     <message>
         <source>Pattern materials:</source>
-        <translation>Материалы выкройки:</translation>
+        <translation type="unfinished">Материалы выкройки:</translation>
     </message>
     <message>
         <source>Manage list of pattern materials</source>
-        <translation>Управлять списком материалов выкройки</translation>
+        <translation type="unfinished">Управлять списком материалов выкройки</translation>
     </message>
     <message>
         <source>Manage</source>
-        <translation>Управление</translation>
+        <translation type="unfinished">Управление</translation>
     </message>
     <message>
         <source>Piece label visible</source>
-        <translation>Видимость метки детали</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -12035,7 +12327,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Acute angle that looks outside of piece</source>
-        <translation>Острый угол, который смотрит наружу детали</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>V mark 2</source>
@@ -12079,7 +12371,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Acute angle that looks inside of piece</source>
-        <translation>Острый угол, который смотрит внутрь детали</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -12242,6 +12534,18 @@ Do you want to save your changes?</source>
         <comment>seam allowance</comment>
         <translation>Пользовательская</translation>
     </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Universally Unique IDentifier of piece. Used to identifier piece while updating manual layout. Left empty to generate new value.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TabPlaceLabels</name>
@@ -12250,6 +12554,13 @@ Do you want to save your changes?</source>
         <translation>Диалог</translation>
     </message>
 </context>
+<context>
+    <name>Tape</name>
+    <message>
+        <source>This test build is older than %1 days. To provide you with better quality service we restrict the lifetime you can use a test build. To continue using Tape please update to newer test build. The application will be shut down.</source>
+        <translation type="vanished">Эта тестовая сборка старше %1 дня. Чтобы предоставить вам более качественный сервис, мы ограничиваем срок службы тестовой сборки. Чтобы продолжить использовать Tape, пожалуйста, обновитесь до новой тестовой сборки. Приложение будет закрыто.</translation>
+    </message>
+</context>
 <context>
     <name>TapeConfigDialog</name>
     <message>
@@ -12417,6 +12728,18 @@ Do you want to save your changes?</source>
         <source>The text appears under the icon (recommended for beginners).</source>
         <translation>Текст отображается под иконками (рекомендуется для начинающих).</translation>
     </message>
+    <message>
+        <source>Default height and size</source>
+        <translation type="vanished">Рост и размер по умолчанию</translation>
+    </message>
+    <message>
+        <source>Default height:</source>
+        <translation type="vanished">Рост по умолчанию:</translation>
+    </message>
+    <message>
+        <source>Default size:</source>
+        <translation type="vanished">Размер по умолчанию:</translation>
+    </message>
     <message>
         <source>With OS options</source>
         <translation>С опций ОС</translation>
@@ -12435,7 +12758,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Don&apos;t use the native file dialog</source>
-        <translation>Не использовать родной диалог файлов</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -12480,6 +12803,10 @@ Do you want to save your changes?</source>
         <source>My Patterns</source>
         <translation>Мои выкройки</translation>
     </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished">Мои раскладки</translation>
+    </message>
 </context>
 <context>
     <name>ToggleDetailInLayout</name>
@@ -12514,81 +12841,81 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Do not &amp;show again</source>
-        <translation>Не &amp;показывать снова</translation>
+        <translation>Не по&amp;казывать снова</translation>
     </message>
 </context>
 <context>
     <name>VAbstartMeasurementDimension</name>
     <message>
         <source>Invalid min/max range</source>
-        <translation>Недопустимый мин/макс диапазон</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid step</source>
-        <translation>Неправильный шаг</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Base value invalid</source>
-        <translation>Неправильное базовое значение</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation>Размер</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Рост</translation>
+        <translation type="unfinished">Высота</translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Размер</translation>
+        <translation type="unfinished">Размер</translation>
     </message>
     <message>
         <source>Waist</source>
         <comment>dimension</comment>
-        <translation>Талия</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hip</source>
         <comment>dimension</comment>
-        <translation>Бёдра</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chest full circumference</source>
         <comment>dimension</comment>
-        <translation>Полный обхват груди</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chest half circumference</source>
         <comment>dimension</comment>
-        <translation>Полуобхват груди</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished">Размер</translation>
     </message>
     <message>
         <source>Chest circumference</source>
         <comment>dimension</comment>
-        <translation>Обхват груди</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Waist full circumference</source>
         <comment>dimension</comment>
-        <translation>Полный обхват талии</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Waist half circumference</source>
         <comment>dimension</comment>
-        <translation>Полуобхват талии</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hip full circumference</source>
         <comment>dimension</comment>
-        <translation>Полный обхват бёдер</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hip half circumference</source>
         <comment>dimension</comment>
-        <translation>Полуобхват бёдер</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -12696,7 +13023,7 @@ Do you want to save your changes?</source>
     <message>
         <source>Tabloid</source>
         <comment>Paper format</comment>
-        <translation>Таблоид</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Roll 24in</source>
@@ -12748,23 +13075,67 @@ Do you want to save your changes?</source>
     <name>VAbstractMainWindow</name>
     <message>
         <source>Confirm format rewriting</source>
-        <translation>Подтвердите изменение формата</translation>
+        <translation type="unfinished">Подтвердите изменение формата</translation>
     </message>
     <message>
         <source>This file is using previous format version v%1. The current is v%2. Saving the file with this app version will update the format version for this file. This may prevent you from be able to open the file with older app versions. Do you really want to continue?</source>
-        <translation>Этот файл использует предыдущую версию формата v%1. Текущая версия -  v%2. При сохранении файла с этой версией приложения будет обновлена ​​версия формата для этого файла. Это может помешать вам открыть файл со старыми версиями приложения. Вы действительно хотите продолжить?</translation>
+        <translation type="unfinished">Этот файл использует предыдущую версию формата v%1. Текущая версия -  v%2. При сохранении файла с этой версией приложения будет обновлена ​​версия формата для этого файла. Это может помешать вам открыть файл со старыми версиями приложения. Вы действительно хотите продолжить?</translation>
     </message>
     <message>
         <source>Comma-Separated Values</source>
-        <translation>Значения, разделенные запятыми</translation>
+        <translation type="unfinished">Значения, разделенные запятыми</translation>
     </message>
     <message>
         <source>values</source>
-        <translation>значения</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export to CSV</source>
-        <translation>Экспорт в CSV</translation>
+        <translation type="unfinished">Экспорт в CSV</translation>
+    </message>
+    <message>
+        <source>The measurements document has no write permissions.</source>
+        <translation type="unfinished">Документ мерок не имеет прав на запись.</translation>
+    </message>
+    <message>
+        <source>Do you want to change the premissions?</source>
+        <translation type="unfinished">Вы хотите изменить настройки?</translation>
+    </message>
+    <message>
+        <source>Cannot set permissions for %1 to writable.</source>
+        <translation type="unfinished">Невозможно установить разрешения для %1 для записи.</translation>
+    </message>
+    <message>
+        <source>Could not save the file.</source>
+        <translation type="unfinished">Не удалось сохранить файл.</translation>
+    </message>
+    <message>
+        <source>Locking file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished">Этот файл уже открыт в другом окне. Игнорируйте, если вы хотите продолжить (не рекомендуется, может привести к повреждению данных).</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished">Файл блокировки не может быть создан из-за отсутствия разрешений. Игнорируйте, если вы хотите продолжить (не рекомендуется, может привести к повреждению данных).</translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished">Произошла неизвестная ошибка, например, полностью заполненный раздел предотвращает запись файла блокировки. Игнорируйте, если вы хотите продолжить (не рекомендуется, может привести к повреждению данных).</translation>
+    </message>
+    <message>
+        <source>This file already opened in another window.</source>
+        <translation type="unfinished">Этот файл уже открыт в другом окне.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions.</source>
+        <translation type="unfinished">Файл блокировки не может быть создан, не хватает прав доступа.</translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -12972,18 +13343,18 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Formula warning: %1. Program will be terminated.</source>
-        <translation>Предупреждение в формуле: %1. Программа будет завершена.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VBank</name>
     <message>
         <source>Preparing data for layout error: Detail &apos;%1&apos; square &lt;= 0</source>
-        <translation>Ошибка подготовки данных к раскладке: Деталь &apos;%1&apos; площадь &lt;= 0</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preparing data for layout error: Layout paper sheet &lt;= 0</source>
-        <translation>Ошибка подготовки данных к раскладке: лист раскладки бумаги &lt;= 0</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preparing data for layout error: List of details is empty</source>
@@ -12994,7 +13365,7 @@ Do you want to save your changes?</source>
     <name>VComboBoxDelegate</name>
     <message>
         <source>Select material</source>
-        <translation>Выбрать материал</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -13423,6 +13794,14 @@ Do you want to save your changes?</source>
         <source>Page measure units (export mode). Valid values: %1.</source>
         <translation>Единицы измерения страницы (режим экспорта). Допустимые значения: %1.</translation>
     </message>
+    <message>
+        <source>Set size value for pattern file, that was opened with multisize measurements (export mode). Valid values: %1cm.</source>
+        <translation type="vanished">Задайте значение размера для файла шаблона, которое было открыто с помощью мультиразмерных мерок (export mode). Допустимые значения: %1 см.</translation>
+    </message>
+    <message>
+        <source>Set height value for pattern file, that was opened with multisize measurements (export mode). Valid values: %1cm.</source>
+        <translation type="vanished">Устанавливает значение роста для файла выкройки, который был открыт с помощью стандартных мерок (режим экспорта). Допустимые значения: %1 см.</translation>
+    </message>
     <message>
         <source>Use this option to override user material defined in pattern. The value must be in form &lt;number&gt;@&lt;user matrial name&gt;. The number should be in range from 1 to %1. For example, 1@Fabric2. The key can be used multiple times. Has no effect in GUI mode.</source>
         <translation>Используйте этот параметр для переопределения пользовательского материала, заданного в выкройке. Значение должно быть в форме &lt;number&gt;@&lt;user matrial name&gt;. Число должно быть в диапазоне от 1 до %1. Например, 1@Fabric2. Ключ может использоваться несколько раз. Не действует в графическом режиме.</translation>
@@ -13473,7 +13852,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Follow manual priority over priority by square (export mode).</source>
-        <translation>Следовать ручному приоритету над приоритетом по площади (режим экспорта).</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nest quantity copies of each piece (export mode).</source>
@@ -13493,7 +13872,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Set horizontal scale factor from 0.01 to 3.0 (default = 1.0, export mode).</source>
-        <translation>Установите горизонтальный масштабный коэффициент от 0,01 до 3,0 (по умолчанию = 1,0, режим экспорта).</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Horizontal scale</source>
@@ -13501,7 +13880,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Set vertical scale factor from 0.01 to 3.0 (default = 1.0, export mode).</source>
-        <translation>Установите вертикальный масштабный коэффициент от 0,01 до 3,0 (по умолчанию = 1,0, режим экспорта).</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vertical scale</source>
@@ -13513,39 +13892,67 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Invalid dimension A value.</source>
-        <translation>Недопустимое значение измерения A.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid dimension B value.</source>
-        <translation>Недопустимое значение измерения B.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid dimension C value.</source>
-        <translation>Недопустимое значение измерения C.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set base for dimension A in the multisize measurements units (export mode).</source>
-        <translation>Установите базу для измерения A в единицах измерения мультиразмерных мерок (режим экспорта).</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The dimension A base</source>
-        <translation>Измерение А - база</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set base for dimension B in the multisize measurements units (export mode).</source>
-        <translation>Установите базу для измерения B в единицах измерения мультиразмерных мерок (режим экспорта).</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The dimension B base</source>
-        <translation>Измерение B - база</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set base for dimension C in the multisize measurements units (export mode).</source>
-        <translation>Установите базу для измерения C в единицах измерения мультиразмерных мерок (режим экспорта).</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The dimension C base</source>
-        <translation>Измерение C - база</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The filename of exported layout file. Use it to enable console export mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The filename of layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pattern pieces form the raw layout data file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The raw layout data file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to output format (default = 0, export mode): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to tiled pdf page template (default = 0, export mode with tiled pdf format): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run the program in a test mode. The program in this mode loads a single layout file and silently quit without showing the main window. The key have priority before key &apos;%1&apos;.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -13574,6 +13981,10 @@ Do you want to save your changes?</source>
         <source>patterns</source>
         <translation>выкройки</translation>
     </message>
+    <message>
+        <source>manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VContainer</name>
@@ -13665,7 +14076,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>This id is not unique.</source>
-        <translation type="vanished">Этот id неуникальный.</translation>
+        <translation type="vanished">Этот id не уникальный.</translation>
     </message>
     <message>
         <source>Could not copy temp file to document file</source>
@@ -13766,7 +14177,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Math parser error: %1</source>
-        <translation>Ошибка математического анализатора: %1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Result is infinite</source>
@@ -13774,7 +14185,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Result is NaN</source>
-        <translation>Результат - NaN</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Result is zero</source>
@@ -13790,14 +14201,14 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Not evaluated</source>
-        <translation>Не вычислено</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VFormulaData</name>
     <message>
         <source>Not evaluated</source>
-        <translation>Не вычислено</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
@@ -13821,37 +14232,41 @@ Do you want to save your changes?</source>
 </context>
 <context>
     <name>VLayoutExporter</name>
+    <message>
+        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot set printer page size</source>
-        <translation>Невозможно установить размер страницы принтера</translation>
+        <translation type="unfinished">Невозможно установить размер страницы принтера</translation>
     </message>
     <message>
         <source>Cannot set printer margins</source>
-        <translation>Невозможно установить поля принтера</translation>
+        <translation type="unfinished">Невозможно установить поля принтера</translation>
     </message>
     <message>
         <source>Can&apos;t open file &apos;%1&apos;</source>
-        <translation>Не удаётся открыть файл &apos;%1&apos;</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export raw layout data failed. %1.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating file &apos;%1&apos; failed! %2</source>
-        <translation>Ошибка при создании файла «%1»! %2</translation>
-    </message>
-    <message>
-        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
-        <translation>Не удается сохранить файл &apos;%1&apos;. Ошибка: %2.</translation>
+        <translation type="unfinished">Ошибка при создании файла «%1»! %2</translation>
     </message>
     <message>
         <source>Can&apos;t create an flat dxf file.</source>
-        <translation>Невозможно создать плоский файл dxf.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t create an AAMA dxf file.</source>
-        <translation>Не удалось создать файл AAMA dxf.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t create an ASTM dxf file.</source>
-        <translation>Не удалось создать файл ASTM dxf.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -13873,23 +14288,23 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>None</source>
-        <translation>Произвольное</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height</source>
-        <translation>Рост</translation>
+        <translation type="unfinished">Высота</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Размер</translation>
+        <translation type="unfinished">Размер</translation>
     </message>
     <message>
         <source>Hip</source>
-        <translation>Бёдра</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Waist</source>
-        <translation>Талия</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -14027,6 +14442,114 @@ Do you want to save your changes?</source>
         <translation>П метка</translation>
     </message>
 </context>
+<context>
+    <name>VPApplication</name>
+    <message>
+        <source>Error parsing file. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error bad id. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error can&apos;t convert value. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error empty parameter. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error wrong id. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Something&apos;s wrong!!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exception thrown: %1. Program will be terminated.</source>
+        <translation type="unfinished">Программное исключение: %1. Работа программы будет завершена.</translation>
+    </message>
+    <message>
+        <source>Can&apos;t begin to listen for incoming connections on name &apos;%1&apos;</source>
+        <translation type="unfinished">Невозможно начать слушать входящие соединения с именем &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <source>Export mode doesn&apos;t support openning several files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import raw layout data does not support openning several layout files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, provide one input file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrousel</name>
+    <message>
+        <source>Pieces of </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrouselPieceList</name>
+    <message>
+        <source>Move to Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Удалить</translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPDialogAbout</name>
+    <message>
+        <source>About Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Puzzle version</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Build revision:</source>
+        <translation type="unfinished">Ревизия:</translation>
+    </message>
+    <message>
+        <source>This program is part of Valentina project.</source>
+        <translation type="unfinished">Эта программа является частью проекта Valentina.</translation>
+    </message>
+    <message>
+        <source>Check For Updates</source>
+        <translation type="unfinished">Проверить наличие обновлений</translation>
+    </message>
+    <message>
+        <source>Cannot open your default browser</source>
+        <translation type="unfinished">Невозможно открыть браузер по умолчанию</translation>
+    </message>
+    <message>
+        <source>Build revision: %1</source>
+        <translation type="unfinished">Ревизия: %1</translation>
+    </message>
+    <message>
+        <source>Built on %1 at %2</source>
+        <translation type="unfinished">Собрано %1 в %2</translation>
+    </message>
+    <message>
+        <source>Web site : %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VPE::VBoolProperty</name>
     <message>
@@ -14049,11 +14572,578 @@ Do you want to save your changes?</source>
         <translation>Открыть файл</translation>
     </message>
 </context>
+<context>
+    <name>VPGraphicsPiece</name>
+    <message>
+        <source>Move to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPLayoutFileReader</name>
+    <message>
+        <source>Piece List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Got empty attribute &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPMainWindow</name>
+    <message>
+        <source>Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;Файл</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished">&amp;Окно</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished">&amp;Помощь</translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished">Меню</translation>
+    </message>
+    <message>
+        <source>Piece Carrousel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Infos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DummyName</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UUID:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{7b2ce4ae-96f5-4905-bb34-405cb40ca208}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Geometry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mirror piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotation</source>
+        <translation type="unfinished">Поворот</translation>
+    </message>
+    <message>
+        <source>Angle:</source>
+        <translation type="unfinished">Угол:</translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° anti-clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Placement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Y:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No piece selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple pieces selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Width</source>
+        <translation type="unfinished">Ширина</translation>
+    </message>
+    <message>
+        <source>Length</source>
+        <translation type="unfinished">Длина</translation>
+    </message>
+    <message>
+        <source>Orientation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove unused length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Margins</source>
+        <translation type="unfinished">Поля</translation>
+    </message>
+    <message>
+        <source>Right:</source>
+        <translation type="unfinished">Правое:</translation>
+    </message>
+    <message>
+        <source>Top:</source>
+        <translation type="unfinished">Верхнее:</translation>
+    </message>
+    <message>
+        <source>Left:</source>
+        <translation type="unfinished">Левое:</translation>
+    </message>
+    <message>
+        <source>Bottom:</source>
+        <translation type="unfinished">Нижнее:</translation>
+    </message>
+    <message>
+        <source>Placement Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Row height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Control</source>
+        <translation type="unfinished">Контроль</translation>
+    </message>
+    <message>
+        <source>Follow grainline</source>
+        <translation type="unfinished">Раскладка по долевой</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vertical grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Horizontal grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pieces gap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sticky edges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation type="unfinished">Экспорт</translation>
+    </message>
+    <message>
+        <source>Export Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiles properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiled Pdf Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Tiles on sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export Tiled Pdf</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation type="unfinished">Раскладка</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Описание</translation>
+    </message>
+    <message>
+        <source>Unit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning superposition of pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning pieces out of bound</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished">Масштаб</translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation type="unfinished">&amp;Открыть</translation>
+    </message>
+    <message>
+        <source>Ctrl+O</source>
+        <translation type="unfinished">Ctrl+O</translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Сохранить</translation>
+    </message>
+    <message>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save &amp;As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Import Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation type="unfinished">&amp;Выход</translation>
+    </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation type="unfinished">&amp;Новый</translation>
+    </message>
+    <message>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About &amp;Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom in</source>
+        <translation type="unfinished">Увеличить</translation>
+    </message>
+    <message>
+        <source>Zoom out</source>
+        <translation type="unfinished">Уменьшить</translation>
+    </message>
+    <message>
+        <source>Zoom 1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom fit best</source>
+        <translation type="unfinished">Уместить</translation>
+    </message>
+    <message>
+        <source>Zoom sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File &apos;%1&apos; doesn&apos;t exist!</source>
+        <translation type="unfinished">Файл «%1» не существует!</translation>
+    </message>
+    <message>
+        <source>File error.</source>
+        <translation type="unfinished">Ошибка файла.</translation>
+    </message>
+    <message>
+        <source>Unable to read a layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fail to create layout.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not extract data from file &apos;%1&apos;. %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Centimeters</source>
+        <translation type="unfinished">Сантиметры</translation>
+    </message>
+    <message>
+        <source>Millimiters</source>
+        <translation type="unfinished">Миллиметры</translation>
+    </message>
+    <message>
+        <source>Inches</source>
+        <translation type="unfinished">Дюймы</translation>
+    </message>
+    <message>
+        <source>Scale:</source>
+        <translation type="unfinished">Масштаб:</translation>
+    </message>
+    <message>
+        <source>untitled %1.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>untitled.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read only</source>
+        <translation type="unfinished">только для чтения</translation>
+    </message>
+    <message>
+        <source>Cannot read settings from a malformed .INI file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save settings. Access denied.</source>
+        <translation type="unfinished">Невозможно сохранить настройки. Доступ запрещен.</translation>
+    </message>
+    <message>
+        <source>Failed to open file, is it writable?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New Window</source>
+        <translation type="unfinished">&amp;Новое окно</translation>
+    </message>
+    <message>
+        <source>Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open file</source>
+        <translation type="unfinished">Открыть файл</translation>
+    </message>
+    <message>
+        <source>Could not save the file</source>
+        <translation type="unfinished">Не удалось сохранить файл</translation>
+    </message>
+    <message>
+        <source>layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save as</source>
+        <translation type="unfinished">Сохранить как</translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window.</source>
+        <translation type="unfinished">Невозможно заблокировать. Этот файл уже открыт в другом окне.</translation>
+    </message>
+    <message>
+        <source>Could not save file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window. Expect collissions when run 2 copies of the program.</source>
+        <translation type="unfinished">Невозможно заблокировать. Этот файл уже открыт в другом окне. Возможны конфликты, если одновременно запущено несколько экземпляров программы.</translation>
+    </message>
+    <message>
+        <source>Raw Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About Qt</source>
+        <translation type="unfinished">Про Qt</translation>
+    </message>
+    <message>
+        <source>PDF Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SVG Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPSheet</name>
+    <message>
+        <source>Letter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Legal</source>
+        <translation type="unfinished">Legal</translation>
+    </message>
+    <message>
+        <source>Tabloid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 24in</source>
+        <translation type="unfinished">Рулон 24 дюйма</translation>
+    </message>
+    <message>
+        <source>Roll 30in</source>
+        <translation type="unfinished">Рулон 30 дюймов</translation>
+    </message>
+    <message>
+        <source>Roll 36in</source>
+        <translation type="unfinished">Рулон 36 дюймов</translation>
+    </message>
+    <message>
+        <source>Roll 42in</source>
+        <translation type="unfinished">Рулон 42 дюйма</translation>
+    </message>
+    <message>
+        <source>Roll 44in</source>
+        <translation type="unfinished">Рулон 44 дюйма</translation>
+    </message>
+    <message>
+        <source>Roll 48in</source>
+        <translation type="unfinished">Рулон 44 дюйма {не 48 ли?}</translation>
+    </message>
+    <message>
+        <source>Roll 62in</source>
+        <translation type="unfinished">Рулон 44 дюйма {не 62 ли?}</translation>
+    </message>
+    <message>
+        <source>Roll 72in</source>
+        <translation type="unfinished">Рулон 44 дюйма {не 72 ли?}</translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPTileFactory</name>
+    <message>
+        <source>Grid ( %1 , %2 )</source>
+        <translation type="unfinished">Сетка ( %1 , %2 )</translation>
+    </message>
+    <message>
+        <source>Page %1 of %2</source>
+        <translation type="unfinished">Страница %1 из %2</translation>
+    </message>
+</context>
 <context>
     <name>VPattern</name>
     <message>
         <source>Error no unique id.</source>
-        <translation type="vanished">Ошибка, неуникальный id.</translation>
+        <translation type="vanished">Ошибка, не уникальный id.</translation>
     </message>
     <message>
         <source>Error parsing file.</source>
@@ -14301,7 +15391,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Piece path doesn&apos;t contain nodes</source>
-        <translation>Контур детали не содержит узлов</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -14335,11 +15425,11 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Value for final measurtement &apos;%1&apos; is infinite or NaN. Please, check your calculations.</source>
-        <translation>Значение для финальной мерки &quot;%1&quot; бесконечно или NaN. Пожалуйста, проверьте свои расчеты.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to create record for final measurement &apos;%1&apos;. Error: %2</source>
-        <translation>Невозможно создать запись для финального измерения &quot;%1&apos;&quot;. Ошибка: %2</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -14350,7 +15440,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Notch for point &apos;%1&apos; in piece &apos;%2&apos; will be disabled. Manual length is less than allowed value.</source>
-        <translation>Надсечка для точки &quot;%1&quot; в детали &quot;%2&quot; будет отключена. Ручная длина меньше допустимого значения.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main path of piece %1</source>
@@ -14394,51 +15484,51 @@ Do you want to save your changes?</source>
     <name>VPrintLayout</name>
     <message>
         <source>For printing multipages document all sheet should have the same size.</source>
-        <translation>При печати многостраничного документа все страницы должны быть одного размера.</translation>
+        <translation type="unfinished">При печати многостраничного документа все страницы должны быть одного размера.</translation>
     </message>
     <message>
         <source>For previewing multipage document all sheet should have the same size.</source>
-        <translation>При предварительном просмотре многостраничного документа все страницы должны быть одного размера.</translation>
+        <translation type="unfinished">При предварительном просмотре многостраничного документа все страницы должны быть одного размера.</translation>
     </message>
     <message>
         <source>Pages will be cropped because they do not fit printer paper size.</source>
-        <translation>Страницы будут обрезаны, они не соответствуют формату бумаги принтера.</translation>
+        <translation type="unfinished">Страницы будут обрезаны, они не соответствуют формату бумаги принтера.</translation>
     </message>
     <message>
         <source>Print error</source>
-        <translation>Ошибка печати</translation>
+        <translation type="unfinished">Ошибка печати</translation>
     </message>
     <message>
         <source>Cannot proceed because there are no available printers in your system.</source>
-        <translation>Невозможно продолжить, в системе нет доступных принтеров.</translation>
+        <translation type="unfinished">Невозможно продолжить, в системе нет доступных принтеров.</translation>
     </message>
     <message>
         <source>Failed to open file, is it writable?</source>
-        <translation>Не удалось открыть файл, доступен ли он для записи?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed in flushing page to disk, disk full?</source>
-        <translation>Не удалось записать страницу на диск, диск заполнен?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot set printer margins</source>
-        <translation>Невозможно установить поля принтера</translation>
+        <translation type="unfinished">Невозможно установить поля принтера</translation>
     </message>
     <message>
         <source>Cannot set custom printer page size</source>
-        <translation>Невозможно установить пользовательский размер страницы принтера</translation>
+        <translation type="unfinished">Невозможно установить пользовательский размер страницы принтера</translation>
     </message>
     <message>
         <source>Cannot set printer page size</source>
-        <translation>Невозможно установить размер страницы принтера</translation>
+        <translation type="unfinished">Невозможно установить размер страницы принтера</translation>
     </message>
     <message>
         <source>Cannot set printer tiled page size</source>
-        <translation>Невозможно установить размер страницы плитки для принтера</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>unamed</source>
-        <translation>неназванный</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File error.
@@ -14446,7 +15536,7 @@ Do you want to save your changes?</source>
 %1
 
 %2</source>
-        <translation>Ошибка файла.
+        <translation type="unfinished">Ошибка файла.
 
 %1
 
@@ -14454,25 +15544,37 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>The layout is stale.</source>
-        <translation>Раскладка устарела.</translation>
+        <translation type="unfinished">Раскладка устарела.</translation>
     </message>
     <message>
         <source>The layout was not updated since last pattern modification. Do you want to continue?</source>
-        <translation>Раскладка не была обновлена после последнего изменения выкройки. Хотите продолжить?</translation>
+        <translation type="unfinished">Раскладка не была обновлена после последнего изменения выкройки. Хотите продолжить?</translation>
+    </message>
+</context>
+<context>
+    <name>VRawLayout</name>
+    <message>
+        <source>VRawLayout::ReadFile() failed. Raw layout format prefix mismatch error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VRawLayout::ReadFile() failed.
+Raw layout format compatibility error: actualFileVersion = %1 and fileVersion = %2</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VSettings</name>
     <message>
         <source>layouts</source>
-        <translation>раскладки</translation>
+        <translation type="vanished">раскладки</translation>
     </message>
 </context>
 <context>
     <name>VSimpleCurve</name>
     <message>
         <source>VSimpleCurve::RefreshGeometry: pointer to curve is null.</source>
-        <translation>VSimpleCurve::RefreshGeometry: указатель на кривую нуль.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -14593,23 +15695,23 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Length</source>
-        <translation>Длина</translation>
+        <translation type="unfinished">Длина</translation>
     </message>
     <message>
         <source>Angle</source>
-        <translation>Угол</translation>
+        <translation type="unfinished">Угол</translation>
     </message>
     <message>
         <source>Label</source>
-        <translation>Метка</translation>
+        <translation type="unfinished">Метка</translation>
     </message>
     <message>
         <source>Segment 1</source>
-        <translation>Сегмент 1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Segment 2</source>
-        <translation>Сегмент 2</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -14777,7 +15879,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>flipping by line</source>
-        <translation>отразить объект по линии</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -14875,7 +15977,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>move</source>
-        <translation>переместить</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -15414,7 +16516,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Notes:</source>
-        <translation>Заметки:</translation>
+        <translation type="unfinished">Заметки:</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -15488,23 +16590,23 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Label</source>
-        <translation>Метка</translation>
+        <translation type="unfinished">Метка</translation>
     </message>
     <message>
         <source>Curve 1 segment 1</source>
-        <translation>Кривая 1 сегмент 1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Curve 1 segment 2</source>
-        <translation>Кривая 1 сегмент 2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Curve 2 segment 1</source>
-        <translation>Кривая 2 сегмент 1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Curve 2 segment 2</source>
-        <translation>Кривая 2 сегмент 2</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -16880,6 +17982,131 @@ Do you want to save your changes?</source>
         <comment>Left symbol _ in the name</comment>
         <translation>Угол2ЭлДуга_</translation>
     </message>
+    <message>
+        <source>date</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">дата</translation>
+    </message>
+    <message>
+        <source>time</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">время</translation>
+    </message>
+    <message>
+        <source>patternName</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">названиеМодели</translation>
+    </message>
+    <message>
+        <source>patternNumber</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">номерМодели</translation>
+    </message>
+    <message>
+        <source>author</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">автор</translation>
+    </message>
+    <message>
+        <source>customer</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">клиент</translation>
+    </message>
+    <message>
+        <source>pExt</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">чРазширение</translation>
+    </message>
+    <message>
+        <source>pFileName</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">чИмяФайла</translation>
+    </message>
+    <message>
+        <source>mFileName</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">мИмяФайла</translation>
+    </message>
+    <message>
+        <source>mExt</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">мРазширение</translation>
+    </message>
+    <message>
+        <source>pLetter</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">дБуква</translation>
+    </message>
+    <message>
+        <source>pAnnotation</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">дАннотация</translation>
+    </message>
+    <message>
+        <source>pOrientation</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">дОриентация</translation>
+    </message>
+    <message>
+        <source>pRotation</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">дВращение</translation>
+    </message>
+    <message>
+        <source>pTilt</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">дНаклон</translation>
+    </message>
+    <message>
+        <source>pFoldPosition</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">дРасположениеСгиба</translation>
+    </message>
+    <message>
+        <source>pName</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">дИмя</translation>
+    </message>
+    <message>
+        <source>pQuantity</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">дКоличество</translation>
+    </message>
+    <message>
+        <source>mFabric</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">мТкань</translation>
+    </message>
+    <message>
+        <source>mLining</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">мПодклад</translation>
+    </message>
+    <message>
+        <source>mInterfacing</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">мКлееваяПодкладка</translation>
+    </message>
+    <message>
+        <source>mInterlining</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">мМежподкладка</translation>
+    </message>
+    <message>
+        <source>wCut</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">сВырезать</translation>
+    </message>
+    <message>
+        <source>wOnFold</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">сНаСгиб</translation>
+    </message>
+    <message>
+        <source>userMaterial</source>
+        <comment>placeholder</comment>
+        <translation type="vanished">полМатериал</translation>
+    </message>
     <message>
         <source>r2cm</source>
         <comment>round to up to 1 decimal</comment>
@@ -16943,32 +18170,32 @@ Do you want to save your changes?</source>
     <message>
         <source>hyperbolic sine function</source>
         <comment>function sinh</comment>
-        <translation>гиперболическая функция синуса</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hyperbolic cosine</source>
         <comment>function cosh</comment>
-        <translation>гиперболический косинус</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hyperbolic tangens function</source>
         <comment>function tanh</comment>
-        <translation>гиперболическая функция тангенса</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hyperbolic arcus sine function</source>
         <comment>function asinh</comment>
-        <translation>гиперболическая функция арксинуса</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hyperbolic arcus cosine function</source>
         <comment>function acosh</comment>
-        <translation>гиперболическая функция арккосинуса</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hyperbolic arcur tangens function</source>
         <comment>function atanh</comment>
-        <translation>гиперболическая функция арктангенса</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sine function working with degrees</source>
@@ -17003,27 +18230,27 @@ Do you want to save your changes?</source>
     <message>
         <source>logarithm to the base 2</source>
         <comment>function log2</comment>
-        <translation>логарифм к основанию 2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>logarithm to the base 10</source>
         <comment>function log10</comment>
-        <translation>логарифм к основанию 10</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>logarithm to the base 10</source>
         <comment>function log</comment>
-        <translation>логарифм к основанию 10</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>logarithm to base e (2.71828...)</source>
         <comment>function ln</comment>
-        <translation>логарифм к основанию е (2.71828...)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>e raised to the power of x</source>
         <comment>function exp</comment>
-        <translation>е возведённый в степень х</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>square root of a value</source>
@@ -17033,7 +18260,7 @@ Do you want to save your changes?</source>
     <message>
         <source>sign function -1 if x&lt;0; 1 if x&gt;0</source>
         <comment>function sign</comment>
-        <translation>функция знака -1 если x&lt;0; 1 если x&gt;0</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>round to nearest integer</source>
@@ -17083,7 +18310,7 @@ Do you want to save your changes?</source>
     <message>
         <source>Returns the floating-point remainder of numer/denom (rounded towards zero)</source>
         <comment>function fmod</comment>
-        <translation>Возвращает остаток с плавающей точкой от числа/делитель (округленного до нуля)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>warning</source>
@@ -17118,6 +18345,13 @@ Do you want to save your changes?</source>
         <translation type="vanished">Ошибка восстановления из резервного файла: %1.</translation>
     </message>
 </context>
+<context>
+    <name>VValentinaSettings</name>
+    <message>
+        <source>layouts</source>
+        <translation type="unfinished">раскладки</translation>
+    </message>
+</context>
 <context>
     <name>VWidgetDetails</name>
     <message>
@@ -17166,7 +18400,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Cannot find piece by id &apos;%1&apos;</source>
-        <translation>Не удается найти деталь с идентификатором &quot;%1&quot;</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -17220,6 +18454,13 @@ Do you want to save your changes?</source>
         <translation>Категории: %1.</translation>
     </message>
 </context>
+<context>
+    <name>Valentina</name>
+    <message>
+        <source>This test build is older than %1 days. To provide you with better quality service we restrict the lifetime you can use a test build. To continue using Valentina please update to newer test build. The application will be shut down.</source>
+        <translation type="vanished">Эта тестовая сборка старше %1 дня. Чтобы предоставить вам более качественный сервис, мы ограничиваем срок службы тестовой сборки. Для продолжения работы с Валентиной, пожалуйста, обновите тестовую сборку. Приложение будет закрыто.</translation>
+    </message>
+</context>
 <context>
     <name>VisToolCubicBezierPath</name>
     <message>
@@ -17263,7 +18504,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>&lt;b&gt;Point at distance and angle&lt;/b&gt;: angle = %1°, length = %2%3; &lt;b&gt;%4&lt;/b&gt; - sticking angle, &lt;b&gt;%5&lt;/b&gt; - finish creation</source>
-        <translation>&lt;b&gt;Точка на расстоянии и под углом&lt;/b&gt;: угол = %1°, длина = %2%3; &lt;b&gt;%4&lt;/b&gt; - фиксация угла, &lt;b&gt;%5&lt;/b&gt; - окончание создания</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -17285,11 +18526,11 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Length = %1%2, angle = %3°, &lt;b&gt;%4&lt;/b&gt; - sticking angle, &lt;b&gt;Mouse click&lt;/b&gt; - finish selecting a position</source>
-        <translation>Длина = %1%2, угол = %3°, &lt;b&gt;%4&lt;/b&gt; - фиксация угла, &lt;b&gt;клик мыши&lt;/b&gt; - завершение выбора позиции</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Length = %1%2, angle = %3°, rotation angle = %4°, &lt;b&gt;%5&lt;/b&gt; - sticking angle, &lt;b&gt;%6&lt;/b&gt; - change rotation origin point, &lt;b&gt;Mouse click&lt;/b&gt; - finish creating</source>
-        <translation>Длина = %1%2, угол = %3°, угол вращения = %4°, &lt;b&gt;%5&lt;/b&gt; - фиксация угла, &lt;b&gt;%6&lt;/b&gt; - изменение начальной точки вращения, &lt;b&gt;клик мыши&lt;/b&gt; - завершение создания</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -17300,7 +18541,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Rotating angle = %1°, &lt;b&gt;%2&lt;/b&gt; - sticking angle, &lt;b&gt;Mouse click&lt;/b&gt; - finish creation</source>
-        <translation>Угол поворота = %1°, &lt;b&gt;%2&lt;/b&gt; - фиксация угла, &lt;b&gt;клик мыши&lt;/b&gt; - завершение создания</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -17311,7 +18552,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Use &lt;b&gt;%1&lt;/b&gt; for sticking angle!</source>
-        <translation>Используйте &lt;b&gt;%1&lt;/b&gt; для фиксации угла!</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -17334,7 +18575,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Use &lt;b&gt;%1&lt;/b&gt; for sticking angle!</source>
-        <translation>Используйте &lt;b&gt;%1&lt;/b&gt; для фиксации угла!</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -17532,7 +18773,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Do you want to change the premissions?</source>
-        <translation>Вы хотите изменить права?</translation>
+        <translation type="unfinished">Вы хотите изменить настройки?</translation>
     </message>
 </context>
 <context>
diff --git a/share/translations/valentina_uk_UA.ts b/share/translations/valentina_uk_UA.ts
index 385e78770..984b056ce 100644
--- a/share/translations/valentina_uk_UA.ts
+++ b/share/translations/valentina_uk_UA.ts
@@ -576,7 +576,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -707,16 +707,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogArcWithLength</name>
@@ -834,16 +834,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogBisector</name>
@@ -965,7 +965,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -1036,16 +1036,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCubicBezierPath</name>
@@ -1095,16 +1095,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCurveIntersectAxis</name>
@@ -1206,7 +1206,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -1297,11 +1297,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1311,6 +1307,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCutSpline</name>
@@ -1388,11 +1388,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1402,6 +1398,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCutSplinePath</name>
@@ -1479,11 +1479,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Alias1:</source>
@@ -1493,6 +1489,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogDateTimeFormats</name>
@@ -1795,15 +1795,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Value</source>
-        <translation>Значення</translation>
-    </message>
-    <message>
-        <source>Label</source>
+        <source>Dimension:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dimension:</source>
+        <source>Value</source>
+        <translation type="unfinished">Значення</translation>
+    </message>
+    <message>
+        <source>Label</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1958,6 +1958,14 @@
         <source>Measurments file name</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Розмір</translation>
+    </message>
+    <message>
+        <source>Height</source>
+        <translation type="obsolete">Зріст</translation>
+    </message>
     <message>
         <source>Measurments extension</source>
         <translation type="unfinished"></translation>
@@ -2086,19 +2094,15 @@
         <source>Customer email</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Measurement: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Зріст</translation>
+        <translation type="unfinished">Зріст</translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Розмір</translation>
+        <translation type="unfinished">Розмір</translation>
     </message>
     <message>
         <source>Hip</source>
@@ -2111,23 +2115,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No data for the height dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the size dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the hip dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the waist dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Final measurement: %1</source>
+        <source>Measurement: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2150,6 +2138,26 @@
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Final measurement: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the height dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the size dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the hip dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the waist dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogEditWrongFormula</name>
@@ -2382,16 +2390,16 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogEndLine</name>
@@ -2497,7 +2505,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -2727,11 +2735,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -2749,6 +2753,10 @@
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -2846,11 +2854,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -2868,6 +2872,10 @@
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -3020,7 +3028,7 @@
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -3882,7 +3890,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -3949,7 +3957,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -4076,7 +4084,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -4231,11 +4239,11 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Full name:</source>
-        <translation>Повне ім&apos;я:</translation>
+        <translation type="unfinished">Повне ім&apos;я:</translation>
     </message>
     <message>
         <source>Description:</source>
-        <translation>Опис:</translation>
+        <translation type="unfinished">Опис:</translation>
     </message>
     <message>
         <source>Ready</source>
@@ -4243,20 +4251,50 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Name</source>
-        <translation>Ім&apos;я</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Value</source>
-        <translation>Значення</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Значення</translation>
+    </message>
+    <message>
+        <source>Full name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Повне ім&apos;я</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Опис</translation>
     </message>
     <message>
         <source>Base value</source>
-        <translation>Базове значення</translation>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Базове значення</translation>
+    </message>
+    <message>
+        <source>Shift (%1):</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Skip</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished">Значення</translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <translation type="unfinished">Базове значення</translation>
+    </message>
     <message>
         <source>Shift (%1)*:</source>
         <translation type="unfinished"></translation>
@@ -4277,36 +4315,6 @@ Apply settings anyway?</source>
         <source>Please, select unique number for each column</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Name</source>
-        <comment>measurement column</comment>
-        <translation>Ім&apos;я</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <comment>measurement column</comment>
-        <translation>Значення</translation>
-    </message>
-    <message>
-        <source>Full name</source>
-        <comment>measurement column</comment>
-        <translation>Повне ім&apos;я</translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <comment>measurement column</comment>
-        <translation>Опис</translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <comment>measurement column</comment>
-        <translation>Базове значення</translation>
-    </message>
-    <message>
-        <source>Shift (%1):</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DialogMove</name>
@@ -4400,11 +4408,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -4422,6 +4426,10 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -4661,7 +4669,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -4869,6 +4877,10 @@ Apply settings anyway?</source>
         <source>Label language:</source>
         <translation>Мова назви точки:</translation>
     </message>
+    <message>
+        <source>yyyy-MM-dd</source>
+        <translation type="obsolete">yyyy-MM-dd</translation>
+    </message>
     <message>
         <source>Passmark length:</source>
         <translation type="unfinished"></translation>
@@ -5570,7 +5582,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5669,7 +5681,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5764,7 +5776,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5823,7 +5835,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -5890,7 +5902,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6005,7 +6017,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6052,7 +6064,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6102,6 +6114,29 @@ Apply settings anyway?</source>
         </translation>
     </message>
 </context>
+<context>
+    <name>DialogPuzzlePreferences</name>
+    <message>
+        <source>Puzzle preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished">Налаштування</translation>
+    </message>
+    <message>
+        <source>Paths</source>
+        <translation type="unfinished">Шляхи</translation>
+    </message>
+    <message numerus="yes">
+        <source>Followed %n option(s) require restart to take effect: %1.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+</context>
 <context>
     <name>DialogRestrictDimension</name>
     <message>
@@ -6213,11 +6248,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Alias</source>
@@ -6235,6 +6266,10 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -6477,6 +6512,10 @@ Apply settings anyway?</source>
         <source>Numerical control</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogSeamAllowance</name>
@@ -6735,6 +6774,11 @@ Apply settings anyway?</source>
         <source>Use full circumference</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Height</source>
+        <comment>dimension</comment>
+        <translation type="unfinished">Зріст</translation>
+    </message>
     <message>
         <source>Min value:</source>
         <translation type="unfinished"></translation>
@@ -6767,10 +6811,25 @@ Apply settings anyway?</source>
         <source>The base value for the column</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <comment>dimension</comment>
+        <translation type="unfinished">Розмір</translation>
+    </message>
     <message>
         <source>Circumference</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Waist</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hip</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Please, provide correct data for dimensions</source>
         <translation type="unfinished"></translation>
@@ -6787,26 +6846,6 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Height</source>
-        <comment>dimension</comment>
-        <translation>Зріст</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <comment>dimension</comment>
-        <translation>Розмір</translation>
-    </message>
-    <message>
-        <source>Waist</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hip</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DialogShoulderPoint</name>
@@ -6916,7 +6955,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -6959,7 +6998,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -7106,16 +7145,16 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogSplinePath</name>
@@ -7265,16 +7304,16 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogTapePreferences</name>
@@ -7458,7 +7497,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -7569,7 +7608,7 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Tool</source>
-        <translation>Інструмент</translation>
+        <translation type="unfinished">Інструмент</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -8307,7 +8346,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>This file already opened in another window.</source>
-        <translation>Цей файл вже відкрито в іншому вікні.</translation>
+        <translation type="vanished">Цей файл вже відкрито в іншому вікні.</translation>
     </message>
     <message>
         <source>Wrong units.</source>
@@ -8760,27 +8799,27 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Locking file</source>
-        <translation>Блокування файлу</translation>
+        <translation type="vanished">Блокування файлу</translation>
     </message>
     <message>
         <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Цей файл вже відкритий в іншому вікні. Ігноруйте якщо ви хочете продовжити (не рекомендується, може призвести до втрати даних).</translation>
+        <translation type="vanished">Цей файл вже відкритий в іншому вікні. Ігноруйте якщо ви хочете продовжити (не рекомендується, може призвести до втрати даних).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Не вдалося створити lock файл через відсутність дозволів. Ігноруйте якщо хочете продовжити (не рекомендується, може призвести до втрати даних).</translation>
+        <translation type="vanished">Не вдалося створити lock файл через відсутність дозволів. Ігноруйте якщо хочете продовжити (не рекомендується, може призвести до втрати даних).</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Сталася невідома помилка, наприклад переповнення розділу попередило запис lock файлу. Ігноруйте якщо бажаєте продовжити (не рекомендується, може призвести до втрати даних).</translation>
+        <translation type="vanished">Сталася невідома помилка, наприклад переповнення розділу попередило запис lock файлу. Ігноруйте якщо бажаєте продовжити (не рекомендується, може призвести до втрати даних).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions.</source>
-        <translation>Не вдалося створити lock файл через відсутність дозволів.</translation>
+        <translation type="vanished">Не вдалося створити lock файл через відсутність дозволів.</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation>Сталася невідома помилка, наприклад переповнення розділу попередило запис lock файлу.</translation>
+        <translation type="vanished">Сталася невідома помилка, наприклад переповнення розділу попередило запис lock файлу.</translation>
     </message>
     <message>
         <source>Report Bug...</source>
@@ -8940,15 +8979,15 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>The document has no write permissions.</source>
-        <translation>Документ не має прав на запис.</translation>
+        <translation type="vanished">Документ не має прав на запис.</translation>
     </message>
     <message>
         <source>Cannot set permissions for %1 to writable.</source>
-        <translation>Не вдалося встановити права для %1 на запис.</translation>
+        <translation type="vanished">Не вдалося встановити права для %1 на запис.</translation>
     </message>
     <message>
         <source>Could not save the file.</source>
-        <translation>Не вдалося зберегти файл.</translation>
+        <translation type="vanished">Не вдалося зберегти файл.</translation>
     </message>
     <message>
         <source>Could not save the file</source>
@@ -9335,7 +9374,43 @@ Do you want to save your changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to change the premissions?</source>
+        <source>Manual Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open the Puzzle app</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished">Оновити</translation>
+    </message>
+    <message>
+        <source>Update manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to prepare raw layout data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select manual layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9533,6 +9608,10 @@ Do you want to save your changes?</source>
         <source>Measurement file contains invalid known measurement(s).</source>
         <translation>Файл мірок містить недійсні відомі мірки.</translation>
     </message>
+    <message>
+        <source>Wrong units.</source>
+        <translation type="vanished">Неправильні одиниці виміру.</translation>
+    </message>
     <message>
         <source>File error.</source>
         <translation>Помилка файла.</translation>
@@ -9957,6 +10036,10 @@ Do you want to save your changes?</source>
         <source>My label templates</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>My manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PreferencesPatternPage</name>
@@ -10098,6 +10181,111 @@ This option will take an affect after restart.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>Puzzle</name>
+    <message>
+        <source>Export options can be used with single input file only.</source>
+        <translation type="unfinished">Параметри експорту можуть використовуватися тільки з одним вхідним файлом.</translation>
+    </message>
+    <message>
+        <source>Valentina&apos;s manual layout editor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The manual layout file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesConfigurationPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished">Форма</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished">Мова</translation>
+    </message>
+    <message>
+        <source>GUI language:</source>
+        <translation type="unfinished">Мова інтерфейсу:</translation>
+    </message>
+    <message>
+        <source>Toolbar</source>
+        <translation type="unfinished">Панель інструментів</translation>
+    </message>
+    <message>
+        <source>The text appears under the icon (recommended for beginners).</source>
+        <translation type="unfinished">Текст відображається під іконкою (рекомендується для новачків).</translation>
+    </message>
+    <message>
+        <source>User Interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate dark mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t use the native file dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dark mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesPathPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished">Форма</translation>
+    </message>
+    <message>
+        <source>Paths that Valentina uses</source>
+        <translation type="unfinished">Шляхи, що використовує Валентина</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished">Тип</translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished">По замовчуванню</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished">Редагувати</translation>
+    </message>
+    <message>
+        <source>Open Directory</source>
+        <translation type="unfinished">Відкрити директорію</translation>
+    </message>
+    <message>
+        <source>My Individual Measurements</source>
+        <translation type="unfinished">Мої індивідуальні мірки</translation>
+    </message>
+    <message>
+        <source>My Multisize Measurements</source>
+        <translation type="unfinished">Мої стандартні мірки</translation>
+    </message>
+    <message>
+        <source>My Patterns</source>
+        <translation type="unfinished">Мої лекала</translation>
+    </message>
+    <message>
+        <source>My Templates</source>
+        <translation type="unfinished">Мої шаблони</translation>
+    </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished">Мої розкладки</translation>
+    </message>
+</context>
 <context>
     <name>QApplication</name>
     <message>
@@ -10443,6 +10631,10 @@ This option will take an affect after restart.</source>
         <source>Can&apos;t convert toInt parameter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Piece name &apos;%1&apos; is not unique.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Could not find the segment start.</source>
         <translation type="unfinished"></translation>
@@ -10459,6 +10651,10 @@ This option will take an affect after restart.</source>
         <source>Error calculating segment for curve &apos;%1&apos;. %2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot prepare builtin passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
@@ -10475,18 +10671,14 @@ This option will take an affect after restart.</source>
         <source>Cannot prepare passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Piece name &apos;%1&apos; is not unique.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Cannot get tokens from formula &apos;%1&apos;. Formula error: %2.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>No data for the height dimension.</source>
         <translation type="unfinished"></translation>
@@ -10508,11 +10700,15 @@ This option will take an affect after restart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
+        <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
+        <source>Unplaced pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet 1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -11108,7 +11304,7 @@ This option will take an affect after restart.</source>
     </message>
     <message>
         <source>untitled</source>
-        <translation type="vanished">без імені</translation>
+        <translation>без імені</translation>
     </message>
     <message>
         <source>&lt;Empty&gt;</source>
@@ -11345,27 +11541,27 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Locking file</source>
-        <translation>Файл блокування</translation>
+        <translation type="vanished">Файл блокування</translation>
     </message>
     <message>
         <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Цей файл вже відкрит в іншому вікні. Ігноруйте, якщо бажаєте продовжити (не рекомендується, може призвести до пошкодження даних).</translation>
+        <translation type="vanished">Цей файл вже відкрит в іншому вікні. Ігноруйте, якщо бажаєте продовжити (не рекомендується, може призвести до пошкодження даних).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Файл блокування не може бути створений через відсутність дозволу. Ігноруйте, якщо бажаєте продовжити (не рекомендується, може призвести до пошкодження даних).</translation>
+        <translation type="vanished">Файл блокування не може бути створений через відсутність дозволу. Ігноруйте, якщо бажаєте продовжити (не рекомендується, може призвести до пошкодження даних).</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation>Виникла невідома помилка, наприклад, повністю заповнений розділ заважає запису файлу блокування. Ігноруйте, якщо ви хочете продовжити (не рекомендується, може призвести до пошкодження даних).</translation>
+        <translation type="vanished">Виникла невідома помилка, наприклад, повністю заповнений розділ заважає запису файлу блокування. Ігноруйте, якщо ви хочете продовжити (не рекомендується, може призвести до пошкодження даних).</translation>
     </message>
     <message>
         <source>The lock file could not be created, for lack of permissions.</source>
-        <translation>Файл блокування не може бути створений, не вистачає прав доступу.</translation>
+        <translation type="vanished">Файл блокування не може бути створений, не вистачає прав доступу.</translation>
     </message>
     <message>
         <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation>Виникла невідома помилка, наприклад, повністю заповнений розділ заважає запису файла блокування.</translation>
+        <translation type="vanished">Виникла невідома помилка, наприклад, повністю заповнений розділ заважає запису файла блокування.</translation>
     </message>
     <message>
         <source>Export to CSV</source>
@@ -11413,15 +11609,15 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>The measurements document has no write permissions.</source>
-        <translation>Документ мірок не має прав на запис.</translation>
+        <translation type="vanished">Документ мірок не має прав на запис.</translation>
     </message>
     <message>
         <source>Cannot set permissions for %1 to writable.</source>
-        <translation>Не вдалося встановити права для %1 на запис.</translation>
+        <translation type="vanished">Не вдалося встановити права для %1 на запис.</translation>
     </message>
     <message>
         <source>Could not save the file.</source>
-        <translation>Не вдалося зберегти файл.</translation>
+        <translation type="vanished">Не вдалося зберегти файл.</translation>
     </message>
     <message>
         <source>Could not save the file</source>
@@ -11551,17 +11747,43 @@ Do you want to save your changes?</source>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Search measurements by term. &lt;/p&gt;&lt;p&gt;Prepend &amp;quot;/r/&amp;quot; to the front of the search string to search measurements by regex.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Do you want to change the premissions?</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Cannot read settings from a malformed .INI file.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Повне ім&apos;я</translation>
+    </message>
+    <message>
+        <source>Calculated value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Розраховане значення</translation>
+    </message>
+    <message>
+        <source>Formula</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Формула</translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished">Базове значення</translation>
+    </message>
+    <message>
+        <source>Correction</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Units:</source>
-        <translation>Одинці виміру:</translation>
+        <translation type="unfinished">Одинці виміру:</translation>
     </message>
     <message>
         <source>Shift B</source>
@@ -11661,46 +11883,16 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Inches</source>
-        <translation>Дюйми</translation>
+        <translation type="unfinished">Дюйми</translation>
     </message>
     <message>
         <source>Centimeters</source>
-        <translation>Сантиметри</translation>
+        <translation type="unfinished">Сантиметри</translation>
     </message>
     <message>
         <source>Degrees</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Name</source>
-        <comment>measurement column</comment>
-        <translation>Ім&apos;я</translation>
-    </message>
-    <message>
-        <source>Full name</source>
-        <comment>measurement column</comment>
-        <translation>Повне ім&apos;я</translation>
-    </message>
-    <message>
-        <source>Calculated value</source>
-        <comment>measurement column</comment>
-        <translation>Розраховане значення</translation>
-    </message>
-    <message>
-        <source>Formula</source>
-        <comment>measurement column</comment>
-        <translation>Формула</translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <comment>measurement column</comment>
-        <translation>Базове значення</translation>
-    </message>
-    <message>
-        <source>Correction</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Restrict first dimension</source>
         <translation type="unfinished"></translation>
@@ -11779,6 +11971,10 @@ Do you want to save your changes?</source>
         <source>Labels</source>
         <translation>Мітки</translation>
     </message>
+    <message>
+        <source>Detail label visible</source>
+        <translation type="vanished">Мітка деталі видима</translation>
+    </message>
     <message>
         <source>Width:</source>
         <translation>Ширина:</translation>
@@ -11889,19 +12085,19 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Pattern name:</source>
-        <translation>Ім&apos;я лекала:</translation>
+        <translation type="unfinished">Ім&apos;я лекала:</translation>
     </message>
     <message>
         <source>Pattern number:</source>
-        <translation>Номер лекала:</translation>
+        <translation type="unfinished">Номер лекала:</translation>
     </message>
     <message>
         <source>Company/Designer name:</source>
-        <translation>Компанія/дезайнер:</translation>
+        <translation type="unfinished">Компанія/дезайнер:</translation>
     </message>
     <message>
         <source>Customer name:</source>
-        <translation>Ім&apos;я клієнта:</translation>
+        <translation type="unfinished">Ім&apos;я клієнта:</translation>
     </message>
     <message>
         <source>Date format:</source>
@@ -11917,7 +12113,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>yyyy-MM-dd</source>
-        <translation>yyyy-MM-dd</translation>
+        <translation type="unfinished">yyyy-MM-dd</translation>
     </message>
     <message>
         <source>Customer email:</source>
@@ -12239,6 +12435,18 @@ Do you want to save your changes?</source>
         <comment>seam allowance</comment>
         <translation>Користувацька</translation>
     </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Universally Unique IDentifier of piece. Used to identifier piece while updating manual layout. Left empty to generate new value.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TabPlaceLabels</name>
@@ -12414,6 +12622,18 @@ Do you want to save your changes?</source>
         <source>The text appears under the icon (recommended for beginners).</source>
         <translation>Текст відображається під іконкою (рекомендується для новачків).</translation>
     </message>
+    <message>
+        <source>Default height and size</source>
+        <translation type="vanished">Стандартний зріст і розмір</translation>
+    </message>
+    <message>
+        <source>Default height:</source>
+        <translation type="vanished">Стандартний зріст:</translation>
+    </message>
+    <message>
+        <source>Default size:</source>
+        <translation type="vanished">Стандартний розмір:</translation>
+    </message>
     <message>
         <source>With OS options</source>
         <translation>З параметрами ОС</translation>
@@ -12477,6 +12697,10 @@ Do you want to save your changes?</source>
         <source>My Patterns</source>
         <translation>Мої лекала</translation>
     </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished">Мої розкладки</translation>
+    </message>
 </context>
 <context>
     <name>ToggleDetailInLayout</name>
@@ -12528,19 +12752,15 @@ Do you want to save your changes?</source>
         <source>Base value invalid</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Size</source>
-        <translation>Розмір</translation>
-    </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
-        <translation>Зріст</translation>
+        <translation type="unfinished">Зріст</translation>
     </message>
     <message>
         <source>Size</source>
         <comment>dimension</comment>
-        <translation>Розмір</translation>
+        <translation type="unfinished">Розмір</translation>
     </message>
     <message>
         <source>Waist</source>
@@ -12562,6 +12782,10 @@ Do you want to save your changes?</source>
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished">Розмір</translation>
+    </message>
     <message>
         <source>Chest circumference</source>
         <comment>dimension</comment>
@@ -12752,7 +12976,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Comma-Separated Values</source>
-        <translation>Comma-Separated Values</translation>
+        <translation type="unfinished">Comma-Separated Values</translation>
     </message>
     <message>
         <source>values</source>
@@ -12760,7 +12984,51 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Export to CSV</source>
-        <translation>Експортувати до CSV</translation>
+        <translation type="unfinished">Експортувати до CSV</translation>
+    </message>
+    <message>
+        <source>The measurements document has no write permissions.</source>
+        <translation type="unfinished">Документ мірок не має прав на запис.</translation>
+    </message>
+    <message>
+        <source>Do you want to change the premissions?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot set permissions for %1 to writable.</source>
+        <translation type="unfinished">Не вдалося встановити права для %1 на запис.</translation>
+    </message>
+    <message>
+        <source>Could not save the file.</source>
+        <translation type="unfinished">Не вдалося зберегти файл.</translation>
+    </message>
+    <message>
+        <source>Locking file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This file already opened in another window.</source>
+        <translation type="unfinished">Цей файл вже відкрито в іншому вікні.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -13543,6 +13811,34 @@ Do you want to save your changes?</source>
         <source>The dimension C base</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>The filename of exported layout file. Use it to enable console export mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The filename of layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pattern pieces form the raw layout data file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The raw layout data file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to output format (default = 0, export mode): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to tiled pdf page template (default = 0, export mode with tiled pdf format): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run the program in a test mode. The program in this mode loads a single layout file and silently quit without showing the main window. The key have priority before key &apos;%1&apos;.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VCommonSettings</name>
@@ -13570,6 +13866,10 @@ Do you want to save your changes?</source>
         <source>patterns</source>
         <translation>лекала</translation>
     </message>
+    <message>
+        <source>manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VContainer</name>
@@ -13816,25 +14116,29 @@ Do you want to save your changes?</source>
 </context>
 <context>
     <name>VLayoutExporter</name>
+    <message>
+        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot set printer page size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot set printer margins</source>
-        <translation>Не вдалося встановити поля принтеру</translation>
+        <translation type="unfinished">Не вдалося встановити поля принтеру</translation>
     </message>
     <message>
         <source>Can&apos;t open file &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Creating file &apos;%1&apos; failed! %2</source>
-        <translation>Створення файлу &apos;%1&apos; не вдалося! %2</translation>
+        <source>Export raw layout data failed. %1.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
-        <translation type="unfinished"></translation>
+        <source>Creating file &apos;%1&apos; failed! %2</source>
+        <translation type="unfinished">Створення файлу &apos;%1&apos; не вдалося! %2</translation>
     </message>
     <message>
         <source>Can&apos;t create an flat dxf file.</source>
@@ -13868,15 +14172,15 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>None</source>
-        <translation>Жодного</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height</source>
-        <translation>Зріст</translation>
+        <translation type="unfinished">Зріст</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Розмір</translation>
+        <translation type="unfinished">Розмір</translation>
     </message>
     <message>
         <source>Hip</source>
@@ -14022,6 +14326,114 @@ Do you want to save your changes?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>VPApplication</name>
+    <message>
+        <source>Error parsing file. Program will be terminated.</source>
+        <translation type="unfinished">Помилка парсінгу файла. Програма буде закрита.</translation>
+    </message>
+    <message>
+        <source>Error bad id. Program will be terminated.</source>
+        <translation type="unfinished">Помилка неправильний id. Програма буде закрита.</translation>
+    </message>
+    <message>
+        <source>Error can&apos;t convert value. Program will be terminated.</source>
+        <translation type="unfinished">Помилка конвертації значення. Програма буде закрита.</translation>
+    </message>
+    <message>
+        <source>Error empty parameter. Program will be terminated.</source>
+        <translation type="unfinished">Помилка пустий параметр. Програма буде закрита.</translation>
+    </message>
+    <message>
+        <source>Error wrong id. Program will be terminated.</source>
+        <translation type="unfinished">Помилка неправильний id. Програма буде закрита.</translation>
+    </message>
+    <message>
+        <source>Something&apos;s wrong!!</source>
+        <translation type="unfinished">Щось не так!!</translation>
+    </message>
+    <message>
+        <source>Exception thrown: %1. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t begin to listen for incoming connections on name &apos;%1&apos;</source>
+        <translation type="unfinished">Не вдається почати слухати вхідні з&apos;єднання за іменем &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <source>Export mode doesn&apos;t support openning several files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import raw layout data does not support openning several layout files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, provide one input file.</source>
+        <translation type="unfinished">Будь ласка, надайте один вхідний файл.</translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrousel</name>
+    <message>
+        <source>Pieces of </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrouselPieceList</name>
+    <message>
+        <source>Move to Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Видалити</translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPDialogAbout</name>
+    <message>
+        <source>About Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Puzzle version</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Build revision:</source>
+        <translation type="unfinished">Ревізія:</translation>
+    </message>
+    <message>
+        <source>This program is part of Valentina project.</source>
+        <translation type="unfinished">Ця програма є частиною проекту Valentina.</translation>
+    </message>
+    <message>
+        <source>Check For Updates</source>
+        <translation type="unfinished">Перевірити наявність оновлень</translation>
+    </message>
+    <message>
+        <source>Cannot open your default browser</source>
+        <translation type="unfinished">Не можу відкрити браузер по замовчуванню</translation>
+    </message>
+    <message>
+        <source>Build revision: %1</source>
+        <translation type="unfinished">Ревізія: %1</translation>
+    </message>
+    <message>
+        <source>Built on %1 at %2</source>
+        <translation type="unfinished">Зібрано %1 в %2</translation>
+    </message>
+    <message>
+        <source>Web site : %1</source>
+        <translation type="unfinished">Веб сайт : %1</translation>
+    </message>
+</context>
 <context>
     <name>VPE::VBoolProperty</name>
     <message>
@@ -14044,6 +14456,573 @@ Do you want to save your changes?</source>
         <translation>Відкрити файл</translation>
     </message>
 </context>
+<context>
+    <name>VPGraphicsPiece</name>
+    <message>
+        <source>Move to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPLayoutFileReader</name>
+    <message>
+        <source>Piece List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Got empty attribute &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPMainWindow</name>
+    <message>
+        <source>Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;Файл</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished">&amp;Допомога</translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished">Меню</translation>
+    </message>
+    <message>
+        <source>Piece Carrousel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Infos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Імя:</translation>
+    </message>
+    <message>
+        <source>DummyName</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UUID:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{7b2ce4ae-96f5-4905-bb34-405cb40ca208}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Geometry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mirror piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotation</source>
+        <translation type="unfinished">Поворот</translation>
+    </message>
+    <message>
+        <source>Angle:</source>
+        <translation type="unfinished">Кут:</translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° anti-clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Placement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Y:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No piece selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple pieces selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Width</source>
+        <translation type="unfinished">Ширина</translation>
+    </message>
+    <message>
+        <source>Length</source>
+        <translation type="unfinished">Довжина</translation>
+    </message>
+    <message>
+        <source>Orientation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove unused length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right:</source>
+        <translation type="unfinished">Праве:</translation>
+    </message>
+    <message>
+        <source>Top:</source>
+        <translation type="unfinished">Верхнє:</translation>
+    </message>
+    <message>
+        <source>Left:</source>
+        <translation type="unfinished">Ліве:</translation>
+    </message>
+    <message>
+        <source>Bottom:</source>
+        <translation type="unfinished">Нижнє:</translation>
+    </message>
+    <message>
+        <source>Placement Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Row height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Follow grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vertical grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Horizontal grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pieces gap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sticky edges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation type="unfinished">Експорт</translation>
+    </message>
+    <message>
+        <source>Export Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiles properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiled Pdf Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Tiles on sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export Tiled Pdf</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation type="unfinished">Розкладка</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Опис</translation>
+    </message>
+    <message>
+        <source>Unit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning superposition of pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning pieces out of bound</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation type="unfinished">&amp;Відкрити</translation>
+    </message>
+    <message>
+        <source>Ctrl+O</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Зберегти</translation>
+    </message>
+    <message>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save &amp;As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Import Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation type="unfinished">&amp;Вихід</translation>
+    </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation type="unfinished">&amp;Новий</translation>
+    </message>
+    <message>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation type="unfinished">Про &amp;Qt</translation>
+    </message>
+    <message>
+        <source>About &amp;Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom in</source>
+        <translation type="unfinished">Збільшити</translation>
+    </message>
+    <message>
+        <source>Zoom out</source>
+        <translation type="unfinished">Зменшити</translation>
+    </message>
+    <message>
+        <source>Zoom 1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom fit best</source>
+        <translation type="unfinished">Помістити все</translation>
+    </message>
+    <message>
+        <source>Zoom sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished">Властивості</translation>
+    </message>
+    <message>
+        <source>File &apos;%1&apos; doesn&apos;t exist!</source>
+        <translation type="unfinished">Файл &apos;%1&apos; не існує!</translation>
+    </message>
+    <message>
+        <source>File error.</source>
+        <translation type="unfinished">Помилка файла.</translation>
+    </message>
+    <message>
+        <source>Unable to read a layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fail to create layout.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not extract data from file &apos;%1&apos;. %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Centimeters</source>
+        <translation type="unfinished">Сантиметри</translation>
+    </message>
+    <message>
+        <source>Millimiters</source>
+        <translation type="unfinished">Міліметри</translation>
+    </message>
+    <message>
+        <source>Inches</source>
+        <translation type="unfinished">Дюйми</translation>
+    </message>
+    <message>
+        <source>Scale:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>untitled %1.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>untitled.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read only</source>
+        <translation type="unfinished">тільки читання</translation>
+    </message>
+    <message>
+        <source>Cannot read settings from a malformed .INI file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save settings. Access denied.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to open file, is it writable?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New Window</source>
+        <translation type="unfinished">&amp;Нове вікно</translation>
+    </message>
+    <message>
+        <source>Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open file</source>
+        <translation type="unfinished">Відкрити файл</translation>
+    </message>
+    <message>
+        <source>Could not save the file</source>
+        <translation type="unfinished">Не вдалося зберегти файл</translation>
+    </message>
+    <message>
+        <source>layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save as</source>
+        <translation type="unfinished">Зберегти як</translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save file</source>
+        <translation type="unfinished">Не вдалося зберегти файл</translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window. Expect collissions when run 2 copies of the program.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Raw Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About Qt</source>
+        <translation type="unfinished">Про Qt</translation>
+    </message>
+    <message>
+        <source>PDF Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SVG Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPSheet</name>
+    <message>
+        <source>Letter</source>
+        <translation type="unfinished">Лист</translation>
+    </message>
+    <message>
+        <source>Legal</source>
+        <translation type="unfinished">Legal</translation>
+    </message>
+    <message>
+        <source>Tabloid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 24in</source>
+        <translation type="unfinished">Рулон 24 дюйми</translation>
+    </message>
+    <message>
+        <source>Roll 30in</source>
+        <translation type="unfinished">Рулон 30 дюймів</translation>
+    </message>
+    <message>
+        <source>Roll 36in</source>
+        <translation type="unfinished">Рулон 36 дюймів</translation>
+    </message>
+    <message>
+        <source>Roll 42in</source>
+        <translation type="unfinished">Рулон 42 дюйми</translation>
+    </message>
+    <message>
+        <source>Roll 44in</source>
+        <translation type="unfinished">Рулон 44 дюйми</translation>
+    </message>
+    <message>
+        <source>Roll 48in</source>
+        <translation type="unfinished">Рулон 44 дюйми {48i?}</translation>
+    </message>
+    <message>
+        <source>Roll 62in</source>
+        <translation type="unfinished">Рулон 44 дюйми {62i?}</translation>
+    </message>
+    <message>
+        <source>Roll 72in</source>
+        <translation type="unfinished">Рулон 44 дюйми {72i?}</translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPTileFactory</name>
+    <message>
+        <source>Grid ( %1 , %2 )</source>
+        <translation type="unfinished">Сітка ( %1 , %2 )</translation>
+    </message>
+    <message>
+        <source>Page %1 of %2</source>
+        <translation type="unfinished">Сторінка %1 з %2</translation>
+    </message>
+</context>
 <context>
     <name>VPattern</name>
     <message>
@@ -14389,23 +15368,23 @@ Do you want to save your changes?</source>
     <name>VPrintLayout</name>
     <message>
         <source>For printing multipages document all sheet should have the same size.</source>
-        <translation>Для друку багатосторінкового документа всі сторінки мають бути одного розміру.</translation>
+        <translation type="unfinished">Для друку багатосторінкового документа всі сторінки мають бути одного розміру.</translation>
     </message>
     <message>
         <source>For previewing multipage document all sheet should have the same size.</source>
-        <translation>Для перегляду багатосторінкового документу всі листи повинні мати той самий розмір.</translation>
+        <translation type="unfinished">Для перегляду багатосторінкового документу всі листи повинні мати той самий розмір.</translation>
     </message>
     <message>
         <source>Pages will be cropped because they do not fit printer paper size.</source>
-        <translation>Сторінки будуть обрізані тому що вони не відповідають формату паперу принтера.</translation>
+        <translation type="unfinished">Сторінки будуть обрізані тому що вони не відповідають формату паперу принтера.</translation>
     </message>
     <message>
         <source>Print error</source>
-        <translation>Помилка друку</translation>
+        <translation type="unfinished">Помилка друку</translation>
     </message>
     <message>
         <source>Cannot proceed because there are no available printers in your system.</source>
-        <translation>Не можливо виконати тому що не знайдено доступних принтерів у вашій системі.</translation>
+        <translation type="unfinished">Не можливо виконати тому що не знайдено доступних принтерів у вашій системі.</translation>
     </message>
     <message>
         <source>Failed to open file, is it writable?</source>
@@ -14417,7 +15396,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Cannot set printer margins</source>
-        <translation>Не вдалося встановити поля принтеру</translation>
+        <translation type="unfinished">Не вдалося встановити поля принтеру</translation>
     </message>
     <message>
         <source>Cannot set custom printer page size</source>
@@ -14445,18 +15424,30 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>The layout is stale.</source>
-        <translation>Розкладка застаріла.</translation>
+        <translation type="unfinished">Розкладка застаріла.</translation>
     </message>
     <message>
         <source>The layout was not updated since last pattern modification. Do you want to continue?</source>
-        <translation>Розкладка не була оновлена з часу останніх змін креслення. Ви хочете продовжити?</translation>
+        <translation type="unfinished">Розкладка не була оновлена з часу останніх змін креслення. Ви хочете продовжити?</translation>
+    </message>
+</context>
+<context>
+    <name>VRawLayout</name>
+    <message>
+        <source>VRawLayout::ReadFile() failed. Raw layout format prefix mismatch error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VRawLayout::ReadFile() failed.
+Raw layout format compatibility error: actualFileVersion = %1 and fileVersion = %2</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VSettings</name>
     <message>
         <source>layouts</source>
-        <translation>розкладки</translation>
+        <translation type="vanished">розкладки</translation>
     </message>
 </context>
 <context>
@@ -15405,7 +16396,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>Notes:</source>
-        <translation>Примітки:</translation>
+        <translation type="unfinished">Примітки:</translation>
     </message>
     <message>
         <source>Alias:</source>
@@ -17104,6 +18095,13 @@ Do you want to save your changes?</source>
         <translation type="vanished">Помилка відновлення резервного файлу: %1.</translation>
     </message>
 </context>
+<context>
+    <name>VValentinaSettings</name>
+    <message>
+        <source>layouts</source>
+        <translation type="unfinished">розкладки</translation>
+    </message>
+</context>
 <context>
     <name>VWidgetDetails</name>
     <message>
diff --git a/share/translations/valentina_zh_CN.ts b/share/translations/valentina_zh_CN.ts
index fd8286886..bf8c968af 100644
--- a/share/translations/valentina_zh_CN.ts
+++ b/share/translations/valentina_zh_CN.ts
@@ -563,11 +563,11 @@
         <translation type="unfinished">工具</translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alias:</source>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -658,11 +658,11 @@
         <translation type="unfinished">工具</translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alias:</source>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -828,11 +828,11 @@
         <translation type="unfinished">工具</translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alias:</source>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -883,11 +883,11 @@
         <translation type="unfinished">工具</translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alias:</source>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1040,10 +1040,6 @@
         <source>Tool</source>
         <translation type="unfinished">工具</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Alias1:</source>
         <translation type="unfinished"></translation>
@@ -1052,6 +1048,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCutSpline</name>
@@ -1115,10 +1115,6 @@
         <source>Tool</source>
         <translation type="unfinished">工具</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Alias1:</source>
         <translation type="unfinished"></translation>
@@ -1127,6 +1123,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogCutSplinePath</name>
@@ -1190,10 +1190,6 @@
         <source>Tool</source>
         <translation type="unfinished">工具</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Alias1:</source>
         <translation type="unfinished"></translation>
@@ -1202,6 +1198,10 @@
         <source>Alias2:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogDateTimeFormats</name>
@@ -1243,6 +1243,10 @@
         <source>Dimension labels</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Dimension:</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Value</source>
         <translation type="unfinished"></translation>
@@ -1251,10 +1255,6 @@
         <source>Label</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Dimension:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DialogDuplicateDetail</name>
@@ -1543,10 +1543,6 @@
         <source>Customer email</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Measurement: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
@@ -1568,23 +1564,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No data for the height dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the size dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the hip dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No data for the waist dimension.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Final measurement: %1</source>
+        <source>Measurement: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1607,6 +1587,26 @@
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Final measurement: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the height dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the size dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the hip dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No data for the waist dimension.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogEditWrongFormula</name>
@@ -1806,11 +1806,11 @@
         <translation type="unfinished">工具</translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alias:</source>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2110,10 +2110,6 @@
         <source>Tool</source>
         <translation type="unfinished">工具</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
@@ -2130,6 +2126,10 @@
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -2225,10 +2225,6 @@
         <source>Tool</source>
         <translation type="unfinished">工具</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
@@ -2245,6 +2241,10 @@
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -3399,42 +3399,6 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Skip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shift (%1)*:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File path is empty</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not enough columns</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not enough data to import</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please, select unique number for each column</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Name</source>
         <comment>measurement column</comment>
@@ -3465,6 +3429,42 @@ Apply settings anyway?</source>
         <comment>measurement column</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift (%1)*:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File path is empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not enough columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not enough data to import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, select unique number for each column</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogMove</name>
@@ -3556,10 +3556,6 @@ Apply settings anyway?</source>
         <source>Tool</source>
         <translation type="unfinished">工具</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Alias:</source>
         <translation type="unfinished"></translation>
@@ -3576,6 +3572,10 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -4827,6 +4827,27 @@ Apply settings anyway?</source>
         </translation>
     </message>
 </context>
+<context>
+    <name>DialogPuzzlePreferences</name>
+    <message>
+        <source>Puzzle preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paths</source>
+        <translation type="unfinished">路径</translation>
+    </message>
+    <message numerus="yes">
+        <source>Followed %n option(s) require restart to take effect: %1.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+</context>
 <context>
     <name>DialogRestrictDimension</name>
     <message>
@@ -4932,10 +4953,6 @@ Apply settings anyway?</source>
         <source>Tool</source>
         <translation type="unfinished">工具</translation>
     </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Alias</source>
         <translation type="unfinished"></translation>
@@ -4952,6 +4969,10 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Invalid suffix</source>
         <translation type="unfinished"></translation>
@@ -5154,6 +5175,10 @@ Apply settings anyway?</source>
         <source>Numerical control</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogSeamAllowance</name>
@@ -5414,7 +5439,8 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Height</source>
-        <translation type="obsolete">高度</translation>
+        <comment>dimension</comment>
+        <translation type="unfinished">高度</translation>
     </message>
     <message>
         <source>Min value:</source>
@@ -5450,12 +5476,23 @@ Apply settings anyway?</source>
     </message>
     <message>
         <source>Size</source>
-        <translation type="obsolete">尺码</translation>
+        <comment>dimension</comment>
+        <translation type="unfinished">尺码</translation>
     </message>
     <message>
         <source>Circumference</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Waist</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hip</source>
+        <comment>dimension</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Please, provide correct data for dimensions</source>
         <translation type="unfinished"></translation>
@@ -5472,26 +5509,6 @@ Apply settings anyway?</source>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Height</source>
-        <comment>dimension</comment>
-        <translation type="unfinished">高度</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <comment>dimension</comment>
-        <translation type="unfinished">尺码</translation>
-    </message>
-    <message>
-        <source>Waist</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hip</source>
-        <comment>dimension</comment>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DialogShoulderPoint</name>
@@ -5738,11 +5755,11 @@ Apply settings anyway?</source>
         <translation type="unfinished">工具</translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alias:</source>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5853,11 +5870,11 @@ Apply settings anyway?</source>
         <translation type="unfinished">工具</translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Alias:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alias:</source>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -6674,7 +6691,7 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>This file already opened in another window.</source>
-        <translation>这个文件已经在别的窗李打开的.</translation>
+        <translation type="vanished">这个文件已经在别的窗李打开的.</translation>
     </message>
     <message>
         <source>File error.</source>
@@ -6960,30 +6977,6 @@ Do you want to save your changes?</source>
         <source>Don&apos;t Save</source>
         <translation>不保存</translation>
     </message>
-    <message>
-        <source>Locking file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The lock file could not be created, for lack of permissions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Point intersection curves</source>
         <translation type="unfinished"></translation>
@@ -7096,18 +7089,6 @@ Do you want to save your changes?</source>
         <source>Select main path objects clockwise.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>The document has no write permissions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cannot set permissions for %1 to writable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not save the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Could not save the file</source>
         <translation type="unfinished"></translation>
@@ -7493,7 +7474,43 @@ Do you want to save your changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to change the premissions?</source>
+        <source>Manual Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open the Puzzle app</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update manual layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to prepare raw layout data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select manual layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7536,22 +7553,6 @@ Do you want to save your changes?</source>
         <source>Could not create recipe file. %1</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Shop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scalable Vector Graphics files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save draw</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw export</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>MainWindowsNoGUI</name>
@@ -7943,6 +7944,10 @@ Do you want to save your changes?</source>
         <source>My label templates</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>My manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PreferencesPatternPage</name>
@@ -8084,6 +8089,111 @@ This option will take an affect after restart.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>Puzzle</name>
+    <message>
+        <source>Export options can be used with single input file only.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Valentina&apos;s manual layout editor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The manual layout file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesConfigurationPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished">语言</translation>
+    </message>
+    <message>
+        <source>GUI language:</source>
+        <translation type="unfinished">GUI语言:</translation>
+    </message>
+    <message>
+        <source>Toolbar</source>
+        <translation type="unfinished">工具栏</translation>
+    </message>
+    <message>
+        <source>The text appears under the icon (recommended for beginners).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate dark mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t use the native file dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dark mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PuzzlePreferencesPathPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paths that Valentina uses</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Individual Measurements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Multisize Measurements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Patterns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Templates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>QCoreApplication</name>
     <message>
@@ -8363,6 +8473,10 @@ This option will take an affect after restart.</source>
         <source>Can&apos;t convert toInt parameter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Piece name &apos;%1&apos; is not unique.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Could not find the segment start.</source>
         <translation type="unfinished"></translation>
@@ -8379,6 +8493,10 @@ This option will take an affect after restart.</source>
         <source>Error calculating segment for curve &apos;%1&apos;. %2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot prepare builtin passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
@@ -8395,18 +8513,14 @@ This option will take an affect after restart.</source>
         <source>Cannot prepare passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Piece name &apos;%1&apos; is not unique.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error in path &apos;%1&apos;. Calculating segment for curve &apos;%2&apos; has failed. %3</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Cannot get tokens from formula &apos;%1&apos;. Formula error: %2.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>No data for the height dimension.</source>
         <translation type="unfinished"></translation>
@@ -8428,11 +8542,15 @@ This option will take an affect after restart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to prepare final measurement placeholder. Parser error at line %1: %2.</source>
+        <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Invalid global value for a passmark length. Piece &apos;%1&apos;. Length is less than minimal allowed.</source>
+        <source>Unplaced pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet 1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -8701,6 +8819,10 @@ This option will take an affect after restart.</source>
 </context>
 <context>
     <name>TMainWindow</name>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:18pt;&quot;&gt;Select New for creation measurement file.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Calculated value</source>
         <translation type="unfinished"></translation>
@@ -9065,30 +9187,6 @@ Do you want to save your changes?</source>
         <source>Don&apos;t Save</source>
         <translation>不保存</translation>
     </message>
-    <message>
-        <source>Locking file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The lock file could not be created, for lack of permissions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Export to CSV</source>
         <translation type="unfinished"></translation>
@@ -9113,18 +9211,6 @@ Do you want to save your changes?</source>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>The measurements document has no write permissions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cannot set permissions for %1 to writable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not save the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Could not save the file</source>
         <translation type="unfinished"></translation>
@@ -9254,11 +9340,37 @@ Do you want to save your changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to change the premissions?</source>
+        <source>Cannot read settings from a malformed .INI file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cannot read settings from a malformed .INI file.</source>
+        <source>Name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full name</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Calculated value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Formula</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Base value</source>
+        <comment>measurement column</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Correction</source>
+        <comment>measurement column</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9373,42 +9485,12 @@ Do you want to save your changes?</source>
         <source>Degrees</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Name</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full name</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calculated value</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Formula</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Base value</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Correction</source>
-        <comment>measurement column</comment>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Restrict first dimension</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:18pt;&quot;&gt;Select New to create a measurement file.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <source>untitled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -9941,6 +10023,18 @@ Do you want to save your changes?</source>
         <comment>seam allowance</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Universally Unique IDentifier of piece. Used to identifier piece while updating manual layout. Left empty to generate new value.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TabPlaceLabels</name>
@@ -10115,6 +10209,10 @@ Do you want to save your changes?</source>
         <source>My Patterns</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>My Layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TogglePieceForceForbidFlipping</name>
@@ -10159,14 +10257,6 @@ Do you want to save your changes?</source>
         <source>Base value invalid</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Height</source>
-        <translation type="obsolete">高度</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished">尺码</translation>
-    </message>
     <message>
         <source>Height</source>
         <comment>dimension</comment>
@@ -10197,6 +10287,10 @@ Do you want to save your changes?</source>
         <comment>dimension</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished">尺码</translation>
+    </message>
     <message>
         <source>Chest circumference</source>
         <comment>dimension</comment>
@@ -10364,6 +10458,50 @@ Do you want to save your changes?</source>
         <source>Export to CSV</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>The measurements document has no write permissions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to change the premissions?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot set permissions for %1 to writable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Locking file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This file already opened in another window.</source>
+        <translation type="unfinished">这个文件已经在别的窗李打开的.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created, for lack of permissions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown error happened, for instance a full partition prevented writing out the lock file.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VAbstractNode</name>
@@ -11001,6 +11139,34 @@ Do you want to save your changes?</source>
         <source>The dimension C base</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>The filename of exported layout file. Use it to enable console export mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The filename of layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pattern pieces form the raw layout data file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The raw layout data file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to output format (default = 0, export mode): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number corresponding to tiled pdf page template (default = 0, export mode with tiled pdf format): &lt;not defined&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run the program in a test mode. The program in this mode loads a single layout file and silently quit without showing the main window. The key have priority before key &apos;%1&apos;.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VCommonSettings</name>
@@ -11028,6 +11194,10 @@ Do you want to save your changes?</source>
         <source>patterns</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>manual layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VContainer</name>
@@ -11216,6 +11386,10 @@ Do you want to save your changes?</source>
 </context>
 <context>
     <name>VLayoutExporter</name>
+    <message>
+        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Cannot set printer page size</source>
         <translation type="unfinished"></translation>
@@ -11229,11 +11403,11 @@ Do you want to save your changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Creating file &apos;%1&apos; failed! %2</source>
+        <source>Export raw layout data failed. %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can&apos;t save file &apos;%1&apos;. Error: %2.</source>
+        <source>Creating file &apos;%1&apos; failed! %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -11422,6 +11596,114 @@ Do you want to save your changes?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>VPApplication</name>
+    <message>
+        <source>Error parsing file. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error bad id. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error can&apos;t convert value. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error empty parameter. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error wrong id. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Something&apos;s wrong!!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exception thrown: %1. Program will be terminated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t begin to listen for incoming connections on name &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export mode doesn&apos;t support openning several files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import raw layout data does not support openning several layout files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please, provide one input file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrousel</name>
+    <message>
+        <source>Pieces of </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPCarrouselPieceList</name>
+    <message>
+        <source>Move to Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">删除</translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPDialogAbout</name>
+    <message>
+        <source>About Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Puzzle version</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Build revision:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This program is part of Valentina project.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check For Updates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open your default browser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Build revision: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Built on %1 at %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Web site : %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VPE::VBoolProperty</name>
     <message>
@@ -11444,6 +11726,573 @@ Do you want to save your changes?</source>
         <translation>打开文件</translation>
     </message>
 </context>
+<context>
+    <name>VPGraphicsPiece</name>
+    <message>
+        <source>Move to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPLayoutFileReader</name>
+    <message>
+        <source>Piece List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Got empty attribute &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPMainWindow</name>
+    <message>
+        <source>Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Piece Carrousel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Infos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DummyName</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UUID:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>{7b2ce4ae-96f5-4905-bb34-405cb40ca208}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Seamline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Geometry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mirror piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Angle:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece by 90° anti-clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate the piece so that the grainline is horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Placement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Y:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No piece selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple pieces selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Width</source>
+        <translation type="unfinished">宽度</translation>
+    </message>
+    <message>
+        <source>Length</source>
+        <translation type="unfinished">长度</translation>
+    </message>
+    <message>
+        <source>Orientation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove unused length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Placement Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Row height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Follow grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vertical grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Horizontal grainline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pieces gap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sticky edges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiles properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tiled Pdf Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Tiles on sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export Tiled Pdf</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning superposition of pieces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning pieces out of bound</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+O</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save &amp;As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Import Raw Layout Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About &amp;Puzzle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom 1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom fit best</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File &apos;%1&apos; doesn&apos;t exist!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to read a layout file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fail to create layout.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not extract data from file &apos;%1&apos;. %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Centimeters</source>
+        <translation type="unfinished">公分</translation>
+    </message>
+    <message>
+        <source>Millimiters</source>
+        <translation type="unfinished">毫米</translation>
+    </message>
+    <message>
+        <source>Inches</source>
+        <translation type="unfinished">英寸</translation>
+    </message>
+    <message>
+        <source>Scale:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>untitled %1.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>untitled.vlt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot read settings from a malformed .INI file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save settings. Access denied.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to open file, is it writable?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open file</source>
+        <translation type="unfinished">打开文件</translation>
+    </message>
+    <message>
+        <source>Could not save the file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to lock. This file already opened in another window. Expect collissions when run 2 copies of the program.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Raw Layout files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About Qt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PDF Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SVG Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPSheet</name>
+    <message>
+        <source>Letter</source>
+        <translation type="unfinished">信</translation>
+    </message>
+    <message>
+        <source>Legal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabloid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 24in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 30in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 36in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 42in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 44in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 48in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 62in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roll 72in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPTileFactory</name>
+    <message>
+        <source>Grid ( %1 , %2 )</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page %1 of %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VPattern</name>
     <message>
@@ -11834,9 +12683,14 @@ Do you want to save your changes?</source>
     </message>
 </context>
 <context>
-    <name>VSettings</name>
+    <name>VRawLayout</name>
     <message>
-        <source>layouts</source>
+        <source>VRawLayout::ReadFile() failed. Raw layout format prefix mismatch error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VRawLayout::ReadFile() failed.
+Raw layout format compatibility error: actualFileVersion = %1 and fileVersion = %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -14164,6 +15018,13 @@ Do you want to save your changes?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>VValentinaSettings</name>
+    <message>
+        <source>layouts</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VWidgetDetails</name>
     <message>
diff --git a/src/app/app.pro b/src/app/app.pro
index 4a4eb35c8..6a02b9428 100644
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -1,8 +1,10 @@
 TEMPLATE = subdirs
 SUBDIRS = \
     tape \
-    valentina
+    valentina \
+    puzzle
 
-macx{# For making app bundle tape must exist before valentina.app will be created
+macx{# For making app bundle tape and puzzle must exist before valentina.app will be created
     valentina.depends = tape
+    valentina.depends = puzzle
 }
diff --git a/src/app/puzzle/carousel/vpcarrousel.cpp b/src/app/puzzle/carousel/vpcarrousel.cpp
new file mode 100644
index 000000000..e444a632b
--- /dev/null
+++ b/src/app/puzzle/carousel/vpcarrousel.cpp
@@ -0,0 +1,292 @@
+/************************************************************************
+ **
+ **  @file   vpcarrousel.cpp
+ **  @author Ronan Le Tiec
+ **  @date   13 4, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#include "vpcarrousel.h"
+#include "ui_vpcarrousel.h"
+#include <QVBoxLayout>
+#include <QMessageBox>
+#include <QScrollBar>
+#include <QFontMetrics>
+
+#include "../vmisc/backport/qoverload.h"
+#include "../layout/vpsheet.h"
+#include "../layout/vplayout.h"
+
+#include <QLoggingCategory>
+#include <QMenu>
+#include <QPainter>
+
+Q_LOGGING_CATEGORY(pCarrousel, "p.carrousel")
+
+//---------------------------------------------------------------------------------------------------------------------
+VPCarrousel::VPCarrousel(const VPLayoutPtr &layout, QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::VPCarrousel),
+    m_layout(layout)
+{
+    SCASSERT(not layout.isNull())
+    ui->setupUi(this);
+    ui->listWidget->SetCarrousel(this);
+
+    // init the combo box
+    connect(ui->comboBoxPieceList, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+            &VPCarrousel::on_ActivePieceListChanged);
+
+    connect(layout.get(), &VPLayout::ActiveSheetChanged, this, &VPCarrousel::on_ActiveSheetChanged);
+    connect(layout.get(), &VPLayout::SheetListChanged, this, &VPCarrousel::Refresh);
+
+    // ------ then we fill the carrousel with the layout content
+    Refresh();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPCarrousel::Refresh()
+{
+    const QUuid sheetUuid = ui->comboBoxPieceList->currentData().toUuid();
+
+    // --- clears the content of the carrousel
+    ui->comboBoxPieceList->blockSignals(true);
+    Clear();
+    ui->comboBoxPieceList->blockSignals(false);
+
+    // --- add the content saved in the layout to the carrousel.
+    // Do not rely on m_layout because we do not control it.
+    m_pieceLists = QList<VPCarrouselSheet>();
+
+    VPLayoutPtr layout = m_layout.toStrongRef();
+    if (not layout.isNull())
+    {
+        {
+            VPCarrouselSheet carrouselSheet;
+            carrouselSheet.unplaced = true;
+            carrouselSheet.active = false;
+            carrouselSheet.name = tr("Unplaced pieces");
+            carrouselSheet.pieces = layout->GetUnplacedPieces();
+
+            m_pieceLists.append(carrouselSheet);
+        }
+
+        QList<VPSheetPtr> sheets = layout->GetSheets();
+        for (const auto &sheet : sheets)
+        {
+            if (not sheet.isNull())
+            {
+                VPCarrouselSheet carrouselSheet;
+                carrouselSheet.unplaced = false;
+                carrouselSheet.active = (sheet == layout->GetFocusedSheet());
+                carrouselSheet.name = sheet->GetName();
+                carrouselSheet.pieces = sheet->GetPieces();
+                carrouselSheet.sheetUuid = sheet->Uuid();
+
+                m_pieceLists.append(carrouselSheet);
+            }
+        }
+
+        ui->comboBoxPieceList->blockSignals(true);
+
+        for (const auto& sheet: m_pieceLists)
+        {
+            ui->comboBoxPieceList->addItem(GetSheetName(sheet), sheet.sheetUuid);
+        }
+
+        ui->comboBoxPieceList->blockSignals(false);
+    }
+
+    ui->comboBoxPieceList->blockSignals(true);
+    ui->comboBoxPieceList->setCurrentIndex(-1);
+    ui->comboBoxPieceList->blockSignals(false);
+
+    int index = ui->comboBoxPieceList->findData(sheetUuid);
+    ui->comboBoxPieceList->setCurrentIndex(index != -1 ? index : 0);
+
+    RefreshOrientation();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPCarrousel::on_ActiveSheetChanged(const VPSheetPtr &sheet)
+{
+    if (not sheet.isNull())
+    {
+        int index = ui->comboBoxPieceList->findData(sheet->Uuid());
+        if (index != -1)
+        {
+            ui->comboBoxPieceList->setCurrentIndex(index);
+        }
+    }
+    else
+    {
+        ui->comboBoxPieceList->setCurrentIndex(0);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPCarrousel::RefreshSheetNames()
+{
+    VPLayoutPtr layout = m_layout.toStrongRef();
+    if (layout.isNull())
+    {
+        return;
+    }
+
+    for (int i=0; i < m_pieceLists.size(); ++i)
+    {
+        if (not m_pieceLists.at(i).unplaced)
+        {
+            VPSheetPtr sheet = layout->GetSheet(m_pieceLists.at(i).sheetUuid);
+            if (not sheet.isNull())
+            {
+                m_pieceLists[i].name = sheet->GetName();
+                m_pieceLists[i].active = (sheet == layout->GetFocusedSheet());
+            }
+        }
+        else
+        {
+            m_pieceLists[i].name = tr("Unplaced pieces");
+        }
+
+        ui->comboBoxPieceList->setItemText(i, GetSheetName(m_pieceLists.at(i)));
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPCarrousel::Clear()
+{
+    // remove the combobox entries
+    ui->comboBoxPieceList->clear();
+
+    ui->listWidget->clear();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPCarrousel::on_ActivePieceListChanged(int index)
+{
+    qCDebug(pCarrousel, "index changed %i", index);
+
+    VPLayoutPtr layout = m_layout.toStrongRef();
+    if (layout.isNull())
+    {
+        return;
+    }
+
+    if (not m_pieceLists.isEmpty() && index >= 0 && index < m_pieceLists.size())
+    {
+        ui->listWidget->SetCurrentPieceList(m_pieceLists.at(index).pieces);
+
+        if (index > 0)
+        {
+            QUuid sheetUuid = ui->comboBoxPieceList->currentData().toUuid();
+            VPSheetPtr sheet = layout->GetSheet(sheetUuid);
+
+            if (not sheet.isNull())
+            {
+                VPSheetPtr activeSheet = layout->GetFocusedSheet();
+                if (not activeSheet.isNull())
+                {
+                    activeSheet->ClearSelection();
+                }
+
+                m_ignoreActiveSheetChange = true;
+                layout->SetFocusedSheet(sheet);
+                m_ignoreActiveSheetChange = false;
+            }
+        }
+    }
+    else
+    {
+        ui->listWidget->SetCurrentPieceList(QList<VPPiecePtr>());
+        m_ignoreActiveSheetChange = true;
+        layout->SetFocusedSheet(VPSheetPtr());
+        m_ignoreActiveSheetChange = false;
+    }
+
+    RefreshSheetNames();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPCarrousel::SetOrientation(Qt::Orientation orientation)
+{
+    m_orientation = orientation;
+    RefreshOrientation();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPCarrousel::RefreshOrientation()
+{
+    // then update the scrollarea min height / width and scrollbar behaviour
+    if(m_orientation == Qt::Horizontal)
+    {
+        ui->comboBoxPieceList->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+
+        // scroll bar policy of scroll area
+        ui->listWidget->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+        ui->listWidget->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+
+        ui->listWidget->setFlow(QListView::TopToBottom);
+    }
+    else // Qt::Vertical
+    {
+        ui->comboBoxPieceList->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+
+        // scroll bar policy of scroll area
+        ui->listWidget->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+        ui->listWidget->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+
+        ui->listWidget->setFlow(QListView::LeftToRight);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPCarrousel::changeEvent(QEvent *event)
+{
+    if (event->type() == QEvent::LanguageChange)
+    {
+        // retranslate designer form (single inheritance approach)
+        ui->retranslateUi(this);
+
+        RefreshSheetNames();
+        on_ActivePieceListChanged(ui->comboBoxPieceList->currentIndex());
+    }
+
+    // remember to call base class implementation
+    QWidget::changeEvent(event);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPCarrousel::GetSheetName(const VPCarrouselSheet &sheet) -> QString
+{
+    if (sheet.unplaced)
+    {
+        return sheet.name;
+    }
+
+    if (sheet.active)
+    {
+        return QStringLiteral("--> %1 %2 <--").arg(tr("Pieces of"), sheet.name);
+    }
+
+    return tr("Pieces of ") + sheet.name;
+}
diff --git a/src/app/puzzle/carousel/vpcarrousel.h b/src/app/puzzle/carousel/vpcarrousel.h
new file mode 100644
index 000000000..c3a56b110
--- /dev/null
+++ b/src/app/puzzle/carousel/vpcarrousel.h
@@ -0,0 +1,112 @@
+/************************************************************************
+ **
+ **  @file   vpcarrousel.h
+ **  @author Ronan Le Tiec
+ **  @date   13 04, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+#ifndef VPCARROUSEL_H
+#define VPCARROUSEL_H
+
+#include <QWidget>
+#include <QComboBox>
+#include <QScrollArea>
+#include "../layout/vppiece.h"
+#include "../layout/layoutdef.h"
+
+namespace Ui
+{
+class VPCarrousel;
+}
+
+struct VPCarrouselSheet
+{
+    bool unplaced{true};
+    bool active{false};
+    QString name{};
+    QList<VPPiecePtr> pieces{};
+    QUuid sheetUuid{};
+};
+
+class VPCarrousel : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit VPCarrousel(const VPLayoutPtr &layout, QWidget *parent = nullptr);
+    virtual ~VPCarrousel() = default;
+
+    /**
+     * @brief SetOrientation Sets the orientation to the given value and refreshes
+     * the orientation of the carrousel.
+     * @param orientation the orientation to set the carrousel to.
+     */
+    void SetOrientation(Qt::Orientation orientation);
+
+    /**
+     * @brief RefreshOrientation Refreshes the orientation of the carrousel with the
+     * m_orientation value;
+     */
+    void RefreshOrientation();
+
+    void RefreshSheetNames();
+
+    /**
+     * @brief Clear Clears the carrousel (removes everything)
+     */
+    void Clear();
+
+public slots:
+    /**
+     * @brief Refresh Refreshes the content of the carrousel
+     */
+    void Refresh();
+    void on_ActiveSheetChanged(const VPSheetPtr &sheet);
+
+protected:
+    virtual void changeEvent(QEvent* event) override;
+
+private slots:
+
+    /**
+     * @brief on_ActivePieceListChanged Called when the active piece list is changed
+     * @param index piece index
+     */
+    void on_ActivePieceListChanged(int index);
+
+private:
+    Q_DISABLE_COPY(VPCarrousel)
+    Ui::VPCarrousel *ui;
+
+    VPLayoutWeakPtr m_layout{};
+
+    QList<VPCarrouselSheet> m_pieceLists{};
+
+    Qt::Orientation m_orientation{Qt::Vertical};
+
+    bool m_ignoreActiveSheetChange{false};
+
+    static auto GetSheetName(const VPCarrouselSheet &sheet) -> QString;
+};
+
+#endif // VPCARROUSEL_H
diff --git a/src/app/puzzle/carousel/vpcarrousel.ui b/src/app/puzzle/carousel/vpcarrousel.ui
new file mode 100644
index 000000000..3c198cc24
--- /dev/null
+++ b/src/app/puzzle/carousel/vpcarrousel.ui
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>VPCarrousel</class>
+ <widget class="QWidget" name="VPCarrousel">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>583</width>
+    <height>557</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string notr="true">Carrousel</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="leftMargin">
+    <number>6</number>
+   </property>
+   <property name="topMargin">
+    <number>6</number>
+   </property>
+   <property name="rightMargin">
+    <number>6</number>
+   </property>
+   <property name="bottomMargin">
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="QComboBox" name="comboBoxPieceList">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="sizeAdjustPolicy">
+      <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="VPCarrouselPieceList" name="listWidget">
+     <property name="verticalScrollBarPolicy">
+      <enum>Qt::ScrollBarAlwaysOn</enum>
+     </property>
+     <property name="dragDropMode">
+      <enum>QAbstractItemView::NoDragDrop</enum>
+     </property>
+     <property name="iconSize">
+      <size>
+       <width>120</width>
+       <height>120</height>
+      </size>
+     </property>
+     <property name="movement">
+      <enum>QListView::Static</enum>
+     </property>
+     <property name="flow">
+      <enum>QListView::TopToBottom</enum>
+     </property>
+     <property name="resizeMode">
+      <enum>QListView::Adjust</enum>
+     </property>
+     <property name="spacing">
+      <number>6</number>
+     </property>
+     <property name="viewMode">
+      <enum>QListView::IconMode</enum>
+     </property>
+     <property name="sortingEnabled">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>VPCarrouselPieceList</class>
+   <extends>QListWidget</extends>
+   <header>carousel/vpcarrouselpiecelist.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/app/puzzle/carousel/vpcarrouselpiece.cpp b/src/app/puzzle/carousel/vpcarrouselpiece.cpp
new file mode 100644
index 000000000..bd0af36ad
--- /dev/null
+++ b/src/app/puzzle/carousel/vpcarrouselpiece.cpp
@@ -0,0 +1,154 @@
+/************************************************************************
+ **
+ **  @file   vpcarrouselpiece.cpp
+ **  @author Ronan Le Tiec
+ **  @date   25 4, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+#include "vpcarrouselpiece.h"
+
+#include <QApplication>
+#include <QMenu>
+#include <QPainter>
+
+#include "vpmimedatapiece.h"
+#include "vpcarrouselpiecelist.h"
+#include "vpcarrousel.h"
+#include "../layout/vpsheet.h"
+#include "../layout/vppiece.h"
+
+#include <QLoggingCategory>
+
+Q_LOGGING_CATEGORY(pCarrouselPiece, "p.carrouselPiece")
+
+
+//---------------------------------------------------------------------------------------------------------------------
+VPCarrouselPiece::VPCarrouselPiece(const VPPiecePtr &piece, QListWidget* parent) :
+    QListWidgetItem(parent, Type),
+    m_piece(piece)
+{
+    SCASSERT(m_piece != nullptr)
+    int width = 120 - 8;
+    QFontMetrics metrix = QFontMetrics(QFont());
+    QString clippedText = metrix.elidedText(piece->GetName(), Qt::ElideRight, width);
+    setIcon(CreatePieceIcon(QSize(120, 120)));
+    setText(clippedText);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPCarrouselPiece::GetPiece() const -> VPPiecePtr
+{
+    return m_piece;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPCarrouselPiece::RefreshSelection()
+{
+    VPPiecePtr piece = GetPiece();
+    if (not piece.isNull())
+    {
+        setSelected(piece->IsSelected());
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPCarrouselPiece::CreatePieceIcon(const QSize &size, bool isDragIcon) const -> QIcon
+{
+    VPPiecePtr piece = GetPiece();
+    if (piece.isNull())
+    {
+        return {};
+    }
+
+    QRectF boundingRect = piece->DetailBoundingRect();
+    qreal canvasSize = qMax(boundingRect.height(), boundingRect.width());
+    QRectF canvas = QRectF(0, 0, canvasSize, canvasSize);
+
+    qreal dx = canvas.center().x() - boundingRect.center().x();
+    qreal dy = canvas.center().y() - boundingRect.center().y();
+
+    QVector<QIcon::Mode> iconModes;
+    iconModes.append(QIcon::Normal);
+
+    if(not isDragIcon)
+    {
+        iconModes.append(QIcon::Selected);
+    }
+
+    QIcon icon;
+
+    for(auto iconMode : iconModes)
+    {
+        QPixmap pixmap(size);
+
+        if(not isDragIcon)
+        {
+            pixmap.fill(QColor(Qt::white));
+        }
+        else
+        {
+            pixmap.fill(QColor(Qt::transparent));
+        }
+
+        QPainter painter;
+        painter.begin(&pixmap);
+        painter.setRenderHint(QPainter::Antialiasing);
+        painter.setRenderHint(QPainter::SmoothPixmapTransform);
+
+        int spacing = 2;
+
+        painter.translate(spacing, spacing);
+
+        qreal scaleFactorX = canvasSize * 100 / (size.width() - spacing*2) / 100;
+        qreal scaleFactorY = canvasSize * 100 / (size.height() - spacing*2) / 100;
+        painter.scale(1./scaleFactorX, 1./scaleFactorY);
+        painter.setPen(QPen(Qt::black, 0.8*qMax(scaleFactorX, scaleFactorY)));
+
+        if(not isDragIcon)
+        {
+            painter.translate(dx, dy);
+        }
+        else
+        {
+            painter.translate(-boundingRect.topLeft().x()+spacing, -boundingRect.topLeft().y()+spacing);
+        }
+
+        if(iconMode == QIcon::Selected)
+        {
+            painter.setBrush(QBrush(QColor(255,160,160,60)));
+        }
+        else
+        {
+            painter.setBrush(QBrush(Qt::white));
+        }
+
+        piece->DrawMiniature(painter);
+
+        painter.end();
+
+        icon.addPixmap(pixmap,iconMode);
+    }
+
+    return icon;
+}
diff --git a/src/app/puzzle/carousel/vpcarrouselpiece.h b/src/app/puzzle/carousel/vpcarrouselpiece.h
new file mode 100644
index 000000000..1786a8396
--- /dev/null
+++ b/src/app/puzzle/carousel/vpcarrouselpiece.h
@@ -0,0 +1,68 @@
+/************************************************************************
+ **
+ **  @file   vpcarrouselpiece.h
+ **  @author Ronan Le Tiec
+ **  @date   25 4, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#ifndef VPCARROUSELPIECE_H
+#define VPCARROUSELPIECE_H
+
+#include <QMouseEvent>
+#include <QListWidgetItem>
+
+#include "../layout/layoutdef.h"
+
+class VPCarrouselPiece : public QListWidgetItem
+{
+public:
+    enum { Type = UserType + 1};
+
+    explicit VPCarrouselPiece(const VPPiecePtr &piece, QListWidget* parent);
+    virtual ~VPCarrouselPiece() = default;
+
+    /**
+     * @brief GetPiece Returns the corresponding layout piece
+     * @return  the corresponding layout piece
+     */
+    auto GetPiece() const -> VPPiecePtr;
+
+    /**
+     * @brief RefreshSelection refreshes the selection of the piece according to the selection information of m_piece
+     */
+    void RefreshSelection();
+
+    /**
+     * @brief CreatePieceIcon Creates an icon of the piece of given size
+     * @param size of the icon
+     * @return the created icon
+     */
+    auto CreatePieceIcon(const QSize &size, bool isDragIcon = false) const -> QIcon;
+
+
+private:
+    Q_DISABLE_COPY(VPCarrouselPiece)
+    VPPieceWeakPtr m_piece;
+};
+
+#endif // VPCARROUSELPIECE_H
diff --git a/src/app/puzzle/carousel/vpcarrouselpiecelist.cpp b/src/app/puzzle/carousel/vpcarrouselpiecelist.cpp
new file mode 100644
index 000000000..b4538f0a7
--- /dev/null
+++ b/src/app/puzzle/carousel/vpcarrouselpiecelist.cpp
@@ -0,0 +1,250 @@
+/************************************************************************
+ **
+ **  @file   vpcarrouselpiecelist.cpp
+ **  @author Ronan Le Tiec
+ **  @date   25 4, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#include "vpcarrouselpiecelist.h"
+
+#include <QDrag>
+#include <QDragMoveEvent>
+#include <QPainter>
+#include <QApplication>
+#include <QMenu>
+
+#include "vpcarrousel.h"
+#include "vpcarrouselpiece.h"
+#include "../vmisc/backport/qoverload.h"
+#include "vpmimedatapiece.h"
+#include "../layout/vpsheet.h"
+#include "../layout/vplayout.h"
+#include "../undocommands/vpundomovepieceonsheet.h"
+
+#include <QLoggingCategory>
+
+Q_LOGGING_CATEGORY(pCarrouselPieceList, "p.carrouselPieceList")
+
+//---------------------------------------------------------------------------------------------------------------------
+VPCarrouselPieceList::VPCarrouselPieceList(QWidget* parent) :
+    QListWidget(parent)
+{
+    setStyleSheet("QListWidget::item{border: 2px solid transparent; color: black;}  "
+                  "QListWidget::item:selected {border: 2px solid rgb(255,160,160);}");
+    setContextMenuPolicy(Qt::DefaultContextMenu);
+    setSelectionMode(QAbstractItemView::MultiSelection);
+    setViewMode(QListView::IconMode);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPCarrouselPieceList::SetCarrousel(VPCarrousel *carrousel)
+{
+    m_carrousel = carrousel;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPCarrouselPieceList::Refresh()
+{
+    clear();
+
+    if(not m_pieceList.isEmpty())
+    {
+        // create the corresponding carrousel pieces
+        for (auto piece : m_pieceList)
+        {
+            if (not piece.isNull())
+            {
+                // update the label of the piece
+                auto* carrouselpiece = new VPCarrouselPiece(piece, this);
+                carrouselpiece->setSelected(piece->IsSelected());
+            }
+        }
+        sortItems();
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPCarrouselPieceList::SetCurrentPieceList(const QList<VPPiecePtr> &pieceList)
+{
+    m_pieceList = pieceList;
+
+    Refresh();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPCarrouselPieceList::mousePressEvent(QMouseEvent *event)
+{
+    if (event->button() == Qt::LeftButton)
+    {
+        m_dragStart = event->pos();
+    }
+
+    if (!(event->modifiers() & Qt::ControlModifier))
+    {
+        // clearSelection doesn't work properly here so we go through the elements.
+        for(auto *item: selectedItems())
+        {
+            item->setSelected(false);
+        }
+    }
+
+    QListWidget::mousePressEvent(event);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPCarrouselPieceList::mouseMoveEvent(QMouseEvent *event)
+{
+    if (((event->buttons() & Qt::LeftButton) != 0U) &&
+        ((event->pos() - m_dragStart).manhattanLength() >= QApplication::startDragDistance()) &&
+        (selectedItems().count() > 0) &&
+        (not m_pieceList.isEmpty() && m_pieceList.first()->Sheet() == nullptr)) // only if it's from unplaced pieces
+    {
+        startDrag(Qt::MoveAction);
+    }
+    else
+    {
+        QListWidget::mouseMoveEvent(event);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPCarrouselPieceList::startDrag(Qt::DropActions supportedActions)
+{
+    Q_UNUSED(supportedActions)
+
+    QListWidgetItem* _item = currentItem();
+    if(_item->type() == VPCarrouselPiece::Type)
+    {
+        auto *pieceItem = static_cast<VPCarrouselPiece *> (_item);
+
+        // starts the dragging
+        auto *drag = new QDrag(this);
+        auto *mimeData = new VPMimeDataPiece();
+        VPPiecePtr piece = pieceItem->GetPiece();
+        mimeData->SetPiecePtr(piece);
+
+        QPixmap pixmap = pieceItem->CreatePieceIcon(QSize(120, 120), true).pixmap(QSize(120, 120));
+
+        drag->setDragCursor(VPMimeDataPiece::DragCursor(pixmap), Qt::MoveAction);
+        drag->setMimeData(mimeData);
+        if(drag->exec() == Qt::MoveAction)
+        {
+            m_carrousel->Refresh();
+            piece->SetSelected(true);
+
+            VPLayoutPtr layout = piece->Layout();
+            if (not layout.isNull())
+            {
+                emit layout->PieceSelectionChanged(piece);
+            }
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPCarrouselPieceList::dragMoveEvent(QDragMoveEvent* e)
+{
+    qCDebug(pCarrouselPieceList, "drag move");
+    e->acceptProposedAction();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPCarrouselPieceList::contextMenuEvent(QContextMenuEvent *event)
+{
+    QListWidgetItem* _item = currentItem();
+    if(_item != nullptr && _item->type() == VPCarrouselPiece::Type)
+    {
+        auto *pieceItem = static_cast<VPCarrouselPiece *> (_item);
+
+        QMenu menu;
+
+        QAction *moveAction = menu.addAction(tr("Move to Sheet"));
+        moveAction->setVisible(false);
+
+        QAction *deleteAction = menu.addAction(tr("Delete"));
+        deleteAction->setVisible(false);
+
+        QAction *removeAction = menu.addAction(tr("Remove from Sheet"));
+        removeAction->setVisible(false);
+
+        if(not m_pieceList.isEmpty() && m_pieceList.first()->Sheet() == nullptr)
+        {
+            moveAction->setVisible(true);
+            deleteAction->setVisible(true);
+        }
+
+        if(not m_pieceList.isEmpty() && m_pieceList.first()->Sheet() != nullptr)
+        {
+            removeAction->setVisible(true);
+        }
+
+        QAction *selectedAction = menu.exec(event->globalPos());
+
+        VPPiecePtr piece = pieceItem->GetPiece();
+        VPLayoutPtr layout = piece->Layout();
+
+        if (piece.isNull() || layout.isNull())
+        {
+            return;
+        }
+
+        if (selectedAction == moveAction)
+        {
+            VPSheetPtr sheet = layout->GetFocusedSheet();
+            if (not sheet.isNull())
+            {
+                piece->ClearTransformations();
+                QRectF rect = sheet->GetMarginsRect();
+                piece->SetPosition(QPointF(rect.topLeft().x() + 1, rect.topLeft().y() + 1));
+                auto *command = new VPUndoMovePieceOnSheet(layout->GetFocusedSheet(), piece);
+                layout->UndoStack()->push(command);
+            }
+        }
+        else if (selectedAction == deleteAction)
+        {
+            auto *command = new VPUndoMovePieceOnSheet(layout->GetTrashSheet(), piece);
+            layout->UndoStack()->push(command);
+        }
+        else if (selectedAction == removeAction)
+        {
+            auto *command = new VPUndoMovePieceOnSheet(VPSheetPtr(), piece);
+            layout->UndoStack()->push(command);
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPCarrouselPieceList::on_SelectionChangedExternal()
+{
+    blockSignals(true);
+    for(int i = 0; i < count(); ++i)
+    {
+        QListWidgetItem* _item = item(i);
+        if(_item->type() == VPCarrouselPiece::Type)
+        {
+            auto *itemPiece = static_cast<VPCarrouselPiece *> (_item);
+            itemPiece->RefreshSelection();
+        }
+    }
+    blockSignals(false);
+}
diff --git a/src/app/puzzle/carousel/vpcarrouselpiecelist.h b/src/app/puzzle/carousel/vpcarrouselpiecelist.h
new file mode 100644
index 000000000..75714c7cf
--- /dev/null
+++ b/src/app/puzzle/carousel/vpcarrouselpiecelist.h
@@ -0,0 +1,84 @@
+/************************************************************************
+ **
+ **  @file   vpcarrouselpiecelist.h
+ **  @author Ronan Le Tiec
+ **  @date   25 4, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+#ifndef VPCARROUSELPIECELIST_H
+#define VPCARROUSELPIECELIST_H
+
+#include <QListWidget>
+
+#include "vpcarrousel.h"
+
+
+class VPCarrouselPieceList : public QListWidget
+{
+    Q_OBJECT
+public:
+    explicit VPCarrouselPieceList(QWidget* parent);
+    virtual ~VPCarrouselPieceList() = default;
+
+    /**
+     * @brief Refresh refreshes the items of the carrousel piece list
+     */
+    void Refresh();
+
+    /**
+     * @brief SetCurrentPieceList Sets the current piece list to the given piece list and redraw
+     * the carrousel.
+     */
+    void SetCurrentPieceList(const QList<VPPiecePtr> &pieceList);
+
+    /**
+     * @brief SetCarrousel Sets the carrousel corresponding to the list
+     * @param carrousel pointer to the carrousel
+     */
+    void SetCarrousel(VPCarrousel *carrousel);
+
+public slots:
+    /**
+     * @brief on_SelectionChangedExternal when the selection was changed outside of the carrousel
+     */
+    void on_SelectionChangedExternal();
+
+protected:
+    void startDrag(Qt::DropActions supportedActions) override;
+    void dragMoveEvent(QDragMoveEvent* e) override;
+
+    void mousePressEvent(QMouseEvent *event) override;
+    void mouseMoveEvent(QMouseEvent *event) override;
+
+    void contextMenuEvent(QContextMenuEvent *event) override;
+
+private:
+    Q_DISABLE_COPY(VPCarrouselPieceList)
+
+    QList<VPPiecePtr> m_pieceList{};
+    QPoint m_dragStart{};
+    VPCarrousel *m_carrousel{nullptr};
+};
+
+#endif // VPCARROUSELPIECELIST_H
diff --git a/src/app/puzzle/carousel/vpmimedatapiece.cpp b/src/app/puzzle/carousel/vpmimedatapiece.cpp
new file mode 100644
index 000000000..227447e5e
--- /dev/null
+++ b/src/app/puzzle/carousel/vpmimedatapiece.cpp
@@ -0,0 +1,67 @@
+/************************************************************************
+ **
+ **  @file   vpmimedatapiece.cpp
+ **  @author Ronan Le Tiec
+ **  @date   4 5, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+#include "vpmimedatapiece.h"
+
+#include <QPainter>
+#include <QPixmap>
+
+#include "../layout/vppiece.h"
+
+const QString VPMimeDataPiece::mineFormatPiecePtr = QStringLiteral("application/vnd.puzzle.piece.ptr");
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPMimeDataPiece::formats() const -> QStringList
+{
+    return {mineFormatPiecePtr};
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPMimeDataPiece::GetPiecePtr() const -> VPPiecePtr
+{
+    return m_piece;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMimeDataPiece::SetPiecePtr(const VPPiecePtr &piece)
+{
+    m_piece = piece;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPMimeDataPiece::DragCursor(const QPixmap &piecePixmap) -> QPixmap
+{
+    QPixmap dragCursor(piecePixmap.width()*2, piecePixmap.height()*2);
+    dragCursor.fill(Qt::transparent);
+    QPainter painter(&dragCursor);
+    painter.drawPixmap(dragCursor.width()/2, dragCursor.height()/2, piecePixmap);
+    QPixmap cursor = QPixmap("://cursor/collect.png");
+    painter.drawPixmap(dragCursor.width()/2 - cursor.width()/2, dragCursor.height()/2 - cursor.height()/2, cursor);
+    painter.end();
+    return dragCursor;
+}
diff --git a/src/app/puzzle/carousel/vpmimedatapiece.h b/src/app/puzzle/carousel/vpmimedatapiece.h
new file mode 100644
index 000000000..68e794b1a
--- /dev/null
+++ b/src/app/puzzle/carousel/vpmimedatapiece.h
@@ -0,0 +1,69 @@
+/************************************************************************
+ **
+ **  @file   vpmimedatapiece.h
+ **  @author Ronan Le Tiec
+ **  @date   4 5, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+#ifndef VPMIMEDATAPIECE_H
+#define VPMIMEDATAPIECE_H
+
+#include <QMimeData>
+#include <QSharedPointer>
+
+#include "../layout/layoutdef.h"
+
+class VPMimeDataPiece : public QMimeData
+{
+    Q_OBJECT
+
+public:
+    VPMimeDataPiece() = default;
+    virtual ~VPMimeDataPiece() = default;
+
+    virtual auto formats() const -> QStringList override;
+
+    /**
+     * @brief GetPiecePtr Returns the piece pointer of the mime data
+     * @return  piece pointer
+     */
+    auto GetPiecePtr() const -> VPPiecePtr;
+
+    /**
+     * @brief SetPiecePtr sets the piece pointer to the given value
+     * @param piece the piece pointer
+     */
+    void SetPiecePtr(const VPPiecePtr &piece);
+
+    static auto DragCursor(const QPixmap &piecePixmap) -> QPixmap;
+
+    static const QString mineFormatPiecePtr;
+
+private:
+    Q_DISABLE_COPY(VPMimeDataPiece)
+
+    VPPieceWeakPtr m_piece{};
+};
+
+#endif // VPMIMEDATAPIECE_H
diff --git a/src/app/puzzle/dialogs/configpages/puzzlepreferencesconfigurationpage.cpp b/src/app/puzzle/dialogs/configpages/puzzlepreferencesconfigurationpage.cpp
new file mode 100644
index 000000000..094f64011
--- /dev/null
+++ b/src/app/puzzle/dialogs/configpages/puzzlepreferencesconfigurationpage.cpp
@@ -0,0 +1,163 @@
+/************************************************************************
+ **
+ **  @file   puzzlepreferencesconfigurationpage.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   21 5, 2021
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2021 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+#include "puzzlepreferencesconfigurationpage.h"
+#include "ui_puzzlepreferencesconfigurationpage.h"
+#include "../../vpapplication.h"
+
+//---------------------------------------------------------------------------------------------------------------------
+PuzzlePreferencesConfigurationPage::PuzzlePreferencesConfigurationPage(QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::PuzzlePreferencesConfigurationPage)
+{
+    ui->setupUi(this);
+
+    InitLanguages(ui->langCombo);
+    connect(ui->langCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this]()
+    {
+        m_langChanged = true;
+    });
+
+    VPSettings *settings = VPApplication::VApp()->PuzzleSettings();
+
+    // Theme
+    ui->darkModeCheck->setChecked(settings->GetDarkMode());
+
+    // Native dialogs
+    ui->checkBoxDontUseNativeDialog->setChecked(settings->IsDontUseNativeDialog());
+
+    //----------------------- Toolbar
+    ui->toolBarStyleCheck->setChecked(settings->GetToolBarStyle());
+
+    // Undo
+    ui->undoCount->setValue(settings->GetUndoCount());
+
+    //Graphical output
+    ui->graphOutputCheck->setChecked(settings->GetGraphicalOutput());
+    ui->checkBoxOpenGLRender->setChecked(settings->IsOpenGLRender());
+
+    // Tab Scrolling
+    ui->spinBoxDuration->setMinimum(VCommonSettings::scrollingDurationMin);
+    ui->spinBoxDuration->setMaximum(VCommonSettings::scrollingDurationMax);
+    ui->spinBoxDuration->setValue(settings->GetScrollingDuration());
+
+    ui->spinBoxUpdateInterval->setMinimum(VCommonSettings::scrollingUpdateIntervalMin);
+    ui->spinBoxUpdateInterval->setMaximum(VCommonSettings::scrollingUpdateIntervalMax);
+    ui->spinBoxUpdateInterval->setValue(settings->GetScrollingUpdateInterval());
+
+    ui->doubleSpinBoxSensor->setMinimum(VCommonSettings::sensorMouseScaleMin);
+    ui->doubleSpinBoxSensor->setMaximum(VCommonSettings::sensorMouseScaleMax);
+    ui->doubleSpinBoxSensor->setValue(settings->GetSensorMouseScale());
+
+    ui->doubleSpinBoxWheel->setMinimum(VCommonSettings::wheelMouseScaleMin);
+    ui->doubleSpinBoxWheel->setMaximum(VCommonSettings::wheelMouseScaleMax);
+    ui->doubleSpinBoxWheel->setValue(settings->GetWheelMouseScale());
+
+    ui->doubleSpinBoxAcceleration->setMinimum(VCommonSettings::scrollingAccelerationMin);
+    ui->doubleSpinBoxAcceleration->setMaximum(VCommonSettings::scrollingAccelerationMax);
+    ui->doubleSpinBoxAcceleration->setValue(settings->GetScrollingAcceleration());
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+PuzzlePreferencesConfigurationPage::~PuzzlePreferencesConfigurationPage()
+{
+    delete ui;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto PuzzlePreferencesConfigurationPage::Apply() -> QStringList
+{
+    QStringList preferences;
+    VPSettings *settings = VPApplication::VApp()->PuzzleSettings();
+
+    settings->SetToolBarStyle(ui->toolBarStyleCheck->isChecked());
+
+    if (settings->GetDarkMode() != ui->darkModeCheck->isChecked())
+    {
+        settings->SetDarkMode(ui->darkModeCheck->isChecked());
+        preferences.append(tr("dark mode"));
+    }
+
+    if (settings->IsDontUseNativeDialog() != ui->checkBoxDontUseNativeDialog->isChecked())
+    {
+        settings->SetDontUseNativeDialog(ui->checkBoxDontUseNativeDialog->isChecked());
+    }
+
+    if (m_langChanged)
+    {
+        const QString locale = qvariant_cast<QString>(ui->langCombo->currentData());
+        settings->SetLocale(locale);
+        m_langChanged = false;
+
+        VAbstractApplication::VApp()->LoadTranslation(locale);
+        qApp->processEvents();// force to call changeEvent
+    }
+
+    /* Maximum number of commands in undo stack may only be set when the undo stack is empty, since setting it on a
+     * non-empty stack might delete the command at the current index. Calling setUndoLimit() on a non-empty stack
+     * prints a warning and does nothing.*/
+    if (settings->GetUndoCount() != ui->undoCount->value())
+    {
+        preferences.append(tr("undo limit"));
+        settings->SetUndoCount(ui->undoCount->value());
+    }
+
+    // Scene antialiasing
+    if (settings->GetGraphicalOutput() != ui->graphOutputCheck->isChecked())
+    {
+        preferences.append(tr("antialiasing"));
+        settings->SetGraphicalOutput(ui->graphOutputCheck->isChecked());
+    }
+
+    if (settings->IsOpenGLRender() != ui->checkBoxOpenGLRender->isChecked())
+    {
+        preferences.append(tr("scene render"));
+        settings->SetOpenGLRender(ui->checkBoxOpenGLRender->isChecked());
+    }
+
+    // Tab Scrolling
+    settings->SetScrollingDuration(ui->spinBoxDuration->value());
+    settings->SetScrollingUpdateInterval(ui->spinBoxUpdateInterval->value());
+    settings->SetSensorMouseScale(ui->doubleSpinBoxSensor->value());
+    settings->SetWheelMouseScale(ui->doubleSpinBoxWheel->value());
+    settings->SetScrollingAcceleration(ui->doubleSpinBoxAcceleration->value());
+
+    return preferences;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void PuzzlePreferencesConfigurationPage::changeEvent(QEvent *event)
+{
+    if (event->type() == QEvent::LanguageChange)
+    {
+        // retranslate designer form (single inheritance approach)
+        ui->retranslateUi(this);
+    }
+    // remember to call base class implementation
+    QWidget::changeEvent(event);
+}
diff --git a/src/app/puzzle/dialogs/configpages/puzzlepreferencesconfigurationpage.h b/src/app/puzzle/dialogs/configpages/puzzlepreferencesconfigurationpage.h
new file mode 100644
index 000000000..1656a2922
--- /dev/null
+++ b/src/app/puzzle/dialogs/configpages/puzzlepreferencesconfigurationpage.h
@@ -0,0 +1,57 @@
+/************************************************************************
+ **
+ **  @file   puzzlepreferencesconfigurationpage.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   21 5, 2021
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2021 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#ifndef PUZZLEPREFERENCESCONFIGURATIONPAGE_H
+#define PUZZLEPREFERENCESCONFIGURATIONPAGE_H
+
+#include <QWidget>
+
+namespace Ui
+{
+    class PuzzlePreferencesConfigurationPage;
+}
+
+class PuzzlePreferencesConfigurationPage : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit PuzzlePreferencesConfigurationPage(QWidget *parent = nullptr);
+    virtual ~PuzzlePreferencesConfigurationPage();
+
+    QStringList Apply();
+
+protected:
+    virtual void changeEvent(QEvent* event) override;
+
+private:
+    Q_DISABLE_COPY(PuzzlePreferencesConfigurationPage)
+    Ui::PuzzlePreferencesConfigurationPage *ui;
+    bool m_langChanged{false};
+};
+
+#endif // PUZZLEPREFERENCESCONFIGURATIONPAGE_H
diff --git a/src/app/puzzle/dialogs/configpages/puzzlepreferencesconfigurationpage.ui b/src/app/puzzle/dialogs/configpages/puzzlepreferencesconfigurationpage.ui
new file mode 100644
index 000000000..35b7e19a7
--- /dev/null
+++ b/src/app/puzzle/dialogs/configpages/puzzlepreferencesconfigurationpage.ui
@@ -0,0 +1,385 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>PuzzlePreferencesConfigurationPage</class>
+ <widget class="QWidget" name="PuzzlePreferencesConfigurationPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>702</width>
+    <height>741</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QTabWidget" name="tabWidget">
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="tabGeneral">
+      <attribute name="title">
+       <string>General</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <widget class="QScrollArea" name="scrollArea">
+         <property name="widgetResizable">
+          <bool>true</bool>
+         </property>
+         <widget class="QWidget" name="scrollAreaWidgetContents">
+          <property name="geometry">
+           <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>660</width>
+            <height>672</height>
+           </rect>
+          </property>
+          <layout class="QVBoxLayout" name="verticalLayout_6">
+           <item>
+            <widget class="QGroupBox" name="groupBox_2">
+             <property name="title">
+              <string>Language</string>
+             </property>
+             <layout class="QFormLayout" name="formLayout">
+              <property name="fieldGrowthPolicy">
+               <enum>QFormLayout::ExpandingFieldsGrow</enum>
+              </property>
+              <item row="0" column="0">
+               <widget class="QLabel" name="label_2">
+                <property name="text">
+                 <string>GUI language:</string>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="1">
+               <widget class="QComboBox" name="langCombo"/>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="groupBox_6">
+             <property name="title">
+              <string>Toolbar</string>
+             </property>
+             <layout class="QVBoxLayout" name="verticalLayout_4">
+              <item>
+               <widget class="QCheckBox" name="toolBarStyleCheck">
+                <property name="text">
+                 <string>The text appears under the icon (recommended for beginners).</string>
+                </property>
+                <property name="checked">
+                 <bool>true</bool>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="groupBox_4">
+             <property name="title">
+              <string>User Interface</string>
+             </property>
+             <layout class="QVBoxLayout" name="verticalLayout_5">
+              <item>
+               <widget class="QCheckBox" name="darkModeCheck">
+                <property name="text">
+                 <string>Activate dark mode</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="checkBoxDontUseNativeDialog">
+                <property name="text">
+                 <string>Don't use the native file dialog</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="groupBox_3">
+             <property name="title">
+              <string>Graphical output</string>
+             </property>
+             <layout class="QVBoxLayout" name="verticalLayout_3">
+              <item>
+               <widget class="QCheckBox" name="graphOutputCheck">
+                <property name="text">
+                 <string>Use antialiasing</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="checkBoxOpenGLRender">
+                <property name="toolTip">
+                 <string>Use OpenGL to render a scene.
+This option will take an affect after restart.</string>
+                </property>
+                <property name="text">
+                 <string>Use OpenGL render</string>
+                </property>
+                <property name="tristate">
+                 <bool>false</bool>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="groupBox_5">
+             <property name="title">
+              <string>Undo</string>
+             </property>
+             <layout class="QFormLayout" name="formLayout_2">
+              <property name="fieldGrowthPolicy">
+               <enum>QFormLayout::ExpandingFieldsGrow</enum>
+              </property>
+              <item row="0" column="0">
+               <widget class="QLabel" name="label_3">
+                <property name="text">
+                 <string>Count steps (0 - no limit):</string>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="1">
+               <widget class="QSpinBox" name="undoCount"/>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <spacer name="verticalSpacer">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>40</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </widget>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tabScrolling">
+      <attribute name="title">
+       <string>Scrolling</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_7">
+       <item>
+        <widget class="QScrollArea" name="scrollArea_2">
+         <property name="widgetResizable">
+          <bool>true</bool>
+         </property>
+         <widget class="QWidget" name="scrollAreaWidgetContents_2">
+          <property name="geometry">
+           <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>660</width>
+            <height>672</height>
+           </rect>
+          </property>
+          <layout class="QVBoxLayout" name="verticalLayout_8">
+           <item>
+            <widget class="QGroupBox" name="groupBox">
+             <property name="title">
+              <string>Animation</string>
+             </property>
+             <layout class="QFormLayout" name="formLayout_3">
+              <property name="fieldGrowthPolicy">
+               <enum>QFormLayout::ExpandingFieldsGrow</enum>
+              </property>
+              <item row="0" column="0">
+               <widget class="QLabel" name="label_8">
+                <property name="text">
+                 <string>Duration:</string>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="1">
+               <widget class="QSpinBox" name="spinBoxDuration">
+                <property name="toolTip">
+                 <string>Scrolling animation duration</string>
+                </property>
+                <property name="suffix">
+                 <string comment="milliseconds">ms</string>
+                </property>
+                <property name="minimum">
+                 <number>100</number>
+                </property>
+                <property name="maximum">
+                 <number>1000</number>
+                </property>
+                <property name="value">
+                 <number>300</number>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="0">
+               <widget class="QLabel" name="label_10">
+                <property name="text">
+                 <string>Update interval:</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="1">
+               <widget class="QSpinBox" name="spinBoxUpdateInterval">
+                <property name="toolTip">
+                 <string>Time in milliseconds between each animation update</string>
+                </property>
+                <property name="suffix">
+                 <string comment="milliseconds">ms</string>
+                </property>
+                <property name="minimum">
+                 <number>10</number>
+                </property>
+                <property name="maximum">
+                 <number>100</number>
+                </property>
+                <property name="value">
+                 <number>30</number>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="groupBox_8">
+             <property name="title">
+              <string>Mouse scale</string>
+             </property>
+             <layout class="QFormLayout" name="formLayout_4">
+              <property name="fieldGrowthPolicy">
+               <enum>QFormLayout::ExpandingFieldsGrow</enum>
+              </property>
+              <item row="0" column="0">
+               <widget class="QLabel" name="label_11">
+                <property name="text">
+                 <string comment="sensor mouse">Sensor:</string>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="1">
+               <widget class="QDoubleSpinBox" name="doubleSpinBoxSensor">
+                <property name="toolTip">
+                 <string>Scale scrolling sensitivity for mouse with sensor</string>
+                </property>
+                <property name="minimum">
+                 <double>1.000000000000000</double>
+                </property>
+                <property name="maximum">
+                 <double>10.000000000000000</double>
+                </property>
+                <property name="singleStep">
+                 <double>0.100000000000000</double>
+                </property>
+                <property name="value">
+                 <double>2.000000000000000</double>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="0">
+               <widget class="QLabel" name="label_12">
+                <property name="text">
+                 <string comment="mouse wheel">Wheel:</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="1">
+               <widget class="QDoubleSpinBox" name="doubleSpinBoxWheel">
+                <property name="toolTip">
+                 <string>Scale scrolling sensitivity for mouse with wheel</string>
+                </property>
+                <property name="minimum">
+                 <double>1.000000000000000</double>
+                </property>
+                <property name="maximum">
+                 <double>100.000000000000000</double>
+                </property>
+                <property name="singleStep">
+                 <double>0.100000000000000</double>
+                </property>
+                <property name="value">
+                 <double>45.000000000000000</double>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="groupBox_7">
+             <property name="title">
+              <string>Scrolling</string>
+             </property>
+             <layout class="QFormLayout" name="formLayout_5">
+              <property name="fieldGrowthPolicy">
+               <enum>QFormLayout::ExpandingFieldsGrow</enum>
+              </property>
+              <item row="0" column="0">
+               <widget class="QLabel" name="label_13">
+                <property name="text">
+                 <string>Acceleration:</string>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="1">
+               <widget class="QDoubleSpinBox" name="doubleSpinBoxAcceleration">
+                <property name="minimum">
+                 <double>1.000000000000000</double>
+                </property>
+                <property name="maximum">
+                 <double>10.000000000000000</double>
+                </property>
+                <property name="singleStep">
+                 <double>0.100000000000000</double>
+                </property>
+                <property name="value">
+                 <double>1.300000000000000</double>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <spacer name="verticalSpacer_2">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>359</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </widget>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/app/puzzle/dialogs/configpages/puzzlepreferenceslayoutpage.cpp b/src/app/puzzle/dialogs/configpages/puzzlepreferenceslayoutpage.cpp
new file mode 100644
index 000000000..08a140fb2
--- /dev/null
+++ b/src/app/puzzle/dialogs/configpages/puzzlepreferenceslayoutpage.cpp
@@ -0,0 +1,659 @@
+/************************************************************************
+ **
+ **  @file   puzzlepreferenceslayoutpage.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   20 8, 2021
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2021 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#include "puzzlepreferenceslayoutpage.h"
+#include "ui_puzzlepreferenceslayoutpage.h"
+#include "vpapplication.h"
+
+//---------------------------------------------------------------------------------------------------------------------
+PuzzlePreferencesLayoutPage::PuzzlePreferencesLayoutPage(QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::PuzzlePreferencesLayoutPage)
+{
+    ui->setupUi(this);
+
+    VPApplication::VApp()->PuzzleSettings()->GetOsSeparator() ? setLocale(QLocale()) : setLocale(QLocale::c());
+
+    InitLayoutUnits();
+    VAbstractLayoutDialog::InitTemplates(ui->comboBoxSheetTemplates);
+    VAbstractLayoutDialog::InitTileTemplates(ui->comboBoxTileTemplates);
+    MinimumSheetPaperSize();
+    MinimumTilePaperSize();
+
+    ReadSettings();
+
+    connect(ui->comboBoxLayoutUnit, QOverload<int>::of(&QComboBox::currentIndexChanged),
+            this, &PuzzlePreferencesLayoutPage::ConvertPaperSize);
+
+    connect(ui->comboBoxSheetTemplates, QOverload<int>::of(&QComboBox::currentIndexChanged),
+            this, [this]{SheetSize(SheetTemplate());});
+    connect(ui->comboBoxTileTemplates, QOverload<int>::of(&QComboBox::currentIndexChanged),
+            this, [this]{TileSize(TileTemplate());});
+
+    connect(ui->doubleSpinBoxSheetPaperWidth, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
+            this, &PuzzlePreferencesLayoutPage::SheetPaperSizeChanged);
+    connect(ui->doubleSpinBoxSheetPaperHeight, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
+            this, &PuzzlePreferencesLayoutPage::SheetPaperSizeChanged);
+    connect(ui->doubleSpinBoxTilePaperWidth, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
+            this, &PuzzlePreferencesLayoutPage::TilePaperSizeChanged);
+    connect(ui->doubleSpinBoxTilePaperHeight, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
+            this, &PuzzlePreferencesLayoutPage::TilePaperSizeChanged);
+
+    connect(ui->doubleSpinBoxSheetPaperWidth, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
+            this, &PuzzlePreferencesLayoutPage::FindSheetTemplate);
+    connect(ui->doubleSpinBoxSheetPaperHeight, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
+            this, &PuzzlePreferencesLayoutPage::FindSheetTemplate);
+    connect(ui->doubleSpinBoxTilePaperWidth, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
+            this, &PuzzlePreferencesLayoutPage::FindTileTemplate);
+    connect(ui->doubleSpinBoxTilePaperHeight, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
+            this, &PuzzlePreferencesLayoutPage::FindTileTemplate);
+
+    connect(ui->doubleSpinBoxSheetPaperWidth, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
+            this, &PuzzlePreferencesLayoutPage::CorrectMaxMargins);
+    connect(ui->doubleSpinBoxSheetPaperHeight, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
+            this, &PuzzlePreferencesLayoutPage::CorrectMaxMargins);
+    connect(ui->doubleSpinBoxTilePaperWidth, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
+            this, &PuzzlePreferencesLayoutPage::CorrectMaxMargins);
+    connect(ui->doubleSpinBoxTilePaperHeight, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
+            this, &PuzzlePreferencesLayoutPage::CorrectMaxMargins);
+
+    connect(ui->checkBoxLayoutIgnoreFileds, &QCheckBox::stateChanged, this,
+            &PuzzlePreferencesLayoutPage::LayoutSheetIgnoreMargins);
+    connect(ui->checkBoxTileIgnoreFileds, &QCheckBox::stateChanged, this,
+            &PuzzlePreferencesLayoutPage::LayoutTileIgnoreMargins);
+
+    connect(ui->toolButtonSheetPortraitOritation, &QToolButton::toggled, this,
+            &PuzzlePreferencesLayoutPage::SwapSheetOrientation);
+    connect(ui->toolButtonSheetLandscapeOrientation, &QToolButton::toggled, this,
+            &PuzzlePreferencesLayoutPage::SwapSheetOrientation);
+    connect(ui->toolButtonTilePortraitOrientation, &QToolButton::toggled, this,
+            &PuzzlePreferencesLayoutPage::SwapTileOrientation);
+    connect(ui->toolButtonTileLandscapeOrientation, &QToolButton::toggled, this,
+            &PuzzlePreferencesLayoutPage::SwapTileOrientation);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+PuzzlePreferencesLayoutPage::~PuzzlePreferencesLayoutPage()
+{
+    delete ui;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto PuzzlePreferencesLayoutPage::Apply() -> QStringList
+{
+    QStringList preferences;
+    VPSettings *settings = VPApplication::VApp()->PuzzleSettings();
+
+    settings->SetLayoutUnit(LayoutUnit());
+
+    settings->SetLayoutSheetPaperHeight(
+                UnitConvertor(ui->doubleSpinBoxSheetPaperHeight->value(), m_oldLayoutUnit, Unit::Px));
+    settings->SetLayoutSheetPaperWidth(
+                UnitConvertor(ui->doubleSpinBoxSheetPaperWidth->value(), m_oldLayoutUnit, Unit::Px));
+
+    settings->SetLayoutSheetIgnoreMargins(ui->checkBoxLayoutIgnoreFileds->isChecked());
+    settings->SetLayoutSheetMargins(GetSheetMargins());
+
+    settings->SetLayoutTileShowTiles(ui->checkBoxTileShowTiles->isChecked());
+    settings->SetLayoutTileShowWatermark(ui->checkBoxTileShowWatermark->isChecked());
+
+    settings->SetLayoutTilePaperHeight(
+                UnitConvertor(ui->doubleSpinBoxTilePaperHeight->value(), m_oldLayoutUnit, Unit::Px));
+    settings->SetLayoutTilePaperWidth(
+                UnitConvertor(ui->doubleSpinBoxTilePaperWidth->value(), m_oldLayoutUnit, Unit::Px));
+
+    settings->SetLayoutTileIgnoreMargins(ui->checkBoxTileIgnoreFileds->isChecked());
+    settings->SetLayoutTileMargins(GetTileMargins());
+
+    settings->SetLayoutPieceGap(UnitConvertor(ui->doubleSpinBoxPiecesGap->value(), m_oldLayoutUnit, Unit::Px));
+
+    settings->SetLayoutWarningPiecesSuperposition(ui->checkBoxWarningPiecesSuperposition->isChecked());
+    settings->SetLayoutStickyEdges(ui->checkBoxStickyEdges->isChecked());
+    settings->SetLayoutWarningPiecesOutOfBound(ui->checkBoxWarningPiecesOutOfBound->isChecked());
+    settings->SetLayoutFollowGrainline(ui->checkBoxFollowGrainline->isChecked());
+
+    preferences.append(tr("default layout settings"));
+    return preferences;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void PuzzlePreferencesLayoutPage::changeEvent(QEvent *event)
+{
+    if (event->type() == QEvent::LanguageChange)
+    {
+        // retranslate designer form (single inheritance approach)
+        ui->retranslateUi(this);
+    }
+    // remember to call base class implementation
+    QWidget::changeEvent(event);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void PuzzlePreferencesLayoutPage::ConvertPaperSize()
+{
+    const Unit layoutUnit = LayoutUnit();
+
+    const qreal sheetWidth = ui->doubleSpinBoxSheetPaperWidth->value();
+    const qreal sheetHeight = ui->doubleSpinBoxSheetPaperHeight->value();
+
+    const qreal sheetLeftMargin = ui->doubleSpinBoxSheetMarginLeft->value();
+    const qreal sheetRightMargin = ui->doubleSpinBoxSheetMarginRight->value();
+    const qreal sheetTopMargin = ui->doubleSpinBoxSheetMarginTop->value();
+    const qreal sheetBottomMargin = ui->doubleSpinBoxSheetMarginBottom->value();
+
+    ui->doubleSpinBoxSheetPaperWidth->blockSignals(true);
+    ui->doubleSpinBoxSheetPaperHeight->blockSignals(true);
+    ui->doubleSpinBoxSheetPaperWidth->setMaximum(FromPixel(QIMAGE_MAX, layoutUnit));
+    ui->doubleSpinBoxSheetPaperHeight->setMaximum(FromPixel(QIMAGE_MAX, layoutUnit));
+    ui->doubleSpinBoxSheetPaperWidth->blockSignals(false);
+    ui->doubleSpinBoxSheetPaperHeight->blockSignals(false);
+
+    const qreal newSheetWidth = UnitConvertor(sheetWidth, m_oldLayoutUnit, layoutUnit);
+    const qreal newSheetHeight = UnitConvertor(sheetHeight, m_oldLayoutUnit, layoutUnit);
+
+    const qreal newSheetLeftMargin = UnitConvertor(sheetLeftMargin, m_oldLayoutUnit, layoutUnit);
+    const qreal newSheetRightMargin = UnitConvertor(sheetRightMargin, m_oldLayoutUnit, layoutUnit);
+    const qreal newSheetTopMargin = UnitConvertor(sheetTopMargin, m_oldLayoutUnit, layoutUnit);
+    const qreal newSheetBottomMargin = UnitConvertor(sheetBottomMargin, m_oldLayoutUnit, layoutUnit);
+
+    const qreal tileWidth = ui->doubleSpinBoxTilePaperWidth->value();
+    const qreal tileHeight = ui->doubleSpinBoxTilePaperHeight->value();
+
+    const qreal tileLeftMargin = ui->doubleSpinBoxTileMarginLeft->value();
+    const qreal tileRightMargin = ui->doubleSpinBoxTileMarginRight->value();
+    const qreal tileTopMargin = ui->doubleSpinBoxTileMarginTop->value();
+    const qreal tileBottomMargin = ui->doubleSpinBoxTileMarginBottom->value();
+
+    ui->doubleSpinBoxTilePaperWidth->blockSignals(true);
+    ui->doubleSpinBoxTilePaperHeight->blockSignals(true);
+    ui->doubleSpinBoxTilePaperWidth->setMaximum(FromPixel(QIMAGE_MAX, layoutUnit));
+    ui->doubleSpinBoxTilePaperHeight->setMaximum(FromPixel(QIMAGE_MAX, layoutUnit));
+    ui->doubleSpinBoxTilePaperWidth->blockSignals(false);
+    ui->doubleSpinBoxTilePaperHeight->blockSignals(false);
+
+    const qreal newTileWidth = UnitConvertor(tileWidth, m_oldLayoutUnit, layoutUnit);
+    const qreal newTileHeight = UnitConvertor(tileHeight, m_oldLayoutUnit, layoutUnit);
+
+    const qreal newTileLeftMargin = UnitConvertor(tileLeftMargin, m_oldLayoutUnit, layoutUnit);
+    const qreal newTileRightMargin = UnitConvertor(tileRightMargin, m_oldLayoutUnit, layoutUnit);
+    const qreal newTileTopMargin = UnitConvertor(tileTopMargin, m_oldLayoutUnit, layoutUnit);
+    const qreal newTileBottomMargin = UnitConvertor(tileBottomMargin, m_oldLayoutUnit, layoutUnit);
+
+    qreal newGap = UnitConvertor(ui->doubleSpinBoxPiecesGap->value(), m_oldLayoutUnit, layoutUnit);
+
+    m_oldLayoutUnit = layoutUnit;
+    CorrectPaperDecimals();
+    MinimumSheetPaperSize();
+    MinimumTilePaperSize();
+
+    ui->doubleSpinBoxSheetPaperWidth->setValue(newSheetWidth);
+    ui->doubleSpinBoxSheetPaperHeight->setValue(newSheetHeight);
+
+    ui->doubleSpinBoxSheetMarginLeft->setValue(newSheetLeftMargin);
+    ui->doubleSpinBoxSheetMarginRight->setValue(newSheetRightMargin);
+    ui->doubleSpinBoxSheetMarginTop->setValue(newSheetTopMargin);
+    ui->doubleSpinBoxSheetMarginBottom->setValue(newSheetBottomMargin);
+
+    ui->doubleSpinBoxTilePaperWidth->setValue(newTileWidth);
+    ui->doubleSpinBoxTilePaperHeight->setValue(newTileHeight);
+
+    ui->doubleSpinBoxTileMarginLeft->setValue(newTileLeftMargin);
+    ui->doubleSpinBoxTileMarginRight->setValue(newTileRightMargin);
+    ui->doubleSpinBoxTileMarginTop->setValue(newTileTopMargin);
+    ui->doubleSpinBoxTileMarginBottom->setValue(newTileBottomMargin);
+
+    ui->doubleSpinBoxPiecesGap->setMaximum(UnitConvertor(VPSettings::GetMaxLayoutPieceGap(), Unit::Cm, layoutUnit));
+    ui->doubleSpinBoxPiecesGap->setValue(newGap);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void PuzzlePreferencesLayoutPage::LayoutSheetIgnoreMargins(int state)
+{
+    ui->doubleSpinBoxSheetMarginLeft->setDisabled(state != 0);
+    ui->doubleSpinBoxSheetMarginRight->setDisabled(state != 0);
+    ui->doubleSpinBoxSheetMarginTop->setDisabled(state != 0);
+    ui->doubleSpinBoxSheetMarginBottom->setDisabled(state != 0);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void PuzzlePreferencesLayoutPage::LayoutTileIgnoreMargins(int state)
+{
+    ui->doubleSpinBoxTileMarginLeft->setDisabled(state != 0);
+    ui->doubleSpinBoxTileMarginRight->setDisabled(state != 0);
+    ui->doubleSpinBoxTileMarginTop->setDisabled(state != 0);
+    ui->doubleSpinBoxTileMarginBottom->setDisabled(state != 0);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void PuzzlePreferencesLayoutPage::FindSheetTemplate()
+{
+    const qreal width = ui->doubleSpinBoxSheetPaperWidth->value();
+    const qreal height = ui->doubleSpinBoxSheetPaperHeight->value();
+    FindTemplate(ui->comboBoxSheetTemplates, width, height);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void PuzzlePreferencesLayoutPage::FindTileTemplate()
+{
+    const qreal width = ui->doubleSpinBoxTilePaperWidth->value();
+    const qreal height = ui->doubleSpinBoxTilePaperHeight->value();
+    FindTemplate(ui->comboBoxTileTemplates, width, height);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void PuzzlePreferencesLayoutPage::CorrectMaxMargins()
+{
+    const qreal sheetWidth = ui->doubleSpinBoxSheetPaperWidth->value();
+    const qreal sheetHeight = ui->doubleSpinBoxSheetPaperHeight->value();
+
+    // 80%/2 of paper size for each field
+    const qreal sheetWidthMargin = (sheetWidth*80.0/100.0)/2.0;
+    const qreal sheetHeightMargin = (sheetHeight*80.0/100.0)/2.0;
+
+    ui->doubleSpinBoxSheetMarginLeft->setMaximum(sheetWidthMargin);
+    ui->doubleSpinBoxSheetMarginRight->setMaximum(sheetWidthMargin);
+    ui->doubleSpinBoxSheetMarginTop->setMaximum(sheetHeightMargin);
+    ui->doubleSpinBoxSheetMarginBottom->setMaximum(sheetHeightMargin);
+
+    const qreal tileWidth = ui->doubleSpinBoxTilePaperWidth->value();
+    const qreal tileHeight = ui->doubleSpinBoxTilePaperHeight->value();
+
+    // 80%/2 of paper size for each field
+    const qreal tileWidthMargin = (tileWidth*80.0/100.0)/2.0;
+    const qreal tileHeightMargin = (tileHeight*80.0/100.0)/2.0;
+
+    ui->doubleSpinBoxTileMarginLeft->setMaximum(tileWidthMargin);
+    ui->doubleSpinBoxTileMarginRight->setMaximum(tileWidthMargin);
+    ui->doubleSpinBoxTileMarginTop->setMaximum(tileHeightMargin);
+    ui->doubleSpinBoxTileMarginBottom->setMaximum(tileHeightMargin);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void PuzzlePreferencesLayoutPage::SwapSheetOrientation(bool checked)
+{
+    if (checked)
+    {
+        const qreal width = ui->doubleSpinBoxSheetPaperWidth->value();
+        const qreal height = ui->doubleSpinBoxSheetPaperHeight->value();
+
+        ui->doubleSpinBoxSheetPaperWidth->blockSignals(true);
+        ui->doubleSpinBoxSheetPaperWidth->setValue(height);
+        ui->doubleSpinBoxSheetPaperWidth->blockSignals(false);
+
+        ui->doubleSpinBoxSheetPaperHeight->blockSignals(true);
+        ui->doubleSpinBoxSheetPaperHeight->setValue(width);
+        ui->doubleSpinBoxSheetPaperHeight->blockSignals(false);
+
+        SheetPaperSizeChanged();
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void PuzzlePreferencesLayoutPage::SwapTileOrientation(bool checked)
+{
+    if (checked)
+    {
+        const qreal width = ui->doubleSpinBoxTilePaperWidth->value();
+        const qreal height = ui->doubleSpinBoxTilePaperHeight->value();
+
+        ui->doubleSpinBoxTilePaperWidth->blockSignals(true);
+        ui->doubleSpinBoxTilePaperWidth->setValue(height);
+        ui->doubleSpinBoxTilePaperWidth->blockSignals(false);
+
+        ui->doubleSpinBoxTilePaperHeight->blockSignals(true);
+        ui->doubleSpinBoxTilePaperHeight->setValue(width);
+        ui->doubleSpinBoxTilePaperHeight->blockSignals(false);
+
+        TilePaperSizeChanged();
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void PuzzlePreferencesLayoutPage::InitLayoutUnits()
+{
+    ui->comboBoxLayoutUnit->addItem(tr("Millimiters"), QVariant(UnitsToStr(Unit::Mm)));
+    ui->comboBoxLayoutUnit->addItem(tr("Centimeters"), QVariant(UnitsToStr(Unit::Cm)));
+    ui->comboBoxLayoutUnit->addItem(tr("Inches"), QVariant(UnitsToStr(Unit::Inch)));
+    ui->comboBoxLayoutUnit->addItem(tr("Pixels"), QVariant(UnitsToStr(Unit::Px)));
+
+    // set default unit
+    VPSettings *settings = VPApplication::VApp()->PuzzleSettings();
+    m_oldLayoutUnit = StrToUnits(settings->GetUnit());
+    const qint32 indexUnit = ui->comboBoxLayoutUnit->findData(settings->GetUnit());
+    if (indexUnit != -1)
+    {
+        ui->comboBoxLayoutUnit->setCurrentIndex(indexUnit);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QSizeF PuzzlePreferencesLayoutPage::Template(VAbstractLayoutDialog::PaperSizeTemplate t) const
+{
+    const Unit layoutUnit = LayoutUnit();
+
+    switch (t)
+    {
+        case VAbstractLayoutDialog::PaperSizeTemplate::A0:
+        case VAbstractLayoutDialog::PaperSizeTemplate::A1:
+        case VAbstractLayoutDialog::PaperSizeTemplate::A2:
+        case VAbstractLayoutDialog::PaperSizeTemplate::A3:
+        case VAbstractLayoutDialog::PaperSizeTemplate::A4:
+        case VAbstractLayoutDialog::PaperSizeTemplate::Letter:
+        case VAbstractLayoutDialog::PaperSizeTemplate::Legal:
+        case VAbstractLayoutDialog::PaperSizeTemplate::Tabloid:
+            return VAbstractLayoutDialog::GetTemplateSize(t, layoutUnit);
+        case VAbstractLayoutDialog::PaperSizeTemplate::Roll24in:
+        case VAbstractLayoutDialog::PaperSizeTemplate::Roll30in:
+        case VAbstractLayoutDialog::PaperSizeTemplate::Roll36in:
+        case VAbstractLayoutDialog::PaperSizeTemplate::Roll42in:
+        case VAbstractLayoutDialog::PaperSizeTemplate::Roll44in:
+        case VAbstractLayoutDialog::PaperSizeTemplate::Roll48in:
+        case VAbstractLayoutDialog::PaperSizeTemplate::Roll62in:
+        case VAbstractLayoutDialog::PaperSizeTemplate::Roll72in:
+            return VAbstractLayoutDialog::GetTemplateSize(t, layoutUnit);
+        case VAbstractLayoutDialog::PaperSizeTemplate::Custom:
+            return VAbstractLayoutDialog::GetTemplateSize(t, layoutUnit);
+        default:
+            break;
+    }
+    return QSizeF();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto PuzzlePreferencesLayoutPage::SheetTemplate() const -> QSizeF
+{
+    auto t = static_cast<VAbstractLayoutDialog::PaperSizeTemplate>(ui->comboBoxSheetTemplates->currentData().toInt());
+    return Template(t);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto PuzzlePreferencesLayoutPage::TileTemplate() const -> QSizeF
+{
+    auto t = static_cast<VAbstractLayoutDialog::PaperSizeTemplate>(ui->comboBoxTileTemplates->currentData().toInt());
+    return Template(t);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void PuzzlePreferencesLayoutPage::MinimumSheetPaperSize()
+{
+    const qreal value = UnitConvertor(1, Unit::Px, m_oldLayoutUnit);
+    ui->doubleSpinBoxSheetPaperWidth->setMinimum(value);
+    ui->doubleSpinBoxSheetPaperHeight->setMinimum(value);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void PuzzlePreferencesLayoutPage::MinimumTilePaperSize()
+{
+    const qreal value = UnitConvertor(1, Unit::Px, m_oldLayoutUnit);
+    ui->doubleSpinBoxTilePaperWidth->setMinimum(value);
+    ui->doubleSpinBoxTilePaperHeight->setMinimum(value);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto PuzzlePreferencesLayoutPage::LayoutUnit() const -> Unit
+{
+    return StrToUnits(ui->comboBoxLayoutUnit->currentData().toString());
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void PuzzlePreferencesLayoutPage::SetLayoutUnit(Unit unit)
+{
+    const qint32 indexUnit = ui->comboBoxLayoutUnit->findData(UnitsToStr(unit));
+    if (indexUnit != -1)
+    {
+        ui->comboBoxLayoutUnit->setCurrentIndex(indexUnit);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void PuzzlePreferencesLayoutPage::SheetSize(const QSizeF &size)
+{
+    m_oldLayoutUnit = LayoutUnit();
+    ui->doubleSpinBoxSheetPaperWidth->setMaximum(FromPixel(QIMAGE_MAX, m_oldLayoutUnit));
+    ui->doubleSpinBoxSheetPaperHeight->setMaximum(FromPixel(QIMAGE_MAX, m_oldLayoutUnit));
+
+    ui->doubleSpinBoxSheetPaperWidth->setValue(size.width());
+    ui->doubleSpinBoxSheetPaperHeight->setValue(size.height());
+
+    CorrectPaperDecimals();
+    SheetPaperSizeChanged();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void PuzzlePreferencesLayoutPage::TileSize(const QSizeF &size)
+{
+    m_oldLayoutUnit = LayoutUnit();
+    ui->doubleSpinBoxTilePaperWidth->setMaximum(FromPixel(QIMAGE_MAX, m_oldLayoutUnit));
+    ui->doubleSpinBoxTilePaperHeight->setMaximum(FromPixel(QIMAGE_MAX, m_oldLayoutUnit));
+
+    ui->doubleSpinBoxTilePaperWidth->setValue(size.width());
+    ui->doubleSpinBoxTilePaperHeight->setValue(size.height());
+
+    CorrectPaperDecimals();
+    TilePaperSizeChanged();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void PuzzlePreferencesLayoutPage::CorrectPaperDecimals()
+{
+    switch (m_oldLayoutUnit)
+    {
+        case Unit::Cm:
+        case Unit::Mm:
+        case Unit::Px:
+            ui->doubleSpinBoxSheetPaperWidth->setDecimals(2);
+            ui->doubleSpinBoxSheetPaperHeight->setDecimals(2);
+
+            ui->doubleSpinBoxTilePaperWidth->setDecimals(2);
+            ui->doubleSpinBoxTilePaperHeight->setDecimals(2);
+
+            ui->doubleSpinBoxSheetMarginLeft->setDecimals(4);
+            ui->doubleSpinBoxSheetMarginRight->setDecimals(4);
+            ui->doubleSpinBoxSheetMarginTop->setDecimals(4);
+            ui->doubleSpinBoxSheetMarginBottom->setDecimals(4);
+
+            ui->doubleSpinBoxTileMarginLeft->setDecimals(4);
+            ui->doubleSpinBoxTileMarginRight->setDecimals(4);
+            ui->doubleSpinBoxTileMarginTop->setDecimals(4);
+            ui->doubleSpinBoxTileMarginBottom->setDecimals(4);
+
+            ui->doubleSpinBoxPiecesGap->setDecimals(2);
+            break;
+        case Unit::Inch:
+            ui->doubleSpinBoxSheetPaperWidth->setDecimals(5);
+            ui->doubleSpinBoxSheetPaperHeight->setDecimals(5);
+
+            ui->doubleSpinBoxTilePaperWidth->setDecimals(5);
+            ui->doubleSpinBoxTilePaperHeight->setDecimals(5);
+
+            ui->doubleSpinBoxSheetMarginLeft->setDecimals(5);
+            ui->doubleSpinBoxSheetMarginRight->setDecimals(5);
+            ui->doubleSpinBoxSheetMarginTop->setDecimals(5);
+            ui->doubleSpinBoxSheetMarginBottom->setDecimals(5);
+
+            ui->doubleSpinBoxTileMarginLeft->setDecimals(5);
+            ui->doubleSpinBoxTileMarginRight->setDecimals(5);
+            ui->doubleSpinBoxTileMarginTop->setDecimals(5);
+            ui->doubleSpinBoxTileMarginBottom->setDecimals(5);
+
+            ui->doubleSpinBoxPiecesGap->setDecimals(5);
+            break;
+        default:
+            break;
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void PuzzlePreferencesLayoutPage::SheetPaperSizeChanged()
+{
+    bool portrait = ui->doubleSpinBoxSheetPaperHeight->value() > ui->doubleSpinBoxSheetPaperWidth->value();
+
+    ui->toolButtonSheetPortraitOritation->blockSignals(true);
+    ui->toolButtonSheetPortraitOritation->setChecked(portrait);
+    ui->toolButtonSheetPortraitOritation->blockSignals(false);
+
+    ui->toolButtonSheetLandscapeOrientation->blockSignals(true);
+    ui->toolButtonSheetLandscapeOrientation->setChecked(not portrait);
+    ui->toolButtonSheetLandscapeOrientation->blockSignals(false);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void PuzzlePreferencesLayoutPage::TilePaperSizeChanged()
+{
+    bool portrait = ui->doubleSpinBoxTilePaperHeight->value() > ui->doubleSpinBoxTilePaperWidth->value();
+
+    ui->toolButtonTilePortraitOrientation->blockSignals(true);
+    ui->toolButtonTilePortraitOrientation->setChecked(portrait);
+    ui->toolButtonTilePortraitOrientation->blockSignals(false);
+
+    ui->toolButtonTileLandscapeOrientation->blockSignals(true);
+    ui->toolButtonTileLandscapeOrientation->setChecked(not portrait);
+    ui->toolButtonTileLandscapeOrientation->blockSignals(false);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto PuzzlePreferencesLayoutPage::GetSheetMargins() const -> QMarginsF
+{
+    QMarginsF fields;
+    fields.setLeft(UnitConvertor(ui->doubleSpinBoxSheetMarginLeft->value(), m_oldLayoutUnit, Unit::Px));
+    fields.setRight(UnitConvertor(ui->doubleSpinBoxSheetMarginRight->value(), m_oldLayoutUnit, Unit::Px));
+    fields.setTop(UnitConvertor(ui->doubleSpinBoxSheetMarginTop->value(), m_oldLayoutUnit, Unit::Px));
+    fields.setBottom(UnitConvertor(ui->doubleSpinBoxSheetMarginBottom->value(), m_oldLayoutUnit, Unit::Px));
+    return fields;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void PuzzlePreferencesLayoutPage::SetSheetMargins(const QMarginsF &value)
+{
+    ui->doubleSpinBoxSheetMarginLeft->setValue(UnitConvertor(value.left(), Unit::Px, LayoutUnit()));
+    ui->doubleSpinBoxSheetMarginRight->setValue(UnitConvertor(value.right(), Unit::Px, LayoutUnit()));
+    ui->doubleSpinBoxSheetMarginTop->setValue(UnitConvertor(value.top(), Unit::Px, LayoutUnit()));
+    ui->doubleSpinBoxSheetMarginBottom->setValue(UnitConvertor(value.bottom(), Unit::Px, LayoutUnit()));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto PuzzlePreferencesLayoutPage::GetTileMargins() const -> QMarginsF
+{
+    QMarginsF fields;
+    fields.setLeft(UnitConvertor(ui->doubleSpinBoxTileMarginLeft->value(), m_oldLayoutUnit, Unit::Px));
+    fields.setRight(UnitConvertor(ui->doubleSpinBoxTileMarginRight->value(), m_oldLayoutUnit, Unit::Px));
+    fields.setTop(UnitConvertor(ui->doubleSpinBoxTileMarginTop->value(), m_oldLayoutUnit, Unit::Px));
+    fields.setBottom(UnitConvertor(ui->doubleSpinBoxTileMarginBottom->value(), m_oldLayoutUnit, Unit::Px));
+    return fields;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void PuzzlePreferencesLayoutPage::SetTileMargins(const QMarginsF &value)
+{
+    ui->doubleSpinBoxTileMarginLeft->setValue(UnitConvertor(value.left(), Unit::Px, LayoutUnit()));
+    ui->doubleSpinBoxTileMarginRight->setValue(UnitConvertor(value.right(), Unit::Px, LayoutUnit()));
+    ui->doubleSpinBoxTileMarginTop->setValue(UnitConvertor(value.top(), Unit::Px, LayoutUnit()));
+    ui->doubleSpinBoxTileMarginBottom->setValue(UnitConvertor(value.bottom(), Unit::Px, LayoutUnit()));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void PuzzlePreferencesLayoutPage::SetPieceGap(qreal gap)
+{
+    qreal value = UnitConvertor(gap, Unit::Px, LayoutUnit());
+    ui->doubleSpinBoxPiecesGap->setValue(value);
+    CorrectPaperDecimals();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void PuzzlePreferencesLayoutPage::ReadSettings()
+{
+    VPSettings *settings = VPApplication::VApp()->PuzzleSettings();
+
+    SetLayoutUnit(settings->LayoutUnit());
+    m_oldLayoutUnit = LayoutUnit();
+
+    const qreal sheetWidth = UnitConvertor(settings->GetLayoutSheetPaperWidth(), Unit::Px, LayoutUnit());
+    const qreal sheetHeight = UnitConvertor(settings->GetLayoutSheetPaperHeight(), Unit::Px, LayoutUnit());
+    SheetSize(QSizeF(sheetWidth, sheetHeight));
+
+    ui->checkBoxLayoutIgnoreFileds->setChecked(settings->GetLayoutSheetIgnoreMargins());
+    SetSheetMargins(settings->GetLayoutSheetMargins());
+
+    const qreal tileWidth = UnitConvertor(settings->GetLayoutTilePaperWidth(), Unit::Px, LayoutUnit());
+    const qreal tileHeight = UnitConvertor(settings->GetLayoutTilePaperHeight(), Unit::Px, LayoutUnit());
+    TileSize(QSizeF(tileWidth, tileHeight));
+
+    ui->checkBoxTileShowTiles->setChecked(settings->GetLayoutTileShowTiles());
+    ui->checkBoxTileShowWatermark->setChecked(settings->GetLayoutTileShowWatermark());
+    ui->checkBoxTileIgnoreFileds->setChecked(settings->GetLayoutTileIgnoreMargins());
+    SetTileMargins(settings->GetLayoutSheetMargins());
+
+    ui->checkBoxWarningPiecesSuperposition->setChecked(settings->GetLayoutWarningPiecesSuperposition());
+    ui->checkBoxStickyEdges->setChecked(settings->GetLayoutStickyEdges());
+    ui->checkBoxWarningPiecesOutOfBound->setChecked(settings->GetLayoutWarningPiecesOutOfBound());
+    ui->checkBoxFollowGrainline->setChecked(settings->GetLayoutFollowGrainline());
+
+    ui->doubleSpinBoxPiecesGap->setMaximum(UnitConvertor(VPSettings::GetMaxLayoutPieceGap(), Unit::Px, LayoutUnit()));
+    SetPieceGap(settings->GetLayoutPieceGap());
+
+    FindSheetTemplate();
+    FindTileTemplate();
+
+    SheetPaperSizeChanged();
+    TilePaperSizeChanged();
+
+    LayoutSheetIgnoreMargins(static_cast<int>(ui->checkBoxLayoutIgnoreFileds->isChecked()));
+    LayoutTileIgnoreMargins(static_cast<int>(ui->checkBoxTileIgnoreFileds->isChecked()));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void PuzzlePreferencesLayoutPage::FindTemplate(QComboBox *box, qreal width, qreal height)
+{
+    SCASSERT(box != nullptr)
+    const Unit paperUnit = LayoutUnit();
+
+    const int max = static_cast<int>(VAbstractLayoutDialog::PaperSizeTemplate::Custom);
+    for (int i=0; i < max; ++i)
+    {
+        const QSizeF tmplSize = VAbstractLayoutDialog::GetTemplateSize(
+                    static_cast<VAbstractLayoutDialog::PaperSizeTemplate>(i), paperUnit);
+        if (QSizeF(width, height) == tmplSize || QSizeF(height, width) == tmplSize)
+        {
+            box->blockSignals(true);
+            const int index = box->findData(i);
+            if (index != -1)
+            {
+                box->setCurrentIndex(index);
+            }
+            box->blockSignals(false);
+            return;
+        }
+    }
+
+    box->blockSignals(true);
+    const int index = box->findData(max);
+    if (index != -1)
+    {
+        box->setCurrentIndex(index);
+    }
+    box->blockSignals(false);
+}
diff --git a/src/app/puzzle/dialogs/configpages/puzzlepreferenceslayoutpage.h b/src/app/puzzle/dialogs/configpages/puzzlepreferenceslayoutpage.h
new file mode 100644
index 000000000..eefc4246b
--- /dev/null
+++ b/src/app/puzzle/dialogs/configpages/puzzlepreferenceslayoutpage.h
@@ -0,0 +1,102 @@
+/************************************************************************
+ **
+ **  @file   puzzlepreferenceslayoutpage.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   20 8, 2021
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2021 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#ifndef PUZZLEPREFERENCESLAYOUTPAGE_H
+#define PUZZLEPREFERENCESLAYOUTPAGE_H
+
+#include <QWidget>
+
+#include "../vmisc/def.h"
+#include "../vlayout/dialogs/vabstractlayoutdialog.h"
+
+namespace Ui
+{
+    class PuzzlePreferencesLayoutPage;
+}
+
+class PuzzlePreferencesLayoutPage : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit PuzzlePreferencesLayoutPage(QWidget *parent = nullptr);
+    ~PuzzlePreferencesLayoutPage();
+
+    QStringList Apply();
+
+protected:
+    virtual void changeEvent(QEvent* event) override;
+
+private slots:
+    void ConvertPaperSize();
+    void LayoutSheetIgnoreMargins(int state);
+    void LayoutTileIgnoreMargins(int state);
+    void FindSheetTemplate();
+    void FindTileTemplate();
+    void CorrectMaxMargins();
+    void SwapSheetOrientation(bool checked);
+    void SwapTileOrientation(bool checked);
+
+private:
+    Q_DISABLE_COPY(PuzzlePreferencesLayoutPage)
+    Ui::PuzzlePreferencesLayoutPage *ui;
+    Unit m_oldLayoutUnit{Unit::Mm};
+
+    void InitLayoutUnits();
+
+    QSizeF Template(VAbstractLayoutDialog::PaperSizeTemplate t) const;
+    QSizeF SheetTemplate() const;
+    QSizeF TileTemplate() const;
+
+    void MinimumSheetPaperSize();
+    void MinimumTilePaperSize();
+
+    Unit LayoutUnit() const;
+    void SetLayoutUnit(Unit unit);
+
+    void SheetSize(const QSizeF &size);
+    void TileSize(const QSizeF &size);
+
+    void CorrectPaperDecimals();
+
+    void SheetPaperSizeChanged();
+    void TilePaperSizeChanged();
+
+    QMarginsF GetSheetMargins() const;
+    void SetSheetMargins(const QMarginsF &value);
+
+    QMarginsF GetTileMargins() const;
+    void SetTileMargins(const QMarginsF &value);
+
+    void SetPieceGap(qreal gap);
+
+    void ReadSettings();
+
+    void FindTemplate(QComboBox *box, qreal width, qreal height);
+};
+
+#endif // PUZZLEPREFERENCESLAYOUTPAGE_H
diff --git a/src/app/puzzle/dialogs/configpages/puzzlepreferenceslayoutpage.ui b/src/app/puzzle/dialogs/configpages/puzzlepreferenceslayoutpage.ui
new file mode 100644
index 000000000..cc67e52e8
--- /dev/null
+++ b/src/app/puzzle/dialogs/configpages/puzzlepreferenceslayoutpage.ui
@@ -0,0 +1,663 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>PuzzlePreferencesLayoutPage</class>
+ <widget class="QWidget" name="PuzzlePreferencesLayoutPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>616</width>
+    <height>668</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout_5">
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout_7">
+     <item>
+      <widget class="QGroupBox" name="groupBox">
+       <property name="title">
+        <string>Sheet</string>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_2">
+        <item>
+         <widget class="QGroupBox" name="groupBoxPaperFormat">
+          <property name="autoFillBackground">
+           <bool>false</bool>
+          </property>
+          <property name="title">
+           <string>Format</string>
+          </property>
+          <property name="flat">
+           <bool>false</bool>
+          </property>
+          <property name="checkable">
+           <bool>false</bool>
+          </property>
+          <property name="checked">
+           <bool>false</bool>
+          </property>
+          <layout class="QVBoxLayout" name="verticalLayout">
+           <item>
+            <layout class="QFormLayout" name="formLayout">
+             <property name="fieldGrowthPolicy">
+              <enum>QFormLayout::ExpandingFieldsGrow</enum>
+             </property>
+             <item row="0" column="0">
+              <widget class="QLabel" name="labelLayoutUnit">
+               <property name="text">
+                <string>Unit:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="1">
+              <widget class="QComboBox" name="comboBoxLayoutUnit"/>
+             </item>
+             <item row="1" column="0">
+              <widget class="QLabel" name="label_2">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="text">
+                <string>Templates:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1">
+              <widget class="QComboBox" name="comboBoxSheetTemplates"/>
+             </item>
+            </layout>
+           </item>
+           <item>
+            <widget class="Line" name="line">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <layout class="QGridLayout" name="gridLayout">
+             <item row="2" column="0">
+              <layout class="QHBoxLayout" name="horizontalLayout">
+               <item>
+                <widget class="QToolButton" name="toolButtonSheetPortraitOritation">
+                 <property name="text">
+                  <string notr="true">...</string>
+                 </property>
+                 <property name="icon">
+                  <iconset resource="../../../../libs/vmisc/share/resources/icon.qrc">
+                   <normaloff>:/icon/16x16/portrait.png</normaloff>:/icon/16x16/portrait.png</iconset>
+                 </property>
+                 <property name="checkable">
+                  <bool>true</bool>
+                 </property>
+                 <property name="checked">
+                  <bool>true</bool>
+                 </property>
+                 <property name="autoRaise">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QToolButton" name="toolButtonSheetLandscapeOrientation">
+                 <property name="text">
+                  <string notr="true">...</string>
+                 </property>
+                 <property name="icon">
+                  <iconset resource="../../../../libs/vmisc/share/resources/icon.qrc">
+                   <normaloff>:/icon/16x16/landscape.png</normaloff>:/icon/16x16/landscape.png</iconset>
+                 </property>
+                 <property name="checkable">
+                  <bool>true</bool>
+                 </property>
+                 <property name="checked">
+                  <bool>false</bool>
+                 </property>
+                 <property name="autoRaise">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </item>
+             <item row="0" column="0">
+              <widget class="QLabel" name="labelWidth">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="text">
+                <string>Width:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="0">
+              <widget class="QLabel" name="labelHeight">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="text">
+                <string>Height:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1">
+              <widget class="QDoubleSpinBox" name="doubleSpinBoxSheetPaperHeight">
+               <property name="minimumSize">
+                <size>
+                 <width>94</width>
+                 <height>0</height>
+                </size>
+               </property>
+               <property name="decimals">
+                <number>2</number>
+               </property>
+               <property name="maximum">
+                <double>99999.000000000000000</double>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="1">
+              <widget class="QDoubleSpinBox" name="doubleSpinBoxSheetPaperWidth">
+               <property name="minimumSize">
+                <size>
+                 <width>94</width>
+                 <height>0</height>
+                </size>
+               </property>
+               <property name="decimals">
+                <number>2</number>
+               </property>
+               <property name="maximum">
+                <double>99999.990000000005239</double>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item>
+         <widget class="QGroupBox" name="groupBoxSheetMargin">
+          <property name="title">
+           <string>Margins</string>
+          </property>
+          <layout class="QVBoxLayout" name="verticalLayout_4">
+           <item>
+            <layout class="QGridLayout" name="gridLayout_2">
+             <item row="1" column="2">
+              <widget class="QLabel" name="labelSheetMarginRight">
+               <property name="text">
+                <string>Right:</string>
+               </property>
+               <property name="alignment">
+                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="2">
+              <widget class="QDoubleSpinBox" name="doubleSpinBoxSheetMarginTop">
+               <property name="alignment">
+                <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+               </property>
+               <property name="singleStep">
+                <double>0.100000000000000</double>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="1">
+              <widget class="QLabel" name="labelSheetMarginTop">
+               <property name="text">
+                <string>Top:</string>
+               </property>
+               <property name="alignment">
+                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1">
+              <widget class="QDoubleSpinBox" name="doubleSpinBoxSheetMarginLeft">
+               <property name="singleStep">
+                <double>0.100000000000000</double>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="3">
+              <widget class="QDoubleSpinBox" name="doubleSpinBoxSheetMarginRight">
+               <property name="singleStep">
+                <double>0.100000000000000</double>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="0">
+              <widget class="QLabel" name="labelSheetMarginLeft">
+               <property name="text">
+                <string>Left:</string>
+               </property>
+               <property name="alignment">
+                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="1">
+              <widget class="QLabel" name="labelSheetMarginBottom">
+               <property name="text">
+                <string>Bottom:</string>
+               </property>
+               <property name="alignment">
+                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="2">
+              <widget class="QDoubleSpinBox" name="doubleSpinBoxSheetMarginBottom">
+               <property name="singleStep">
+                <double>0.100000000000000</double>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+           <item>
+            <widget class="QCheckBox" name="checkBoxLayoutIgnoreFileds">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="text">
+              <string>Ignore margins</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="groupBoxLayoutControl">
+       <property name="title">
+        <string>Control</string>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_14">
+        <item>
+         <widget class="QCheckBox" name="checkBoxWarningPiecesSuperposition">
+          <property name="text">
+           <string>Warning superposition of pieces</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="checkBoxWarningPiecesOutOfBound">
+          <property name="text">
+           <string>Warning pieces out of bound</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="checkBoxStickyEdges">
+          <property name="text">
+           <string>Sticky edges</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="checkBoxFollowGrainline">
+          <property name="text">
+           <string>Follow grainline</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout_2">
+          <item>
+           <widget class="QLabel" name="labelSheetPiecesGap">
+            <property name="text">
+             <string>Pieces gap</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QDoubleSpinBox" name="doubleSpinBoxPiecesGap"/>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <spacer name="verticalSpacer">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
+      <string>Tiles</string>
+     </property>
+     <property name="checkable">
+      <bool>false</bool>
+     </property>
+     <property name="checked">
+      <bool>false</bool>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_5">
+      <item>
+       <widget class="QCheckBox" name="checkBoxTileShowTiles">
+        <property name="text">
+         <string>Show Tiles on sheet</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="checkBoxTileShowWatermark">
+        <property name="toolTip">
+         <string>Show watermark preview</string>
+        </property>
+        <property name="text">
+         <string>Show watermark</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QGroupBox" name="groupBoxPaperFormat_2">
+        <property name="autoFillBackground">
+         <bool>false</bool>
+        </property>
+        <property name="title">
+         <string>Format</string>
+        </property>
+        <property name="flat">
+         <bool>false</bool>
+        </property>
+        <property name="checkable">
+         <bool>false</bool>
+        </property>
+        <property name="checked">
+         <bool>false</bool>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_3">
+         <item>
+          <layout class="QFormLayout" name="formLayout_2">
+           <property name="fieldGrowthPolicy">
+            <enum>QFormLayout::ExpandingFieldsGrow</enum>
+           </property>
+           <item row="0" column="0">
+            <widget class="QLabel" name="label_3">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="text">
+              <string>Templates:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QComboBox" name="comboBoxTileTemplates"/>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <widget class="Line" name="line_2">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <layout class="QGridLayout" name="gridLayout_3">
+           <item row="2" column="0">
+            <layout class="QHBoxLayout" name="horizontalLayout_3">
+             <item>
+              <widget class="QToolButton" name="toolButtonTilePortraitOrientation">
+               <property name="text">
+                <string notr="true">...</string>
+               </property>
+               <property name="icon">
+                <iconset resource="../../../../libs/vmisc/share/resources/icon.qrc">
+                 <normaloff>:/icon/16x16/portrait.png</normaloff>:/icon/16x16/portrait.png</iconset>
+               </property>
+               <property name="checkable">
+                <bool>true</bool>
+               </property>
+               <property name="checked">
+                <bool>true</bool>
+               </property>
+               <property name="autoRaise">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QToolButton" name="toolButtonTileLandscapeOrientation">
+               <property name="text">
+                <string notr="true">...</string>
+               </property>
+               <property name="icon">
+                <iconset resource="../../../../libs/vmisc/share/resources/icon.qrc">
+                 <normaloff>:/icon/16x16/landscape.png</normaloff>:/icon/16x16/landscape.png</iconset>
+               </property>
+               <property name="checkable">
+                <bool>true</bool>
+               </property>
+               <property name="checked">
+                <bool>false</bool>
+               </property>
+               <property name="autoRaise">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+           <item row="0" column="0">
+            <widget class="QLabel" name="labelWidth_2">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="text">
+              <string>Width:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="0">
+            <widget class="QLabel" name="labelHeight_2">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="text">
+              <string>Height:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1">
+            <widget class="QDoubleSpinBox" name="doubleSpinBoxTilePaperHeight">
+             <property name="minimumSize">
+              <size>
+               <width>94</width>
+               <height>0</height>
+              </size>
+             </property>
+             <property name="decimals">
+              <number>2</number>
+             </property>
+             <property name="maximum">
+              <double>99999.000000000000000</double>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QDoubleSpinBox" name="doubleSpinBoxTilePaperWidth">
+             <property name="minimumSize">
+              <size>
+               <width>94</width>
+               <height>0</height>
+              </size>
+             </property>
+             <property name="decimals">
+              <number>2</number>
+             </property>
+             <property name="maximum">
+              <double>99999.990000000005239</double>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <widget class="QGroupBox" name="groupBoxSheetMargin_2">
+        <property name="title">
+         <string>Margins</string>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_6">
+         <item>
+          <layout class="QGridLayout" name="gridLayout_4">
+           <item row="1" column="2">
+            <widget class="QLabel" name="labelSheetMarginRight_2">
+             <property name="text">
+              <string>Right:</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="2">
+            <widget class="QDoubleSpinBox" name="doubleSpinBoxTileMarginTop">
+             <property name="alignment">
+              <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+             </property>
+             <property name="singleStep">
+              <double>0.100000000000000</double>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QLabel" name="labelSheetMarginTop_2">
+             <property name="text">
+              <string>Top:</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1">
+            <widget class="QDoubleSpinBox" name="doubleSpinBoxTileMarginLeft">
+             <property name="singleStep">
+              <double>0.100000000000000</double>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="3">
+            <widget class="QDoubleSpinBox" name="doubleSpinBoxTileMarginRight">
+             <property name="singleStep">
+              <double>0.100000000000000</double>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="0">
+            <widget class="QLabel" name="labelSheetMarginLeft_2">
+             <property name="text">
+              <string>Left:</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="1">
+            <widget class="QLabel" name="labelSheetMarginBottom_2">
+             <property name="text">
+              <string>Bottom:</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="2">
+            <widget class="QDoubleSpinBox" name="doubleSpinBoxTileMarginBottom">
+             <property name="singleStep">
+              <double>0.100000000000000</double>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <widget class="QCheckBox" name="checkBoxTileIgnoreFileds">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>Ignore margins</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <spacer name="verticalSpacer_2">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../../../../libs/vmisc/share/resources/icon.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/src/app/puzzle/dialogs/configpages/puzzlepreferencespathpage.cpp b/src/app/puzzle/dialogs/configpages/puzzlepreferencespathpage.cpp
new file mode 100644
index 000000000..cc8a79429
--- /dev/null
+++ b/src/app/puzzle/dialogs/configpages/puzzlepreferencespathpage.cpp
@@ -0,0 +1,220 @@
+/************************************************************************
+ **
+ **  @file   puzzlepreferencespathpage.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   21 5, 2021
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2021 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#include "puzzlepreferencespathpage.h"
+#include "ui_puzzlepreferencespathpage.h"
+#include "../../vpapplication.h"
+
+//---------------------------------------------------------------------------------------------------------------------
+PuzzlePreferencesPathPage::PuzzlePreferencesPathPage(QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::PuzzlePreferencesPathPage)
+{
+    ui->setupUi(this);
+
+    InitTable();
+
+    connect(ui->pathTable, &QTableWidget::itemSelectionChanged, this, [this]()
+    {
+        ui->defaultButton->setEnabled(not ui->pathTable->selectedItems().isEmpty());
+        ui->defaultButton->setDefault(false);
+
+        ui->editButton->setEnabled(not ui->pathTable->selectedItems().isEmpty());
+        ui->editButton->setDefault(true);
+    });
+
+    connect(ui->defaultButton, &QPushButton::clicked, this, &PuzzlePreferencesPathPage::DefaultPath);
+    connect(ui->editButton, &QPushButton::clicked, this, &PuzzlePreferencesPathPage::EditPath);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+PuzzlePreferencesPathPage::~PuzzlePreferencesPathPage()
+{
+    delete ui;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void PuzzlePreferencesPathPage::Apply()
+{
+    VPSettings *settings = VPApplication::VApp()->PuzzleSettings();
+    settings->SetPathIndividualMeasurements(ui->pathTable->item(0, 1)->text());
+    settings->SetPathMultisizeMeasurements(ui->pathTable->item(1, 1)->text());
+    settings->SetPathPattern(ui->pathTable->item(2, 1)->text());
+    settings->SetPathTemplate(ui->pathTable->item(3, 1)->text());
+    settings->SetPathManualLayouts(ui->pathTable->item(4, 1)->text());
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void PuzzlePreferencesPathPage::changeEvent(QEvent *event)
+{
+    if (event->type() == QEvent::LanguageChange)
+    {
+        // retranslate designer form (single inheritance approach)
+        ui->retranslateUi(this);
+        InitTable();
+    }
+    // remember to call base class implementation
+    QWidget::changeEvent(event);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void PuzzlePreferencesPathPage::DefaultPath()
+{
+    const int row = ui->pathTable->currentRow();
+    QTableWidgetItem *item = ui->pathTable->item(row, 1);
+    SCASSERT(item != nullptr)
+
+    QString path;
+    switch (row)
+    {
+        case 0: // individual measurements
+            path = VCommonSettings::GetDefPathIndividualMeasurements();
+            break;
+        case 1: // multisize measurements
+            path = VCommonSettings::GetDefPathMultisizeMeasurements();
+            break;
+        case 2: // pattern path
+            path = VCommonSettings::GetDefPathPattern();
+            break;
+        case 3: // templates
+            path = VCommonSettings::GetDefPathTemplate();
+            break;
+        case 4: // layouts
+            path = VCommonSettings::GetDefPathManualLayouts();
+            break;
+        default:
+            break;
+    }
+
+    item->setText(path);
+    item->setToolTip(path);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void PuzzlePreferencesPathPage::EditPath()
+{
+    const int row = ui->pathTable->currentRow();
+    QTableWidgetItem *item = ui->pathTable->item(row, 1);
+    SCASSERT(item != nullptr)
+
+    QString path;
+    switch (row)
+    {
+        case 0: // individual measurements
+            path = VPApplication::VApp()->PuzzleSettings()->GetPathIndividualMeasurements();
+            break;
+        case 1: // multisize measurements
+            path = VPApplication::VApp()->PuzzleSettings()->GetPathMultisizeMeasurements();
+            path = VCommonSettings::PrepareMultisizeTables(path);
+            break;
+        case 2: // pattern path
+            path = VPApplication::VApp()->PuzzleSettings()->GetPathPattern();
+            break;
+        case 3: // templates
+            path = VPApplication::VApp()->PuzzleSettings()->GetPathTemplate();
+            break;
+        case 4: // layouts
+            path = VPApplication::VApp()->PuzzleSettings()->GetPathManualLayouts();
+            break;
+        default:
+            break;
+    }
+
+    bool usedNotExistedDir = false;
+    QDir directory(path);
+    if (not directory.exists())
+    {
+        usedNotExistedDir = directory.mkpath(QChar('.'));
+    }
+
+    const QString dir = QFileDialog::getExistingDirectory(
+        this, tr("Open Directory"), path,
+        VAbstractApplication::VApp()->NativeFileDialog(QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks));
+    if (dir.isEmpty())
+    {
+        if (usedNotExistedDir)
+        {
+            QDir(path).rmpath(QChar('.'));
+        }
+
+        DefaultPath();
+        return;
+    }
+
+    item->setText(dir);
+    item->setToolTip(dir);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void PuzzlePreferencesPathPage::InitTable()
+{
+    ui->pathTable->clearContents();
+    ui->pathTable->setRowCount(5);
+    ui->pathTable->setColumnCount(2);
+
+    const VPSettings *settings = VPApplication::VApp()->PuzzleSettings();
+
+    {
+        ui->pathTable->setItem(0, 0, new QTableWidgetItem(tr("My Individual Measurements")));
+        QTableWidgetItem *item = new QTableWidgetItem(settings->GetPathIndividualMeasurements());
+        item->setToolTip(settings->GetPathIndividualMeasurements());
+        ui->pathTable->setItem(0, 1, item);
+    }
+
+    {
+        ui->pathTable->setItem(1, 0, new QTableWidgetItem(tr("My Multisize Measurements")));
+        QTableWidgetItem *item = new QTableWidgetItem(settings->GetPathMultisizeMeasurements());
+        item->setToolTip(settings->GetPathMultisizeMeasurements());
+        ui->pathTable->setItem(1, 1, item);
+    }
+
+    {
+        ui->pathTable->setItem(2, 0, new QTableWidgetItem(tr("My Patterns")));
+        QTableWidgetItem *item = new QTableWidgetItem(settings->GetPathPattern());
+        item->setToolTip(settings->GetPathPattern());
+        ui->pathTable->setItem(2, 1, item);
+    }
+
+    {
+        ui->pathTable->setItem(3, 0, new QTableWidgetItem(tr("My Templates")));
+        QTableWidgetItem *item = new QTableWidgetItem(settings->GetPathTemplate());
+        item->setToolTip(settings->GetPathTemplate());
+        ui->pathTable->setItem(3, 1, item);
+    }
+
+    {
+        ui->pathTable->setItem(4, 0, new QTableWidgetItem(tr("My Layouts")));
+        QTableWidgetItem *item = new QTableWidgetItem(settings->GetPathManualLayouts());
+        item->setToolTip(settings->GetPathManualLayouts());
+        ui->pathTable->setItem(4, 1, item);
+    }
+
+    ui->pathTable->verticalHeader()->setDefaultSectionSize(20);
+    ui->pathTable->resizeColumnsToContents();
+    ui->pathTable->resizeRowsToContents();
+    ui->pathTable->horizontalHeader()->setStretchLastSection(true);
+}
diff --git a/src/app/puzzle/dialogs/configpages/puzzlepreferencespathpage.h b/src/app/puzzle/dialogs/configpages/puzzlepreferencespathpage.h
new file mode 100644
index 000000000..139208758
--- /dev/null
+++ b/src/app/puzzle/dialogs/configpages/puzzlepreferencespathpage.h
@@ -0,0 +1,62 @@
+/************************************************************************
+ **
+ **  @file   puzzlepreferencespathpage.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   21 5, 2021
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2021 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#ifndef PUZZLEPREFERENCESPATHPAGE_H
+#define PUZZLEPREFERENCESPATHPAGE_H
+
+#include <QWidget>
+
+namespace Ui
+{
+    class PuzzlePreferencesPathPage;
+}
+
+class PuzzlePreferencesPathPage : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit PuzzlePreferencesPathPage(QWidget *parent = nullptr);
+    virtual ~PuzzlePreferencesPathPage();
+
+    void Apply();
+
+protected:
+    virtual void changeEvent(QEvent* event) override;
+
+private slots:
+    void DefaultPath();
+    void EditPath();
+
+private:
+    Q_DISABLE_COPY(PuzzlePreferencesPathPage)
+    Ui::PuzzlePreferencesPathPage *ui;
+
+    void InitTable();
+};
+
+#endif // PUZZLEPREFERENCESPATHPAGE_H
diff --git a/src/app/puzzle/dialogs/configpages/puzzlepreferencespathpage.ui b/src/app/puzzle/dialogs/configpages/puzzlepreferencespathpage.ui
new file mode 100644
index 000000000..9c8da0ff1
--- /dev/null
+++ b/src/app/puzzle/dialogs/configpages/puzzlepreferencespathpage.ui
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>PuzzlePreferencesPathPage</class>
+ <widget class="QWidget" name="PuzzlePreferencesPathPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>586</width>
+    <height>808</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Paths that Valentina uses</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <widget class="QTableWidget" name="pathTable">
+        <property name="editTriggers">
+         <set>QAbstractItemView::NoEditTriggers</set>
+        </property>
+        <property name="selectionMode">
+         <enum>QAbstractItemView::SingleSelection</enum>
+        </property>
+        <property name="selectionBehavior">
+         <enum>QAbstractItemView::SelectRows</enum>
+        </property>
+        <property name="showGrid">
+         <bool>false</bool>
+        </property>
+        <attribute name="horizontalHeaderStretchLastSection">
+         <bool>true</bool>
+        </attribute>
+        <attribute name="verticalHeaderVisible">
+         <bool>false</bool>
+        </attribute>
+        <column>
+         <property name="text">
+          <string>Type</string>
+         </property>
+        </column>
+        <column>
+         <property name="text">
+          <string>Path</string>
+         </property>
+        </column>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QPushButton" name="defaultButton">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Default</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="editButton">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Edit</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/app/puzzle/dialogs/dialogpuzzlepreferences.cpp b/src/app/puzzle/dialogs/dialogpuzzlepreferences.cpp
new file mode 100644
index 000000000..deb8c4a5f
--- /dev/null
+++ b/src/app/puzzle/dialogs/dialogpuzzlepreferences.cpp
@@ -0,0 +1,164 @@
+/************************************************************************
+ **
+ **  @file   dialogpuzzlepreferences.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   21 5, 2021
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2021 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+#include "dialogpuzzlepreferences.h"
+#include "ui_dialogpuzzlepreferences.h"
+#include "../vpapplication.h"
+#include "configpages/puzzlepreferencesconfigurationpage.h"
+#include "configpages/puzzlepreferencespathpage.h"
+#include "configpages/puzzlepreferenceslayoutpage.h"
+
+#include <QMessageBox>
+#include <QPushButton>
+#include <QShowEvent>
+
+//---------------------------------------------------------------------------------------------------------------------
+DialogPuzzlePreferences::DialogPuzzlePreferences(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::DialogPuzzlePreferences),
+    m_configurationPage(new PuzzlePreferencesConfigurationPage),
+    m_layoutPage(new PuzzlePreferencesLayoutPage),
+    m_pathPage(new PuzzlePreferencesPathPage)
+{
+    ui->setupUi(this);
+
+#if defined(Q_OS_MAC)
+    setWindowFlags(Qt::Window);
+#endif
+
+    VAbstractApplication::VApp()->Settings()->GetOsSeparator() ? setLocale(QLocale()) : setLocale(QLocale::c());
+
+    QPushButton *bOk = ui->buttonBox->button(QDialogButtonBox::Ok);
+    SCASSERT(bOk != nullptr)
+    connect(bOk, &QPushButton::clicked, this, &DialogPuzzlePreferences::Ok);
+
+    QPushButton *bApply = ui->buttonBox->button(QDialogButtonBox::Apply);
+    SCASSERT(bApply != nullptr)
+    connect(bApply, &QPushButton::clicked, this, &DialogPuzzlePreferences::Apply);
+
+    ui->pagesWidget->insertWidget(0, m_configurationPage);
+    ui->pagesWidget->insertWidget(1, m_layoutPage);
+    ui->pagesWidget->insertWidget(2, m_pathPage);
+
+    connect(ui->contentsWidget, &QListWidget::currentItemChanged, this, &DialogPuzzlePreferences::PageChanged);
+    ui->pagesWidget->setCurrentIndex(0);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+DialogPuzzlePreferences::~DialogPuzzlePreferences()
+{
+    delete ui;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogPuzzlePreferences::showEvent(QShowEvent *event)
+{
+    QDialog::showEvent( event );
+    if ( event->spontaneous() )
+    {
+        return;
+    }
+
+    if (m_isInitialized)
+    {
+        return;
+    }
+    // do your init stuff here
+
+    QSize sz = VAbstractApplication::VApp()->Settings()->GetPreferenceDialogSize();
+    if (not sz.isEmpty())
+    {
+        resize(sz);
+    }
+
+    m_isInitialized = true;//first show windows are held
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogPuzzlePreferences::resizeEvent(QResizeEvent *event)
+{
+    Q_UNUSED(event)
+    // remember the size for the next time this dialog is opened, but only
+    // if widget was already initialized, which rules out the resize at
+    // dialog creating, which would
+    if (m_isInitialized)
+    {
+        VAbstractApplication::VApp()->Settings()->SetPreferenceDialogSize(size());
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogPuzzlePreferences::changeEvent(QEvent *event)
+{
+    if (event->type() == QEvent::LanguageChange)
+    {
+        // retranslate designer form (single inheritance approach)
+        ui->retranslateUi(this);
+    }
+    // remember to call base class implementation
+    QDialog::changeEvent(event);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogPuzzlePreferences::Apply()
+{
+    QStringList preferences;
+
+    preferences += m_configurationPage->Apply();
+    preferences += m_layoutPage->Apply();
+    m_pathPage->Apply();
+
+    if (not preferences.isEmpty())
+    {
+        const QString text = tr("Followed %n option(s) require restart to take effect: %1.", "",
+                                preferences.size()).arg(preferences.join(QStringLiteral(", ")));
+        QMessageBox::information(this, QCoreApplication::applicationName(), text);
+    }
+
+    VPApplication::VApp()->PuzzleSettings()->GetOsSeparator() ? setLocale(QLocale()) : setLocale(QLocale::c());
+    emit UpdateProperties();
+    setResult(QDialog::Accepted);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogPuzzlePreferences::Ok()
+{
+    Apply();
+    done(QDialog::Accepted);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogPuzzlePreferences::PageChanged(QListWidgetItem *current, QListWidgetItem *previous)
+{
+    if (current == nullptr)
+    {
+        current = previous;
+    }
+    int rowIndex = ui->contentsWidget->row(current);
+    ui->pagesWidget->setCurrentIndex(rowIndex);
+}
diff --git a/src/app/puzzle/dialogs/dialogpuzzlepreferences.h b/src/app/puzzle/dialogs/dialogpuzzlepreferences.h
new file mode 100644
index 000000000..c84390bf1
--- /dev/null
+++ b/src/app/puzzle/dialogs/dialogpuzzlepreferences.h
@@ -0,0 +1,73 @@
+/************************************************************************
+ **
+ **  @file   dialogpuzzlepreferences.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   21 5, 2021
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2021 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#ifndef DIALOGPUZZLEPREFERENCES_H
+#define DIALOGPUZZLEPREFERENCES_H
+
+#include <QDialog>
+
+namespace Ui
+{
+    class DialogPuzzlePreferences;
+}
+
+class PuzzlePreferencesConfigurationPage;
+class PuzzlePreferencesPathPage;
+class QListWidgetItem;
+class PuzzlePreferencesLayoutPage;
+
+class DialogPuzzlePreferences : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit DialogPuzzlePreferences(QWidget *parent = nullptr);
+    virtual ~DialogPuzzlePreferences();
+
+signals:
+    void UpdateProperties();
+
+protected:
+    virtual void showEvent(QShowEvent *event) override;
+    virtual void resizeEvent(QResizeEvent *event) override;
+    virtual void changeEvent(QEvent* event) override;
+
+private slots:
+    void Apply();
+    void Ok();
+    void PageChanged(QListWidgetItem *current, QListWidgetItem *previous);
+
+private:
+    Q_DISABLE_COPY(DialogPuzzlePreferences)
+    Ui::DialogPuzzlePreferences *ui;
+    bool m_isInitialized{false};
+    PuzzlePreferencesConfigurationPage *m_configurationPage;
+    PuzzlePreferencesLayoutPage        *m_layoutPage;
+    PuzzlePreferencesPathPage          *m_pathPage;
+};
+
+#endif // DIALOGPUZZLEPREFERENCES_H
diff --git a/src/app/puzzle/dialogs/dialogpuzzlepreferences.ui b/src/app/puzzle/dialogs/dialogpuzzlepreferences.ui
new file mode 100644
index 000000000..7d3869348
--- /dev/null
+++ b/src/app/puzzle/dialogs/dialogpuzzlepreferences.ui
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DialogPuzzlePreferences</class>
+ <widget class="QDialog" name="DialogPuzzlePreferences">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>851</width>
+    <height>551</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Puzzle preferences</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="../share/resources/puzzleicon.qrc">
+    <normaloff>:/puzzleicon/64x64/logo.png</normaloff>:/puzzleicon/64x64/logo.png</iconset>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QListWidget" name="contentsWidget">
+       <property name="minimumSize">
+        <size>
+         <width>128</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>128</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>96</width>
+         <height>84</height>
+        </size>
+       </property>
+       <property name="textElideMode">
+        <enum>Qt::ElideMiddle</enum>
+       </property>
+       <property name="movement">
+        <enum>QListView::Static</enum>
+       </property>
+       <property name="spacing">
+        <number>12</number>
+       </property>
+       <property name="viewMode">
+        <enum>QListView::IconMode</enum>
+       </property>
+       <property name="currentRow">
+        <number>-1</number>
+       </property>
+       <item>
+        <property name="text">
+         <string>Configuration</string>
+        </property>
+        <property name="textAlignment">
+         <set>AlignCenter</set>
+        </property>
+        <property name="icon">
+         <iconset resource="../../../libs/vmisc/share/resources/icon.qrc">
+          <normaloff>:/icon/config.png</normaloff>:/icon/config.png</iconset>
+        </property>
+        <property name="flags">
+         <set>ItemIsSelectable|ItemIsUserCheckable|ItemIsEnabled</set>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Layout</string>
+        </property>
+        <property name="textAlignment">
+         <set>AlignCenter</set>
+        </property>
+        <property name="icon">
+         <iconset resource="../../../libs/vmisc/share/resources/icon.qrc">
+          <normaloff>:/icon/layout.png</normaloff>:/icon/layout.png</iconset>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Paths</string>
+        </property>
+        <property name="textAlignment">
+         <set>AlignCenter</set>
+        </property>
+        <property name="icon">
+         <iconset resource="../../../libs/vmisc/share/resources/icon.qrc">
+          <normaloff>:/icon/path_config.png</normaloff>:/icon/path_config.png</iconset>
+        </property>
+        <property name="flags">
+         <set>ItemIsSelectable|ItemIsUserCheckable|ItemIsEnabled</set>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item>
+      <widget class="QStackedWidget" name="pagesWidget">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="sizeIncrement">
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
+       <widget class="QWidget" name="page_2"/>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../share/resources/puzzleicon.qrc"/>
+  <include location="../../../libs/vmisc/share/resources/icon.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>DialogPuzzlePreferences</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>DialogPuzzlePreferences</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/src/app/puzzle/dialogs/dialogsavemanuallayout.cpp b/src/app/puzzle/dialogs/dialogsavemanuallayout.cpp
new file mode 100644
index 000000000..4e85c3efc
--- /dev/null
+++ b/src/app/puzzle/dialogs/dialogsavemanuallayout.cpp
@@ -0,0 +1,592 @@
+/************************************************************************
+ **
+ **  @file   dialogsavemanuallayout.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   3 9, 2021
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2021 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#include "dialogsavemanuallayout.h"
+#include "ui_dialogsavemanuallayout.h"
+#include "../vpapplication.h"
+#include "../ifc/exception/vexception.h"
+#include "../vlayout/vlayoutexporter.h"
+
+#include <QMessageBox>
+#include <QShowEvent>
+#include <QtDebug>
+
+#ifndef Q_OS_WIN
+    Q_GLOBAL_STATIC_WITH_ARGS(const QString, baseFilenameRegExp, (QLatin1String("^[^\\/]+$")))
+#else
+    Q_GLOBAL_STATIC_WITH_ARGS(const QString, baseFilenameRegExp, (QLatin1String("^[^\\:?\"*|\\/<>]+$")))
+#endif
+
+bool DialogSaveManualLayout::havePdf = false;
+bool DialogSaveManualLayout::tested  = false;
+
+//---------------------------------------------------------------------------------------------------------------------
+DialogSaveManualLayout::DialogSaveManualLayout(int count, bool consoleExport, const QString &fileName, QWidget *parent)
+    : VAbstractLayoutDialog(parent),
+      ui(new Ui::DialogSaveManualLayout),
+      m_count(count),
+      m_consoleExport(consoleExport)
+{
+    ui->setupUi(this);
+
+#if defined(Q_OS_MAC)
+    setWindowFlags(Qt::Window);
+#endif
+
+    VPApplication::VApp()->PuzzleSettings()->GetOsSeparator() ? setLocale(QLocale()) : setLocale(QLocale::c());
+
+    QPushButton *bOk = ui->buttonBox->button(QDialogButtonBox::Ok);
+    SCASSERT(bOk != nullptr)
+    bOk->setEnabled(false);
+
+    ui->lineEditFileName->setValidator( new QRegularExpressionValidator(QRegularExpression(*baseFilenameRegExp), this));
+
+    const QString mask = m_count > 1 ? fileName + '_' : fileName;
+    if (not m_consoleExport)
+    {
+        ui->lineEditFileName->setText(mask);
+    }
+    else
+    {
+        if (QRegularExpression(*baseFilenameRegExp).match(mask).hasMatch())
+        {
+            ui->lineEditFileName->setText(mask);
+        }
+        else
+        {
+            throw VException(tr("The base filename does not match a regular expression."));
+        }
+    }
+
+    for (auto &v : InitFormats())
+    {
+        ui->comboBoxFormat->addItem(v.first, QVariant(static_cast<int>(v.second)));
+    }
+#ifdef V_NO_ASSERT // Temporarily unavailable
+    RemoveFormatFromList(LayoutExportFormats::OBJ);
+#endif
+
+//    RemoveFormatFromList(LayoutExportFormats::NC); // No support for now
+
+    connect(bOk, &QPushButton::clicked, this, &DialogSaveManualLayout::Save);
+    connect(ui->lineEditFileName, &QLineEdit::textChanged, this, &DialogSaveManualLayout::ShowExample);
+    connect(ui->comboBoxFormat, QOverload<int>::of(&QComboBox::currentIndexChanged),
+            this, &DialogSaveManualLayout::ShowExample);
+
+    connect(ui->pushButtonBrowse, &QPushButton::clicked, this, [this]()
+    {
+        const QString dirPath = VPApplication::VApp()->PuzzleSettings()->GetPathManualLayouts();
+        bool usedNotExistedDir = false;
+        QDir directory(dirPath);
+        if (not directory.exists())
+        {
+            usedNotExistedDir = directory.mkpath(QChar('.'));
+        }
+
+        const QString dir = QFileDialog::getExistingDirectory(
+            this, tr("Select folder"), dirPath,
+            VAbstractApplication::VApp()->NativeFileDialog(QFileDialog::ShowDirsOnly |
+                                                           QFileDialog::DontResolveSymlinks));
+        if (not dir.isEmpty())
+        {// If paths equal the signal will not be called, we will do this manually
+            dir == ui->lineEditPath->text() ? PathChanged(dir) : ui->lineEditPath->setText(dir);
+        }
+
+        if (usedNotExistedDir)
+        {
+            QDir directory(dirPath);
+            directory.rmpath(QChar('.'));
+        }
+    });
+    connect(ui->lineEditPath, &QLineEdit::textChanged, this, &DialogSaveManualLayout::PathChanged);
+
+    ui->lineEditPath->setText(VPApplication::VApp()->PuzzleSettings()->GetPathManualLayouts());
+
+    ReadSettings();
+
+    ShowExample();//Show example for current format.
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+DialogSaveManualLayout::~DialogSaveManualLayout()
+{
+    delete ui;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto DialogSaveManualLayout::Path() const -> QString
+{
+    return ui->lineEditPath->text();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto DialogSaveManualLayout::FileName() const -> QString
+{
+    return ui->lineEditFileName->text();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto DialogSaveManualLayout::Format() const -> LayoutExportFormats
+{
+    return static_cast<LayoutExportFormats>(ui->comboBoxFormat->currentData().toInt());
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSaveManualLayout::SelectFormat(LayoutExportFormats format)
+{
+    if (static_cast<int>(format) < 0 || format >= LayoutExportFormats::COUNT)
+    {
+        throw VException(tr("Tried to use out of range format number."));
+    }
+
+    const int i = ui->comboBoxFormat->findData(static_cast<int>(format));
+    if (i < 0)
+    {
+        throw VException(tr("Selected not present format."));
+    }
+    ui->comboBoxFormat->setCurrentIndex(i);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSaveManualLayout::SetBinaryDXFFormat(bool binary)
+{
+    switch(Format())
+    {
+        case LayoutExportFormats::DXF_AC1006_Flat:
+        case LayoutExportFormats::DXF_AC1009_Flat:
+        case LayoutExportFormats::DXF_AC1012_Flat:
+        case LayoutExportFormats::DXF_AC1014_Flat:
+        case LayoutExportFormats::DXF_AC1015_Flat:
+        case LayoutExportFormats::DXF_AC1018_Flat:
+        case LayoutExportFormats::DXF_AC1021_Flat:
+        case LayoutExportFormats::DXF_AC1024_Flat:
+        case LayoutExportFormats::DXF_AC1027_Flat:
+        case LayoutExportFormats::DXF_AC1006_AAMA:
+        case LayoutExportFormats::DXF_AC1009_AAMA:
+        case LayoutExportFormats::DXF_AC1012_AAMA:
+        case LayoutExportFormats::DXF_AC1014_AAMA:
+        case LayoutExportFormats::DXF_AC1015_AAMA:
+        case LayoutExportFormats::DXF_AC1018_AAMA:
+        case LayoutExportFormats::DXF_AC1021_AAMA:
+        case LayoutExportFormats::DXF_AC1024_AAMA:
+        case LayoutExportFormats::DXF_AC1027_AAMA:
+        case LayoutExportFormats::DXF_AC1006_ASTM:
+        case LayoutExportFormats::DXF_AC1009_ASTM:
+        case LayoutExportFormats::DXF_AC1012_ASTM:
+        case LayoutExportFormats::DXF_AC1014_ASTM:
+        case LayoutExportFormats::DXF_AC1015_ASTM:
+        case LayoutExportFormats::DXF_AC1018_ASTM:
+        case LayoutExportFormats::DXF_AC1021_ASTM:
+        case LayoutExportFormats::DXF_AC1024_ASTM:
+        case LayoutExportFormats::DXF_AC1027_ASTM:
+            ui->checkBoxBinaryDXF->setChecked(binary);
+            break;
+        default:
+            ui->checkBoxBinaryDXF->setChecked(false);
+            break;
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto DialogSaveManualLayout::IsBinaryDXFFormat() const -> bool
+{
+    switch(Format())
+    {
+        case LayoutExportFormats::DXF_AC1006_Flat:
+        case LayoutExportFormats::DXF_AC1009_Flat:
+        case LayoutExportFormats::DXF_AC1012_Flat:
+        case LayoutExportFormats::DXF_AC1014_Flat:
+        case LayoutExportFormats::DXF_AC1015_Flat:
+        case LayoutExportFormats::DXF_AC1018_Flat:
+        case LayoutExportFormats::DXF_AC1021_Flat:
+        case LayoutExportFormats::DXF_AC1024_Flat:
+        case LayoutExportFormats::DXF_AC1027_Flat:
+        case LayoutExportFormats::DXF_AC1006_AAMA:
+        case LayoutExportFormats::DXF_AC1009_AAMA:
+        case LayoutExportFormats::DXF_AC1012_AAMA:
+        case LayoutExportFormats::DXF_AC1014_AAMA:
+        case LayoutExportFormats::DXF_AC1015_AAMA:
+        case LayoutExportFormats::DXF_AC1018_AAMA:
+        case LayoutExportFormats::DXF_AC1021_AAMA:
+        case LayoutExportFormats::DXF_AC1024_AAMA:
+        case LayoutExportFormats::DXF_AC1027_AAMA:
+        case LayoutExportFormats::DXF_AC1006_ASTM:
+        case LayoutExportFormats::DXF_AC1009_ASTM:
+        case LayoutExportFormats::DXF_AC1012_ASTM:
+        case LayoutExportFormats::DXF_AC1014_ASTM:
+        case LayoutExportFormats::DXF_AC1015_ASTM:
+        case LayoutExportFormats::DXF_AC1018_ASTM:
+        case LayoutExportFormats::DXF_AC1021_ASTM:
+        case LayoutExportFormats::DXF_AC1024_ASTM:
+        case LayoutExportFormats::DXF_AC1027_ASTM:
+            return ui->checkBoxBinaryDXF->isChecked();
+        default:
+            return false;
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSaveManualLayout::SetDestinationPath(const QString &cmdDestinationPath)
+{
+    QString path;
+    if (cmdDestinationPath.isEmpty())
+    {
+        path = QDir::currentPath();
+    }
+    else if (QDir(cmdDestinationPath).isAbsolute())
+    {
+        path = cmdDestinationPath;
+    }
+    else
+    {
+        QDir dir;
+        if (not dir.cd(cmdDestinationPath))
+        {
+            throw VException(tr("The destination directory doesn't exists or is not readable."));
+        }
+        path = dir.absolutePath();
+    }
+
+    qDebug() << "Output full path: " << path << "\n";
+    ui->lineEditPath->setText(path);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto DialogSaveManualLayout::IsTextAsPaths() const -> bool
+{
+    return ui->checkBoxTextAsPaths->isChecked();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSaveManualLayout::SetTextAsPaths(bool textAsPaths)
+{
+    ui->checkBoxTextAsPaths->setChecked(textAsPaths);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSaveManualLayout::SetExportUnified(bool value)
+{
+    switch(Format())
+    {
+        case LayoutExportFormats::PDF:
+        case LayoutExportFormats::PDFTiled:
+        case LayoutExportFormats::PS:
+        case LayoutExportFormats::EPS:
+            ui->checkBoxExportUnified->setChecked(value);
+            break;
+        default:
+            ui->checkBoxExportUnified->setChecked(false);
+            break;
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto DialogSaveManualLayout::IsExportUnified() const -> bool
+{
+    switch(Format())
+    {
+        case LayoutExportFormats::PDF:
+        case LayoutExportFormats::PDFTiled:
+        case LayoutExportFormats::PS:
+        case LayoutExportFormats::EPS:
+            return ui->checkBoxExportUnified->isChecked();
+        default:
+            return false;
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSaveManualLayout::SetTilesScheme(bool value)
+{
+    switch(Format())
+    {
+        case LayoutExportFormats::PDFTiled:
+            ui->checkBoxTilesScheme->setChecked(value);
+            break;
+        default:
+            ui->checkBoxTilesScheme->setChecked(false);
+            break;
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+bool DialogSaveManualLayout::IsTilesScheme() const
+{
+    switch(Format())
+    {
+        case LayoutExportFormats::PDFTiled:
+            return ui->checkBoxTilesScheme->isChecked();
+        default:
+            return false;
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSaveManualLayout::showEvent(QShowEvent *event)
+{
+    QDialog::showEvent( event );
+    if ( event->spontaneous() )
+    {
+        return;
+    }
+
+    if (m_isInitialized)
+    {
+        return;
+    }
+    // do your init stuff here
+
+    setFixedHeight(size().height());
+
+    m_isInitialized = true;//first show windows are held
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSaveManualLayout::Save()
+{
+    WriteSettings();
+
+    for (int i=0; i < m_count; ++i)
+    {
+        QString name;
+        if (m_count > 1 && not IsExportUnified())
+        {
+            name = Path() + '/' + FileName() + QString::number(i+1) + VLayoutExporter::ExportFormatSuffix(Format());
+        }
+        else
+        {
+            name = Path() + '/' + FileName() + VLayoutExporter::ExportFormatSuffix(Format());
+        }
+
+        if (QFile::exists(name))
+        {
+            QMessageBox::StandardButton res = QMessageBox::question(this, tr("Name conflict"),
+                                  tr("Folder already contain file with name %1. Rewrite all conflict file names?")
+                                  .arg(name), QMessageBox::Yes|QMessageBox::No, QMessageBox::Yes);
+            if (res == QMessageBox::No)
+            {
+                reject();
+                return;
+            }
+
+            break;
+        }
+    }
+    accept();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSaveManualLayout::PathChanged(const QString &text)
+{
+    QPushButton *bOk = ui->buttonBox->button(QDialogButtonBox::Ok);
+    SCASSERT(bOk != nullptr)
+
+    QPalette palette = ui->lineEditPath->palette();
+
+    QDir dir(text);
+    dir.setPath(text);
+    if (not text.isEmpty() && dir.exists(text))
+    {
+        bOk->setEnabled(true);
+        palette.setColor(ui->lineEditPath->foregroundRole(), Qt::black);
+    }
+    else
+    {
+        bOk->setEnabled(false);
+        palette.setColor(ui->lineEditPath->foregroundRole(), Qt::red);
+    }
+
+    ui->lineEditPath->setPalette(palette);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSaveManualLayout::ShowExample()
+{
+    const LayoutExportFormats currentFormat = Format();
+
+    QString example;
+    if (m_count > 1)
+    {
+        example = tr("Example:") + FileName() + QLatin1Char('1') + VLayoutExporter::ExportFormatSuffix(currentFormat);
+    }
+    else
+    {
+        example = tr("Example:") + FileName() + VLayoutExporter::ExportFormatSuffix(currentFormat);
+    }
+    ui->labelExample->setText(example);
+
+    ui->checkBoxBinaryDXF->setEnabled(false);
+    ui->checkBoxTextAsPaths->setEnabled(true);
+    ui->checkBoxExportUnified->setEnabled(false);
+    ui->checkBoxTilesScheme->setEnabled(false);
+
+    switch(currentFormat)
+    {
+        case LayoutExportFormats::DXF_AC1006_Flat:
+        case LayoutExportFormats::DXF_AC1009_Flat:
+        case LayoutExportFormats::DXF_AC1012_Flat:
+        case LayoutExportFormats::DXF_AC1014_Flat:
+        case LayoutExportFormats::DXF_AC1015_Flat:
+        case LayoutExportFormats::DXF_AC1018_Flat:
+        case LayoutExportFormats::DXF_AC1021_Flat:
+        case LayoutExportFormats::DXF_AC1024_Flat:
+        case LayoutExportFormats::DXF_AC1027_Flat:
+        case LayoutExportFormats::DXF_AC1006_AAMA:
+        case LayoutExportFormats::DXF_AC1009_AAMA:
+        case LayoutExportFormats::DXF_AC1012_AAMA:
+        case LayoutExportFormats::DXF_AC1014_AAMA:
+        case LayoutExportFormats::DXF_AC1015_AAMA:
+        case LayoutExportFormats::DXF_AC1018_AAMA:
+        case LayoutExportFormats::DXF_AC1021_AAMA:
+        case LayoutExportFormats::DXF_AC1024_AAMA:
+        case LayoutExportFormats::DXF_AC1027_AAMA:
+        case LayoutExportFormats::DXF_AC1006_ASTM:
+        case LayoutExportFormats::DXF_AC1009_ASTM:
+        case LayoutExportFormats::DXF_AC1012_ASTM:
+        case LayoutExportFormats::DXF_AC1014_ASTM:
+        case LayoutExportFormats::DXF_AC1015_ASTM:
+        case LayoutExportFormats::DXF_AC1018_ASTM:
+        case LayoutExportFormats::DXF_AC1021_ASTM:
+        case LayoutExportFormats::DXF_AC1024_ASTM:
+        case LayoutExportFormats::DXF_AC1027_ASTM:
+            ui->checkBoxBinaryDXF->setEnabled(true);
+            break;
+        case LayoutExportFormats::RLD:
+            ui->checkBoxTextAsPaths->setEnabled(false);
+            break;
+        case LayoutExportFormats::PDFTiled:
+            ui->checkBoxTilesScheme->setEnabled(true);
+            ui->checkBoxExportUnified->setEnabled(true);
+            break;
+        case LayoutExportFormats::PDF:
+        case LayoutExportFormats::PS:
+        case LayoutExportFormats::EPS:
+            ui->checkBoxExportUnified->setEnabled(true);
+            break;
+        case LayoutExportFormats::SVG:
+        case LayoutExportFormats::PNG:
+        case LayoutExportFormats::OBJ:
+        case LayoutExportFormats::NC:
+        case LayoutExportFormats::TIF:
+        default:
+            break;
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto DialogSaveManualLayout::SupportPSTest() -> bool
+{
+    if (!tested)
+    {
+        havePdf = VLayoutExporter::SupportPDFConversion();
+        tested = true;
+    }
+    return havePdf;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto DialogSaveManualLayout::InitFormats() -> QVector<std::pair<QString, LayoutExportFormats> >
+{
+    QVector<std::pair<QString, LayoutExportFormats>> list;
+
+    auto InitFormat = [&list](LayoutExportFormats format)
+    {
+        list.append(std::make_pair(VLayoutExporter::ExportFormatDescription(format), format));
+    };
+
+    InitFormat(LayoutExportFormats::SVG);
+    InitFormat(LayoutExportFormats::PDF);
+    InitFormat(LayoutExportFormats::PNG);
+    InitFormat(LayoutExportFormats::OBJ);
+    if (SupportPSTest())
+    {
+        InitFormat(LayoutExportFormats::PS);
+        InitFormat(LayoutExportFormats::EPS);
+    }
+    InitFormat(LayoutExportFormats::DXF_AC1006_Flat);
+    InitFormat(LayoutExportFormats::DXF_AC1009_Flat);
+    InitFormat(LayoutExportFormats::DXF_AC1012_Flat);
+    InitFormat(LayoutExportFormats::DXF_AC1014_Flat);
+    InitFormat(LayoutExportFormats::DXF_AC1015_Flat);
+    InitFormat(LayoutExportFormats::DXF_AC1018_Flat);
+    InitFormat(LayoutExportFormats::DXF_AC1021_Flat);
+    InitFormat(LayoutExportFormats::DXF_AC1024_Flat);
+    InitFormat(LayoutExportFormats::DXF_AC1027_Flat);
+    InitFormat(LayoutExportFormats::DXF_AC1006_AAMA);
+    InitFormat(LayoutExportFormats::DXF_AC1009_AAMA);
+    InitFormat(LayoutExportFormats::DXF_AC1012_AAMA);
+    InitFormat(LayoutExportFormats::DXF_AC1014_AAMA);
+    InitFormat(LayoutExportFormats::DXF_AC1015_AAMA);
+    InitFormat(LayoutExportFormats::DXF_AC1018_AAMA);
+    InitFormat(LayoutExportFormats::DXF_AC1021_AAMA);
+    InitFormat(LayoutExportFormats::DXF_AC1024_AAMA);
+    InitFormat(LayoutExportFormats::DXF_AC1027_AAMA);
+    InitFormat(LayoutExportFormats::DXF_AC1006_ASTM);
+    InitFormat(LayoutExportFormats::DXF_AC1009_ASTM);
+    InitFormat(LayoutExportFormats::DXF_AC1012_ASTM);
+    InitFormat(LayoutExportFormats::DXF_AC1014_ASTM);
+    InitFormat(LayoutExportFormats::DXF_AC1015_ASTM);
+    InitFormat(LayoutExportFormats::DXF_AC1018_ASTM);
+    InitFormat(LayoutExportFormats::DXF_AC1021_ASTM);
+    InitFormat(LayoutExportFormats::DXF_AC1024_ASTM);
+    InitFormat(LayoutExportFormats::DXF_AC1027_ASTM);
+    InitFormat(LayoutExportFormats::PDFTiled);
+//    InitFormat(LayoutExportFormats::NC);
+    InitFormat(LayoutExportFormats::RLD);
+    InitFormat(LayoutExportFormats::TIF);
+
+    return list;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSaveManualLayout::RemoveFormatFromList(LayoutExportFormats format)
+{
+    const int index = ui->comboBoxFormat->findData(static_cast<int>(format));
+    if (index != -1)
+    {
+        ui->comboBoxFormat->removeItem(index);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSaveManualLayout::ReadSettings()
+{
+    VPSettings *settings = VPApplication::VApp()->PuzzleSettings();
+    SelectFormat(static_cast<LayoutExportFormats>(settings->GetLayoutExportFormat()));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSaveManualLayout::WriteSettings() const
+{
+    if (m_consoleExport)
+    {
+        return;
+    }
+
+    VPSettings *settings = VPApplication::VApp()->PuzzleSettings();
+    settings->SetLayoutExportFormat(static_cast<qint8>(Format()));
+}
diff --git a/src/app/puzzle/dialogs/dialogsavemanuallayout.h b/src/app/puzzle/dialogs/dialogsavemanuallayout.h
new file mode 100644
index 000000000..8d2bb065c
--- /dev/null
+++ b/src/app/puzzle/dialogs/dialogsavemanuallayout.h
@@ -0,0 +1,95 @@
+/************************************************************************
+ **
+ **  @file   dialogsavemanuallayout.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   3 9, 2021
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2021 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#ifndef DIALOGSAVEMANUALLAYOUT_H
+#define DIALOGSAVEMANUALLAYOUT_H
+
+#include "../vlayout/dialogs/vabstractlayoutdialog.h"
+#include "../vlayout/vlayoutdef.h"
+
+namespace Ui
+{
+class DialogSaveManualLayout;
+}
+
+class DialogSaveManualLayout : public VAbstractLayoutDialog
+{
+    Q_OBJECT
+
+public:
+    explicit DialogSaveManualLayout(int count, bool consoleExport, const QString &fileName = QString(),
+                                    QWidget *parent = nullptr);
+    virtual ~DialogSaveManualLayout();
+
+    auto Path() const -> QString;
+    auto FileName() const -> QString;
+
+    auto Format() const -> LayoutExportFormats;
+    void SelectFormat(LayoutExportFormats format);
+
+    void SetBinaryDXFFormat(bool binary);
+    auto IsBinaryDXFFormat() const -> bool;
+
+    void SetDestinationPath(const QString& cmdDestinationPath);
+
+    auto IsTextAsPaths() const -> bool;
+    void SetTextAsPaths(bool textAsPaths);
+
+    void SetExportUnified(bool value);
+    auto IsExportUnified() const -> bool;
+
+    void SetTilesScheme(bool value);
+    auto IsTilesScheme() const -> bool;
+
+protected:
+    virtual void showEvent(QShowEvent *event) override;
+
+private slots:
+    void Save();
+    void PathChanged(const QString &text);
+    void ShowExample();
+
+private:
+    Q_DISABLE_COPY(DialogSaveManualLayout)
+    Ui::DialogSaveManualLayout *ui;
+    int  m_count;
+    bool m_isInitialized{false};
+    bool m_scaleConnected{true};
+    bool m_consoleExport;
+
+    static bool havePdf;
+    static bool tested;
+    static bool SupportPSTest();
+    static QVector<std::pair<QString, LayoutExportFormats> > InitFormats();
+
+    void RemoveFormatFromList(LayoutExportFormats format);
+
+    void ReadSettings();
+    void WriteSettings() const;
+};
+
+#endif // DIALOGSAVEMANUALLAYOUT_H
diff --git a/src/app/puzzle/dialogs/dialogsavemanuallayout.ui b/src/app/puzzle/dialogs/dialogsavemanuallayout.ui
new file mode 100644
index 000000000..f14638ab3
--- /dev/null
+++ b/src/app/puzzle/dialogs/dialogsavemanuallayout.ui
@@ -0,0 +1,280 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DialogSaveManualLayout</class>
+ <widget class="QDialog" name="DialogSaveManualLayout">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>413</width>
+    <height>290</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_9">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_8">
+     <item>
+      <widget class="QLabel" name="label_9">
+       <property name="text">
+        <string>Path:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="lineEditPath">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="toolTip">
+        <string>Destination folder</string>
+       </property>
+       <property name="placeholderText">
+        <string>Path to destination folder</string>
+       </property>
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButtonBrowse">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="toolTip">
+        <string>Select path to destination folder</string>
+       </property>
+       <property name="text">
+        <string>Browse…</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_10">
+     <item>
+      <widget class="QLabel" name="label_10">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>File format:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="comboBoxFormat">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_5">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_11">
+     <item>
+      <widget class="QGroupBox" name="groupBoxFormatOptions_2">
+       <property name="title">
+        <string>Options</string>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_3">
+        <item>
+         <widget class="QCheckBox" name="checkBoxBinaryDXF">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>Binary form</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="checkBoxTextAsPaths">
+          <property name="enabled">
+           <bool>true</bool>
+          </property>
+          <property name="text">
+           <string>Text as paths</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="checkBoxExportUnified">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>Export unified</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="checkBoxTilesScheme">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>Tiles scheme</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_13">
+     <property name="sizeConstraint">
+      <enum>QLayout::SetDefaultConstraint</enum>
+     </property>
+     <item>
+      <widget class="QLabel" name="label_15">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>File name:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="lineEditFileName">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="toolTip">
+        <string>File base name</string>
+       </property>
+       <property name="placeholderText">
+        <string>File base name</string>
+       </property>
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="labelExample">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>130</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="text">
+        <string notr="true">TextLabel</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>DialogSaveManualLayout</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>DialogSaveManualLayout</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/src/app/puzzle/dialogs/vpdialogabout.cpp b/src/app/puzzle/dialogs/vpdialogabout.cpp
new file mode 100644
index 000000000..857c0b12e
--- /dev/null
+++ b/src/app/puzzle/dialogs/vpdialogabout.cpp
@@ -0,0 +1,141 @@
+/************************************************************************
+ **
+ **  @file   vpdialogabout.cpp
+ **  @author Ronan Le Tiec
+ **  @date   11 4, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2015 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+#include "vpdialogabout.h"
+#include "ui_vpdialogabout.h"
+#include "../version.h"
+#include "../vmisc/def.h"
+#include "../fervor/fvupdater.h"
+
+#include <QDate>
+#include <QDesktopServices>
+#include <QMessageBox>
+#include <QShowEvent>
+#include <QUrl>
+#include <QtDebug>
+
+//---------------------------------------------------------------------------------------------------------------------
+VPDialogAbout::VPDialogAbout(QWidget *parent)
+    :QDialog(parent),
+      ui(new Ui::VPDialogAbout),
+      isInitialized(false)
+{
+    ui->setupUi(this);
+
+    //mApp->Settings()->GetOsSeparator() ? setLocale(QLocale()) : setLocale(QLocale::c());
+
+    RetranslateUi();
+    connect(ui->pushButton_Web_Site, &QPushButton::clicked, this, []()
+    {
+        if ( not QDesktopServices::openUrl(QUrl(VER_COMPANYDOMAIN_STR)))
+        {
+            qWarning() << tr("Cannot open your default browser");
+        }
+    });
+    connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &VPDialogAbout::close);
+    connect(ui->pushButtonCheckUpdate, &QPushButton::clicked, []()
+    {
+        // Set feed URL before doing anything else
+        FvUpdater::sharedUpdater()->SetFeedURL(FvUpdater::CurrentFeedURL());
+        FvUpdater::sharedUpdater()->CheckForUpdatesNotSilent();
+    });
+
+    // By default on Windows font point size 8 points we need 11 like on Linux.
+    FontPointSize(ui->label_Legal_Stuff, 11);
+    FontPointSize(ui->label_Puzzle_Built, 11);
+    FontPointSize(ui->label_QT_Version, 11);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+VPDialogAbout::~VPDialogAbout()
+{
+    delete ui;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPDialogAbout::changeEvent(QEvent *event)
+{
+    if (event->type() == QEvent::LanguageChange)
+    {
+        // retranslate designer form (single inheritance approach)
+        ui->retranslateUi(this);
+        RetranslateUi();
+    }
+
+    // remember to call base class implementation
+    QDialog::changeEvent(event);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPDialogAbout::showEvent(QShowEvent *event)
+{
+    QDialog::showEvent( event );
+    if ( event->spontaneous() )
+    {
+        return;
+    }
+
+    if (isInitialized)
+    {
+        return;
+    }
+    // do your init stuff here
+
+    setMaximumSize(size());
+    setMinimumSize(size());
+
+    isInitialized = true;//first show windows are held
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPDialogAbout::FontPointSize(QWidget *w, int pointSize)
+{
+    SCASSERT(w != nullptr)
+
+    QFont font = w->font();
+    font.setPointSize(pointSize);
+    w->setFont(font);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPDialogAbout::RetranslateUi()
+{
+    ui->label_Puzzle_Version->setText(QString("Puzzle %1").arg(APP_VERSION_STR));
+    ui->labelBuildRevision->setText(tr("Build revision: %1").arg(BUILD_REVISION));
+    ui->label_QT_Version->setText(buildCompatibilityString());
+
+    const QDate date = QLocale::c().toDate(QString(__DATE__).simplified(), QLatin1String("MMM d yyyy"));
+    ui->label_Puzzle_Built->setText(tr("Built on %1 at %2").arg(date.toString(), __TIME__));
+
+    ui->label_Legal_Stuff->setText(QApplication::translate("InternalStrings",
+                                                           "The program is provided AS IS with NO WARRANTY OF ANY "
+                                                           "KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY "
+                                                           "AND FITNESS FOR A PARTICULAR PURPOSE."));
+
+    ui->pushButton_Web_Site->setText(tr("Web site : %1").arg(VER_COMPANYDOMAIN_STR));
+}
diff --git a/src/app/puzzle/dialogs/vpdialogabout.h b/src/app/puzzle/dialogs/vpdialogabout.h
new file mode 100644
index 000000000..fce48ca0e
--- /dev/null
+++ b/src/app/puzzle/dialogs/vpdialogabout.h
@@ -0,0 +1,61 @@
+/************************************************************************
+ **
+ **  @file   vpdialogabout.h
+ **  @author Ronan Le Tiec
+ **  @date   11 4, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2015 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+#ifndef VPDIALOGABOUT_H
+#define VPDIALOGABOUT_H
+
+#include <QDialog>
+
+namespace Ui
+{
+    class VPDialogAbout;
+}
+
+class VPDialogAbout : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit VPDialogAbout(QWidget *parent = nullptr);
+    virtual ~VPDialogAbout();
+
+protected:
+    virtual void changeEvent(QEvent* event) override;
+    virtual void showEvent(QShowEvent *event) override;
+
+private:
+    Q_DISABLE_COPY(VPDialogAbout)
+    Ui::VPDialogAbout *ui;
+    bool isInitialized;
+
+    void FontPointSize(QWidget *w, int pointSize);
+
+    void RetranslateUi();
+};
+
+#endif // VPDIALOGABOUT_H
diff --git a/src/app/puzzle/dialogs/vpdialogabout.ui b/src/app/puzzle/dialogs/vpdialogabout.ui
new file mode 100644
index 000000000..f98c73aa6
--- /dev/null
+++ b/src/app/puzzle/dialogs/vpdialogabout.ui
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>VPDialogAbout</class>
+ <widget class="QDialog" name="VPDialogAbout">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>462</width>
+    <height>338</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>About Puzzle</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="../share/resources/puzzleicon.qrc">
+    <normaloff>:/puzzleicon/64x64/logo.png</normaloff>:/puzzleicon/64x64/logo.png</iconset>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="spacing">
+      <number>4</number>
+     </property>
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>9</number>
+     </property>
+     <property name="bottomMargin">
+      <number>16</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="label_appIcon">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="pixmap">
+        <pixmap resource="../share/resources/puzzleicon.qrc">:/puzzleicon/64x64/logo.png</pixmap>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <widget class="QLabel" name="label_Puzzle_Version">
+         <property name="font">
+          <font>
+           <pointsize>15</pointsize>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Puzzle version</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+         <property name="textInteractionFlags">
+          <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+         </property>
+        </widget>
+       </item>
+       <item alignment="Qt::AlignHCenter">
+        <widget class="QLabel" name="labelBuildRevision">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Build revision:</string>
+         </property>
+         <property name="textInteractionFlags">
+          <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+         </property>
+        </widget>
+       </item>
+       <item alignment="Qt::AlignHCenter">
+        <widget class="QLabel" name="label">
+         <property name="text">
+          <string>This program is part of Valentina project.</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="pushButton_Web_Site">
+         <property name="palette">
+          <palette>
+           <active>
+            <colorrole role="ButtonText">
+             <brush brushstyle="SolidPattern">
+              <color alpha="255">
+               <red>0</red>
+               <green>0</green>
+               <blue>255</blue>
+              </color>
+             </brush>
+            </colorrole>
+           </active>
+           <inactive>
+            <colorrole role="ButtonText">
+             <brush brushstyle="SolidPattern">
+              <color alpha="255">
+               <red>0</red>
+               <green>0</green>
+               <blue>255</blue>
+              </color>
+             </brush>
+            </colorrole>
+           </inactive>
+           <disabled>
+            <colorrole role="ButtonText">
+             <brush brushstyle="SolidPattern">
+              <color alpha="255">
+               <red>120</red>
+               <green>120</green>
+               <blue>120</blue>
+              </color>
+             </brush>
+            </colorrole>
+           </disabled>
+          </palette>
+         </property>
+         <property name="font">
+          <font>
+           <underline>true</underline>
+          </font>
+         </property>
+         <property name="cursor">
+          <cursorShape>PointingHandCursor</cursorShape>
+         </property>
+         <property name="text">
+          <string notr="true">pushButton_Web_Site</string>
+         </property>
+         <property name="autoDefault">
+          <bool>false</bool>
+         </property>
+         <property name="flat">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_Puzzle_Built">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="text">
+          <string notr="true">label_Tape_Built</string>
+         </property>
+         <property name="textInteractionFlags">
+          <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_QT_Version">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="text">
+          <string notr="true">label_QT_Version</string>
+         </property>
+         <property name="textInteractionFlags">
+          <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_Legal_Stuff">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="text">
+          <string notr="true">label_Legal_Stuff</string>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QPushButton" name="pushButtonCheckUpdate">
+       <property name="text">
+        <string>Check For Updates</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="autoFillBackground">
+        <bool>true</bool>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Ok</set>
+       </property>
+       <property name="centerButtons">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../share/resources/puzzleicon.qrc"/>
+  <include location="../share/resources/puzzleicon.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/src/app/puzzle/layout/layoutdef.cpp b/src/app/puzzle/layout/layoutdef.cpp
new file mode 100644
index 000000000..2b3b47df3
--- /dev/null
+++ b/src/app/puzzle/layout/layoutdef.cpp
@@ -0,0 +1,92 @@
+/************************************************************************
+ **
+ **  @file   layoutdef.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   31 8, 2021
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2021 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+#include "layoutdef.h"
+
+#include <QString>
+#include <QStringList>
+
+//---------------------------------------------------------------------------------------------------------------------
+auto GrainlineTypeToStr(GrainlineType type) -> QString
+{
+    QString result;
+    switch (type)
+    {
+        case GrainlineType::Horizontal:
+            result = QStringLiteral("horizontal");
+            break;
+        case GrainlineType::Vertical:
+            result = QStringLiteral("vertical");
+            break;
+        case GrainlineType::NotFixed:
+        default:
+            result = QStringLiteral("notFixed");
+            break;
+    }
+    return result;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto StrToGrainlineType(const QString &string) -> GrainlineType
+{
+    const QStringList types
+    {
+        QStringLiteral("horizontal"), // 0
+        QStringLiteral("vertical"),   // 1
+        QStringLiteral("notFixed")    // 2
+    };
+
+    GrainlineType type = GrainlineType::NotFixed;
+    switch (types.indexOf(string))
+    {
+        case 0:// horizontal
+            type = GrainlineType::Horizontal;
+            break;
+        case 2:// vertical
+            type = GrainlineType::Vertical;
+            break;
+        case 3:// notFixed
+        default:
+            type = GrainlineType::NotFixed;
+            break;
+    }
+    return type;
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------
+bool VPTransformationOrigon::operator==(const VPTransformationOrigon &origin) const
+{
+    return this->origin == origin.origin && custom == origin.custom;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+bool VPTransformationOrigon::operator!=(const VPTransformationOrigon &origin) const
+{
+    return !VPTransformationOrigon::operator==(origin);
+}
diff --git a/src/app/puzzle/layout/layoutdef.h b/src/app/puzzle/layout/layoutdef.h
new file mode 100644
index 000000000..faa19b23c
--- /dev/null
+++ b/src/app/puzzle/layout/layoutdef.h
@@ -0,0 +1,67 @@
+/************************************************************************
+ **
+ **  @file   layoutdef.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   16 8, 2021
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2021 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#ifndef LAYOUTDEF_H
+#define LAYOUTDEF_H
+
+#include <QPointF>
+
+template <typename T> class QSharedPointer;
+template <typename T> class QWeakPointer;
+
+class VPLayout;
+using VPLayoutPtr = QSharedPointer<VPLayout>;
+using VPLayoutWeakPtr = QWeakPointer<VPLayout>;
+
+class VPPiece;
+using VPPiecePtr = QSharedPointer<VPPiece>;
+using VPPieceWeakPtr = QWeakPointer<VPPiece>;
+
+class VPSheet;
+using VPSheetPtr = QSharedPointer<VPSheet>;
+using VPSheetWeakPtr = QWeakPointer<VPSheet>;
+
+enum class GrainlineType : qint8
+{
+    Vertical,
+    Horizontal,
+    NotFixed
+};
+
+auto GrainlineTypeToStr(GrainlineType type) -> QString;
+auto StrToGrainlineType(const QString &string) -> GrainlineType;
+
+struct VPTransformationOrigon
+{
+    QPointF origin{};
+    bool    custom{false};
+
+    bool operator==(const VPTransformationOrigon &origin) const;
+    bool operator!=(const VPTransformationOrigon &origin) const;
+};
+
+#endif // LAYOUTDEF_H
diff --git a/src/app/puzzle/layout/vplayout.cpp b/src/app/puzzle/layout/vplayout.cpp
new file mode 100644
index 000000000..5ab67c09b
--- /dev/null
+++ b/src/app/puzzle/layout/vplayout.cpp
@@ -0,0 +1,403 @@
+/************************************************************************
+ **
+ **  @file   vplayout.cpp
+ **  @author Ronan Le Tiec
+ **  @date   13 4, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+#include "vplayout.h"
+#include "vppiece.h"
+#include "vpsheet.h"
+#include "../vpapplication.h"
+#include "../vptilefactory.h"
+#include "../ifc/xml/vwatermarkconverter.h"
+#include "../vformat/vwatermark.h"
+#include "../ifc/exception/vexception.h"
+
+#include <QLoggingCategory>
+#include <QUndoStack>
+#include <QPixmapCache>
+
+Q_LOGGING_CATEGORY(pLayout, "p.layout")
+
+//---------------------------------------------------------------------------------------------------------------------
+VPLayout::VPLayout(QUndoStack *undoStack) :
+    m_undoStack(undoStack)
+{
+    SCASSERT(m_undoStack != nullptr)
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayout::CreateLayout(QUndoStack *undoStack) -> VPLayoutPtr
+{
+    SCASSERT(undoStack != nullptr)
+    undoStack->clear();
+    VPLayoutPtr layout(new VPLayout(undoStack));
+    layout->AddTrashSheet(VPSheetPtr(new VPSheet(layout)));
+
+    // create a standard sheet
+    VPSheetPtr sheet(new VPSheet(layout));
+    sheet->SetName(tr("Sheet %1").arg(layout->GetAllSheets().size()+1));
+    layout->AddSheet(sheet);
+    layout->SetFocusedSheet(sheet);
+
+    VPSettings *settings = VPApplication::VApp()->PuzzleSettings();
+
+    layout->LayoutSettings().SetUnit(settings->LayoutUnit());
+
+    layout->LayoutSettings().SetShowTiles(settings->GetLayoutTileShowTiles());
+    layout->LayoutSettings().SetShowWatermark(settings->GetLayoutTileShowWatermark());
+    layout->LayoutSettings().SetTilesSize(QSizeF(settings->GetLayoutTilePaperWidth(),
+                                                 settings->GetLayoutTilePaperHeight()));
+    layout->LayoutSettings().SetIgnoreTilesMargins(settings->GetLayoutTileIgnoreMargins());
+    layout->LayoutSettings().SetTilesMargins(settings->GetLayoutTileMargins());
+
+    layout->LayoutSettings().SetWarningSuperpositionOfPieces(settings->GetLayoutWarningPiecesSuperposition());
+    layout->LayoutSettings().SetWarningPiecesOutOfBound(settings->GetLayoutWarningPiecesOutOfBound());
+    layout->LayoutSettings().SetFollowGrainline(settings->GetLayoutFollowGrainline());
+    layout->LayoutSettings().SetStickyEdges(settings->GetLayoutStickyEdges());
+    layout->LayoutSettings().SetPiecesGap(settings->GetLayoutPieceGap());
+
+    // ----- for test purposes, to be removed------------------
+    layout->LayoutSettings().SetTitle(QString("My Test Layout"));
+    layout->LayoutSettings().SetDescription(QString("Description of my Layout"));
+    // --------------------------------------------------------
+
+    // init the tile factory
+    auto *tileFactory = new VPTileFactory(layout, settings);
+    tileFactory->refreshTileInfos();
+    layout->SetTileFactory(tileFactory);
+
+    return layout;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayout::AddPiece(const VPLayoutPtr &layout, const VPPiecePtr &piece)
+{
+    piece->SetLayout(layout);
+    layout->AddPiece(piece);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayout::AddPiece(const VPPiecePtr &piece)
+{
+    if (not piece.isNull())
+    {
+        if (not m_pieces.contains(piece->GetUniqueID()))
+        {
+            m_pieces.insert(piece->GetUniqueID(), piece);
+        }
+        else
+        {
+            VPPiecePtr oldPiece = m_pieces.value(piece->GetUniqueID());
+            if (not oldPiece.isNull())
+            {
+                oldPiece->Update(piece);
+            }
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+VPTileFactory *VPLayout::TileFactory() const
+{
+    return m_tileFactory;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayout::SetTileFactory(VPTileFactory *newTileFactory)
+{
+    m_tileFactory = newTileFactory;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayout::RefreshScenePieces() const
+{
+    for (const auto& sheet : GetSheets())
+    {
+        if (not sheet.isNull())
+        {
+            sheet->SceneData()->RefreshPieces();
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayout::WatermarkData() const -> VWatermarkData
+{
+    VWatermarkData data;
+    if (not m_layoutSettings.WatermarkPath().isEmpty())
+    {
+        try
+        {
+            VWatermarkConverter converter(m_layoutSettings.WatermarkPath());
+            VWatermark watermark;
+            watermark.setXMLContent(converter.Convert());
+            data = watermark.GetWatermark();
+        }
+        catch (VException &)
+        {
+            data.invalidFile = true;
+            data.opacity = 20;
+            data.showImage = true;
+            data.path = "fake.png";
+            data.showText = false;
+            return data;
+        }
+    }
+
+    return data;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayout::IsSheetsUniform() const -> bool
+{
+    QList<VPSheetPtr> sheets = GetSheets();
+    if (sheets.size() < 2)
+    {
+        return true;
+    }
+
+    VPSheetPtr sheet = sheets.first();
+    if (sheet.isNull())
+    {
+        return false;
+    }
+
+    QSizeF sheetSize = sheet->GetSheetSize().toSize();
+
+    return std::all_of(sheets.begin(), sheets.end(), [sheetSize](const VPSheetPtr &sheet)
+    {
+        if (sheet.isNull())
+        {
+            return false;
+        }
+        QSize size = sheet->GetSheetSize().toSize();
+        return size == sheetSize || size.transposed() == sheetSize;
+    });
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayout::GetPieces() const -> QList<VPPiecePtr>
+{
+    return m_pieces.values();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayout::GetPlacedPieces() const -> QList<VPPiecePtr>
+{
+    QList<VPPiecePtr> pieces;
+    pieces.reserve(m_pieces.size());
+
+    for (const auto& piece : m_pieces)
+    {
+        if (not piece->isNull() && piece->Sheet() != VPSheetPtr() && piece->Sheet() != m_trashSheet)
+        {
+            pieces.append(piece);
+        }
+    }
+
+    return pieces;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayout::GetUnplacedPieces() const -> QList<VPPiecePtr>
+{
+    return PiecesForSheet(VPSheetPtr());
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayout::GetTrashedPieces() const -> QList<VPPiecePtr>
+{
+    if (m_trashSheet.isNull())
+    {
+        return {};
+    }
+    return PiecesForSheet(m_trashSheet->Uuid());
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayout::AddSheet(const VPSheetPtr &sheet) -> VPSheetPtr
+{
+    if (not sheet.isNull() && GetSheet(sheet->Uuid()).isNull())
+    {
+        m_sheets.append(sheet);
+        connect(this, &VPLayout::PieceTransformationChanged, sheet.get(), &VPSheet::CheckPiecePositionValidity);
+    }
+    return sheet;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QList<VPSheetPtr> VPLayout::GetAllSheets() const
+{
+    return m_sheets;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayout::GetSheets() const -> QList<VPSheetPtr>
+{
+    QList<VPSheetPtr> sheets;
+    sheets.reserve(m_sheets.size());
+
+    for (const auto &sheet : m_sheets)
+    {
+        if (not sheet.isNull() && sheet->IsVisible())
+        {
+            sheets.append(sheet);
+        }
+    }
+    return sheets;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayout::GetSheet(const QUuid &uuid) -> VPSheetPtr
+{
+    auto sheet = std::find_if(m_sheets.begin(), m_sheets.end(),
+                              [uuid](const VPSheetPtr &sheet) { return sheet->Uuid() == uuid; });
+
+    if (sheet != m_sheets.end())
+    {
+        return *sheet;
+    }
+
+    return {};
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayout::SetFocusedSheet(const VPSheetPtr &focusedSheet)
+{
+    if (m_sheets.isEmpty())
+    {
+        m_focusedSheet = {};
+    }
+    else
+    {
+        m_focusedSheet = focusedSheet.isNull() ? m_sheets.first() : focusedSheet;
+    }
+
+    emit ActiveSheetChanged(m_focusedSheet);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayout::GetFocusedSheet() -> VPSheetPtr
+{
+    return m_focusedSheet;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayout::GetTrashSheet() -> VPSheetPtr
+{
+    return m_trashSheet;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayout::LayoutSettings() -> VPLayoutSettings &
+{
+    return m_layoutSettings;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayout::PiecesForSheet(const VPSheetPtr &sheet) const -> QList<VPPiecePtr>
+{
+    QList<VPPiecePtr> list;
+    list.reserve(m_pieces.size());
+
+    for (const auto& piece : m_pieces)
+    {
+        if (not piece.isNull() && piece->Sheet() == sheet)
+        {
+            list.append(piece);
+        }
+    }
+
+    return list;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayout::PiecesForSheet(const QUuid &uuid) const -> QList<VPPiecePtr>
+{
+    QList<VPPiecePtr> list;
+    list.reserve(m_pieces.size());
+
+    for (const auto& piece : m_pieces)
+    {
+        if (not piece.isNull())
+        {
+            VPSheetPtr sheet = piece->Sheet();
+            if (not sheet.isNull() && sheet->Uuid() == uuid)
+            {
+                list.append(piece);
+            }
+        }
+    }
+
+    return list;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayout::UndoStack() const -> QUndoStack *
+{
+    return m_undoStack;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayout::SetUndoStack(QUndoStack *newUndoStack)
+{
+    m_undoStack = newUndoStack;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayout::Clear()
+{
+    if (m_undoStack != nullptr)
+    {
+        m_undoStack->clear();
+    }
+
+    m_pieces.clear();
+    m_trashSheet->Clear();
+    m_sheets.clear();
+    m_focusedSheet.clear();
+    m_layoutSettings = VPLayoutSettings();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayout::CheckPiecesPositionValidity() const
+{
+    for (const auto &sheet : m_sheets)
+    {
+        if (not sheet.isNull())
+        {
+            sheet->ValidateSuperpositionOfPieces();
+            sheet->ValidatePiecesOutOfBound();
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayout::AddTrashSheet(const VPSheetPtr &sheet)
+{
+    m_trashSheet = sheet;
+    m_trashSheet->SetTrashSheet(true);
+}
diff --git a/src/app/puzzle/layout/vplayout.h b/src/app/puzzle/layout/vplayout.h
new file mode 100644
index 000000000..c02960ed8
--- /dev/null
+++ b/src/app/puzzle/layout/vplayout.h
@@ -0,0 +1,136 @@
+/************************************************************************
+ **
+ **  @file   vplayout.h
+ **  @author Ronan Le Tiec
+ **  @date   13 4, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#ifndef VPLAYOUT_H
+#define VPLAYOUT_H
+
+#include <QList>
+#include <QMap>
+
+#include "def.h"
+#include "vplayoutsettings.h"
+#include "layoutdef.h"
+
+class VPPiece;
+class VPSheet;
+class QUndoStack;
+class VPTileFactory;
+struct VWatermarkData;
+
+class VPLayout : public QObject
+{
+    Q_OBJECT
+public:
+    virtual ~VPLayout() = default;
+
+    static auto CreateLayout(QUndoStack *undoStack) -> VPLayoutPtr;
+    static void AddPiece(const VPLayoutPtr &layout, const VPPiecePtr &piece);
+
+    auto GetPieces() const -> QList<VPPiecePtr>;
+    auto GetPlacedPieces() const -> QList<VPPiecePtr>;
+    auto GetUnplacedPieces() const -> QList<VPPiecePtr>;
+    auto GetTrashedPieces() const -> QList<VPPiecePtr>;
+
+    auto AddSheet(const VPSheetPtr &sheet) -> VPSheetPtr;
+    auto GetAllSheets() const -> QList<VPSheetPtr>;
+    auto GetSheets() const -> QList<VPSheetPtr>;
+    auto GetSheet(const QUuid &uuid) -> VPSheetPtr;
+
+    /**
+     * @brief SetFocusedSheet Sets the focused sheet, to which pieces are added from the carrousel via drag
+     * and drop
+     * @param focusedSheet the new active sheet. If nullptr, then it sets automaticaly the first sheet from m_sheets
+     */
+    void SetFocusedSheet(const VPSheetPtr &focusedSheet = VPSheetPtr());
+
+    /**
+     * @brief GetFocusedSheet Returns the focused sheet, to which pieces are added from the carrousel via drag
+     * and drop
+     * @return the focused sheet
+     */
+    auto GetFocusedSheet() -> VPSheetPtr;
+
+    void AddTrashSheet(const VPSheetPtr &sheet);
+    auto GetTrashSheet() -> VPSheetPtr;
+
+    auto LayoutSettings() -> VPLayoutSettings &;
+
+    auto PiecesForSheet(const VPSheetPtr &sheet) const -> QList<VPPiecePtr>;
+    auto PiecesForSheet(const QUuid &uuid) const -> QList<VPPiecePtr>;
+
+    QUndoStack *UndoStack() const;
+
+    void SetUndoStack(QUndoStack *newUndoStack);
+
+    void Clear();
+
+    void CheckPiecesPositionValidity() const;
+
+    auto TileFactory() const -> VPTileFactory *;
+    void SetTileFactory(VPTileFactory *newTileFactory);
+
+    void RefreshScenePieces() const;
+
+    auto WatermarkData() const -> VWatermarkData;
+
+    auto IsSheetsUniform() const -> bool;
+
+signals:
+    void PieceSheetChanged(const VPPiecePtr &piece);
+    void ActiveSheetChanged(const VPSheetPtr &focusedSheet);
+    void PieceTransformationChanged(const VPPiecePtr &piece);
+    void TransformationOriginChanged();
+    void SheetListChanged();
+    void PieceSelectionChanged(const VPPiecePtr &piece);
+    void PiecePositionValidityChanged(const VPPiecePtr &piece);
+    void LayoutChanged();
+
+protected:
+    explicit VPLayout(QUndoStack *undoStack);
+
+    void AddPiece(const VPPiecePtr &piece);
+
+private:
+    Q_DISABLE_COPY(VPLayout)
+
+    QMap<QString, VPPiecePtr> m_pieces{};
+
+    VPSheetPtr m_trashSheet{};
+
+    QList<VPSheetPtr> m_sheets{};
+    VPSheetPtr m_focusedSheet{};
+
+    VPLayoutSettings m_layoutSettings{};
+
+    QUndoStack *m_undoStack;
+
+    VPTileFactory *m_tileFactory{nullptr};
+};
+
+Q_DECLARE_METATYPE(VPLayoutPtr)
+
+#endif // VPLAYOUT_H
diff --git a/src/app/puzzle/layout/vplayoutsettings.cpp b/src/app/puzzle/layout/vplayoutsettings.cpp
new file mode 100644
index 000000000..a83b0d1a1
--- /dev/null
+++ b/src/app/puzzle/layout/vplayoutsettings.cpp
@@ -0,0 +1,390 @@
+/************************************************************************
+ **
+ **  @file   vplayoutsettings.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   29 7, 2021
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2021 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#include "vplayoutsettings.h"
+
+#include <QComboBox>
+#include <QIcon>
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutSettings::SetUnit(Unit unit)
+{
+    m_unit = unit;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutSettings::GetUnit() const -> Unit
+{
+    return m_unit;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutSettings::SetWarningSuperpositionOfPieces(bool state)
+{
+    m_warningSuperpositionOfPieces = state;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutSettings::GetWarningSuperpositionOfPieces() const -> bool
+{
+    return m_warningSuperpositionOfPieces;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutSettings::SetWarningPiecesOutOfBound(bool state)
+{
+    m_warningPiecesOutOfBound = state;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutSettings::GetWarningPiecesOutOfBound() const -> bool
+{
+    return m_warningPiecesOutOfBound;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutSettings::SetTitle(const QString &title)
+{
+    m_title = title;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutSettings::GetTitle() const -> QString
+{
+    return m_title;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutSettings::SetDescription(const QString &description)
+{
+    m_description = description;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutSettings::GetDescription() const -> QString
+{
+    return m_description;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutSettings::SetTilesSize(qreal width, qreal height)
+{
+    m_tilesSize.setWidth(width);
+    m_tilesSize.setHeight(height);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutSettings::SetTilesSizeConverted(qreal width, qreal height)
+{
+    m_tilesSize.setWidth(UnitConvertor(width, m_unit, Unit::Px));
+    m_tilesSize.setHeight(UnitConvertor(height, m_unit, Unit::Px));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutSettings::SetTilesSize(const QSizeF &size)
+{
+    m_tilesSize = size;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutSettings::SetTilesSizeConverted(const QSizeF &size)
+{
+    m_tilesSize = QSizeF(
+                UnitConvertor(size.width(), GetUnit(), Unit::Px),
+                UnitConvertor(size.height(), GetUnit(), Unit::Px)
+                );
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutSettings::GetTilesOrientation() const -> QPageLayout::Orientation
+{
+    return m_tilesSize.height() >= m_tilesSize.width() ? QPageLayout::Portrait : QPageLayout::Landscape;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutSettings::GetTilesSize() const -> QSizeF
+{
+    return m_tilesSize;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutSettings::GetTilesSize(Unit unit) const -> QSizeF
+{
+    QSizeF convertedSize = QSizeF(
+                UnitConvertor(m_tilesSize.width(), Unit::Px, unit),
+                UnitConvertor(m_tilesSize.height(), Unit::Px, unit)
+                );
+
+    return convertedSize;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutSettings::GetTilesSizeConverted() const -> QSizeF
+{
+    return GetTilesSize(GetUnit());
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutSettings::SetTilesMargins(qreal left, qreal top, qreal right, qreal bottom)
+{
+    m_tilesMargins.setLeft(left);
+    m_tilesMargins.setTop(top);
+    m_tilesMargins.setRight(right);
+    m_tilesMargins.setBottom(bottom);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutSettings::SetTilesMarginsConverted(qreal left, qreal top, qreal right, qreal bottom)
+{
+    m_tilesMargins.setLeft(UnitConvertor(left, GetUnit(), Unit::Px));
+    m_tilesMargins.setTop(UnitConvertor(top, GetUnit(), Unit::Px));
+    m_tilesMargins.setRight(UnitConvertor(right, GetUnit(), Unit::Px));
+    m_tilesMargins.setBottom(UnitConvertor(bottom, GetUnit(), Unit::Px));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutSettings::SetTilesMargins(const QMarginsF &margins)
+{
+    m_tilesMargins = margins;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutSettings::SetTilesMarginsConverted(const QMarginsF &margins)
+{
+    m_tilesMargins = UnitConvertor(margins, GetUnit(), Unit::Px);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutSettings::GetTilesMargins() const -> QMarginsF
+{
+    return m_tilesMargins;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutSettings::GetTilesMargins(Unit unit) const -> QMarginsF
+{
+    return UnitConvertor(m_tilesMargins, Unit::Px, unit);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutSettings::GetTilesMarginsConverted() const -> QMarginsF
+{
+    return UnitConvertor(m_tilesMargins, Unit::Px, GetUnit());
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutSettings::GetShowTiles() const -> bool
+{
+    return m_showTiles;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutSettings::SetShowTiles(bool value)
+{
+    m_showTiles = value;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutSettings::SetFollowGrainline(bool state)
+{
+    m_followGrainLine = state;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutSettings::GetFollowGrainline() const -> bool
+{
+    return m_followGrainLine;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutSettings::SetPiecesGap(qreal value)
+{
+    m_piecesGap = value;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutSettings::SetPiecesGapConverted(qreal value)
+{
+    m_piecesGap = UnitConvertor(value, m_unit, Unit::Px);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutSettings::GetPiecesGap() const -> qreal
+{
+    return m_piecesGap;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutSettings::GetPiecesGapConverted() const -> qreal
+{
+    return UnitConvertor(m_piecesGap, Unit::Px, m_unit);
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutSettings::SetStickyEdges(bool state)
+{
+    m_stickyEdges = state;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutSettings::GetStickyEdges() const -> bool
+{
+    return m_stickyEdges;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutSettings::GetShowGrid() const -> bool
+{
+    return m_showGrid;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutSettings::SetShowGrid(bool value)
+{
+    m_showGrid = value;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutSettings::GetGridColWidth() const -> qreal
+{
+    return m_gridColWidth;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutSettings::GetGridColWidthConverted() const -> qreal
+{
+    return UnitConvertor(m_gridColWidth, Unit::Px, m_unit);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutSettings::SetGridColWidth(qreal value)
+{
+    m_gridColWidth = value;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutSettings::SetGridColWidthConverted(qreal value)
+{
+    m_gridColWidth = UnitConvertor(value, m_unit, Unit::Px);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutSettings::GetGridRowHeight() const -> qreal
+{
+    return m_gridRowHeight;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutSettings::GetGridRowHeightConverted() const -> qreal
+{
+    return UnitConvertor(m_gridRowHeight, Unit::Px, m_unit);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutSettings::SetGridRowHeight(qreal value)
+{
+    m_gridRowHeight = value;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutSettings::SetGridRowHeightConverted(qreal value)
+{
+    m_gridRowHeight = UnitConvertor(value, m_unit, Unit::Px);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutSettings::IgnoreTilesMargins() const -> bool
+{
+    return m_ignoreTilesMargins;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutSettings::SetIgnoreTilesMargins(bool newIgnoreTilesMargins)
+{
+    m_ignoreTilesMargins = newIgnoreTilesMargins;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutSettings::HorizontalScale() const -> qreal
+{
+    return m_horizontalScale;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutSettings::SetHorizontalScale(qreal newHorizontalScale)
+{
+    m_horizontalScale = newHorizontalScale;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutSettings::VerticalScale() const -> qreal
+{
+    return m_verticalScale;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutSettings::SetVerticalScale(qreal newVerticalScale)
+{
+    m_verticalScale = newVerticalScale;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutSettings::WatermarkPath() const -> const QString &
+{
+    return m_watermarkPath;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutSettings::SetWatermarkPath(const QString &newWatermarkPath)
+{
+    m_watermarkPath = newWatermarkPath;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutSettings::GetShowWatermark() const -> bool
+{
+    return m_showWatermark;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutSettings::SetShowWatermark(bool newShowWatermark)
+{
+    m_showWatermark = newShowWatermark;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+bool VPLayoutSettings::GetPrintTilesScheme() const
+{
+    return m_printTilesScheme;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutSettings::SetPrintTilesScheme(bool newPrintTilesScheme)
+{
+    m_printTilesScheme = newPrintTilesScheme;
+}
diff --git a/src/app/puzzle/layout/vplayoutsettings.h b/src/app/puzzle/layout/vplayoutsettings.h
new file mode 100644
index 000000000..542519a05
--- /dev/null
+++ b/src/app/puzzle/layout/vplayoutsettings.h
@@ -0,0 +1,376 @@
+/************************************************************************
+ **
+ **  @file   vplayoutsettings.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   29 7, 2021
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2021 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#ifndef VPLAYOUTSETTINGS_H
+#define VPLAYOUTSETTINGS_H
+
+#include <QMarginsF>
+#include <QSizeF>
+#include <QString>
+#include <QCoreApplication>
+
+#include "def.h"
+
+class VPLayoutSettings
+{
+    Q_DECLARE_TR_FUNCTIONS(VPLayoutSettings)
+public:
+    VPLayoutSettings() = default;
+
+    // Layout
+
+    /**
+     * @brief SetUnit Sets the unit of the layout to the given unit
+     * @param unit the new unit
+     */
+    void SetUnit(Unit unit);
+
+    /**
+     * @brief GetUnit Returns the current unit of the layout
+     * @return the unit
+     */
+    auto GetUnit() const -> Unit;
+
+    /**
+     * @brief SetTitle Sets the title of the layout to the given value
+     * @param title the title of the layout
+     */
+    void SetTitle(const QString &title);
+
+    /**
+     * @brief GetTitle Returns the title of the layout
+     * @return title of the layout
+     */
+    auto GetTitle() const -> QString;
+
+    /**
+     * @brief SetDescription Sets the description of the layout to the given value
+     * @param description the description of the layout
+     */
+    void SetDescription(const QString &description);
+
+    /**
+     * @brief GetDescription Returns the description of the layout.
+     * @return description of the layout
+     */
+    auto GetDescription() const -> QString;
+
+    void SetStickyEdges(bool state);
+    auto GetStickyEdges() const -> bool;
+
+    // Piece
+
+    void SetWarningSuperpositionOfPieces(bool state);
+    auto GetWarningSuperpositionOfPieces() const -> bool;
+
+    void SetWarningPiecesOutOfBound(bool state);
+    auto GetWarningPiecesOutOfBound() const -> bool;
+
+    /**
+     * @brief SetFollowGrainline Sets the type of grainline for the pieces to follow
+     * @param state the type of grainline
+     */
+    void SetFollowGrainline(bool state);
+
+    /**
+     * @brief GetFollowGrainline Returns if the sheet's pieces follow a grainline or not
+     * @return wether the pieces follow a grainline and if so, which grainline
+     */
+    auto GetFollowGrainline() const -> bool;
+
+    /**
+     * @brief SetPiecesGap sets the pieces gap to the given value, the unit has to be in Unit::Px
+     * @param value pieces gap
+     */
+    void SetPiecesGap(qreal value);
+
+    /**
+     * @brief SetPiecesGapConverted sets the pieces gap to the given value, the unit has to be in the layout's unit
+     * @param value pieces gap
+     */
+    void SetPiecesGapConverted(qreal value);
+
+    /**
+     * @brief GetPiecesGap returns the pieces gap in Unit::Px
+     * @return the pieces gap in Unit::Px
+     */
+    auto GetPiecesGap() const -> qreal;
+
+    /**
+     * @brief GetPiecesGapConverted returns the pieces gap in the layout's unit
+     * @return the pieces gap in the layout's unit
+     */
+    auto GetPiecesGapConverted() const -> qreal;
+
+    // Tiles
+
+    /**
+     * @brief SetTilesSize sets the size of the tiles, the values have to be in Unit::Px
+     * @param width tiles width
+     * @param height tiles height
+     */
+    void SetTilesSize(qreal width, qreal height);
+
+    /**
+     * @brief SetTilesSizeConverted sets the size of the sheet, the values have to be in the layout's unit
+     * @param width tiles width
+     * @param height tiles height
+     */
+    void SetTilesSizeConverted(qreal width, qreal height);
+
+    /**
+     * @brief SetTilesSize sets the size of the tiles, the values have to be in Unit::Px
+     * @param size tiles size
+     */
+    void SetTilesSize(const QSizeF &size);
+    /**
+     * @brief SetTilesSizeConverted sets the size of the tiles, the values have to be in the layout's unit
+     * @param size tiles size
+     */
+    void SetTilesSizeConverted(const QSizeF &size);
+
+    auto GetTilesOrientation() const -> QPageLayout::Orientation;
+
+    /**
+     * @brief GetTilesSize Returns the size of the tiles in Unit::Px
+     * @return tiles size in Unit::Px
+     */
+    auto GetTilesSize() const -> QSizeF;
+
+    /**
+     * @brief GetTilesSize Returns the size of the tiles in given Unit
+     * @return tiles size
+     */
+    auto GetTilesSize(Unit unit) const -> QSizeF;
+
+    /**
+     * @brief GetTilesSizeConverted Returns the size of the tiles in the layout's unit
+     * @return the size in the layout's unit
+     */
+    auto GetTilesSizeConverted() const -> QSizeF;
+
+    /**
+     * @brief SetTilesMargins, set the margins of the tiles, the values have to be in Unit::Px
+     * @param left in Unit::Px
+     * @param top in Unit::Px
+     * @param right in Unit::Px
+     * @param bottom in Unit::Px
+     */
+    void SetTilesMargins(qreal left, qreal top, qreal right, qreal bottom);
+
+    /**
+     * @brief SetSheetMargins, set the margins of the tiles, the values have to be in the unit of the layout
+     * @param left in Unit::Px
+     * @param top in Unit::Px
+     * @param right in Unit::Px
+     * @param bottom in Unit::Px
+     */
+    void SetTilesMarginsConverted(qreal left, qreal top, qreal right, qreal bottom);
+
+    /**
+     * @brief SetTilesMargins set the margins of the tiles, the values have to be in Unit::Px
+     * @param margins tiles margins
+     */
+    void SetTilesMargins(const QMarginsF &margins);
+
+    /**
+     * @brief SetTilesMarginsConverted set the margins of the tiles, the values have to be in the unit of the layout
+     * @param margins tiles margins
+     */
+    void SetTilesMarginsConverted(const QMarginsF &margins);
+
+    /**
+     * @brief GetTilesMargins Returns margins of the tiles in Unit::Px
+     * @return the margins in Unit::Px
+     */
+    auto GetTilesMargins() const -> QMarginsF;
+
+    /**
+     * @brief GetTilesMargins Returns margins of the tiles in the given unit
+     * @param unit the unit in which we want the margins
+     * @return the margins in the given unit
+     */
+    auto GetTilesMargins(Unit unit) const -> QMarginsF;
+
+    /**
+     * @brief GetTilesMarginsConverted Returns the margins of the tiles in the layout's unit
+     * @return the margins in the tiles's unit
+     */
+    auto GetTilesMarginsConverted() const -> QMarginsF;
+
+    /**
+     * @brief GetShowTiles Returns true if the tiles has to be shown on the current sheet
+     * @return true if the tiles has to be shown on the current sheet
+     */
+    auto GetShowTiles() const -> bool;
+
+    /**
+     * @brief SetShowTiles Sets wether to show the tiles on the current sheet or not
+     * @param value true to show the tiles
+     */
+    void SetShowTiles(bool value);
+
+    // Sheet
+    /**
+     * @brief GetShowGrid Returns true if the placement grid has to be shown on the current sheet
+     * @return true if the placement grid has to be shown on the current sheet
+     */
+    auto GetShowGrid() const -> bool;
+
+    /**
+     * @brief SetShowGrid Returns true if the placement grid has to be shown on the current sheet
+     * @param value whether to show the grid or not
+     */
+    void SetShowGrid(bool value);
+
+    /**
+    * @brief GetGridColWidth returns the placement grid column width in Unit::Px
+    * @return the placement grid column width in Unit::Px
+    */
+    auto GetGridColWidth() const -> qreal;
+
+    /**
+    * @brief GetGridColWidth returns the placement grid column width in the layout's unit
+    * @return the placement grid column width in the layout's unit
+    */
+    auto GetGridColWidthConverted() const -> qreal;
+
+    /**
+     * @brief SetGridColWidth sets the placement grid column width to the given value, the unit has to be Unit::Px
+     * @param value the placement grid column width in Unit::Px
+     */
+    void SetGridColWidth(qreal value);
+
+    /**
+     * @brief SetGridColWidthConverted sets the placement grid column width to the given value, the unit has to be in
+     * the layout's unit
+     * @param value the placement grid column width in the layout's unit
+     */
+    void SetGridColWidthConverted(qreal value);
+
+    /**
+    * @brief GetGridRowHeight returns the placement grid row height in Unit::Px
+    * @return the placement grid row height in Unit::Px
+    */
+    auto GetGridRowHeight() const -> qreal;
+
+    /**
+    * @brief GetGridRowHeightConverted returns the placement grid row height in the layout's unit
+    * @return the placement grid row height in the layout's unit
+    */
+    auto GetGridRowHeightConverted() const -> qreal;
+
+    /**
+     * @brief SetGridRowHeight sets the placement grid row height to the given value, the unit has to be Unit::Px
+     * @param value the placement grid row height in Unit::Px
+     */
+    void SetGridRowHeight(qreal value);
+
+    /**
+     * @brief SetGridRowHeightConverted sets the placement grid row height to the given value, the unit has to be in
+     * the layout's unit
+     * @param value the placement grid row height in the layout's unit
+     */
+    void SetGridRowHeightConverted(qreal value);
+
+    auto IgnoreTilesMargins() const -> bool;
+    void SetIgnoreTilesMargins(bool newIgnoreTilesMargins);
+
+    auto HorizontalScale() const -> qreal;
+    void SetHorizontalScale(qreal newHorizontalScale);
+
+    auto VerticalScale() const -> qreal;
+    void SetVerticalScale(qreal newVerticalScale);
+
+    auto WatermarkPath() const -> const QString &;
+    void SetWatermarkPath(const QString &newWatermarkPath);
+
+    auto GetShowWatermark() const -> bool;
+    void SetShowWatermark(bool newShowWatermark);
+
+    bool GetPrintTilesScheme() const;
+    void SetPrintTilesScheme(bool newPrintTilesScheme);
+
+private:
+    Unit m_unit{Unit::Cm};
+
+    bool m_warningSuperpositionOfPieces{false};
+    bool m_warningPiecesOutOfBound{false};
+
+    QString m_title{};
+    QString m_description{};
+
+    /**
+     * @brief m_size the Size of the tiles in Unit::Px
+     */
+    QSizeF m_tilesSize{};
+
+    // margins
+    /**
+     * @brief m_margins the margins of the tiles in Unit::Px
+     */
+    QMarginsF m_tilesMargins{};
+
+    bool m_ignoreTilesMargins{false};
+
+    bool m_showTiles{false};
+    bool m_showWatermark{false};
+
+    // control
+    bool m_followGrainLine{false};
+
+    /**
+     * @brief m_piecesGap the pieces gap in Unit::Px
+     */
+    qreal m_piecesGap{0};
+
+    // placement grid
+    /**
+     * @brief GetShowGrid Returns true if the placement grid has to be shown on the current sheet
+     */
+    bool m_showGrid{false};
+    /**
+     * @brief m_gridColWidth the column width of the placement grid in Unit::Px
+     */
+    qreal m_gridColWidth{0};
+
+    /**
+     * @brief m_gridRowHeight the row height of the placement grid in Unit::Px
+     */
+    qreal m_gridRowHeight{0};
+
+    bool m_stickyEdges{false};
+
+    qreal m_horizontalScale{1.0};
+    qreal m_verticalScale{1.0};
+
+    QString m_watermarkPath{};
+
+    bool m_printTilesScheme{false};
+};
+
+#endif // VPLAYOUTSETTINGS_H
diff --git a/src/app/puzzle/layout/vppiece.cpp b/src/app/puzzle/layout/vppiece.cpp
new file mode 100644
index 000000000..a71390392
--- /dev/null
+++ b/src/app/puzzle/layout/vppiece.cpp
@@ -0,0 +1,514 @@
+/************************************************************************
+ **
+ **  @file   vppiece.cpp
+ **  @author Ronan Le Tiec
+ **  @date   13 4, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#include "vppiece.h"
+
+#include <QtMath>
+
+#include "../vmisc/def.h"
+#include "vpsheet.h"
+#include "vplayout.h"
+#include "../vlayout/vtextmanager.h"
+#include "../vlayout/vlayoutpiecepath.h"
+
+#include <QIcon>
+#include <QLoggingCategory>
+#include <QPainter>
+
+Q_LOGGING_CATEGORY(pPiece, "p.piece")
+
+namespace
+{
+constexpr qreal minStickyDistance = ToPixel(3, Unit::Mm);
+constexpr qreal maxStickyDistance = ToPixel(10, Unit::Mm);
+constexpr qreal stickyShift = ToPixel(1, Unit::Mm);
+
+//---------------------------------------------------------------------------------------------------------------------
+auto CutEdge(const QLineF &edge) -> QVector<QPointF>
+{
+    QVector<QPointF> points;
+    if (qFuzzyIsNull(stickyShift))
+    {
+        points.append(edge.p1());
+        points.append(edge.p2());
+    }
+    else
+    {
+        const int n = qFloor(edge.length()/stickyShift);
+
+        if (n <= 0)
+        {
+            points.append(edge.p1());
+            points.append(edge.p2());
+        }
+        else
+        {
+            points.reserve(n);
+            const qreal nShift = edge.length()/n;
+            for (int i = 1; i <= n+1; ++i)
+            {
+                QLineF l1 = edge;
+                l1.setLength(nShift*(i-1));
+                points.append(l1.p2());
+            }
+        }
+    }
+    return points;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto PrepareStickyPath(const QVector<QPointF> &path) -> QVector<QPointF>
+{
+    if (path.size() < 2)
+    {
+        return path;
+    }
+
+    QVector<QPointF> stickyPath;
+
+    for (int i=0; i<path.size(); ++i)
+    {
+        stickyPath += CutEdge(QLineF(path.at(i), path.at(i < path.size()-1 ? i+1 : 0)));
+    }
+
+    return stickyPath;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto ClosestDistance(const QVector<QPointF> &path1, const QVector<QPointF> &path2) -> QLineF
+{
+    qreal distance = INT_MAX;
+    QLineF closestDistance;
+
+    for (auto p1 : path1)
+    {
+        for (auto p2 : path2)
+        {
+            QLineF d(p1, p2);
+            if (d.length() <= distance)
+            {
+                distance = d.length();
+                closestDistance = d;
+            }
+        }
+    }
+
+    return closestDistance;
+}
+}  // namespace
+
+//---------------------------------------------------------------------------------------------------------------------
+VPPiece::VPPiece(const VLayoutPiece &layoutPiece)
+    : VLayoutPiece(layoutPiece)
+{
+    ClearTransformations();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPPiece::Update(const VPPiecePtr &piece)
+{
+    if (piece.isNull())
+    {
+        return;
+    }
+
+    SetName(piece->GetName());
+    SetCountourPoints(piece->GetContourPoints(), IsHideMainPath());
+    SetSeamAllowancePoints(GetSeamAllowancePoints(), piece->IsSeamAllowance(), piece->IsSeamAllowanceBuiltIn());
+    SetInternalPaths(GetInternalPaths());
+    SetPassmarks(GetPassmarks());
+    SetPlaceLabels(GetPlaceLabels());
+
+    SetGrainlineEnabled(piece->IsGrainlineEnabled());
+    SetGrainlineAngle(piece->GrainlineAngle());
+    SetGrainlineArrowType(piece->GrainlineArrowType());
+    SetGrainlinePoints(piece->GetGrainline());
+
+    SetPieceLabelRect(piece->GetPieceLabelRect());
+    SetPieceLabelData(piece->GetPieceLabelData());
+    SetPatternLabelRect(piece->GetPatternLabelRect());
+    SetPatternLabelData(piece->GetPatternLabelData());
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPPiece::GetUniqueID() const -> QString
+{
+    QString id = VLayoutPiece::GetUniqueID();
+
+    if (m_copyNumber > 1)
+    {
+        id = id + '_' + QString::number(m_copyNumber);
+    }
+
+    return id;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPPiece::ClearTransformations()
+{
+    // Reset the piece position to the default state
+    SetMatrix(QTransform());
+
+    // restore original size
+    QTransform m;
+    m.scale(GetXScale(), GetYScale());
+    QTransform matrix = GetMatrix();
+    matrix *= m;
+    SetMatrix(matrix);
+
+    // translate the piece so that the top left corner of the bouding rect of the piece is at the position
+    // (0,0) in the sheet coordinate system
+    const QPointF offset = MappedDetailBoundingRect().topLeft();
+    Translate(-offset.x(), -offset.y());
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPPiece::SetPosition(QPointF point)
+{
+    QTransform matrix = GetMatrix();
+    const QPointF offset = MappedDetailBoundingRect().topLeft();
+    matrix.translate(point.x() - offset.x(), point.y() - offset.y());
+    SetMatrix(matrix);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPPiece::GetPosition() -> QPointF
+{
+    QTransform matrix = GetMatrix();
+    return QPointF(matrix.dx(), matrix.dy());
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPPiece::RotateToGrainline(const VPTransformationOrigon &origin)
+{
+    VPSheetPtr sheet = Sheet();
+    if (not IsGrainlineEnabled() || sheet.isNull())
+    {
+        return;
+    }
+
+    const QVector<QPointF> grainlinePoints = GetMappedGrainline();
+    if (grainlinePoints.count() < 2)
+    {
+        return;
+    }
+
+    QLineF grainline(grainlinePoints.first(), grainlinePoints.last());
+
+    QLineF canonical(grainlinePoints.first().x(), grainlinePoints.first().y(),
+                     grainlinePoints.first().x()+100, grainlinePoints.first().y());
+
+    GrainlineType grainlineType = sheet->GrainlineOrientation();
+
+    auto DegreesAtFront = [grainline, canonical, grainlineType]()
+    {
+        QLineF atFront = canonical;
+        if (grainlineType == GrainlineType::Vertical)
+        {
+            atFront.setAngle(90);
+        }
+
+        qreal angleTo = grainline.angleTo(atFront);
+        return angleTo;
+    };
+
+    auto DegreesAtRear = [grainline, canonical, grainlineType]()
+    {
+        QLineF atRear = canonical;
+        atRear.setAngle(grainlineType == GrainlineType::Vertical ? 270 : 180);
+
+        qreal angleTo = grainline.angleTo(atRear);
+        return angleTo;
+    };
+
+    GrainlineArrowDirection type = GrainlineArrowType();
+    qreal degrees = 0;
+
+    if (type == GrainlineArrowDirection::atFront)
+    {
+        degrees = DegreesAtFront();
+    }
+    else if (type == GrainlineArrowDirection::atRear)
+    {
+        degrees = DegreesAtRear();
+    }
+    else
+    {
+        const qreal atFront = DegreesAtFront();
+        if (atFront <= 90 || atFront >= 270)
+        {
+            degrees = atFront;
+        }
+        else
+        {
+            degrees = DegreesAtRear();
+        }
+    }
+
+    if (origin.custom)
+    {
+        Rotate(MappedDetailBoundingRect().center(), degrees);
+    }
+    else
+    {
+        Rotate(origin.origin, degrees);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPPiece::SetGrainlineEnabled(bool enabled)
+{
+    VLayoutPiece::SetGrainlineEnabled(enabled);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPPiece::SetGrainlineAngle(qreal angle)
+{
+    VLayoutPiece::SetGrainlineAngle(angle);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPPiece::SetGrainlineArrowType(GrainlineArrowDirection type)
+{
+    VLayoutPiece::SetGrainlineArrowType(type);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPPiece::SetGrainlinePoints(const QVector<QPointF> &points)
+{
+    VLayoutPiece::SetGrainlinePoints(points);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPPiece::GetPieceLabelRect() const -> QVector<QPointF>
+{
+    return VLayoutPiece::GetPieceLabelRect();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPPiece::SetPieceLabelRect(const QVector<QPointF> &rect)
+{
+    VLayoutPiece::SetPieceLabelRect(rect);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPPiece::GetPieceLabelData() const -> VTextManager
+{
+    return VLayoutPiece::GetPieceLabelData();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPPiece::SetPieceLabelData(const VTextManager &data)
+{
+    VLayoutPiece::SetPieceLabelData(data);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPPiece::GetPatternLabelRect() const -> QVector<QPointF>
+{
+    return VLayoutPiece::GetPatternLabelRect();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPPiece::SetPatternLabelRect(const QVector<QPointF> &rect)
+{
+    VLayoutPiece::SetPatternLabelRect(rect);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPPiece::GetPatternLabelData() const -> VTextManager
+{
+    return VLayoutPiece::GetPatternLabelData();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPPiece::SetPatternLabelData(const VTextManager &data)
+{
+    VLayoutPiece::SetPatternLabelData(data);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPPiece::Flip()
+{
+    QTransform pieceMatrix = GetMatrix();
+    QPointF center = pieceMatrix.map(DetailBoundingRect().center());
+
+    QTransform m;
+    m.translate(center.x(), 0);
+    m.scale(-1, 1);
+    m.translate(-center.x(), 0);
+
+    pieceMatrix *= m;
+    SetMatrix(pieceMatrix);
+    SetMirror(!IsMirror());
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPPiece::StickyPosition(qreal &dx, qreal &dy) const -> bool
+{
+    VPLayoutPtr layout = Layout();
+    if (layout.isNull() || not layout->LayoutSettings().GetStickyEdges())
+    {
+        return false;
+    }
+
+    const qreal pieceGap = layout->LayoutSettings().GetPiecesGap();
+    if (pieceGap <= 0)
+    {
+        return false;
+    }
+
+    VPSheetPtr sheet = Sheet();
+    if (sheet.isNull())
+    {
+        return false;
+    }
+
+    QList<VPPiecePtr> allPieces = sheet->GetPieces();
+
+    if (allPieces.count() < 2)
+    {
+        return false;
+    }
+
+    QVector<QPointF> path = GetMappedExternalContourPoints();
+    QRectF boundingRect = VLayoutPiece::BoundingRect(path);
+    const qreal stickyDistance = pieceGap+minStickyDistance;
+    QRectF stickyZone = QRectF(boundingRect.topLeft().x()-stickyDistance, boundingRect.topLeft().y()-stickyDistance,
+                               boundingRect.width()+stickyDistance*2, boundingRect.height()+stickyDistance*2);
+
+    QVector<QPointF> stickyPath = PrepareStickyPath(path);
+    QLineF closestDistance;
+
+    for (const auto& piece : allPieces)
+    {
+        if (piece.isNull() || piece->GetUniqueID() == GetUniqueID())
+        {
+            continue;
+        }
+
+        QVector<QPointF> piecePath = piece->GetMappedExternalContourPoints();
+        QRectF pieceBoundingRect = VLayoutPiece::BoundingRect(piecePath);
+
+        if (stickyZone.intersects(pieceBoundingRect) || pieceBoundingRect.contains(stickyZone) ||
+                stickyZone.contains(pieceBoundingRect))
+        {
+            if (not VPPiece::PathsSuperposition(path, piecePath))
+            {
+                QVector<QPointF> pieceStickyPath = PrepareStickyPath(piecePath);
+                closestDistance = ClosestDistance(stickyPath, pieceStickyPath);
+            }
+        }
+    }
+
+    if (closestDistance.isNull())
+    {
+        return false;
+    }
+
+    const qreal extraZone = qBound(minStickyDistance, pieceGap * 50 / 100, maxStickyDistance);
+    const qreal length = closestDistance.length();
+
+    if (length > pieceGap && length <= pieceGap + extraZone)
+    {
+        closestDistance.setLength(length - pieceGap);
+        QPointF diff = closestDistance.p2() - closestDistance.p1();
+        dx = diff.x();
+        dy = diff.y();
+        return true;
+    }
+
+    if (length < pieceGap && length >= pieceGap - extraZone)
+    {
+        closestDistance.setAngle(closestDistance.angle() + 180);
+        closestDistance.setLength(pieceGap - length);
+        QPointF diff = closestDistance.p2() - closestDistance.p1();
+        dx = diff.x();
+        dy = diff.y();
+        return true;
+    }
+
+    return false;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPPiece::PathsSuperposition(const QVector<QPointF> &path1, const QVector<QPointF> &path2) -> bool
+{
+    const QRectF path1Rect = VLayoutPiece::BoundingRect(path1);
+    const QPainterPath path1Path = VAbstractPiece::PainterPath(path1);
+
+    const QRectF path2Rect = VLayoutPiece::BoundingRect(path2);
+    const QPainterPath path2Path = VAbstractPiece::PainterPath(path2);
+
+    if (path1Rect.intersects(path2Rect) || path2Rect.contains(path1Rect) || path1Rect.contains(path2Rect))
+    {
+        if (path1Path.contains(path2Path) || path2Path.contains(path1Path) || path1Path.intersects(path2Path))
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPPiece::IsValid() const -> bool
+{
+    if (not IsHideMainPath() && GetContourPoints().isEmpty())
+    {
+        return false;
+    }
+
+    if (IsSeamAllowance() && IsSeamAllowanceBuiltIn() && GetContourPoints().isEmpty())
+    {
+        return false;
+    }
+
+    if (IsSeamAllowance() && not IsSeamAllowanceBuiltIn() && GetSeamAllowancePoints().isEmpty())
+    {
+        return false;
+    }
+
+    if (IsGrainlineEnabled() && GetGrainline().isEmpty())
+    {
+        return false;
+    }
+
+    return true;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+quint16 VPPiece::CopyNumber() const
+{
+    return m_copyNumber;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPPiece::SetCopyNumber(quint16 newCopyNumber)
+{
+    m_copyNumber = qMax(static_cast<quint16>(1), newCopyNumber);
+}
diff --git a/src/app/puzzle/layout/vppiece.h b/src/app/puzzle/layout/vppiece.h
new file mode 100644
index 000000000..03b7d60d2
--- /dev/null
+++ b/src/app/puzzle/layout/vppiece.h
@@ -0,0 +1,205 @@
+/************************************************************************
+ **
+ **  @file   vppiece.h
+ **  @author Ronan Le Tiec
+ **  @date   13 4, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#ifndef VPPIECE_H
+#define VPPIECE_H
+
+#include <QUuid>
+#include <QVector>
+#include <QPoint>
+#include <QTransform>
+
+#include "../vlayout/vlayoutpiece.h"
+#include "../layout/layoutdef.h"
+
+class VPLayout;
+class VPSheet;
+
+class VPPiece : public VLayoutPiece
+{
+public:
+    VPPiece() = default;
+    explicit VPPiece(const VLayoutPiece &layoutPiece);
+    virtual ~VPPiece() = default;
+
+    void Update(const VPPiecePtr &piece);
+
+    virtual auto GetUniqueID() const -> QString override;
+
+
+    void ClearTransformations();
+
+    /**
+     * @brief SetPosition Sets the position of the piece, in relation to the origin of the scene
+     * @param point the point where to set the piece
+     */
+    void SetPosition(QPointF point);
+
+    /**
+     * @brief GetPosition Returns the position of the piece
+     * @return the position of the piece
+     */
+    auto GetPosition() -> QPointF;
+
+    /**
+     * @brief RotateToGrainline  rotates the piece to follow the grainline
+     */
+    void RotateToGrainline(const VPTransformationOrigon &origin);
+
+    /**
+     * @brief SetSelected Sets wether the piece is selected
+     * @param value true if the piece is selected
+     */
+    void SetSelected(bool value);
+
+    /**
+     * @brief IsSelected Returns wether the piece is selected. It emit the signal SelectionChanged
+     * @return true if the piece is selected
+     */
+    auto IsSelected() const -> bool;
+
+    auto Sheet() const -> VPSheetPtr;
+    void SetSheet(const VPSheetPtr &newSheet);
+
+    auto Layout() const -> VPLayoutPtr;
+    void SetLayout(const VPLayoutPtr &layout);
+
+    void SetGrainlineEnabled(bool enabled);
+    void SetGrainlineAngle(qreal angle);
+    void SetGrainlineArrowType(GrainlineArrowDirection type);
+    void SetGrainlinePoints(const QVector<QPointF> &points);
+
+    auto GetPieceLabelRect() const -> QVector<QPointF>;
+    void SetPieceLabelRect(const QVector<QPointF> &rect);
+
+    auto GetPieceLabelData() const ->VTextManager;
+    void SetPieceLabelData(const VTextManager &data);
+
+    auto GetPatternLabelRect() const -> QVector<QPointF>;
+    void SetPatternLabelRect(const QVector<QPointF> &rect);
+
+    auto GetPatternLabelData() const ->VTextManager;
+    void SetPatternLabelData(const VTextManager &data);
+
+    /**
+     * @brief Flip horizontally mirror around center of bounding rect
+     */
+    void Flip();
+
+    auto OutOfBound() const -> bool;
+    void SetOutOfBound(bool newOutOfBound);
+
+    auto HasSuperpositionWithPieces() const -> bool;
+    void SetHasSuperpositionWithPieces(bool newHasSuperpositionWithPieces);
+
+    auto StickyPosition(qreal &dx, qreal &dy) const -> bool;
+
+    static auto PathsSuperposition(const QVector<QPointF> &path1, const QVector<QPointF> &path2) -> bool;
+
+    auto IsValid() const -> bool;
+
+    auto CopyNumber() const -> quint16;
+    void SetCopyNumber(quint16 newCopyNumber);
+
+private:
+    Q_DISABLE_COPY(VPPiece)
+
+    VPLayoutWeakPtr m_layout{};
+
+    VPSheetWeakPtr m_sheet{};
+
+    bool m_isSelected{false};
+    bool m_outOfBound{false};
+    bool m_hasSuperpositionWithPieces{false};
+
+    quint16 m_copyNumber{1};
+};
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void VPPiece::SetSelected(bool value)
+{
+    m_isSelected = value;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline auto VPPiece::IsSelected() const -> bool
+{
+    return m_isSelected;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline auto VPPiece::Sheet() const -> VPSheetPtr
+{
+    return m_sheet;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void VPPiece::SetSheet(const VPSheetPtr &newSheet)
+{
+    m_sheet = newSheet;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline auto VPPiece::Layout() const -> VPLayoutPtr
+{
+    return m_layout;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void VPPiece::SetLayout(const VPLayoutPtr &layout)
+{
+    SCASSERT(layout != nullptr)
+    m_layout = layout;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline auto VPPiece::OutOfBound() const -> bool
+{
+    return m_outOfBound;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void VPPiece::SetOutOfBound(bool newOutOfBound)
+{
+    m_outOfBound = newOutOfBound;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline auto VPPiece::HasSuperpositionWithPieces() const -> bool
+{
+    return m_hasSuperpositionWithPieces;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void VPPiece::SetHasSuperpositionWithPieces(bool newHasSuperpositionWithPieces)
+{
+    m_hasSuperpositionWithPieces = newHasSuperpositionWithPieces;
+}
+
+Q_DECLARE_METATYPE(VPPiecePtr)
+
+#endif // VPPIECE_H
diff --git a/src/app/puzzle/layout/vpsheet.cpp b/src/app/puzzle/layout/vpsheet.cpp
new file mode 100644
index 000000000..9d25ef565
--- /dev/null
+++ b/src/app/puzzle/layout/vpsheet.cpp
@@ -0,0 +1,839 @@
+/************************************************************************
+ **
+ **  @file   vpsheet.cpp
+ **  @author Ronan Le Tiec
+ **  @date   23 5, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#include "vpsheet.h"
+
+#include "vplayout.h"
+#include "vppiece.h"
+#include "../vpapplication.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "../scene/vpgraphicssheet.h"
+#include "../scene/vpgraphicspiece.h"
+#include "../scene/vpgraphicstilegrid.h"
+#include "../scene/vpgraphicspiececontrols.h"
+#include "../scene/vpgraphicstilegrid.h"
+
+// VPSheetSceneData
+//---------------------------------------------------------------------------------------------------------------------
+VPSheetSceneData::VPSheetSceneData(const VPLayoutPtr &layout, const QUuid &sheetUuid)
+    : m_layout(layout),
+      m_scene(new VMainGraphicsScene()),
+      m_sheetUuid(sheetUuid)
+{
+    SCASSERT(not layout.isNull())
+
+    m_graphicsSheet = new VPGraphicsSheet(layout);
+    m_graphicsSheet->setPos(0, 0);
+    m_scene->addItem(m_graphicsSheet);
+
+    m_graphicsTileGrid = new VPGraphicsTileGrid(layout, m_sheetUuid);
+    m_scene->addItem(m_graphicsTileGrid);
+
+    m_rotationControls = new VPGraphicsPieceControls(layout);
+    m_rotationControls->setVisible(false);
+    m_scene->addItem(m_rotationControls);
+
+    m_rotationOrigin = new VPGraphicsTransformationOrigin(layout);
+    m_rotationOrigin->setVisible(false);
+    m_scene->addItem(m_rotationOrigin);
+
+    QObject::connect(m_rotationControls, &VPGraphicsPieceControls::ShowOrigin,
+                     m_rotationOrigin, &VPGraphicsTransformationOrigin::on_ShowOrigin);
+    QObject::connect(m_rotationControls, &VPGraphicsPieceControls::TransformationOriginChanged,
+                     m_rotationOrigin, &VPGraphicsTransformationOrigin::SetTransformationOrigin);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+VPSheetSceneData::~VPSheetSceneData()
+{
+    delete m_scene;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSheetSceneData::Scene() const -> VMainGraphicsScene *
+{
+    return m_scene;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSheetSceneData::RefreshLayout()
+{
+    m_graphicsSheet->update();
+
+    m_graphicsTileGrid->update();
+
+    m_scene->update();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSheetSceneData::RefreshPieces()
+{
+    qDeleteAll(m_graphicsPieces);
+    m_graphicsPieces.clear();
+
+    VPLayoutPtr layout = m_layout.toStrongRef();
+    if(layout.isNull())
+    {
+        return;
+    }
+
+    VPSheetPtr sheet = layout->GetSheet(m_sheetUuid);
+    if (not sheet.isNull())
+    {
+        QList<VPPiecePtr> pieces = sheet->GetPieces();
+        m_graphicsPieces.reserve(pieces.size());
+
+        for (const auto &piece : pieces)
+        {
+            if (not piece.isNull())
+            {
+                auto *graphicsPiece = new VPGraphicsPiece(piece);
+                m_graphicsPieces.append(graphicsPiece);
+                m_scene->addItem(graphicsPiece);
+                ConnectPiece(graphicsPiece);
+            }
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSheetSceneData::PrepareForExport()
+{
+    m_graphicsSheet->SetShowBorder(false);
+    m_graphicsSheet->SetShowMargin(false);
+
+    m_rotationControls->setVisible(false);
+    m_rotationOrigin->setVisible(false);
+
+    VPLayoutPtr layout = m_layout.toStrongRef();
+    if (not layout.isNull())
+    {
+        m_showGridTmp = layout->LayoutSettings().GetShowGrid();
+        layout->LayoutSettings().SetShowGrid(false);
+
+        m_showTilesTmp = layout->LayoutSettings().GetShowTiles();
+        layout->LayoutSettings().SetShowTiles(false);
+
+        VPSheetPtr sheet = layout->GetSheet(m_sheetUuid);
+        m_slectedPiecesTmp = sheet->GetSelectedPieces();
+
+        for (const auto& piece : m_slectedPiecesTmp)
+        {
+            if (not piece.isNull())
+            {
+                piece->SetSelected(false);
+            }
+        }
+
+        m_outOfBoundTmp = layout->LayoutSettings().GetWarningPiecesOutOfBound();
+        layout->LayoutSettings().SetWarningPiecesOutOfBound(false);
+
+        m_pieceSuperpositionTmp = layout->LayoutSettings().GetWarningSuperpositionOfPieces();
+        layout->LayoutSettings().SetWarningSuperpositionOfPieces(false);
+    }
+
+    RefreshLayout();
+    RefreshPieces();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSheetSceneData::CleanAfterExport()
+{
+    m_graphicsSheet->SetShowBorder(true);
+    m_graphicsSheet->SetShowMargin(true);
+
+    VPLayoutPtr layout = m_layout.toStrongRef();
+    if (not layout.isNull())
+    {
+        layout->LayoutSettings().SetShowGrid(m_showGridTmp);
+        layout->LayoutSettings().SetShowTiles(m_showTilesTmp);
+
+        for (const auto& piece : m_slectedPiecesTmp)
+        {
+            if (not piece.isNull())
+            {
+                piece->SetSelected(true);
+                emit layout->PieceSelectionChanged(piece);
+            }
+        }
+
+        layout->LayoutSettings().SetWarningPiecesOutOfBound(m_outOfBoundTmp);
+        layout->LayoutSettings().SetWarningSuperpositionOfPieces(m_pieceSuperpositionTmp);
+    }
+
+    RefreshLayout();
+    RefreshPieces();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSheetSceneData::GraphicsPieces() const -> const QList<VPGraphicsPiece *> &
+{
+    return m_graphicsPieces;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSheetSceneData::GraphicsPiecesAsItems() const -> QList<QGraphicsItem *>
+{
+    QList<QGraphicsItem *> items;
+    items.reserve(m_graphicsPieces.size());
+
+    for(auto *item : m_graphicsPieces)
+    {
+        items.append(item);
+    }
+
+    return items;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSheetSceneData::RotationControls() const -> VPGraphicsPieceControls *
+{
+    return m_rotationControls;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSheetSceneData::ScenePiece(const VPPiecePtr &piece) const -> VPGraphicsPiece *
+{
+    VPGraphicsPiece *_graphicsPiece = nullptr;
+    for(auto *graphicPiece : m_graphicsPieces)
+    {
+        if(graphicPiece->GetPiece() == piece)
+        {
+            _graphicsPiece = graphicPiece;
+        }
+    }
+
+    return _graphicsPiece;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSheetSceneData::RemovePiece(VPGraphicsPiece *piece)
+{
+    m_graphicsPieces.removeAll(piece);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSheetSceneData::AddPiece(VPGraphicsPiece *piece)
+{
+    m_graphicsPieces.append(piece);
+    ConnectPiece(piece);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSheetSceneData::SetTextAsPaths(bool textAsPaths) const
+{
+    for (auto *piece : m_graphicsPieces)
+    {
+        if (piece != nullptr)
+        {
+            piece->SetTextAsPaths(textAsPaths);
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSheetSceneData::PrepareTilesScheme()
+{
+    VPLayoutPtr layout = m_layout.toStrongRef();
+    if (not layout.isNull())
+    {
+        m_showTilesSchemeTmp = layout->LayoutSettings().GetShowTiles();
+        layout->LayoutSettings().SetShowTiles(true);
+
+        m_showTilesWatermarkSchemeTmp = layout->LayoutSettings().GetShowWatermark();
+        layout->LayoutSettings().SetShowWatermark(false);
+    }
+
+    RefreshLayout();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSheetSceneData::ClearTilesScheme()
+{
+    VPLayoutPtr layout = m_layout.toStrongRef();
+    if (not layout.isNull())
+    {
+        layout->LayoutSettings().SetShowTiles(m_showTilesSchemeTmp);
+        layout->LayoutSettings().SetShowWatermark(m_showTilesWatermarkSchemeTmp);
+    }
+
+    RefreshLayout();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSheetSceneData::RefreshSheetSize()
+{
+    if (m_graphicsSheet != nullptr)
+    {
+        m_graphicsSheet->RefreshBoundingRect();
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSheetSceneData::ConnectPiece(VPGraphicsPiece *piece)
+{
+    SCASSERT(piece != nullptr)
+
+    VPLayoutPtr layout = m_layout.toStrongRef();
+    if (layout.isNull())
+    {
+        return;
+    }
+
+    QObject::connect(layout.get(), &VPLayout::PieceTransformationChanged, piece,
+                     &VPGraphicsPiece::on_RefreshPiece);
+    QObject::connect(layout.get(), &VPLayout::PieceSelectionChanged,
+                     m_rotationControls, &VPGraphicsPieceControls::on_UpdateControls);
+    QObject::connect(layout.get(), &VPLayout::PiecePositionValidityChanged,
+                     piece, &VPGraphicsPiece::on_RefreshPiece);
+    QObject::connect(piece, &VPGraphicsPiece::PieceTransformationChanged,
+                     m_rotationControls, &VPGraphicsPieceControls::on_UpdateControls);
+    QObject::connect(piece, &VPGraphicsPiece::HideTransformationHandles,
+                     m_rotationControls, &VPGraphicsPieceControls::on_HideHandles);
+    QObject::connect(piece, &VPGraphicsPiece::HideTransformationHandles,
+                     m_rotationOrigin, &VPGraphicsTransformationOrigin::on_HideHandles);
+}
+
+// VPSheet
+//---------------------------------------------------------------------------------------------------------------------
+VPSheet::VPSheet(const VPLayoutPtr &layout) :
+    m_layout(layout),
+    m_sceneData(new VPSheetSceneData(layout, Uuid()))
+{
+    SCASSERT(not layout.isNull())
+
+    VPSettings *settings = VPApplication::VApp()->PuzzleSettings();
+    SetIgnoreMargins(settings->GetLayoutSheetIgnoreMargins());
+    SetSheetMargins(settings->GetLayoutSheetMargins());
+    SetSheetSize(QSizeF(settings->GetLayoutSheetPaperWidth(), settings->GetLayoutSheetPaperHeight()));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSheet::GetLayout() const -> VPLayoutPtr
+{
+    return m_layout;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSheet::GetPieces() const -> QList<VPPiecePtr>
+{
+    VPLayoutPtr layout = GetLayout();
+    if (not layout.isNull())
+    {
+        return layout->PiecesForSheet(m_uuid);
+    }
+
+    return {};
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSheet::GetSelectedPieces() const -> QList<VPPiecePtr>
+{
+    VPLayoutPtr layout = GetLayout();
+    if (not layout.isNull())
+    {
+        QList<VPPiecePtr> list = layout->PiecesForSheet(m_uuid);
+
+        QList<VPPiecePtr> selected;
+        selected.reserve(list.size());
+
+        for (const auto& piece : list)
+        {
+            if (not piece.isNull() && piece->IsSelected())
+            {
+                selected.append(piece);
+            }
+        }
+
+        return selected;
+    }
+
+    return {};
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSheet::GetAsLayoutPieces() const -> QVector<VLayoutPiece>
+{
+    QList<VPPiecePtr> pieces = GetPieces();
+
+    QVector<VLayoutPiece> details;
+    details.reserve(pieces.size());
+
+    for (const auto& piece : pieces)
+    {
+        if (not piece.isNull())
+        {
+            details.append(*piece);
+        }
+    }
+
+    return details;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSheet::GetName() const -> QString
+{
+    return m_name;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSheet::SetName(const QString &name)
+{
+    m_name = name;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSheet::Uuid() const -> const QUuid &
+{
+    return m_uuid;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSheet::IsVisible() const -> bool
+{
+    return m_visible;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSheet::SetVisible(bool visible)
+{
+    m_visible = visible;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSheet::GrainlineOrientation() const -> GrainlineType
+{
+    if (m_grainlineType == GrainlineType::NotFixed)
+    {
+        if (m_size.height() < m_size.width())
+        {
+            return GrainlineType::Horizontal;
+        }
+
+        return GrainlineType::Vertical;
+    }
+
+    return m_grainlineType;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSheet::GetGrainlineType() const -> GrainlineType
+{
+    return m_grainlineType;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSheet::SetGrainlineType(GrainlineType type)
+{
+    m_grainlineType = type;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSheet::TransformationOrigin() const -> const VPTransformationOrigon &
+{
+    return m_transformationOrigin;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSheet::SetTransformationOrigin(const VPTransformationOrigon &newTransformationOrigin)
+{
+    m_transformationOrigin = newTransformationOrigin;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSheet::Clear()
+{
+    m_name.clear();
+    m_visible = true;
+    m_transformationOrigin = VPTransformationOrigon();
+    m_trashSheet = false;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSheet::TrashSheet() const -> bool
+{
+    return m_trashSheet;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSheet::SetTrashSheet(bool newTrashSheet)
+{
+    m_trashSheet = newTrashSheet;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSheet::ValidateSuperpositionOfPieces() const
+{
+    QList<VPPiecePtr> pieces = GetPieces();
+
+    for (const auto &piece : pieces)
+    {
+        if (piece.isNull())
+        {
+            continue;
+        }
+
+        const bool oldSuperpositionOfPieces = piece->HasSuperpositionWithPieces();
+        QVector<QPointF> path1 = piece->GetMappedExternalContourPoints();
+        bool hasSuperposition = false;
+
+        for (const auto &p : pieces)
+        {
+            if (p.isNull() || piece == p)
+            {
+                continue;
+            }
+
+            QVector<QPointF> path2 = p->GetMappedExternalContourPoints();
+
+            bool superposition = VPPiece::PathsSuperposition(path1, path2);
+            if (superposition)
+            {
+                hasSuperposition = superposition;
+                break;
+            }
+        }
+
+        piece->SetHasSuperpositionWithPieces(hasSuperposition);
+
+        if (oldSuperpositionOfPieces != piece->HasSuperpositionWithPieces())
+        {
+            VPLayoutPtr layout = GetLayout();
+            if (not layout.isNull())
+            {
+                emit layout->PiecePositionValidityChanged(piece);
+            }
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSheet::ValidatePieceOutOfBound(const VPPiecePtr &piece) const
+{
+    if (piece.isNull())
+    {
+        return;
+    }
+
+    const bool oldOutOfBound = piece->OutOfBound();
+
+    QRectF pieceRect = piece->MappedDetailBoundingRect();
+    QRectF sheetRect = GetMarginsRect();
+
+    piece->SetOutOfBound(not sheetRect.contains(pieceRect));
+
+    if (oldOutOfBound != piece->OutOfBound())
+    {
+        VPLayoutPtr layout = GetLayout();
+        if (not layout.isNull())
+        {
+            emit layout->PiecePositionValidityChanged(piece);
+        }
+    }
+
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSheet::ValidatePiecesOutOfBound() const
+{
+    QList<VPPiecePtr> pieces = GetPieces();
+    for (const auto &piece : pieces)
+    {
+        ValidatePieceOutOfBound(piece);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSheet::GetSheetRect() const -> QRectF
+{
+    return QRectF(QPoint(0, 0), m_size);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSheet::GetMarginsRect() const -> QRectF
+{
+    if (not m_ignoreMargins)
+    {
+        QRectF rect = QRectF(QPointF(m_margins.left(), m_margins.top()),
+                             QPointF(m_size.width() - m_margins.right(), m_size.height() - m_margins.bottom()));
+        return rect;
+    }
+
+    return QRectF(0, 0, m_size.width(), m_size.height());
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSheet::RemoveUnusedLength()
+{
+    VPLayoutPtr layout = GetLayout();
+    if (layout.isNull())
+    {
+        return;
+    }
+
+    QList<VPPiecePtr> pieces = GetPieces();
+    if (pieces.isEmpty())
+    {
+        return;
+    }
+
+    QRectF piecesBoundingRect;
+
+    for (const auto& piece : pieces)
+    {
+        if (not piece.isNull())
+        {
+            piecesBoundingRect = piecesBoundingRect.united(piece->MappedDetailBoundingRect());
+        }
+    }
+
+    const qreal extra = 2;
+    QRectF sheetRect = GetSheetRect();
+    GrainlineType type = GrainlineOrientation();
+
+    if (type == GrainlineType::Vertical)
+    {
+        qreal margin = 0;
+        if (not m_ignoreMargins)
+        {
+            margin = m_margins.bottom();
+        }
+
+        if (sheetRect.bottomRight().y() - margin > piecesBoundingRect.bottomRight().y())
+        {
+            m_size = QSizeF(m_size.width(), piecesBoundingRect.bottomRight().y() + margin + extra);
+        }
+    }
+    else if (type == GrainlineType::Horizontal)
+    {
+        qreal margin = 0;
+        if (not m_ignoreMargins)
+        {
+            margin = m_margins.right();
+        }
+
+        if (sheetRect.topRight().x() - margin > piecesBoundingRect.topRight().x())
+        {
+            m_size = QSizeF(piecesBoundingRect.topRight().x() + margin + extra, m_size.height());
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSheet::CheckPiecePositionValidity(const VPPiecePtr &piece) const
+{
+    VPLayoutPtr layout = GetLayout();
+    if (layout.isNull())
+    {
+        return;
+    }
+
+    QList<VPPiecePtr> pieces = GetPieces();
+    if (piece.isNull() || not pieces.contains(piece))
+    {
+        return;
+    }
+
+    if (layout->LayoutSettings().GetWarningPiecesOutOfBound())
+    {
+        ValidatePieceOutOfBound(piece);
+    }
+
+    if (layout->LayoutSettings().GetWarningSuperpositionOfPieces())
+    {
+        ValidateSuperpositionOfPieces();
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSheet::SceneData() const -> VPSheetSceneData *
+{
+    return m_sceneData;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSheet::ClearSelection() const
+{
+    QList<VPPiecePtr> selectedPieces = GetSelectedPieces();
+    for (const auto& piece : selectedPieces)
+    {
+        if (piece->IsSelected())
+        {
+            piece->SetSelected(false);
+        }
+    }
+
+    if (not selectedPieces.isEmpty())
+    {
+        VPLayoutPtr layout = GetLayout();
+        if (not layout.isNull())
+        {
+            emit layout->PieceSelectionChanged(VPPiecePtr());
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSheet::GetSheetOrientation() const -> QPageLayout::Orientation
+{
+    return m_size.height() >= m_size.width() ? QPageLayout::Portrait : QPageLayout::Landscape;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSheet::SheetUnits() const -> Unit
+{
+    VPLayoutPtr layout = GetLayout();
+    if (not layout.isNull())
+    {
+        return layout->LayoutSettings().GetUnit();
+    }
+
+    return Unit::Cm;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSheet::SetSheetSize(qreal width, qreal height)
+{
+    m_size.setWidth(width);
+    m_size.setHeight(height);
+
+    if (m_sceneData != nullptr)
+    {
+        m_sceneData->RefreshSheetSize();
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSheet::SetSheetSizeConverted(qreal width, qreal height)
+{
+    Unit unit = SheetUnits();
+    m_size.setWidth(UnitConvertor(width, unit, Unit::Px));
+    m_size.setHeight(UnitConvertor(height, unit, Unit::Px));
+
+    if (m_sceneData != nullptr)
+    {
+        m_sceneData->RefreshSheetSize();
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSheet::SetSheetSize(const QSizeF &size)
+{
+    m_size = size;
+
+    if (m_sceneData != nullptr)
+    {
+        m_sceneData->RefreshSheetSize();
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSheet::SetSheetSizeConverted(const QSizeF &size)
+{
+    Unit unit = SheetUnits();
+    m_size = QSizeF(UnitConvertor(size.width(), unit, Unit::Px),
+                    UnitConvertor(size.height(), unit, Unit::Px));
+
+    if (m_sceneData != nullptr)
+    {
+        m_sceneData->RefreshSheetSize();
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSheet::GetSheetSize() const -> QSizeF
+{
+    return m_size;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSheet::GetSheetSizeConverted() const -> QSizeF
+{
+    Unit unit = SheetUnits();
+    QSizeF convertedSize = QSizeF(
+                UnitConvertor(m_size.width(), Unit::Px, unit),
+                UnitConvertor(m_size.height(), Unit::Px, unit)
+                );
+
+    return convertedSize;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSheet::SetSheetMargins(qreal left, qreal top, qreal right, qreal bottom)
+{
+    m_margins.setLeft(left);
+    m_margins.setTop(top);
+    m_margins.setRight(right);
+    m_margins.setBottom(bottom);
+}
+//---------------------------------------------------------------------------------------------------------------------
+void VPSheet::SetSheetMarginsConverted(qreal left, qreal top, qreal right, qreal bottom)
+{
+    Unit unit = SheetUnits();
+    m_margins.setLeft(UnitConvertor(left, unit, Unit::Px));
+    m_margins.setTop(UnitConvertor(top, unit, Unit::Px));
+    m_margins.setRight(UnitConvertor(right, unit, Unit::Px));
+    m_margins.setBottom(UnitConvertor(bottom, unit, Unit::Px));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSheet::SetSheetMargins(const QMarginsF &margins)
+{
+    m_margins = margins;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSheet::SetSheetMarginsConverted(const QMarginsF &margins)
+{
+    Unit unit = SheetUnits();
+    m_margins = UnitConvertor(margins, unit, Unit::Px);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSheet::GetSheetMargins() const -> QMarginsF
+{
+    return m_margins;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSheet::GetSheetMarginsConverted() const -> QMarginsF
+{
+    Unit unit = SheetUnits();
+    return UnitConvertor(m_margins, Unit::Px, unit);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSheet::IgnoreMargins() const -> bool
+{
+    return m_ignoreMargins;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSheet::SetIgnoreMargins(bool newIgnoreMargins)
+{
+    m_ignoreMargins = newIgnoreMargins;
+}
diff --git a/src/app/puzzle/layout/vpsheet.h b/src/app/puzzle/layout/vpsheet.h
new file mode 100644
index 000000000..8a138ff98
--- /dev/null
+++ b/src/app/puzzle/layout/vpsheet.h
@@ -0,0 +1,317 @@
+/************************************************************************
+ **
+ **  @file   vpsheet.h
+ **  @author Ronan Le Tiec
+ **  @date   23 5, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#ifndef VPSHEET_H
+#define VPSHEET_H
+
+#include <QSizeF>
+#include <QMarginsF>
+#include <QList>
+#include <QComboBox>
+#include <QUuid>
+
+#include "def.h"
+#include "layoutdef.h"
+
+class VPLayout;
+class VPPiece;
+class VMainGraphicsScene;
+class VPGraphicsPieceControls;
+class VPGraphicsTransformationOrigin;
+class VPGraphicsPiece;
+class VPGraphicsTileGrid;
+class VPGraphicsSheet;
+class VLayoutPiece;
+
+class VPSheetSceneData
+{
+public:
+    explicit VPSheetSceneData(const VPLayoutPtr &layout, const QUuid &sheetUuid);
+    ~VPSheetSceneData();
+
+    VMainGraphicsScene *Scene() const;
+
+    /**
+     * @brief RefreshLayout Refreshes the rectangles for the layout border and the margin
+     */
+    void RefreshLayout();
+
+    void RefreshPieces();
+
+    /**
+     * @brief PrepareForExport prepares the graphic for an export (i.e hide margin etc)
+     */
+    void PrepareForExport();
+
+    /**
+     * @brief CleanAfterExport cleans the graphic for an export (i.e show margin etc)
+     */
+    void CleanAfterExport();
+
+    auto GraphicsPieces() const -> const QList<VPGraphicsPiece *> &;
+    auto GraphicsPiecesAsItems() const -> QList<QGraphicsItem *>;
+
+    auto RotationControls() const -> VPGraphicsPieceControls *;
+
+    auto ScenePiece(const VPPiecePtr &piece) const -> VPGraphicsPiece *;
+
+    void RemovePiece(VPGraphicsPiece *piece);
+    void AddPiece(VPGraphicsPiece *piece);
+
+    void SetTextAsPaths(bool textAsPaths) const;
+
+    void PrepareTilesScheme();
+    void ClearTilesScheme();
+
+    void RefreshSheetSize();
+
+private:
+    Q_DISABLE_COPY(VPSheetSceneData)
+
+    VPLayoutWeakPtr m_layout{};
+
+    VMainGraphicsScene *m_scene;
+
+    VPGraphicsSheet *m_graphicsSheet{nullptr};
+
+    VPGraphicsTileGrid *m_graphicsTileGrid{nullptr};
+
+    VPGraphicsPieceControls *m_rotationControls{nullptr};
+    VPGraphicsTransformationOrigin *m_rotationOrigin{nullptr};
+
+    QList<VPGraphicsPiece*> m_graphicsPieces{};
+
+    /**
+     * variable to hold temporarly hte value of the show tiles
+     */
+    bool m_showTilesTmp{false};
+
+    bool m_showTilesSchemeTmp{false};
+    bool m_showTilesWatermarkSchemeTmp{false};
+
+    /**
+     * variable to hold temporarly hte value of the show grid
+     */
+    bool m_showGridTmp{false};
+
+    QUuid m_sheetUuid;
+
+    QList<VPPiecePtr> m_slectedPiecesTmp{};
+
+    bool m_outOfBoundTmp{false};
+    bool m_pieceSuperpositionTmp{false};
+
+    void ConnectPiece(VPGraphicsPiece *piece);
+};
+
+class VPSheet : public QObject
+{
+    Q_OBJECT
+public:
+    explicit VPSheet(const VPLayoutPtr &layout);
+
+    virtual ~VPSheet() = default;
+
+    /**
+     * @brief GetLayout Returns the Layout of the sheet
+     * @return Layout of the sheet
+     */
+    auto GetLayout() const -> VPLayoutPtr;
+
+    auto GetPieces() const -> QList<VPPiecePtr>;
+
+    auto GetSelectedPieces() const -> QList<VPPiecePtr>;
+
+    auto GetAsLayoutPieces() const -> QVector<VLayoutPiece>;
+
+    /**
+     * @brief GetName Returns the name of the sheet
+     * @return the name
+     */
+    auto GetName() const -> QString;
+
+    /**
+     * @brief SetName Sets the name of the sheet to the given name
+     * @param name the new sheet's name
+     */
+    void SetName(const QString &name);
+
+    auto Uuid() const -> const QUuid &;
+
+    bool IsVisible() const;
+    void SetVisible(bool visible);
+
+    auto GrainlineOrientation() const -> GrainlineType;
+    auto GetGrainlineType() const -> GrainlineType;
+    void SetGrainlineType(GrainlineType type);
+
+    auto TransformationOrigin() const -> const VPTransformationOrigon &;
+    void SetTransformationOrigin(const VPTransformationOrigon &newTransformationOrigin);
+
+    void Clear();
+
+    auto TrashSheet() const -> bool;
+    void SetTrashSheet(bool newTrashSheet);
+
+    void ValidateSuperpositionOfPieces() const;
+    void ValidatePieceOutOfBound(const VPPiecePtr &piece) const;
+    void ValidatePiecesOutOfBound() const;
+
+    auto GetSheetRect() const -> QRectF;
+    auto GetMarginsRect() const -> QRectF;
+
+    void RemoveUnusedLength();
+
+    /**
+     * @brief SetSheetSize sets the size of the sheet, the values have to be in Unit::Px
+     * @param width sheet width
+     * @param height sheet height
+     */
+    void SetSheetSize(qreal width, qreal height);
+
+    /**
+     * @brief SetSheetSize sets the size of the sheet, the values have to be in the layout's unit
+     * @param width sheet width
+     * @param height sheet height
+     */
+    void SetSheetSizeConverted(qreal width, qreal height);
+
+    /**
+     * @brief SetSheetSize sets the size of the sheet, the values have to be in Unit::Px
+     * @param size sheet size
+     */
+    void SetSheetSize(const QSizeF &size);
+    /**
+     * @brief SetSheetSizeConverted sets the size of the sheet, the values have to be in the layout's unit
+     * @param size sheet size
+     */
+    void SetSheetSizeConverted(const QSizeF &size);
+
+    /**
+     * @brief GetSheetSize Returns the size in Unit::Px
+     * @return sheet size in Unit::Px
+     */
+    auto GetSheetSize() const -> QSizeF;
+
+    /**
+     * @brief GetSheetSizeConverted Returns the size in the layout's unit
+     * @return the size in the layout's unit
+     */
+    auto GetSheetSizeConverted() const -> QSizeF;
+
+    /**
+     * @brief SetSheetMargins, set the margins of the sheet, the values have to be in Unit::Px
+     * @param left in Unit::Px
+     * @param top in Unit::Px
+     * @param right in Unit::Px
+     * @param bottom in Unit::Px
+     */
+    void SetSheetMargins(qreal left, qreal top, qreal right, qreal bottom);
+
+    /**
+     * @brief SetSheetMargins, set the margins of the sheet, the values have to be in the unit of the layout
+     * @param left in Unit::Px
+     * @param top in Unit::Px
+     * @param right in Unit::Px
+     * @param bottom in Unit::Px
+     */
+    void SetSheetMarginsConverted(qreal left, qreal top, qreal right, qreal bottom);
+
+    /**
+     * @brief SetSheetMargins set the margins of the sheet, the values have to be in Unit::Px
+     * @param margins sheet margins
+     */
+    void SetSheetMargins(const QMarginsF &margins);
+
+    /**
+     * @brief SetSheetMargins set the margins of the sheet, the values have to be in the unit of the layout
+     * @param margins sheet margins
+     */
+    void SetSheetMarginsConverted(const QMarginsF &margins);
+
+    /**
+     * @brief GetSheetMargins Returns the size in Unit::Px
+     * @return the size in Unit::Px
+     */
+    auto GetSheetMargins() const -> QMarginsF;
+
+    /**
+     * @brief GetSheetMarginsConverted Returns the margins in the layout's unit
+     * @return the margins in the sheet's unit
+     */
+    auto GetSheetMarginsConverted() const -> QMarginsF;
+
+    auto IgnoreMargins() const -> bool;
+    void SetIgnoreMargins(bool newIgnoreMargins);
+
+    VPSheetSceneData *SceneData() const;
+
+    void ClearSelection() const;
+
+    auto GetSheetOrientation() const -> QPageLayout::Orientation;
+
+public slots:
+    void CheckPiecePositionValidity(const VPPiecePtr &piece) const;
+
+private:
+    Q_DISABLE_COPY(VPSheet)
+
+    VPLayoutWeakPtr m_layout{};
+
+    QString m_name{};
+
+    QUuid m_uuid{QUuid::createUuid()};
+
+    bool m_visible{true};
+    bool m_trashSheet{false};
+
+    VPTransformationOrigon m_transformationOrigin{};
+
+    /**
+     * @brief m_size the Size in Unit::Px
+     */
+    QSizeF m_size{};
+
+    // margins
+    /**
+     * @brief m_margins the margins in Unit::Px
+     */
+    QMarginsF m_margins{};
+
+    bool m_ignoreMargins{false};
+
+    GrainlineType m_grainlineType{GrainlineType::NotFixed};
+
+    VPSheetSceneData *m_sceneData{nullptr};
+
+    auto SheetUnits() const -> Unit;
+
+};
+
+Q_DECLARE_METATYPE(VPSheetPtr)
+
+#endif // VPSHEET_H
diff --git a/src/app/puzzle/main.cpp b/src/app/puzzle/main.cpp
new file mode 100644
index 000000000..13353f3c6
--- /dev/null
+++ b/src/app/puzzle/main.cpp
@@ -0,0 +1,86 @@
+/************************************************************************
+ **
+ **  @file   main.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   16 2, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+#include <QMessageBox> // For QT_REQUIRE_VERSION
+#include <QTimer>
+
+#include "vpapplication.h"
+#include "../fervor/fvupdater.h"
+#include "../vmisc/vsysexits.h"
+#include "../vmisc/def.h"
+
+
+#if defined(APPIMAGE) && defined(Q_OS_LINUX)
+#if QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
+#   include "../vmisc/backport/qscopeguard.h"
+#else
+#   include <QScopeGuard>
+#endif
+#   include "../vmisc/appimage.h"
+#endif // defined(APPIMAGE) && defined(Q_OS_LINUX)
+
+int main(int argc, char *argv[])
+{
+#if defined(APPIMAGE) && defined(Q_OS_LINUX)
+    /* Fix path to ICU_DATA when run AppImage.*/
+    char *exe_dir = IcuDataPath("/../share/icu");
+    auto FreeMemory = qScopeGuard([exe_dir] {free(exe_dir);});
+#endif // defined(APPIMAGE) && defined(Q_OS_LINUX)
+
+    Q_INIT_RESOURCE(puzzleicon);
+    Q_INIT_RESOURCE(theme);
+    Q_INIT_RESOURCE(icon);
+    Q_INIT_RESOURCE(schema);
+    Q_INIT_RESOURCE(flags);
+    Q_INIT_RESOURCE(style);
+    Q_INIT_RESOURCE(cursor);
+
+    QT_REQUIRE_VERSION(argc, argv, "5.4.0")// clazy:exclude=qstring-arg,qstring-allocations
+
+#if defined(Q_OS_WIN)
+    VAbstractApplication::WinAttachConsole();
+#endif
+
+#ifndef Q_OS_MAC // supports natively
+    InitHighDpiScaling(argc, argv);
+#endif //Q_OS_MAC
+
+    VPApplication app(argc, argv);
+    app.InitOptions();
+
+    QTimer::singleShot(0, &app, &VPApplication::ProcessCMD);
+
+#if defined(APPIMAGE) && defined(Q_OS_LINUX)
+    if (exe_dir)
+    {
+        qDebug() << "Path to ICU folder:" << exe_dir;
+    }
+#endif // defined(APPIMAGE) && defined(Q_OS_LINUX)
+
+    return app.exec();
+}
diff --git a/src/app/puzzle/puzzle.pri b/src/app/puzzle/puzzle.pri
new file mode 100644
index 000000000..2129fab00
--- /dev/null
+++ b/src/app/puzzle/puzzle.pri
@@ -0,0 +1,93 @@
+# ADD TO EACH PATH $$PWD VARIABLE!!!!!!
+# This need for corect working file translations.pro
+
+SOURCES += \
+    $$PWD/dialogs/configpages/puzzlepreferencesconfigurationpage.cpp \
+    $$PWD/dialogs/configpages/puzzlepreferencespathpage.cpp \
+    $$PWD/dialogs/configpages/puzzlepreferenceslayoutpage.cpp \
+    $$PWD/dialogs/dialogpuzzlepreferences.cpp \
+    $$PWD/dialogs/vpdialogabout.cpp \
+    $$PWD/layout/layoutdef.cpp \
+    $$PWD/main.cpp \
+    $$PWD/undocommands/vpundoaddsheet.cpp \
+    $$PWD/undocommands/vpundocommand.cpp \
+    $$PWD/undocommands/vpundomovepieceonsheet.cpp \
+    $$PWD/undocommands/vpundooriginmove.cpp \
+    $$PWD/undocommands/vpundopiecemove.cpp \
+    $$PWD/undocommands/vpundopiecerotate.cpp \
+    $$PWD/undocommands/vpundoremovesheet.cpp \
+    $$PWD/vpapplication.cpp \
+    $$PWD/carousel/vpcarrousel.cpp \
+    $$PWD/carousel/vpcarrouselpiece.cpp \
+    $$PWD/carousel/vpcarrouselpiecelist.cpp \
+    $$PWD/vpcommandline.cpp \
+    $$PWD/vpcommands.cpp \
+    $$PWD/scene/vpgraphicspiece.cpp \
+    $$PWD/scene/vpgraphicspiececontrols.cpp \
+    $$PWD/scene/vpgraphicssheet.cpp \
+    $$PWD/scene/vpgraphicstilegrid.cpp \
+    $$PWD/layout/vplayout.cpp \
+    $$PWD/layout/vplayoutsettings.cpp \
+    $$PWD/scene/vpmaingraphicsview.cpp \
+    $$PWD/vpmainwindow.cpp \
+    $$PWD/carousel/vpmimedatapiece.cpp \
+    $$PWD/layout/vppiece.cpp \
+    $$PWD/vpsettings.cpp \
+    $$PWD/layout/vpsheet.cpp \
+    $$PWD/vptilefactory.cpp \
+    $$PWD/xml/vplayoutfilereader.cpp \
+    $$PWD/xml/vplayoutfilewriter.cpp \
+    $$PWD/xml/vplayoutliterals.cpp \
+    $$PWD/dialogs/dialogsavemanuallayout.cpp
+
+*msvc*:SOURCES += $$PWD/stable.cpp
+
+HEADERS += \
+    $$PWD/dialogs/configpages/puzzlepreferencesconfigurationpage.h \
+    $$PWD/dialogs/configpages/puzzlepreferencespathpage.h \
+    $$PWD/dialogs/configpages/puzzlepreferenceslayoutpage.h \
+    $$PWD/dialogs/dialogpuzzlepreferences.h \
+    $$PWD/dialogs/vpdialogabout.h \
+    $$PWD/layout/layoutdef.h \
+    $$PWD/scene/scenedef.h \
+    $$PWD/stable.h \
+    $$PWD/undocommands/vpundoaddsheet.h \
+    $$PWD/undocommands/vpundocommand.h \
+    $$PWD/undocommands/vpundomovepieceonsheet.h \
+    $$PWD/undocommands/vpundooriginmove.h \
+    $$PWD/undocommands/vpundopiecemove.h \
+    $$PWD/undocommands/vpundopiecerotate.h \
+    $$PWD/undocommands/vpundoremovesheet.h \
+    $$PWD/vpapplication.h \
+    $$PWD/carousel/vpcarrousel.h \
+    $$PWD/carousel/vpcarrouselpiece.h \
+    $$PWD/carousel/vpcarrouselpiecelist.h \
+    $$PWD/vpcommandline.h \
+    $$PWD/vpcommands.h \
+    $$PWD/scene/vpgraphicspiece.h \
+    $$PWD/scene/vpgraphicspiececontrols.h \
+    $$PWD/scene/vpgraphicssheet.h \
+    $$PWD/scene/vpgraphicstilegrid.h \
+    $$PWD/layout/vplayout.h \
+    $$PWD/layout/vplayoutsettings.h \
+    $$PWD/scene/vpmaingraphicsview.h \
+    $$PWD/vpmainwindow.h \
+    $$PWD/carousel/vpmimedatapiece.h \
+    $$PWD/layout/vppiece.h \
+    $$PWD/vpsettings.h \
+    $$PWD/layout/vpsheet.h \
+    $$PWD/vptilefactory.h \
+    $$PWD/xml/vplayoutfilereader.h \
+    $$PWD/xml/vplayoutfilewriter.h \
+    $$PWD/xml/vplayoutliterals.h \
+    $$PWD/dialogs/dialogsavemanuallayout.h
+
+FORMS += \
+    $$PWD/dialogs/configpages/puzzlepreferencesconfigurationpage.ui \
+    $$PWD/dialogs/configpages/puzzlepreferencespathpage.ui \
+    $$PWD/dialogs/configpages/puzzlepreferenceslayoutpage.ui \
+    $$PWD/dialogs/dialogpuzzlepreferences.ui \
+    $$PWD/dialogs/vpdialogabout.ui \
+    $$PWD/carousel/vpcarrousel.ui \
+    $$PWD/vpmainwindow.ui \
+    $$PWD/dialogs/dialogsavemanuallayout.ui
diff --git a/src/app/puzzle/puzzle.pro b/src/app/puzzle/puzzle.pro
new file mode 100644
index 000000000..10ed4c8be
--- /dev/null
+++ b/src/app/puzzle/puzzle.pro
@@ -0,0 +1,345 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2020-02-16T17:16:07
+#
+#-------------------------------------------------
+
+# File with common stuff for whole project
+include(../../../common.pri)
+
+QT       += core gui widgets network xml svg xmlpatterns printsupport concurrent
+
+# Name of binary file
+TARGET = puzzle
+
+# We want create executable file
+TEMPLATE = app
+
+# Use out-of-source builds (shadow builds)
+CONFIG -= debug_and_release debug_and_release_target
+
+# Since Q5.12 available support for C++17
+equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) {
+    CONFIG += c++17
+} else {
+    CONFIG += c++14
+}
+
+# The following define makes your compiler emit warnings if you use
+# any feature of Qt which has been marked as deprecated (the exact warnings
+# depend on your compiler). Please consult the documentation of the
+# deprecated API in order to know how to port your code away from it.
+DEFINES += QT_DEPRECATED_WARNINGS
+
+# You can also make your code fail to compile if you use deprecated APIs.
+# In order to do so, uncomment the following line.
+# You can also select to disable deprecated APIs only up to a certain version of Qt.
+#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
+
+# Since Qt 5.4.0 the source code location is recorded only in debug builds.
+# We need this information also in release builds. For this need define QT_MESSAGELOGCONTEXT.
+DEFINES += QT_MESSAGELOGCONTEXT
+
+# Directory for executable file
+DESTDIR = bin
+
+# Directory for files created moc
+MOC_DIR = moc
+
+# Directory for objecs files
+OBJECTS_DIR = obj
+
+# Directory for files created rcc
+RCC_DIR = rcc
+
+# Directory for files created uic
+UI_DIR = uic
+
+
+# Suport subdirectories. Just better project code tree.
+include(puzzle.pri)
+
+RESOURCES += \
+    share/resources/cursor.qrc \
+    share/resources/puzzleicon.qrc
+
+include(../translations.pri)
+
+# Set "make install" command for Unix-like systems.
+unix{
+    !macx{
+        # Path to bin file after installation
+        target.path = $$BINDIR
+
+        INSTALLS += \
+            target
+    }
+    macx{
+        # Some macx stuff
+        QMAKE_MAC_SDK = macosx
+
+        # QMAKE_MACOSX_DEPLOYMENT_TARGET defined in common.pri
+
+        CONFIG(release, debug|release){
+            QMAKE_RPATHDIR += @executable_path/../Frameworks
+
+            # Path to resources in app bundle
+            #RESOURCES_DIR = "Contents/Resources" defined in translation.pri
+            FRAMEWORKS_DIR = "Contents/Frameworks"
+            MACOS_DIR = "Contents/MacOS"
+            # On macx we will use app bundle. Bundle doesn't need bin directory inside.
+            # See issue #166: Creating OSX Homebrew (Mac OS X package manager) formula.
+            target.path = $$MACOS_DIR
+
+            #languages added inside translations.pri
+
+            # Symlinks also good names for copying. Make will take origin file and copy them with using symlink name.
+            # For bundle this names more then enough. We don't need care much about libraries versions.
+            #libraries.path = $$FRAMEWORKS_DIR
+            #libraries.files += $${OUT_PWD}/../../libs/qmuparser/$${DESTDIR}/libqmuparser.2.dylib
+            #libraries.files += $${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}/libvpropertyexplorer.1.dylib
+
+            # logo on macx.
+            ICON = $$PWD/../../../dist/Puzzle.icns
+
+            QMAKE_INFO_PLIST = $$PWD/../../../dist/macx/puzzle/Info.plist
+
+            format.path = $$RESOURCES_DIR/
+            format.files += $$PWD/../../../dist/macx/layout.icns
+
+            QMAKE_BUNDLE_DATA += \
+                #libraries \
+                format
+        }
+    }
+}
+
+#win32 {
+#    for(DIR, INSTALL_OPENSSL) {
+#        #add these absolute paths to a variable which
+#        #ends up as 'mkcommands = path1 path2 path3 ...'
+#        openssl_path += $${PWD}/$$DIR
+#    }
+#    copyToDestdir($$openssl_path, $$shell_path($${OUT_PWD}/$$DESTDIR))
+#}
+
+# Compilation will fail without this files after we added them to this section.
+OTHER_FILES += \
+    share/resources/puzzleicon/64x64/logo.ico  # Puzzle's logo.
+
+# Set using ccache. Function enable_ccache() defined in common.pri.
+$$enable_ccache()
+
+include(warnings.pri)
+
+CONFIG(release, debug|release){
+    # Release mode
+    !*msvc*:CONFIG += silent
+    DEFINES += V_NO_ASSERT
+    !unix:*g++*{
+        QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll
+    }
+
+    noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols
+        DEFINES += V_NO_DEBUG
+    } else {
+        # Turn on debug symbols in release mode on Unix systems.
+        # On Mac OS X temporarily disabled. Need find way how to strip binary file.
+        !macx:!*msvc*{
+            QMAKE_CXXFLAGS_RELEASE += -g -gdwarf-3
+            QMAKE_CFLAGS_RELEASE += -g -gdwarf-3
+            QMAKE_LFLAGS_RELEASE =
+        }
+    }
+} else {
+# Breakpoints do not work if debug the app inside of bundle. In debug mode we turn off creating a bundle.
+# Probably it will breake some dependencies. Version for Mac designed to work inside an app bundle.
+    CONFIG -= app_bundle
+}
+
+DVCS_HESH=$$FindBuildRevision()
+message("Build revision:" $${DVCS_HESH})
+DEFINES += "BUILD_REVISION=$${DVCS_HESH}" # Make available build revision number in sources.
+
+# Path to recource file.
+win32:RC_FILE = share/resources/puzzle.rc
+
+noRunPath{ # For enable run qmake with CONFIG+=noRunPath
+    # do nothing
+} else {
+    unix:!macx{
+        # suppress the default RPATH
+        # helps to run the program without Qt Creator
+        # see problem with path to libqmuparser and libpropertybrowser
+        QMAKE_LFLAGS_RPATH =
+        QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}"
+    }
+}
+
+# When the GNU linker sees a library, it discards all symbols that it doesn't need.
+# Dependent library go first.
+
+##VTools static library (depend on VWidgets, VMisc, VPatternDB)
+#unix|win32: LIBS += -L$$OUT_PWD/../../libs/vtools/$${DESTDIR}/ -lvtools
+
+#INCLUDEPATH += $$PWD/../../libs/vtools
+#INCLUDEPATH += $$OUT_PWD/../../libs/vtools/$${UI_DIR} # For UI files
+#DEPENDPATH += $$PWD/../../libs/vtools
+
+#win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vtools/$${DESTDIR}/vtools.lib
+#else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vtools/$${DESTDIR}/libvtools.a
+
+# VLayout static library (depend on VGeometry, VFormat)
+unix|win32: LIBS += -L$$OUT_PWD/../../libs/vlayout/$${DESTDIR}/ -lvlayout
+
+INCLUDEPATH += $$PWD/../../libs/vlayout
+DEPENDPATH += $$PWD/../../libs/vlayout
+
+win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vlayout/$${DESTDIR}/vlayout.lib
+else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vlayout/$${DESTDIR}/libvlayout.a
+
+# VFormat static library (depend on VPatternDB, IFC)
+unix|win32: LIBS += -L$$OUT_PWD/../../libs/vformat/$${DESTDIR}/ -lvformat
+
+INCLUDEPATH += $$PWD/../../libs/vformat
+DEPENDPATH += $$PWD/../../libs/vformat
+
+win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vformat/$${DESTDIR}/vformat.lib
+else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vformat/$${DESTDIR}/libvformat.a
+
+#VPatternDB static library (depend on vgeometry, vmisc)
+unix|win32: LIBS += -L$$OUT_PWD/../../libs/vpatterndb/$${DESTDIR} -lvpatterndb
+
+INCLUDEPATH += $$PWD/../../libs/vpatterndb
+DEPENDPATH += $$PWD/../../libs/vpatterndb
+
+win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vpatterndb/$${DESTDIR}/vpatterndb.lib
+else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vpatterndb/$${DESTDIR}/libvpatterndb.a
+
+# Fervor static library (depend on VMisc, IFC)
+unix|win32: LIBS += -L$$OUT_PWD/../../libs/fervor/$${DESTDIR}/ -lfervor
+
+INCLUDEPATH += $$PWD/../../libs/fervor
+DEPENDPATH += $$PWD/../../libs/fervor
+
+win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/fervor/$${DESTDIR}/fervor.lib
+else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/fervor/$${DESTDIR}/libfervor.a
+
+# IFC static library (depend on QMuParser, VMisc)
+unix|win32: LIBS += -L$$OUT_PWD/../../libs/ifc/$${DESTDIR}/ -lifc
+
+INCLUDEPATH += $$PWD/../../libs/ifc
+DEPENDPATH += $$PWD/../../libs/ifc
+
+win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/ifc/$${DESTDIR}/ifc.lib
+else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/ifc/$${DESTDIR}/libifc.a
+
+#VWidgets static library
+unix|win32: LIBS += -L$$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/ -lvwidgets
+
+INCLUDEPATH += $$PWD/../../libs/vwidgets
+DEPENDPATH += $$PWD/../../libs/vwidgets
+
+win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/vwidgets.lib
+else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/libvwidgets.a
+
+#VMisc static library
+unix|win32: LIBS += -L$$OUT_PWD/../../libs/vmisc/$${DESTDIR}/ -lvmisc
+
+INCLUDEPATH += $$PWD/../../libs/vmisc
+DEPENDPATH += $$PWD/../../libs/vmisc
+
+win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vmisc/$${DESTDIR}/vmisc.lib
+else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vmisc/$${DESTDIR}/libvmisc.a
+
+# VGeometry static library (depend on ifc)
+unix|win32: LIBS += -L$$OUT_PWD/../../libs/vgeometry/$${DESTDIR}/ -lvgeometry
+
+INCLUDEPATH += $$PWD/../../libs/vgeometry
+DEPENDPATH += $$PWD/../../libs/vgeometry
+
+win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vgeometry/$${DESTDIR}/vgeometry.lib
+else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vgeometry/$${DESTDIR}/libvgeometry.a
+
+# VObj static library
+unix|win32: LIBS += -L$$OUT_PWD/../../libs/vobj/$${DESTDIR}/ -lvobj
+
+INCLUDEPATH += $$PWD/../../libs/vobj
+DEPENDPATH += $$PWD/../../libs/vobj
+
+win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vobj/$${DESTDIR}/vobj.lib
+else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vobj/$${DESTDIR}/libvobj.a
+
+# VDxf static library
+unix|win32: LIBS += -L$$OUT_PWD/../../libs/vdxf/$${DESTDIR}/ -lvdxf
+
+INCLUDEPATH += $$PWD/../../libs/vdxf
+DEPENDPATH += $$PWD/../../libs/vdxf
+
+win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vdxf/$${DESTDIR}/vdxf.lib
+else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vdxf/$${DESTDIR}/libvdxf.a
+
+# QMuParser library
+win32:CONFIG(release, debug|release): LIBS += -L$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -lqmuparser2
+else:win32:CONFIG(debug, debug|release): LIBS += -L$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -lqmuparser2
+else:unix: LIBS += -L$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -lqmuparser
+
+INCLUDEPATH += $${PWD}/../../libs/qmuparser
+DEPENDPATH += $${PWD}/../../libs/qmuparser
+
+# VPropertyExplorer library
+win32:CONFIG(release, debug|release): LIBS += -L$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR} -lvpropertyexplorer
+else:win32:CONFIG(debug, debug|release): LIBS += -L$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR} -lvpropertyexplorer
+else:unix: LIBS += -L$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR} -lvpropertyexplorer
+
+INCLUDEPATH += $${PWD}/../../libs/vpropertyexplorer
+DEPENDPATH += $${PWD}/../../libs/vpropertyexplorer
+
+contains(DEFINES, APPIMAGE) {
+    unix:!macx: LIBS += -licudata -licui18n -licuuc
+}
+
+CONFIG(release, debug|release){
+    noStripDebugSymbols {
+        # do nothing
+    } else {
+        !macx:!*msvc*{
+            noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols
+                win32:!*msvc*{
+                    # Strip debug symbols.
+                    QMAKE_POST_LINK += objcopy --strip-debug bin/${TARGET}
+                }
+
+                unix:!macx{
+                    # Strip after you link all libaries.
+                    QMAKE_POST_LINK += objcopy --strip-debug ${TARGET}
+                }
+            } else {
+                win32:!*msvc*{
+                    # Strip debug symbols.
+                    QMAKE_POST_LINK += objcopy --only-keep-debug bin/${TARGET} bin/${TARGET}.dbg &&
+                    QMAKE_POST_LINK += objcopy --strip-debug bin/${TARGET} &&
+                    QMAKE_POST_LINK += objcopy --add-gnu-debuglink="bin/${TARGET}.dbg" bin/${TARGET}
+
+                    QMAKE_DISTCLEAN += bin/${TARGET}.dbg
+                }
+
+                unix:!macx{
+                    # Strip debug symbols.
+                    QMAKE_POST_LINK += objcopy --only-keep-debug ${TARGET} ${TARGET}.dbg &&
+                    QMAKE_POST_LINK += objcopy --strip-debug ${TARGET} &&
+                    QMAKE_POST_LINK += objcopy --add-gnu-debuglink="${TARGET}.dbg" ${TARGET}
+
+                    QMAKE_DISTCLEAN += ${TARGET}.dbg
+                }
+            }
+        }
+    }
+}
+
+CONFIG(release, debug|release){
+    macx{
+       # run macdeployqt to include all qt libraries in packet
+       QMAKE_POST_LINK += $$[QT_INSTALL_BINS]/macdeployqt $${OUT_PWD}/$${DESTDIR}/$${TARGET}.app
+    }
+}
diff --git a/src/app/puzzle/scene/scenedef.h b/src/app/puzzle/scene/scenedef.h
new file mode 100644
index 000000000..a088b7744
--- /dev/null
+++ b/src/app/puzzle/scene/scenedef.h
@@ -0,0 +1,38 @@
+/************************************************************************
+ **
+ **  @file   scenedef.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   7 8, 2021
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2021 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#ifndef SCENEDEF_H
+#define SCENEDEF_H
+
+enum class PGraphicsItem : int
+{
+    Piece = 1,
+    Handles = 2,
+    TransformationOrigin = 3
+};
+
+#endif // SCENEDEF_H
diff --git a/src/app/puzzle/scene/vpgraphicspiece.cpp b/src/app/puzzle/scene/vpgraphicspiece.cpp
new file mode 100644
index 000000000..9cc74e0f2
--- /dev/null
+++ b/src/app/puzzle/scene/vpgraphicspiece.cpp
@@ -0,0 +1,702 @@
+/************************************************************************
+ **
+ **  @file   vpgraphicspiece.cpp
+ **  @author Ronan Le Tiec
+ **  @date   4 5, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+#include "vpgraphicspiece.h"
+
+#include <QPen>
+#include <QBrush>
+#include <QPainter>
+#include <QGraphicsSceneMouseEvent>
+#include <QStyleOptionGraphicsItem>
+#include <QGraphicsSceneContextMenuEvent>
+#include <QMenu>
+#include <QtMath>
+#include <QGraphicsScene>
+#include <QApplication>
+
+#include "../layout/vppiece.h"
+#include "../layout/vplayout.h"
+#include "../layout/vpsheet.h"
+
+#include "../vlayout/vtextmanager.h"
+
+#include "vlayoutpiecepath.h"
+#include "vplacelabelitem.h"
+
+#include "undocommands/vpundopiecemove.h"
+#include "undocommands/vpundomovepieceonsheet.h"
+
+#include <QLoggingCategory>
+Q_LOGGING_CATEGORY(pGraphicsPiece, "p.graphicsPiece")
+
+namespace
+{
+constexpr qreal penWidth = 1;
+
+QColor mainColor = Qt::black;
+QColor errorColor = Qt::red;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+VPGraphicsPiece::VPGraphicsPiece(const VPPiecePtr &piece, QGraphicsItem *parent) :
+    QGraphicsObject(parent),
+    m_piece(piece)
+{
+    QPixmap cursor_pixmap = QIcon("://puzzleicon/svg/cursor_rotate.svg").pixmap(QSize(32,32));
+    m_rotateCursor= QCursor(cursor_pixmap, 16, 16);
+
+    // set some infos
+    setFlags(ItemIsSelectable | ItemSendsGeometryChanges);
+    setAcceptHoverEvents(true);
+    setCursor(Qt::OpenHandCursor);
+
+    PaintPiece();
+    InitLabels();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPGraphicsPiece::GetPiece() -> VPPiecePtr
+{
+    return m_piece.toStrongRef();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPGraphicsPiece::boundingRect() const -> QRectF
+{
+    QPainterPath shape;
+    shape.addPath(m_seamLine);
+    shape.addPath(m_cuttingLine);
+    shape.addPath(m_grainline);
+    shape.addPath(m_internalPaths);
+    shape.addPath(m_passmarks);
+    shape.addPath(m_placeLabels);
+    shape.addPath(m_stickyPath);
+
+    constexpr qreal halfPenWidth = penWidth/2.;
+
+    return shape.boundingRect().adjusted(-halfPenWidth, -halfPenWidth, halfPenWidth, halfPenWidth);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPGraphicsPiece::shape() const -> QPainterPath
+{
+    if(!m_cuttingLine.isEmpty())
+    {
+        return m_cuttingLine;
+    }
+
+    return m_seamLine;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPGraphicsPiece::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(widget);
+    Q_UNUSED(option);
+
+    QPen pen(PieceColor(), penWidth, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
+    painter->setPen(pen);
+
+    PaintPiece(painter);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPGraphicsPiece::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    //perform the default behaviour
+    QGraphicsObject::mousePressEvent(event);
+
+    // change the cursor when clicking the left button
+    if((event->button() == Qt::LeftButton))
+    {
+        setCursor(Qt::ClosedHandCursor);
+
+        m_moveStartPoint = event->pos();
+        emit HideTransformationHandles(true);
+        m_hasStickyPosition = false;
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPGraphicsPiece::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+    QGraphicsObject::mouseMoveEvent(event);
+
+    GroupMove(event->pos());
+
+    m_moveStartPoint = event->pos();
+    allowChangeMerge = true;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPGraphicsPiece::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+    //perform the default behaviour
+    QGraphicsItem::mouseReleaseEvent(event);
+
+    // change the cursor when clicking left button
+    if (event->button() == Qt::LeftButton)
+    {
+        setCursor(Qt::OpenHandCursor);
+        emit HideTransformationHandles(false);
+
+        VPPiecePtr piece = m_piece.toStrongRef();
+        if (not piece.isNull())
+        {
+            VPLayoutPtr layout = piece->Layout();
+            if (not layout.isNull())
+            {
+                if (layout->LayoutSettings().GetStickyEdges() && m_hasStickyPosition)
+                {
+                    auto *command = new VPUndoPieceMove(piece, m_stickyTranslateX, m_stickyTranslateY,
+                                                        allowChangeMerge);
+                    layout->UndoStack()->push(command);
+
+                    SetStickyPoints(QVector<QPointF>());
+                }
+            }
+        }
+
+        allowChangeMerge = false;
+        m_hasStickyPosition = false;
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPGraphicsPiece::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
+{
+    VPPiecePtr piece = m_piece.toStrongRef();
+    if (piece.isNull())
+    {
+        return;
+    }
+
+    VPLayoutPtr layout = piece->Layout();
+    if (layout.isNull())
+    {
+        return;
+    }
+
+    QMenu menu;
+    QList<VPSheetPtr> sheets = layout->GetSheets();
+    sheets.removeAll(piece->Sheet());
+
+    QVector<QAction*> moveToActions;
+
+    if (not sheets.isEmpty())
+    {
+        QMenu *moveMenu = menu.addMenu(tr("Move to"));
+
+        for (const auto &sheet : sheets)
+        {
+            if (not sheet.isNull())
+            {
+                QAction* moveToSheet = moveMenu->addAction(sheet->GetName());
+                moveToSheet->setData(QVariant::fromValue(sheet));
+                moveToActions.append(moveToSheet);
+            }
+        }
+    }
+
+    // remove from layout action
+    QAction *removeAction = menu.addAction(tr("Remove from Sheet"));
+
+    QAction *selectedAction = menu.exec(event->screenPos());
+
+    if (moveToActions.contains(selectedAction))
+    {
+        auto *command = new VPUndoMovePieceOnSheet(qvariant_cast<VPSheetPtr>(selectedAction->data()), piece);
+        layout->UndoStack()->push(command);
+    }
+    else if (selectedAction == removeAction)
+    {
+        auto *command = new VPUndoMovePieceOnSheet(VPSheetPtr(), piece);
+        layout->UndoStack()->push(command);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPGraphicsPiece::SetTextAsPaths(bool newTextAsPaths)
+{
+    m_textAsPaths = newTextAsPaths;
+    InitLabels();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPGraphicsPiece::InitLabels()
+{
+    qDeleteAll(m_labelPathItems);
+    qDeleteAll(m_labelTextItems);
+
+    m_labelPathItems.clear();
+    m_labelTextItems.clear();
+
+    VPPiecePtr piece = m_piece.toStrongRef();
+    if (piece.isNull())
+    {
+        return;
+    }
+
+    InitPieceLabel(piece->GetPieceLabelRect(), piece->GetPieceLabelData());
+    InitPieceLabel(piece->GetPatternLabelRect(), piece->GetPatternLabelData());
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPGraphicsPiece::SetStickyPoints(const QVector<QPointF> &newStickyPoint)
+{
+    m_stickyPoints = newStickyPoint;
+
+    prepareGeometryChange();
+    PaintPiece(); // refresh shapes
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPGraphicsPiece::InitPieceLabel(const QVector<QPointF> &labelShape, const VTextManager &tm)
+{
+    VPPiecePtr piece = m_piece.toStrongRef();
+    if (piece.isNull())
+    {
+        return;
+    }
+
+    if (labelShape.count() > 2)
+    {
+        const qreal dW = QLineF(labelShape.at(0), labelShape.at(1)).length();
+        const qreal dH = QLineF(labelShape.at(1), labelShape.at(2)).length();
+        const qreal angle = - QLineF(labelShape.at(0), labelShape.at(1)).angle();
+        qreal dY = 0;
+        QColor color = PieceColor();
+
+        for (int i = 0; i < tm.GetSourceLinesCount(); ++i)
+        {
+            const TextLine& tl = tm.GetSourceLine(i);
+            QFont fnt = tm.GetFont();
+            fnt.setPixelSize(tm.GetFont().pixelSize() + tl.m_iFontSize);
+            fnt.setBold(tl.m_bold);
+            fnt.setItalic(tl.m_italic);
+
+            QFontMetrics fm(fnt);
+
+            if (m_textAsPaths)
+            {
+                dY += fm.height();
+            }
+
+            if (dY > dH)
+            {
+                break;
+            }
+
+            QString qsText = tl.m_qsText;
+#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
+            if (fm.horizontalAdvance(qsText) > dW)
+#else
+            if (fm.width(qsText) > dW)
+#endif
+            {
+                qsText = fm.elidedText(qsText, Qt::ElideMiddle, static_cast<int>(dW));
+            }
+
+            qreal dX = 0;
+            if (tl.m_eAlign == 0 || (tl.m_eAlign & Qt::AlignLeft) > 0)
+            {
+                dX = 0;
+            }
+            else if ((tl.m_eAlign & Qt::AlignHCenter) > 0)
+            {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
+                dX = (dW - fm.horizontalAdvance(qsText))/2;
+#else
+                dX = (dW - fm.width(qsText))/2;
+#endif
+            }
+            else if ((tl.m_eAlign & Qt::AlignRight) > 0)
+            {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
+                dX = dW - fm.horizontalAdvance(qsText);
+#else
+                dX = dW - fm.width(qsText);
+#endif
+            }
+
+            // set up the rotation around top-left corner matrix
+            QTransform labelMatrix;
+            labelMatrix.translate(labelShape.at(0).x(), labelShape.at(0).y());
+            if (piece->IsMirror())
+            {
+                labelMatrix.scale(-1, 1);
+                labelMatrix.rotate(-angle);
+                labelMatrix.translate(-dW, 0);
+                labelMatrix.translate(dX, dY); // Each string has own position
+            }
+            else
+            {
+                labelMatrix.rotate(angle);
+                labelMatrix.translate(dX, dY); // Each string has own position
+            }
+
+            labelMatrix *= piece->GetMatrix();
+
+            if (m_textAsPaths)
+            {
+                QPainterPath path;
+                path.addText(0, - static_cast<qreal>(fm.ascent())/6., fnt, qsText);
+
+                auto* item = new QGraphicsPathItem(this);
+                item->setPath(path);
+                item->setBrush(QBrush(color));
+                item->setTransform(labelMatrix);
+                m_labelPathItems.append(item);
+
+                dY += tm.GetSpacing();
+            }
+            else
+            {
+                auto* item = new QGraphicsSimpleTextItem(this);
+                item->setFont(fnt);
+                item->setText(qsText);
+                item->setBrush(QBrush(color));
+                item->setTransform(labelMatrix);
+                m_labelTextItems.append(item);
+
+                dY += (fm.height() + tm.GetSpacing());
+            }
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPGraphicsPiece::PaintPiece(QPainter *painter)
+{
+    QBrush noBrush(Qt::NoBrush);
+    QBrush selectionBrush(QColor(255,160,160,60));
+
+    m_seamLine = QPainterPath();
+    m_cuttingLine = QPainterPath();
+    m_grainline = QPainterPath();
+    m_internalPaths = QPainterPath();
+    m_passmarks = QPainterPath();
+    m_placeLabels = QPainterPath();
+    m_stickyPath = QPainterPath();
+
+    VPPiecePtr piece = m_piece.toStrongRef();
+    if (piece.isNull())
+    {
+        return;
+    }
+
+    // initialises the seam line
+    if (not piece->IsHideMainPath() || not piece->IsSeamAllowance())
+    {
+        QVector<QPointF> seamLinePoints = piece->GetMappedContourPoints();
+        if(!seamLinePoints.isEmpty())
+        {
+            m_seamLine.moveTo(seamLinePoints.first());
+            for (int i = 1; i < seamLinePoints.size(); i++)
+            {
+                m_seamLine.lineTo(seamLinePoints.at(i));
+            }
+
+            if (painter != nullptr)
+            {
+                painter->save();
+                painter->setBrush(piece->IsSelected() ? selectionBrush : noBrush);
+                painter->drawPath(m_seamLine);
+                painter->restore();
+            }
+        }
+    }
+
+    // initiliases the cutting line
+    if (piece->IsSeamAllowance() && not piece->IsSeamAllowanceBuiltIn())
+    {
+        QVector<QPointF> cuttingLinepoints = piece->GetMappedSeamAllowancePoints();
+        if(!cuttingLinepoints.isEmpty())
+        {
+            m_cuttingLine.moveTo(cuttingLinepoints.first());
+            for (int i = 1; i < cuttingLinepoints.size(); i++)
+            {
+                m_cuttingLine.lineTo(cuttingLinepoints.at(i));
+            }
+
+            if (painter != nullptr)
+            {
+                painter->save();
+                painter->setBrush(isSelected() ? selectionBrush : noBrush);
+                painter->drawPath(m_cuttingLine);
+                painter->restore();
+            }
+        }
+    }
+
+    // initialises the grainline
+    if(piece->IsGrainlineEnabled())
+    {
+        QVector<QPointF> grainLinepoints = piece->GetMappedGrainline();
+        if(!grainLinepoints.isEmpty())
+        {
+            m_grainline.moveTo(grainLinepoints.first());
+            for (int i = 1; i < grainLinepoints.size(); i++)
+            {
+                m_grainline.lineTo(grainLinepoints.at(i));
+            }
+
+            if (painter != nullptr)
+            {
+                painter->save();
+                // here to fill the grainlines arrow. Not wanted for mvp
+                // later maybe if it's configurable
+//                painter->setBrush(blackBrush);
+
+                painter->setBrush(noBrush);
+                painter->drawPath(m_grainline);
+                painter->restore();
+            }
+        }
+    }
+
+    // initialises the internal paths
+    QVector<VLayoutPiecePath> internalPaths = piece->GetInternalPaths();
+    for (const auto& piecePath : internalPaths)
+    {
+        QPainterPath path = piece->GetMatrix().map(piecePath.GetPainterPath());
+
+        if (painter != nullptr)
+        {
+            painter->save();
+            QPen pen = painter->pen();
+            pen.setStyle(piecePath.PenStyle());
+            painter->setPen(pen);
+            painter->drawPath(path);
+            painter->restore();
+        }
+        m_internalPaths.addPath(path);
+    }
+
+    // initialises the passmarks
+    QVector<VLayoutPassmark> passmarks = piece->GetMappedPassmarks();
+    for(auto &passmark : passmarks)
+    {
+        QPainterPath passmarkPath;
+        for (auto &line : passmark.lines)
+        {
+            passmarkPath.moveTo(line.p1());
+            passmarkPath.lineTo(line.p2());
+        }
+
+        if (painter != nullptr)
+        {
+            painter->save();
+            painter->setBrush(noBrush);
+            painter->drawPath(passmarkPath);
+            painter->restore();
+        }
+
+        m_passmarks.addPath(passmarkPath);
+    }
+
+    // initialises the place labels (buttons etc)
+    QVector<VLayoutPlaceLabel> placeLabels = piece->GetMappedPlaceLabels();
+    for(auto &placeLabel : placeLabels)
+    {
+        QPainterPath path = VPlaceLabelItem::LabelShapePath(placeLabel.shape);
+
+        if (painter != nullptr)
+        {
+            painter->save();
+            painter->setBrush(noBrush);
+            painter->drawPath(path);
+            painter->restore();
+        }
+
+        m_placeLabels.addPath(path);
+    }
+
+    if (not m_stickyPoints.isEmpty())
+    {
+        m_stickyPath.moveTo(m_stickyPoints.first());
+        for (int i = 1; i < m_stickyPoints.size(); i++)
+        {
+            m_stickyPath.lineTo(m_stickyPoints.at(i));
+        }
+
+        if (painter != nullptr)
+        {
+            painter->save();
+            painter->setBrush(QBrush(Qt::BDiagPattern));
+
+            QPen pen = painter->pen();
+            pen.setStyle(Qt::DashLine);
+            pen.setColor(mainColor);
+            painter->setPen(pen);
+
+            painter->drawPath(m_stickyPath);
+            painter->restore();
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPGraphicsPiece::GroupMove(const QPointF &pos)
+{
+    VPPiecePtr piece = m_piece.toStrongRef();
+    if (piece.isNull())
+    {
+        return;
+    }
+
+    VPLayoutPtr layout = piece->Layout();
+    if (layout.isNull())
+    {
+        return;
+    }
+
+    auto PreparePieces = [layout]()
+    {
+        QList<VPPiecePtr> pieces;
+
+        VPSheetPtr sheet = layout->GetFocusedSheet();
+        if (not sheet.isNull())
+        {
+            return sheet->GetSelectedPieces();
+        }
+
+        return pieces;
+    };
+
+    QList<VPPiecePtr> pieces = PreparePieces();
+    QPointF newPos = pos - m_moveStartPoint;
+
+    if (qFuzzyIsNull(newPos.x()) && qFuzzyIsNull(newPos.y()))
+    {
+        return;
+    }
+
+    if (pieces.size() == 1)
+    {
+        VPPiecePtr p = pieces.first();
+        auto *command = new VPUndoPieceMove(piece, newPos.x(), newPos.y(), allowChangeMerge);
+        layout->UndoStack()->push(command);
+
+        if (layout->LayoutSettings().GetStickyEdges())
+        {
+            QVector<QPointF> path;
+            if (not p.isNull() && p->StickyPosition(m_stickyTranslateX, m_stickyTranslateY))
+            {
+                path = p->GetMappedExternalContourPoints();
+                QTransform m;
+                m.translate(m_stickyTranslateX, m_stickyTranslateY);
+                path = m.map(path);
+                m_hasStickyPosition = true;
+            }
+            else
+            {
+                m_hasStickyPosition = false;
+            }
+
+            SetStickyPoints(path);
+        }
+    }
+    else if (pieces.size() > 1)
+    {
+        auto *command = new VPUndoPiecesMove(pieces, newPos.x(), newPos.y(), allowChangeMerge);
+        layout->UndoStack()->push(command);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPGraphicsPiece::PieceColor() const -> QColor
+{
+    VPPiecePtr piece = m_piece.toStrongRef();
+    if (piece.isNull())
+    {
+        return mainColor;
+    }
+
+    VPLayoutPtr layout = piece->Layout();
+    if (layout.isNull())
+    {
+        return mainColor;
+    }
+
+    bool outOfBound = false;
+    if (layout->LayoutSettings().GetWarningPiecesOutOfBound())
+    {
+        outOfBound = piece->OutOfBound();
+    }
+
+    bool superposition = false;
+    if (layout->LayoutSettings().GetWarningSuperpositionOfPieces())
+    {
+        superposition = piece->HasSuperpositionWithPieces();
+    }
+
+    if (outOfBound || superposition)
+    {
+        return errorColor;
+    }
+
+    return mainColor;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPGraphicsPiece::on_RefreshPiece(const VPPiecePtr &piece)
+{
+    if (m_piece == piece)
+    {
+        prepareGeometryChange();
+        PaintPiece(); // refresh shapes
+        InitLabels();
+        emit PieceTransformationChanged();
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPGraphicsPiece::itemChange(GraphicsItemChange change, const QVariant &value) -> QVariant
+{
+    if (scene() != nullptr)
+    {
+        if(change == ItemSelectedHasChanged)
+        {
+            VPPiecePtr piece = m_piece.toStrongRef();
+            if (not piece.isNull())
+            {
+                piece->SetSelected(value.toBool());
+
+                VPLayoutPtr layout = piece->Layout();
+                if (not layout.isNull())
+                {
+                    emit layout->PieceSelectionChanged(piece);
+                }
+            }
+        }
+    }
+
+    return QGraphicsObject::itemChange(change, value);
+}
+
diff --git a/src/app/puzzle/scene/vpgraphicspiece.h b/src/app/puzzle/scene/vpgraphicspiece.h
new file mode 100644
index 000000000..a0889b5a9
--- /dev/null
+++ b/src/app/puzzle/scene/vpgraphicspiece.h
@@ -0,0 +1,119 @@
+/************************************************************************
+ **
+ **  @file   vpgraphicspiece.h
+ **  @author Ronan Le Tiec
+ **  @date   4 5, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+#ifndef VPGRAPHICSPIECE_H
+#define VPGRAPHICSPIECE_H
+
+#include <QGraphicsItem>
+#include <QCursor>
+
+#include "scenedef.h"
+#include "../layout/layoutdef.h"
+
+class VTextManager;
+
+class VPGraphicsPiece : public QGraphicsObject
+{
+    Q_OBJECT
+public:
+    explicit VPGraphicsPiece(const VPPiecePtr &piece, QGraphicsItem *parent = nullptr);
+    ~VPGraphicsPiece() = default;
+
+    /**
+     * @brief GetPiece Returns the piece that corresponds to the graphics piece
+     * @return the piece
+     */
+    auto GetPiece() -> VPPiecePtr;
+
+    virtual int type() const override {return Type;}
+    enum { Type = UserType + static_cast<int>(PGraphicsItem::Piece)};
+
+    void SetStickyPoints(const QVector<QPointF> &newStickyPoint);
+
+    void SetTextAsPaths(bool newTextAsPaths);
+
+signals:
+    void HideTransformationHandles(bool hide);
+    void PieceTransformationChanged();
+
+public slots:
+    void on_RefreshPiece(const VPPiecePtr &piece);
+
+protected:
+    auto boundingRect() const -> QRectF override;
+    auto shape() const -> QPainterPath override;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
+
+    void mousePressEvent(QGraphicsSceneMouseEvent * event) override;
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
+
+    auto itemChange(GraphicsItemChange change, const QVariant &value) -> QVariant override;
+
+    void contextMenuEvent(QGraphicsSceneContextMenuEvent *event) override;
+
+private:
+    Q_DISABLE_COPY(VPGraphicsPiece)
+    VPPieceWeakPtr m_piece;
+
+    QPainterPath m_cuttingLine{};
+    QPainterPath m_seamLine{};
+    QPainterPath m_grainline{};
+    QPainterPath m_internalPaths{};
+    QPainterPath m_passmarks{};
+    QPainterPath m_placeLabels{};
+
+    QPointF m_moveStartPoint{};
+    QPointF m_rotationStartPoint{};
+
+    QCursor m_rotateCursor{};
+
+    bool allowChangeMerge{false};
+
+    QVector<QPointF> m_stickyPoints{};
+    QPainterPath m_stickyPath{};
+
+    bool m_hasStickyPosition{false};
+    qreal m_stickyTranslateX{0};
+    qreal m_stickyTranslateY{0};
+
+    bool m_textAsPaths{false};
+
+    QVector<QGraphicsPathItem *> m_labelPathItems{};
+    QVector<QGraphicsSimpleTextItem *> m_labelTextItems{};
+
+    void InitLabels();
+    void InitPieceLabel(const QVector<QPointF> &labelShape, const VTextManager &tm);
+    void PaintPiece(QPainter *painter=nullptr);
+
+    void GroupMove(const QPointF &pos);
+
+    QColor PieceColor() const;
+};
+
+#endif // VPGRAPHICSPIECE_H
diff --git a/src/app/puzzle/scene/vpgraphicspiececontrols.cpp b/src/app/puzzle/scene/vpgraphicspiececontrols.cpp
new file mode 100644
index 000000000..0e422e1ff
--- /dev/null
+++ b/src/app/puzzle/scene/vpgraphicspiececontrols.cpp
@@ -0,0 +1,857 @@
+/************************************************************************
+ **
+ **  @file   vpgraphicspiececontrols.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   2 8, 2021
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2021 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#include "vpgraphicspiececontrols.h"
+
+#include <QCursor>
+#include <QGraphicsScene>
+#include <QGraphicsSceneMouseEvent>
+#include <QIcon>
+#include <QPainter>
+#include <QtDebug>
+
+#include "../vmisc/compatibility.h"
+#include "../vwidgets/global.h"
+#include "../layout/vplayout.h"
+#include "../layout/vppiece.h"
+#include "../undocommands/vpundopiecerotate.h"
+#include "../undocommands/vpundooriginmove.h"
+#include "vpgraphicspiece.h"
+
+namespace
+{
+const qreal arcStartAngle = 105;
+const qreal arcAngle = 25;
+const qreal arcRadius = 15;
+
+const qreal arrowTail = 2;
+const qreal arrowSide = 2;
+const qreal arrowLength = 4;
+const qreal arrow1Angle = 13;
+const qreal arrow2Angle = 38;
+
+constexpr qreal penWidth = 2;
+
+const qreal centerRadius1 = 5;
+const qreal centerRadius2 = 10;
+
+const QColor defaultColor = Qt::black;
+const QColor hoverColor = Qt::green;
+
+enum class HandleCorner : int
+{
+    Invalid = 0,
+    TopLeft = 1,
+    TopRight = 2,
+    BottomRight = 3,
+    BottomLeft = 4
+};
+
+auto TransformationOrigin(const VPLayoutPtr &layout, const QRectF &boundingRect) -> VPTransformationOrigon
+{
+    SCASSERT(layout != nullptr)
+    VPSheetPtr sheet = layout->GetFocusedSheet();
+    if (not sheet.isNull())
+    {
+        return sheet->TransformationOrigin();
+    }
+
+    VPTransformationOrigon origin;
+    origin.origin = boundingRect.center();
+    origin.custom = false;
+
+    return origin;
+}
+}  // namespace
+
+//---------------------------------------------------------------------------------------------------------------------
+VPGraphicsTransformationOrigin::VPGraphicsTransformationOrigin(const VPLayoutPtr &layout, QGraphicsItem *parent)
+    : QGraphicsObject(parent),
+      m_layout(layout),
+      m_color(defaultColor)
+{
+    SCASSERT(m_layout != nullptr)
+    setCursor(Qt::OpenHandCursor);
+    setZValue(1);
+    setAcceptHoverEvents(true);
+
+    connect(layout.get(), &VPLayout::TransformationOriginChanged, this,
+            &VPGraphicsTransformationOrigin::SetTransformationOrigin);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPGraphicsTransformationOrigin::SetTransformationOrigin()
+{
+    prepareGeometryChange();
+    update();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPGraphicsTransformationOrigin::on_HideHandles(bool hide)
+{
+    m_originVisible = not hide;
+    prepareGeometryChange();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPGraphicsTransformationOrigin::on_ShowOrigin(bool show)
+{
+    setVisible(show);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPGraphicsTransformationOrigin::boundingRect() const -> QRectF
+{
+    constexpr qreal halfPenWidth = penWidth/2.;
+    return Center2().boundingRect().adjusted(-halfPenWidth, -halfPenWidth, halfPenWidth, halfPenWidth);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPGraphicsTransformationOrigin::shape() const -> QPainterPath
+{
+    return Center2();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPGraphicsTransformationOrigin::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(widget);
+    Q_UNUSED(option);
+
+    const qreal scale = SceneScale(scene());
+
+    QPen pen(m_color, penWidth/scale, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
+
+    painter->setPen(pen);
+
+    if (m_originVisible)
+    {
+        painter->save();
+        painter->setBrush(QBrush(m_color));
+        painter->drawPath(Center1());
+        painter->restore();
+
+        painter->save();
+        painter->setBrush(QBrush());
+        painter->drawPath(Center2());
+        painter->restore();
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPGraphicsTransformationOrigin::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    // change the cursor when clicking the left button
+    if((event->button() == Qt::LeftButton))
+    {
+        setCursor(Qt::ClosedHandCursor);
+        event->accept();
+    }
+    else
+    {
+        //perform the default behaviour
+        QGraphicsObject::mousePressEvent(event);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPGraphicsTransformationOrigin::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+    VPLayoutPtr layout = m_layout.toStrongRef();
+    if (not layout.isNull())
+    {
+        VPSheetPtr sheet = layout->GetFocusedSheet();
+        if (not sheet.isNull())
+        {
+            VPTransformationOrigon origin = sheet->TransformationOrigin();
+            origin.origin = event->scenePos();
+            origin.custom = true;
+
+            auto *command = new VPUndoOriginMove(sheet, origin, m_allowChangeMerge);
+            layout->UndoStack()->push(command);
+        }
+        prepareGeometryChange();
+    }
+
+    m_allowChangeMerge = true;
+    QGraphicsObject::mouseMoveEvent(event);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPGraphicsTransformationOrigin::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+    //perform the default behaviour
+    QGraphicsItem::mouseReleaseEvent(event);
+
+    // change the cursor when clicking left button
+    if (event->button() == Qt::LeftButton)
+    {
+        setCursor(Qt::OpenHandCursor);
+        m_allowChangeMerge = false;
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPGraphicsTransformationOrigin::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
+{
+    m_color = hoverColor;
+    QGraphicsObject::hoverEnterEvent(event);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPGraphicsTransformationOrigin::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
+{
+    m_color = defaultColor;
+    QGraphicsObject::hoverEnterEvent(event);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPGraphicsTransformationOrigin::RotationCenter(QPainter *painter) const -> QPainterPath
+{
+    QPainterPath path;
+
+    const qreal scale = SceneScale(scene());
+    qreal radius = centerRadius1/scale;
+    VPTransformationOrigon transformationOrigin = TransformationOrigin(m_layout, QRectF());
+    QRectF rect(transformationOrigin.origin.x()-radius, transformationOrigin.origin.y()-radius, radius*2., radius*2.);
+
+    QPainterPath center1;
+    center1.addEllipse(rect);
+
+    if (painter != nullptr)
+    {
+        painter->save();
+        painter->setBrush(QBrush(m_color));
+        painter->drawPath(Center1());
+        painter->restore();
+    }
+    path.addPath(center1);
+
+    radius = centerRadius2/scale;
+    rect = QRectF(transformationOrigin.origin.x()-radius, transformationOrigin.origin.y()-radius, radius*2., radius*2.);
+
+    QPainterPath center2;
+    center2.addEllipse(rect);
+
+    if (painter != nullptr)
+    {
+        painter->save();
+        painter->setBrush(QBrush());
+        painter->drawPath(Center2());
+        painter->restore();
+    }
+    path.addPath(center2);
+
+    return path;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPGraphicsTransformationOrigin::Center1() const -> QPainterPath
+{
+    const qreal scale = SceneScale(scene());
+    qreal radius = centerRadius1/scale;
+    VPTransformationOrigon transformationOrigin = TransformationOrigin(m_layout, QRectF());
+    QRectF rect(transformationOrigin.origin.x()-radius, transformationOrigin.origin.y()-radius, radius*2., radius*2.);
+
+    QPainterPath center1;
+    center1.addEllipse(rect);
+
+    return center1;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPGraphicsTransformationOrigin::Center2() const -> QPainterPath
+{
+    const qreal scale = SceneScale(scene());
+    qreal radius = centerRadius2/scale;
+    VPTransformationOrigon transformationOrigin = TransformationOrigin(m_layout, QRectF());
+    QRectF rect = QRectF(transformationOrigin.origin.x()-radius, transformationOrigin.origin.y()-radius, radius*2.,
+                         radius*2.);
+
+    QPainterPath center2;
+    center2.addEllipse(rect);
+
+    return center2;
+}
+
+// VPGraphicsPieceControls
+//---------------------------------------------------------------------------------------------------------------------
+VPGraphicsPieceControls::VPGraphicsPieceControls(const VPLayoutPtr &layout, QGraphicsItem *parent)
+    : QGraphicsObject(parent),
+      m_layout(layout)
+{
+    SCASSERT(m_layout != nullptr)
+    QPixmap cursor_pixmap = QIcon("://puzzleicon/svg/cursor_rotate.svg").pixmap(QSize(32,32));
+    setCursor(QCursor(cursor_pixmap, 16, 16));
+    setZValue(1);
+    setAcceptHoverEvents(true);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPGraphicsPieceControls::on_UpdateControls()
+{
+    if (m_ignorePieceTransformation)
+    {
+        return;
+    }
+
+    m_selectedPieces = SelectedPieces();
+    m_pieceRect = PiecesBoundingRect(m_selectedPieces);
+    setVisible(not m_pieceRect.isNull());
+
+    if (not m_pieceRect.isNull())
+    {
+        VPLayoutPtr layout = m_layout.toStrongRef();
+        if (not layout.isNull())
+        {
+            VPSheetPtr sheet = layout->GetFocusedSheet();
+            if (not sheet.isNull())
+            {
+                VPTransformationOrigon origin = sheet->TransformationOrigin();
+                if (not origin.custom)
+                {
+                    origin.origin = m_pieceRect.center();
+                    sheet->SetTransformationOrigin(origin);
+                    emit TransformationOriginChanged();
+                }
+            }
+        }
+    }
+
+    emit ShowOrigin(not m_pieceRect.isNull());
+    prepareGeometryChange();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPGraphicsPieceControls::on_HideHandles(bool hide)
+{
+    m_controlsVisible = not hide;
+    update();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPGraphicsPieceControls::boundingRect() const -> QRectF
+{
+    constexpr qreal halfPenWidth = penWidth/2.;
+    return Handles().boundingRect().adjusted(-halfPenWidth, -halfPenWidth, halfPenWidth, halfPenWidth);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPGraphicsPieceControls::shape() const -> QPainterPath
+{
+    return Handles();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPGraphicsPieceControls::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(widget);
+    Q_UNUSED(option);
+
+    const qreal scale = SceneScale(scene());
+
+    QPen pen(defaultColor, penWidth/scale, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
+
+    painter->setPen(pen);
+
+    if (m_controlsVisible)
+    {
+        TopLeftControl(painter);
+        TopRightControl(painter);
+        BottomLeftControl(painter);
+        BottomRightControl(painter);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPGraphicsPieceControls::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    if(event->button() == Qt::LeftButton)
+    {
+        m_rotationStartPoint = event->scenePos();
+        m_rotationSum = 0;
+        m_controlsVisible = false;
+        m_handleCorner = HandleCorner(event->scenePos());
+        m_ignorePieceTransformation = true;
+        prepareGeometryChange();
+    }
+    else
+    {
+        QGraphicsObject::mousePressEvent(event);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPGraphicsPieceControls::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+    if((event->modifiers() & Qt::ShiftModifier) != 0U
+            && static_cast<enum HandleCorner>(m_handleCorner) != HandleCorner::Invalid)
+    {
+        if (not m_originSaved)
+        {
+            VPLayoutPtr layout = m_layout.toStrongRef();
+            if (not layout.isNull())
+            {
+                VPSheetPtr sheet = layout->GetFocusedSheet();
+                if (not sheet.isNull())
+                {
+                    m_savedOrigin = sheet->TransformationOrigin();
+                    m_originSaved = true;
+                    m_pieceRect = PiecesBoundingRect(m_selectedPieces);
+
+                    VPTransformationOrigon origin;
+                    origin.custom = true;
+
+                    if (static_cast<enum HandleCorner>(m_handleCorner) == HandleCorner::TopLeft)
+                    {
+                        origin.origin = m_pieceRect.topLeft();
+                    }
+                    else if (static_cast<enum HandleCorner>(m_handleCorner) == HandleCorner::TopRight)
+                    {
+                        origin.origin = m_pieceRect.topRight();
+                    }
+                    else if (static_cast<enum HandleCorner>(m_handleCorner) == HandleCorner::BottomRight)
+                    {
+                        origin.origin = m_pieceRect.bottomRight();
+                    }
+                    else if (static_cast<enum HandleCorner>(m_handleCorner) == HandleCorner::BottomLeft)
+                    {
+                        origin.origin = m_pieceRect.bottomLeft();
+                    }
+
+                    sheet->SetTransformationOrigin(origin);
+                    emit TransformationOriginChanged();
+                }
+            }
+        }
+    }
+    else
+    {
+        if (m_originSaved)
+        {
+            VPLayoutPtr layout = m_layout.toStrongRef();
+            if (not layout.isNull())
+            {
+                VPSheetPtr sheet = layout->GetFocusedSheet();
+                if (sheet != nullptr)
+                {
+                    if (not m_savedOrigin.custom)
+                    {
+                        m_pieceRect = PiecesBoundingRect(m_selectedPieces);
+                        m_savedOrigin.origin = m_pieceRect.center();
+                    }
+                    sheet->SetTransformationOrigin(m_savedOrigin);
+                    emit TransformationOriginChanged();
+                }
+                m_originSaved = false;
+            }
+        }
+    }
+
+    QPointF rotationNewPoint = event->scenePos();
+
+    // get the angle from the center to the initial click point
+    VPTransformationOrigon rotationOrigin = TransformationOrigin(m_layout, m_pieceRect);
+    QLineF initPosition(rotationOrigin.origin, m_rotationStartPoint);
+    QLineF initRotationPosition(rotationOrigin.origin, rotationNewPoint);
+
+    qreal rotateOn = initPosition.angleTo(initRotationPosition);
+
+    if (rotateOn > 180)
+    {
+        rotateOn = rotateOn - 360.;
+    }
+
+    if (not qFuzzyIsNull(rotateOn))
+    {
+        auto PreparePieces = [this]()
+        {
+            QList<VPPiecePtr> pieces;
+            VPLayoutPtr layout = m_layout.toStrongRef();
+            if (not layout.isNull())
+            {
+                VPSheetPtr sheet = layout->GetFocusedSheet();
+                if (not sheet.isNull())
+                {
+                    pieces = sheet->GetSelectedPieces();
+                }
+            }
+
+            return pieces;
+        };
+
+        QList<VPPiecePtr> pieces = PreparePieces();
+
+        VPLayoutPtr layout = m_layout.toStrongRef();
+        if (not layout.isNull())
+        {
+            if (layout->LayoutSettings().GetFollowGrainline() && not rotationOrigin.custom)
+            {
+                if (m_rotationSum > 90 || m_rotationSum < -90)
+                {
+                    m_rotationSum = rotateOn;
+                }
+                else
+                {
+                    m_rotationSum += rotateOn;
+                }
+            }
+            else
+            {
+                m_rotationSum = rotateOn;
+            }
+
+            if (pieces.size() == 1)
+            {
+                auto *command = new VPUndoPieceRotate(pieces.first(), rotationOrigin, rotateOn, m_rotationSum,
+                                                      allowChangeMerge);
+                layout->UndoStack()->push(command);
+            }
+            else if (pieces.size() > 1)
+            {
+                auto *command = new VPUndoPiecesRotate(pieces, rotationOrigin, rotateOn, m_rotationSum,
+                                                       allowChangeMerge);
+                layout->UndoStack()->push(command);
+            }
+        }
+    }
+
+    if (m_originSaved && m_savedOrigin.custom)
+    {
+        QLineF line(rotationOrigin.origin, m_savedOrigin.origin);
+        line.setAngle(line.angle()+rotateOn);
+        m_savedOrigin.origin = line.p2();
+    }
+
+    m_rotationStartPoint = rotationNewPoint;
+    allowChangeMerge = true;
+    QGraphicsObject::mouseMoveEvent(event);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPGraphicsPieceControls::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+    if(event->button() == Qt::LeftButton)
+    {
+        m_controlsVisible = true;
+        m_ignorePieceTransformation = false;
+
+        if (m_originSaved)
+        {
+            VPLayoutPtr layout = m_layout.toStrongRef();
+            if (not layout.isNull())
+            {
+                VPSheetPtr sheet = layout->GetFocusedSheet();
+                if (not sheet.isNull())
+                {
+                    if (not m_savedOrigin.custom)
+                    {
+                        m_pieceRect = PiecesBoundingRect(m_selectedPieces);
+                        m_savedOrigin.origin = m_pieceRect.center();
+                    }
+                    sheet->SetTransformationOrigin(m_savedOrigin);
+                    emit TransformationOriginChanged();
+                }
+                m_originSaved = false;
+            }
+        }
+
+        on_UpdateControls();
+        allowChangeMerge = false;
+    }
+    QGraphicsObject::mouseReleaseEvent(event);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPGraphicsPieceControls::SetIgnorePieceTransformation(bool newIgnorePieceTransformation)
+{
+    m_ignorePieceTransformation = newIgnorePieceTransformation;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPGraphicsPieceControls::TopLeftControl(QPainter *painter) const -> QPainterPath
+{
+    return Controller(QTransform(), painter);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPGraphicsPieceControls::TopRightControl(QPainter *painter) const -> QPainterPath
+{
+    QTransform t;
+    t.scale(-1, 1);
+    t.translate(-(m_pieceRect.topLeft().x() * 2. + m_pieceRect.width()), 0);
+
+    return Controller(t, painter);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPGraphicsPieceControls::BottomLeftControl(QPainter *painter) const -> QPainterPath
+{
+    QTransform t;
+    t.scale(1, -1);
+    t.translate(0, -(m_pieceRect.topLeft().y() * 2. + m_pieceRect.height()));
+
+    return Controller(t, painter);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPGraphicsPieceControls::BottomRightControl(QPainter *painter) const -> QPainterPath
+{
+    QTransform t;
+    t.scale(-1, -1);
+    t.translate(-(m_pieceRect.topLeft().x() * 2. + m_pieceRect.width()),
+                -(m_pieceRect.topLeft().y() * 2. + m_pieceRect.height()));
+
+    return Controller(t, painter);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPGraphicsPieceControls::Handles() const -> QPainterPath
+{
+    QPainterPath path;
+
+    path.addPath(TopLeftControl());
+    path.addPath(TopRightControl());
+    path.addPath(BottomLeftControl());
+    path.addPath(BottomRightControl());
+
+    return path;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPGraphicsPieceControls::Controller(const QTransform &t, QPainter *painter) const -> QPainterPath
+{
+    if (painter != nullptr)
+    {
+        QPen pen = painter->pen();
+        pen.setColor(defaultColor);
+        painter->setPen(pen);
+    }
+
+    QBrush colorBrush(defaultColor);
+
+    QPainterPath controller = ArrowPath();
+    controller = t.map(controller);
+
+    if (painter != nullptr)
+    {
+        painter->save();
+        painter->setBrush(colorBrush);
+        painter->drawPath(controller);
+        painter->restore();
+    }
+
+    return controller;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPGraphicsPieceControls::ControllersRect() const -> QRectF
+{
+    const qreal scale = SceneScale(scene());
+
+    const qreal gap = 2;
+    QRectF rect = m_pieceRect;
+    const qreal minWidth = arcRadius/scale+gap;
+    const qreal minHeight = arcRadius/scale+gap;
+
+    if (m_pieceRect.width() < minWidth)
+    {
+        qreal diff = minWidth - m_pieceRect.width();
+        rect.adjust(-diff/2., 0, diff/2., 0);
+    }
+
+    if (m_pieceRect.height() < minHeight)
+    {
+        qreal diff = minHeight - m_pieceRect.height();
+        rect.adjust(0, -diff/2., 0, diff/2.);
+    }
+
+    return rect;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPGraphicsPieceControls::ArrowPath() const -> QPainterPath
+{
+    const qreal scale = SceneScale(scene())/2;
+    QPainterPath arrow;
+
+    QRectF pieceRect = ControllersRect();
+
+    QLineF start(pieceRect.topLeft().x(), pieceRect.topLeft().y(),
+                 pieceRect.topLeft().x(), pieceRect.topLeft().y() - (arcRadius+1)/scale);
+    start.setAngle(arcStartAngle);
+
+    arrow.moveTo(start.p2());
+
+    QLineF baseLine(start.p2(), QPointF(start.p2().x()+arrowTail/scale, start.p2().y()));
+    baseLine.setAngle(arrow1Angle);
+    arrow.lineTo(baseLine.p2());
+
+    QLineF leftSide = QLineF(baseLine.p2(), baseLine.p1());
+    leftSide.setLength(arrowSide/scale);
+    leftSide.setAngle(leftSide.angle()-90);
+    arrow.lineTo(leftSide.p2());
+
+    start = QLineF(pieceRect.topLeft().x(), pieceRect.topLeft().y(),
+                   pieceRect.topLeft().x(), pieceRect.topLeft().y() - arcRadius/scale);
+    start.setAngle(arcStartAngle);
+
+    baseLine = QLineF(start.p2(), QPointF(start.p2().x()+(arrowTail+arrowLength)/scale, start.p2().y()));
+    baseLine.setAngle(arrow1Angle);
+    arrow.lineTo(baseLine.p2());
+
+    start = QLineF(pieceRect.topLeft().x(), pieceRect.topLeft().y(),
+                   pieceRect.topLeft().x(), pieceRect.topLeft().y() - (arcRadius-1)/scale);
+    start.setAngle(arcStartAngle);
+
+    baseLine = QLineF(start.p2(), QPointF(start.p2().x()+arrowTail/scale, start.p2().y()));
+    baseLine.setAngle(arrow1Angle);
+
+    QLineF rightSide = QLineF(baseLine.p2(), baseLine.p1());
+    rightSide.setLength(arrowSide/scale);
+    rightSide.setAngle(rightSide.angle()+90);
+    arrow.lineTo(rightSide.p2());
+
+    arrow.lineTo(baseLine.p2());
+    arrow.lineTo(start.p2());
+
+    // arc 1
+    QRectF arc1Rect(pieceRect.topLeft().x()-(arcRadius-1)/scale, pieceRect.topLeft().y()-(arcRadius-1)/scale,
+                    (arcRadius-1)/scale*2, (arcRadius-1)/scale*2);
+    arrow.arcTo(arc1Rect, arcStartAngle, arcAngle);
+
+    // arrow 2
+
+    start = QLineF(pieceRect.topLeft().x(), pieceRect.topLeft().y(),
+                   pieceRect.topLeft().x(), pieceRect.topLeft().y() - (arcRadius-1)/scale);
+    start.setAngle(arcStartAngle+arcAngle);
+
+    baseLine = QLineF(start.p2(), QPointF(start.p2().x()+arrowTail/scale, start.p2().y()));
+    baseLine.setAngle(arrow2Angle+180);
+    arrow.lineTo(baseLine.p2());
+
+    leftSide = QLineF(baseLine.p2(), baseLine.p1());
+    leftSide.setLength(arrowSide/scale);
+    leftSide.setAngle(leftSide.angle()-90);
+    arrow.lineTo(leftSide.p2());
+
+    start = QLineF(pieceRect.topLeft().x(), pieceRect.topLeft().y(),
+                   pieceRect.topLeft().x(), pieceRect.topLeft().y() - arcRadius/scale);
+    start.setAngle(arcStartAngle+arcAngle);
+
+    baseLine = QLineF(start.p2(), QPointF(start.p2().x()+(arrowTail+arrowLength)/scale, start.p2().y()));
+    baseLine.setAngle(arrow2Angle+180);
+    arrow.lineTo(baseLine.p2());
+
+    start = QLineF(pieceRect.topLeft().x(), pieceRect.topLeft().y(),
+                   pieceRect.topLeft().x(), pieceRect.topLeft().y() - (arcRadius+1)/scale);
+    start.setAngle(arcStartAngle+arcAngle);
+
+    baseLine = QLineF(start.p2(), QPointF(start.p2().x()+arrowTail/scale, start.p2().y()));
+    baseLine.setAngle(arrow2Angle+180);
+
+    rightSide = QLineF(baseLine.p2(), baseLine.p1());
+    rightSide.setLength(arrowSide/scale);
+    rightSide.setAngle(rightSide.angle()+90);
+    arrow.lineTo(rightSide.p2());
+
+    arrow.lineTo(baseLine.p2());
+    arrow.lineTo(start.p2());
+
+    // arc 2
+    QRectF arc2Rect(pieceRect.topLeft().x()-(arcRadius+1)/scale, pieceRect.topLeft().y()-(arcRadius+1)/scale,
+                    (arcRadius+1)/scale*2, (arcRadius+1)/scale*2);
+    QPainterPath arc;
+    start = QLineF(pieceRect.topLeft().x(), pieceRect.topLeft().y(),
+                 pieceRect.topLeft().x(), pieceRect.topLeft().y() - (arcRadius+1)/scale);
+    start.setAngle(arcStartAngle);
+
+    arc.moveTo(start.p2());
+    arc.arcTo(arc2Rect, arcStartAngle, arcAngle);
+    arrow.addPath(arc.toReversed());
+
+    return arrow;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPGraphicsPieceControls::SelectedPieces() const -> QList<VPPiecePtr>
+{
+    QList<VPPiecePtr> pieces;
+
+    VPLayoutPtr layout = m_layout.toStrongRef();
+    if (not layout.isNull())
+    {
+        VPSheetPtr sheet = layout->GetFocusedSheet();
+        if (not sheet.isNull())
+        {
+            pieces = sheet->GetSelectedPieces();
+        }
+    }
+
+    return pieces;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPGraphicsPieceControls::PiecesBoundingRect(const QList<VPPiecePtr> &selectedPieces) -> QRectF
+{
+    QRectF rect;
+    for (const auto& item : selectedPieces)
+    {
+        if (not item.isNull())
+        {
+            rect = rect.united(item->MappedDetailBoundingRect());
+        }
+    }
+
+    return rect;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPGraphicsPieceControls::HandleCorner(const QPointF &pos) const -> int
+{
+    if (TopLeftControl().boundingRect().contains(pos))
+    {
+        return static_cast<int>(HandleCorner::BottomRight);
+    }
+
+    if (TopRightControl().boundingRect().contains(pos))
+    {
+        return static_cast<int>(HandleCorner::BottomLeft);
+    }
+
+    if (BottomLeftControl().boundingRect().contains(pos))
+    {
+        return static_cast<int>(HandleCorner::TopRight);
+    }
+
+    if (BottomRightControl().boundingRect().contains(pos))
+    {
+        return static_cast<int>(HandleCorner::TopLeft);
+    }
+
+    return static_cast<int>(HandleCorner::Invalid);
+}
diff --git a/src/app/puzzle/scene/vpgraphicspiececontrols.h b/src/app/puzzle/scene/vpgraphicspiececontrols.h
new file mode 100644
index 000000000..5c6691590
--- /dev/null
+++ b/src/app/puzzle/scene/vpgraphicspiececontrols.h
@@ -0,0 +1,138 @@
+/************************************************************************
+ **
+ **  @file   vpgraphicspiececontrols.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   2 8, 2021
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2021 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#ifndef VPGRAPHICSPIECECONTROLS_H
+#define VPGRAPHICSPIECECONTROLS_H
+
+#include <QColor>
+#include <QGraphicsObject>
+
+#include "scenedef.h"
+#include "../layout/vpsheet.h"
+
+class VPLayout;
+class VPGraphicsPiece;
+
+class VPGraphicsTransformationOrigin : public QGraphicsObject
+{
+    Q_OBJECT
+public:
+    explicit VPGraphicsTransformationOrigin(const VPLayoutPtr &layout, QGraphicsItem * parent = nullptr);
+
+    virtual int type() const override {return Type;}
+    enum { Type = UserType + static_cast<int>(PGraphicsItem::TransformationOrigin)};
+
+public slots:
+    void SetTransformationOrigin();
+    void on_HideHandles(bool hide);
+    void on_ShowOrigin(bool show);
+
+protected:
+    auto boundingRect() const -> QRectF override;
+    auto shape() const -> QPainterPath override;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
+
+    void mousePressEvent(QGraphicsSceneMouseEvent * event) override;
+    void mouseMoveEvent(QGraphicsSceneMouseEvent * event) override;
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
+
+    void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override;
+    void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override;
+
+private:
+    Q_DISABLE_COPY(VPGraphicsTransformationOrigin)
+
+    bool            m_originVisible{true};
+    VPLayoutWeakPtr m_layout{};
+    QColor          m_color;
+    bool            m_allowChangeMerge{false};
+
+    auto RotationCenter(QPainter *painter = nullptr) const -> QPainterPath;
+    auto Center1() const -> QPainterPath;
+    auto Center2() const -> QPainterPath;
+};
+
+class VPGraphicsPieceControls : public QGraphicsObject
+{
+    Q_OBJECT
+public:
+    explicit VPGraphicsPieceControls(const VPLayoutPtr &layout, QGraphicsItem * parent = nullptr);
+
+    virtual int type() const override {return Type;}
+    enum { Type = UserType + static_cast<int>(PGraphicsItem::Handles)};
+
+    void SetIgnorePieceTransformation(bool newIgnorePieceTransformation);
+
+signals:
+    void ShowOrigin(bool show);
+    void TransformationOriginChanged();
+
+public slots:
+    void on_UpdateControls();
+    void on_HideHandles(bool hide);
+
+protected:
+    auto boundingRect() const -> QRectF override;
+    auto shape() const -> QPainterPath override;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
+
+    void mousePressEvent(QGraphicsSceneMouseEvent * event) override;
+    void mouseMoveEvent(QGraphicsSceneMouseEvent * event) override;
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
+
+private:
+    Q_DISABLE_COPY(VPGraphicsPieceControls)
+    QRectF          m_pieceRect{};
+    QPointF         m_rotationStartPoint{};
+    qreal           m_rotationSum{0};
+    bool            m_controlsVisible{true};
+    VPLayoutWeakPtr m_layout{};
+    int             m_handleCorner{0};
+    VPTransformationOrigon m_savedOrigin{};
+    bool            m_originSaved{false};
+    bool            allowChangeMerge{false};
+    QList<VPPiecePtr> m_selectedPieces{};
+    bool            m_ignorePieceTransformation{false};
+
+    auto TopLeftControl(QPainter *painter = nullptr) const -> QPainterPath;
+    auto TopRightControl(QPainter *painter = nullptr) const -> QPainterPath;
+    auto BottomLeftControl(QPainter *painter = nullptr) const -> QPainterPath;
+    auto BottomRightControl(QPainter *painter = nullptr) const -> QPainterPath;
+
+    auto Handles() const -> QPainterPath;
+    auto Controller(const QTransform &t, QPainter *painter = nullptr) const -> QPainterPath;
+    auto ControllersRect() const -> QRectF;
+
+    auto ArrowPath() const -> QPainterPath;
+
+    auto HandleCorner(const QPointF &pos) const -> int;
+
+    auto SelectedPieces() const -> QList<VPPiecePtr>;
+    static auto PiecesBoundingRect(const QList<VPPiecePtr> &selectedPieces) -> QRectF;
+};
+
+#endif // VPGRAPHICSPIECECONTROLS_H
diff --git a/src/app/puzzle/scene/vpgraphicssheet.cpp b/src/app/puzzle/scene/vpgraphicssheet.cpp
new file mode 100644
index 000000000..51519e7f2
--- /dev/null
+++ b/src/app/puzzle/scene/vpgraphicssheet.cpp
@@ -0,0 +1,158 @@
+/*******************************************************************
+ **
+ **  @file   vpgraphicssheet.cpp
+ **  @author Ronan Le Tiec
+ **  @date   3 5, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+#include "vpgraphicssheet.h"
+#include "../layout/vplayout.h"
+#include "../layout/vpsheet.h"
+
+#include <QtMath>
+
+//---------------------------------------------------------------------------------------------------------------------
+VPGraphicsSheet::VPGraphicsSheet(const VPLayoutPtr &layout, QGraphicsItem *parent):
+    QGraphicsItem(parent),
+    m_layout(layout)
+{}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPGraphicsSheet::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(widget);
+    Q_UNUSED(option);
+
+    QPen pen(QColor(0,179,255), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
+    pen.setCosmetic(true);
+    QBrush noBrush(Qt::NoBrush);
+    painter->setPen(pen);
+    painter->setBrush(noBrush);
+
+    QRectF sheetRect = GetSheetRect();
+
+    if(m_showMargin)
+    {
+        painter->drawRect(GetMarginsRect());
+    }
+
+    if(m_showBorder)
+    {
+        pen.setColor(Qt::black);
+
+        painter->setPen(pen);
+        painter->drawRect(sheetRect);
+    }
+
+    VPLayoutPtr layout = m_layout.toStrongRef();
+
+    if(not layout.isNull() && layout->LayoutSettings().GetShowGrid())
+    {
+        pen.setColor(QColor(204,204,204));
+        painter->setPen(pen);
+
+        qreal colWidth = layout->LayoutSettings().GetGridColWidth();
+        if(colWidth > 0)
+        {
+            qreal colX = colWidth;
+            while (colX < sheetRect.right())
+            {
+                QLineF line = QLineF(colX, 0, colX, sheetRect.bottom());
+                painter->drawLine(line);
+                colX += colWidth;
+            }
+        }
+
+        qreal rowHeight = layout->LayoutSettings().GetGridRowHeight();
+        if(rowHeight > 0)
+        {
+            qreal rowY = rowHeight;
+
+            while (rowY < sheetRect.bottom())
+            {
+                QLineF line = QLineF(0, rowY, sheetRect.right(), rowY);
+                painter->drawLine(line);
+                rowY += rowHeight;
+            }
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPGraphicsSheet::GetSheetRect() const -> QRectF
+{
+    VPLayoutPtr layout = m_layout.toStrongRef();
+    if (layout.isNull())
+    {
+        return {};
+    }
+
+    VPSheetPtr sheet = layout->GetFocusedSheet();
+    if (sheet.isNull())
+    {
+        return {};
+    }
+    return sheet->GetSheetRect();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPGraphicsSheet::GetMarginsRect() const -> QRectF
+{
+    VPLayoutPtr layout = m_layout.toStrongRef();
+    if (layout.isNull())
+    {
+        return {};
+    }
+
+    VPSheetPtr sheet = layout->GetFocusedSheet();
+    if (sheet.isNull())
+    {
+        return {};
+    }
+    return sheet->GetMarginsRect();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPGraphicsSheet::SetShowMargin(bool value)
+{
+    m_showMargin = value;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPGraphicsSheet::SetShowBorder(bool value)
+{
+    m_showBorder = value;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPGraphicsSheet::RefreshBoundingRect()
+{
+    prepareGeometryChange();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPGraphicsSheet::boundingRect() const -> QRectF
+{
+    return GetSheetRect();
+}
diff --git a/src/app/puzzle/scene/vpgraphicssheet.h b/src/app/puzzle/scene/vpgraphicssheet.h
new file mode 100644
index 000000000..7510f53ad
--- /dev/null
+++ b/src/app/puzzle/scene/vpgraphicssheet.h
@@ -0,0 +1,74 @@
+/************************************************************************
+ **
+ **  @file   vpgraphicssheet.h
+ **  @author Ronan Le Tiec
+ **  @date   3 5, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+#ifndef VPGRAPHICSSHEET_H
+#define VPGRAPHICSSHEET_H
+
+#include <QGraphicsItem>
+#include <QPainter>
+
+#include "../layout/layoutdef.h"
+
+class VPLayout;
+
+class VPGraphicsSheet : public QGraphicsItem
+{
+public:
+    explicit VPGraphicsSheet(const VPLayoutPtr &layout, QGraphicsItem *parent = nullptr);
+    ~VPGraphicsSheet()=default;
+
+    auto boundingRect() const -> QRectF override;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
+
+    auto GetSheetRect() const -> QRectF;
+    auto GetMarginsRect() const -> QRectF;
+
+    /**
+     * @brief SetShowMargin Sets Wether we see the margin
+     * @param value true to show the margin
+     */
+    void SetShowMargin(bool value);
+
+    /**
+     * @brief SetShowBorder Sets whether we see the border of the sheet
+     * @param value true to show the border
+     */
+    void SetShowBorder(bool value);
+
+    void RefreshBoundingRect();
+
+private:
+    Q_DISABLE_COPY(VPGraphicsSheet)
+
+    VPLayoutWeakPtr m_layout{};
+
+    bool m_showMargin{true};
+    bool m_showBorder{true};
+};
+
+#endif // VPGRAPHICSSHEET_H
diff --git a/src/app/puzzle/scene/vpgraphicstilegrid.cpp b/src/app/puzzle/scene/vpgraphicstilegrid.cpp
new file mode 100644
index 000000000..102951dad
--- /dev/null
+++ b/src/app/puzzle/scene/vpgraphicstilegrid.cpp
@@ -0,0 +1,130 @@
+#include "vpgraphicstilegrid.h"
+
+#include "../vptilefactory.h"
+#include "../layout/vplayout.h"
+#include "../layout/vpsheet.h"
+
+#include <QFileInfo>
+#include <QImageReader>
+#include <QPixmapCache>
+#include <QSvgRenderer>
+
+namespace
+{
+constexpr qreal penWidth = 1;
+}  // namespace
+
+//---------------------------------------------------------------------------------------------------------------------
+VPGraphicsTileGrid::VPGraphicsTileGrid(const VPLayoutPtr &layout, const QUuid &sheetUuid, QGraphicsItem *parent):
+    QGraphicsItem(parent),
+    m_layout(layout),
+    m_sheetUuid(sheetUuid)
+{
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPGraphicsTileGrid::boundingRect() const -> QRectF
+{
+    VPLayoutPtr layout = m_layout.toStrongRef();
+    if(not layout.isNull() && layout->LayoutSettings().GetShowTiles())
+    {
+        VPSheetPtr sheet = layout->GetSheet(m_sheetUuid);
+
+        QMarginsF sheetMargins;
+        if (not sheet.isNull() && not sheet->IgnoreMargins())
+        {
+            sheetMargins = sheet->GetSheetMargins();
+        }
+
+        qreal xScale = layout->LayoutSettings().HorizontalScale();
+        qreal yScale = layout->LayoutSettings().VerticalScale();
+
+        qreal width = layout->TileFactory()->DrawingAreaWidth() - VPTileFactory::tileStripeWidth;
+        qreal height = layout->TileFactory()->DrawingAreaHeight() - VPTileFactory::tileStripeWidth;
+
+        QRectF rect(sheetMargins.left(), sheetMargins.top(),
+                    layout->TileFactory()->ColNb(sheet) * (width / xScale),
+                    layout->TileFactory()->RowNb(sheet) * (height / yScale));
+
+        constexpr qreal halfPenWidth = penWidth/2.;
+
+        return rect.adjusted(-halfPenWidth, -halfPenWidth, halfPenWidth, halfPenWidth);
+    }
+
+    return {};
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPGraphicsTileGrid::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(widget);
+    Q_UNUSED(option);
+
+    VPLayoutPtr layout = m_layout.toStrongRef();
+    if(not layout.isNull() && layout->LayoutSettings().GetShowTiles())
+    {
+        VPSheetPtr sheet = layout->GetSheet(m_sheetUuid);
+
+        QMarginsF sheetMargins;
+        if (not sheet.isNull() && not sheet->IgnoreMargins())
+        {
+            sheetMargins = sheet->GetSheetMargins();
+        }
+
+        QPen pen(QColor(255,0,0,127), penWidth, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
+        pen.setCosmetic(true);
+        pen.setStyle(Qt::DashLine);
+        QBrush noBrush(Qt::NoBrush);
+        painter->setPen(pen);
+        painter->setBrush(noBrush);
+
+        qreal xScale = layout->LayoutSettings().HorizontalScale();
+        qreal yScale = layout->LayoutSettings().VerticalScale();
+
+        const qreal width = (layout->TileFactory()->DrawingAreaWidth() - VPTileFactory::tileStripeWidth) / xScale;
+        const qreal height = (layout->TileFactory()->DrawingAreaHeight() - VPTileFactory::tileStripeWidth) / yScale;
+
+        const int nbCol = layout->TileFactory()->ColNb(sheet);
+        const int nbRow = layout->TileFactory()->RowNb(sheet);
+
+        VWatermarkData watermarkData = layout->TileFactory()->WatermarkData();
+
+        for(int j=0;j<=nbRow;++j)
+        {
+            // horizontal lines
+            painter->drawLine(QPointF(sheetMargins.left(), sheetMargins.top()+j*height),
+                              QPointF(sheetMargins.left()+nbCol*width, sheetMargins.top()+j*height));
+
+            for(int i=0;i<=nbCol;++i)
+            {
+                // vertical lines
+                painter->drawLine(QPointF(sheetMargins.left()+i*width, sheetMargins.top()),
+                                  QPointF(sheetMargins.left()+i*width, sheetMargins.top() + nbRow*height));
+
+                if (j < nbRow && i < nbCol)
+                {
+                    QRectF img(sheetMargins.left()+i*width, sheetMargins.top()+j*height,
+                               width, height);
+
+                    if (not layout->LayoutSettings().WatermarkPath().isEmpty() &&
+                            layout->LayoutSettings().GetShowWatermark())
+                    {
+                        if (watermarkData.opacity > 0)
+                        {
+                            if (watermarkData.showImage && not watermarkData.path.isEmpty())
+                            {
+                                VPTileFactory::PaintWatermarkImage(painter, img, watermarkData,
+                                                                   layout->LayoutSettings().WatermarkPath());
+                            }
+
+                            if (watermarkData.showText && not watermarkData.text.isEmpty())
+                            {
+                                VPTileFactory::PaintWatermarkText(painter, img, watermarkData);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/app/puzzle/scene/vpgraphicstilegrid.h b/src/app/puzzle/scene/vpgraphicstilegrid.h
new file mode 100644
index 000000000..b53980fb3
--- /dev/null
+++ b/src/app/puzzle/scene/vpgraphicstilegrid.h
@@ -0,0 +1,59 @@
+/************************************************************************
+ **
+ **  @file   vpgraphicstilegrid.h
+ **  @author Ronan Le Tiec
+ **  @date   19 11, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+#ifndef VPGRAPHICSTILEGRID_H
+#define VPGRAPHICSTILEGRID_H
+
+#include <QGraphicsItem>
+#include <QPainter>
+#include <QUuid>
+
+#include "../vmisc/def.h"
+#include "../layout/layoutdef.h"
+
+class VPTileFactory;
+class VPLayout;
+struct VWatermarkData;
+
+class VPGraphicsTileGrid : public QGraphicsItem
+{
+public:
+    explicit VPGraphicsTileGrid(const VPLayoutPtr &layout, const QUuid &sheetUuid, QGraphicsItem *parent = nullptr);
+    ~VPGraphicsTileGrid()=default;
+
+    QRectF boundingRect() const override;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
+
+private:
+    Q_DISABLE_COPY(VPGraphicsTileGrid)
+
+    VPLayoutWeakPtr m_layout;
+    QUuid m_sheetUuid;
+};
+
+#endif // VPGRAPHICSTILEGRID_H
diff --git a/src/app/puzzle/scene/vpmaingraphicsview.cpp b/src/app/puzzle/scene/vpmaingraphicsview.cpp
new file mode 100644
index 000000000..72b3bc4ab
--- /dev/null
+++ b/src/app/puzzle/scene/vpmaingraphicsview.cpp
@@ -0,0 +1,735 @@
+/************************************************************************
+ **
+ **  @file   vpmaingraphicsview.cpp
+ **  @author Ronan Le Tiec
+ **  @date   3 5, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+#include "vpmaingraphicsview.h"
+
+#include <QDragEnterEvent>
+#include <QMimeData>
+#include <QKeyEvent>
+#include <QMenu>
+#include <QUndoStack>
+
+#include "../vptilefactory.h"
+#include "../carousel/vpmimedatapiece.h"
+#include "../layout/vplayout.h"
+#include "../layout/vpsheet.h"
+#include "../layout/vppiece.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "vptilefactory.h"
+#include "vpgraphicspiece.h"
+#include "vpgraphicspiececontrols.h"
+
+#include "../undocommands/vpundopiecemove.h"
+#include "../undocommands/vpundopiecerotate.h"
+#include "../undocommands/vpundooriginmove.h"
+#include "../undocommands/vpundomovepieceonsheet.h"
+#include "../undocommands/vpundoremovesheet.h"
+
+#include <QLoggingCategory>
+
+Q_LOGGING_CATEGORY(pMainGraphicsView, "p.mainGraphicsView")
+
+namespace
+{
+const QKeySequence restoreOriginShortcut = QKeySequence(Qt::ControlModifier + Qt::Key_Asterisk);
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------
+VPMainGraphicsView::VPMainGraphicsView(const VPLayoutPtr &layout, QWidget *parent) :
+    VMainGraphicsView(parent),
+    m_layout(layout)
+{
+    SCASSERT(not layout.isNull())
+
+    SwitchScene(layout->GetFocusedSheet());
+
+    setAcceptDrops(true);
+
+    // add the connections
+    connect(layout.get(), &VPLayout::PieceSheetChanged, this, &VPMainGraphicsView::on_PieceSheetChanged);
+    connect(layout.get(), &VPLayout::ActiveSheetChanged, this, &VPMainGraphicsView::on_ActiveSheetChanged);
+
+    auto *restoreOrigin = new QAction(this);
+    restoreOrigin->setShortcut(restoreOriginShortcut);
+    connect(restoreOrigin, &QAction::triggered, this, &VPMainGraphicsView::RestoreOrigin);
+    this->addAction(restoreOrigin);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainGraphicsView::RefreshLayout()
+{
+    VPLayoutPtr layout = m_layout.toStrongRef();
+    if (not layout.isNull())
+    {
+        VPSheetPtr sheet = layout->GetFocusedSheet();
+        if (not sheet.isNull())
+        {
+            sheet->SceneData()->RefreshLayout();
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainGraphicsView::RefreshPieces()
+{
+    VPLayoutPtr layout = m_layout.toStrongRef();
+    if (not layout.isNull())
+    {
+        VPSheetPtr sheet = layout->GetFocusedSheet();
+        if (not sheet.isNull())
+        {
+            sheet->SceneData()->RefreshPieces();
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainGraphicsView::dragEnterEvent(QDragEnterEvent *event)
+{
+    const QMimeData *mime = event->mimeData();
+
+    if(mime->hasFormat(VPMimeDataPiece::mineFormatPiecePtr))
+    {
+        qCDebug(pMainGraphicsView(), "drag enter");
+        event->acceptProposedAction();
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainGraphicsView::dragMoveEvent(QDragMoveEvent *event)
+{
+    const QMimeData *mime = event->mimeData();
+
+    if(mime->hasFormat(VPMimeDataPiece::mineFormatPiecePtr))
+    {
+        event->acceptProposedAction();
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainGraphicsView::dragLeaveEvent(QDragLeaveEvent *event)
+{
+    event->accept();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainGraphicsView::dropEvent(QDropEvent *event)
+{
+    const QMimeData *mime = event->mimeData();
+
+    qCDebug(pMainGraphicsView(), "drop enter , %s", qUtf8Printable(mime->objectName()));
+
+    if(mime->hasFormat(VPMimeDataPiece::mineFormatPiecePtr))
+    {
+        const auto *mimePiece = qobject_cast<const VPMimeDataPiece *> (mime);
+
+        VPPiecePtr piece = mimePiece->GetPiecePtr();
+        if(not piece.isNull())
+        {
+            VPLayoutPtr layout = m_layout.toStrongRef();
+            if (layout.isNull())
+            {
+                return;
+            }
+
+            qCDebug(pMainGraphicsView(), "element dropped, %s", qUtf8Printable(piece->GetName()));
+            event->acceptProposedAction();
+
+            piece->ClearTransformations();
+            piece->SetPosition(mapToScene(event->pos()));
+
+            auto *command = new VPUndoMovePieceOnSheet(layout->GetFocusedSheet(), piece);
+            layout->UndoStack()->push(command);
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainGraphicsView::keyPressEvent(QKeyEvent *event)
+{
+    if(event->key() == Qt::Key_Backspace || event->key() == Qt::Key_Delete)
+    {
+        VPLayoutPtr layout = m_layout.toStrongRef();
+        if (layout.isNull())
+        {
+            return;
+        }
+
+        VPSheetPtr sheet = layout->GetFocusedSheet();
+        if (sheet.isNull())
+        {
+            return ;
+        }
+
+        const QList<VPGraphicsPiece *> &graphicsPieces = sheet->SceneData()->GraphicsPieces();
+        for(auto *graphicsPiece : graphicsPieces)
+        {
+            VPPiecePtr piece = graphicsPiece->GetPiece();
+
+            if(not piece.isNull() && piece->IsSelected())
+            {
+                piece->SetSelected(false);
+
+                VPLayoutPtr layout = m_layout.toStrongRef();
+                if (not layout.isNull())
+                {
+                    emit layout->PieceSelectionChanged(piece);
+
+                    auto *command = new VPUndoMovePieceOnSheet(VPSheetPtr(), piece);
+                    layout->UndoStack()->push(command);
+                }
+            }
+        }
+    }
+    else if (event->key() == Qt::Key_Left)
+    {
+        if((event->modifiers() & Qt::ShiftModifier) != 0U)
+        {
+            TranslatePiecesOn(-10, 0);
+        }
+        else
+        {
+            TranslatePiecesOn(-1, 0);
+        }
+    }
+    else if (event->key() == Qt::Key_Right)
+    {
+        if((event->modifiers() & Qt::ShiftModifier) != 0U)
+        {
+            TranslatePiecesOn(10, 0);
+        }
+        else
+        {
+            TranslatePiecesOn(1, 0);
+        }
+    }
+    else if (event->key() == Qt::Key_Up)
+    {
+        if((event->modifiers() & Qt::ShiftModifier) != 0U)
+        {
+            TranslatePiecesOn(0, -10);
+        }
+        else
+        {
+            TranslatePiecesOn(0, -1);
+        }
+    }
+    else if (event->key() == Qt::Key_Down)
+    {
+        if((event->modifiers() & Qt::ShiftModifier) != 0U)
+        {
+            TranslatePiecesOn(0, 10);
+        }
+        else
+        {
+            TranslatePiecesOn(0, 1);
+        }
+    }
+    else if (event->key() == Qt::Key_BracketLeft)
+    {
+        if((event->modifiers() & Qt::ControlModifier) != 0U)
+        {
+            RotatePiecesByAngle(90);
+        }
+        else if((event->modifiers() & Qt::AltModifier) != 0U)
+        {
+            RotatePiecesByAngle(1);
+        }
+        else
+        {
+            RotatePiecesByAngle(15);
+        }
+    }
+    else if (event->key() == Qt::Key_BracketRight)
+    {
+        if((event->modifiers() & Qt::ControlModifier) != 0U)
+        {
+            RotatePiecesByAngle(-90);
+        }
+        else if((event->modifiers() & Qt::AltModifier) != 0U)
+        {
+            RotatePiecesByAngle(-1);
+        }
+        else
+        {
+            RotatePiecesByAngle(-15);
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainGraphicsView::keyReleaseEvent(QKeyEvent *event)
+{
+    if (event->key() == Qt::Key_Left ||
+            event->key() == Qt::Key_Right ||
+            event->key() == Qt::Key_Up ||
+            event->key() == Qt::Key_Down ||
+            event->key() == Qt::Key_BracketLeft ||
+            event->key() == Qt::Key_BracketRight)
+    {
+        if (not event->isAutoRepeat())
+        {
+            VPLayoutPtr layout = m_layout.toStrongRef();
+            if (layout.isNull())
+            {
+                return;
+            }
+
+            VPSheetPtr sheet = layout->GetFocusedSheet();
+            if (sheet.isNull())
+            {
+                return;
+            }
+
+            const QList<VPGraphicsPiece *> &graphicsPieces = sheet->SceneData()->GraphicsPieces();
+            if (m_hasStickyPosition && not graphicsPieces.isEmpty())
+            {
+                if (layout->LayoutSettings().GetStickyEdges())
+                {
+                    auto PreparePieces = [layout]()
+                    {
+                        QList<VPPiecePtr> pieces;
+                        VPSheetPtr sheet = layout->GetFocusedSheet();
+                        if (not sheet.isNull())
+                        {
+                            pieces = sheet->GetSelectedPieces();
+                        }
+
+                        return pieces;
+                    };
+
+                    QList<VPPiecePtr> pieces = PreparePieces();
+                    if (pieces.size() == 1)
+                    {
+                        VPPiecePtr p = pieces.first();
+
+                        auto *command = new VPUndoPieceMove(p, m_stickyTranslateX, m_stickyTranslateY,
+                                                            m_allowChangeMerge);
+                        layout->UndoStack()->push(command);
+
+                        VPGraphicsPiece * gPiece = sheet->SceneData()->ScenePiece(p);
+                        if (gPiece != nullptr)
+                        {
+                            gPiece->SetStickyPoints(QVector<QPointF>());
+                        }
+                    }
+                }
+            }
+
+            m_allowChangeMerge = false;
+            m_hasStickyPosition = false;
+        }
+    }
+
+    if (event->key() == Qt::Key_BracketLeft || event->key() == Qt::Key_BracketRight)
+    {
+        if (not event->isAutoRepeat())
+        {
+            VPLayoutPtr layout = m_layout.toStrongRef();
+            if (layout.isNull())
+            {
+                return;
+            }
+
+            VPSheetPtr sheet = layout->GetFocusedSheet();
+            if (sheet.isNull())
+            {
+                sheet->SceneData()->RotationControls()->SetIgnorePieceTransformation(false);
+                sheet->SceneData()->RotationControls()->on_UpdateControls();
+                sheet->SceneData()->RotationControls()->on_HideHandles(false);
+            }
+
+            m_rotationSum = 0;
+        }
+    }
+    VMainGraphicsView::keyReleaseEvent(event);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainGraphicsView::contextMenuEvent(QContextMenuEvent *event)
+{
+    QGraphicsItem *item = itemAt(event->pos());
+    if (item != nullptr && item->type() == VPGraphicsPiece::Type)
+    {
+        VMainGraphicsView::contextMenuEvent(event);
+        return;
+    }
+
+    VPLayoutPtr layout = m_layout.toStrongRef();
+    if (layout.isNull())
+    {
+        return;
+    }
+
+    VPSheetPtr sheet = layout->GetFocusedSheet();
+
+    QMenu menu;
+
+    QAction *restoreOriginAction = menu.addAction(tr("Restore transformation origin"));
+    restoreOriginAction->setShortcut(restoreOriginShortcut);
+    restoreOriginAction->setEnabled(not sheet.isNull() && sheet->TransformationOrigin().custom);
+
+    QAction *removeSheetAction = menu.addAction(QIcon::fromTheme(QStringLiteral("edit-delete")), tr("Remove sheet"));
+    removeSheetAction->setEnabled(not sheet.isNull() && layout->GetSheets().size() > 1);
+
+    QAction *selectedAction = menu.exec(event->globalPos());
+    if (selectedAction == removeSheetAction)
+    {
+        layout->UndoStack()->push(new VPUndoRemoveSheet(sheet));
+    }
+    else if (selectedAction == restoreOriginAction)
+    {
+        RestoreOrigin();
+    }
+
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainGraphicsView::RestoreOrigin() const
+{
+    VPLayoutPtr layout = m_layout.toStrongRef();
+    if (layout.isNull())
+    {
+        return;
+    }
+
+    VPSheetPtr sheet = layout->GetFocusedSheet();
+    if (not sheet.isNull())
+    {
+        VPTransformationOrigon origin = sheet->TransformationOrigin();
+        if (origin.custom)
+        { // ignore if not custom. Prevent double call
+            origin.custom = false;
+
+            QRectF boundingRect;
+            QList<VPPiecePtr> selectedPieces = sheet->GetSelectedPieces();
+            for (const auto& piece : selectedPieces)
+            {
+                if (piece->IsSelected())
+                {
+                    boundingRect = boundingRect.united(piece->MappedDetailBoundingRect());
+                }
+            }
+            origin.origin = boundingRect.center();
+
+            auto *command = new VPUndoOriginMove(sheet, origin);
+            layout->UndoStack()->push(command);
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainGraphicsView::on_ItemClicked(QGraphicsItem *item)
+{
+    if (item == nullptr || (item->type() != VPGraphicsPiece::Type &&
+                            item->type() != VPGraphicsPieceControls::Type &&
+                            item->type() != VPGraphicsTransformationOrigin::Type))
+    {
+        VPLayoutPtr layout = m_layout.toStrongRef();
+        if (not layout.isNull())
+        {
+            VPSheetPtr sheet = layout->GetFocusedSheet();
+            if (not sheet.isNull())
+            {
+                sheet->ClearSelection();
+            }
+        }
+    }
+    else
+    {
+        if (item->type() == VPGraphicsPiece::Type)
+        {
+            auto *pieceItem = dynamic_cast<VPGraphicsPiece*>(item);
+            if (pieceItem != nullptr)
+            {
+                VPPiecePtr piece = pieceItem->GetPiece();
+                if (not piece.isNull())
+                {
+                    if (not piece->IsSelected())
+                    {
+                        piece->SetSelected(true);
+                        VPLayoutPtr layout = m_layout.toStrongRef();
+                        if (not layout.isNull())
+                        {
+                            emit layout->PieceSelectionChanged(piece);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainGraphicsView::on_SceneMouseMove(const QPointF &scenePos)
+{
+    emit mouseMove(scenePos);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainGraphicsView::RotatePiecesByAngle(qreal angle)
+{
+    VPLayoutPtr layout = m_layout.toStrongRef();
+    if (layout.isNull())
+    {
+        return;
+    }
+
+    VPSheetPtr sheet = layout->GetFocusedSheet();
+    if (sheet.isNull())
+    {
+        return;
+    }
+
+    sheet->SceneData()->RotationControls()->on_HideHandles(true);
+    sheet->SceneData()->RotationControls()->SetIgnorePieceTransformation(true);
+
+    VPTransformationOrigon origin = sheet->TransformationOrigin();
+
+    auto PreparePieces = [this]()
+    {
+        QList<VPPiecePtr> pieces;
+        VPLayoutPtr layout = m_layout.toStrongRef();
+        if (not layout.isNull())
+        {
+            VPSheetPtr sheet = layout->GetFocusedSheet();
+            if (not sheet.isNull())
+            {
+                pieces = sheet->GetSelectedPieces();
+            }
+        }
+
+        return pieces;
+    };
+
+    if (layout->LayoutSettings().GetFollowGrainline() && not origin.custom)
+    {
+        if (m_rotationSum > 90 || m_rotationSum < -90)
+        {
+            m_rotationSum = angle;
+        }
+        else
+        {
+            m_rotationSum += angle;
+        }
+    }
+    else
+    {
+        m_rotationSum = angle;
+    }
+
+    QList<VPPiecePtr> pieces = PreparePieces();
+
+    if (pieces.size() == 1)
+    {
+        auto *command = new VPUndoPieceRotate(pieces.first(), origin, angle, m_rotationSum, m_allowChangeMerge);
+        layout->UndoStack()->push(command);
+    }
+    else if (pieces.size() > 1)
+    {
+        auto *command = new VPUndoPiecesRotate(pieces, origin, angle, m_rotationSum, m_allowChangeMerge);
+        layout->UndoStack()->push(command);
+    }
+
+    m_allowChangeMerge = true;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainGraphicsView::TranslatePiecesOn(qreal dx, qreal dy)
+{
+    VPLayoutPtr layout = m_layout.toStrongRef();
+    if (layout.isNull())
+    {
+        return;
+    }
+
+    VPSheetPtr sheet = layout->GetFocusedSheet();
+    if (sheet.isNull())
+    {
+        return;
+    }
+
+    const QList<VPGraphicsPiece *> &graphicsPieces = sheet->SceneData()->GraphicsPieces();
+
+    if (graphicsPieces.isEmpty())
+    {
+        return;
+    }
+
+    VPPiecePtr piece = graphicsPieces.first()->GetPiece();
+    if (piece.isNull())
+    {
+        return;
+    }
+
+    auto PreparePieces = [this]()
+    {
+        QList<VPPiecePtr> pieces;
+        VPLayoutPtr layout = m_layout.toStrongRef();
+        if (not layout.isNull())
+        {
+            VPSheetPtr sheet = layout->GetFocusedSheet();
+            if (not sheet.isNull())
+            {
+                pieces = sheet->GetSelectedPieces();
+            }
+        }
+
+        return pieces;
+    };
+
+    QList<VPPiecePtr> pieces = PreparePieces();
+    if (pieces.size() == 1)
+    {
+        VPPiecePtr p = pieces.first();
+        auto *command = new VPUndoPieceMove(p, dx, dy, m_allowChangeMerge);
+        layout->UndoStack()->push(command);
+
+        if (layout->LayoutSettings().GetStickyEdges())
+        {
+            QVector<QPointF> path;
+            if (not p.isNull() && p->StickyPosition(m_stickyTranslateX, m_stickyTranslateY))
+            {
+                path = p->GetMappedExternalContourPoints();
+                QTransform m;
+                m.translate(m_stickyTranslateX, m_stickyTranslateY);
+                path = m.map(path);
+                m_hasStickyPosition = true;
+            }
+            else
+            {
+                m_hasStickyPosition = false;
+            }
+
+            VPGraphicsPiece *gPiece = sheet->SceneData()->ScenePiece(p);
+            if (gPiece != nullptr)
+            {
+                gPiece->SetStickyPoints(path);
+            }
+        }
+    }
+    else if (pieces.size() > 1)
+    {
+        auto *command = new VPUndoPiecesMove(pieces, dx, dy, m_allowChangeMerge);
+        layout->UndoStack()->push(command);
+    }
+
+    m_allowChangeMerge = true;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainGraphicsView::SwitchScene(const VPSheetPtr &sheet)
+{
+    if (not sheet.isNull())
+    {
+       VMainGraphicsScene *scene = sheet->SceneData()->Scene();
+       setScene(scene);
+       connect(scene, &VMainGraphicsScene::ItemClicked, this, &VPMainGraphicsView::on_ItemClicked,
+               Qt::UniqueConnection);
+       connect(scene, &VMainGraphicsScene::mouseMove, this, &VPMainGraphicsView::on_SceneMouseMove,
+               Qt::UniqueConnection);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainGraphicsView::ClearSelection()
+{
+    VPLayoutPtr layout = m_layout.toStrongRef();
+    if (layout.isNull())
+    {
+        return;
+    }
+
+    VPSheetPtr sheet = layout->GetFocusedSheet();
+    if (sheet.isNull())
+    {
+        return;
+    }
+
+    QList<VPPiecePtr> pieces = sheet->GetSelectedPieces();
+    for (const auto& piece : pieces)
+    {
+        piece->SetSelected(false);
+        emit layout->PieceSelectionChanged(piece);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainGraphicsView::on_PieceSheetChanged(const VPPiecePtr &piece)
+{
+    VPLayoutPtr layout = m_layout.toStrongRef();
+    if (layout.isNull())
+    {
+        return;
+    }
+
+    VPSheetPtr sheet = layout->GetFocusedSheet();
+    if (sheet.isNull())
+    {
+        return;
+    }
+
+    VPGraphicsPiece *graphicsPiece = sheet->SceneData()->ScenePiece(piece);
+
+    if (piece != nullptr && (piece->Sheet().isNull() || piece->Sheet() == layout->GetTrashSheet() ||
+            piece->Sheet() != layout->GetFocusedSheet())) // remove
+    {
+        if (graphicsPiece != nullptr)
+        {
+            sheet->SceneData()->Scene()->removeItem(graphicsPiece);
+            sheet->SceneData()->RemovePiece(graphicsPiece);
+            delete graphicsPiece;
+        }
+    }
+    else // add
+    {
+        if(graphicsPiece == nullptr)
+        {
+            graphicsPiece = new VPGraphicsPiece(piece);
+            sheet->SceneData()->AddPiece(graphicsPiece);
+        }
+        sheet->SceneData()->Scene()->addItem(graphicsPiece);
+    }
+
+    sheet->SceneData()->RotationControls()->on_UpdateControls();
+
+    VMainGraphicsView::NewSceneRect(scene(), this);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainGraphicsView::on_ActiveSheetChanged(const VPSheetPtr &focusedSheet)
+{
+    if (not focusedSheet.isNull())
+    {
+        ClearSelection();
+        SwitchScene(focusedSheet);
+        RefreshLayout();
+        RefreshPieces();
+    }
+}
diff --git a/src/app/puzzle/scene/vpmaingraphicsview.h b/src/app/puzzle/scene/vpmaingraphicsview.h
new file mode 100644
index 000000000..792cd5b39
--- /dev/null
+++ b/src/app/puzzle/scene/vpmaingraphicsview.h
@@ -0,0 +1,114 @@
+/************************************************************************
+ **
+ **  @file   vpmaingraphicsview.h
+ **  @author Ronan Le Tiec
+ **  @date   3 5, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+#ifndef VPMAINGRAPHICSVIEW_H
+#define VPMAINGRAPHICSVIEW_H
+
+#include "../vwidgets/vmaingraphicsview.h"
+#include "../layout/layoutdef.h"
+
+class VMainGraphicsScene;
+class VPGraphicsPieceControls;
+class VPGraphicsTransformationOrigin;
+class VPTileFactory;
+class VPGraphicsPiece;
+class VPLayout;
+class VPGraphicsTileGrid;
+class VPGraphicsSheet;
+class VPPiece;
+
+class VPMainGraphicsView : public VMainGraphicsView
+{
+    Q_OBJECT
+public:
+    VPMainGraphicsView(const VPLayoutPtr &layout, QWidget *parent);
+    ~VPMainGraphicsView() = default;
+
+    /**
+     * @brief RefreshLayout Refreshes the rectangles for the layout border and the margin
+     */
+    void RefreshLayout();
+
+public slots:
+    /**
+     * @brief on_PieceSheetChanged The slot is called when the given piece was moved from the given piece list to
+     * the other given piece list
+     * @param piece the piece that was moved
+     */
+    void on_PieceSheetChanged(const VPPiecePtr &piece);
+
+    void on_ActiveSheetChanged(const VPSheetPtr &focusedSheet);
+
+    void RefreshPieces();
+
+signals:
+    /**
+     * @brief mouseMove send new mouse position.
+     * @param scenePos new mouse position.
+     */
+    void mouseMove(const QPointF &scenePos);
+
+protected:
+    void dragEnterEvent(QDragEnterEvent *event) override;
+    void dragMoveEvent(QDragMoveEvent *event) override;
+    void dragLeaveEvent(QDragLeaveEvent *event) override;
+    void dropEvent(QDropEvent *event) override;
+
+    void keyPressEvent(QKeyEvent *event) override;
+    void keyReleaseEvent(QKeyEvent *event) override;
+
+    void contextMenuEvent(QContextMenuEvent *event) override;
+
+    void drawTilesLine();
+
+private slots:
+    void RestoreOrigin() const;
+    void on_ItemClicked(QGraphicsItem* item);
+    void on_SceneMouseMove(const QPointF &scenePos);
+
+private:
+    Q_DISABLE_COPY(VPMainGraphicsView)
+
+    VPLayoutWeakPtr m_layout;
+
+    bool m_allowChangeMerge{false};
+
+    qreal m_rotationSum{0};
+
+    bool m_hasStickyPosition{false};
+    qreal m_stickyTranslateX{0};
+    qreal m_stickyTranslateY{0};
+
+    void RotatePiecesByAngle(qreal angle);
+    void TranslatePiecesOn(qreal dx, qreal dy);
+
+    void SwitchScene(const VPSheetPtr &sheet);
+    void ClearSelection();
+};
+
+#endif // VPMAINGRAPHICSVIEW_H
diff --git a/src/app/puzzle/share/resources/cursor.qrc b/src/app/puzzle/share/resources/cursor.qrc
new file mode 100644
index 000000000..740bdbf6a
--- /dev/null
+++ b/src/app/puzzle/share/resources/cursor.qrc
@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/">
+        <file>cursor/collect.png</file>
+        <file>cursor/collect@2x.png</file>
+    </qresource>
+</RCC>
diff --git a/src/app/puzzle/share/resources/cursor/collect.png b/src/app/puzzle/share/resources/cursor/collect.png
new file mode 100644
index 000000000..674392d9b
Binary files /dev/null and b/src/app/puzzle/share/resources/cursor/collect.png differ
diff --git a/src/app/puzzle/share/resources/cursor/collect@2x.png b/src/app/puzzle/share/resources/cursor/collect@2x.png
new file mode 100644
index 000000000..57967c82c
Binary files /dev/null and b/src/app/puzzle/share/resources/cursor/collect@2x.png differ
diff --git a/src/app/puzzle/share/resources/puzzle.rc b/src/app/puzzle/share/resources/puzzle.rc
new file mode 100644
index 000000000..809de88e6
--- /dev/null
+++ b/src/app/puzzle/share/resources/puzzle.rc
@@ -0,0 +1,80 @@
+IDI_ICON1               ICON    DISCARDABLE     "puzzleicon/64x64/logo.ico"
+
+#include <windows.h>
+#include "../../version.h"
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION     VER_FILEVERSION
+PRODUCTVERSION  VER_PRODUCTVERSION
+
+// normally found in <winver.h> included by <windows.h>
+// FILEFLAGS
+#define VS_FF_NORMAL            0x00000000L  // ok I made this one up
+#ifndef VS_FF_DEBUG
+#define VS_FF_DEBUG             0x00000001L
+#endif
+#ifndef VS_FF_PRERELEASE
+#define VS_FF_PRERELEASE        0x00000002L
+#endif
+// FILEOS
+#ifndef VOS_NT
+#define VOS_NT                  0x00040000L
+#endif
+#ifndef VOS__WINDOWS32
+#define VOS__WINDOWS32          0x00000004L
+#endif
+#ifndef VOS_NT_WINDOWS32
+#define VOS_NT_WINDOWS32        0x00040004L
+#endif
+// FILETYPE
+#ifndef VFT_APP
+#define VFT_APP                 0x00000001L
+#endif
+#ifndef VFT_DLL
+#define VFT_DLL                 0x00000002L
+#endif
+
+#ifdef V_PRERELEASE
+
+#ifdef V_NO_DEBUG
+    FILEFLAGS (VS_FF_PRERELEASE)
+#else
+    FILEFLAGS (VS_FF_DEBUG|VS_FF_PRERELEASE)
+#endif
+	
+#else
+
+#ifdef V_NO_DEBUG
+    FILEFLAGS (VS_FF_NORMAL)
+#else
+    FILEFLAGS (VS_FF_DEBUG|VS_FF_NORMAL)
+#endif
+
+#endif
+
+FILEOS         	VOS_NT_WINDOWS32
+FILETYPE       	VFT_APP
+FILESUBTYPE    	VFT2_UNKNOWN
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "CompanyName",        VER_COMPANYNAME_STR
+            VALUE "FileDescription",    VER_FILEDESCRIPTION_STR
+            VALUE "FileVersion",        VER_FILEVERSION_STR
+            VALUE "InternalName",       VER_INTERNALNAME_STR
+            VALUE "LegalCopyright",     VER_LEGALCOPYRIGHT_STR
+            VALUE "LegalTrademarks1",   VER_LEGALTRADEMARKS1_STR
+            VALUE "LegalTrademarks2",   VER_LEGALTRADEMARKS2_STR
+            VALUE "OriginalFilename",   VER_ORIGINALFILENAME_STR
+            VALUE "ProductName",        VER_PRODUCTNAME_STR
+            VALUE "ProductVersion",     VER_PRODUCTVERSION_STR
+        END
+    END
+
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x0409, 0x04E4 //U.S. English
+    END
+END
diff --git a/src/app/puzzle/share/resources/puzzleicon.qrc b/src/app/puzzle/share/resources/puzzleicon.qrc
new file mode 100644
index 000000000..712fccda6
--- /dev/null
+++ b/src/app/puzzle/share/resources/puzzleicon.qrc
@@ -0,0 +1,25 @@
+<RCC>
+    <qresource prefix="/">
+        <file>puzzleicon/64x64/logo.png</file>
+        <file>puzzleicon/64x64/iconLayout.png</file>
+        <file>puzzleicon/64x64/iconCurrentPiece.png</file>
+        <file>puzzleicon/64x64/iconLayers.png</file>
+        <file>puzzleicon/64x64/iconTiles.png</file>
+        <file>puzzleicon/64x64/iconProperties.png</file>
+        <file>puzzleicon/svg/icon_scissors.svg</file>
+        <file>puzzleicon/svg/icon_scissors_vertical.svg</file>
+        <file>puzzleicon/svg/icon_scissors_horizontal.svg</file>
+        <file>puzzleicon/16x16/roll.png</file>
+        <file>puzzleicon/16x16/template.png</file>
+        <file>puzzleicon/svg/cursor_rotate.svg</file>
+        <file>puzzleicon/svg/icon_rotate_90_anticlockwise.svg</file>
+        <file>puzzleicon/svg/icon_rotate_90_clockwise.svg</file>
+        <file>puzzleicon/svg/icon_rotate_grainline_horizontal.svg</file>
+        <file>puzzleicon/svg/icon_rotate_grainline_vertical.svg</file>
+        <file>puzzleicon/32X32/horizontal_grainline.png</file>
+        <file>puzzleicon/32X32/horizontal_grainline@2x.png</file>
+        <file>puzzleicon/32X32/vertical_grainline.png</file>
+        <file>puzzleicon/32X32/vertical_grainline@2x.png</file>
+        <file>puzzleicon/svg/no_watermark_image.svg</file>
+    </qresource>
+</RCC>
diff --git a/src/app/puzzle/share/resources/puzzleicon/16x16/roll.png b/src/app/puzzle/share/resources/puzzleicon/16x16/roll.png
new file mode 100644
index 000000000..49c30dff1
Binary files /dev/null and b/src/app/puzzle/share/resources/puzzleicon/16x16/roll.png differ
diff --git a/src/app/puzzle/share/resources/puzzleicon/16x16/template.png b/src/app/puzzle/share/resources/puzzleicon/16x16/template.png
new file mode 100644
index 000000000..c29755d29
Binary files /dev/null and b/src/app/puzzle/share/resources/puzzleicon/16x16/template.png differ
diff --git a/src/app/puzzle/share/resources/puzzleicon/32X32/horizontal_grainline.png b/src/app/puzzle/share/resources/puzzleicon/32X32/horizontal_grainline.png
new file mode 100644
index 000000000..09e0e5ddc
Binary files /dev/null and b/src/app/puzzle/share/resources/puzzleicon/32X32/horizontal_grainline.png differ
diff --git a/src/app/puzzle/share/resources/puzzleicon/32X32/horizontal_grainline@2x.png b/src/app/puzzle/share/resources/puzzleicon/32X32/horizontal_grainline@2x.png
new file mode 100644
index 000000000..4957393e3
Binary files /dev/null and b/src/app/puzzle/share/resources/puzzleicon/32X32/horizontal_grainline@2x.png differ
diff --git a/src/app/puzzle/share/resources/puzzleicon/32X32/vertical_grainline.png b/src/app/puzzle/share/resources/puzzleicon/32X32/vertical_grainline.png
new file mode 100644
index 000000000..f332842f6
Binary files /dev/null and b/src/app/puzzle/share/resources/puzzleicon/32X32/vertical_grainline.png differ
diff --git a/src/app/puzzle/share/resources/puzzleicon/32X32/vertical_grainline@2x.png b/src/app/puzzle/share/resources/puzzleicon/32X32/vertical_grainline@2x.png
new file mode 100644
index 000000000..ccfd215a4
Binary files /dev/null and b/src/app/puzzle/share/resources/puzzleicon/32X32/vertical_grainline@2x.png differ
diff --git a/src/app/puzzle/share/resources/puzzleicon/64x64/cursorRotate.png b/src/app/puzzle/share/resources/puzzleicon/64x64/cursorRotate.png
new file mode 100644
index 000000000..831f77ed0
Binary files /dev/null and b/src/app/puzzle/share/resources/puzzleicon/64x64/cursorRotate.png differ
diff --git a/src/app/puzzle/share/resources/puzzleicon/64x64/cursorRotate@2x.png b/src/app/puzzle/share/resources/puzzleicon/64x64/cursorRotate@2x.png
new file mode 100644
index 000000000..4cb07973b
Binary files /dev/null and b/src/app/puzzle/share/resources/puzzleicon/64x64/cursorRotate@2x.png differ
diff --git a/src/app/puzzle/share/resources/puzzleicon/64x64/iconCurrentPiece.png b/src/app/puzzle/share/resources/puzzleicon/64x64/iconCurrentPiece.png
new file mode 100644
index 000000000..0e12bb443
Binary files /dev/null and b/src/app/puzzle/share/resources/puzzleicon/64x64/iconCurrentPiece.png differ
diff --git a/src/app/puzzle/share/resources/puzzleicon/64x64/iconCurrentPiece@2x.png b/src/app/puzzle/share/resources/puzzleicon/64x64/iconCurrentPiece@2x.png
new file mode 100644
index 000000000..c2df93245
Binary files /dev/null and b/src/app/puzzle/share/resources/puzzleicon/64x64/iconCurrentPiece@2x.png differ
diff --git a/src/app/puzzle/share/resources/puzzleicon/64x64/iconLayers.png b/src/app/puzzle/share/resources/puzzleicon/64x64/iconLayers.png
new file mode 100644
index 000000000..2f36eba4d
Binary files /dev/null and b/src/app/puzzle/share/resources/puzzleicon/64x64/iconLayers.png differ
diff --git a/src/app/puzzle/share/resources/puzzleicon/64x64/iconLayers@2x.png b/src/app/puzzle/share/resources/puzzleicon/64x64/iconLayers@2x.png
new file mode 100644
index 000000000..3019f8725
Binary files /dev/null and b/src/app/puzzle/share/resources/puzzleicon/64x64/iconLayers@2x.png differ
diff --git a/src/app/puzzle/share/resources/puzzleicon/64x64/iconLayout.png b/src/app/puzzle/share/resources/puzzleicon/64x64/iconLayout.png
new file mode 100644
index 000000000..70a5a5691
Binary files /dev/null and b/src/app/puzzle/share/resources/puzzleicon/64x64/iconLayout.png differ
diff --git a/src/app/puzzle/share/resources/puzzleicon/64x64/iconLayout@2x.png b/src/app/puzzle/share/resources/puzzleicon/64x64/iconLayout@2x.png
new file mode 100644
index 000000000..5691b26a9
Binary files /dev/null and b/src/app/puzzle/share/resources/puzzleicon/64x64/iconLayout@2x.png differ
diff --git a/src/app/puzzle/share/resources/puzzleicon/64x64/iconProperties.png b/src/app/puzzle/share/resources/puzzleicon/64x64/iconProperties.png
new file mode 100644
index 000000000..0dc054e3f
Binary files /dev/null and b/src/app/puzzle/share/resources/puzzleicon/64x64/iconProperties.png differ
diff --git a/src/app/puzzle/share/resources/puzzleicon/64x64/iconProperties@2x.png b/src/app/puzzle/share/resources/puzzleicon/64x64/iconProperties@2x.png
new file mode 100644
index 000000000..6648e784b
Binary files /dev/null and b/src/app/puzzle/share/resources/puzzleicon/64x64/iconProperties@2x.png differ
diff --git a/src/app/puzzle/share/resources/puzzleicon/64x64/iconTiles.png b/src/app/puzzle/share/resources/puzzleicon/64x64/iconTiles.png
new file mode 100644
index 000000000..ee3099a77
Binary files /dev/null and b/src/app/puzzle/share/resources/puzzleicon/64x64/iconTiles.png differ
diff --git a/src/app/puzzle/share/resources/puzzleicon/64x64/iconTiles@2x.png b/src/app/puzzle/share/resources/puzzleicon/64x64/iconTiles@2x.png
new file mode 100644
index 000000000..84a3b3a9a
Binary files /dev/null and b/src/app/puzzle/share/resources/puzzleicon/64x64/iconTiles@2x.png differ
diff --git a/src/app/puzzle/share/resources/puzzleicon/64x64/logo.ico b/src/app/puzzle/share/resources/puzzleicon/64x64/logo.ico
new file mode 100644
index 000000000..a98015678
Binary files /dev/null and b/src/app/puzzle/share/resources/puzzleicon/64x64/logo.ico differ
diff --git a/src/app/puzzle/share/resources/puzzleicon/64x64/logo.png b/src/app/puzzle/share/resources/puzzleicon/64x64/logo.png
new file mode 100644
index 000000000..ea9aa050e
Binary files /dev/null and b/src/app/puzzle/share/resources/puzzleicon/64x64/logo.png differ
diff --git a/src/app/puzzle/share/resources/puzzleicon/svg/cursor_rotate.svg b/src/app/puzzle/share/resources/puzzleicon/svg/cursor_rotate.svg
new file mode 100644
index 000000000..2bc7aa1ac
--- /dev/null
+++ b/src/app/puzzle/share/resources/puzzleicon/svg/cursor_rotate.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg893"
+   width="128"
+   height="128"
+   viewBox="0 0 128 128"
+   sodipodi:docname="cursor_rotate.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   inkscape:export-filename="/home/ronan/Workspace_cpp/valentina/src/app/puzzle/share/resources/puzzleicon/64x64/cursorRotate@2x.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <metadata
+     id="metadata899">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs897" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1943"
+     inkscape:window-height="957"
+     id="namedview895"
+     showgrid="false"
+     inkscape:zoom="3.8141593"
+     inkscape:cx="-9.2984942"
+     inkscape:cy="78.770819"
+     inkscape:window-x="-163"
+     inkscape:window-y="86"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g901"
+     showguides="false"
+     inkscape:lockguides="false" />
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g901">
+    <path
+       id="path1502"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:16.112;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       d="M 67.494019,3 C 45.635979,3 26.4721,14.832798 15.842825,32.458789 L 0,20.886257 10.290418,67.03627 50.234036,44.059307 30.104959,39.845618 c 7.88695,-12.507886 21.673605,-20.733626 37.38906,-20.733626 24.548563,0 44.393991,20.068893 44.393991,45.180711 0,25.111817 -19.845428,45.178617 -44.393991,45.178617 -18.793455,0 -34.829896,-11.76047 -41.31635,-28.542147 -12.799702,5.691961 -3.295568,1.770075 -14.669238,6.556583 C 20.55829,109.77568 42.229103,125.58331 67.494019,125.58331 100.88055,125.58331 128,97.98361 128,64.292703 128,30.601797 100.88055,3 67.494019,3 Z"
+       sodipodi:nodetypes="scccccsssccsss" />
+  </g>
+</svg>
diff --git a/src/app/puzzle/share/resources/puzzleicon/svg/iconProperties.svg b/src/app/puzzle/share/resources/puzzleicon/svg/iconProperties.svg
new file mode 100644
index 000000000..eb0cdd094
--- /dev/null
+++ b/src/app/puzzle/share/resources/puzzleicon/svg/iconProperties.svg
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   viewBox="0 0 33.866666 33.866668"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="icon_properties.svg"
+   inkscape:export-filename="/home/ronan/Desktop/icon_properties@2x.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="-11.795691"
+     inkscape:cy="86.412865"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1513"
+     inkscape:window-height="752"
+     inkscape:window-x="374"
+     inkscape:window-y="117"
+     inkscape:window-maximized="0"
+     inkscape:document-rotation="0"
+     inkscape:snap-global="false" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-263.13332)">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.05013126;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect815"
+       width="25.9415"
+       height="32.816536"
+       x="3.9646497"
+       y="263.65839" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.17405;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 7.5406885,268.48285 18.5207075,0.002"
+       id="path860"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.17405;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 7.5406885,272.18701 18.5207075,0.002"
+       id="path860-3"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.17405;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 7.5406885,275.89118 18.5207075,0.002"
+       id="path860-3-6"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.17405;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 7.5406885,279.59535 18.5207075,0.002"
+       id="path860-3-6-7"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.17217;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 7.5406884,283.29857 9.5248736,0.004"
+       id="path860-3-6-7-3"
+       sodipodi:nodetypes="cc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Ebene 2">
+    <rect
+       style="fill:#ffb000;fill-opacity:1;stroke:#000000;stroke-width:0.0239823;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1541"
+       width="11.755722"
+       height="4.0580931"
+       x="-3.0312908"
+       y="33.013405"
+       transform="matrix(0.7043678,-0.70983519,0.65609625,0.75467723,0,0)" />
+    <rect
+       style="fill:#ff6ac5;fill-opacity:1;stroke:#000000;stroke-width:0.0246373;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1558"
+       width="4.095542"
+       height="2.2526591"
+       x="32.814873"
+       y="-5.8033538"
+       transform="matrix(0.769894,0.63817178,-0.72322028,0.69061743,0,0)" />
+    <path
+       sodipodi:type="star"
+       style="fill:#ecb05c;fill-opacity:0.585054;stroke:#000000;stroke-width:0.0256646;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1560"
+       sodipodi:sides="3"
+       sodipodi:cx="20.110312"
+       sodipodi:cy="29.040583"
+       sodipodi:r1="2.4221137"
+       sodipodi:r2="1.2110568"
+       sodipodi:arg1="0.14292279"
+       sodipodi:arg2="1.1901203"
+       inkscape:flatsided="true"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 22.507729,29.385581 -3.894903,1.558727 0.597554,-4.152449 z"
+       inkscape:transform-center-x="-0.30927552"
+       inkscape:transform-center-y="-0.31760931"
+       transform="rotate(7.0152373,14.907215,26.753104)" />
+    <path
+       d="m 32.521685,18.700663 -1.915051,-1.950856 c -0.255301,-0.259946 -0.59531,-0.403311 -0.95729,-0.403442 -2.56e-4,0 -3.42e-4,0 -5.98e-4,0 -0.361979,0 -0.701754,0.143149 -0.95682,0.402964 l -9.764404,9.946229 c -0.08,0.08341 -0.112911,0.202146 -0.136638,0.276461 l -1.255006,4.474487 c -0.045,0.160609 -0.001,0.333424 0.114791,0.451418 0.08588,0.08748 0.201256,0.13476 0.319213,0.13476 0.04147,0 0.08319,-0.006 0.124067,-0.01771 l 4.390169,-1.277678 c 0.01304,-0.0036 0.207012,-0.0718 0.273863,-0.139906 l 9.764295,-9.946361 c 0.255302,-0.259934 0.3957,-0.60627 0.395582,-0.975236 -8.4e-5,-0.368726 -0.140868,-0.715075 -0.396169,-0.975129 z m -13.894462,12.202626 0.842858,-3.004847 2.107026,2.146289 z m 3.81154,-1.281375 -2.553598,-2.601189 7.848656,-7.994895 2.553599,2.601177 z m 9.445081,-9.621087 -0.957994,0.975978 -2.553716,-2.601308 0.958113,-0.975847 c 0.0846,-0.08616 0.197733,-0.133564 0.318508,-0.133564 h 2.57e-4 c 0.121012,0 0.234388,0.04763 0.319214,0.134042 l 1.91517,1.950856 c 0.175995,0.179278 0.176231,0.470805 5.11e-4,0.649843 z m 0,0"
+       id="path953"
+       style="fill:#000000;fill-opacity:1;stroke-width:0.0304305;stroke-miterlimit:4;stroke-dasharray:none" />
+  </g>
+</svg>
diff --git a/src/app/puzzle/share/resources/puzzleicon/svg/icon_current_piece.svg b/src/app/puzzle/share/resources/puzzleicon/svg/icon_current_piece.svg
new file mode 100644
index 000000000..d021a16b2
--- /dev/null
+++ b/src/app/puzzle/share/resources/puzzleicon/svg/icon_current_piece.svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   viewBox="0 0 33.866666 33.866668"
+   version="1.1"
+   id="svg2509"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="icon_current_piece.svg">
+  <defs
+     id="defs2503" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="-253.40813"
+     inkscape:cy="-61.561841"
+     inkscape:document-units="px"
+     inkscape:current-layer="g2570"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="2492"
+     inkscape:window-height="1376"
+     inkscape:window-x="68"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata2506">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-263.13332)">
+    <g
+       transform="matrix(0.26453414,0,0,0.26453414,63.37226,-244.46879)"
+       font-size="14.6667"
+       font-weight="400"
+       font-style="normal"
+       id="g2570"
+       style="font-style:normal;font-weight:400;font-size:14.66670036px;font-family:Ubuntu;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:bevel;stroke-opacity:1">
+      <path
+         d="m -140.95302,1932.7404 0.69118,112.062 h -69.00486 l -0.19139,-25.9137 0.22275,-27.7193 1.69724,-0.6159 1.52048,-0.7014 0.70479,-0.4067 1.0218,-0.6852 1.26935,-1.0451 1.16075,-1.1592 1.06104,-1.2554 0.96326,-1.3272 0.86777,-1.3738 0.77496,-1.3924 0.68291,-1.3795 0.8777,-2.0097 1.26386,-3.522 0.55623,-1.7804 0.21606,-0.9228 0.19427,-1.1523 0.16148,-1.3687 0.11878,-1.5657 0.0676,-1.7466 0.0104,-1.913 -0.058,-2.0662 -0.1324,-2.205 -0.21343,-2.3325 -0.30178,-2.446 -0.39726,-2.5483 -0.49959,-2.6371 -0.60908,-2.7146 -0.72542,-2.7795 -0.84877,-2.8318 -0.97525,-2.8616 -1.05725,-2.761 -0.93355,-2.1985 34.72106,-11.6806 2.50212,3.437 1.09172,1.3233 1.06182,1.1453 1.04965,0.9815 1.05753,0.8335 1.08979,0.7051 1.15089,0.594 1.2433,0.4976 1.36638,0.4114 1.51656,0.3326 1.68999,0.2582 1.88344,0.1898 2.09146,0.1299 3.55478,0.1052 2.77287,0.021"
+         id="path2568"
+         inkscape:connector-curvature="0"
+         style="vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4.14862871;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/src/app/puzzle/share/resources/puzzleicon/svg/icon_grainline_horizontal.svg b/src/app/puzzle/share/resources/puzzleicon/svg/icon_grainline_horizontal.svg
new file mode 100644
index 000000000..d0609895f
--- /dev/null
+++ b/src/app/puzzle/share/resources/puzzleicon/svg/icon_grainline_horizontal.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   viewBox="0 0 33.866666 33.866668"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="icon_grainline_horizontal.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6"
+     inkscape:cx="131.4404"
+     inkscape:cy="23.984595"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="2492"
+     inkscape:window-height="1376"
+     inkscape:window-x="68"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-263.13333)">
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.08413111px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 5.5252585,275.18217 0.051298,3.99382 22.7141635,-0.0537 0.01533,-3.8659 5.496769,4.82839 -5.511316,4.79342 -0.03376,-3.83055 -22.7010593,-0.0398 0.042982,3.95521 -5.53642339,-4.9772 z"
+       id="path815"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccc" />
+  </g>
+</svg>
diff --git a/src/app/puzzle/share/resources/puzzleicon/svg/icon_grainline_vertical.svg b/src/app/puzzle/share/resources/puzzleicon/svg/icon_grainline_vertical.svg
new file mode 100644
index 000000000..22c7e42f6
--- /dev/null
+++ b/src/app/puzzle/share/resources/puzzleicon/svg/icon_grainline_vertical.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   viewBox="0 0 33.866666 33.866668"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="icon_grainline_vertical.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6"
+     inkscape:cx="10.587649"
+     inkscape:cy="31.675878"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="2492"
+     inkscape:window-height="1376"
+     inkscape:window-x="68"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-263.13333)">
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.08413111px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 21.94176,268.65855 -3.993828,0.0513 0.05369,22.71416 3.865904,0.0153 -4.828397,5.49677 -4.79342,-5.51132 3.830552,-0.0338 0.03977,-22.70106 -3.955217,0.043 4.977207,-5.53642 z"
+       id="path815"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccc" />
+  </g>
+</svg>
diff --git a/src/app/puzzle/share/resources/puzzleicon/svg/icon_landscape.svg b/src/app/puzzle/share/resources/puzzleicon/svg/icon_landscape.svg
new file mode 100644
index 000000000..444a54033
--- /dev/null
+++ b/src/app/puzzle/share/resources/puzzleicon/svg/icon_landscape.svg
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   viewBox="0 0 33.866666 33.866668"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="icon_landscape.svg"
+   inkscape:export-filename="/home/ronan/Desktop/icon_layout.png"
+   inkscape:export-xdpi="48"
+   inkscape:export-ydpi="48"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="129.97931"
+     inkscape:cy="45.737629"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="2492"
+     inkscape:window-height="1376"
+     inkscape:window-x="68"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-263.13332)">
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.05013251;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 33.343664,293.0374 v -17.62724 l -4.39397,-4.25101 -4.14294,-4.06324 H 0.52713435 v 25.94149 z"
+       id="rect815"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="fill:#ffffff;fill-opacity:0;stroke:#000000;stroke-width:1.05799997;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:transform-center-x="-0.55548508"
+       inkscape:transform-center-y="0.97501237"
+       d="m 24.948494,267.23765 -0.0243,8.13814 8.41946,0.0344"
+       id="path848"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/src/app/puzzle/share/resources/puzzleicon/svg/icon_layers.svg b/src/app/puzzle/share/resources/puzzleicon/svg/icon_layers.svg
new file mode 100644
index 000000000..ab1385c2d
--- /dev/null
+++ b/src/app/puzzle/share/resources/puzzleicon/svg/icon_layers.svg
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   viewBox="0 0 33.866666 33.866668"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="icon_layers.svg"
+   inkscape:export-filename="/home/ronan/Desktop/icon_layout.png"
+   inkscape:export-xdpi="48"
+   inkscape:export-ydpi="48"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.7"
+     inkscape:cx="-330.80339"
+     inkscape:cy="-397.46436"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="2492"
+     inkscape:window-height="1376"
+     inkscape:window-x="68"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-263.13332)">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.19349599;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect815"
+       width="17.856504"
+       height="17.856504"
+       x="0.59674788"
+       y="263.73007" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.19349599;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect815-5"
+       width="17.856504"
+       height="17.856504"
+       x="8.4442673"
+       y="270.30368" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.19349599;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect815-3"
+       width="17.856504"
+       height="17.856504"
+       x="15.413412"
+       y="278.54672" />
+  </g>
+</svg>
diff --git a/src/app/puzzle/share/resources/puzzleicon/svg/icon_layout.svg b/src/app/puzzle/share/resources/puzzleicon/svg/icon_layout.svg
new file mode 100644
index 000000000..993a50de8
--- /dev/null
+++ b/src/app/puzzle/share/resources/puzzleicon/svg/icon_layout.svg
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   viewBox="0 0 33.866666 33.866668"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="icon_layout.svg"
+   inkscape:export-filename="/home/ronan/Desktop/icon_layout.png"
+   inkscape:export-xdpi="48"
+   inkscape:export-ydpi="48"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="96.514929"
+     inkscape:cy="54.111874"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1513"
+     inkscape:window-height="1106"
+     inkscape:window-x="596"
+     inkscape:window-y="129"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-263.13332)">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.05013251;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect815"
+       width="25.9415"
+       height="32.816536"
+       x="3.9646497"
+       y="263.65839" />
+    <rect
+       style="fill:none;fill-opacity:1;stroke:#00eaff;stroke-width:1.04943001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect815-3"
+       width="23.835947"
+       height="30.700571"
+       x="5.0226316"
+       y="264.71637" />
+  </g>
+</svg>
diff --git a/src/app/puzzle/share/resources/puzzleicon/svg/icon_portrait.svg b/src/app/puzzle/share/resources/puzzleicon/svg/icon_portrait.svg
new file mode 100644
index 000000000..cf7971065
--- /dev/null
+++ b/src/app/puzzle/share/resources/puzzleicon/svg/icon_portrait.svg
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   viewBox="0 0 33.866666 33.866668"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="icon_portrait.svg"
+   inkscape:export-filename="/home/ronan/Desktop/icon_layout.png"
+   inkscape:export-xdpi="48"
+   inkscape:export-ydpi="48"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="74.673459"
+     inkscape:cy="45.737629"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="2492"
+     inkscape:window-height="1376"
+     inkscape:window-x="68"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-263.13332)">
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.05013251;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 3.9646542,263.65839 H 21.591894 l 4.25101,4.39397 4.06324,4.14294 v 24.27962 H 3.9646542 Z"
+       id="rect815"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="fill:#ffffff;fill-opacity:0;stroke:#000000;stroke-width:1.05799997;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:transform-center-x="0.97501255"
+       inkscape:transform-center-y="-0.55548525"
+       d="m 29.764404,272.05356 -8.13814,0.0243 -0.0344,-8.41946"
+       id="path848"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/src/app/puzzle/share/resources/puzzleicon/svg/icon_rotate_90_anticlockwise.svg b/src/app/puzzle/share/resources/puzzleicon/svg/icon_rotate_90_anticlockwise.svg
new file mode 100644
index 000000000..47851199d
--- /dev/null
+++ b/src/app/puzzle/share/resources/puzzleicon/svg/icon_rotate_90_anticlockwise.svg
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg893"
+   width="128"
+   height="128"
+   viewBox="0 0 128 128"
+   sodipodi:docname="icon_rotate_90_anticlockwise.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   inkscape:export-filename="/home/ronan/Workspace_cpp/valentina/src/app/puzzle/share/resources/puzzleicon/64x64/cursorRotate@2x.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <metadata
+     id="metadata899">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs897" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1043"
+     id="namedview895"
+     showgrid="false"
+     inkscape:zoom="1.9070797"
+     inkscape:cx="-10.361902"
+     inkscape:cy="69.818165"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g901"
+     showguides="false"
+     inkscape:lockguides="false"
+     inkscape:document-rotation="0" />
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g901">
+    <path
+       id="path1502"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:16.3619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       d="M 55.896493,2.9375026 C 33.6579,6.5065667 18.949296,20.13637 11.102943,39.261394 L 0.54579357,31.704504 9.2043998,61.438917 33.336678,43.163337 20.178057,41.964226 C 26.09616,28.336396 41.286906,13.618412 57.166066,10.475466 83.491044,5.26499 118.31674,25.305285 118.92695,54.737111 c 3.26906,-0.0857 5.15084,-0.118802 8.51053,-0.256065 C 127.26422,20.979551 89.86429,-2.5139775 55.896493,2.9375026 Z"
+       sodipodi:nodetypes="scccccsccs" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:80.5149px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.25804"
+       x="27.286873"
+       y="104.23756"
+       id="text1480"
+       transform="scale(0.94780675,1.0550674)"><tspan
+         sodipodi:role="line"
+         id="tspan1478"
+         x="27.286873"
+         y="104.23756"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:80.5149px;font-family:Garuda;-inkscape-font-specification:Garuda;stroke-width:1.25804">90</tspan></text>
+  </g>
+</svg>
diff --git a/src/app/puzzle/share/resources/puzzleicon/svg/icon_rotate_90_clockwise.svg b/src/app/puzzle/share/resources/puzzleicon/svg/icon_rotate_90_clockwise.svg
new file mode 100644
index 000000000..d2effc39a
--- /dev/null
+++ b/src/app/puzzle/share/resources/puzzleicon/svg/icon_rotate_90_clockwise.svg
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg893"
+   width="128"
+   height="128"
+   viewBox="0 0 128 128"
+   sodipodi:docname="icon_rotate_90_clockwise.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   inkscape:export-filename="/home/ronan/Workspace_cpp/valentina/src/app/puzzle/share/resources/puzzleicon/64x64/iconRotate90Clockwise@2x.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <metadata
+     id="metadata899">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs897" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1043"
+     id="namedview895"
+     showgrid="false"
+     inkscape:zoom="1.9070797"
+     inkscape:cx="-10.361902"
+     inkscape:cy="69.818165"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g901"
+     showguides="false"
+     inkscape:lockguides="false"
+     inkscape:document-rotation="0" />
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g901">
+    <path
+       id="path1502"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:16.3619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       d="M 72.086781,2.9375026 C 94.325374,6.5065667 109.03398,20.13637 116.88033,39.261394 l 10.55715,-7.55689 -8.65861,29.734413 -24.132274,-18.27558 13.158624,-1.199111 C 101.88711,28.336396 86.696368,13.618412 70.817208,10.475466 44.49223,5.26499 9.6665336,25.305285 9.0563236,54.737111 5.7872636,54.651411 3.9054836,54.618309 0.54579357,54.481046 0.71905357,20.979551 38.118984,-2.5139775 72.086781,2.9375026 Z"
+       sodipodi:nodetypes="scccccsccs" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:80.5149px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.25804"
+       x="18.815292"
+       y="103.3251"
+       id="text1480"
+       transform="scale(0.94780675,1.0550674)"><tspan
+         sodipodi:role="line"
+         id="tspan1478"
+         x="18.815292"
+         y="103.3251"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:80.5149px;font-family:Garuda;-inkscape-font-specification:Garuda;stroke-width:1.25804">90</tspan></text>
+  </g>
+</svg>
diff --git a/src/app/puzzle/share/resources/puzzleicon/svg/icon_rotate_grainline_horizontal.svg b/src/app/puzzle/share/resources/puzzleicon/svg/icon_rotate_grainline_horizontal.svg
new file mode 100644
index 000000000..4509e66c8
--- /dev/null
+++ b/src/app/puzzle/share/resources/puzzleicon/svg/icon_rotate_grainline_horizontal.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg893"
+   width="128"
+   height="128"
+   viewBox="0 0 128 128"
+   sodipodi:docname="icon_rotate_grainline_horizontal_clockwise.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   inkscape:export-filename="/home/ronan/Workspace_cpp/valentina/src/app/puzzle/share/resources/puzzleicon/64x64/iconRotateGrainlineHorizontal@2x.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <metadata
+     id="metadata899">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs897" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1043"
+     id="namedview895"
+     showgrid="false"
+     inkscape:zoom="1.9070797"
+     inkscape:cx="73.591374"
+     inkscape:cy="127.65689"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g901"
+     showguides="false"
+     inkscape:lockguides="false"
+     inkscape:document-rotation="0" />
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g901">
+    <g
+       id="g2862"
+       style="fill:#000000">
+      <path
+         id="path1502-1"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:15.9493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+         d="M 60.996394,0.20303699 C 58.149666,0.24970079 55.302575,0.50557789 52.47989,0.98233389 31.348865,4.5513981 17.373357,18.181529 9.9177848,37.306553 L -0.11309389,29.747959 8.1138972,59.484287 31.044802,41.206943 18.540073,40.007724 C 24.163438,26.379894 38.59788,11.662388 53.686194,8.5194431 56.908693,7.8481862 60.45821,7.3123197 63.862041,7.4453147 c 0,0 -0.0094,-3.1734682 -0.01877,-7.21884021 -0.947752,-0.030357 -1.897966,-0.038992 -2.846876,-0.023437 z m 2.865647,7.24227771 c 3.40383,-0.132995 6.956636,0.4028716 10.179135,1.0741284 15.088313,3.1429449 29.522754,17.8604509 35.146114,31.4882809 l -12.502866,1.199219 22.930896,18.277344 8.22699,-29.736328 -10.03088,7.558594 C 110.35586,18.181529 96.378506,4.5513978 75.24748,0.98233389 71.4839,0.34665889 67.634281,0.10504749 63.84327,0.22647449 63.83387,4.2718465 63.86204,7.4453147 63.862041,7.4453147 Z"
+         sodipodi:nodetypes="sscccccsccscscccccscc" />
+    </g>
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.267085px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 101.4024,97.530244 -0.16286,-12.678896 -72.108879,0.170445 -0.0485,12.272785 -17.45021,-15.328335 17.49634,-15.217299 0.10731,12.160556 72.067279,0.126254 -0.13651,-12.556319 17.57604,15.800751 z"
+       id="path815"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccc" />
+  </g>
+</svg>
diff --git a/src/app/puzzle/share/resources/puzzleicon/svg/icon_rotate_grainline_vertical.svg b/src/app/puzzle/share/resources/puzzleicon/svg/icon_rotate_grainline_vertical.svg
new file mode 100644
index 000000000..34e32c7a7
--- /dev/null
+++ b/src/app/puzzle/share/resources/puzzleicon/svg/icon_rotate_grainline_vertical.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg893"
+   width="128"
+   height="128"
+   viewBox="0 0 128 128"
+   sodipodi:docname="icon_rotate_grainline_vertical_clockwise.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   inkscape:export-filename="/home/ronan/Workspace_cpp/valentina/src/app/puzzle/share/resources/puzzleicon/64x64/iconRotateGrainlineVertical@2x.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <metadata
+     id="metadata899">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs897" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1043"
+     id="namedview895"
+     showgrid="false"
+     inkscape:zoom="1.9070797"
+     inkscape:cx="73.591374"
+     inkscape:cy="127.65689"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g901"
+     showguides="false"
+     inkscape:lockguides="false"
+     inkscape:document-rotation="0" />
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g901">
+    <g
+       id="g2862"
+       style="fill:#000000">
+      <path
+         id="path1502-1"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:15.9493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+         d="M 60.996394,0.20303699 C 58.149666,0.24970079 55.302575,0.50557789 52.47989,0.98233389 31.348865,4.5513981 17.373357,18.181529 9.9177848,37.306553 L -0.11309389,29.747959 8.1138972,59.484287 31.044802,41.206943 18.540073,40.007724 C 24.163438,26.379894 38.59788,11.662388 53.686194,8.5194431 56.908693,7.8481862 60.45821,7.3123197 63.862041,7.4453147 c 0,0 -0.0094,-3.1734682 -0.01877,-7.21884021 -0.947752,-0.030357 -1.897966,-0.038992 -2.846876,-0.023437 z m 2.865647,7.24227771 c 3.40383,-0.132995 6.956636,0.4028716 10.179135,1.0741284 15.088313,3.1429449 29.522754,17.8604509 35.146114,31.4882809 l -12.502866,1.199219 22.930896,18.277344 8.22699,-29.736328 -10.03088,7.558594 C 110.35586,18.181529 96.378506,4.5513978 75.24748,0.98233389 71.4839,0.34665889 67.634281,0.10504749 63.84327,0.22647449 63.83387,4.2718465 63.86204,7.4453147 63.862041,7.4453147 Z"
+         sodipodi:nodetypes="sscccccsccscscccccscc" />
+    </g>
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.267085px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 78.712585,37.789626 -12.678895,0.162859 0.170444,72.108875 12.272786,0.0485 -15.328336,17.45021 -15.217299,-17.49634 12.160556,-0.10731 0.126255,-72.06728 -12.556319,0.13651 15.800751,-17.576041 z"
+       id="path815"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccc" />
+  </g>
+</svg>
diff --git a/src/app/puzzle/share/resources/puzzleicon/svg/icon_scissors.svg b/src/app/puzzle/share/resources/puzzleicon/svg/icon_scissors.svg
new file mode 100644
index 000000000..fd1bd78c7
--- /dev/null
+++ b/src/app/puzzle/share/resources/puzzleicon/svg/icon_scissors.svg
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="100"
+   height="56"
+   id="svg2"
+   sodipodi:docname="Scissors_icon_black.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1825"
+     inkscape:window-height="947"
+     id="namedview9"
+     showgrid="false"
+     inkscape:zoom="4"
+     inkscape:cx="88.508712"
+     inkscape:cy="66.691968"
+     inkscape:window-x="408"
+     inkscape:window-y="42"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g4593" />
+  <defs
+     id="defs4">
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="Scissors"
+       style="overflow:visible">
+      <path
+         d="M 9.0898857,-3.6061018 C 8.1198849,-4.7769976 6.3697607,-4.7358294 5.0623558,-4.2327734 l -8.2124046,3.0779029 c -2.3882933,-1.3067135 -4.7482873,-0.9325372 -4.7482873,-1.5687873 0,-0.4973164 0.4566662,-0.3883222 0.3883068,-1.6831941 -0.065635,-1.2432767 -1.3635771,-2.1630796 -2.5903987,-2.0816435 -1.227271,-0.00735 -2.499439,0.9331613 -2.510341,2.2300611 -0.09143,1.3063864 1.007209,2.5196896 2.306764,2.6052316 1.5223406,0.2266616 4.218258,-0.6955566 5.482945,1.57086006 -0.9422847,1.73825774 -2.6140244,1.74307674 -4.1255107,1.65607034 -1.2548743,-0.072235 -2.7620933,0.2873979 -3.3606483,1.5208605 -0.578367,1.1820862 -0.0112,2.8646022 1.316749,3.226412 1.3401912,0.4918277 3.1806689,-0.129711 3.4993722,-1.6707242 0.2456585,-1.187823 -0.5953659,-1.7459574 -0.2725074,-2.1771537 0.2436135,-0.32536 1.7907806,-0.1368452 4.5471053,-1.3748244 L 5.6763468,4.2330688 C 6.8000164,4.5467672 8.1730685,4.5362646 9.1684433,3.4313614 l -9.22008423,-3.48508362 z m -18.3078016,-1.900504 c 1.294559,0.7227998 1.1888392,2.6835702 -0.1564272,3.0632889 -1.2165179,0.423661 -2.7710269,-0.7589694 -2.3831779,-2.0774648 0.227148,-1.0818519 1.653387,-1.480632 2.5396051,-0.9858241 z m 0.056264,8.0173649 c 1.3508301,0.4988648 1.1214429,2.7844356 -0.2522207,3.091609 -0.9110594,0.3163391 -2.2135494,-0.1387976 -2.3056964,-1.2121394 -0.177609,-1.305055 1.356085,-2.4841482 2.5579171,-1.8794696 z"
+         id="schere"
+         style="marker-start:none" />
+    </marker>
+  </defs>
+  <g
+     transform="matrix(0.88916115,0.40113698,-0.40113698,0.88916115,416.60041,-888.00877)"
+     id="layer1">
+    <g
+       transform="matrix(4.2610846,-1.2351263,1.2351263,4.2610846,-1337.7659,-2994.9736)"
+       id="g4593">
+      <path
+         d="m 59.731665,956.40057 c -0.609784,-1.39286 -2.303491,-1.83556 -3.698902,-1.71226 l -8.742604,0.69566 c -1.935736,-1.91425 -4.307466,-2.2049 -4.132136,-2.81651 0.137044,-0.47806 0.545993,-0.24745 0.837105,-1.51102 0.279511,-1.21323 -0.714709,-2.45509 -1.916471,-2.71488 -1.177727,-0.34526 -2.659814,0.20827 -3.027677,1.45195 -0.447882,1.23061 0.273869,2.69969 1.499535,3.14003 1.400938,0.6374 4.246607,0.49379 4.837778,3.02096 -1.384807,1.41129 -2.993148,0.95525 -4.422137,0.4551 -1.186382,-0.41524 -2.734347,-0.48487 -3.649629,0.53589 -0.881717,0.97694 -0.800158,2.7506 0.376675,3.46434 1.15277,0.8421 3.093263,0.7518 3.824279,-0.64172 0.563472,-1.07414 -0.09119,-1.84242 0.337995,-2.16796 0.32384,-0.24563 1.759155,0.36194 4.749906,-0.0686 l 3.518754,2.50293 c 0.830495,-0.11244 2.357866,-0.33884 2.949854,-0.42081 l -3.108827,-2.3174 9.766502,-0.89574 z m -17.075242,-6.87194 c 1.045256,1.05155 0.403306,2.90727 -0.994512,2.90157 -1.286163,0.072 -2.454591,-1.49318 -1.718425,-2.65375 0.516476,-0.97737 1.997384,-0.96769 2.712937,-0.24782 z m -2.155235,7.72245 c 1.161058,0.85179 0.310724,2.98566 -1.0944,2.9024 -0.962958,0.053 -2.089598,-0.7434 -1.882399,-1.80058 0.188897,-1.30347 1.988129,-2.01427 2.976799,-1.10182 z"
+         id="path4599"
+         style="marker-start:none"
+         sodipodi:nodetypes="cccscccccccccccccccccccccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/src/app/puzzle/share/resources/puzzleicon/svg/icon_scissors_horizontal.svg b/src/app/puzzle/share/resources/puzzleicon/svg/icon_scissors_horizontal.svg
new file mode 100644
index 000000000..c6ed9f159
--- /dev/null
+++ b/src/app/puzzle/share/resources/puzzleicon/svg/icon_scissors_horizontal.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="10mm"
+   height="5.5999999mm"
+   id="svg2"
+   sodipodi:docname="icon_scissors_horizontal.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1510"
+     inkscape:window-height="773"
+     id="namedview9"
+     showgrid="false"
+     inkscape:zoom="4"
+     inkscape:cx="-13.069473"
+     inkscape:cy="57.804097"
+     inkscape:window-x="285"
+     inkscape:window-y="105"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g4593"
+     inkscape:document-rotation="0"
+     units="mm" />
+  <defs
+     id="defs4">
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="Scissors"
+       style="overflow:visible">
+      <path
+         d="M 9.0898857,-3.6061018 C 8.1198849,-4.7769976 6.3697607,-4.7358294 5.0623558,-4.2327734 l -8.2124046,3.0779029 c -2.3882933,-1.3067135 -4.7482873,-0.9325372 -4.7482873,-1.5687873 0,-0.4973164 0.4566662,-0.3883222 0.3883068,-1.6831941 -0.065635,-1.2432767 -1.3635771,-2.1630796 -2.5903987,-2.0816435 -1.227271,-0.00735 -2.499439,0.9331613 -2.510341,2.2300611 -0.09143,1.3063864 1.007209,2.5196896 2.306764,2.6052316 1.5223406,0.2266616 4.218258,-0.6955566 5.482945,1.57086006 -0.9422847,1.73825774 -2.6140244,1.74307674 -4.1255107,1.65607034 -1.2548743,-0.072235 -2.7620933,0.2873979 -3.3606483,1.5208605 -0.578367,1.1820862 -0.0112,2.8646022 1.316749,3.226412 1.3401912,0.4918277 3.1806689,-0.129711 3.4993722,-1.6707242 0.2456585,-1.187823 -0.5953659,-1.7459574 -0.2725074,-2.1771537 0.2436135,-0.32536 1.7907806,-0.1368452 4.5471053,-1.3748244 L 5.6763468,4.2330688 C 6.8000164,4.5467672 8.1730685,4.5362646 9.1684433,3.4313614 l -9.22008423,-3.48508362 z m -18.3078016,-1.900504 c 1.294559,0.7227998 1.1888392,2.6835702 -0.1564272,3.0632889 -1.2165179,0.423661 -2.7710269,-0.7589694 -2.3831779,-2.0774648 0.227148,-1.0818519 1.653387,-1.480632 2.5396051,-0.9858241 z m 0.056264,8.0173649 c 1.3508301,0.4988648 1.1214429,2.7844356 -0.2522207,3.091609 -0.9110594,0.3163391 -2.2135494,-0.1387976 -2.3056964,-1.2121394 -0.177609,-1.305055 1.356085,-2.4841482 2.5579171,-1.8794696 z"
+         id="schere"
+         style="marker-start:none" />
+    </marker>
+  </defs>
+  <g
+     transform="matrix(0.88916115,0.40113698,-0.40113698,0.88916115,416.60041,-888.00877)"
+     id="layer1">
+    <g
+       transform="matrix(4.2610846,-1.2351263,1.2351263,4.2610846,-1337.7659,-2994.9736)"
+       id="g4593">
+      <path
+         d="m 35.464624,949.91014 c 0.230465,0.52643 0.870608,0.69376 1.398007,0.64716 l 3.304293,-0.26293 c 0.731614,0.72349 1.628019,0.83334 1.561751,1.06451 -0.0518,0.18068 -0.206363,0.0935 -0.316383,0.57109 -0.105643,0.45854 0.270125,0.92791 0.724333,1.02609 0.445128,0.1305 1.005282,-0.0787 1.144322,-0.54876 0.169277,-0.46512 -0.103509,-1.02036 -0.566757,-1.18679 -0.529488,-0.2409 -1.605018,-0.18663 -1.828451,-1.14178 0.523391,-0.5334 1.131267,-0.36105 1.671359,-0.172 0.448397,0.15694 1.033456,0.18325 1.379387,-0.20254 0.333251,-0.36924 0.302424,-1.0396 -0.142367,-1.30936 -0.435692,-0.31827 -1.169106,-0.28414 -1.445396,0.24254 -0.212966,0.40597 0.03447,0.69635 -0.127746,0.81938 -0.122393,0.0928 -0.664876,-0.13679 -1.795242,0.0259 l -1.329919,-0.94598 c -0.313891,0.0425 -0.891164,0.12806 -1.114904,0.15904 l 1.174988,0.87587 -3.691276,0.33854 z m 6.453633,2.59727 c -0.395055,-0.39744 -0.15243,-1.09881 0.375877,-1.09666 0.486113,-0.0272 0.927723,0.56435 0.649487,1.00299 -0.195206,0.3694 -0.754918,0.36575 -1.025364,0.0937 z m 0.814577,-2.91872 c -0.438826,-0.32194 -0.11744,-1.12844 0.413631,-1.09697 0.363954,-0.02 0.789772,0.28097 0.711461,0.68053 -0.0714,0.49265 -0.751419,0.7613 -1.125092,0.41644 z"
+         id="path4599"
+         style="fill:#b4b4b4;fill-opacity:1;stroke-width:0.377953;marker-start:none"
+         sodipodi:nodetypes="cccscccccccccccccccccccccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/src/app/puzzle/share/resources/puzzleicon/svg/icon_scissors_vertical.svg b/src/app/puzzle/share/resources/puzzleicon/svg/icon_scissors_vertical.svg
new file mode 100644
index 000000000..8bc4994e4
--- /dev/null
+++ b/src/app/puzzle/share/resources/puzzleicon/svg/icon_scissors_vertical.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="5.5999999mm"
+   height="10mm"
+   id="svg2"
+   sodipodi:docname="icon_scissors_vertical.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1845"
+     inkscape:window-height="1016"
+     id="namedview9"
+     showgrid="false"
+     inkscape:zoom="4"
+     inkscape:cx="-13.069473"
+     inkscape:cy="50.393713"
+     inkscape:window-x="75"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g4593"
+     inkscape:document-rotation="0"
+     units="mm" />
+  <defs
+     id="defs4">
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="Scissors"
+       style="overflow:visible">
+      <path
+         d="M 9.0898857,-3.6061018 C 8.1198849,-4.7769976 6.3697607,-4.7358294 5.0623558,-4.2327734 l -8.2124046,3.0779029 c -2.3882933,-1.3067135 -4.7482873,-0.9325372 -4.7482873,-1.5687873 0,-0.4973164 0.4566662,-0.3883222 0.3883068,-1.6831941 -0.065635,-1.2432767 -1.3635771,-2.1630796 -2.5903987,-2.0816435 -1.227271,-0.00735 -2.499439,0.9331613 -2.510341,2.2300611 -0.09143,1.3063864 1.007209,2.5196896 2.306764,2.6052316 1.5223406,0.2266616 4.218258,-0.6955566 5.482945,1.57086006 -0.9422847,1.73825774 -2.6140244,1.74307674 -4.1255107,1.65607034 -1.2548743,-0.072235 -2.7620933,0.2873979 -3.3606483,1.5208605 -0.578367,1.1820862 -0.0112,2.8646022 1.316749,3.226412 1.3401912,0.4918277 3.1806689,-0.129711 3.4993722,-1.6707242 0.2456585,-1.187823 -0.5953659,-1.7459574 -0.2725074,-2.1771537 0.2436135,-0.32536 1.7907806,-0.1368452 4.5471053,-1.3748244 L 5.6763468,4.2330688 C 6.8000164,4.5467672 8.1730685,4.5362646 9.1684433,3.4313614 l -9.22008423,-3.48508362 z m -18.3078016,-1.900504 c 1.294559,0.7227998 1.1888392,2.6835702 -0.1564272,3.0632889 -1.2165179,0.423661 -2.7710269,-0.7589694 -2.3831779,-2.0774648 0.227148,-1.0818519 1.653387,-1.480632 2.5396051,-0.9858241 z m 0.056264,8.0173649 c 1.3508301,0.4988648 1.1214429,2.7844356 -0.2522207,3.091609 -0.9110594,0.3163391 -2.2135494,-0.1387976 -2.3056964,-1.2121394 -0.177609,-1.305055 1.356085,-2.4841482 2.5579171,-1.8794696 z"
+         id="schere"
+         style="marker-start:none" />
+    </marker>
+  </defs>
+  <g
+     transform="matrix(0.88916115,0.40113698,-0.40113698,0.88916115,416.60041,-888.00877)"
+     id="layer1">
+    <g
+       transform="matrix(4.2610846,-1.2351263,1.2351263,4.2610846,-1337.7659,-2994.9736)"
+       id="g4593">
+      <path
+         d="m 36.184207,948.95114 c 0.569876,0.0741 0.909488,0.64195 1.012188,1.16134 l 0.671333,3.24604 c 0.899184,0.50018 1.255261,1.33013 1.458678,1.20188 0.158999,-0.10024 0.0321,-0.22428 0.459871,-0.46343 0.410725,-0.22962 0.966427,-6e-5 1.187683,0.40859 0.249732,0.3909 0.205467,0.9872 -0.206972,1.25211 -0.399242,0.29256 -1.008607,0.18588 -1.297908,-0.21237 -0.379329,-0.44103 -0.627899,-1.48884 -1.60743,-1.43634 -0.365808,0.65165 -0.03037,1.1871 0.302112,1.65281 0.276041,0.38663 0.464872,0.94101 0.191168,1.381 -0.261348,0.42319 -0.913595,0.58101 -1.296949,0.22937 -0.427389,-0.32934 -0.599659,-1.04305 -0.171218,-1.45557 0.330248,-0.31797 0.678218,-0.16158 0.751001,-0.35173 0.05492,-0.14347 -0.317221,-0.60012 -0.476999,-1.7309 l -1.280073,-1.01242 c -0.04695,-0.31326 -0.126182,-0.89144 -0.158987,-1.11492 l 1.169432,0.88327 -0.706915,-3.63873 z m 4.297937,5.47019 c -0.492034,-0.26819 -1.097611,0.16084 -0.947845,0.66748 0.109774,0.47433 0.80121,0.73295 1.144574,0.34318 0.300097,-0.29069 0.140107,-0.82706 -0.196729,-1.01066 z m -2.57461,1.59808 c -0.431781,-0.33133 -1.116275,0.20272 -0.937591,0.70381 0.08252,0.35505 0.490562,0.67973 0.8523,0.49284 0.453046,-0.20628 0.52087,-0.93429 0.08529,-1.19665 z"
+         id="path4599"
+         style="fill:#b4b4b4;fill-opacity:1;stroke-width:0.377954;marker-start:none"
+         sodipodi:nodetypes="cccscccccccccccccccccccccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/src/app/puzzle/share/resources/puzzleicon/svg/icon_tiles.svg b/src/app/puzzle/share/resources/puzzleicon/svg/icon_tiles.svg
new file mode 100644
index 000000000..5ee9a5d0d
--- /dev/null
+++ b/src/app/puzzle/share/resources/puzzleicon/svg/icon_tiles.svg
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   viewBox="0 0 33.866666 33.866668"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="icon_tiles.svg"
+   inkscape:export-filename="/home/ronan/Desktop/icon_layout.png"
+   inkscape:export-xdpi="48"
+   inkscape:export-ydpi="48"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.7"
+     inkscape:cx="-330.80339"
+     inkscape:cy="-397.46436"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1513"
+     inkscape:window-height="1106"
+     inkscape:window-x="596"
+     inkscape:window-y="129"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-263.13332)">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.05013251;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect815"
+       width="25.9415"
+       height="32.816536"
+       x="3.9646497"
+       y="263.65839" />
+    <rect
+       style="fill:none;fill-opacity:1;stroke:#ff0000;stroke-width:0.98678774;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect815-3"
+       width="0.071545608"
+       height="30.772118"
+       x="16.89756"
+       y="264.67615" />
+    <rect
+       style="fill:none;fill-opacity:1;stroke:#ff0000;stroke-width:0.9272486;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect815-3-6"
+       width="0.081191778"
+       height="23.942709"
+       x="274.76807"
+       y="-28.642822"
+       transform="matrix(9.5379316e-4,0.99999955,-0.99999794,0.00202899,0,0)" />
+    <rect
+       style="fill:none;fill-opacity:1;stroke:#ff0000;stroke-width:0.9272486;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect815-3-6-7"
+       width="0.081191778"
+       height="23.942709"
+       x="285.62363"
+       y="-28.632275"
+       transform="matrix(9.5379382e-4,0.99999955,-0.99999794,0.00202899,0,0)" />
+  </g>
+</svg>
diff --git a/src/app/puzzle/share/resources/puzzleicon/svg/no_watermark_image.svg b/src/app/puzzle/share/resources/puzzleicon/svg/no_watermark_image.svg
new file mode 100644
index 000000000..3cafa6dbf
--- /dev/null
+++ b/src/app/puzzle/share/resources/puzzleicon/svg/no_watermark_image.svg
@@ -0,0 +1 @@
+<svg id="Capa_1" enable-background="new 0 0 512 512" height="512" viewBox="0 0 512 512" width="512" xmlns="http://www.w3.org/2000/svg"><g><g><path d="m502.681 198.27v68.85l-2.48 1.68-24.29 16.48-58.97-40-58.97 40-58.97-40-58.97 40-58.96-40-58.97 40-26.76-18.15v-219.75c0-22.03 17.85-39.88 39.87-39.88h176.7c15.88 0 67.31 43.85 112.77 90.03 41.48 42.15 78 86.24 78 100.74z" fill="#ddeafb"/><path d="m475.911 332.15 26.77-18.16v150.63c0 22.03-17.85 39.88-39.87 39.88h-327.6c-18.82 0-34.59-13.04-38.78-30.58l-.16-22.8-.93-135.78v-1.34l26.76 18.15 58.97-40 58.96 40 58.97-40 58.97 40 58.97-40z" fill="#ddeafb"/><path d="m502.681 198.27v68.85l-2.48 1.68c-15.77-94.08-100.61-101.12-129.94-130.45l54.42-40.82c41.48 42.15 78 86.24 78 100.74z" fill="#cbe2ff"/><path d="m311.906 7.5h-97.57c.11 0 .22.01.34.01 119.72 3 125.26 100.52 157.15 132.41l40.82-54.42c-42.15-41.48-86.24-78-100.74-78z" fill="#cbe2ff"/><path d="m502.681 198.276v16.868c0-35.514-28.798-64.312-64.312-64.312h-39.143c-22.019 0-39.877-17.858-39.877-39.877v-39.143c0-35.514-28.798-64.312-64.312-64.312h16.868c30.373 0 59.512 12.068 80.989 33.545l76.242 76.242c21.476 21.476 33.545 50.615 33.545 80.989z" fill="#bed8fb"/><circle cx="96.445" cy="141.864" fill="#dd636e" r="87.126"/><path d="m107.749 228.264c-3.7.48-7.48.73-11.31.73-48.12 0-87.12-39.01-87.12-87.13 0-48.11 39-87.12 87.12-87.12 3.83 0 7.61.25 11.31.73-42.78 5.54-75.82 42.11-75.82 86.39 0 44.29 33.04 80.86 75.82 86.4z" fill="#da4a54"/></g><g><path d="m510.181 198.276c0-32.598-12.693-63.244-35.741-86.292l-76.242-76.242c-23.05-23.049-53.695-35.742-86.293-35.742h-.006-176.7c-26.12 0-47.37 21.255-47.37 47.38v.257c-48.153 4.369-86.01 44.956-86.01 94.223 0 49.273 37.856 89.864 86.01 94.233v31.027c0 2.486 1.232 4.811 3.29 6.207l26.769 18.16c2.543 1.725 5.88 1.724 8.421 0l54.761-37.144 54.749 37.144c2.543 1.725 5.88 1.724 8.421 0l54.76-37.144 54.76 37.144c2.541 1.725 5.879 1.724 8.42 0l54.761-37.144 54.76 37.144c1.271.862 2.74 1.293 4.21 1.293s2.939-.431 4.21-1.293l26.76-18.15c2.058-1.396 3.29-3.721 3.29-6.207zm-122.591-151.928 76.242 76.242c12.185 12.184 21.069 26.788 26.205 42.729-13.069-13.549-31.401-21.988-51.669-21.988h-39.143c-17.853 0-32.377-14.524-32.377-32.377v-39.142c0-20.268-8.438-38.599-21.987-51.669 15.942 5.137 30.545 14.021 42.729 26.205zm88.319 229.87-54.76-37.144c-2.541-1.724-5.879-1.724-8.42 0l-54.761 37.144-54.76-37.144c-2.541-1.724-5.879-1.724-8.42 0l-54.76 37.144-54.749-37.144c-2.543-1.725-5.88-1.724-8.421 0l-54.761 37.144-19.27-13.072v-26.876c49.21-3.293 88.24-44.375 88.24-94.41 0-29.062-13.078-56.098-35.881-74.177-3.244-2.573-7.963-2.029-10.536 1.218-2.573 3.246-2.028 7.963 1.218 10.536 19.191 15.217 30.199 37.969 30.199 62.423 0 43.908-35.718 79.63-79.62 79.63-43.908 0-79.63-35.722-79.63-79.63 0-43.903 35.722-79.62 79.63-79.62 7.619 0 15.133 1.069 22.331 3.177 3.979 1.166 8.142-1.115 9.306-5.089 1.165-3.975-1.114-8.141-5.089-9.306-6.547-1.918-13.307-3.107-20.168-3.564v-.078c0-17.854 14.521-32.38 32.37-32.38h159.838c31.326 0 56.812 25.486 56.812 56.812v39.143c0 26.124 21.253 47.377 47.377 47.377h39.143c31.171 0 56.551 25.237 56.801 56.35v48.472z"/><path d="m507.608 308.351c-2.641-2.287-6.383-2.434-9.149-.558l-22.55 15.294-54.76-37.144c-2.541-1.725-5.878-1.724-8.421 0l-19.519 13.243c-3.399 2.306-4.586 6.937-2.382 10.403 2.279 3.586 7.05 4.555 10.543 2.187l15.569-10.563 54.76 37.144c2.541 1.725 5.879 1.724 8.42 0l15.05-10.208v136.471c0 17.883-14.497 32.38-32.38 32.38h-327.59c-.462 0-.921-.01-1.379-.029-16.775-.699-29.846-14.883-29.961-31.673l-.941-137.098 14.97 10.156c2.543 1.725 5.88 1.724 8.421 0l54.761-37.144 54.749 37.144c2.543 1.725 5.88 1.724 8.421 0l54.76-37.144 54.76 37.144c2.54 1.724 5.877 1.724 8.419.001l11.172-7.575c3.399-2.304 4.586-6.933 2.384-10.399-2.279-3.587-7.052-4.559-10.543-2.192l-7.221 4.896-54.761-37.145c-2.541-1.724-5.879-1.724-8.42 0l-54.76 37.144-54.749-37.144c-2.543-1.725-5.88-1.724-8.421 0l-54.761 37.144-22.379-15.18c-1.84-1.248-4.138-1.747-6.287-1.175-3.377.899-5.604 3.914-5.604 7.259v1.402l1.09 154.58c0 17.853 14.019 42.029 46.28 42.029h327.6c26.162 0 47.37-21.208 47.37-47.37v-150.416c0-2.225-.879-4.407-2.561-5.864z"/><path d="m131.2 96.501-34.755 34.755-34.756-34.755c-2.93-2.929-7.678-2.929-10.607 0s-2.929 7.677 0 10.606l34.756 34.756-34.756 34.757c-2.929 2.929-2.929 7.677 0 10.606 1.465 1.465 3.385 2.197 5.304 2.197s3.839-.732 5.304-2.197l34.755-34.755 34.755 34.755c1.465 1.465 3.385 2.197 5.304 2.197s3.839-.732 5.304-2.197c2.929-2.929 2.929-7.677 0-10.606l-34.756-34.756 34.756-34.756c2.929-2.929 2.929-7.677 0-10.606-2.93-2.93-7.678-2.93-10.608-.001z"/></g></g></svg>
\ No newline at end of file
diff --git a/src/app/puzzle/stable.cpp b/src/app/puzzle/stable.cpp
new file mode 100644
index 000000000..460b5cb9c
--- /dev/null
+++ b/src/app/puzzle/stable.cpp
@@ -0,0 +1,30 @@
+/************************************************************************
+ **
+ **  @file   stable.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   November 15, 2013
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2013-2015 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+// Build the precompiled headers.
+#include "stable.h"
diff --git a/src/app/puzzle/stable.h b/src/app/puzzle/stable.h
new file mode 100644
index 000000000..22e9d4702
--- /dev/null
+++ b/src/app/puzzle/stable.h
@@ -0,0 +1,72 @@
+/************************************************************************
+ **
+ **  @file   stable.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   November 15, 2013
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2013-2015 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+#ifndef STABLE_H
+#define STABLE_H
+
+/* I like to include this pragma too, so the build log indicates if pre-compiled headers were in use. */
+#pragma message("Compiling precompiled headers for puzzle utility.\n")
+
+/* Add C includes here */
+
+#if defined __cplusplus
+/* Add C++ includes here */
+#include <csignal>
+
+/*In all cases we need include core header for getting defined values*/
+#ifdef QT_CORE_LIB
+#   include <QtCore>
+#endif
+
+#ifdef QT_GUI_LIB
+#   include <QtGui>
+#endif
+
+#ifdef QT_XML_LIB
+#   include <QtXml>
+#endif
+
+//In Windows you can't use same header in all modes.
+#if !defined(Q_OS_WIN)
+#   ifdef QT_WIDGETS_LIB
+#       include <QtWidgets>
+#   endif
+
+    //Build doesn't work, if include this headers on Windows.
+#   ifdef QT_XMLPATTERNS_LIB
+#       include <QtXmlPatterns>
+#   endif
+
+#   ifdef QT_NETWORK_LIB
+#       include <QtNetwork>
+#   endif
+#endif/*Q_OS_WIN*/
+
+#endif /*__cplusplus*/
+
+#endif // STABLE_H
diff --git a/src/app/puzzle/undocommands/vpundoaddsheet.cpp b/src/app/puzzle/undocommands/vpundoaddsheet.cpp
new file mode 100644
index 000000000..cc0547d51
--- /dev/null
+++ b/src/app/puzzle/undocommands/vpundoaddsheet.cpp
@@ -0,0 +1,90 @@
+/************************************************************************
+ **
+ **  @file   vpundoaddsheet.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   19 8, 2021
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2021 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#include "vpundoaddsheet.h"
+#include "../vmisc/def.h"
+#include "../layout/vpsheet.h"
+#include "../layout/vplayout.h"
+
+//---------------------------------------------------------------------------------------------------------------------
+VPUndoAddSheet::VPUndoAddSheet(const VPSheetPtr &sheet, QUndoCommand *parent)
+    : VPUndoCommand(false, parent),
+      m_sheet(sheet)
+{
+    SCASSERT(not sheet.isNull())
+
+    setText(tr("add sheet"));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPUndoAddSheet::undo()
+{
+    VPSheetPtr sheet = m_sheet.toStrongRef();
+    if (sheet.isNull())
+    {
+        return;
+    }
+
+    sheet->SetVisible(false);
+
+    VPLayoutPtr layout = sheet->GetLayout();
+    if (layout.isNull())
+    {
+        return;
+    }
+
+    emit layout->SheetListChanged();
+    layout->SetFocusedSheet(VPSheetPtr());
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPUndoAddSheet::redo()
+{
+    VPSheetPtr sheet = m_sheet.toStrongRef();
+    if (sheet.isNull())
+    {
+        return;
+    }
+
+    VPLayoutPtr layout = sheet->GetLayout();
+    if (layout.isNull())
+    {
+        return;
+    }
+
+    sheet->SetVisible(true);
+    layout->AddSheet(sheet);
+    emit layout->SheetListChanged();
+    layout->SetFocusedSheet(sheet);
+    emit layout->LayoutChanged();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPUndoAddSheet::id() const -> int
+{
+    return static_cast<int>(ML::UndoCommand::AddSheet);
+}
diff --git a/src/app/puzzle/undocommands/vpundoaddsheet.h b/src/app/puzzle/undocommands/vpundoaddsheet.h
new file mode 100644
index 000000000..628aeef8e
--- /dev/null
+++ b/src/app/puzzle/undocommands/vpundoaddsheet.h
@@ -0,0 +1,51 @@
+/************************************************************************
+ **
+ **  @file   vpundoaddsheet.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   19 8, 2021
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2021 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#ifndef VPUNDOADDSHEET_H
+#define VPUNDOADDSHEET_H
+
+#include "vpundocommand.h"
+
+#include "../layout/layoutdef.h"
+
+class VPUndoAddSheet : public VPUndoCommand
+{
+public:
+    explicit VPUndoAddSheet(const VPSheetPtr &sheet, QUndoCommand *parent = nullptr);
+    virtual ~VPUndoAddSheet()=default;
+
+    virtual void undo() override;
+    virtual void redo() override;
+    virtual auto id() const -> int override;
+
+private:
+    Q_DISABLE_COPY(VPUndoAddSheet)
+
+    VPSheetWeakPtr m_sheet;
+};
+
+#endif // VPUNDOADDSHEET_H
diff --git a/src/app/puzzle/undocommands/vpundocommand.cpp b/src/app/puzzle/undocommands/vpundocommand.cpp
new file mode 100644
index 000000000..d3b18baee
--- /dev/null
+++ b/src/app/puzzle/undocommands/vpundocommand.cpp
@@ -0,0 +1,36 @@
+/************************************************************************
+ **
+ **  @file   vpundocommand.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   16 8, 2021
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2021 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#include "vpundocommand.h"
+
+Q_LOGGING_CATEGORY(vpUndo, "vp.undo")
+
+//---------------------------------------------------------------------------------------------------------------------
+VPUndoCommand::VPUndoCommand(bool allowMerge, QUndoCommand *parent)
+    : QUndoCommand(parent),
+      m_allowMerge(allowMerge)
+{}
diff --git a/src/app/puzzle/undocommands/vpundocommand.h b/src/app/puzzle/undocommands/vpundocommand.h
new file mode 100644
index 000000000..967e0b9e2
--- /dev/null
+++ b/src/app/puzzle/undocommands/vpundocommand.h
@@ -0,0 +1,75 @@
+/************************************************************************
+ **
+ **  @file   vpundocommand.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   16 8, 2021
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2021 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#ifndef VPUNDOCOMMAND_H
+#define VPUNDOCOMMAND_H
+
+#include <QObject>
+#include <QUndoCommand>
+#include <QLoggingCategory>
+
+namespace ML
+{
+enum class UndoCommand: qint8
+{
+    MovePiece = 0,
+    MovePieces = 1,
+    RotatePiece = 2,
+    RotatePieces = 3,
+    MoveOrigin = 4,
+    MoveOnSheet = 5,
+    AddSheet = 6,
+    RemoveSheet = 7,
+};
+}
+
+Q_DECLARE_LOGGING_CATEGORY(vpUndo)
+
+class VPUndoCommand : public QObject, public QUndoCommand
+{
+    Q_OBJECT
+public:
+    explicit VPUndoCommand(bool allowMerge = false, QUndoCommand *parent = nullptr);
+    virtual ~VPUndoCommand() =default;
+
+    auto AllowMerge() const -> bool;
+
+protected:
+    bool m_allowMerge;
+
+private:
+    Q_DISABLE_COPY(VPUndoCommand)
+};
+
+
+//---------------------------------------------------------------------------------------------------------------------
+inline auto VPUndoCommand::AllowMerge() const -> bool
+{
+    return m_allowMerge;
+}
+
+#endif // VPUNDOCOMMAND_H
diff --git a/src/app/puzzle/undocommands/vpundomovepieceonsheet.cpp b/src/app/puzzle/undocommands/vpundomovepieceonsheet.cpp
new file mode 100644
index 000000000..009654ca4
--- /dev/null
+++ b/src/app/puzzle/undocommands/vpundomovepieceonsheet.cpp
@@ -0,0 +1,140 @@
+/************************************************************************
+ **
+ **  @file   vpundomovepieceonsheet.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   19 8, 2021
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2021 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#include "vpundomovepieceonsheet.h"
+#include "../vmisc/def.h"
+#include "../layout/vpsheet.h"
+#include "../layout/vplayout.h"
+#include "../layout/vppiece.h"
+
+//---------------------------------------------------------------------------------------------------------------------
+VPUndoMovePieceOnSheet::VPUndoMovePieceOnSheet(const VPSheetPtr &sheet, const VPPiecePtr &piece, QUndoCommand *parent)
+    : VPUndoCommand(false, parent),
+      m_sheet(sheet),
+      m_piece(piece)
+{
+    SCASSERT(not piece.isNull())
+
+    m_oldSheet = piece->Sheet();
+
+    VPLayoutPtr layout = piece->Layout();
+    if (not layout.isNull())
+    {
+        m_followGrainline = layout->LayoutSettings().GetFollowGrainline();
+    }
+
+    setText(tr("move piece on sheet"));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPUndoMovePieceOnSheet::undo()
+{
+    VPSheetPtr sourceSheet = m_oldSheet.toStrongRef();
+    VPSheetPtr activateSheet = sourceSheet;
+    if (activateSheet.isNull())
+    {
+        activateSheet = m_sheet.toStrongRef();
+    }
+
+    VPLayoutPtr layout;
+
+    if (not activateSheet.isNull())
+    {
+        layout = activateSheet->GetLayout();
+        if (not layout.isNull() && not activateSheet->TrashSheet() && layout->GetFocusedSheet() != activateSheet)
+        {
+            layout->SetFocusedSheet(activateSheet);
+        }
+    }
+
+    VPPiecePtr piece = m_piece.toStrongRef();
+    if (not piece.isNull())
+    {
+        piece->SetSheet(sourceSheet);
+        piece->SetSelected(false);
+
+        if (not layout.isNull())
+        {
+            emit layout->PieceSheetChanged(piece);
+            emit layout->PieceSelectionChanged(piece);
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPUndoMovePieceOnSheet::redo()
+{
+    VPSheetPtr sourceSheet = m_sheet.toStrongRef();
+    VPSheetPtr activateSheet = sourceSheet;
+    if (activateSheet.isNull())
+    {
+        activateSheet = m_oldSheet.toStrongRef();
+    }
+
+    VPLayoutPtr layout;
+
+    if (not activateSheet.isNull())
+    {
+        layout = activateSheet->GetLayout();
+        if (not layout.isNull() && not activateSheet->TrashSheet() && layout->GetFocusedSheet() != activateSheet)
+        {
+            layout->SetFocusedSheet(activateSheet);
+        }
+    }
+
+    VPPiecePtr piece = m_piece.toStrongRef();
+    if (not piece.isNull())
+    {
+        piece->SetSheet(sourceSheet);
+
+        if (sourceSheet.isNull())
+        {
+            piece->SetSelected(false);
+        }
+
+        if (m_followGrainline)
+        {
+            VPTransformationOrigon origin;
+            origin.custom = true;
+
+            piece->RotateToGrainline(origin);
+        }
+
+        if (not layout.isNull())
+        {
+            emit layout->PieceSheetChanged(piece);
+            emit layout->PieceTransformationChanged(piece);
+            emit layout->LayoutChanged();
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPUndoMovePieceOnSheet::id() const -> int
+{
+    return static_cast<int>(ML::UndoCommand::MoveOnSheet);
+}
diff --git a/src/app/puzzle/undocommands/vpundomovepieceonsheet.h b/src/app/puzzle/undocommands/vpundomovepieceonsheet.h
new file mode 100644
index 000000000..7ec924f26
--- /dev/null
+++ b/src/app/puzzle/undocommands/vpundomovepieceonsheet.h
@@ -0,0 +1,54 @@
+/************************************************************************
+ **
+ **  @file   vpundomovepieceonsheet.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   19 8, 2021
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2021 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#ifndef VPUNDOMOVEPIECEONSHEET_H
+#define VPUNDOMOVEPIECEONSHEET_H
+
+#include "vpundocommand.h"
+
+#include "../layout/layoutdef.h"
+
+class VPUndoMovePieceOnSheet : public VPUndoCommand
+{
+public:
+    VPUndoMovePieceOnSheet(const VPSheetPtr &sheet, const VPPiecePtr &piece, QUndoCommand *parent = nullptr);
+    virtual ~VPUndoMovePieceOnSheet()=default;
+
+    virtual void undo() override;
+    virtual void redo() override;
+    virtual auto id() const -> int override;
+
+private:
+    Q_DISABLE_COPY(VPUndoMovePieceOnSheet)
+
+    VPSheetWeakPtr m_oldSheet{};
+    VPSheetWeakPtr m_sheet;
+    VPPieceWeakPtr m_piece;
+    bool           m_followGrainline{false};
+};
+
+#endif // VPUNDOMOVEPIECEONSHEET_H
diff --git a/src/app/puzzle/undocommands/vpundooriginmove.cpp b/src/app/puzzle/undocommands/vpundooriginmove.cpp
new file mode 100644
index 000000000..49601235a
--- /dev/null
+++ b/src/app/puzzle/undocommands/vpundooriginmove.cpp
@@ -0,0 +1,128 @@
+/************************************************************************
+ **
+ **  @file   vpundooriginmove.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   19 8, 2021
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2021 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#include "vpundooriginmove.h"
+#include "../vmisc/def.h"
+#include "../layout/vpsheet.h"
+#include "../layout/vplayout.h"
+
+//---------------------------------------------------------------------------------------------------------------------
+VPUndoOriginMove::VPUndoOriginMove(const VPSheetPtr &sheet, const VPTransformationOrigon &origin, bool allowMerge,
+                                   QUndoCommand *parent)
+    : VPUndoCommand(allowMerge, parent),
+      m_sheet(sheet),
+      m_origin(origin)
+{
+    SCASSERT(not sheet.isNull())
+
+    m_oldOrigin = sheet->TransformationOrigin();
+
+    setText(tr("move transformation origin"));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPUndoOriginMove::undo()
+{
+    VPSheetPtr sheet = m_sheet.toStrongRef();
+    if (sheet.isNull())
+    {
+        return;
+    }
+
+    VPLayoutPtr layout = sheet->GetLayout();
+    if (layout.isNull())
+    {
+        return;
+    }
+
+    if (layout->GetFocusedSheet() != sheet)
+    {
+        layout->SetFocusedSheet(sheet);
+    }
+
+    sheet->SetTransformationOrigin(m_oldOrigin);
+    layout->TransformationOriginChanged();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPUndoOriginMove::redo()
+{
+    VPSheetPtr sheet = m_sheet.toStrongRef();
+    if (sheet.isNull())
+    {
+        return;
+    }
+
+    VPLayoutPtr layout = sheet->GetLayout();
+    if (layout.isNull())
+    {
+        return;
+    }
+
+    if (layout->GetFocusedSheet() != sheet)
+    {
+        layout->SetFocusedSheet(sheet);
+    }
+
+    sheet->SetTransformationOrigin(m_origin);
+    emit layout->TransformationOriginChanged();
+    emit layout->LayoutChanged();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPUndoOriginMove::mergeWith(const QUndoCommand *command) -> bool
+{
+    if (command->id() != id()) // make sure other is also an VPUndoPieceMove command
+    {
+        return false;
+    }
+
+    const auto *moveCommand = dynamic_cast<const VPUndoOriginMove *>(command);
+    SCASSERT(moveCommand != nullptr)
+
+    VPSheetPtr sheet = Sheet();
+    if (moveCommand->Sheet().isNull() || sheet.isNull() || not moveCommand->AllowMerge())
+    {
+        return false;
+    }
+
+    VPTransformationOrigon origin = moveCommand->Origin();
+
+    if (origin.custom != m_origin.custom)
+    {
+        return false;
+    }
+
+    m_origin.origin += origin.origin;
+    return true;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPUndoOriginMove::id() const -> int
+{
+    return static_cast<int>(ML::UndoCommand::MoveOrigin);
+}
diff --git a/src/app/puzzle/undocommands/vpundooriginmove.h b/src/app/puzzle/undocommands/vpundooriginmove.h
new file mode 100644
index 000000000..837092508
--- /dev/null
+++ b/src/app/puzzle/undocommands/vpundooriginmove.h
@@ -0,0 +1,73 @@
+/************************************************************************
+ **
+ **  @file   vpundooriginmove.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   19 8, 2021
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2021 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#ifndef VPUNDOORIGINMOVE_H
+#define VPUNDOORIGINMOVE_H
+
+#include "vpundocommand.h"
+
+#include "../layout/layoutdef.h"
+
+class VPUndoOriginMove : public VPUndoCommand
+{
+    Q_OBJECT
+public:
+    VPUndoOriginMove(const VPSheetPtr &sheet, const VPTransformationOrigon &origin, bool allowMerge = false,
+                     QUndoCommand *parent = nullptr);
+    virtual ~VPUndoOriginMove()=default;
+
+    virtual void undo() override;
+    virtual void redo() override;
+    // cppcheck-suppress unusedFunction
+    virtual auto mergeWith(const QUndoCommand *command) -> bool override;
+    virtual auto id() const -> int override;
+
+    auto Sheet() const -> VPSheetWeakPtr;
+    auto Origin() const -> const VPTransformationOrigon &;
+
+private:
+    Q_DISABLE_COPY(VPUndoOriginMove)
+
+    VPSheetWeakPtr         m_sheet;
+    VPTransformationOrigon m_oldOrigin{};
+    VPTransformationOrigon m_origin{};
+
+};
+
+//---------------------------------------------------------------------------------------------------------------------
+inline auto VPUndoOriginMove::Sheet() const -> VPSheetWeakPtr
+{
+    return m_sheet;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline auto VPUndoOriginMove::Origin() const ->const VPTransformationOrigon &
+{
+    return m_origin;
+}
+
+#endif // VPUNDOORIGINMOVE_H
diff --git a/src/app/puzzle/undocommands/vpundopiecemove.cpp b/src/app/puzzle/undocommands/vpundopiecemove.cpp
new file mode 100644
index 000000000..d1ffbbc27
--- /dev/null
+++ b/src/app/puzzle/undocommands/vpundopiecemove.cpp
@@ -0,0 +1,288 @@
+/************************************************************************
+ **
+ **  @file   vpundopiecemove.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   16 8, 2021
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2021 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#include "vpundopiecemove.h"
+#include "../vmisc/def.h"
+#include "../layout/vppiece.h"
+#include "../layout/vplayout.h"
+
+//---------------------------------------------------------------------------------------------------------------------
+VPUndoPieceMove::VPUndoPieceMove(const VPPiecePtr &piece, qreal dx, qreal dy, bool allowMerge, QUndoCommand *parent)
+    : VPUndoCommand(allowMerge, parent),
+      m_piece(piece),
+      m_dx(dx),
+      m_dy(dy)
+{
+    SCASSERT(not piece.isNull())
+
+    m_oldTransform = piece->GetMatrix();
+
+    setText(tr("move piece"));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPUndoPieceMove::undo()
+{
+    VPPiecePtr piece = Piece();
+    if (piece.isNull())
+    {
+        return;
+    }
+
+    VPLayoutPtr layout = piece->Layout();
+    if (layout.isNull())
+    {
+        return;
+    }
+
+    if (layout->GetFocusedSheet() != piece->Sheet())
+    {
+        layout->SetFocusedSheet(piece->Sheet());
+    }
+
+    piece->SetMatrix(m_oldTransform);
+    emit layout->PieceTransformationChanged(piece);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPUndoPieceMove::redo()
+{
+    VPPiecePtr piece = Piece();
+    if (piece.isNull())
+    {
+        return;
+    }
+
+    VPLayoutPtr layout = piece->Layout();
+    if (layout.isNull())
+    {
+        return;
+    }
+
+    if (layout->GetFocusedSheet() != piece->Sheet())
+    {
+        layout->SetFocusedSheet(piece->Sheet());
+    }
+
+    piece->Translate(m_dx, m_dy);
+    emit layout->PieceTransformationChanged(piece);
+    emit layout->LayoutChanged();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPUndoPieceMove::mergeWith(const QUndoCommand *command) -> bool
+{
+    if (command->id() != id()) // make sure other is also an VPUndoPieceMove command
+    {
+        return false;
+    }
+
+    const auto *moveCommand = dynamic_cast<const VPUndoPieceMove *>(command);
+    SCASSERT(moveCommand != nullptr)
+
+    VPPiecePtr piece = Piece();
+    if (moveCommand->Piece().isNull() || piece.isNull() || moveCommand->Piece() != piece ||
+            not moveCommand->AllowMerge())
+    {
+        return false;
+    }
+
+    m_dx += moveCommand->Dx();
+    m_dy += moveCommand->Dy();
+    return true;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPUndoPieceMove::id() const -> int
+{
+    return static_cast<int>(ML::UndoCommand::MovePiece);
+}
+
+// move pieces
+//---------------------------------------------------------------------------------------------------------------------
+VPUndoPiecesMove::VPUndoPiecesMove(const QList<VPPiecePtr> &pieces, qreal dx, qreal dy, bool allowMerge,
+                                   QUndoCommand *parent)
+    : VPUndoCommand(allowMerge, parent),
+      m_dx(dx),
+      m_dy(dy)
+{
+    setText(QObject::tr("move pieces"));
+
+    for (const auto& piece : pieces)
+    {
+        if (not piece.isNull())
+        {
+            m_pieces.append(piece);
+            m_oldTransforms.insert(piece->GetUniqueID(), piece->GetMatrix());
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPUndoPiecesMove::undo()
+{
+    if (m_pieces.isEmpty())
+    {
+        return;
+    }
+
+    VPLayoutPtr layout = Layout();
+    if (layout.isNull())
+    {
+        return;
+    }
+
+    VPSheetPtr sheet = Sheet();
+    if (layout->GetFocusedSheet() != sheet)
+    {
+        layout->SetFocusedSheet(sheet);
+    }
+
+    for (const auto& piece : m_pieces)
+    {
+        VPPiecePtr p = piece.toStrongRef();
+        if (not p.isNull())
+        {
+            if (m_oldTransforms.contains(p->GetUniqueID()))
+            {
+                p->SetMatrix(m_oldTransforms.value(p->GetUniqueID()));
+                emit layout->PieceTransformationChanged(p);
+            }
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPUndoPiecesMove::redo()
+{
+    if (m_pieces.isEmpty())
+    {
+        return;
+    }
+
+    VPLayoutPtr layout = Layout();
+    if (layout.isNull())
+    {
+        return;
+    }
+
+    VPSheetPtr sheet = Sheet();
+    if (layout->GetFocusedSheet() != sheet)
+    {
+        layout->SetFocusedSheet(sheet);
+    }
+
+    for (const auto& piece : m_pieces)
+    {
+        VPPiecePtr p = piece.toStrongRef();
+        if (not p.isNull())
+        {
+            p->Translate(m_dx, m_dy);
+            emit layout->PieceTransformationChanged(p);
+        }
+    }
+
+    emit layout->LayoutChanged();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPUndoPiecesMove::mergeWith(const QUndoCommand *command) -> bool
+{
+    if (command->id() != id()) // make sure other is also an VPUndoPieceMove command
+    {
+        return false;
+    }
+
+    const auto *moveCommand = dynamic_cast<const VPUndoPiecesMove *>(command);
+    SCASSERT(moveCommand != nullptr)
+
+    if (moveCommand->PieceIds() != PieceIds())
+    {
+        return false;
+    }
+
+    if (not moveCommand->AllowMerge())
+    {
+        return false;
+    }
+
+    m_dx += moveCommand->Dx();
+    m_dy += moveCommand->Dy();
+    return true;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPUndoPiecesMove::id() const -> int
+{
+    return static_cast<int>(ML::UndoCommand::MovePieces);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPUndoPiecesMove::Layout() const -> VPLayoutPtr
+{
+    for (const auto& piece : m_pieces)
+    {
+        VPPiecePtr p = piece.toStrongRef();
+        if (not p.isNull())
+        {
+            return p->Layout();
+        }
+    }
+
+    return nullptr;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPUndoPiecesMove::Sheet() const  -> VPSheetPtr
+{
+    for (const auto& piece : m_pieces)
+    {
+        VPPiecePtr p = piece.toStrongRef();
+        if (not p.isNull())
+        {
+            return p->Sheet();
+        }
+    }
+
+    return nullptr;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline auto VPUndoPiecesMove::PieceIds() const -> QSet<QString>
+{
+    QSet<QString> ids;
+    for (const auto& piece : m_pieces)
+    {
+        VPPiecePtr p = piece.toStrongRef();
+        if (not p.isNull())
+        {
+            ids.insert(p->GetUniqueID());
+        }
+    };
+
+    return ids;
+}
diff --git a/src/app/puzzle/undocommands/vpundopiecemove.h b/src/app/puzzle/undocommands/vpundopiecemove.h
new file mode 100644
index 000000000..fe84e3413
--- /dev/null
+++ b/src/app/puzzle/undocommands/vpundopiecemove.h
@@ -0,0 +1,125 @@
+/************************************************************************
+ **
+ **  @file   vpundopiecemove.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   16 8, 2021
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2021 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#ifndef VPUNDOPIECEMOVE_H
+#define VPUNDOPIECEMOVE_H
+
+#include "vpundocommand.h"
+
+#include <QTransform>
+
+#include "../layout/layoutdef.h"
+
+class VPUndoPieceMove : public VPUndoCommand
+{
+    Q_OBJECT
+public:
+    explicit VPUndoPieceMove(const VPPiecePtr &piece, qreal dx, qreal dy, bool allowMerge = false,
+                             QUndoCommand *parent = nullptr);
+    virtual ~VPUndoPieceMove()=default;
+
+    virtual void undo() override;
+    virtual void redo() override;
+    // cppcheck-suppress unusedFunction
+    virtual auto mergeWith(const QUndoCommand *command) -> bool override;
+    virtual auto id() const -> int override ;
+
+    auto Piece() const -> VPPiecePtr;
+    auto Dx() const -> qreal;
+    auto Dy() const -> qreal;
+
+private:
+    Q_DISABLE_COPY(VPUndoPieceMove)
+
+    VPPieceWeakPtr m_piece;
+    QTransform     m_oldTransform{};
+    qreal          m_dx;
+    qreal          m_dy;
+};
+
+//---------------------------------------------------------------------------------------------------------------------
+inline auto VPUndoPieceMove::Piece() const -> VPPiecePtr
+{
+    return m_piece;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline auto VPUndoPieceMove::Dx() const -> qreal
+{
+    return m_dx;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline auto VPUndoPieceMove::Dy() const -> qreal
+{
+    return m_dy;
+}
+
+// Move pieces
+class VPUndoPiecesMove : public VPUndoCommand
+{
+    Q_OBJECT
+public:
+    explicit VPUndoPiecesMove(const QList<VPPiecePtr> &pieces, qreal dx, qreal dy, bool allowMerge = false,
+                              QUndoCommand *parent = nullptr);
+    virtual ~VPUndoPiecesMove()=default;
+
+    virtual void undo() override;
+    virtual void redo() override;
+    // cppcheck-suppress unusedFunction
+    virtual auto mergeWith(const QUndoCommand *command) -> bool override;
+    virtual auto id() const -> int override ;
+
+    auto PieceIds() const -> QSet<QString>;
+    auto Dx() const -> qreal;
+    auto Dy() const -> qreal;
+
+private:
+    Q_DISABLE_COPY(VPUndoPiecesMove)
+
+    QVector<VPPieceWeakPtr>   m_pieces{};
+    QMap<QString, QTransform> m_oldTransforms{};
+    qreal                     m_dx;
+    qreal                     m_dy;
+
+    auto Layout() const -> VPLayoutPtr;
+    auto Sheet() const -> VPSheetPtr;
+};
+
+//---------------------------------------------------------------------------------------------------------------------
+inline auto VPUndoPiecesMove::Dx() const -> qreal
+{
+    return m_dx;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline auto VPUndoPiecesMove::Dy() const -> qreal
+{
+    return m_dy;
+}
+
+#endif // VPUNDOPIECEMOVE_H
diff --git a/src/app/puzzle/undocommands/vpundopiecerotate.cpp b/src/app/puzzle/undocommands/vpundopiecerotate.cpp
new file mode 100644
index 000000000..603cba7fb
--- /dev/null
+++ b/src/app/puzzle/undocommands/vpundopiecerotate.cpp
@@ -0,0 +1,360 @@
+/************************************************************************
+ **
+ **  @file   vpundopiecerotate.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   18 8, 2021
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2021 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#include "vpundopiecerotate.h"
+#include "../layout/vppiece.h"
+#include "../layout/vplayout.h"
+
+namespace
+{
+auto RoundAngle(qreal angle) -> qreal
+{
+    QLineF l(10, 10, 100, 10);
+    l.setAngle(angle);
+    return l.angle();
+}
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+VPUndoPieceRotate::VPUndoPieceRotate(const VPPiecePtr &piece, const VPTransformationOrigon &origin, qreal angle,
+                                     qreal angleSum, bool allowMerge, QUndoCommand *parent)
+    : VPUndoCommand(allowMerge, parent),
+      m_piece(piece),
+      m_origin(origin),
+      m_angle(angle),
+      m_angleSum(angleSum)
+{
+    SCASSERT(not piece.isNull())
+
+    m_oldTransform = piece->GetMatrix();
+
+    VPLayoutPtr layout = piece->Layout();
+    if (not layout.isNull())
+    {
+        m_followGrainline = layout->LayoutSettings().GetFollowGrainline();
+    }
+
+    setText(tr("rotate piece"));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPUndoPieceRotate::undo()
+{
+    VPPiecePtr piece = Piece();
+    if (piece.isNull())
+    {
+        return;
+    }
+
+    VPLayoutPtr layout = piece->Layout();
+    if (layout.isNull())
+    {
+        return;
+    }
+
+    if (layout->GetFocusedSheet() != piece->Sheet())
+    {
+        layout->SetFocusedSheet(piece->Sheet());
+    }
+
+    piece->SetMatrix(m_oldTransform);
+    emit layout->PieceTransformationChanged(piece);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPUndoPieceRotate::redo()
+{
+    VPPiecePtr piece = Piece();
+    if (piece.isNull())
+    {
+        return;
+    }
+
+    VPLayoutPtr layout = piece->Layout();
+    if (layout.isNull())
+    {
+        return;
+    }
+
+    if (layout->GetFocusedSheet() != piece->Sheet())
+    {
+        layout->SetFocusedSheet(piece->Sheet());
+    }
+
+    if (m_firstCall)
+    {
+        if (m_followGrainline && piece->IsGrainlineEnabled())
+        {
+            piece->Rotate(m_origin.origin, m_angleSum);
+        }
+        else
+        {
+            piece->Rotate(m_origin.origin, m_angle);
+        }
+    }
+    else
+    {
+        piece->Rotate(m_origin.origin, m_angle);
+    }
+
+    if (m_followGrainline)
+    {
+        piece->RotateToGrainline(m_origin);
+    }
+
+    emit layout->PieceTransformationChanged(piece);
+
+    if (m_firstCall)
+    {
+        m_firstCall = false;
+    }
+
+    emit layout->LayoutChanged();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPUndoPieceRotate::mergeWith(const QUndoCommand *command) -> bool
+{
+    if (command->id() != id()) // make sure other is also an VPUndoPieceMove command
+    {
+        return false;
+    }
+
+    const auto *moveCommand = dynamic_cast<const VPUndoPieceRotate *>(command);
+    SCASSERT(moveCommand != nullptr)
+
+    VPPiecePtr piece = Piece();
+    if (not moveCommand->AllowMerge() || (moveCommand->Piece().isNull() || piece.isNull()) ||
+            moveCommand->Piece() != piece || moveCommand->Origin() != m_origin ||
+            moveCommand->FollowGrainline() != m_followGrainline)
+    {
+        return false;
+    }
+
+    m_angle += moveCommand->Angle();
+    m_angle = RoundAngle(m_angle);
+    return true;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPUndoPieceRotate::id() const -> int
+{
+    return static_cast<int>(ML::UndoCommand::RotatePiece);
+}
+
+// rotate pieces
+//---------------------------------------------------------------------------------------------------------------------
+VPUndoPiecesRotate::VPUndoPiecesRotate(const QList<VPPiecePtr> &pieces, const VPTransformationOrigon &origin,
+                                       qreal angle, qreal angleSum, bool allowMerge, QUndoCommand *parent)
+    : VPUndoCommand(allowMerge, parent),
+      m_origin(origin),
+      m_angle(angle),
+      m_angleSum(angleSum)
+{
+    setText(QObject::tr("rotate pieces"));
+
+    for (const auto& piece : pieces)
+    {
+        if (not piece.isNull())
+        {
+            m_pieces.append(piece);
+            m_oldTransforms.insert(piece->GetUniqueID(), piece->GetMatrix());
+        }
+    }
+
+    VPLayoutPtr layout = Layout();
+    if (not layout.isNull())
+    {
+        m_followGrainline = layout->LayoutSettings().GetFollowGrainline();
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPUndoPiecesRotate::undo()
+{
+    if (m_pieces.isEmpty())
+    {
+        return;
+    }
+
+    VPLayoutPtr layout = Layout();
+    if (layout.isNull())
+    {
+        return;
+    }
+
+    VPSheetPtr sheet = Sheet();
+    if (layout->GetFocusedSheet() != sheet)
+    {
+        layout->SetFocusedSheet(sheet);
+    }
+
+    for (const auto& piece : m_pieces)
+    {
+        VPPiecePtr p = piece.toStrongRef();
+        if (not p.isNull())
+        {
+            if (m_oldTransforms.contains(p->GetUniqueID()))
+            {
+                p->SetMatrix(m_oldTransforms.value(p->GetUniqueID()));
+                emit layout->PieceTransformationChanged(p);
+            }
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPUndoPiecesRotate::redo()
+{
+    if (m_pieces.isEmpty())
+    {
+        return;
+    }
+
+    VPLayoutPtr layout = Layout();
+    if (layout.isNull())
+    {
+        return;
+    }
+
+    VPSheetPtr sheet = Sheet();
+    if (layout->GetFocusedSheet() != sheet)
+    {
+        layout->SetFocusedSheet(sheet);
+    }
+
+    for (const auto& piece : m_pieces)
+    {
+        VPPiecePtr p = piece.toStrongRef();
+        if (not p.isNull())
+        {
+            if (m_firstCall)
+            {
+                if (m_followGrainline && p->IsGrainlineEnabled())
+                {
+                    p->Rotate(m_origin.origin, m_angleSum);
+                }
+                else
+                {
+                    p->Rotate(m_origin.origin, m_angle);
+                }
+            }
+            else
+            {
+                p->Rotate(m_origin.origin, m_angle);
+            }
+
+            if (m_followGrainline)
+            {
+                p->RotateToGrainline(m_origin);
+            }
+
+            emit layout->PieceTransformationChanged(p);
+        }
+    }
+
+    if (m_firstCall)
+    {
+        m_firstCall = false;
+    }
+
+    emit layout->LayoutChanged();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPUndoPiecesRotate::mergeWith(const QUndoCommand *command) -> bool
+{
+    if (command->id() != id()) // make sure other is also an VPUndoPieceMove command
+    {
+        return false;
+    }
+
+    const auto *moveCommand = dynamic_cast<const VPUndoPiecesRotate *>(command);
+    SCASSERT(moveCommand != nullptr)
+
+    if (not moveCommand->AllowMerge() || moveCommand->PieceIds() != PieceIds() || moveCommand->Origin() != m_origin ||
+            moveCommand->FollowGrainline() != m_followGrainline)
+    {
+        return false;
+    }
+
+    m_angle += moveCommand->Angle();
+    m_angle = RoundAngle(m_angle);
+    return true;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPUndoPiecesRotate::id() const -> int
+{
+    return static_cast<int>(ML::UndoCommand::RotatePieces);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPUndoPiecesRotate::PieceIds() const -> QSet<QString>
+{
+    QSet<QString> ids;
+    for (const auto& piece : m_pieces)
+    {
+        VPPiecePtr p = piece.toStrongRef();
+        if (not p.isNull())
+        {
+            ids.insert(p->GetUniqueID());
+        }
+    };
+
+    return ids;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPUndoPiecesRotate::Layout() const -> VPLayoutPtr
+{
+    for (const auto& piece : m_pieces)
+    {
+        VPPiecePtr p = piece.toStrongRef();
+        if (not p.isNull())
+        {
+            return p->Layout();
+        }
+    }
+
+    return nullptr;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPUndoPiecesRotate::Sheet() const -> VPSheetPtr
+{
+    for (const auto& piece : m_pieces)
+    {
+        VPPiecePtr p = piece.toStrongRef();
+        if (not p.isNull())
+        {
+            return p->Sheet();
+        }
+    }
+
+    return nullptr;
+}
diff --git a/src/app/puzzle/undocommands/vpundopiecerotate.h b/src/app/puzzle/undocommands/vpundopiecerotate.h
new file mode 100644
index 000000000..769862cad
--- /dev/null
+++ b/src/app/puzzle/undocommands/vpundopiecerotate.h
@@ -0,0 +1,147 @@
+/************************************************************************
+ **
+ **  @file   vpundopiecerotate.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   18 8, 2021
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2021 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#ifndef VPUNDOPIECEROTATE_H
+#define VPUNDOPIECEROTATE_H
+
+#include "vpundocommand.h"
+
+#include <QTransform>
+
+#include "../layout/layoutdef.h"
+
+class VPUndoPieceRotate : public VPUndoCommand
+{
+    Q_OBJECT
+public:
+    VPUndoPieceRotate(const VPPiecePtr &piece, const VPTransformationOrigon &origin, qreal angle, qreal angleSum,
+                      bool allowMerge = false, QUndoCommand *parent = nullptr);
+
+    virtual ~VPUndoPieceRotate()=default;
+
+    virtual void undo() override;
+    virtual void redo() override;
+    // cppcheck-suppress unusedFunction
+    virtual auto mergeWith(const QUndoCommand *command) -> bool override;
+    virtual auto id() const -> int override ;
+
+    auto Piece() const -> VPPiecePtr;
+    auto Origin() const -> VPTransformationOrigon;
+    auto Angle() const -> qreal;
+
+    bool FollowGrainline() const;
+
+private:
+    Q_DISABLE_COPY(VPUndoPieceRotate)
+
+    bool           m_firstCall{true};
+    VPPieceWeakPtr m_piece;
+    QTransform     m_oldTransform{};
+    VPTransformationOrigon m_origin;
+    qreal          m_angle;
+    qreal          m_angleSum;
+    bool           m_followGrainline{false};
+};
+
+//---------------------------------------------------------------------------------------------------------------------
+inline auto VPUndoPieceRotate::Piece() const -> VPPiecePtr
+{
+    return m_piece;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline auto VPUndoPieceRotate::Origin() const -> VPTransformationOrigon
+{
+    return m_origin;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline auto VPUndoPieceRotate::Angle() const -> qreal
+{
+    return m_angle;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline auto VPUndoPieceRotate::FollowGrainline() const -> bool
+{
+    return m_followGrainline;
+}
+
+// Rotate pieces
+class VPUndoPiecesRotate : public VPUndoCommand
+{
+    Q_OBJECT
+public:
+    explicit VPUndoPiecesRotate(const QList<VPPiecePtr> &pieces, const VPTransformationOrigon &origin, qreal angle,
+                                qreal angleSum, bool allowMerge = false, QUndoCommand *parent = nullptr);
+    virtual ~VPUndoPiecesRotate()=default;
+
+    virtual void undo() override;
+    virtual void redo() override;
+    // cppcheck-suppress unusedFunction
+    virtual auto mergeWith(const QUndoCommand *command) -> bool override;
+    virtual auto id() const -> int override ;
+
+    auto PieceIds() const -> QSet<QString>;
+    auto Origin() const -> VPTransformationOrigon;
+    auto Angle() const -> qreal;
+    auto FollowGrainline() const -> bool;
+
+private:
+    Q_DISABLE_COPY(VPUndoPiecesRotate)
+
+    bool                      m_firstCall{true};
+    QVector<VPPieceWeakPtr>   m_pieces{};
+    QMap<QString, QTransform> m_oldTransforms{};
+    VPTransformationOrigon    m_origin;
+    qreal                     m_angle;
+    qreal                     m_angleSum;
+    bool                      m_followGrainline{false};
+
+    auto Layout() const -> VPLayoutPtr;
+    auto Sheet() const -> VPSheetPtr;
+};
+
+//---------------------------------------------------------------------------------------------------------------------
+inline auto VPUndoPiecesRotate::Origin() const -> VPTransformationOrigon
+{
+    return m_origin;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline auto VPUndoPiecesRotate::Angle() const -> qreal
+{
+    return m_angle;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline auto VPUndoPiecesRotate::FollowGrainline() const -> bool
+{
+    return m_followGrainline;
+}
+
+#endif // VPUNDOPIECEROTATE_H
diff --git a/src/app/puzzle/undocommands/vpundoremovesheet.cpp b/src/app/puzzle/undocommands/vpundoremovesheet.cpp
new file mode 100644
index 000000000..316754b11
--- /dev/null
+++ b/src/app/puzzle/undocommands/vpundoremovesheet.cpp
@@ -0,0 +1,121 @@
+/************************************************************************
+ **
+ **  @file   vpundoremovesheet.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   19 8, 2021
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2021 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#include "vpundoremovesheet.h"
+#include "../vmisc/def.h"
+#include "../layout/vpsheet.h"
+#include "../layout/vppiece.h"
+#include "../layout/vplayout.h"
+
+//---------------------------------------------------------------------------------------------------------------------
+VPUndoRemoveSheet::VPUndoRemoveSheet(const VPSheetPtr &sheet, QUndoCommand *parent)
+    : VPUndoCommand(false, parent),
+      m_sheet(sheet)
+{
+    SCASSERT(not sheet.isNull())
+
+    QList<VPPiecePtr> pieces = sheet->GetPieces();
+    for (auto piece : pieces)
+    {
+        m_pieces.append(piece);
+    }
+
+    setText(tr("add sheet"));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPUndoRemoveSheet::undo()
+{
+    VPSheetPtr sheet = m_sheet.toStrongRef();
+    if (sheet.isNull())
+    {
+        return;
+    }
+
+    if (not sheet.isNull())
+    {
+        sheet->SetVisible(true);
+
+        for (const auto &piece : m_pieces)
+        {
+            VPPiecePtr p = piece.toStrongRef();
+            if (not p.isNull())
+            {
+                p->SetSheet(sheet);
+            }
+        }
+
+        VPLayoutPtr layout = sheet->GetLayout();
+        if (layout.isNull())
+        {
+            return;
+        }
+
+        emit layout->SheetListChanged();
+        layout->SetFocusedSheet(sheet);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPUndoRemoveSheet::redo()
+{
+    VPSheetPtr sheet = m_sheet.toStrongRef();
+    if (sheet.isNull())
+    {
+        return;
+    }
+
+    if (not sheet.isNull())
+    {
+        sheet->SetVisible(false);
+
+        for (const auto &piece : m_pieces)
+        {
+            VPPiecePtr p = piece.toStrongRef();
+            if (not p.isNull())
+            {
+                p->SetSheet(VPSheetPtr());
+            }
+        }
+    }
+
+    VPLayoutPtr layout = sheet->GetLayout();
+    if (layout.isNull())
+    {
+        return;
+    }
+
+    emit layout->SheetListChanged();
+    layout->SetFocusedSheet(VPSheetPtr());
+    emit layout->LayoutChanged();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPUndoRemoveSheet::id() const -> int
+{
+    return static_cast<int>(ML::UndoCommand::RemoveSheet);
+}
diff --git a/src/app/puzzle/undocommands/vpundoremovesheet.h b/src/app/puzzle/undocommands/vpundoremovesheet.h
new file mode 100644
index 000000000..e3fea07b0
--- /dev/null
+++ b/src/app/puzzle/undocommands/vpundoremovesheet.h
@@ -0,0 +1,52 @@
+/************************************************************************
+ **
+ **  @file   vpundoremovesheet.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   19 8, 2021
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2021 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#ifndef VPUNDOREMOVESHEET_H
+#define VPUNDOREMOVESHEET_H
+
+#include "vpundocommand.h"
+
+#include "../layout/layoutdef.h"
+
+class VPUndoRemoveSheet : public VPUndoCommand
+{
+public:
+    explicit VPUndoRemoveSheet(const VPSheetPtr &sheet, QUndoCommand *parent = nullptr);
+    virtual ~VPUndoRemoveSheet()=default;
+
+    virtual void undo() override;
+    virtual void redo() override;
+    virtual auto id() const -> int override;
+
+private:
+    Q_DISABLE_COPY(VPUndoRemoveSheet)
+
+    QList<VPPieceWeakPtr> m_pieces{};
+    VPSheetWeakPtr        m_sheet;
+};
+
+#endif // VPUNDOREMOVESHEET_H
diff --git a/src/app/puzzle/version.h b/src/app/puzzle/version.h
new file mode 100644
index 000000000..bde0ae5b0
--- /dev/null
+++ b/src/app/puzzle/version.h
@@ -0,0 +1,39 @@
+/************************************************************************
+ **
+ **  @file   version.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   November 15, 2013
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2013-2015 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+#ifndef VERSION_H
+#define VERSION_H
+
+#include "../../libs/vmisc/projectversion.h"
+
+#define VER_INTERNALNAME_STR        "Puzzle"
+#define VER_ORIGINALFILENAME_STR    "puzzle.exe"
+#define VER_PRODUCTNAME_STR         "Puzzle"
+#define VER_FILEDESCRIPTION_STR     "Valentina's manual layout creator."
+
+#endif // VERSION_H
diff --git a/src/app/puzzle/vpapplication.cpp b/src/app/puzzle/vpapplication.cpp
new file mode 100644
index 000000000..0b349b0c4
--- /dev/null
+++ b/src/app/puzzle/vpapplication.cpp
@@ -0,0 +1,676 @@
+/************************************************************************
+ **
+ **  @file   vpapplication.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   16 2, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+#include "vpapplication.h"
+#include "version.h"
+#include "vpmainwindow.h"
+#include "../ifc/exception/vexceptionobjecterror.h"
+#include "../ifc/exception/vexceptionbadid.h"
+#include "../ifc/exception/vexceptionconversionerror.h"
+#include "../ifc/exception/vexceptionemptyparameter.h"
+#include "../ifc/exception/vexceptionwrongid.h"
+#include "../vmisc/vsysexits.h"
+#include "../vmisc/diagnostic.h"
+#include "../vmisc/qt_dispatch/qt_dispatch.h"
+
+#include <QMessageBox>
+#include <QLoggingCategory>
+
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_CLANG("-Wmissing-prototypes")
+QT_WARNING_DISABLE_INTEL(1418)
+
+Q_LOGGING_CATEGORY(pApp, "p.application")
+
+QT_WARNING_POP
+
+#include <QCommandLineParser>
+#include <QLocalSocket>
+#include <QLocalServer>
+#include <QFileOpenEvent>
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
+{
+    // only the GUI thread should display message boxes.  If you are
+    // writing a multithreaded application and the error happens on
+    // a non-GUI thread, you'll have to queue the message to the GUI
+    QCoreApplication *instance = QCoreApplication::instance();
+    const bool isGuiThread = (instance != nullptr) && (QThread::currentThread() == instance->thread());
+
+    if (not isGuiThread)
+    {
+        auto Handler = [](QtMsgType type, const QMessageLogContext &context, const QString &msg)
+        {
+            noisyFailureMsgHandler(type, context, msg);
+        };
+
+        q_dispatch_async_main(Handler, type, context, msg);
+        return;
+    }
+
+    // Why on earth didn't Qt want to make failed signal/slot connections qWarning?
+    if ((type == QtDebugMsg) && msg.contains(QStringLiteral("::connect")))
+    {
+        type = QtWarningMsg;
+    }
+
+#if defined(V_NO_ASSERT)
+    // I have decided to hide this annoing message for release builds.
+    if ((type == QtWarningMsg) && msg.contains(QStringLiteral("QSslSocket: cannot resolve")))
+    {
+        type = QtDebugMsg;
+    }
+
+    if ((type == QtWarningMsg) && msg.contains(QStringLiteral("setGeometry: Unable to set geometry")))
+    {
+        type = QtDebugMsg;
+    }
+#endif //defined(V_NO_ASSERT)
+
+#if defined(Q_OS_MAC)
+#   if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0) && QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
+        // Try hide very annoying, Qt related, warnings in Mac OS X
+        // QNSView mouseDragged: Internal mouse button tracking invalid (missing Qt::LeftButton)
+        // https://bugreports.qt.io/browse/QTBUG-42846
+        if ((type == QtWarningMsg) && msg.contains(QStringLiteral("QNSView")))
+        {
+            type = QtDebugMsg;
+        }
+#   endif
+
+#   if QT_VERSION < QT_VERSION_CHECK(5, 9, 0)
+    // Hide Qt bug 'Assertion when reading an icns file'
+    // https://bugreports.qt.io/browse/QTBUG-45537
+    // Remove after Qt fix will be released
+    if ((type == QtWarningMsg) && msg.contains(QStringLiteral("QICNSHandler::read()")))
+    {
+        type = QtDebugMsg;
+    }
+#   endif
+
+    // Hide anything that starts with QMacCGContext
+    if ((type == QtWarningMsg) && msg.contains(QStringLiteral("QMacCGContext::")))
+    {
+        type = QtDebugMsg;
+    }
+
+    // See issue #568
+    if (msg.contains(QStringLiteral("Error receiving trust for a CA certificate")))
+    {
+        type = QtDebugMsg;
+    }
+#endif
+
+    // this is another one that doesn't make sense as just a debug message.  pretty serious
+    // sign of a problem
+    // http://www.developer.nokia.com/Community/Wiki/QPainter::begin:Paint_device_returned_engine_%3D%3D_0_(Known_Issue)
+    if ((type == QtDebugMsg) && msg.contains(QStringLiteral("QPainter::begin"))
+        && msg.contains(QStringLiteral("Paint device returned engine")))
+    {
+        type = QtWarningMsg;
+    }
+
+    // This qWarning about "Cowardly refusing to send clipboard message to hung application..."
+    // is something that can easily happen if you are debugging and the application is paused.
+    // As it is so common, not worth popping up a dialog.
+    if ((type == QtWarningMsg) && msg.contains(QStringLiteral("QClipboard::event"))
+            && msg.contains(QStringLiteral("Cowardly refusing")))
+    {
+        type = QtDebugMsg;
+    }
+
+    switch (type)
+    {
+        case QtDebugMsg:
+            vStdOut() << QApplication::translate("mNoisyHandler", "DEBUG:") << msg << "\n";
+            return;
+        case QtWarningMsg:
+            vStdErr() << QApplication::translate("mNoisyHandler", "WARNING:") << msg << "\n";
+            break;
+        case QtCriticalMsg:
+            vStdErr() << QApplication::translate("mNoisyHandler", "CRITICAL:") << msg << "\n";
+            break;
+        case QtFatalMsg:
+            vStdErr() << QApplication::translate("mNoisyHandler", "FATAL:") << msg << "\n";
+            break;
+        #if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)
+        case QtInfoMsg:
+            vStdOut() << QApplication::translate("mNoisyHandler", "INFO:") << msg << "\n";
+            break;
+        #endif
+        default:
+            break;
+    }
+
+    vStdOut().flush();
+    vStdErr().flush();
+
+    if (isGuiThread)
+    {
+        //fixme: trying to make sure there are no save/load dialogs are opened, because error message during them will
+        //lead to crash
+        const bool topWinAllowsPop = (QApplication::activeModalWidget() == nullptr) ||
+                !QApplication::activeModalWidget()->inherits("QFileDialog");
+        QMessageBox messageBox;
+        switch (type)
+        {
+            case QtWarningMsg:
+                messageBox.setWindowTitle(QApplication::translate("mNoisyHandler", "Warning"));
+                messageBox.setIcon(QMessageBox::Warning);
+                break;
+            case QtCriticalMsg:
+                messageBox.setWindowTitle(QApplication::translate("mNoisyHandler", "Critical error"));
+                messageBox.setIcon(QMessageBox::Critical);
+                break;
+            case QtFatalMsg:
+                messageBox.setWindowTitle(QApplication::translate("mNoisyHandler", "Fatal error"));
+                messageBox.setIcon(QMessageBox::Critical);
+                break;
+            #if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)
+            case QtInfoMsg:
+                messageBox.setWindowTitle(QApplication::translate("mNoisyHandler", "Information"));
+                messageBox.setIcon(QMessageBox::Information);
+                break;
+            #endif
+            case QtDebugMsg:
+                Q_UNREACHABLE(); //-V501
+                break;
+            default:
+                break;
+        }
+
+        if (type == QtWarningMsg || type == QtCriticalMsg || type == QtFatalMsg)
+        {
+            if (VPApplication::VApp()->IsAppInGUIMode())
+            {
+                if (topWinAllowsPop)
+                {
+                    messageBox.setText(msg);
+                    messageBox.setStandardButtons(QMessageBox::Ok);
+                    messageBox.setWindowModality(Qt::ApplicationModal);
+                    messageBox.setModal(true);
+                #ifndef QT_NO_CURSOR
+                    QGuiApplication::setOverrideCursor(Qt::ArrowCursor);
+                #endif
+                    messageBox.exec();
+                #ifndef QT_NO_CURSOR
+                    QGuiApplication::restoreOverrideCursor();
+                #endif
+                }
+            }
+        }
+
+        if (QtFatalMsg == type)
+        {
+            abort();
+        }
+    }
+    else
+    {
+        if (type != QtDebugMsg)
+        {
+            abort(); // be NOISY unless overridden!
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+VPApplication::VPApplication(int &argc, char **argv)
+    :VAbstractApplication(argc, argv)
+{
+    setApplicationDisplayName(VER_PRODUCTNAME_STR);
+    setApplicationName(VER_INTERNALNAME_STR);
+    setOrganizationName(VER_COMPANYNAME_STR);
+    setOrganizationDomain(VER_COMPANYDOMAIN_STR);
+    // Setting the Application version
+    setApplicationVersion(APP_VERSION_STR);
+    // We have been running Puzzle in two different cases.
+    // The first inside own bundle where info.plist is works fine, but the second,
+    // when we run inside Valentina's bundle, require direct setting the icon.
+    setWindowIcon(QIcon(":/puzzleicon/64x64/logo.png"));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+VPApplication::~VPApplication()
+{
+    qDeleteAll(mainWindows);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+/**
+ * @brief notify Reimplemented from QApplication::notify().
+ * @param receiver receiver.
+ * @param event event.
+ * @return value that is returned from the receiver's event handler.
+ */
+// reimplemented from QApplication so we can throw exceptions in slots
+auto VPApplication::notify(QObject *receiver, QEvent *event) -> bool
+{
+    try
+    {
+        return QApplication::notify(receiver, event);
+    }
+    catch (const VExceptionObjectError &e)
+    {
+        qCCritical(pApp, "%s\n\n%s\n\n%s", qUtf8Printable(tr("Error parsing file. Program will be terminated.")), //-V807
+                   qUtf8Printable(e.ErrorMessage()), qUtf8Printable(e.DetailedInformation()));
+        exit(V_EX_DATAERR);
+    }
+    catch (const VExceptionBadId &e)
+    {
+        qCCritical(pApp, "%s\n\n%s\n\n%s", qUtf8Printable(tr("Error bad id. Program will be terminated.")),
+                   qUtf8Printable(e.ErrorMessage()), qUtf8Printable(e.DetailedInformation()));
+        exit(V_EX_DATAERR);
+    }
+    catch (const VExceptionConversionError &e)
+    {
+        qCCritical(pApp, "%s\n\n%s\n\n%s", qUtf8Printable(tr("Error can't convert value. Program will be terminated.")),
+                   qUtf8Printable(e.ErrorMessage()), qUtf8Printable(e.DetailedInformation()));
+        exit(V_EX_DATAERR);
+    }
+    catch (const VExceptionEmptyParameter &e)
+    {
+        qCCritical(pApp, "%s\n\n%s\n\n%s", qUtf8Printable(tr("Error empty parameter. Program will be terminated.")),
+                   qUtf8Printable(e.ErrorMessage()), qUtf8Printable(e.DetailedInformation()));
+        exit(V_EX_DATAERR);
+    }
+    catch (const VExceptionWrongId &e)
+    {
+        qCCritical(pApp, "%s\n\n%s\n\n%s", qUtf8Printable(tr("Error wrong id. Program will be terminated.")),
+                   qUtf8Printable(e.ErrorMessage()), qUtf8Printable(e.DetailedInformation()));
+        exit(V_EX_DATAERR);
+    }
+    catch (const VExceptionToolWasDeleted &e)
+    {
+        qCCritical(pApp, "%s\n\n%s\n\n%s",
+                   qUtf8Printable("Unhadled deleting tool. Continue use object after deleting!"),
+                   qUtf8Printable(e.ErrorMessage()), qUtf8Printable(e.DetailedInformation()));
+        exit(V_EX_DATAERR);
+    }
+    catch (const VException &e)
+    {
+        qCCritical(pApp, "%s\n\n%s\n\n%s", qUtf8Printable(tr("Something's wrong!!")),
+                   qUtf8Printable(e.ErrorMessage()), qUtf8Printable(e.DetailedInformation()));
+        return true;
+    }
+    catch (std::exception &e)
+    {
+        qCCritical(pApp, "%s", qUtf8Printable(tr("Exception thrown: %1. Program will be terminated.").arg(e.what())));
+        exit(V_EX_SOFTWARE);
+    }
+    return false;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+/**
+ * @brief IsAppInGUIMode little hack that allow to have access to application state from VAbstractApplication class.
+ */
+auto VPApplication::IsAppInGUIMode() const -> bool
+{
+    return CommandLine()->IsGuiEnabled();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPApplication::MainWindow()-> VPMainWindow *
+{
+    Clean();
+    if (mainWindows.isEmpty())
+    {
+        NewMainWindow();
+    }
+    return mainWindows[0];
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPApplication::MainWindows() -> QList<VPMainWindow *>
+{
+    Clean();
+    QList<VPMainWindow*> list;
+    for (auto &w : mainWindows)
+    {
+        list.append(w);
+    }
+    return list;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPApplication::NewMainWindow() -> VPMainWindow *
+{
+    VPCommandLinePtr cmd;
+    VPCommandLine::ProcessInstance(cmd, {ConstFirst<QString>(VPApplication::arguments())});
+    return NewMainWindow(cmd);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPApplication::NewMainWindow(const VPCommandLinePtr &cmd) -> VPMainWindow *
+{
+    auto *puzzle = new VPMainWindow(cmd);
+    mainWindows.prepend(puzzle);
+    if (not cmd->IsTestModeEnabled())
+    {
+        puzzle->show();
+        puzzle->UpdateWindowTitle();
+    }
+    puzzle->InitZoom();
+    return puzzle;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPApplication::InitOptions()
+{
+    qInstallMessageHandler(noisyFailureMsgHandler);
+
+    OpenSettings();
+
+    qCDebug(pApp, "Version: %s", qUtf8Printable(APP_VERSION_STR));
+    qCDebug(pApp, "Build revision: %s", BUILD_REVISION);
+    qCDebug(pApp, "%s", qUtf8Printable(buildCompatibilityString()));
+    qCDebug(pApp, "Built on %s at %s", __DATE__, __TIME__);
+    qCDebug(pApp, "Command-line arguments: %s", qUtf8Printable(arguments().join(", ")));
+    qCDebug(pApp, "Process ID: %s", qUtf8Printable(QString().setNum(applicationPid())));
+
+    LoadTranslation(QLocale().name());// By default the console version uses system locale
+
+    VPCommandLine::Instance(*this);
+
+    static const char * GENERIC_ICON_TO_CHECK = "document-open";
+    if (QIcon::hasThemeIcon(GENERIC_ICON_TO_CHECK) == false)
+    {
+       //If there is no default working icon theme then we should
+       //use an icon theme that we provide via a .qrc file
+       //This case happens under Windows and Mac OS X
+       //This does not happen under GNOME or KDE
+       QIcon::setThemeName("win.icon.theme");
+    }
+    ActivateDarkMode();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPApplication::TrVars() -> const VTranslateVars *
+{
+    return nullptr;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPApplication::OpenSettings()
+{
+    settings = new VPSettings(QSettings::IniFormat, QSettings::UserScope, QCoreApplication::organizationName(),
+                                   QCoreApplication::applicationName(), this);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPApplication::PuzzleSettings() -> VPSettings *
+{
+    SCASSERT(settings != nullptr)
+    return qobject_cast<VPSettings *>(settings);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPApplication::ActivateDarkMode()
+{
+    VPSettings *settings = VPApplication::VApp()->PuzzleSettings();
+    if (settings->GetDarkMode())
+    {
+         QFile f(":qdarkstyle/style.qss");
+         if (!f.exists())
+         {
+             qDebug()<<"Unable to set stylesheet, file not found\n";
+         }
+         else
+         {
+             f.open(QFile::ReadOnly | QFile::Text);
+             QTextStream ts(&f);
+             VPApplication::VApp()->setStyleSheet(ts.readAll());
+         }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPApplication::ParseCommandLine(const SocketConnection &connection, const QStringList &arguments)
+{
+    VPCommandLinePtr cmd;
+    VPCommandLine::ProcessInstance(cmd, arguments);
+
+    if (cmd->IsGuiEnabled() && connection == SocketConnection::Client)
+    {
+        const QString serverName = QCoreApplication::applicationName();
+        QLocalSocket socket;
+        socket.connectToServer(serverName);
+        if (socket.waitForConnected(1000))
+        {
+            qCDebug(pApp, "Connected to the server '%s'", qUtf8Printable(serverName));
+            QTextStream stream(&socket);
+            stream << arguments.join(";;");
+            stream.flush();
+            socket.waitForBytesWritten();
+            QCoreApplication::exit(V_EX_OK);
+            return;
+        }
+
+        qCDebug(pApp, "Can't establish connection to the server '%s'", qUtf8Printable(serverName));
+
+        localServer = new QLocalServer(this);
+        connect(localServer, &QLocalServer::newConnection, this, &VPApplication::NewLocalSocketConnection);
+        if (not localServer->listen(serverName))
+        {
+            qCDebug(pApp, "Can't begin to listen for incoming connections on name '%s'",
+                    qUtf8Printable(serverName));
+            if (localServer->serverError() == QAbstractSocket::AddressInUseError)
+            {
+                QLocalServer::removeServer(serverName);
+                if (not localServer->listen(serverName))
+                {
+                    qCWarning(pApp, "%s",
+                     qUtf8Printable(tr("Can't begin to listen for incoming connections on name '%1'").arg(serverName)));
+                }
+            }
+        }
+
+        LoadTranslation(PuzzleSettings()->GetLocale());
+    }
+
+    ProcessArguments(cmd);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPApplication::ProcessArguments(const VPCommandLinePtr &cmd)
+{
+    const QStringList rawLayouts = cmd->OptionRawLayouts();
+    const QStringList args = cmd->OptionFileNames();
+    if (args.count() > 0)
+    {
+        if (not cmd->IsGuiEnabled() && args.count() > 1)
+        {
+            qCCritical(pApp, "%s\n", qPrintable(tr("Export mode doesn't support openning several files.")));
+            cmd.get()->parser.showHelp(V_EX_USAGE);
+        }
+
+        if (args.count() > 1 && not rawLayouts.isEmpty())
+        {
+            qCCritical(pApp, "%s\n",
+                       qPrintable(tr("Import raw layout data does not support openning several layout files.")));
+            cmd.get()->parser.showHelp(V_EX_USAGE);
+        }
+
+        for (const auto &arg : args)
+        {
+            NewMainWindow(cmd);
+            if (not MainWindow()->LoadFile(arg))
+            {
+                if (not cmd->IsGuiEnabled())
+                {
+                    return; // process only one input file
+                }
+                delete MainWindow();
+                continue;
+            }
+
+            if (not rawLayouts.isEmpty())
+            {
+                MainWindow()->ImportRawLayouts(rawLayouts);
+            }
+        }
+    }
+    else
+    {
+        if (cmd->IsTestModeEnabled())
+        {
+            qCCritical(pApp, "%s\n", qPrintable(tr("Please, provide one input file.")));
+            cmd.get()->parser.showHelp(V_EX_USAGE);
+        }
+
+        NewMainWindow(cmd);
+        if (not rawLayouts.isEmpty())
+        {
+            MainWindow()->ImportRawLayouts(rawLayouts);
+        }
+    }
+
+    if (not cmd->IsGuiEnabled())
+    {
+        QCoreApplication::exit(V_EX_OK); // close program after processing in console mode
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPApplication::ProcessCMD()
+{
+    ParseCommandLine(SocketConnection::Client, arguments());
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPApplication::event(QEvent *e) -> bool
+{
+    switch(e->type())
+    {
+        // In Mac OS X the QFileOpenEvent event is generated when user perform "Open With" from Finder (this event is
+        // Mac specific).
+        case QEvent::FileOpen:
+        {
+            auto *fileOpenEvent = static_cast<QFileOpenEvent *>(e);
+            const QString macFileOpen = fileOpenEvent->file();
+            if(not macFileOpen.isEmpty())
+            {
+                VPMainWindow *mw = MainWindow();
+                if (mw != nullptr)
+                {
+                    mw->LoadFile(macFileOpen);  // open file in existing window
+                }
+                return true;
+            }
+            break;
+        }
+#if defined(Q_OS_MAC)
+        case QEvent::ApplicationActivate:
+        {
+            Clean();
+            VPMainWindow *mw = MainWindow();
+            if (mw && not mw->isMinimized())
+            {
+                mw->show();
+            }
+            return true;
+        }
+#endif //defined(Q_OS_MAC)
+        default:
+            return VAbstractApplication::event(e);
+    }
+    return VAbstractApplication::event(e);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPApplication::InitTrVars()
+{
+    // do nothing
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPApplication::AboutToQuit()
+{
+    // If try to use the method QApplication::exit program can't sync settings and show warning about QApplication
+    // instance. Solution is to call sync() before quit.
+    // Connect this slot with VApplication::aboutToQuit.
+    Settings()->sync();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPApplication::NewLocalSocketConnection()
+{
+    QScopedPointer<QLocalSocket>socket(localServer->nextPendingConnection());
+    if (socket.isNull())
+    {
+        return;
+    }
+    socket->waitForReadyRead(1000);
+    QTextStream stream(socket.data());
+    const QString arg = stream.readAll();
+    if (not arg.isEmpty())
+    {
+        ParseCommandLine(SocketConnection::Server, arg.split(";;"));
+    }
+    MainWindow()->raise();
+    MainWindow()->activateWindow();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPApplication::PreferencesDialog() const -> QSharedPointer<DialogPuzzlePreferences>
+{
+    return m_preferencesDialog;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPApplication::SetPreferencesDialog(const QSharedPointer<DialogPuzzlePreferences> &newPreferencesDialog)
+{
+    m_preferencesDialog = newPreferencesDialog;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPApplication::Clean()
+{
+    // cleanup any deleted main windows first
+    for (int i = mainWindows.count() - 1; i >= 0; --i)
+    {
+        if (mainWindows.at(i).isNull())
+        {
+            mainWindows.removeAt(i);
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPApplication::CommandLine() -> VPCommandLinePtr
+{
+    return VPCommandLine::instance;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+VPApplication *VPApplication::VApp()
+{
+    return qobject_cast<VPApplication*>(QCoreApplication::instance());
+}
diff --git a/src/app/puzzle/vpapplication.h b/src/app/puzzle/vpapplication.h
new file mode 100644
index 000000000..7cc36ecba
--- /dev/null
+++ b/src/app/puzzle/vpapplication.h
@@ -0,0 +1,97 @@
+/************************************************************************
+ **
+ **  @file   vpapplication.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   16 2, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#ifndef VPAPPLICATION_H
+#define VPAPPLICATION_H
+
+#include "../vmisc/def.h"
+#include "vpsettings.h"
+#include "../vmisc/vabstractapplication.h"
+#include "vpcommandline.h"
+
+template <typename T> class QWeakPointer;
+class VPMainWindow;
+class QLocalServer;
+class DialogPuzzlePreferences;
+
+enum class SocketConnection : bool {Client = false, Server = true};
+
+class VPApplication : public VAbstractApplication
+{
+    Q_OBJECT
+public:
+    VPApplication(int &argc, char **argv);
+    virtual ~VPApplication() override;
+
+    virtual bool notify(QObject * receiver, QEvent * event) override;
+
+    virtual bool IsAppInGUIMode() const override;
+    VPMainWindow *MainWindow();
+    QList<VPMainWindow*> MainWindows();
+    VPMainWindow *NewMainWindow();
+    VPMainWindow *NewMainWindow(const VPCommandLinePtr &cmd);
+
+    void InitOptions();
+
+    virtual const VTranslateVars *TrVars() override;
+
+    virtual void  OpenSettings() override;
+    VPSettings *PuzzleSettings();
+    void ActivateDarkMode();
+
+    void ParseCommandLine(const SocketConnection &connection, const QStringList &arguments);
+    void ProcessArguments(const VPCommandLinePtr &cmd);
+
+    static VPCommandLinePtr CommandLine();
+    static VPApplication *VApp();
+
+    auto PreferencesDialog() const -> QSharedPointer<DialogPuzzlePreferences>;
+    void SetPreferencesDialog(const QSharedPointer<DialogPuzzlePreferences> &newPreferencesDialog);
+
+public slots:
+    void ProcessCMD();
+
+protected:
+    virtual void InitTrVars() override;
+    virtual bool event(QEvent *e) override;
+
+protected slots:
+    virtual void AboutToQuit() override;
+
+private slots:
+    void NewLocalSocketConnection();
+
+private:
+    Q_DISABLE_COPY(VPApplication)
+    QList<QPointer<VPMainWindow> > mainWindows{};
+    QLocalServer *localServer{nullptr};
+    QWeakPointer<DialogPuzzlePreferences> m_preferencesDialog{};
+
+    void Clean();
+};
+
+#endif // VPAPPLICATION_H
diff --git a/src/app/puzzle/vpcommandline.cpp b/src/app/puzzle/vpcommandline.cpp
new file mode 100644
index 000000000..ca94b76d1
--- /dev/null
+++ b/src/app/puzzle/vpcommandline.cpp
@@ -0,0 +1,213 @@
+/************************************************************************
+ **
+ **  @file   vpcommandline.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   12 4, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#include "vpcommandline.h"
+#include "vpcommands.h"
+#include "../vmisc/vsysexits.h"
+#include "../vmisc/literals.h"
+#include <QDebug>
+
+std::shared_ptr<VPCommandLine> VPCommandLine::instance = nullptr;
+
+#define translate(context, source) QCoreApplication::translate((context), source)
+
+//------------------------------------------------------------------------------------------------
+bool VPCommandLine::IsExportEnabled() const
+{
+    const bool result = IsOptionSet(LONG_OPTION_EXPORT_FILE);
+    int argSize = parser.positionalArguments().size();
+    if (result && argSize != 1)
+    {
+        qCritical() << translate("Puzzle", "Export options can be used with single input file only.") << "/n";
+        const_cast<VPCommandLine*>(this)->parser.showHelp(V_EX_USAGE);
+    }
+    return result;
+}
+
+//----------------------------------------------------------------------------------------------
+QString VPCommandLine::OptionExportFile() const
+{
+    QString path;
+    if (IsExportEnabled())
+    {
+        path = OptionValue(LONG_OPTION_EXPORT_FILE);
+    }
+
+    return path;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QStringList VPCommandLine::OptionRawLayouts() const
+{
+    return OptionValues(LONG_OPTION_RAW_LAYOUT);
+}
+
+//--------------------------------------------------------------------------------------------
+bool VPCommandLine::IsTestModeEnabled() const
+{
+    const bool r = IsOptionSet(LONG_OPTION_TEST);
+    if (r && parser.positionalArguments().size() != 1)
+    {
+        qCritical() << translate("VCommandLine", "Test option can be used with single input file only.") << "/n";
+        const_cast<VPCommandLine*>(this)->parser.showHelp(V_EX_USAGE);
+    }
+    return r;
+}
+
+//--------------------------------------------------------------------------------------------
+bool VPCommandLine::IsGuiEnabled() const
+{
+    return isGuiEnabled;
+}
+
+//--------------------------------------------------------------------------------------------
+QStringList VPCommandLine::OptionFileNames() const
+{
+    return parser.positionalArguments();
+}
+
+//-------------------------------------------------------------------------------------------
+bool VPCommandLine::IsNoScalingEnabled() const
+{
+    return IsOptionSet(LONG_OPTION_NO_HDPI_SCALING);
+}
+
+//----------------------------------------------------------------------------------------------------------------------
+void VPCommandLine::ShowHelp(int exitCode)
+{
+    parser.showHelp(exitCode);
+}
+
+//----------------------------------------------------------------------------------------------
+VPCommandLine::VPCommandLine():
+    parser(),
+    isGuiEnabled(false)
+{
+    parser.setApplicationDescription(translate("Puzzle", "Valentina's manual layout editor."));
+    parser.addHelpOption();
+    parser.addVersionOption();
+    parser.addPositionalArgument(QStringLiteral("filename"), translate("Puzzle", "The manual layout file."));
+
+    InitCommandLineOptions();
+}
+
+//-------------------------------------------------------------------------------------------
+VPCommandLinePtr VPCommandLine::Instance(const QCoreApplication &app)
+{
+    VPCommandLine::ProcessInstance(instance, app.arguments());
+    return instance;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPCommandLine::ProcessInstance(VPCommandLinePtr &instance, const QStringList &arguments)
+{
+    if (instance == nullptr)
+    {
+        instance.reset(new VPCommandLine);
+    }
+    instance->parser.process(arguments);
+
+    instance->isGuiEnabled = not (instance->IsGuiEnabled() || instance->IsExportEnabled());
+}
+
+//-------------------------------------------------------------------------------------------
+void VPCommandLine::InitCommandLineOptions()
+{
+    //keep in mind order here - that is how user will see it, so group-up for usability
+    //=================================================================================================================
+    parser.addOptions({
+        {{SINGLE_OPTION_EXPORT_FILE, LONG_OPTION_EXPORT_FILE},
+         translate("VCommandLine", "The filename of exported layout file. Use it to enable console export mode."),
+         translate("VCommandLine", "The filename of layout file")},
+        {{SINGLE_OPTION_RAW_LAYOUT, LONG_OPTION_RAW_LAYOUT},
+         translate("VCommandLine", "Load pattern pieces form the raw layout data file."),
+         translate("VCommandLine", "The raw layout data file")},
+        {{SINGLE_OPTION_EXP2FORMAT, LONG_OPTION_EXP2FORMAT},
+         translate("VCommandLine", "Number corresponding to output format (default = 0, export mode): <not defined>"),
+         translate("VCommandLine", "Format number"), QChar('0')},
+        {LONG_OPTION_BINARYDXF, translate("VCommandLine", "Export dxf in binary form.")},
+        {LONG_OPTION_TEXT2PATHS, translate("VCommandLine", "Export text as paths.")},
+    //=================================================================================================================
+        {{SINGLE_OPTION_CROP_LENGTH, LONG_OPTION_CROP_LENGTH},
+         translate("VCommandLine", "Auto crop unused length (export mode).")},
+        {{LONG_OPTION_CROP_WIDTH},
+         translate("VCommandLine", "Auto crop unused width (export mode).")},
+    //=================================================================================================================
+        {LONG_OPTION_TILED_PDF_PAGE_TEMPLATE,
+         translate("VCommandLine", "Number corresponding to tiled pdf page template (default = 0, export mode with "
+                                   "tiled pdf format): <not defined>"),
+         translate("VCommandLine", "Template number"), QChar('0')},
+        {LONG_OPTION_TILED_PDF_LEFT_MARGIN,
+         translate("VCommandLine","Tiled page left margin in current units like 3.0 (export mode). If not set will be "
+                                   "used default value 1 cm."),
+         translate("VCommandLine", "The left margin")},
+        {LONG_OPTION_TILED_PDF_RIGHT_MARGIN,
+         translate("VCommandLine", "Tiled page right margin in current units like 3.0 (export mode). If not set will "
+                                   "be used default value 1 cm."),
+         translate("VCommandLine", "The right margin")},
+        {LONG_OPTION_TILED_PDF_TOP_MARGIN,
+         translate("VCommandLine", "Tiled page top margin in current units like 3.0 (export mode). If not set will be "
+                                   "used value default value 1 cm."),
+         translate("VCommandLine", "The top margin")},
+        {LONG_OPTION_TILED_PDF_BOTTOM_MARGIN,
+         translate("VCommandLine", "Tiled page bottom margin in current units like 3.0 (export mode). If not set will "
+                                   "be used value default value 1 cm."),
+         translate("VCommandLine", "The bottom margin")},
+        {LONG_OPTION_TILED_PDF_LANDSCAPE,
+         translate("VCommandLine", "Set tiled page orienatation to landscape (export mode). Default value if not set "
+                                   "portrait.")},
+    //=================================================================================================================
+        {{SINGLE_OPTION_TEST, LONG_OPTION_TEST},
+         translate("VCommandLine", "Run the program in a test mode. The program in this mode loads a single layout "
+                                   "file and silently quit without showing the main window. The key have priority "
+                                   "before key '%1'.").arg(LONG_OPTION_EXPORT_FILE)},
+        {LONG_OPTION_NO_HDPI_SCALING,
+         translate("VCommandLine", "Disable high dpi scaling. Call this option if has problem with scaling (by default "
+                                   "scaling enabled). Alternatively you can use the %1 environment variable.")
+             .arg(QStringLiteral("QT_AUTO_SCREEN_SCALE_FACTOR=0"))},
+    });
+}
+
+//--------------------------------------------------------------------------------------------
+bool VPCommandLine::IsOptionSet(const QString &option) const
+{
+    return parser.isSet(option);
+}
+
+//-------------------------------------------------------------------------------------------
+QString VPCommandLine::OptionValue(const QString &option) const
+{
+    return parser.value(option);
+}
+
+//--------------------------------------------------------------------------------------------
+QStringList VPCommandLine::OptionValues(const QString &option) const
+{
+    return parser.values(option);
+}
+
+
diff --git a/src/app/puzzle/vpcommandline.h b/src/app/puzzle/vpcommandline.h
new file mode 100644
index 000000000..5cc1f3444
--- /dev/null
+++ b/src/app/puzzle/vpcommandline.h
@@ -0,0 +1,87 @@
+/************************************************************************
+ **
+ **  @file   vpcommandline.h
+ **  @author Dmytro Hladkykh <vorzelmir@gmail.com>
+ **  @date   12 4, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#ifndef VPCOMMANDLINE_H
+#define VPCOMMANDLINE_H
+
+#include <memory>
+#include <QCoreApplication>
+#include <QCommandLineParser>
+
+class VPCommandLine;
+using VPCommandLinePtr = std::shared_ptr<VPCommandLine>;
+
+class VPCommandLine: public QObject
+{
+    Q_OBJECT
+public:   
+    virtual ~VPCommandLine() = default;
+
+    /** @brief if user enabled export from cmd */
+    bool IsExportEnabled() const;
+
+    /** @brief path to export file or empty string if not */
+    QString OptionExportFile() const;
+
+    /** @brief list with paths to the raw layout data files */
+    QStringList OptionRawLayouts() const;
+
+    /** @brief if user enabled test mode from cmd */
+    bool IsTestModeEnabled() const;
+
+    /** @brief if gui enabled or not */
+    bool IsGuiEnabled() const;
+
+    /** @brief the file name which should be loaded */
+    QStringList OptionFileNames() const;
+
+    /** @brief if high dpi scaling is enabled */
+    bool IsNoScalingEnabled() const;
+
+    Q_NORETURN void ShowHelp(int exitCode = 0);
+protected:
+    VPCommandLine();
+
+    /** @brief create the single instance of the class inside vpapplication */
+    static VPCommandLinePtr Instance(const QCoreApplication &app);
+    static void ProcessInstance(VPCommandLinePtr &instance, const QStringList &arguments);
+private:
+    Q_DISABLE_COPY(VPCommandLine)
+    static VPCommandLinePtr instance;
+    QCommandLineParser parser;
+    bool isGuiEnabled;
+    friend class VPApplication;
+
+    /** @brief add options to the QCommandLineParser that there are in the cmd can be */
+    void InitCommandLineOptions();
+
+    bool IsOptionSet(const QString &option)const;
+    QString OptionValue(const QString &option) const;
+    QStringList OptionValues(const QString &option) const;
+};
+
+#endif // VPCOMMANDLINE_H
diff --git a/src/app/puzzle/vpcommands.cpp b/src/app/puzzle/vpcommands.cpp
new file mode 100644
index 000000000..b10c0d1d3
--- /dev/null
+++ b/src/app/puzzle/vpcommands.cpp
@@ -0,0 +1,88 @@
+/************************************************************************
+ **
+ **  @file   vpcommands.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   13 4, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#include "vpcommands.h"
+
+#include <QStringList>
+
+const QString LONG_OPTION_EXPORT_FILE   = QStringLiteral("exportFile");
+const QString SINGLE_OPTION_EXPORT_FILE = QStringLiteral("e");
+
+const QString LONG_OPTION_TEST          = QStringLiteral("test");
+const QString SINGLE_OPTION_TEST        = QStringLiteral("t");
+
+const QString LONG_OPTION_RAW_LAYOUT    = QStringLiteral("rawLayout");
+const QString SINGLE_OPTION_RAW_LAYOUT  = QStringLiteral("r");
+
+const QString LONG_OPTION_EXP2FORMAT    = QStringLiteral("format");
+const QString SINGLE_OPTION_EXP2FORMAT  = QStringLiteral("f");
+
+const QString LONG_OPTION_BINARYDXF     = QStringLiteral("bdxf");
+const QString LONG_OPTION_TEXT2PATHS    = QStringLiteral("text2paths");
+
+const QString LONG_OPTION_CROP_LENGTH   = QStringLiteral("crop");
+const QString SINGLE_OPTION_CROP_LENGTH = QStringLiteral("c");
+
+const QString LONG_OPTION_CROP_WIDTH    = QStringLiteral("cropWidth");
+
+const QString LONG_OPTION_TILED_PDF_PAGE_TEMPLATE = QStringLiteral("tiledPageformat");
+const QString LONG_OPTION_TILED_PDF_LEFT_MARGIN   = QStringLiteral("tiledlmargin");
+const QString LONG_OPTION_TILED_PDF_RIGHT_MARGIN  = QStringLiteral("tiledrmargin");
+const QString LONG_OPTION_TILED_PDF_TOP_MARGIN    = QStringLiteral("tiledtmargin");
+const QString LONG_OPTION_TILED_PDF_BOTTOM_MARGIN = QStringLiteral("tiledbmargin");
+const QString LONG_OPTION_TILED_PDF_LANDSCAPE     = QStringLiteral("tiledLandscape");
+
+//---------------------------------------------------------------------------------------------------------------------
+/**
+ * @brief AllKeys return list with all command line keys (short and long forms). Used for testing on conflicts.
+ * @return list with all command line keys
+ */
+QStringList AllKeys()
+{
+    return QStringList
+    {
+        LONG_OPTION_EXPORT_FILE,
+        SINGLE_OPTION_EXPORT_FILE,
+        LONG_OPTION_TEST,
+        SINGLE_OPTION_TEST,
+        LONG_OPTION_RAW_LAYOUT,
+        SINGLE_OPTION_RAW_LAYOUT,
+        LONG_OPTION_EXP2FORMAT,
+        SINGLE_OPTION_EXP2FORMAT,
+        LONG_OPTION_BINARYDXF,
+        LONG_OPTION_TEXT2PATHS,
+        LONG_OPTION_CROP_LENGTH,
+        SINGLE_OPTION_CROP_LENGTH,
+        LONG_OPTION_CROP_WIDTH,
+        LONG_OPTION_TILED_PDF_PAGE_TEMPLATE,
+        LONG_OPTION_TILED_PDF_LEFT_MARGIN,
+        LONG_OPTION_TILED_PDF_RIGHT_MARGIN,
+        LONG_OPTION_TILED_PDF_TOP_MARGIN,
+        LONG_OPTION_TILED_PDF_BOTTOM_MARGIN,
+        LONG_OPTION_TILED_PDF_LANDSCAPE
+    };
+}
diff --git a/src/app/puzzle/vpcommands.h b/src/app/puzzle/vpcommands.h
new file mode 100644
index 000000000..4db42b939
--- /dev/null
+++ b/src/app/puzzle/vpcommands.h
@@ -0,0 +1,63 @@
+/************************************************************************
+ **
+ **  @file   vpcommands.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   13 4, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#ifndef VPCOMMANDS_H
+#define VPCOMMANDS_H
+
+
+#include <QString>
+
+extern const QString LONG_OPTION_EXPORT_FILE;
+extern const QString SINGLE_OPTION_EXPORT_FILE;
+
+extern const QString LONG_OPTION_TEST;
+extern const QString SINGLE_OPTION_TEST;
+
+extern const QString LONG_OPTION_RAW_LAYOUT;
+extern const QString SINGLE_OPTION_RAW_LAYOUT;
+
+extern const QString LONG_OPTION_EXP2FORMAT;
+extern const QString SINGLE_OPTION_EXP2FORMAT;
+
+extern const QString LONG_OPTION_BINARYDXF;
+extern const QString LONG_OPTION_TEXT2PATHS;
+
+extern const QString LONG_OPTION_CROP_LENGTH;
+extern const QString SINGLE_OPTION_CROP_LENGTH;
+
+extern const QString LONG_OPTION_CROP_WIDTH;
+
+extern const QString LONG_OPTION_TILED_PDF_PAGE_TEMPLATE;
+extern const QString LONG_OPTION_TILED_PDF_LEFT_MARGIN;
+extern const QString LONG_OPTION_TILED_PDF_RIGHT_MARGIN;
+extern const QString LONG_OPTION_TILED_PDF_TOP_MARGIN;
+extern const QString LONG_OPTION_TILED_PDF_BOTTOM_MARGIN;
+extern const QString LONG_OPTION_TILED_PDF_LANDSCAPE;
+
+QStringList AllKeys();
+
+#endif // VPCOMMANDS_H
diff --git a/src/app/puzzle/vpmainwindow.cpp b/src/app/puzzle/vpmainwindow.cpp
new file mode 100644
index 000000000..fd0ef4c39
--- /dev/null
+++ b/src/app/puzzle/vpmainwindow.cpp
@@ -0,0 +1,4535 @@
+/************************************************************************
+ **
+ **  @file   vpmainwindow.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   16 2, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#include "vpmainwindow.h"
+
+#include <QFileDialog>
+#include <QCloseEvent>
+#include <QtMath>
+#include <QSvgGenerator>
+#include <QFileSystemWatcher>
+#include <QSaveFile>
+#include <QUndoStack>
+#include <QPrinterInfo>
+#include <QPrintDialog>
+#include <QPrintPreviewDialog>
+
+#include "ui_vpmainwindow.h"
+#include "dialogs/vpdialogabout.h"
+#include "xml/vplayoutfilewriter.h"
+#include "xml/vplayoutfilereader.h"
+#include "vpapplication.h"
+#include "../vlayout/vrawlayout.h"
+#include "../vlayout/vlayoutexporter.h"
+#include "../vlayout/vprintlayout.h"
+#include "../vlayout/dialogs/watermarkwindow.h"
+#include "../vmisc/vsysexits.h"
+#include "../vmisc/projectversion.h"
+#include "../ifc/xml/vlayoutconverter.h"
+#include "../ifc/exception/vexception.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "layout/vpsheet.h"
+#include "dialogs/dialogpuzzlepreferences.h"
+#include "undocommands/vpundoaddsheet.h"
+#include "undocommands/vpundopiecerotate.h"
+#include "undocommands/vpundopiecemove.h"
+#include "dialogs/dialogsavemanuallayout.h"
+#include "../vdxf/libdxfrw/drw_base.h"
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
+#include "../vmisc/backport/qscopeguard.h"
+#else
+#include <QScopeGuard>
+#endif
+
+#include <QLoggingCategory>
+#include <chrono>
+#include <thread>
+
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_CLANG("-Wmissing-prototypes")
+QT_WARNING_DISABLE_INTEL(1418)
+
+Q_LOGGING_CATEGORY(pWindow, "p.window")
+
+QT_WARNING_POP
+
+namespace
+{
+//---------------------------------------------------------------------------------------------------------------------
+auto CreateLayoutPath(const QString &path) -> bool
+{
+    bool usedNotExistedDir = true;
+    QDir dir(path);
+    dir.setPath(path);
+    if (not dir.exists(path))
+    {
+        usedNotExistedDir = dir.mkpath(QChar('.'));
+    }
+    return usedNotExistedDir;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void RemoveLayoutPath(const QString &path, bool usedNotExistedDir)
+{
+    if (usedNotExistedDir)
+    {
+        QDir dir(path);
+        dir.rmpath(QChar('.'));
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void SetDoubleSpinBoxValue(QDoubleSpinBox *spinBox, qreal value)
+{
+    spinBox->blockSignals(true);
+    spinBox->setValue(value);
+    spinBox->blockSignals(false);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void SetCheckBoxValue(QCheckBox *checkbox, bool value)
+{
+    checkbox->blockSignals(true);
+    checkbox->setChecked(value);
+    checkbox->blockSignals(false);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void SetLineEditValue(QLineEdit *lineEdit, const QString &value)
+{
+    lineEdit->blockSignals(true);
+    lineEdit->setText(value);
+    lineEdit->blockSignals(false);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void SetPlainTextEditValue(QPlainTextEdit *textEdit, const QString &value)
+{
+    textEdit->blockSignals(true);
+    textEdit->setPlainText(value);
+    textEdit->blockSignals(false);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto PiecesBoundingRect(const QList<VPPiecePtr> &selectedPieces) -> QRectF
+{
+    QRectF rect;
+    for (const auto& item : selectedPieces)
+    {
+        if (not item.isNull())
+        {
+            rect = rect.united(item->MappedDetailBoundingRect());
+        }
+    }
+
+    return rect;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+Q_REQUIRED_RESULT auto PreparePrinter(
+        const QPrinterInfo &info, QPrinter::PrinterMode mode = QPrinter::ScreenResolution) -> QSharedPointer<QPrinter>;
+auto PreparePrinter(const QPrinterInfo &info, QPrinter::PrinterMode mode) -> QSharedPointer<QPrinter>
+{
+    QPrinterInfo tmpInfo = info;
+    if(tmpInfo.isNull() || tmpInfo.printerName().isEmpty())
+    {
+        const QStringList list = QPrinterInfo::availablePrinterNames();
+        if(list.isEmpty())
+        {
+            return QSharedPointer<QPrinter>();
+        }
+
+        tmpInfo = QPrinterInfo::printerInfo(list.first());
+    }
+
+    auto printer = QSharedPointer<QPrinter>(new QPrinter(tmpInfo, mode));
+    printer->setResolution(static_cast<int>(PrintDPI));
+    return printer;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void SetPrinterSheetPageSettings(const QSharedPointer<QPrinter> &printer, const VPSheetPtr &sheet, qreal xScale,
+                                 qreal yScale)
+{
+    SCASSERT(not printer.isNull())
+
+    QMarginsF margins;
+    if (not sheet->IgnoreMargins())
+    {
+        margins = sheet->GetSheetMargins();
+    }
+
+    QPageLayout::Orientation sheetOrientation = sheet->GetSheetOrientation();
+
+    QRectF imageRect = sheet->GetMarginsRect();
+    qreal width = FromPixel(imageRect.width() * xScale + margins.left() + margins.right(), Unit::Mm);
+    qreal height = FromPixel(imageRect.height() * yScale + margins.top() + margins.bottom(), Unit::Mm);
+
+    QSizeF pageSize = sheetOrientation == QPageLayout::Portrait ? QSizeF(width, height) : QSizeF(height, width);
+    if (not printer->setPageSize(QPageSize(pageSize, QPageSize::Millimeter)))
+    {
+        qWarning() << QObject::tr("Cannot set printer page size");
+    }
+
+    printer->setPageOrientation(sheetOrientation);
+    printer->setFullPage(sheet->IgnoreMargins());
+
+    if (not sheet->IgnoreMargins())
+    {
+        if (not printer->setPageMargins(UnitConvertor(margins, Unit::Px, Unit::Mm), QPageLayout::Millimeter))
+        {
+            qWarning() << QObject::tr("Cannot set printer margins");
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void SetPrinterTiledPageSettings(const QSharedPointer<QPrinter> &printer, const VPLayoutPtr &layout,
+                                 const VPSheetPtr &sheet, QPageLayout::Orientation orientation, bool forSheet)
+{
+    SCASSERT(not printer.isNull())
+
+    if (layout.isNull() || sheet.isNull())
+    {
+        return;
+    }
+
+    QSizeF tileSize = layout->LayoutSettings().GetTilesSize(Unit::Mm);
+    QSizeF pageSize;
+
+    if (not forSheet)
+    {
+        pageSize = orientation == QPageLayout::Portrait ? tileSize : tileSize.transposed();
+    }
+    else
+    {
+        QPageLayout::Orientation tileOrientation = layout->LayoutSettings().GetTilesOrientation();
+        QPageLayout::Orientation sheetOrientation = sheet->GetSheetOrientation();
+
+        if (tileOrientation != sheetOrientation)
+        {
+            pageSize = orientation == QPageLayout::Portrait ? tileSize.transposed() : tileSize;
+        }
+        else
+        {
+            pageSize = orientation == QPageLayout::Portrait ? tileSize : tileSize.transposed();
+        }
+    }
+
+    if (not printer->setPageSize(QPageSize(pageSize, QPageSize::Millimeter)))
+    {
+        qWarning() << QObject::tr("Cannot set printer page size");
+    }
+
+    printer->setPageOrientation(orientation);
+    printer->setFullPage(layout->LayoutSettings().IgnoreTilesMargins());
+
+    if (not layout->LayoutSettings().IgnoreTilesMargins())
+    {
+        if (not printer->setPageMargins(layout->LayoutSettings().GetTilesMargins(Unit::Mm),
+                                        QPageLayout::Millimeter))
+        {
+            qWarning() << QObject::tr("Cannot set printer margins");
+        }
+    }
+}
+}  // namespace
+
+struct VPExportData
+{
+    LayoutExportFormats format{LayoutExportFormats::SVG};
+    QList<VPSheetPtr> sheets{};
+    QString path{};
+    QString fileName{};
+    qreal xScale{1.};
+    qreal yScale{1.};
+    bool isBinaryDXF{false};
+    bool textAsPaths{false};
+    bool exportUnified{true};
+    bool showTilesScheme{false};
+};
+
+//---------------------------------------------------------------------------------------------------------------------
+VPMainWindow::VPMainWindow(const VPCommandLinePtr &cmd, QWidget *parent) :
+    VAbstractMainWindow(parent),
+    ui(new Ui::VPMainWindow),
+    m_cmd(cmd),
+    m_undoStack(new QUndoStack(this)),
+    m_layout{VPLayout::CreateLayout(m_undoStack)},
+    m_statusLabel(new QLabel(this)),
+    m_layoutWatcher(new QFileSystemWatcher(this)),
+    m_watermarkWatcher(new QFileSystemWatcher(this))
+{
+    ui->setupUi(this);
+
+    connect(m_layout.get(), &VPLayout::PieceSelectionChanged, this, &VPMainWindow::on_PieceSelectionChanged);
+    connect(m_layout.get(), &VPLayout::LayoutChanged, this, [this]()
+    {
+        LayoutWasSaved(false);
+    });
+    connect(m_layout.get(), &VPLayout::PieceTransformationChanged, this, [this]()
+    {
+        SetPropertyTabCurrentPieceData();
+    });
+    connect(m_layout.get(), &VPLayout::ActiveSheetChanged, this, [this]()
+    {
+        m_layout->TileFactory()->refreshTileInfos();
+        m_graphicsView->RefreshLayout();
+        SetPropertyTabSheetData();
+    });
+
+    connect(m_undoStack, &QUndoStack::cleanChanged, this, [this](bool clean)
+    {
+        LayoutWasSaved(clean);
+    });
+
+    // init status bar
+    statusBar()->addPermanentWidget(m_statusLabel, 1);
+    
+    SetupMenu();
+    InitProperties();
+    InitCarrousel();
+
+    InitMainGraphics();
+
+    InitZoomToolBar();
+    InitScaleToolBar();
+
+    SetPropertiesData();
+
+    ReadSettings();
+
+#if defined(Q_OS_MAC)
+    // Mac OS Dock Menu
+    QMenu *menu = new QMenu(this);
+    connect(menu, &QMenu::aboutToShow, this, &VPMainWindow::AboutToShowDockMenu);
+    AboutToShowDockMenu();
+    menu->setAsDockMenu();
+#endif //defined(Q_OS_MAC)
+
+    connect(m_layoutWatcher, &QFileSystemWatcher::fileChanged, this, [this](const QString &path)
+    {
+        if (not curFile.isEmpty() && curFile == path)
+        {
+            QFileInfo checkFile(path);
+            if (not checkFile.exists())
+            {
+                for(int i=0; i<=1000; i=i+10)
+                {
+                    if (checkFile.exists())
+                    {
+                        break;
+                    }
+
+                    std::this_thread::sleep_for(std::chrono::milliseconds(100));
+                }
+            }
+            UpdateWindowTitle();
+
+            if (checkFile.exists())
+            {
+                m_layoutWatcher->addPath(path);
+            }
+        }
+    });
+
+    connect(m_layoutWatcher, &QFileSystemWatcher::fileChanged, this, [this](const QString &path)
+    {
+        QFileInfo checkFile(path);
+        if (not checkFile.exists())
+        {
+            for(int i=0; i<=1000; i=i+10)
+            {
+                if (checkFile.exists())
+                {
+                    break;
+                }
+
+                std::this_thread::sleep_for(std::chrono::milliseconds(100));
+            }
+        }
+        m_layout->TileFactory()->refreshTileInfos();
+        m_graphicsView->RefreshLayout();
+
+        if (checkFile.exists())
+        {
+            m_layoutWatcher->addPath(path);
+        }
+    });
+
+    m_graphicsView->RefreshLayout();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+VPMainWindow::~VPMainWindow()
+{
+    delete m_undoStack;
+    delete ui;
+    delete m_carrousel;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPMainWindow::CurrentFile() const -> QString
+{
+    return curFile;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPMainWindow::LoadFile(QString path) -> bool
+{
+    if (not QFileInfo::exists(path))
+    {
+        qCCritical(pWindow, "%s", qUtf8Printable(tr("File '%1' doesn't exist!").arg(path)));
+        if (m_cmd->IsTestModeEnabled())
+        {
+            qApp->exit(V_EX_NOINPUT);
+        }
+        return false;
+    }
+
+    // Check if file already opened
+    QList<VPMainWindow*> list = VPApplication::VApp()->MainWindows();
+    auto w = std::find_if(list.begin(), list.end(),
+                          [path](VPMainWindow *window) { return window->CurrentFile() == path; });
+    if (w != list.end())
+    {
+        (*w)->activateWindow();
+        if (this != *w)
+        {
+            close();
+            return false;
+        }
+        return true;
+    }
+
+    VlpCreateLock(lock, path);
+
+    if (not lock->IsLocked())
+    {
+        if (not IgnoreLocking(lock->GetLockError(), path, m_cmd->IsGuiEnabled()))
+        {
+            return false;
+        }
+    }
+
+    try
+    {
+        VLayoutConverter converter(path);
+        m_curFileFormatVersion = converter.GetCurrentFormatVersion();
+        m_curFileFormatVersionStr = converter.GetFormatVersionStr();
+        path = converter.Convert();
+    }
+    catch (VException &e)
+    {
+        qCCritical(pWindow, "%s\n\n%s\n\n%s", qUtf8Printable(tr("File error.")),
+                   qUtf8Printable(e.ErrorMessage()), qUtf8Printable(e.DetailedInformation()));
+        lock.reset();
+        return false;
+    }
+
+    QFile file(path);
+    file.open(QIODevice::ReadOnly);
+
+    VPLayoutFileReader fileReader;
+    m_layout->Clear();
+
+    fileReader.ReadFile(m_layout, &file);
+
+    if (fileReader.hasError())
+    {
+        qCCritical(pWindow, "%s\n\n%s", qUtf8Printable(tr("File error.")),
+                   qUtf8Printable(tr("Unable to read a layout file. %1").arg(fileReader.errorString())));
+        lock.reset();
+
+        if (m_cmd->IsTestModeEnabled())
+        {
+            qApp->exit(V_EX_NOINPUT);
+        }
+        return false;
+    }
+
+    SetCurrentFile(path);
+
+    m_layout->SetFocusedSheet();
+
+    m_oldLayoutUnit = m_layout->LayoutSettings().GetUnit();
+
+    // updates the properties with the loaded data
+    SetPropertiesData();
+
+    m_carrousel->Refresh();
+    m_graphicsView->on_ActiveSheetChanged(m_layout->GetFocusedSheet());
+    m_layout->TileFactory()->refreshTileInfos();
+    m_layout->CheckPiecesPositionValidity();
+
+    VMainGraphicsView::NewSceneRect(m_graphicsView->scene(), m_graphicsView);
+
+    ui->actionRemoveWatermark->setEnabled(not m_layout->LayoutSettings().WatermarkPath().isEmpty());
+    ui->actionEditCurrentWatermark->setEnabled(not m_layout->LayoutSettings().WatermarkPath().isEmpty());
+
+    if (not m_layout->LayoutSettings().WatermarkPath().isEmpty())
+    {
+        m_layoutWatcher->addPath(m_layout->LayoutSettings().WatermarkPath());
+    }
+
+    return true;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::LayoutWasSaved(bool saved)
+{
+    setWindowModified(!saved);
+    not IsLayoutReadOnly() ? ui->actionSave->setEnabled(!saved): ui->actionSave->setEnabled(false);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::SetCurrentFile(const QString &fileName)
+{
+    if (not curFile.isEmpty() && m_layoutWatcher->files().contains(curFile))
+    {
+        m_layoutWatcher->removePath(curFile);
+    }
+
+    curFile = fileName;
+    if (not curFile.isEmpty())
+    {
+        if (not m_layoutWatcher->files().contains(curFile))
+        {
+            m_layoutWatcher->addPath(curFile);
+        }
+        auto *settings = VPApplication::VApp()->PuzzleSettings();
+        QStringList files = settings->GetRecentFileList();
+        files.removeAll(fileName);
+        files.prepend(fileName);
+        while (files.size() > MaxRecentFiles)
+        {
+            files.removeLast();
+        }
+        settings->SetRecentFileList(files);
+        UpdateRecentFileActions();
+    }
+
+    UpdateWindowTitle();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPMainWindow::SaveLayout(const QString &path, QString &error) -> bool
+{
+    bool success = false;
+    QSaveFile file(path);
+    // cppcheck-suppress ConfigurationNotChecked
+    if (file.open(QIODevice::WriteOnly))
+    {
+        VPLayoutFileWriter fileWriter;
+        fileWriter.WriteFile(m_layout, &file);
+
+        if (fileWriter.hasError())
+        {
+            error = tr("Fail to create layout.");
+            return false;
+        }
+
+        success = file.commit();
+    }
+
+    if (success)
+    {
+        SetCurrentFile(path);
+        LayoutWasSaved(true);
+    }
+    else
+    {
+        error = file.errorString();
+    }
+    return success;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::ImportRawLayouts(const QStringList &rawLayouts)
+{
+    VRawLayout rawLayoutReader;
+
+    for(const auto &path : rawLayouts)
+    {
+        VRawLayoutData data;
+        if (rawLayoutReader.ReadFile(path, data))
+        {
+            for (const auto& rawPiece : data.pieces)
+            {
+                for (quint16 i = 1; i <= rawPiece.GetQuantity(); ++i)
+                {
+                    VPPiecePtr piece(new VPPiece(rawPiece));
+                    piece->SetCopyNumber(i);
+
+                    if (not piece->IsValid())
+                    {
+                        qCCritical(pWindow) << qPrintable(tr("Piece %1 invalid.").arg(piece->GetName()));
+
+                        if (m_cmd != nullptr && not m_cmd->IsGuiEnabled())
+                        {
+                            QGuiApplication::exit(V_EX_DATAERR);
+                            return;
+                        }
+                    }
+
+                    piece->SetSheet(nullptr); // just in case
+                    VPLayout::AddPiece(m_layout, piece);
+                }
+            }
+
+            m_carrousel->Refresh();
+            m_layout->CheckPiecesPositionValidity();
+            LayoutWasSaved(false);
+        }
+        else
+        {
+            qCCritical(pWindow, "%s\n", qPrintable(tr("Could not extract data from file '%1'. %2")
+                                                    .arg(path, rawLayoutReader.ErrorString())));
+            if (m_cmd != nullptr && not m_cmd->IsGuiEnabled())
+            {
+                m_cmd->ShowHelp(V_EX_DATAERR);
+            }
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::InitZoom()
+{
+    if (m_graphicsView != nullptr)
+    {
+        m_graphicsView->ZoomFitBest();
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::SetupMenu()
+{
+    // most of the actions are connected through name convention (auto-connection)
+    // File
+    // -------------------- connects the actions for the file menu
+    ui->actionNew->setShortcuts(QKeySequence::New);
+    ui->actionSave->setShortcuts(QKeySequence::Save);
+    ui->actionSaveAs->setShortcuts(QKeySequence::SaveAs);
+
+    m_recentFileActs.fill(nullptr);
+    for (auto & recentFileAct : m_recentFileActs)
+    {
+        auto *action = new QAction(this);
+        recentFileAct = action;
+        connect(action, &QAction::triggered, this, [this]()
+        {
+            if (auto *senderAction = qobject_cast<QAction *>(sender()))
+            {
+                const QString filePath = senderAction->data().toString();
+                if (not filePath.isEmpty())
+                {
+                    LoadFile(filePath);
+                }
+            }
+        });
+        ui->menuFile->insertAction(ui->actionPreferences, recentFileAct);
+        recentFileAct->setVisible(false);
+    }
+
+    m_separatorAct = new QAction(this);
+    m_separatorAct->setSeparator(true);
+    m_separatorAct->setVisible(false);
+    ui->menuFile->insertAction(ui->actionPreferences, m_separatorAct);
+
+    // Actions for recent files loaded by a puzzle window application.
+    UpdateRecentFileActions();
+
+    connect(ui->actionExit, &QAction::triggered, this, &VPMainWindow::close);
+    ui->actionExit->setShortcuts(QKeySequence::Quit);
+
+    // Layout
+    connect(ui->actionExportLayout, &QAction::triggered, this, &VPMainWindow::on_ExportLayout);
+
+    // Sheet
+    connect(ui->actionExportSheet, &QAction::triggered, this, &VPMainWindow::on_ExportSheet);
+
+    // Add dock properties action
+    ui->menuSheet->addSeparator();
+    QAction* actionDockWidgetToolOptions = ui->dockWidgetProperties->toggleViewAction();
+    ui->menuSheet->addAction(actionDockWidgetToolOptions);
+    ui->menuSheet->addSeparator();
+
+    // Add Undo/Redo actions.
+    undoAction = m_layout->UndoStack()->createUndoAction(this, tr("&Undo"));
+    undoAction->setShortcuts(QKeySequence::Undo);
+    undoAction->setIcon(QIcon::fromTheme("edit-undo"));
+    ui->menuSheet->addAction(undoAction);
+    ui->toolBarUndoCommands->addAction(undoAction);
+
+    redoAction = m_layout->UndoStack()->createRedoAction(this, tr("&Redo"));
+    redoAction->setShortcuts(QKeySequence::Redo);
+    redoAction->setIcon(QIcon::fromTheme("edit-redo"));
+    ui->menuSheet->addAction(redoAction);
+    ui->toolBarUndoCommands->addAction(redoAction);
+
+    // Watermark
+    connect(ui->actionWatermarkEditor, &QAction::triggered, this, &VPMainWindow::CreateWatermark);
+    connect(ui->actionEditCurrentWatermark, &QAction::triggered, this, &VPMainWindow::EditCurrentWatermark);
+    connect(ui->actionLoadWatermark, &QAction::triggered, this, &VPMainWindow::LoadWatermark);
+    connect(ui->actionRemoveWatermark, &QAction::triggered, this, &VPMainWindow::RemoveWatermark);
+
+    // Window
+    connect(ui->menuWindow, &QMenu::aboutToShow, this, [this]()
+    {
+        ui->menuWindow->clear();
+        CreateWindowMenu(ui->menuWindow);
+    });
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::InitProperties()
+{
+    ui->tabWidgetProperties->setCurrentIndex(0);
+
+    VPSettings *settings = VPApplication::VApp()->PuzzleSettings();
+    m_oldLayoutUnit = settings->LayoutUnit();
+
+    InitPropertyTabCurrentPiece();
+    InitPropertyTabCurrentSheet();
+    InitPropertyTabTiles();
+    InitPropertyTabLayout();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::InitPropertyTabCurrentPiece()
+{
+    connect(ui->checkBoxCurrentPieceShowSeamline, &QCheckBox::toggled, this, [this](bool checked)
+    {
+        QList<VPPiecePtr> selectedPieces = SelectedPieces();
+        if (selectedPieces.size() == 1)
+        {
+            VPPiecePtr selectedPiece = selectedPieces.first();
+            if (not selectedPiece.isNull())
+            {
+                selectedPiece->SetHideMainPath(not checked);
+                LayoutWasSaved(false);
+                // nothing changed, but will force redraw
+                emit m_layout->PieceTransformationChanged(selectedPiece);
+            }
+        }
+    });
+
+    connect(ui->checkBoxCurrentPieceMirrorPiece, &QCheckBox::toggled, this, [this](bool checked)
+    {
+        QList<VPPiecePtr> selectedPieces = SelectedPieces();
+        if (selectedPieces.size() == 1)
+        {
+            VPPiecePtr selectedPiece = selectedPieces.first();
+            if (not selectedPiece.isNull())
+            {
+                if (selectedPiece->IsMirror() != checked)
+                {
+                    selectedPiece->Flip();
+                    LayoutWasSaved(false);
+                    emit m_layout->PieceTransformationChanged(selectedPiece);
+                }
+            }
+        }
+    });
+
+    // Translate
+    ui->comboBoxTranslateUnit->addItem(tr("Millimiters"), QVariant(UnitsToStr(Unit::Mm)));
+    ui->comboBoxTranslateUnit->addItem(tr("Centimeters"), QVariant(UnitsToStr(Unit::Cm)));
+    ui->comboBoxTranslateUnit->addItem(tr("Inches"), QVariant(UnitsToStr(Unit::Inch)));
+    ui->comboBoxTranslateUnit->addItem(tr("Pixels"), QVariant(UnitsToStr(Unit::Px)));
+
+    m_oldPieceTranslationUnit = Unit::Mm;
+    ui->comboBoxTranslateUnit->blockSignals(true);
+    ui->comboBoxTranslateUnit->setCurrentIndex(0);
+    ui->comboBoxTranslateUnit->blockSignals(false);
+
+    const int minTranslate = -1000;
+    const int maxTranslate = 1000;
+
+    ui->doubleSpinBoxCurrentPieceBoxPositionX->setMinimum(
+                UnitConvertor(minTranslate, Unit::Cm, m_oldPieceTranslationUnit));
+    ui->doubleSpinBoxCurrentPieceBoxPositionX->setMaximum(
+                UnitConvertor(maxTranslate, Unit::Cm, m_oldPieceTranslationUnit));
+    ui->doubleSpinBoxCurrentPieceBoxPositionX->setValue(0);
+
+    ui->doubleSpinBoxCurrentPieceBoxPositionY->setMinimum(
+                UnitConvertor(minTranslate, Unit::Cm, m_oldPieceTranslationUnit));
+    ui->doubleSpinBoxCurrentPieceBoxPositionY->setMaximum(
+                UnitConvertor(maxTranslate, Unit::Cm, m_oldPieceTranslationUnit));
+    ui->doubleSpinBoxCurrentPieceBoxPositionY->setValue(0);
+
+    connect(ui->comboBoxTranslateUnit, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this]()
+    {
+        const Unit newUnit = TranslateUnit();
+        const qreal oldTranslateX = ui->doubleSpinBoxCurrentPieceBoxPositionX->value();
+        const qreal oldTranslateY = ui->doubleSpinBoxCurrentPieceBoxPositionY->value();
+
+        ui->doubleSpinBoxCurrentPieceBoxPositionX->setMinimum(UnitConvertor(minTranslate, Unit::Cm, newUnit));
+        ui->doubleSpinBoxCurrentPieceBoxPositionX->setMaximum(UnitConvertor(maxTranslate, Unit::Cm, newUnit));
+
+        ui->doubleSpinBoxCurrentPieceBoxPositionY->setMinimum(UnitConvertor(minTranslate, Unit::Cm, newUnit));
+        ui->doubleSpinBoxCurrentPieceBoxPositionY->setMaximum(UnitConvertor(maxTranslate, Unit::Cm, newUnit));
+
+        ui->doubleSpinBoxCurrentPieceBoxPositionX->setValue(
+                    UnitConvertor(oldTranslateX, m_oldPieceTranslationUnit, newUnit));
+        ui->doubleSpinBoxCurrentPieceBoxPositionY->setValue(
+                    UnitConvertor(oldTranslateY, m_oldPieceTranslationUnit, newUnit));
+
+        m_oldPieceTranslationUnit = newUnit;
+    });
+
+    SetCheckBoxValue(ui->checkBoxRelativeTranslation, true);
+    connect(ui->checkBoxRelativeTranslation, &QCheckBox::toggled, this, &VPMainWindow::on_RelativeTranslationChanged);
+
+    // Rotate
+    ui->doubleSpinBoxCurrentPieceAngle->setValue(0);
+
+    ui->toolButtonCurrentPieceRotationAnticlockwise->setChecked(true);
+    ui->checkBoxTransformSeparately->setChecked(false);
+
+    QPushButton *bApply = ui->buttonBox->button(QDialogButtonBox::Apply);
+    SCASSERT(bApply != nullptr)
+    connect(bApply, &QPushButton::clicked, this, &VPMainWindow::on_ApplyPieceTransformation);
+
+    QPushButton *bReset = ui->buttonBox->button(QDialogButtonBox::Reset);
+    SCASSERT(bReset != nullptr)
+    connect(bReset, &QPushButton::clicked, this, &VPMainWindow::on_ResetPieceTransformationSettings);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::InitPropertyTabCurrentSheet()
+{
+    connect(ui->lineEditSheetName, &QLineEdit::textEdited, this, [this](const QString &text)
+    {
+        if (not m_layout.isNull())
+        {
+            VPSheetPtr sheet = m_layout->GetFocusedSheet();
+            if (not sheet.isNull())
+            {
+                sheet->SetName(text);
+                LayoutWasSaved(false);
+
+                if(m_carrousel != nullptr)
+                {
+                    m_carrousel->RefreshSheetNames();
+                }
+            }
+        }
+    });
+
+    // -------------------- layout units ---------------------------
+    ui->comboBoxLayoutUnit->addItem(tr("Millimiters"), QVariant(UnitsToStr(Unit::Mm)));
+    ui->comboBoxLayoutUnit->addItem(tr("Centimeters"), QVariant(UnitsToStr(Unit::Cm)));
+    ui->comboBoxLayoutUnit->addItem(tr("Inches"), QVariant(UnitsToStr(Unit::Inch)));
+    ui->comboBoxLayoutUnit->addItem(tr("Pixels"), QVariant(UnitsToStr(Unit::Px)));
+
+    VPSettings *settings = VPApplication::VApp()->PuzzleSettings();
+    const qint32 indexUnit = ui->comboBoxLayoutUnit->findData(UnitsToStr(settings->LayoutUnit()));
+    if (indexUnit != -1)
+    {
+        ui->comboBoxLayoutUnit->setCurrentIndex(indexUnit);
+    }
+
+    connect(ui->comboBoxLayoutUnit, QOverload<int>::of(&QComboBox::currentIndexChanged),
+            this, &VPMainWindow::on_ConvertPaperSize);
+
+    // -------------------- sheet template ---------------------------
+    VAbstractLayoutDialog::InitTemplates(ui->comboBoxSheetTemplates);
+
+    connect(ui->comboBoxSheetTemplates, QOverload<int>::of(&QComboBox::currentIndexChanged),
+            this, [this]{SheetSize(SheetTemplate());});
+
+    // -------------------- paper size ---------------------------
+    MinimumSheetPaperSize();
+
+    const QString suffix = " " + UnitsToStr(LayoutUnit(), true);
+
+    ui->doubleSpinBoxSheetPaperWidth->setSuffix(suffix);
+    ui->doubleSpinBoxSheetPaperHeight->setSuffix(suffix);
+
+    connect(ui->doubleSpinBoxSheetPaperWidth, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this,
+            &VPMainWindow::on_SheetSizeChanged);
+    connect(ui->doubleSpinBoxSheetPaperHeight, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this,
+            &VPMainWindow::on_SheetSizeChanged);
+    connect(ui->toolButtonSheetPortraitOritation, &QToolButton::toggled, this,
+            &VPMainWindow::on_SheetOrientationChanged);
+    connect(ui->toolButtonSheetLandscapeOrientation, &QToolButton::toggled, this,
+            &VPMainWindow::on_SheetOrientationChanged);
+
+    connect(ui->toolButtonGrainlineHorizontalOrientation, &QToolButton::clicked, this, [this](bool checked)
+    {
+        VPSheetPtr sheet = m_layout->GetFocusedSheet();
+        if (sheet.isNull())
+        {
+            return;
+        }
+
+        if (checked)
+        {
+            sheet->SetGrainlineType(GrainlineType::Horizontal);
+            ui->toolButtonGrainlineVerticalOrientation->setChecked(false);
+        }
+        else
+        {
+            sheet->SetGrainlineType(GrainlineType::NotFixed);
+        }
+
+        RotatePiecesToGrainline();
+        LayoutWasSaved(false);
+    });
+
+    connect(ui->toolButtonGrainlineVerticalOrientation, &QToolButton::clicked, this, [this](bool checked)
+    {
+        VPSheetPtr sheet = m_layout->GetFocusedSheet();
+        if (sheet.isNull())
+        {
+            return;
+        }
+
+        if (checked)
+        {
+            sheet->SetGrainlineType(GrainlineType::Vertical);
+            ui->toolButtonGrainlineHorizontalOrientation->setChecked(false);
+        }
+        else
+        {
+            sheet->SetGrainlineType(GrainlineType::NotFixed);
+        }
+
+        RotatePiecesToGrainline();
+        LayoutWasSaved(false);
+    });
+
+    connect(ui->pushButtonSheetRemoveUnusedLength, &QPushButton::clicked, this, [this]()
+    {
+        if (not m_layout.isNull())
+        {
+            VPSheetPtr sheet = m_layout->GetFocusedSheet();
+            if (not sheet.isNull())
+            {
+                sheet->RemoveUnusedLength();
+                LayoutWasSaved(false);
+                m_layout->TileFactory()->refreshTileInfos();
+                m_graphicsView->RefreshLayout();
+                m_graphicsView->RefreshPieces();
+                SetPropertyTabSheetData();
+            }
+        }
+    });
+
+    // -------------------- margins  ------------------------
+    ui->doubleSpinBoxSheetMarginLeft->setSuffix(suffix);
+    ui->doubleSpinBoxSheetMarginRight->setSuffix(suffix);
+    ui->doubleSpinBoxSheetMarginTop->setSuffix(suffix);
+    ui->doubleSpinBoxSheetMarginBottom->setSuffix(suffix);
+
+    connect(ui->doubleSpinBoxSheetMarginTop, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this,
+            &VPMainWindow::on_SheetMarginChanged);
+    connect(ui->doubleSpinBoxSheetMarginRight, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this,
+            &VPMainWindow::on_SheetMarginChanged);
+    connect(ui->doubleSpinBoxSheetMarginBottom, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this,
+            &VPMainWindow::on_SheetMarginChanged);
+    connect(ui->doubleSpinBoxSheetMarginLeft, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this,
+            &VPMainWindow::on_SheetMarginChanged);
+
+    connect(ui->checkBoxLayoutIgnoreFileds, &QCheckBox::stateChanged, this, [this](int state)
+    {
+        if (not m_layout.isNull())
+        {
+            ui->doubleSpinBoxSheetMarginLeft->setDisabled(state != 0);
+            ui->doubleSpinBoxSheetMarginRight->setDisabled(state != 0);
+            ui->doubleSpinBoxSheetMarginTop->setDisabled(state != 0);
+            ui->doubleSpinBoxSheetMarginBottom->setDisabled(state != 0);
+
+            VPSheetPtr sheet = m_layout->GetFocusedSheet();
+            if (not sheet.isNull())
+            {
+                sheet->SetIgnoreMargins(state != 0);
+                LayoutWasSaved(false);
+                m_layout->TileFactory()->refreshTileInfos();
+                m_graphicsView->RefreshLayout();
+
+                sheet->ValidatePiecesOutOfBound();
+            }
+        }
+    });
+
+    ui->groupBoxSheetGrid->setVisible(false); // temporary hide
+
+    connect(ui->pushButtonSheetExport, &QPushButton::clicked, this, &VPMainWindow::on_ExportSheet);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::InitPropertyTabTiles()
+{
+    // -------------------- tiles template
+    VAbstractLayoutDialog::InitTileTemplates(ui->comboBoxTileTemplates, true);
+
+    connect(ui->comboBoxTileTemplates, QOverload<int>::of(&QComboBox::currentIndexChanged),
+            this, [this]{TileSize(TileTemplate());});
+
+    // -------------------- paper size ---------------------------
+    MinimumTilePaperSize();
+
+    const QString suffix = " " + UnitsToStr(LayoutUnit(), true);
+
+    ui->doubleSpinBoxTilePaperWidth->setSuffix(suffix);
+    ui->doubleSpinBoxTilePaperHeight->setSuffix(suffix);
+
+    connect(ui->doubleSpinBoxTilePaperWidth, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this,
+            &VPMainWindow::on_TilesSizeChanged);
+    connect(ui->doubleSpinBoxTilePaperHeight, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this,
+            &VPMainWindow::on_TilesSizeChanged);
+    connect(ui->toolButtonTilePortraitOrientation, &QToolButton::toggled, this,
+            &VPMainWindow::on_TilesOrientationChanged);
+    connect(ui->toolButtonTileLandscapeOrientation, &QToolButton::toggled, this,
+            &VPMainWindow::on_TilesOrientationChanged);
+
+    // -------------------- margins  ------------------------
+    ui->doubleSpinBoxTileMarginLeft->setSuffix(suffix);
+    ui->doubleSpinBoxTileMarginRight->setSuffix(suffix);
+    ui->doubleSpinBoxTileMarginTop->setSuffix(suffix);
+    ui->doubleSpinBoxTileMarginBottom->setSuffix(suffix);
+
+    connect(ui->doubleSpinBoxTileMarginTop, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this,
+            &VPMainWindow::on_TilesMarginChanged);
+    connect(ui->doubleSpinBoxTileMarginRight, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this,
+            &VPMainWindow::on_TilesMarginChanged);
+    connect(ui->doubleSpinBoxTileMarginBottom, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this,
+            &VPMainWindow::on_TilesMarginChanged);
+    connect(ui->doubleSpinBoxTileMarginLeft, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this,
+            &VPMainWindow::on_TilesMarginChanged);
+
+    connect(ui->checkBoxTileIgnoreFileds, &QCheckBox::stateChanged, this, [this](int state)
+    {
+        if (not m_layout.isNull())
+        {
+            ui->doubleSpinBoxTileMarginLeft->setDisabled(state != 0);
+            ui->doubleSpinBoxTileMarginRight->setDisabled(state != 0);
+            ui->doubleSpinBoxTileMarginTop->setDisabled(state != 0);
+            ui->doubleSpinBoxTileMarginBottom->setDisabled(state != 0);
+
+            m_layout->LayoutSettings().SetIgnoreTilesMargins(state != 0);
+            LayoutWasSaved(false);
+            m_layout->TileFactory()->refreshTileInfos();
+            m_graphicsView->RefreshLayout();
+            VMainGraphicsView::NewSceneRect(m_graphicsView->scene(), m_graphicsView);
+        }
+    });
+
+    // -------------------- control  ------------------------
+    connect(ui->checkBoxTilesShowTiles, &QCheckBox::toggled, this, [this](bool checked)
+    {
+        if (not m_layout.isNull())
+        {
+            m_layout->LayoutSettings().SetShowTiles(checked);
+            LayoutWasSaved(false);
+            m_graphicsView->RefreshLayout();
+            VMainGraphicsView::NewSceneRect(m_graphicsView->scene(), m_graphicsView);
+        }
+    });
+
+    connect(ui->checkBoxTilesShowWatermark, &QCheckBox::toggled, this, [this](bool checked)
+    {
+        if (not m_layout.isNull())
+        {
+            m_layout->LayoutSettings().SetShowWatermark(checked);
+            LayoutWasSaved(false);
+            m_graphicsView->RefreshLayout();
+            VMainGraphicsView::NewSceneRect(m_graphicsView->scene(), m_graphicsView);
+        }
+    });
+
+    connect(ui->checkBoxPrintTilesScheme, &QCheckBox::toggled, this, [this](bool checked)
+    {
+        if (not m_layout.isNull())
+        {
+            m_layout->LayoutSettings().SetPrintTilesScheme(checked);
+            LayoutWasSaved(false);
+        }
+    });
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::InitPropertyTabLayout()
+{
+    connect(ui->lineEditLayoutName, &QLineEdit::textEdited, this, [this](const QString &text)
+    {
+        if (not m_layout.isNull())
+        {
+            m_layout->LayoutSettings().SetTitle(text);
+            LayoutWasSaved(false);
+        }
+    });
+
+    connect(ui->plainTextEditLayoutDescription, &QPlainTextEdit::textChanged, this, [this]()
+    {
+        if (not m_layout.isNull())
+        {
+            m_layout->LayoutSettings().SetDescription(ui->plainTextEditLayoutDescription->toPlainText());
+            LayoutWasSaved(false);
+        }
+    });
+
+    connect(ui->checkBoxLayoutWarningPiecesSuperposition, &QCheckBox::toggled, this, [this](bool checked)
+    {
+        if (not m_layout.isNull())
+        {
+            m_layout->LayoutSettings().SetWarningSuperpositionOfPieces(checked);
+            LayoutWasSaved(false);
+            if (checked)
+            {
+                VPSheetPtr sheet = m_layout->GetFocusedSheet();
+                if (not sheet.isNull())
+                {
+                    sheet->ValidateSuperpositionOfPieces();
+                }
+            }
+            m_graphicsView->RefreshPieces();
+        }
+    });
+
+    connect(ui->checkBoxLayoutWarningPiecesOutOfBound, &QCheckBox::toggled, this, [this](bool checked)
+    {
+        if (not m_layout.isNull())
+        {
+            m_layout->LayoutSettings().SetWarningPiecesOutOfBound(checked);
+            LayoutWasSaved(false);
+
+            if (checked)
+            {
+                VPSheetPtr sheet = m_layout->GetFocusedSheet();
+                if (not sheet.isNull())
+                {
+                    sheet->ValidatePiecesOutOfBound();
+                }
+            }
+            m_graphicsView->RefreshPieces();
+        }
+    });
+
+    connect(ui->checkBoxSheetStickyEdges, &QCheckBox::toggled, this, [this](bool checked)
+    {
+        if (not m_layout.isNull())
+        {
+            m_layout->LayoutSettings().SetStickyEdges(checked);
+            LayoutWasSaved(false);
+        }
+    });
+
+    connect(ui->checkBoxFollowGainline, &QCheckBox::toggled, this, [this](bool checked)
+    {
+        if (not m_layout.isNull())
+        {
+            m_layout->LayoutSettings().SetFollowGrainline(checked);
+
+            if (checked)
+            {
+                RotatePiecesToGrainline();
+            }
+
+            LayoutWasSaved(false);
+        }
+    });
+
+    VPSettings *settings = VPApplication::VApp()->PuzzleSettings();
+    ui->doubleSpinBoxSheetPiecesGap->setMaximum(
+                UnitConvertor(VPSettings::GetMaxLayoutPieceGap(), Unit::Px, settings->LayoutUnit()));
+    ui->doubleSpinBoxSheetPiecesGap->setSuffix(" " + UnitsToStr(LayoutUnit(), true));
+    connect(ui->doubleSpinBoxSheetPiecesGap, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this,
+            [this](double d)
+    {
+        if (not m_layout.isNull())
+        {
+            m_layout->LayoutSettings().SetPiecesGapConverted(d);
+            LayoutWasSaved(false);
+        }
+    });
+
+    connect(ui->toolButtonScaleConnected, &QToolButton::clicked, this, [this]()
+    {
+        m_scaleConnected = not m_scaleConnected;
+
+        UpdateScaleConnection();
+    });
+
+    connect(ui->doubleSpinBoxHorizontalScale, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
+            this, [this](double d)
+    {
+        if (m_layout.isNull())
+        {
+            return;
+        }
+
+        m_layout->LayoutSettings().SetHorizontalScale(d / 100.);
+
+        if (m_scaleConnected)
+        {
+            ui->doubleSpinBoxVerticalScale->blockSignals(true);
+            ui->doubleSpinBoxVerticalScale->setValue(d);
+            ui->doubleSpinBoxVerticalScale->blockSignals(false);
+
+            m_layout->LayoutSettings().SetVerticalScale(d / 100.);
+        }
+
+        LayoutWasSaved(false);
+        m_layout->TileFactory()->refreshTileInfos();
+        m_graphicsView->RefreshLayout();
+
+        VMainGraphicsView::NewSceneRect(m_graphicsView->scene(), m_graphicsView);
+    });
+
+    connect(ui->doubleSpinBoxVerticalScale, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
+            [this](double d)
+    {
+        if (m_layout.isNull())
+        {
+            return;
+        }
+
+        m_layout->LayoutSettings().SetVerticalScale(d / 100.);
+
+        if (m_scaleConnected)
+        {
+            ui->doubleSpinBoxHorizontalScale->blockSignals(true);
+            ui->doubleSpinBoxHorizontalScale->setValue(d);
+            ui->doubleSpinBoxHorizontalScale->blockSignals(false);
+
+            m_layout->LayoutSettings().SetHorizontalScale(d / 100.);
+        }
+
+        LayoutWasSaved(false);
+        m_layout->TileFactory()->refreshTileInfos();
+        m_graphicsView->RefreshLayout();
+
+        VMainGraphicsView::NewSceneRect(m_graphicsView->scene(), m_graphicsView);
+    });
+
+    connect(ui->pushButtonLayoutExport, &QPushButton::clicked, this, &VPMainWindow::on_ExportLayout);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::InitCarrousel()
+{
+    m_carrousel = new VPCarrousel(m_layout, ui->dockWidgetCarrousel);
+    ui->dockWidgetCarrousel->setWidget(m_carrousel);
+
+    connect(ui->dockWidgetCarrousel, QOverload<Qt::DockWidgetArea>::of(&QDockWidget::dockLocationChanged), this,
+              &VPMainWindow::on_CarrouselLocationChanged);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::SetPropertiesData()
+{
+    SetPropertyTabCurrentPieceData();
+    SetPropertyTabSheetData();
+    SetPropertyTabTilesData();
+    SetPropertyTabLayoutData();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::SetPropertyTabCurrentPieceData()
+{
+    QList<VPPiecePtr> selectedPieces = SelectedPieces();
+
+    if(selectedPieces.isEmpty())
+    {
+        // show the content "no piece selected"
+        ui->labelCurrentPieceNoPieceSelected->setVisible(true);
+
+        ui->groupBoxCurrentPieceInfo->setVisible(false);
+        ui->groupBoxPieceTransformation->setVisible(false);
+        ui-> groupBoxCurrentPieceSeamline->setVisible(false);
+        ui->groupBoxCurrentPieceGeometry->setVisible(false);
+    }
+    else if(selectedPieces.count() == 1)
+    {
+        ui->labelCurrentPieceNoPieceSelected->setVisible(false);
+
+        ui->groupBoxCurrentPieceInfo->setVisible(true);
+        ui->groupBoxPieceTransformation->setVisible(true);
+        ui-> groupBoxCurrentPieceSeamline->setVisible(true);
+        ui->groupBoxCurrentPieceGeometry->setVisible(true);
+
+        VPPiecePtr selectedPiece = selectedPieces.first();
+
+        // set the value to the current piece
+        SetLineEditValue(ui->lineEditCurrentPieceName, selectedPiece->GetName());
+        SetPlainTextEditValue(ui->plainTextEditCurrentPieceUUID, selectedPiece->GetUUID().toString());
+        SetLineEditValue(ui->lineEditCurrentPieceGradationId, selectedPiece->GetGradationId());
+
+        SetCheckBoxValue(ui->checkBoxCurrentPieceShowSeamline, not selectedPiece->IsHideMainPath());
+        SetCheckBoxValue(ui->checkBoxCurrentPieceMirrorPiece, selectedPiece->IsMirror());
+
+        if (not ui->checkBoxRelativeTranslation->isChecked())
+        {
+            QRectF rect = PiecesBoundingRect(selectedPieces);
+
+            ui->doubleSpinBoxCurrentPieceBoxPositionX->setValue(
+                        UnitConvertor(rect.topLeft().x(), Unit::Px, TranslateUnit()));
+            ui->doubleSpinBoxCurrentPieceBoxPositionY->setValue(
+                        UnitConvertor(rect.topLeft().y(), Unit::Px, TranslateUnit()));
+        }
+    }
+    else
+    {
+        // show the content "multiple pieces selected"
+
+        ui->labelCurrentPieceNoPieceSelected->setVisible(true);
+
+        ui->groupBoxCurrentPieceInfo->setVisible(false);
+        ui->groupBoxPieceTransformation->setVisible(true);
+        ui->groupBoxCurrentPieceSeamline->setVisible(false);
+        ui->groupBoxCurrentPieceGeometry->setVisible(false);
+
+        if (not ui->checkBoxRelativeTranslation->isChecked())
+        {
+            QRectF rect = PiecesBoundingRect(selectedPieces);
+
+            ui->doubleSpinBoxCurrentPieceBoxPositionX->setValue(
+                        UnitConvertor(rect.topLeft().x(), Unit::Px, TranslateUnit()));
+            ui->doubleSpinBoxCurrentPieceBoxPositionY->setValue(
+                        UnitConvertor(rect.topLeft().y(), Unit::Px, TranslateUnit()));
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::SetPropertyTabSheetData()
+{
+    if (not m_layout.isNull())
+    {
+        VPSheetPtr sheet = m_layout->GetFocusedSheet();
+        if (not sheet.isNull())
+        {
+            ui->groupBoxSheetInfos->setDisabled(false);
+            SetLineEditValue(ui->lineEditSheetName, sheet->GetName());
+
+            ui->groupBoxPaperFormat->setDisabled(false);
+            const qint32 indexUnit = ui->comboBoxLayoutUnit->findData(UnitsToStr(m_layout->LayoutSettings().GetUnit()));
+            if (indexUnit != -1)
+            {
+                ui->comboBoxLayoutUnit->blockSignals(true);
+                ui->comboBoxLayoutUnit->setCurrentIndex(indexUnit);
+                ui->comboBoxLayoutUnit->blockSignals(false);
+            }
+            else
+            {
+                ui->comboBoxLayoutUnit->setCurrentIndex(0);
+            }
+
+            const QString suffix = " " + UnitsToStr(LayoutUnit(), true);
+
+            ui->doubleSpinBoxSheetPaperWidth->setSuffix(suffix);
+            ui->doubleSpinBoxSheetPaperHeight->setSuffix(suffix);
+
+            ui->doubleSpinBoxSheetMarginLeft->setSuffix(suffix);
+            ui->doubleSpinBoxSheetMarginRight->setSuffix(suffix);
+            ui->doubleSpinBoxSheetMarginTop->setSuffix(suffix);
+            ui->doubleSpinBoxSheetMarginBottom->setSuffix(suffix);
+
+            // set Width / Length
+            QSizeF size = sheet->GetSheetSizeConverted();
+            SetDoubleSpinBoxValue(ui->doubleSpinBoxSheetPaperWidth, size.width());
+            SetDoubleSpinBoxValue(ui->doubleSpinBoxSheetPaperHeight, size.height());
+
+            SheetPaperSizeChanged();
+            FindSheetTemplate();
+
+            // set margins
+            ui->groupBoxSheetMargin->setDisabled(false);
+            QMarginsF margins = sheet->GetSheetMarginsConverted();
+            SetDoubleSpinBoxValue(ui->doubleSpinBoxSheetMarginLeft, margins.left());
+            SetDoubleSpinBoxValue(ui->doubleSpinBoxSheetMarginTop, margins.top());
+            SetDoubleSpinBoxValue(ui->doubleSpinBoxSheetMarginRight, margins.right());
+            SetDoubleSpinBoxValue(ui->doubleSpinBoxSheetMarginBottom, margins.bottom());
+
+            CorrectSheetMaxMargins();
+
+            const bool ignoreMargins = sheet->IgnoreMargins();
+            SetCheckBoxValue(ui->checkBoxLayoutIgnoreFileds, ignoreMargins);
+
+            ui->doubleSpinBoxSheetMarginLeft->setDisabled(ignoreMargins);
+            ui->doubleSpinBoxSheetMarginRight->setDisabled(ignoreMargins);
+            ui->doubleSpinBoxSheetMarginTop->setDisabled(ignoreMargins);
+            ui->doubleSpinBoxSheetMarginBottom->setDisabled(ignoreMargins);
+
+            GrainlineType type = sheet->GetGrainlineType();
+            ui->toolButtonGrainlineHorizontalOrientation->setChecked(type == GrainlineType::Horizontal);
+            ui->toolButtonGrainlineVerticalOrientation->setChecked(type == GrainlineType::Vertical);
+
+            // set placement grid
+            ui->groupBoxSheetGrid->setDisabled(false);
+            SetDoubleSpinBoxValue(ui->doubleSpinBoxSheetGridColWidth,
+                                  m_layout->LayoutSettings().GetGridColWidthConverted());
+            SetDoubleSpinBoxValue(ui->doubleSpinBoxSheetGridRowHeight,
+                                  m_layout->LayoutSettings().GetGridRowHeightConverted());
+
+            SetCheckBoxValue(ui->checkBoxSheetShowGrid, m_layout->LayoutSettings().GetShowGrid());
+
+            ui->groupBoxSheetExport->setDisabled(false);
+
+            return;
+        }
+    }
+
+    ui->groupBoxSheetInfos->setDisabled(true);
+    SetLineEditValue(ui->lineEditSheetName, QString());
+
+    ui->groupBoxPaperFormat->setDisabled(true);
+
+    ui->comboBoxLayoutUnit->blockSignals(true);
+    ui->comboBoxLayoutUnit->setCurrentIndex(-1);
+    ui->comboBoxLayoutUnit->blockSignals(false);
+
+    ui->comboBoxSheetTemplates->blockSignals(true);
+    ui->comboBoxSheetTemplates->setCurrentIndex(-1);
+    ui->comboBoxSheetTemplates->blockSignals(false);
+
+    SetDoubleSpinBoxValue(ui->doubleSpinBoxSheetPaperWidth, 0);
+    SetDoubleSpinBoxValue(ui->doubleSpinBoxSheetPaperHeight, 0);
+
+    ui->groupBoxSheetMargin->setDisabled(true);
+
+    SetDoubleSpinBoxValue(ui->doubleSpinBoxSheetMarginLeft, 0);
+    SetDoubleSpinBoxValue(ui->doubleSpinBoxSheetMarginTop, 0);
+    SetDoubleSpinBoxValue(ui->doubleSpinBoxSheetMarginRight, 0);
+    SetDoubleSpinBoxValue(ui->doubleSpinBoxSheetMarginBottom, 0);
+
+    SetCheckBoxValue(ui->checkBoxLayoutIgnoreFileds, false);
+
+    ui->groupBoxSheetGrid->setDisabled(true);
+
+    SetDoubleSpinBoxValue(ui->doubleSpinBoxSheetGridColWidth, 0);
+    SetDoubleSpinBoxValue(ui->doubleSpinBoxSheetGridRowHeight, 0);
+
+    SetCheckBoxValue(ui->checkBoxSheetShowGrid, false);
+
+    ui->groupBoxSheetExport->setDisabled(true);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::SetPropertyTabTilesData()
+{
+    if (not m_layout.isNull())
+    {
+        ui->groupBoxTilePaperFormat->setDisabled(false);
+        // set Width / Length
+        QSizeF size = m_layout->LayoutSettings().GetTilesSizeConverted();
+        SetDoubleSpinBoxValue(ui->doubleSpinBoxTilePaperWidth, size.width());
+        SetDoubleSpinBoxValue(ui->doubleSpinBoxTilePaperHeight, size.height());
+
+        TilePaperSizeChanged();
+        FindTileTemplate();
+
+        // set margins
+        ui->groupBoxTileMargins->setDisabled(false);
+        QMarginsF margins = m_layout->LayoutSettings().GetTilesMarginsConverted();
+        SetDoubleSpinBoxValue(ui->doubleSpinBoxTileMarginLeft, margins.left());
+        SetDoubleSpinBoxValue(ui->doubleSpinBoxTileMarginTop, margins.top());
+        SetDoubleSpinBoxValue(ui->doubleSpinBoxTileMarginRight, margins.right());
+        SetDoubleSpinBoxValue(ui->doubleSpinBoxTileMarginBottom, margins.bottom());
+
+        CorrectTileMaxMargins();
+
+        const bool ignoreMargins = m_layout->LayoutSettings().IgnoreTilesMargins();
+        SetCheckBoxValue(ui->checkBoxTileIgnoreFileds, ignoreMargins);
+
+        ui->doubleSpinBoxTileMarginLeft->setDisabled(ignoreMargins);
+        ui->doubleSpinBoxTileMarginRight->setDisabled(ignoreMargins);
+        ui->doubleSpinBoxTileMarginTop->setDisabled(ignoreMargins);
+        ui->doubleSpinBoxTileMarginBottom->setDisabled(ignoreMargins);
+
+        const QString suffix = " " + UnitsToStr(LayoutUnit(), true);
+
+        ui->doubleSpinBoxTilePaperWidth->setSuffix(suffix);
+        ui->doubleSpinBoxTilePaperHeight->setSuffix(suffix);
+
+        ui->doubleSpinBoxTileMarginLeft->setSuffix(suffix);
+        ui->doubleSpinBoxTileMarginRight->setSuffix(suffix);
+        ui->doubleSpinBoxTileMarginTop->setSuffix(suffix);
+        ui->doubleSpinBoxTileMarginBottom->setSuffix(suffix);
+
+        ui->groupBoxTilesControl->setDisabled(false);
+
+        SetCheckBoxValue(ui->checkBoxTilesShowTiles, m_layout->LayoutSettings().GetShowTiles());
+        SetCheckBoxValue(ui->checkBoxTilesShowWatermark, m_layout->LayoutSettings().GetShowWatermark());
+        SetCheckBoxValue(ui->checkBoxPrintTilesScheme, m_layout->LayoutSettings().GetPrintTilesScheme());
+    }
+    else
+    {
+        ui->groupBoxTilePaperFormat->setDisabled(true);
+
+        SetDoubleSpinBoxValue(ui->doubleSpinBoxTilePaperWidth, 0);
+        SetDoubleSpinBoxValue(ui->doubleSpinBoxTilePaperHeight, 0);
+
+        ui->groupBoxTileMargins->setDisabled(true);
+
+        SetDoubleSpinBoxValue(ui->doubleSpinBoxTileMarginLeft, 0);
+        SetDoubleSpinBoxValue(ui->doubleSpinBoxTileMarginTop, 0);
+        SetDoubleSpinBoxValue(ui->doubleSpinBoxTileMarginRight, 0);
+        SetDoubleSpinBoxValue(ui->doubleSpinBoxTileMarginBottom, 0);
+
+        SetCheckBoxValue(ui->checkBoxTileIgnoreFileds, false);
+
+        ui->groupBoxTilesControl->setDisabled(true);
+
+        SetCheckBoxValue(ui->checkBoxTilesShowTiles, false);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::SetPropertyTabLayoutData()
+{
+    if (not m_layout.isNull())
+    {
+        // set the title and description
+        ui->groupBoxLayoutInfos->setDisabled(false);
+        SetLineEditValue(ui->lineEditLayoutName, m_layout->LayoutSettings().GetTitle());
+        SetPlainTextEditValue(ui->plainTextEditLayoutDescription, m_layout->LayoutSettings().GetDescription());
+
+        // set controls
+        ui->groupBoxLayoutControl->setDisabled(false);
+        SetCheckBoxValue(ui->checkBoxLayoutWarningPiecesOutOfBound,
+                         m_layout->LayoutSettings().GetWarningPiecesOutOfBound());
+        SetCheckBoxValue(ui->checkBoxLayoutWarningPiecesSuperposition,
+                         m_layout->LayoutSettings().GetWarningSuperpositionOfPieces());
+        SetCheckBoxValue(ui->checkBoxSheetStickyEdges,
+                         m_layout->LayoutSettings().GetStickyEdges());
+        SetCheckBoxValue(ui->checkBoxFollowGainline,
+                         m_layout->LayoutSettings().GetFollowGrainline());
+
+        // set pieces gap
+        SetDoubleSpinBoxValue(ui->doubleSpinBoxSheetPiecesGap, m_layout->LayoutSettings().GetPiecesGapConverted());
+
+        ui->doubleSpinBoxSheetPiecesGap->setSuffix(" " + UnitsToStr(LayoutUnit(), true));
+
+        ui->groupBoxLayoutScale->setDisabled(false);
+
+        const qreal xScale = m_layout->LayoutSettings().HorizontalScale();
+        SetDoubleSpinBoxValue(ui->doubleSpinBoxHorizontalScale, xScale * 100.);
+
+        const qreal yScale = m_layout->LayoutSettings().VerticalScale();
+        SetDoubleSpinBoxValue(ui->doubleSpinBoxVerticalScale, yScale * 100.);
+
+        m_scaleConnected = qFuzzyCompare(xScale, yScale);
+        UpdateScaleConnection();
+
+        ui->groupBoxLayoutExport->setDisabled(false);
+    }
+    else
+    {
+        ui->groupBoxLayoutInfos->setDisabled(true);
+        SetLineEditValue(ui->lineEditLayoutName, QString());
+        SetPlainTextEditValue(ui->plainTextEditLayoutDescription, QString());
+
+        ui->groupBoxLayoutControl->setDisabled(true);
+
+        ui->comboBoxLayoutUnit->blockSignals(true);
+        ui->comboBoxLayoutUnit->setCurrentIndex(-1);
+        ui->comboBoxLayoutUnit->blockSignals(false);
+
+        // set controls
+        SetCheckBoxValue(ui->checkBoxLayoutWarningPiecesOutOfBound, false);
+        SetCheckBoxValue(ui->checkBoxLayoutWarningPiecesSuperposition, false);
+        SetCheckBoxValue(ui->checkBoxSheetStickyEdges, false);
+        SetCheckBoxValue(ui->checkBoxFollowGainline, false);
+
+        SetDoubleSpinBoxValue(ui->doubleSpinBoxSheetPiecesGap, 0);
+
+        ui->groupBoxLayoutScale->setDisabled(true);
+
+        ui->groupBoxLayoutExport->setDisabled(true);
+    }
+}
+
+
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::InitMainGraphics()
+{
+    m_graphicsView = new VPMainGraphicsView(m_layout, this);
+    m_graphicsView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+    m_graphicsView->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+    ui->centralWidget->layout()->addWidget(m_graphicsView);
+
+    m_graphicsView->RefreshLayout();
+
+    connect(m_graphicsView, &VPMainGraphicsView::ScaleChanged, this, &VPMainWindow::on_ScaleChanged);
+    connect(m_graphicsView, &VPMainGraphicsView::mouseMove, this, &VPMainWindow::on_MouseMoved);
+    connect(m_layout.get(), &VPLayout::PieceSheetChanged, m_carrousel, &VPCarrousel::Refresh);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::InitZoomToolBar()
+{
+    if (not m_doubleSpinBoxScale.isNull())
+    {
+        delete m_doubleSpinBoxScale;
+    }
+
+    delete m_mouseCoordinate;
+
+    // connect the zoom buttons and shortcuts to the slots
+    QList<QKeySequence> zoomInShortcuts;
+    zoomInShortcuts.append(QKeySequence(QKeySequence::ZoomIn));
+    zoomInShortcuts.append(QKeySequence(Qt::ControlModifier + Qt::Key_Plus + Qt::KeypadModifier));
+    ui->actionZoomIn->setShortcuts(zoomInShortcuts);
+    connect(ui->actionZoomIn, &QAction::triggered, m_graphicsView, &VPMainGraphicsView::ZoomIn);
+
+    QList<QKeySequence> zoomOutShortcuts;
+    zoomOutShortcuts.append(QKeySequence(QKeySequence::ZoomOut));
+    zoomOutShortcuts.append(QKeySequence(Qt::ControlModifier + Qt::Key_Minus + Qt::KeypadModifier));
+    ui->actionZoomOut->setShortcuts(zoomOutShortcuts);
+    connect(ui->actionZoomOut, &QAction::triggered, m_graphicsView, &VPMainGraphicsView::ZoomOut);
+
+    QList<QKeySequence> zoomOriginalShortcuts;
+    zoomOriginalShortcuts.append(QKeySequence(Qt::ControlModifier + Qt::Key_0));
+    zoomOriginalShortcuts.append(QKeySequence(Qt::ControlModifier + Qt::Key_0 + Qt::KeypadModifier));
+    ui->actionZoomOriginal->setShortcuts(zoomOriginalShortcuts);
+    connect(ui->actionZoomOriginal, &QAction::triggered, m_graphicsView, &VPMainGraphicsView::ZoomOriginal);
+
+    QList<QKeySequence> zoomFitBestShortcuts;
+    zoomFitBestShortcuts.append(QKeySequence(Qt::ControlModifier + Qt::Key_Equal));
+    ui->actionZoomFitBest->setShortcuts(zoomFitBestShortcuts);
+    connect(ui->actionZoomFitBest, &QAction::triggered, m_graphicsView, &VPMainGraphicsView::ZoomFitBest);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::InitScaleToolBar()
+{
+    auto* zoomScale = new QLabel(tr("Scale:"), this);
+    ui->toolBarScale->addWidget(zoomScale);
+
+    m_doubleSpinBoxScale = new QDoubleSpinBox(this);
+    m_doubleSpinBoxScale->setDecimals(1);
+    m_doubleSpinBoxScale->setSuffix(QChar('%'));
+    on_ScaleChanged(m_graphicsView->transform().m11());
+    connect(m_doubleSpinBoxScale.data(), QOverload<double>::of(&QDoubleSpinBox::valueChanged),
+            this, [this](double d){m_graphicsView->Zoom(d/100.0);});
+    ui->toolBarScale->addWidget(m_doubleSpinBoxScale);
+
+
+    // define the mouse position
+    ui->toolBarScale->addSeparator();
+
+    m_mouseCoordinate = new QLabel(QStringLiteral("0, 0 (%1)")
+                                   .arg(UnitsToStr(m_layout->LayoutSettings().GetUnit(), true)));
+    ui->toolBarScale->addWidget(m_mouseCoordinate);
+    ui->toolBarScale->addSeparator();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::UpdateWindowTitle()
+{
+    QString showName;
+    if (not curFile.isEmpty())
+    {
+        showName = StrippedName(curFile);
+    }
+    else
+    {
+        int index = VPApplication::VApp()->MainWindows().indexOf(this);
+        if (index != -1)
+        {
+            showName = tr("untitled %1.vlt").arg(index+1);
+        }
+        else
+        {
+            showName = tr("untitled.vlt");
+        }
+    }
+
+    showName += QLatin1String("[*]");
+
+    if (IsLayoutReadOnly())
+    {
+        showName += QStringLiteral(" (") + tr("read only") + QChar(')');
+    }
+
+    setWindowTitle(showName);
+    setWindowFilePath(curFile);
+
+#if defined(Q_OS_MAC)
+    static QIcon fileIcon = QIcon(QCoreApplication::applicationDirPath() +
+                                  QLatin1String("/../Resources/layout.icns"));
+    QIcon icon;
+    if (not curFile.isEmpty())
+    {
+        if (not isWindowModified())
+        {
+            icon = fileIcon;
+        }
+        else
+        {
+            static QIcon darkIcon;
+
+            if (darkIcon.isNull())
+            {
+                darkIcon = QIcon(darkenPixmap(fileIcon.pixmap(16, 16)));
+            }
+            icon = darkIcon;
+        }
+    }
+    setWindowIcon(icon);
+#endif //defined(Q_OS_MAC)
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::ReadSettings()
+{
+    qCDebug(pWindow, "Reading settings.");
+    const VPSettings *settings = VPApplication::VApp()->PuzzleSettings();
+
+    if (settings->status() == QSettings::NoError)
+    {
+        restoreGeometry(settings->GetGeometry());
+        restoreState(settings->GetWindowState());
+        restoreState(settings->GetToolbarsState(), APP_VERSION);
+
+        // Text under tool buton icon
+        ToolBarStyles();
+
+        ui->dockWidgetProperties->setVisible(settings->IsDockWidgetPropertiesActive());
+        ui->dockWidgetPropertiesContents->setVisible(settings->IsDockWidgetPropertiesContentsActive());
+
+        // Scene antialiasing
+        m_graphicsView->SetAntialiasing(settings->GetGraphicalOutput());
+
+        // Stack limit
+        m_undoStack->setUndoLimit(settings->GetUndoCount());
+    }
+    else
+    {
+        qWarning() << tr("Cannot read settings from a malformed .INI file.");
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::WriteSettings()
+{
+    VPSettings *settings = VPApplication::VApp()->PuzzleSettings();
+    settings->SetGeometry(saveGeometry());
+    settings->SetWindowState(saveState());
+    settings->SetToolbarsState(saveState(APP_VERSION));
+
+    settings->SetDockWidgetPropertiesActive(ui->dockWidgetProperties->isEnabled());
+    settings->SetDockWidgetPropertiesContentsActive(ui->dockWidgetPropertiesContents->isEnabled());
+
+    settings->sync();
+    if (settings->status() == QSettings::AccessError)
+    {
+        qWarning() << tr("Cannot save settings. Access denied.");
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPMainWindow::MaybeSave() -> bool
+{
+    // TODO: Implement maybe save check
+    if (this->isWindowModified())
+    {
+        QScopedPointer<QMessageBox> messageBox(new QMessageBox(tr("Unsaved changes"),
+                                                               tr("Layout has been modified.\n"
+                                                                  "Do you want to save your changes?"),
+                                                               QMessageBox::Warning, QMessageBox::Yes, QMessageBox::No,
+                                                               QMessageBox::Cancel, this, Qt::Sheet));
+
+        messageBox->setDefaultButton(QMessageBox::Yes);
+        messageBox->setEscapeButton(QMessageBox::Cancel);
+
+        messageBox->setButtonText(QMessageBox::Yes, curFile.isEmpty() || IsLayoutReadOnly() ? tr("Save…") : tr("Save"));
+        messageBox->setButtonText(QMessageBox::No, tr("Don't Save"));
+
+        messageBox->setWindowModality(Qt::ApplicationModal);
+        const auto ret = static_cast<QMessageBox::StandardButton>(messageBox->exec());
+
+        switch (ret)
+        {
+            case QMessageBox::Yes:
+                if (IsLayoutReadOnly())
+                {
+                    return on_actionSaveAs_triggered();
+                }
+                return on_actionSave_triggered();
+            case QMessageBox::No:
+                return true;
+            case QMessageBox::Cancel:
+                return false;
+            default:
+                break;
+        }
+    }
+    return true;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::CreateWindowMenu(QMenu *menu)
+{
+    SCASSERT(menu != nullptr)
+
+    QAction *action = menu->addAction(tr("&New Window"));
+    connect(action, &QAction::triggered, this, []()
+    {
+        VPApplication::VApp()->NewMainWindow()->activateWindow();
+    });
+    action->setMenuRole(QAction::NoRole);
+    menu->addSeparator();
+
+    const QList<VPMainWindow*> windows = VPApplication::VApp()->MainWindows();
+    for (int i = 0; i < windows.count(); ++i)
+    {
+        VPMainWindow *window = windows.at(i);
+
+        QString title = QStringLiteral("%1. %2").arg(i+1).arg(window->windowTitle());
+        const int index = title.lastIndexOf(QLatin1String("[*]"));
+        if (index != -1)
+        {
+            window->isWindowModified() ? title.replace(index, 3, QChar('*')) : title.replace(index, 3, QString());
+        }
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
+        QAction *action = menu->addAction(title, this, SLOT(ShowWindow()));
+#else
+        QAction *action = menu->addAction(title, this, &VPMainWindow::ShowWindow);
+#endif //QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
+        action->setData(i);
+        action->setCheckable(true);
+        action->setMenuRole(QAction::NoRole);
+        if (window->isActiveWindow())
+        {
+            action->setChecked(true);
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPMainWindow::IsLayoutReadOnly() const -> bool
+{
+    if (curFile.isEmpty())
+    {
+        return false;
+    }
+
+    QFileInfo f(curFile);
+
+    if (not f.exists())
+    {
+        return false;
+    }
+
+#ifdef Q_OS_WIN32
+    qt_ntfs_permission_lookup++; // turn checking on
+#endif /*Q_OS_WIN32*/
+
+    bool fileWritable = f.isWritable();
+
+#ifdef Q_OS_WIN32
+    qt_ntfs_permission_lookup--; // turn it off again
+#endif /*Q_OS_WIN32*/
+
+    return not fileWritable;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::ConnectToPreferences(const QSharedPointer<DialogPuzzlePreferences> &preferences)
+{
+    // Must be first
+    connect(preferences.get(), &DialogPuzzlePreferences::UpdateProperties, this, &VPMainWindow::WindowsLocale);
+    connect(preferences.get(), &DialogPuzzlePreferences::UpdateProperties, this, &VPMainWindow::ToolBarStyles);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPMainWindow::SelectedPieces() const -> QList<VPPiecePtr>
+{
+    QList<VPPiecePtr> selectedPieces;
+    if (not m_layout.isNull())
+    {
+        VPSheetPtr activeSheet = m_layout->GetFocusedSheet();
+        if (not activeSheet.isNull())
+        {
+            selectedPieces = activeSheet->GetSelectedPieces();
+        }
+    }
+
+    return selectedPieces;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+Unit VPMainWindow::TranslateUnit() const
+{
+    return StrToUnits(ui->comboBoxTranslateUnit->currentData().toString());
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+Unit VPMainWindow::LayoutUnit() const
+{
+    return StrToUnits(ui->comboBoxLayoutUnit->currentData().toString());
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPMainWindow::Template(VAbstractLayoutDialog::PaperSizeTemplate t) const -> QSizeF
+{
+    const Unit layoutUnit = LayoutUnit();
+
+    switch (t)
+    {
+        case VAbstractLayoutDialog::PaperSizeTemplate::A0:
+        case VAbstractLayoutDialog::PaperSizeTemplate::A1:
+        case VAbstractLayoutDialog::PaperSizeTemplate::A2:
+        case VAbstractLayoutDialog::PaperSizeTemplate::A3:
+        case VAbstractLayoutDialog::PaperSizeTemplate::A4:
+        case VAbstractLayoutDialog::PaperSizeTemplate::Letter:
+        case VAbstractLayoutDialog::PaperSizeTemplate::Legal:
+        case VAbstractLayoutDialog::PaperSizeTemplate::Tabloid:
+            return VAbstractLayoutDialog::GetTemplateSize(t, layoutUnit);
+        case VAbstractLayoutDialog::PaperSizeTemplate::Roll24in:
+        case VAbstractLayoutDialog::PaperSizeTemplate::Roll30in:
+        case VAbstractLayoutDialog::PaperSizeTemplate::Roll36in:
+        case VAbstractLayoutDialog::PaperSizeTemplate::Roll42in:
+        case VAbstractLayoutDialog::PaperSizeTemplate::Roll44in:
+        case VAbstractLayoutDialog::PaperSizeTemplate::Roll48in:
+        case VAbstractLayoutDialog::PaperSizeTemplate::Roll62in:
+        case VAbstractLayoutDialog::PaperSizeTemplate::Roll72in:
+            return VAbstractLayoutDialog::GetTemplateSize(t, layoutUnit);
+        case VAbstractLayoutDialog::PaperSizeTemplate::Custom:
+            return VAbstractLayoutDialog::GetTemplateSize(t, layoutUnit);
+        default:
+            break;
+    }
+    return QSizeF();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPMainWindow::SheetTemplate() const -> QSizeF
+{
+    auto t = static_cast<VAbstractLayoutDialog::PaperSizeTemplate>(ui->comboBoxSheetTemplates->currentData().toInt());
+    return Template(t);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPMainWindow::TileTemplate() const -> QSizeF
+{
+    auto t = static_cast<VAbstractLayoutDialog::PaperSizeTemplate>(ui->comboBoxTileTemplates->currentData().toInt());
+    return Template(t);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::SheetSize(const QSizeF &size)
+{
+    m_oldLayoutUnit = LayoutUnit();
+    ui->doubleSpinBoxSheetPaperWidth->setMaximum(FromPixel(QIMAGE_MAX, m_oldLayoutUnit));
+    ui->doubleSpinBoxSheetPaperHeight->setMaximum(FromPixel(QIMAGE_MAX, m_oldLayoutUnit));
+
+    ui->doubleSpinBoxSheetPaperWidth->setValue(size.width());
+    ui->doubleSpinBoxSheetPaperHeight->setValue(size.height());
+
+    CorrectPaperDecimals();
+    SheetPaperSizeChanged();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::TileSize(const QSizeF &size)
+{
+    m_oldLayoutUnit = LayoutUnit();
+    ui->doubleSpinBoxTilePaperWidth->setMaximum(FromPixel(QIMAGE_MAX, m_oldLayoutUnit));
+    ui->doubleSpinBoxTilePaperHeight->setMaximum(FromPixel(QIMAGE_MAX, m_oldLayoutUnit));
+
+    ui->doubleSpinBoxTilePaperWidth->setValue(size.width());
+    ui->doubleSpinBoxTilePaperHeight->setValue(size.height());
+
+    CorrectPaperDecimals();
+    TilePaperSizeChanged();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::CorrectPaperDecimals()
+{
+    switch (m_oldLayoutUnit)
+    {
+        case Unit::Cm:
+        case Unit::Mm:
+        case Unit::Px:
+            ui->doubleSpinBoxSheetPaperWidth->setDecimals(2);
+            ui->doubleSpinBoxSheetPaperHeight->setDecimals(2);
+
+            ui->doubleSpinBoxTilePaperWidth->setDecimals(2);
+            ui->doubleSpinBoxTilePaperHeight->setDecimals(2);
+
+            ui->doubleSpinBoxSheetMarginLeft->setDecimals(4);
+            ui->doubleSpinBoxSheetMarginRight->setDecimals(4);
+            ui->doubleSpinBoxSheetMarginTop->setDecimals(4);
+            ui->doubleSpinBoxSheetMarginBottom->setDecimals(4);
+
+            ui->doubleSpinBoxTileMarginLeft->setDecimals(4);
+            ui->doubleSpinBoxTileMarginRight->setDecimals(4);
+            ui->doubleSpinBoxTileMarginTop->setDecimals(4);
+            ui->doubleSpinBoxTileMarginBottom->setDecimals(4);
+
+            ui->doubleSpinBoxSheetPiecesGap->setDecimals(2);
+            break;
+        case Unit::Inch:
+            ui->doubleSpinBoxSheetPaperWidth->setDecimals(5);
+            ui->doubleSpinBoxSheetPaperHeight->setDecimals(5);
+
+            ui->doubleSpinBoxTilePaperWidth->setDecimals(5);
+            ui->doubleSpinBoxTilePaperHeight->setDecimals(5);
+
+            ui->doubleSpinBoxSheetMarginLeft->setDecimals(5);
+            ui->doubleSpinBoxSheetMarginRight->setDecimals(5);
+            ui->doubleSpinBoxSheetMarginTop->setDecimals(5);
+            ui->doubleSpinBoxSheetMarginBottom->setDecimals(5);
+
+            ui->doubleSpinBoxTileMarginLeft->setDecimals(5);
+            ui->doubleSpinBoxTileMarginRight->setDecimals(5);
+            ui->doubleSpinBoxTileMarginTop->setDecimals(5);
+            ui->doubleSpinBoxTileMarginBottom->setDecimals(5);
+
+            ui->doubleSpinBoxSheetPiecesGap->setDecimals(5);
+            break;
+        default:
+            break;
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::SheetPaperSizeChanged()
+{
+    bool portrait = ui->doubleSpinBoxSheetPaperHeight->value() >= ui->doubleSpinBoxSheetPaperWidth->value();
+
+    ui->toolButtonSheetPortraitOritation->blockSignals(true);
+    ui->toolButtonSheetPortraitOritation->setChecked(portrait);
+    ui->toolButtonSheetPortraitOritation->blockSignals(false);
+
+    ui->toolButtonSheetLandscapeOrientation->blockSignals(true);
+    ui->toolButtonSheetLandscapeOrientation->setChecked(not portrait);
+    ui->toolButtonSheetLandscapeOrientation->blockSignals(false);
+
+    if (not m_layout.isNull())
+    {
+        if (m_layout->LayoutSettings().GetFollowGrainline())
+        {
+            RotatePiecesToGrainline();
+        }
+
+        VPSheetPtr sheet = m_layout->GetFocusedSheet();
+        if (not sheet.isNull())
+        {
+            sheet->ValidatePiecesOutOfBound();
+        }
+    }
+
+    VMainGraphicsView::NewSceneRect(m_graphicsView->scene(), m_graphicsView);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::TilePaperSizeChanged()
+{
+    bool portrait = ui->doubleSpinBoxTilePaperHeight->value() >= ui->doubleSpinBoxTilePaperWidth->value();
+
+    ui->toolButtonTilePortraitOrientation->blockSignals(true);
+    ui->toolButtonTilePortraitOrientation->setChecked(portrait);
+    ui->toolButtonTilePortraitOrientation->blockSignals(false);
+
+    ui->toolButtonTileLandscapeOrientation->blockSignals(true);
+    ui->toolButtonTileLandscapeOrientation->setChecked(not portrait);
+    ui->toolButtonTileLandscapeOrientation->blockSignals(false);
+
+    VMainGraphicsView::NewSceneRect(m_graphicsView->scene(), m_graphicsView);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::MinimumSheetPaperSize()
+{
+    const qreal value = UnitConvertor(1, Unit::Px, m_oldLayoutUnit);
+    ui->doubleSpinBoxSheetPaperWidth->setMinimum(value);
+    ui->doubleSpinBoxSheetPaperHeight->setMinimum(value);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::MinimumTilePaperSize()
+{
+    const qreal value = UnitConvertor(1, Unit::Px, m_oldLayoutUnit);
+    ui->doubleSpinBoxTilePaperWidth->setMinimum(value);
+    ui->doubleSpinBoxTilePaperHeight->setMinimum(value);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::FindTemplate(QComboBox *box, qreal width, qreal height)
+{
+    SCASSERT(box != nullptr)
+    const Unit paperUnit = LayoutUnit();
+
+    const int max = static_cast<int>(VAbstractLayoutDialog::PaperSizeTemplate::Custom);
+    for (int i=0; i < max; ++i)
+    {
+        const QSizeF tmplSize = VAbstractLayoutDialog::GetTemplateSize(
+                    static_cast<VAbstractLayoutDialog::PaperSizeTemplate>(i), paperUnit);
+        if (QSizeF(width, height) == tmplSize || QSizeF(height, width) == tmplSize)
+        {
+            box->blockSignals(true);
+            const int index = box->findData(i);
+            if (index != -1)
+            {
+                box->setCurrentIndex(index);
+            }
+            box->blockSignals(false);
+            return;
+        }
+    }
+
+    box->blockSignals(true);
+    const int index = box->findData(max);
+    if (index != -1)
+    {
+        box->setCurrentIndex(index);
+    }
+    box->blockSignals(false);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::FindSheetTemplate()
+{
+    const qreal width = ui->doubleSpinBoxSheetPaperWidth->value();
+    const qreal height = ui->doubleSpinBoxSheetPaperHeight->value();
+    FindTemplate(ui->comboBoxSheetTemplates, width, height);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::FindTileTemplate()
+{
+    const qreal width = ui->doubleSpinBoxTilePaperWidth->value();
+    const qreal height = ui->doubleSpinBoxTilePaperHeight->value();
+    FindTemplate(ui->comboBoxTileTemplates, width, height);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::CorrectTileMaxMargins()
+{
+    const qreal tileWidth = ui->doubleSpinBoxTilePaperWidth->value();
+    const qreal tileHeight = ui->doubleSpinBoxTilePaperHeight->value();
+
+    // 80%/2 of paper size for each field
+    const qreal tileWidthMargin = (tileWidth*80.0/100.0)/2.0;
+    const qreal tileHeightMargin = (tileHeight*80.0/100.0)/2.0;
+
+    ui->doubleSpinBoxTileMarginLeft->setMaximum(tileWidthMargin);
+    ui->doubleSpinBoxTileMarginRight->setMaximum(tileWidthMargin);
+    ui->doubleSpinBoxTileMarginTop->setMaximum(tileHeightMargin);
+    ui->doubleSpinBoxTileMarginBottom->setMaximum(tileHeightMargin);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::CorrectSheetMaxMargins()
+{
+    const qreal sheetWidth = ui->doubleSpinBoxSheetPaperWidth->value();
+    const qreal sheetHeight = ui->doubleSpinBoxSheetPaperHeight->value();
+
+    // 80%/2 of paper size for each field
+    const qreal sheetWidthMargin = (sheetWidth*80.0/100.0)/2.0;
+    const qreal sheetHeightMargin = (sheetHeight*80.0/100.0)/2.0;
+
+    ui->doubleSpinBoxSheetMarginLeft->setMaximum(sheetWidthMargin);
+    ui->doubleSpinBoxSheetMarginRight->setMaximum(sheetWidthMargin);
+    ui->doubleSpinBoxSheetMarginTop->setMaximum(sheetHeightMargin);
+    ui->doubleSpinBoxSheetMarginBottom->setMaximum(sheetHeightMargin);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::CorrectMaxMargins()
+{
+    CorrectSheetMaxMargins();
+    CorrectTileMaxMargins();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::RotatePiecesToGrainline()
+{
+    if (not m_layout->LayoutSettings().GetFollowGrainline())
+    {
+        return;
+    }
+
+    QList<VPSheetPtr> sheets = m_layout->GetAllSheets();
+    for(const auto& sheet : sheets)
+    {
+        if (not sheet.isNull())
+        {
+            QList<VPPiecePtr> pieces = sheet->GetPieces();
+            for(const auto& piece : pieces)
+            {
+                if (not piece.isNull() && piece->IsGrainlineEnabled())
+                {
+                    VPTransformationOrigon origin;
+                    origin.custom = true;
+                    piece->RotateToGrainline(origin);
+                    emit m_layout->PieceTransformationChanged(piece);
+                }
+            }
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::ExportData(const VPExportData &data)
+{
+    if (data.format == LayoutExportFormats::DXF_AC1006_AAMA ||
+        data.format == LayoutExportFormats::DXF_AC1009_AAMA ||
+        data.format == LayoutExportFormats::DXF_AC1012_AAMA ||
+        data.format == LayoutExportFormats::DXF_AC1014_AAMA ||
+        data.format == LayoutExportFormats::DXF_AC1015_AAMA ||
+        data.format == LayoutExportFormats::DXF_AC1018_AAMA ||
+        data.format == LayoutExportFormats::DXF_AC1021_AAMA ||
+        data.format == LayoutExportFormats::DXF_AC1024_AAMA ||
+        data.format == LayoutExportFormats::DXF_AC1027_AAMA ||
+        data.format == LayoutExportFormats::DXF_AC1006_ASTM ||
+        data.format == LayoutExportFormats::DXF_AC1009_ASTM ||
+        data.format == LayoutExportFormats::DXF_AC1012_ASTM ||
+        data.format == LayoutExportFormats::DXF_AC1014_ASTM ||
+        data.format == LayoutExportFormats::DXF_AC1015_ASTM ||
+        data.format == LayoutExportFormats::DXF_AC1018_ASTM ||
+        data.format == LayoutExportFormats::DXF_AC1021_ASTM ||
+        data.format == LayoutExportFormats::DXF_AC1024_ASTM ||
+        data.format == LayoutExportFormats::DXF_AC1027_ASTM ||
+        data.format == LayoutExportFormats::RLD)
+    {
+        for (int i = 0; i < data.sheets.size(); ++i)
+        {
+            QString name;
+
+            if (data.sheets.size() > 1)
+            {
+                name = data.path + '/' + data.fileName +
+                        QString::number(i+1) + VLayoutExporter::ExportFormatSuffix(data.format);
+            }
+            else
+            {
+                name = data.path + '/' + data.fileName + VLayoutExporter::ExportFormatSuffix(data.format);
+            }
+
+            VPSheetPtr sheet = data.sheets.at(i);
+            ExportApparelLayout(data, sheet->GetAsLayoutPieces(), name, sheet->GetSheetSize().toSize());
+        }
+    }
+    else
+    {
+        ExportFlatLayout(data);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::ExportApparelLayout(const VPExportData &data, const QVector<VLayoutPiece> &details,
+                                       const QString &name, const QSize &size) const
+{
+    const QString path = data.path;
+    bool usedNotExistedDir = CreateLayoutPath(path);
+    if (not usedNotExistedDir)
+    {
+        qCritical() << tr("Can't create a path");
+        return;
+    }
+
+    VPApplication::VApp()->PuzzleSettings()->SetPathManualLayouts(path);
+
+    QT_WARNING_PUSH
+    QT_WARNING_DISABLE_GCC("-Wnoexcept")
+
+    VLayoutExporter exporter;
+
+    QT_WARNING_POP
+
+    exporter.SetFileName(name);
+    exporter.SetImageRect(QRectF(0, 0, size.width(), size.height()));
+    exporter.SetXScale(data.xScale);
+    exporter.SetYScale(data.yScale);
+    exporter.SetBinaryDxfFormat(data.isBinaryDXF);
+
+    switch (data.format)
+    {
+        case LayoutExportFormats::DXF_AC1006_ASTM:
+            exporter.SetDxfVersion(DRW::AC1006);
+            exporter.ExportToASTMDXF(details);
+            break;
+        case LayoutExportFormats::DXF_AC1009_ASTM:
+            exporter.SetDxfVersion(DRW::AC1009);
+            exporter.ExportToASTMDXF(details);
+            break;
+        case LayoutExportFormats::DXF_AC1012_ASTM:
+            exporter.SetDxfVersion(DRW::AC1012);
+            exporter.ExportToASTMDXF(details);
+            break;
+        case LayoutExportFormats::DXF_AC1014_ASTM:
+            exporter.SetDxfVersion(DRW::AC1014);
+            exporter.ExportToASTMDXF(details);
+            break;
+        case LayoutExportFormats::DXF_AC1015_ASTM:
+            exporter.SetDxfVersion(DRW::AC1015);
+            exporter.ExportToASTMDXF(details);
+            break;
+        case LayoutExportFormats::DXF_AC1018_ASTM:
+            exporter.SetDxfVersion(DRW::AC1018);
+            exporter.ExportToASTMDXF(details);
+            break;
+        case LayoutExportFormats::DXF_AC1021_ASTM:
+            exporter.SetDxfVersion(DRW::AC1021);
+            exporter.ExportToASTMDXF(details);
+            break;
+        case LayoutExportFormats::DXF_AC1024_ASTM:
+            exporter.SetDxfVersion(DRW::AC1024);
+            exporter.ExportToASTMDXF(details);
+            break;
+        case LayoutExportFormats::DXF_AC1027_ASTM:
+            exporter.SetDxfVersion(DRW::AC1027);
+            exporter.ExportToASTMDXF(details);
+            break;
+        case LayoutExportFormats::DXF_AC1006_AAMA:
+            exporter.SetDxfVersion(DRW::AC1006);
+            exporter.ExportToAAMADXF(details);
+            break;
+        case LayoutExportFormats::DXF_AC1009_AAMA:
+            exporter.SetDxfVersion(DRW::AC1009);
+            exporter.ExportToAAMADXF(details);
+            break;
+        case LayoutExportFormats::DXF_AC1012_AAMA:
+            exporter.SetDxfVersion(DRW::AC1012);
+            exporter.ExportToAAMADXF(details);
+            break;
+        case LayoutExportFormats::DXF_AC1014_AAMA:
+            exporter.SetDxfVersion(DRW::AC1014);
+            exporter.ExportToAAMADXF(details);
+            break;
+        case LayoutExportFormats::DXF_AC1015_AAMA:
+            exporter.SetDxfVersion(DRW::AC1015);
+            exporter.ExportToAAMADXF(details);
+            break;
+        case LayoutExportFormats::DXF_AC1018_AAMA:
+            exporter.SetDxfVersion(DRW::AC1018);
+            exporter.ExportToAAMADXF(details);
+            break;
+        case LayoutExportFormats::DXF_AC1021_AAMA:
+            exporter.SetDxfVersion(DRW::AC1021);
+            exporter.ExportToAAMADXF(details);
+            break;
+        case LayoutExportFormats::DXF_AC1024_AAMA:
+            exporter.SetDxfVersion(DRW::AC1024);
+            exporter.ExportToAAMADXF(details);
+            break;
+        case LayoutExportFormats::DXF_AC1027_AAMA:
+            exporter.SetDxfVersion(DRW::AC1027);
+            exporter.ExportToAAMADXF(details);
+            break;
+        case LayoutExportFormats::RLD:
+            exporter.ExportToRLD(details);
+            break;
+        default:
+            qDebug() << "Can't recognize file type." << Q_FUNC_INFO;
+            break;
+    }
+
+    RemoveLayoutPath(path, usedNotExistedDir);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::ExportFlatLayout(const VPExportData &data)
+{
+    const QString path = data.path;
+    bool usedNotExistedDir = CreateLayoutPath(path);
+    if (not usedNotExistedDir)
+    {
+        qCritical() << tr("Can't create a path");
+        return;
+    }
+
+    m_layout->RefreshScenePieces();
+
+    VPApplication::VApp()->PuzzleSettings()->SetPathManualLayouts(path);
+
+    if (data.format == LayoutExportFormats::PDFTiled)
+    {
+        ExportPdfTiledFile(data);
+    }
+    else if ((data.format == LayoutExportFormats::PDF || data.format == LayoutExportFormats::PS ||
+             data.format == LayoutExportFormats::EPS) && data.exportUnified)
+    {
+        ExportUnifiedPdfFile(data);
+    }
+    else
+    {
+        ExportScene(data);
+    }
+
+    RemoveLayoutPath(path, usedNotExistedDir);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::ExportScene(const VPExportData &data)
+{
+    QT_WARNING_PUSH
+    QT_WARNING_DISABLE_GCC("-Wnoexcept")
+
+    VLayoutExporter exporter;
+
+    QT_WARNING_POP
+
+    exporter.SetXScale(data.xScale);
+    exporter.SetYScale(data.yScale);
+    exporter.SetDescription(m_layout->LayoutSettings().GetDescription());
+    exporter.SetBinaryDxfFormat(data.isBinaryDXF);
+
+    QList<VPSheetPtr> sheets = data.sheets;
+
+    for (int i=0; i < sheets.size(); ++i)
+    {
+        const VPSheetPtr& sheet = sheets.at(i);
+        if (sheet.isNull())
+        {
+            continue;
+        }
+
+        sheet->SceneData()->PrepareForExport();
+        sheet->SceneData()->SetTextAsPaths(data.textAsPaths);
+
+        exporter.SetMargins(sheet->GetSheetMargins());
+        exporter.SetTitle(sheet->GetName());
+        exporter.SetIgnorePrinterMargins(sheet->IgnoreMargins());
+
+        QString name;
+        if (sheets.size() > 1)
+        {
+            name = data.path + '/' + data.fileName + QString::number(i+1) +
+                    VLayoutExporter::ExportFormatSuffix(data.format);
+        }
+        else
+        {
+            name = data.path + '/' + data.fileName + VLayoutExporter::ExportFormatSuffix(data.format);
+        }
+
+        exporter.SetFileName(name);
+        exporter.SetImageRect(sheet->GetMarginsRect());
+
+        switch (data.format)
+        {
+            case LayoutExportFormats::SVG:
+                exporter.SetPen(QPen(Qt::black, VAbstractApplication::VApp()->Settings()->WidthHairLine(),
+                                     Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+                exporter.ExportToSVG(sheet->SceneData()->Scene());
+                break;
+            case LayoutExportFormats::PDF:
+                exporter.SetPen(QPen(Qt::black, VAbstractApplication::VApp()->Settings()->WidthHairLine(),
+                                     Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+                exporter.ExportToPDF(sheet->SceneData()->Scene());
+                break;
+            case LayoutExportFormats::PNG:
+                exporter.SetPen(QPen(Qt::black, VAbstractApplication::VApp()->Settings()->WidthHairLine(),
+                                     Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+                exporter.ExportToPNG(sheet->SceneData()->Scene());
+                break;
+            case LayoutExportFormats::OBJ:
+                exporter.ExportToOBJ(sheet->SceneData()->Scene());
+                break;
+            case LayoutExportFormats::PS:
+                exporter.SetPen(QPen(Qt::black, VAbstractApplication::VApp()->Settings()->WidthHairLine(),
+                                     Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+                exporter.ExportToPS(sheet->SceneData()->Scene());
+                break;
+            case LayoutExportFormats::EPS:
+                exporter.SetPen(QPen(Qt::black, VAbstractApplication::VApp()->Settings()->WidthHairLine(),
+                                     Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+                exporter.ExportToEPS(sheet->SceneData()->Scene());
+                break;
+            case LayoutExportFormats::DXF_AC1006_Flat:
+                exporter.SetDxfVersion(DRW::AC1006);
+                exporter.ExportToFlatDXF(sheet->SceneData()->Scene(), sheet->SceneData()->GraphicsPiecesAsItems());
+                break;
+            case LayoutExportFormats::DXF_AC1009_Flat:
+                exporter.SetDxfVersion(DRW::AC1009);
+                exporter.ExportToFlatDXF(sheet->SceneData()->Scene(), sheet->SceneData()->GraphicsPiecesAsItems());
+                break;
+            case LayoutExportFormats::DXF_AC1012_Flat:
+                exporter.SetDxfVersion(DRW::AC1012);
+                exporter.ExportToFlatDXF(sheet->SceneData()->Scene(), sheet->SceneData()->GraphicsPiecesAsItems());
+                break;
+            case LayoutExportFormats::DXF_AC1014_Flat:
+                exporter.SetDxfVersion(DRW::AC1014);
+                exporter.ExportToFlatDXF(sheet->SceneData()->Scene(), sheet->SceneData()->GraphicsPiecesAsItems());
+                break;
+            case LayoutExportFormats::DXF_AC1015_Flat:
+                exporter.SetDxfVersion(DRW::AC1015);
+                exporter.ExportToFlatDXF(sheet->SceneData()->Scene(), sheet->SceneData()->GraphicsPiecesAsItems());
+                break;
+            case LayoutExportFormats::DXF_AC1018_Flat:
+                exporter.SetDxfVersion(DRW::AC1018);
+                exporter.ExportToFlatDXF(sheet->SceneData()->Scene(), sheet->SceneData()->GraphicsPiecesAsItems());
+                break;
+            case LayoutExportFormats::DXF_AC1021_Flat:
+                exporter.SetDxfVersion(DRW::AC1021);
+                exporter.ExportToFlatDXF(sheet->SceneData()->Scene(), sheet->SceneData()->GraphicsPiecesAsItems());
+                break;
+            case LayoutExportFormats::DXF_AC1024_Flat:
+                exporter.SetDxfVersion(DRW::AC1024);
+                exporter.ExportToFlatDXF(sheet->SceneData()->Scene(), sheet->SceneData()->GraphicsPiecesAsItems());
+                break;
+            case LayoutExportFormats::DXF_AC1027_Flat:
+                exporter.SetDxfVersion(DRW::AC1027);
+                exporter.ExportToFlatDXF(sheet->SceneData()->Scene(), sheet->SceneData()->GraphicsPiecesAsItems());
+                break;
+            case LayoutExportFormats::TIF:
+                exporter.SetPen(QPen(Qt::black, VAbstractApplication::VApp()->Settings()->WidthHairLine(),
+                                     Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+                exporter.ExportToTIF(sheet->SceneData()->Scene());
+                break;
+            default:
+                qDebug() << "Can't recognize file type." << Q_FUNC_INFO;
+                break;
+        }
+
+        sheet->SceneData()->CleanAfterExport();
+        sheet->SceneData()->SetTextAsPaths(false);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::ExportUnifiedPdfFile(const VPExportData &data)
+{
+    const QString name = data.path + '/' + data.fileName + VLayoutExporter::ExportFormatSuffix(data.format);
+
+    if (data.format == LayoutExportFormats::PDF)
+    {
+        GenerateUnifiedPdfFile(data, name);
+    }
+    else if (data.format == LayoutExportFormats::PS)
+    {
+        QTemporaryFile tmp;
+        if (tmp.open())
+        {
+            GenerateUnifiedPdfFile(data, tmp.fileName());
+            VLayoutExporter::PdfToPs(QStringList{tmp.fileName(), name});
+        }
+    }
+    else if (data.format == LayoutExportFormats::EPS)
+    {
+        QTemporaryFile tmp;
+        if (tmp.open())
+        {
+            GenerateUnifiedPdfFile(data, tmp.fileName());
+            VLayoutExporter::PdfToPs(QStringList{QStringLiteral("-eps"), tmp.fileName(), name});
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::GenerateUnifiedPdfFile(const VPExportData &data, const QString &name)
+{
+    QSharedPointer<QPrinter> printer(new QPrinter());
+    printer->setCreator(QGuiApplication::applicationDisplayName() + QChar(QChar::Space) +
+                        QCoreApplication::applicationVersion());
+    printer->setOutputFormat(QPrinter::PdfFormat);
+    printer->setOutputFileName(name);
+    printer->setDocName(QFileInfo(name).fileName());
+    printer->setResolution(static_cast<int>(PrintDPI));
+
+    QPainter painter;
+
+    bool firstPage = true;
+
+    for (const auto& sheet : data.sheets)
+    {
+        if (sheet.isNull())
+        {
+            continue;
+        }
+
+        SetPrinterSheetPageSettings(printer, sheet, data.xScale, data.yScale);
+
+        if (firstPage)
+        {
+            if (not painter.begin(printer.data()))
+            { // failed to open file
+                qCritical() << qUtf8Printable(tr("Can't open file '%1'").arg(name));
+                return;
+            }
+
+            painter.setRenderHint(QPainter::Antialiasing, true);
+            painter.setPen(QPen(Qt::black, VAbstractApplication::VApp()->Settings()->WidthHairLine(),
+                                Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+            painter.setBrush(QBrush(Qt::NoBrush));
+            painter.scale(data.xScale, data.yScale);
+        }
+        else
+        {
+            if (not printer->newPage())
+            {
+                qCritical() << tr("Failed in flushing page to disk, disk full?");
+                return;
+            }
+        }
+
+        sheet->SceneData()->PrepareForExport();
+        QRectF imageRect = sheet->GetMarginsRect();
+        sheet->SceneData()->Scene()->render(&painter, VPrintLayout::SceneTargetRect(printer.data(), imageRect),
+                                            imageRect, Qt::IgnoreAspectRatio);
+        sheet->SceneData()->CleanAfterExport();
+
+        firstPage = false;
+    }
+
+    painter.end();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::ExportPdfTiledFile(const VPExportData &data)
+{
+    QSharedPointer<QPrinter> printer(new QPrinter());
+#ifdef Q_OS_MAC
+    printer->setOutputFormat(QPrinter::NativeFormat);
+#else
+    printer->setOutputFormat(QPrinter::PdfFormat);
+#endif
+    printer->setCreator(QGuiApplication::applicationDisplayName() + QChar(QChar::Space) +
+                        QCoreApplication::applicationVersion());
+
+    printer->setResolution(static_cast<int>(PrintDPI));
+
+    if (data.exportUnified)
+    {
+        const QString name = data.path + '/' + data.fileName + VLayoutExporter::ExportFormatSuffix(data.format);
+
+        printer->setOutputFileName(name);
+        printer->setDocName(QFileInfo(name).baseName());
+
+        QPainter painter;
+        bool firstPage = true;
+        for (const auto& sheet : data.sheets)
+        {
+            GeneratePdfTiledFile(sheet, data.showTilesScheme, &painter, printer, firstPage);
+        }
+    }
+    else
+    {
+        for (int i = 0; i < data.sheets.size(); ++i)
+        {
+            const QString name = data.path + '/' + data.fileName + QString::number(i+1) +
+                                 VLayoutExporter::ExportFormatSuffix(data.format);
+
+            printer->setOutputFileName(name);
+            printer->setDocName(QFileInfo(name).baseName());
+
+            QPainter painter;
+            bool firstPage = true;
+            GeneratePdfTiledFile(data.sheets.at(i), data.showTilesScheme, &painter, printer, firstPage);
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::GeneratePdfTiledFile(const VPSheetPtr &sheet, bool showTilesScheme, QPainter *painter,
+                                        const QSharedPointer<QPrinter> &printer, bool &firstPage)
+{
+    SCASSERT(not sheet.isNull())
+    SCASSERT(painter != nullptr)
+    SCASSERT(not printer.isNull())
+
+    sheet->SceneData()->PrepareForExport();
+    m_layout->TileFactory()->refreshTileInfos();
+    sheet->SceneData()->SetTextAsPaths(false);
+
+    if (showTilesScheme)
+    {
+        SetPrinterTiledPageSettings(printer, m_layout, sheet, sheet->GetSheetOrientation(), true);
+    }
+    else
+    {
+        SetPrinterTiledPageSettings(printer, m_layout, sheet, m_layout->LayoutSettings().GetTilesOrientation(), false);
+    }
+
+    if (firstPage)
+    {
+        if (not painter->begin(printer.data()))
+        { // failed to open file
+            qCritical() << tr("Failed to open file, is it writable?");
+            return;
+        }
+
+        painter->setPen(QPen(Qt::black, VAbstractApplication::VApp()->Settings()->WidthMainLine(), Qt::SolidLine,
+                            Qt::RoundCap, Qt::RoundJoin));
+        painter->setBrush(QBrush(Qt::NoBrush));
+        painter->setRenderHint(QPainter::Antialiasing, true);
+    }
+
+    if (showTilesScheme)
+    {
+        DrawTilesScheme(printer.data(), painter, sheet, firstPage);
+    }
+
+    for(int row=0; row < m_layout->TileFactory()->RowNb(sheet); row++)  // for each row of the tiling grid
+    {
+        for(int col=0; col < m_layout->TileFactory()->ColNb(sheet); col++) // for each column of tiling grid
+        {
+            if(not firstPage)
+            {
+                SetPrinterTiledPageSettings(printer, m_layout, sheet,
+                                            m_layout->LayoutSettings().GetTilesOrientation(), false);
+
+                if (not printer->newPage())
+                {
+                    qWarning("failed in flushing page to disk, disk full?");
+                    return;
+                }
+            }
+
+            m_layout->TileFactory()->drawTile(painter, printer.data(), sheet, row, col);
+
+            firstPage = false;
+        }
+    }
+
+    sheet->SceneData()->CleanAfterExport();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::UpdateScaleConnection() const
+{
+    QIcon icon;
+    icon.addFile(m_scaleConnected ? QStringLiteral(":/icon/32x32/link.png")
+                                  : QStringLiteral(":/icon/32x32/broken_link.png"));
+    ui->toolButtonScaleConnected->setIcon(icon);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::OpenWatermark(const QString &path)
+{
+    QList<QPointer<WatermarkWindow>>::const_iterator i;
+    for (i = m_watermarkEditors.begin(); i != m_watermarkEditors.end(); ++i)
+    {
+        if (not (*i).isNull() && not (*i)->CurrentFile().isEmpty()
+                && (*i)->CurrentFile() == AbsoluteMPath(curFile, path))
+        {
+            (*i)->show();
+            return;
+        }
+    }
+
+    auto *watermark = new WatermarkWindow(curFile, this);
+    connect(watermark, &WatermarkWindow::New, this, [this](){OpenWatermark();});
+    connect(watermark, &WatermarkWindow::OpenAnother, this, [this](const QString &path){OpenWatermark(path);});
+    m_watermarkEditors.append(watermark);
+    watermark->show();
+    watermark->Open(path);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::CleanWaterkmarkEditors()
+{
+    QMutableListIterator<QPointer<WatermarkWindow>> i(m_watermarkEditors);
+    while (i.hasNext())
+    {
+        QPointer<WatermarkWindow> watermarkEditor = i.next();
+        if (watermarkEditor.isNull())
+        {
+            i.remove();
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::DrawTilesScheme(QPrinter *printer, QPainter *painter, const VPSheetPtr &sheet, bool &firstPage)
+{
+    SCASSERT(printer != nullptr)
+    SCASSERT(painter != nullptr)
+
+    if (sheet.isNull())
+    {
+        return;
+    }
+
+    if(not firstPage)
+    {
+        printer->setPageOrientation(sheet->GetSheetOrientation());
+
+        if (not printer->newPage())
+        {
+            qWarning("failed in flushing page to disk, disk full?");
+            return;
+        }
+    }
+
+    sheet->SceneData()->PrepareTilesScheme();
+
+    qreal xScale = m_layout->LayoutSettings().HorizontalScale();
+    qreal yScale = m_layout->LayoutSettings().VerticalScale();
+
+    qreal width = m_layout->TileFactory()->DrawingAreaWidth();
+    qreal height = m_layout->TileFactory()->DrawingAreaHeight();
+
+    QPageLayout::Orientation tileOrientation = m_layout->LayoutSettings().GetTilesOrientation();
+    QPageLayout::Orientation sheetOrientation = sheet->GetSheetOrientation();
+
+    QRectF sheetRect = sheet->GetMarginsRect();
+
+    const int nbCol = m_layout->TileFactory()->ColNb(sheet);
+    const int nbRow = m_layout->TileFactory()->RowNb(sheet);
+
+    QRectF source = QRectF(sheetRect.topLeft(),
+                           QSizeF(nbCol * ((width - VPTileFactory::tileStripeWidth) / xScale),
+                                  nbRow * ((height - VPTileFactory::tileStripeWidth) / yScale)));
+    QRectF target;
+
+    if (tileOrientation != sheetOrientation)
+    {
+        QMarginsF margins;
+        if (not m_layout->LayoutSettings().IgnoreTilesMargins())
+        {
+            margins = m_layout->LayoutSettings().GetTilesMargins();
+        }
+
+        QSizeF tilesSize = m_layout->LayoutSettings().GetTilesSize();
+        target = QRectF(0, 0,
+                        tilesSize.height() - margins.left() - margins.right(),
+                        tilesSize.width() - margins.top() - margins.bottom());
+    }
+    else
+    {
+        target = QRectF(0, 0, width, height);
+    }
+
+    sheet->SceneData()->Scene()->render(painter, VPrintLayout::SceneTargetRect(printer, target), source,
+                                        Qt::KeepAspectRatio);
+
+    VWatermarkData watermarkData = m_layout->TileFactory()->WatermarkData();
+    if (watermarkData.opacity > 0)
+    {
+        if (watermarkData.showImage && not watermarkData.path.isEmpty())
+        {
+            VPTileFactory::PaintWatermarkImage(painter, target, watermarkData,
+                                               m_layout->LayoutSettings().WatermarkPath(),
+                                               m_layout->LayoutSettings().HorizontalScale(),
+                                               m_layout->LayoutSettings().VerticalScale());
+        }
+
+        if (watermarkData.showText && not watermarkData.text.isEmpty())
+        {
+            VPTileFactory::PaintWatermarkText(painter, target, watermarkData,
+                                              m_layout->LayoutSettings().HorizontalScale(),
+                                              m_layout->LayoutSettings().VerticalScale());
+        }
+    }
+
+    sheet->SceneData()->ClearTilesScheme();
+
+    firstPage = false;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPMainWindow::AskLayoutIsInvalid(const QList<VPSheetPtr> &sheets) -> bool
+{
+    if (m_layout->LayoutSettings().GetWarningPiecesOutOfBound() ||
+            m_layout->LayoutSettings().GetWarningSuperpositionOfPieces())
+    {
+        for (const auto &sheet : sheets)
+        {
+            bool outOfBoundChecked = false;
+            bool pieceSuperpositionChecked = false;
+
+            QList<VPPiecePtr> pieces = sheet->GetPieces();
+            for (const auto& piece :pieces)
+            {
+               if (m_layout->LayoutSettings().GetWarningPiecesOutOfBound())
+               {
+                   if (not outOfBoundChecked && not piece.isNull() && piece->OutOfBound())
+                   {
+                       QMessageBox msgBox(this);
+                       msgBox.setIcon(QMessageBox::Question);
+                       msgBox.setWindowTitle(tr("The layout is invalid."));
+                       msgBox.setText(tr("The layout is invalid. Piece out of bound. Do you want to continue export?"));
+                       msgBox.setStandardButtons(QMessageBox::Yes|QMessageBox::No);
+                       msgBox.setDefaultButton(QMessageBox::No);
+                       const int width = 500;
+                       auto* horizontalSpacer = new QSpacerItem(width, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
+                       auto* layout = qobject_cast<QGridLayout*>(msgBox.layout());
+                       SCASSERT(layout != nullptr)
+                       layout->addItem(horizontalSpacer, layout->rowCount(), 0, 1, layout->columnCount());
+                       if (msgBox.exec() == QMessageBox::No)
+                       {
+                           return false;
+                       }
+
+                       outOfBoundChecked = true; // no need to ask more
+                   }
+               }
+
+               if (m_layout->LayoutSettings().GetWarningSuperpositionOfPieces())
+               {
+                   if (not pieceSuperpositionChecked && not piece.isNull() && piece->HasSuperpositionWithPieces())
+                   {
+                       QMessageBox msgBox(this);
+                       msgBox.setIcon(QMessageBox::Question);
+                       msgBox.setWindowTitle(tr("The layout is invalid."));
+                       msgBox.setText(tr("The layout is invalid. Pieces superposition. Do you want to continue "
+                                         "export?"));
+                       msgBox.setStandardButtons(QMessageBox::Yes|QMessageBox::No);
+                       msgBox.setDefaultButton(QMessageBox::No);
+                       const int width = 500;
+                       auto* horizontalSpacer = new QSpacerItem(width, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
+                       auto* layout = qobject_cast<QGridLayout*>(msgBox.layout());
+                       SCASSERT(layout != nullptr)
+                       layout->addItem(horizontalSpacer, layout->rowCount(), 0, 1, layout->columnCount());
+                       if (msgBox.exec() == QMessageBox::No)
+                       {
+                           return false;
+                       }
+
+                       pieceSuperpositionChecked = true; // no need to ask more
+                   }
+               }
+            }
+        }
+    }
+
+    return true;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::PrintLayoutSheets(QPrinter *printer, const QList<VPSheetPtr> &sheets)
+{
+    SCASSERT(printer != nullptr)
+
+    // Handle the fromPage(), toPage(), supportsMultipleCopies(), and numCopies() values from QPrinter.
+    int firstPageNumber = printer->fromPage() - 1;
+    if (firstPageNumber >= sheets.count())
+    {
+        return;
+    }
+    if (firstPageNumber == -1)
+    {
+        firstPageNumber = 0;
+    }
+
+    int lastPageNumber = printer->toPage() - 1;
+    if (lastPageNumber == -1 || lastPageNumber >= sheets.count())
+    {
+        lastPageNumber = sheets.count() - 1;
+    }
+
+    const int numPages = lastPageNumber - firstPageNumber + 1;
+    int copyCount = 1;
+    if (not printer->supportsMultipleCopies())
+    {
+        copyCount = printer->copyCount();
+    }
+
+    QPainter painter;
+    bool firstPage = true;
+    qreal xScale = m_layout->LayoutSettings().HorizontalScale();
+    qreal yScale = m_layout->LayoutSettings().VerticalScale();
+
+    for (int i = 0; i < copyCount; ++i)
+    {
+        for (int j = 0; j < numPages; ++j)
+        {
+            int index = printer->pageOrder() == QPrinter::FirstPageFirst ? firstPageNumber + j : lastPageNumber - j;
+
+            const VPSheetPtr& sheet = sheets.at(index);
+            if (sheet.isNull())
+            {
+                continue;
+            }
+
+            if (firstPage)
+            {
+                if (not painter.begin(printer))
+                { // failed to open file
+                    qCritical() << tr("Failed to open file, is it writable?");
+                    return;
+                }
+
+                painter.setRenderHint(QPainter::Antialiasing, true);
+                painter.setPen(QPen(Qt::black, VAbstractApplication::VApp()->Settings()->WidthHairLine(),
+                                    Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+                painter.setBrush(QBrush(Qt::NoBrush));
+                painter.scale(xScale, yScale);
+            }
+            else
+            {
+                printer->setPageOrientation(sheet->GetSheetOrientation());
+                printer->setFullPage(sheet->IgnoreMargins());
+
+                if (not sheet->IgnoreMargins())
+                {
+                    QMarginsF margins = sheet->GetSheetMargins();
+                    if (not printer->setPageMargins(UnitConvertor(margins, Unit::Px, Unit::Mm),
+                                                    QPageLayout::Millimeter))
+                    {
+                        qWarning() << QObject::tr("Cannot set printer margins");
+                    }
+                }
+
+                if (not printer->newPage())
+                {
+                    qCritical() << tr("Failed in flushing page to disk, disk full?");
+                    return;
+                }
+            }
+
+            sheet->SceneData()->PrepareForExport();
+            QRectF imageRect = sheet->GetMarginsRect();
+            sheet->SceneData()->Scene()->render(&painter, VPrintLayout::SceneTargetRect(printer, imageRect),
+                                                imageRect, Qt::IgnoreAspectRatio);
+            sheet->SceneData()->CleanAfterExport();
+
+            firstPage = false;
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::PrintLayoutTiledSheets(QPrinter *printer, const QList<VPSheetPtr> &sheets)
+{
+    SCASSERT(printer != nullptr)
+
+    struct VPLayoutPrinterPage
+    {
+        VPSheetPtr sheet{};
+        bool       tilesScheme{false};
+        int        tileRow{-1};
+        int        tileCol{-1};
+    };
+
+    QVector<VPLayoutPrinterPage> pages;
+
+    for (const auto& sheet : sheets)
+    {
+        if (m_layout->LayoutSettings().GetPrintTilesScheme())
+        {
+            VPLayoutPrinterPage page;
+            page.sheet = sheet;
+            page.tilesScheme  = true;
+
+            pages.append(page);
+        }
+
+        for(int row=0; row < m_layout->TileFactory()->RowNb(sheet); row++)  // for each row of the tiling grid
+        {
+            for(int col=0; col < m_layout->TileFactory()->ColNb(sheet); col++) // for each column of tiling grid
+            {
+                VPLayoutPrinterPage page;
+                page.sheet = sheet;
+                page.tilesScheme = false;
+                page.tileRow = row;
+                page.tileCol = col;
+
+                pages.append(page);
+            }
+        }
+    }
+
+    // Handle the fromPage(), toPage(), supportsMultipleCopies(), and numCopies() values from QPrinter.
+    int firstPageNumber = printer->fromPage() - 1;
+    if (firstPageNumber >= pages.count())
+    {
+        return;
+    }
+    if (firstPageNumber == -1)
+    {
+        firstPageNumber = 0;
+    }
+
+    int lastPageNumber = printer->toPage() - 1;
+    if (lastPageNumber == -1 || lastPageNumber >= pages.count())
+    {
+        lastPageNumber = pages.count() - 1;
+    }
+
+    const int numPages = lastPageNumber - firstPageNumber + 1;
+    int copyCount = 1;
+    if (not printer->supportsMultipleCopies())
+    {
+        copyCount = printer->copyCount();
+    }
+
+    QPainter painter;
+    bool firstPage = true;
+
+    m_layout->TileFactory()->refreshTileInfos();
+
+    for (int i = 0; i < copyCount; ++i)
+    {
+        for (int j = 0; j < numPages; ++j)
+        {
+            int index = printer->pageOrder() == QPrinter::FirstPageFirst ? firstPageNumber + j : lastPageNumber - j;
+            const VPLayoutPrinterPage &page = pages.at(index);
+
+            page.sheet->SceneData()->PrepareForExport();
+            page.sheet->SceneData()->SetTextAsPaths(false);
+
+            if (firstPage)
+            {
+                if (page.tilesScheme)
+                {
+                    printer->setPageOrientation(page.sheet->GetSheetOrientation());
+                }
+                else
+                {
+                    printer->setPageOrientation(m_layout->LayoutSettings().GetTilesOrientation());
+                }
+
+                if (not painter.begin(printer))
+                { // failed to open file
+                    qCritical() << tr("Failed to open file, is it writable?");
+                    return;
+                }
+
+                painter.setPen(QPen(Qt::black, VAbstractApplication::VApp()->Settings()->WidthMainLine(), Qt::SolidLine,
+                                    Qt::RoundCap, Qt::RoundJoin));
+                painter.setBrush(QBrush(Qt::NoBrush));
+                painter.setRenderHint(QPainter::Antialiasing, true);
+            }
+
+            if (page.tilesScheme)
+            {
+                DrawTilesScheme(printer, &painter, page.sheet, firstPage);
+            }
+            else
+            {
+                if(not firstPage)
+                {
+                    printer->setPageOrientation(m_layout->LayoutSettings().GetTilesOrientation());
+
+                    if (not printer->newPage())
+                    {
+                        qWarning("failed in flushing page to disk, disk full?");
+                        return;
+                    }
+                }
+
+                m_layout->TileFactory()->drawTile(&painter, printer, page.sheet, page.tileRow, page.tileCol);
+
+                firstPage = false;
+            }
+
+            page.sheet->SceneData()->CleanAfterExport();
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_actionNew_triggered()
+{
+    VPApplication::VApp()->NewMainWindow();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::ShowToolTip(const QString &toolTip)
+{
+    m_statusLabel->setText(toolTip);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::closeEvent(QCloseEvent *event)
+{
+#if defined(Q_OS_MAC) && QT_VERSION < QT_VERSION_CHECK(5, 11, 1)
+    // Workaround for Qt bug https://bugreports.qt.io/browse/QTBUG-43344
+    static int numCalled = 0;
+    if (numCalled++ >= 1)
+    {
+        return;
+    }
+#endif
+
+    if (MaybeSave())
+    {
+        WriteSettings();
+        event->accept();
+        deleteLater();
+    }
+    else
+    {
+        event->ignore();
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::changeEvent(QEvent *event)
+{
+    if (event->type() == QEvent::LanguageChange)
+    {
+        // retranslate designer form (single inheritance approach)
+        ui->retranslateUi(this);
+        undoAction->setText(tr("&Undo"));
+        redoAction->setText(tr("&Redo"));
+
+        WindowsLocale();
+        UpdateWindowTitle();
+    }
+
+    // remember to call base class implementation
+    QMainWindow::changeEvent(event);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QStringList VPMainWindow::RecentFileList() const
+{
+    return VPApplication::VApp()->PuzzleSettings()->GetRecentFileList();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_actionOpen_triggered()
+{
+    qCDebug(pWindow, "Openning puzzle layout file.");
+
+    const QString filter(tr("Layout files") + QLatin1String(" (*.vlt)"));
+    //Use standard path to individual measurements
+    const QString pathTo = VPApplication::VApp()->PuzzleSettings()->GetPathManualLayouts();
+
+    bool usedNotExistedDir = false;
+    QDir directory(pathTo);
+    if (not directory.exists())
+    {
+        usedNotExistedDir = directory.mkpath(QChar('.'));
+    }
+
+    const QString mPath = QFileDialog::getOpenFileName(this, tr("Open file"), pathTo, filter, nullptr,
+                                                       VAbstractApplication::VApp()->NativeFileDialog());
+
+    if (not mPath.isEmpty())
+    {
+        VPApplication::VApp()->NewMainWindow()->LoadFile(mPath);
+    }
+
+    if (usedNotExistedDir)
+    {
+        QDir(pathTo).rmpath(QChar('.'));
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+bool VPMainWindow::on_actionSave_triggered()
+{
+    if (curFile.isEmpty() || IsLayoutReadOnly())
+    {
+        return on_actionSaveAs_triggered();
+    }
+
+    if (m_curFileFormatVersion < VLayoutConverter::LayoutMaxVer
+            && not ContinueFormatRewrite(m_curFileFormatVersionStr, VLayoutConverter::LayoutMaxVerStr))
+    {
+        return false;
+    }
+
+    if (not CheckFilePermissions(curFile, this))
+    {
+        return false;
+    }
+
+    QString error;
+    if (not SaveLayout(curFile, error))
+    {
+        QMessageBox messageBox;
+        messageBox.setIcon(QMessageBox::Warning);
+        messageBox.setText(tr("Could not save the file"));
+        messageBox.setDefaultButton(QMessageBox::Ok);
+        messageBox.setDetailedText(error);
+        messageBox.setStandardButtons(QMessageBox::Ok);
+        messageBox.exec();
+        return false;
+    }
+
+    m_curFileFormatVersion = VLayoutConverter::LayoutMaxVer;
+    m_curFileFormatVersionStr = VLayoutConverter::LayoutMaxVerStr;
+
+    return true;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+bool VPMainWindow::on_actionSaveAs_triggered()
+{
+    QString filters = tr("Layout files") + QStringLiteral(" (*.vlt)");
+    QString suffix = QStringLiteral("vlt");
+    QString fName = tr("layout") + QChar('.') + suffix;
+
+    QString dir;
+    if (curFile.isEmpty())
+    {
+        dir = VPApplication::VApp()->PuzzleSettings()->GetPathManualLayouts();
+    }
+    else
+    {
+        dir = QFileInfo(curFile).absolutePath();
+    }
+
+    bool usedNotExistedDir = false;
+    QDir directory(dir);
+    if (not directory.exists())
+    {
+        usedNotExistedDir = directory.mkpath(QChar('.'));
+    }
+
+    QString fileName = QFileDialog::getSaveFileName(this, tr("Save as"), dir + QChar('/') + fName, filters, nullptr,
+                                                    VAbstractApplication::VApp()->NativeFileDialog());
+
+    auto RemoveTempDir = qScopeGuard([usedNotExistedDir, dir]()
+    {
+        if (usedNotExistedDir)
+        {
+            QDir(dir).rmpath(QChar('.'));
+        }
+    });
+
+    if (fileName.isEmpty())
+    {
+        return false;
+    }
+
+    QFileInfo f( fileName );
+    if (f.suffix().isEmpty() && f.suffix() != suffix)
+    {
+        fileName += QChar('.') + suffix;
+    }
+
+    if (not CheckFilePermissions(fileName, this))
+    {
+        return false;
+    }
+
+    if (QFileInfo::exists(fileName) && curFile != fileName)
+    {
+        // Temporary try to lock the file before saving
+        VLockGuard<char> tmp(fileName);
+        if (not tmp.IsLocked())
+        {
+            qCCritical(pWindow, "%s",
+                       qUtf8Printable(tr("Failed to lock. This file already opened in another window.")));
+            return false;
+        }
+    }
+
+    QString error;
+    bool result = SaveLayout(fileName, error);
+    if (not result)
+    {
+        QMessageBox messageBox;
+        messageBox.setIcon(QMessageBox::Warning);
+        messageBox.setInformativeText(tr("Could not save file"));
+        messageBox.setDefaultButton(QMessageBox::Ok);
+        messageBox.setDetailedText(error);
+        messageBox.setStandardButtons(QMessageBox::Ok);
+        messageBox.exec();
+        return false;
+    }
+
+    m_curFileFormatVersion = VLayoutConverter::LayoutMaxVer;
+    m_curFileFormatVersionStr = VLayoutConverter::LayoutMaxVerStr;
+
+    UpdateWindowTitle();
+
+    if (curFile == fileName && not lock.isNull())
+    {
+        lock->Unlock();
+    }
+    VlpCreateLock(lock, fileName);
+    if (not lock->IsLocked())
+    {
+        qCCritical(pWindow, "%s", qUtf8Printable(tr("Failed to lock. This file already opened in another window. "
+                                                    "Expect collissions when run 2 copies of the program.")));
+        return false;
+    }
+    return true;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_actionImportRawLayout_triggered()
+{
+    const QString filter(tr("Raw Layout files") + QLatin1String(" (*.rld)"));
+
+    const QString filePath = QFileDialog::getOpenFileName(this, tr("Open file"), QDir::homePath(), filter, nullptr,
+                                                          VAbstractApplication::VApp()->NativeFileDialog());
+
+    if (not filePath.isEmpty())
+    {
+        ImportRawLayouts({filePath});
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_actionAboutQt_triggered()
+{
+    QMessageBox::aboutQt(this, tr("About Qt"));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_actionAboutPuzzle_triggered()
+{
+    auto *aboutDialog = new VPDialogAbout(this);
+    aboutDialog->setAttribute(Qt::WA_DeleteOnClose, true);
+    aboutDialog->show();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_LayoutUnitChanged(int index)
+{
+    Q_UNUSED(index);
+    QVariant comboBoxValue = ui->comboBoxLayoutUnit->currentData();
+    m_layout->LayoutSettings().SetUnit(StrToUnits(comboBoxValue.toString()));
+
+    SetPropertyTabCurrentPieceData();
+    SetPropertyTabSheetData();
+    SetPropertyTabTilesData();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_SheetSizeChanged()
+{
+    if (not m_layout.isNull())
+    {
+        VPSheetPtr sheet = m_layout->GetFocusedSheet();
+        if (not sheet.isNull())
+        {
+            sheet->SetSheetSizeConverted(ui->doubleSpinBoxSheetPaperWidth->value(),
+                                         ui->doubleSpinBoxSheetPaperHeight->value());
+        }
+
+        FindSheetTemplate();
+        SheetPaperSizeChanged();
+        CorrectMaxMargins();
+        LayoutWasSaved(false);
+
+        m_layout->TileFactory()->refreshTileInfos();
+        m_graphicsView->RefreshLayout();
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_SheetOrientationChanged(bool checked)
+{
+    if (checked && not m_layout.isNull())
+    {
+        const qreal width = ui->doubleSpinBoxSheetPaperWidth->value();
+        const qreal height = ui->doubleSpinBoxSheetPaperHeight->value();
+
+        SetDoubleSpinBoxValue(ui->doubleSpinBoxSheetPaperWidth, height);
+        SetDoubleSpinBoxValue(ui->doubleSpinBoxSheetPaperHeight, width);
+
+        VPSheetPtr sheet = m_layout->GetFocusedSheet();
+        if (not sheet.isNull())
+        {
+            sheet->SetSheetSizeConverted(height, width);
+        }
+
+        SheetPaperSizeChanged();
+        CorrectMaxMargins();
+        LayoutWasSaved(false);
+        m_layout->TileFactory()->refreshTileInfos();
+        m_graphicsView->RefreshLayout();
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_SheetMarginChanged()
+{
+    if (not m_layout.isNull())
+    {
+        VPSheetPtr sheet = m_layout->GetFocusedSheet();
+        if (not sheet.isNull())
+        {
+            sheet->SetSheetMarginsConverted(ui->doubleSpinBoxSheetMarginLeft->value(),
+                                            ui->doubleSpinBoxSheetMarginTop->value(),
+                                            ui->doubleSpinBoxSheetMarginRight->value(),
+                                            ui->doubleSpinBoxSheetMarginBottom->value());
+
+            LayoutWasSaved(false);
+
+            sheet->ValidatePiecesOutOfBound();
+        }
+
+        m_graphicsView->RefreshLayout();
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_checkBoxSheetShowGrid_toggled(bool checked)
+{
+    m_layout->LayoutSettings().SetShowGrid(checked);
+    m_graphicsView->RefreshLayout();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_doubleSpinBoxSheetGridColWidth_valueChanged(double value)
+{
+    m_layout->LayoutSettings().SetGridColWidthConverted(value);
+    m_graphicsView->RefreshLayout();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_doubleSpinBoxSheetGridRowHeight_valueChanged(double value)
+{
+    m_layout->LayoutSettings().SetGridRowHeightConverted(value);
+    m_graphicsView->RefreshLayout();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_TilesSizeChanged()
+{
+    if (not m_layout.isNull())
+    {
+        m_layout->LayoutSettings().SetTilesSizeConverted(
+                    ui->doubleSpinBoxTilePaperWidth->value(),
+                    ui->doubleSpinBoxTilePaperHeight->value());
+        FindTileTemplate();
+        TilePaperSizeChanged();
+        CorrectMaxMargins();
+        LayoutWasSaved(false);
+
+        m_layout->TileFactory()->refreshTileInfos();
+        m_graphicsView->RefreshLayout();
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_TilesOrientationChanged(bool checked)
+{
+    if (checked && not m_layout.isNull())
+    {
+        const qreal width = ui->doubleSpinBoxTilePaperWidth->value();
+        const qreal height = ui->doubleSpinBoxTilePaperHeight->value();
+
+        SetDoubleSpinBoxValue(ui->doubleSpinBoxTilePaperWidth, height);
+        SetDoubleSpinBoxValue(ui->doubleSpinBoxTilePaperHeight, width);
+
+        m_layout->LayoutSettings().SetTilesSizeConverted(height, width);
+
+        TilePaperSizeChanged();
+        CorrectMaxMargins();
+        LayoutWasSaved(false);
+        m_layout->TileFactory()->refreshTileInfos();
+        m_graphicsView->RefreshLayout();
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_TilesMarginChanged()
+{
+    if (not m_layout.isNull())
+    {
+        m_layout->LayoutSettings().SetTilesMarginsConverted(
+                    ui->doubleSpinBoxTileMarginLeft->value(),
+                    ui->doubleSpinBoxTileMarginTop->value(),
+                    ui->doubleSpinBoxTileMarginRight->value(),
+                    ui->doubleSpinBoxTileMarginBottom->value());
+        LayoutWasSaved(false);
+        m_layout->TileFactory()->refreshTileInfos();
+        m_graphicsView->RefreshLayout();
+    }
+
+    VMainGraphicsView::NewSceneRect(m_graphicsView->scene(), m_graphicsView);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_CarrouselLocationChanged(Qt::DockWidgetArea area)
+{
+    if(area == Qt::BottomDockWidgetArea || area == Qt::TopDockWidgetArea)
+    {
+        m_carrousel->SetOrientation(Qt::Horizontal);
+    }
+    else if (area == Qt::LeftDockWidgetArea || area == Qt::RightDockWidgetArea)
+    {
+        m_carrousel->SetOrientation(Qt::Vertical);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_PieceSelectionChanged()
+{
+    // update the property of the piece currently selected
+    SetPropertyTabCurrentPieceData();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_ScaleChanged(qreal scale)
+{
+    if (not m_doubleSpinBoxScale.isNull())
+    {
+        m_doubleSpinBoxScale->blockSignals(true);
+        m_doubleSpinBoxScale->setMaximum(qFloor(VPMainGraphicsView::MaxScale()*1000)/10.0);
+        m_doubleSpinBoxScale->setMinimum(qFloor(VPMainGraphicsView::MinScale()*1000)/10.0);
+        m_doubleSpinBoxScale->setValue(qFloor(scale*1000)/10.0);
+        m_doubleSpinBoxScale->setSingleStep(1);
+        m_doubleSpinBoxScale->blockSignals(false);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_MouseMoved(const QPointF &scenePos)
+{
+    if (m_mouseCoordinate != nullptr)
+    {
+        m_mouseCoordinate->setText(QStringLiteral("%1, %2 (%3)")
+                                   .arg(static_cast<qint32>(FromPixel(scenePos.x(),
+                                                                      m_layout->LayoutSettings().GetUnit())))
+                                   .arg(static_cast<qint32>(FromPixel(scenePos.y(),
+                                                                      m_layout->LayoutSettings().GetUnit())))
+                                   .arg(UnitsToStr(m_layout->LayoutSettings().GetUnit(), true)));
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::ShowWindow() const
+{
+    if (auto *action = qobject_cast<QAction*>(sender()))
+    {
+        const QVariant v = action->data();
+        if (v.canConvert<int>())
+        {
+            const int offset = qvariant_cast<int>(v);
+            const QList<VPMainWindow*> windows = VPApplication::VApp()->MainWindows();
+            windows.at(offset)->raise();
+            windows.at(offset)->activateWindow();
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_actionPreferences_triggered()
+{
+    // Calling constructor of the dialog take some time. Because of this user have time to call the dialog twice.
+    QSharedPointer<DialogPuzzlePreferences> preferences = VPApplication::VApp()->PreferencesDialog();
+    if (preferences.isNull())
+    {
+        auto CleanAfterDialog = qScopeGuard([&preferences]()
+        {
+            preferences.clear();
+        });
+
+        QGuiApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+
+        preferences.reset(new DialogPuzzlePreferences());
+        preferences->setWindowModality(Qt::ApplicationModal);
+        VPApplication::VApp()->SetPreferencesDialog(preferences);
+
+        const QList<VPMainWindow*> windows = VPApplication::VApp()->MainWindows();
+        for (auto *window : windows)
+        {
+            window->ConnectToPreferences(preferences);
+        }
+
+        QGuiApplication::restoreOverrideCursor();
+
+        preferences->exec();
+    }
+    else
+    {
+        preferences->show();
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::ToolBarStyles()
+{
+    ToolBarStyle(ui->mainToolBar);
+    ToolBarStyle(ui->toolBarZoom);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_actionAddSheet_triggered()
+{
+    VPSheetPtr sheet(new VPSheet(m_layout));
+    sheet->SetName(tr("Sheet %1").arg(m_layout->GetAllSheets().size()+1));
+    m_layout->UndoStack()->push(new VPUndoAddSheet(sheet));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_ApplyPieceTransformation()
+{
+    if (m_layout.isNull())
+    {
+        return;
+    }
+    const int index = ui->tabWidgetPieceTransformation->currentIndex();
+    if (ui->tabWidgetPieceTransformation->indexOf(ui->tabTranslate) == index)
+    { // translate
+        const qreal dx = UnitConvertor(ui->doubleSpinBoxCurrentPieceBoxPositionX->value(), TranslateUnit(), Unit::Px);
+        const qreal dy = UnitConvertor(ui->doubleSpinBoxCurrentPieceBoxPositionY->value(), TranslateUnit(), Unit::Px);
+
+        QList<VPPiecePtr> selectedPieces = SelectedPieces();
+        if (selectedPieces.isEmpty())
+        {
+            return;
+        }
+
+        if (ui->checkBoxRelativeTranslation->isChecked())
+        {
+            if (ui->checkBoxTransformSeparately->isChecked())
+            {
+                if (selectedPieces.size() > 1)
+                {
+                    m_layout->UndoStack()->beginMacro(tr("translate pieces"));
+                }
+
+                QRectF rect = PiecesBoundingRect(selectedPieces);
+                for (const auto& piece : selectedPieces)
+                {
+                    if (not piece.isNull())
+                    {
+                        const QRectF pieceRect = piece->MappedDetailBoundingRect();
+                        qreal pieceDx = dx;
+                        qreal pieceDy = dy;
+
+                        if (not qFuzzyIsNull(rect.width()))
+                        {
+                            pieceDx += dx*((pieceRect.topLeft().x()-rect.topLeft().x())/rect.width())*2.;
+                        }
+
+                        if (not qFuzzyIsNull(rect.height()))
+                        {
+                            pieceDy += dy*((pieceRect.topLeft().y()-rect.topLeft().y())/rect.height())*2.;
+                        }
+
+                        auto *command = new VPUndoPieceMove(piece, pieceDx, pieceDy);
+                        m_layout->UndoStack()->push(command);
+
+                        if (m_layout->LayoutSettings().GetStickyEdges())
+                        {
+                            qreal stickyTranslateX = 0;
+                            qreal stickyTranslateY = 0;
+                            if (piece->StickyPosition(stickyTranslateX, stickyTranslateY))
+                            {
+                                bool allowMerge = selectedPieces.size() == 1;
+                                auto *stickyCommand = new VPUndoPieceMove(piece, stickyTranslateX, stickyTranslateY,
+                                                                          allowMerge);
+                                m_layout->UndoStack()->push(stickyCommand);
+                            }
+                        }
+                    }
+                }
+
+                if (selectedPieces.size() > 1)
+                {
+                    m_layout->UndoStack()->endMacro();
+                }
+            }
+            else
+            {
+                auto *command = new VPUndoPiecesMove(selectedPieces, dx, dy);
+                m_layout->UndoStack()->push(command);
+            }
+        }
+        else
+        {
+            QRectF rect = PiecesBoundingRect(selectedPieces);
+            qreal pieceDx = dx - rect.topLeft().x();
+            qreal pieceDy = dy - rect.topLeft().y();
+
+            if (selectedPieces.size() == 1)
+            {
+                auto *command = new VPUndoPieceMove(selectedPieces.first(), pieceDx, pieceDy);
+                m_layout->UndoStack()->push(command);
+            }
+            else
+            {
+                auto *command = new VPUndoPiecesMove(selectedPieces, pieceDx, pieceDy);
+                m_layout->UndoStack()->push(command);
+            }
+        }
+    }
+    else if (ui->tabWidgetPieceTransformation->indexOf(ui->tabRotate) == index)
+    { // rotate
+        qreal angle = ui->doubleSpinBoxCurrentPieceAngle->value();
+
+        if (ui->toolButtonCurrentPieceRotationClockwise->isChecked())
+        {
+            angle *= -1;
+        }
+
+        QList<VPPiecePtr> selectedPieces = SelectedPieces();
+        if (selectedPieces.isEmpty())
+        {
+            return;
+        }
+
+        if (ui->checkBoxTransformSeparately->isChecked())
+        {
+            m_layout->UndoStack()->beginMacro(tr("rotate pieces"));
+            for (const auto& piece : selectedPieces)
+            {
+                if (not piece.isNull())
+                {
+                    const QRectF rect = piece->MappedDetailBoundingRect();
+
+                    VPTransformationOrigon origin;
+                    origin.origin = rect.center();
+                    origin.custom = true;
+
+                    auto *command = new VPUndoPieceRotate(piece, origin, angle, angle);
+                    m_layout->UndoStack()->push(command);
+                }
+            }
+            m_layout->UndoStack()->endMacro();
+        }
+        else
+        {
+            VPSheetPtr sheet = m_layout->GetFocusedSheet();
+            if (sheet.isNull())
+            {
+                return;
+            }
+
+            VPTransformationOrigon origin = sheet->TransformationOrigin();
+            auto *command = new VPUndoPiecesRotate(selectedPieces, origin, angle, angle);
+            m_layout->UndoStack()->push(command);
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_ResetPieceTransformationSettings()
+{
+    const int index = ui->tabWidgetPieceTransformation->currentIndex();
+    if (ui->tabWidgetPieceTransformation->indexOf(ui->tabTranslate) == index)
+    { // translate
+        if (ui->checkBoxRelativeTranslation->isChecked())
+        {
+            ui->doubleSpinBoxCurrentPieceBoxPositionX->setValue(0);
+            ui->doubleSpinBoxCurrentPieceBoxPositionY->setValue(0);
+        }
+        else
+        {
+            int unitIndex = ui->comboBoxTranslateUnit->findData(QVariant(UnitsToStr(Unit::Px)));
+            if (unitIndex != -1)
+            {
+                ui->comboBoxTranslateUnit->setCurrentIndex(unitIndex);
+            }
+        }
+    }
+    else if (ui->tabWidgetPieceTransformation->indexOf(ui->tabRotate) == index)
+    { // rotate
+        ui->doubleSpinBoxCurrentPieceAngle->setValue(0);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_RelativeTranslationChanged(bool checked)
+{
+    if (checked)
+    {
+        ui->doubleSpinBoxCurrentPieceBoxPositionX->setValue(0);
+        ui->doubleSpinBoxCurrentPieceBoxPositionY->setValue(0);
+    }
+    else
+    {
+        QRectF rect = PiecesBoundingRect(SelectedPieces());
+
+        ui->doubleSpinBoxCurrentPieceBoxPositionX->setValue(
+                    UnitConvertor(rect.topLeft().x(), Unit::Px, TranslateUnit()));
+        ui->doubleSpinBoxCurrentPieceBoxPositionY->setValue(
+                    UnitConvertor(rect.topLeft().y(), Unit::Px, TranslateUnit()));
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_ConvertPaperSize()
+{
+    const Unit layoutUnit = LayoutUnit();
+
+    const qreal sheetWidth = ui->doubleSpinBoxSheetPaperWidth->value();
+    const qreal sheetHeight = ui->doubleSpinBoxSheetPaperHeight->value();
+
+    const qreal sheetLeftMargin = ui->doubleSpinBoxSheetMarginLeft->value();
+    const qreal sheetRightMargin = ui->doubleSpinBoxSheetMarginRight->value();
+    const qreal sheetTopMargin = ui->doubleSpinBoxSheetMarginTop->value();
+    const qreal sheetBottomMargin = ui->doubleSpinBoxSheetMarginBottom->value();
+
+    ui->doubleSpinBoxSheetPaperWidth->blockSignals(true);
+    ui->doubleSpinBoxSheetPaperHeight->blockSignals(true);
+    ui->doubleSpinBoxSheetPaperWidth->setMaximum(FromPixel(QIMAGE_MAX, layoutUnit));
+    ui->doubleSpinBoxSheetPaperHeight->setMaximum(FromPixel(QIMAGE_MAX, layoutUnit));
+    ui->doubleSpinBoxSheetPaperWidth->blockSignals(false);
+    ui->doubleSpinBoxSheetPaperHeight->blockSignals(false);
+
+    const qreal newSheetWidth = UnitConvertor(sheetWidth, m_oldLayoutUnit, layoutUnit);
+    const qreal newSheetHeight = UnitConvertor(sheetHeight, m_oldLayoutUnit, layoutUnit);
+
+    const qreal newSheetLeftMargin = UnitConvertor(sheetLeftMargin, m_oldLayoutUnit, layoutUnit);
+    const qreal newSheetRightMargin = UnitConvertor(sheetRightMargin, m_oldLayoutUnit, layoutUnit);
+    const qreal newSheetTopMargin = UnitConvertor(sheetTopMargin, m_oldLayoutUnit, layoutUnit);
+    const qreal newSheetBottomMargin = UnitConvertor(sheetBottomMargin, m_oldLayoutUnit, layoutUnit);
+
+    const qreal tileWidth = ui->doubleSpinBoxTilePaperWidth->value();
+    const qreal tileHeight = ui->doubleSpinBoxTilePaperHeight->value();
+
+    const qreal tileLeftMargin = ui->doubleSpinBoxTileMarginLeft->value();
+    const qreal tileRightMargin = ui->doubleSpinBoxTileMarginRight->value();
+    const qreal tileTopMargin = ui->doubleSpinBoxTileMarginTop->value();
+    const qreal tileBottomMargin = ui->doubleSpinBoxTileMarginBottom->value();
+
+    ui->doubleSpinBoxTilePaperWidth->blockSignals(true);
+    ui->doubleSpinBoxTilePaperHeight->blockSignals(true);
+    ui->doubleSpinBoxTilePaperWidth->setMaximum(FromPixel(QIMAGE_MAX, layoutUnit));
+    ui->doubleSpinBoxTilePaperHeight->setMaximum(FromPixel(QIMAGE_MAX, layoutUnit));
+    ui->doubleSpinBoxTilePaperWidth->blockSignals(false);
+    ui->doubleSpinBoxTilePaperHeight->blockSignals(false);
+
+    const qreal newTileWidth = UnitConvertor(tileWidth, m_oldLayoutUnit, layoutUnit);
+    const qreal newTileHeight = UnitConvertor(tileHeight, m_oldLayoutUnit, layoutUnit);
+
+    const qreal newTileLeftMargin = UnitConvertor(tileLeftMargin, m_oldLayoutUnit, layoutUnit);
+    const qreal newTileRightMargin = UnitConvertor(tileRightMargin, m_oldLayoutUnit, layoutUnit);
+    const qreal newTileTopMargin = UnitConvertor(tileTopMargin, m_oldLayoutUnit, layoutUnit);
+    const qreal newTileBottomMargin = UnitConvertor(tileBottomMargin, m_oldLayoutUnit, layoutUnit);
+
+    qreal newGap = UnitConvertor(ui->doubleSpinBoxSheetPiecesGap->value(), m_oldLayoutUnit, layoutUnit);
+
+    m_oldLayoutUnit = layoutUnit;
+    m_layout->LayoutSettings().SetUnit(layoutUnit);
+    CorrectPaperDecimals();
+    MinimumSheetPaperSize();
+    MinimumTilePaperSize();
+
+    const QString suffix = " " + UnitsToStr(layoutUnit, true);
+
+    SetDoubleSpinBoxValue(ui->doubleSpinBoxSheetPaperWidth, newSheetWidth);
+    ui->doubleSpinBoxSheetPaperWidth->setSuffix(suffix);
+
+    SetDoubleSpinBoxValue(ui->doubleSpinBoxSheetPaperHeight, newSheetHeight);
+    ui->doubleSpinBoxSheetPaperHeight->setSuffix(suffix);
+
+    on_SheetSizeChanged();
+
+    SetDoubleSpinBoxValue(ui->doubleSpinBoxSheetMarginLeft, newSheetLeftMargin);
+    ui->doubleSpinBoxSheetMarginLeft->setSuffix(suffix);
+
+    SetDoubleSpinBoxValue(ui->doubleSpinBoxSheetMarginRight, newSheetRightMargin);
+    ui->doubleSpinBoxSheetMarginRight->setSuffix(suffix);
+
+    SetDoubleSpinBoxValue(ui->doubleSpinBoxSheetMarginTop, newSheetTopMargin);
+    ui->doubleSpinBoxSheetMarginTop->setSuffix(suffix);
+
+    SetDoubleSpinBoxValue(ui->doubleSpinBoxSheetMarginBottom, newSheetBottomMargin);
+    ui->doubleSpinBoxSheetMarginBottom->setSuffix(suffix);
+
+    on_SheetMarginChanged();
+
+    SetDoubleSpinBoxValue(ui->doubleSpinBoxTilePaperWidth, newTileWidth);
+    ui->doubleSpinBoxTilePaperWidth->setSuffix(suffix);
+
+    SetDoubleSpinBoxValue(ui->doubleSpinBoxTilePaperHeight, newTileHeight);
+    ui->doubleSpinBoxTilePaperHeight->setSuffix(suffix);
+
+    on_TilesSizeChanged();
+
+    SetDoubleSpinBoxValue(ui->doubleSpinBoxTileMarginLeft, newTileLeftMargin);
+    ui->doubleSpinBoxTileMarginLeft->setSuffix(suffix);
+
+    SetDoubleSpinBoxValue(ui->doubleSpinBoxTileMarginRight, newTileRightMargin);
+    ui->doubleSpinBoxTileMarginRight->setSuffix(suffix);
+
+    SetDoubleSpinBoxValue(ui->doubleSpinBoxTileMarginTop, newTileTopMargin);
+    ui->doubleSpinBoxTileMarginTop->setSuffix(suffix);
+
+    SetDoubleSpinBoxValue(ui->doubleSpinBoxTileMarginBottom, newTileBottomMargin);
+    ui->doubleSpinBoxTileMarginBottom->setSuffix(suffix);
+
+    on_TilesMarginChanged();
+
+    ui->doubleSpinBoxSheetPiecesGap->setMaximum(
+                UnitConvertor(VPSettings::GetMaxLayoutPieceGap(), Unit::Cm, layoutUnit));
+    ui->doubleSpinBoxSheetPiecesGap->setValue(newGap);
+    ui->doubleSpinBoxSheetPiecesGap->setSuffix(suffix);
+
+    CorrectMaxMargins();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_ExportLayout()
+{
+    if (m_layout.isNull())
+    {
+        return;
+    }
+
+    QList<VPSheetPtr> sheets = m_layout->GetSheets();
+    if (sheets.isEmpty())
+    {
+        return;
+    }
+
+    if (not AskLayoutIsInvalid(sheets))
+    {
+        return;
+    }
+
+    DialogSaveManualLayout dialog(sheets.size(), false, m_layout->LayoutSettings().GetTitle(), this);
+
+    if (dialog.exec() == QDialog::Rejected)
+    {
+        return;
+    }
+
+    VPExportData data;
+    data.format = dialog.Format();
+    data.path = dialog.Path();
+    data.fileName = dialog.FileName();
+    data.sheets = sheets;
+    data.xScale = m_layout->LayoutSettings().HorizontalScale();
+    data.yScale = m_layout->LayoutSettings().VerticalScale();
+    data.isBinaryDXF = dialog.IsBinaryDXFFormat();
+    data.textAsPaths = dialog.IsTextAsPaths();
+    data.exportUnified = dialog.IsExportUnified();
+    data.showTilesScheme = dialog.IsTilesScheme();
+
+    ExportData(data);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_ExportSheet()
+{
+    if (m_layout.isNull())
+    {
+        return;
+    }
+
+    VPSheetPtr sheet = m_layout->GetFocusedSheet();
+    if (sheet.isNull())
+    {
+        return;
+    }
+
+    if (not AskLayoutIsInvalid(QList<VPSheetPtr>{sheet}))
+    {
+        return;
+    }
+
+    if (m_layout->LayoutSettings().GetWarningPiecesOutOfBound() ||
+            m_layout->LayoutSettings().GetWarningSuperpositionOfPieces())
+    {
+        bool outOfBoundChecked = false;
+        bool pieceSuperpositionChecked = false;
+
+        QList<VPPiecePtr> pieces = sheet->GetPieces();
+        for (const auto& piece :pieces)
+        {
+           if (m_layout->LayoutSettings().GetWarningPiecesOutOfBound())
+           {
+               if (not outOfBoundChecked && not piece.isNull() && piece->OutOfBound())
+               {
+                   QMessageBox msgBox(this);
+                   msgBox.setIcon(QMessageBox::Question);
+                   msgBox.setWindowTitle(tr("The layout is invalid."));
+                   msgBox.setText(tr("The layout is invalid. Piece out of bound. Do you want to continue export?"));
+                   msgBox.setStandardButtons(QMessageBox::Yes|QMessageBox::No);
+                   msgBox.setDefaultButton(QMessageBox::No);
+                   const int width = 500;
+                   auto* horizontalSpacer = new QSpacerItem(width, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
+                   auto* layout = qobject_cast<QGridLayout*>(msgBox.layout());
+                   SCASSERT(layout != nullptr)
+                   layout->addItem(horizontalSpacer, layout->rowCount(), 0, 1, layout->columnCount());
+                   if (msgBox.exec() == QMessageBox::No)
+                   {
+                       return;
+                   }
+
+                   outOfBoundChecked = true; // no need to ask more
+               }
+           }
+
+           if (m_layout->LayoutSettings().GetWarningSuperpositionOfPieces())
+           {
+               if (not pieceSuperpositionChecked && not piece.isNull() && piece->HasSuperpositionWithPieces())
+               {
+                   QMessageBox msgBox(this);
+                   msgBox.setIcon(QMessageBox::Question);
+                   msgBox.setWindowTitle(tr("The layout is invalid."));
+                   msgBox.setText(tr("The layout is invalid. Pieces superposition. Do you want to continue export?"));
+                   msgBox.setStandardButtons(QMessageBox::Yes|QMessageBox::No);
+                   msgBox.setDefaultButton(QMessageBox::No);
+                   const int width = 500;
+                   auto* horizontalSpacer = new QSpacerItem(width, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
+                   auto* layout = qobject_cast<QGridLayout*>(msgBox.layout());
+                   SCASSERT(layout != nullptr)
+                   layout->addItem(horizontalSpacer, layout->rowCount(), 0, 1, layout->columnCount());
+                   if (msgBox.exec() == QMessageBox::No)
+                   {
+                       return;
+                   }
+
+                   pieceSuperpositionChecked = true; // no need to ask more
+               }
+           }
+        }
+    }
+
+    DialogSaveManualLayout dialog(1, false, sheet->GetName(), this);
+
+    if (dialog.exec() == QDialog::Rejected)
+    {
+        return;
+    }
+
+    VPExportData data;
+    data.format = dialog.Format();
+    data.path = dialog.Path();
+    data.fileName = dialog.FileName();
+    data.sheets = QList<VPSheetPtr>{sheet};
+    data.xScale = m_layout->LayoutSettings().HorizontalScale();
+    data.yScale = m_layout->LayoutSettings().VerticalScale();
+    data.isBinaryDXF = dialog.IsBinaryDXFFormat();
+    data.textAsPaths = dialog.IsTextAsPaths();
+    data.exportUnified = dialog.IsExportUnified();
+    data.showTilesScheme = dialog.IsTilesScheme();
+
+    ExportData(data);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_actionPrintLayout_triggered()
+{
+    if (not m_layout->IsSheetsUniform())
+    {
+        qCritical()<<tr("For printing multipages document all sheet should have the same size.");
+        return;
+    }
+
+    if (not AskLayoutIsInvalid(m_layout->GetSheets()))
+    {
+        return;
+    }
+
+    QSharedPointer<QPrinter> printer = PreparePrinter(QPrinterInfo::defaultPrinter(), QPrinter::HighResolution);
+    if (printer.isNull())
+    {
+        qCritical("%s\n\n%s", qUtf8Printable(tr("Print error")),
+                  qUtf8Printable(tr("Cannot proceed because there are no available printers in your system.")));
+        return;
+    }
+
+    printer->setCreator(QGuiApplication::applicationDisplayName() + QChar(QChar::Space) +
+                        QCoreApplication::applicationVersion());
+
+    QList<VPSheetPtr> sheets = m_layout->GetSheets();
+    VPSheetPtr firstSheet = sheets.first();
+    if (firstSheet.isNull())
+    {
+        qCritical() << tr("Unable to sheet page settings");
+    }
+
+    qreal xScale = m_layout->LayoutSettings().HorizontalScale();
+    qreal yScale = m_layout->LayoutSettings().VerticalScale();
+
+    SetPrinterSheetPageSettings(printer, firstSheet, xScale, yScale);
+    printer->setDocName(m_layout->LayoutSettings().GetTitle());
+    printer->setOutputFileName(QString());//Disable printing to file if was enabled.
+    printer->setOutputFormat(QPrinter::NativeFormat);
+
+    QPrintDialog dialog(printer.data(), this);
+    // If only user couldn't change page margins we could use method setMinMax();
+    dialog.setOption(QPrintDialog::PrintCurrentPage, false);
+
+    if (dialog.exec() == QDialog::Accepted)
+    {
+        printer->setResolution(static_cast<int>(PrintDPI));
+        on_printLayoutSheets(printer.data());
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_actionPrintPreviewLayout_triggered()
+{
+    if (not m_layout->IsSheetsUniform())
+    {
+        qCritical()<<tr("For printing multipages document all sheet should have the same size.");
+        return;
+    }
+
+    if (not AskLayoutIsInvalid(m_layout->GetSheets()))
+    {
+        return;
+    }
+
+    QSharedPointer<QPrinter> printer = PreparePrinter(QPrinterInfo::defaultPrinter());
+    if (printer.isNull())
+    {
+        qCritical("%s\n\n%s", qUtf8Printable(tr("Print error")),
+                  qUtf8Printable(tr("Cannot proceed because there are no available printers in your system.")));
+        return;
+    }
+
+    printer->setCreator(QGuiApplication::applicationDisplayName() + QChar(QChar::Space) +
+                        QCoreApplication::applicationVersion());
+
+    QList<VPSheetPtr> sheets = m_layout->GetSheets();
+    VPSheetPtr firstSheet = sheets.first();
+    if (firstSheet.isNull())
+    {
+        qCritical() << tr("Unable to sheet page settings");
+        return;
+    }
+
+    qreal xScale = m_layout->LayoutSettings().HorizontalScale();
+    qreal yScale = m_layout->LayoutSettings().VerticalScale();
+
+    SetPrinterSheetPageSettings(printer, firstSheet, xScale, yScale);
+    printer->setDocName(m_layout->LayoutSettings().GetTitle());
+    printer->setResolution(static_cast<int>(PrintDPI));
+
+    // display print preview dialog
+    QPrintPreviewDialog preview(printer.data());
+    connect(&preview, &QPrintPreviewDialog::paintRequested, this, &VPMainWindow::on_printLayoutSheets);
+    preview.exec();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_actionPrintTiledLayout_triggered()
+{
+    QSharedPointer<QPrinter> printer = PreparePrinter(QPrinterInfo::defaultPrinter(), QPrinter::HighResolution);
+    if (printer.isNull())
+    {
+        qCritical("%s\n\n%s", qUtf8Printable(tr("Print error")),
+                  qUtf8Printable(tr("Cannot proceed because there are no available printers in your system.")));
+        return;
+    }
+
+    printer->setCreator(QGuiApplication::applicationDisplayName() + QChar(QChar::Space) +
+                        QCoreApplication::applicationVersion());
+
+    QList<VPSheetPtr> sheets = m_layout->GetSheets();
+    VPSheetPtr firstSheet = sheets.first();
+    if (firstSheet.isNull())
+    {
+        qCritical() << tr("Unable to sheet page settings");
+        return;
+    }
+
+    SetPrinterTiledPageSettings(printer, m_layout, firstSheet, m_layout->LayoutSettings().GetTilesOrientation(), false);
+    printer->setDocName(m_layout->LayoutSettings().GetTitle());
+    printer->setOutputFileName(QString());//Disable printing to file if was enabled.
+    printer->setOutputFormat(QPrinter::NativeFormat);
+
+    QPrintDialog dialog(printer.data(), this);
+    // If only user couldn't change page margins we could use method setMinMax();
+    dialog.setOption(QPrintDialog::PrintCurrentPage, false);
+
+    if (dialog.exec() == QDialog::Accepted)
+    {
+        printer->setResolution(static_cast<int>(PrintDPI));
+        on_printLayoutTiledPages(printer.data());
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_actionPrintPreviewTiledLayout_triggered()
+{
+    QSharedPointer<QPrinter> printer = PreparePrinter(QPrinterInfo::defaultPrinter(), QPrinter::HighResolution);
+    if (printer.isNull())
+    {
+        qCritical("%s\n\n%s", qUtf8Printable(tr("Print error")),
+                  qUtf8Printable(tr("Cannot proceed because there are no available printers in your system.")));
+        return;
+    }
+
+    printer->setCreator(QGuiApplication::applicationDisplayName() + QChar(QChar::Space) +
+                        QCoreApplication::applicationVersion());
+
+
+    QList<VPSheetPtr> sheets = m_layout->GetSheets();
+    VPSheetPtr firstSheet = sheets.first();
+    if (firstSheet.isNull())
+    {
+        qCritical() << tr("Unable to sheet page settings");
+        return;
+    }
+
+    SetPrinterTiledPageSettings(printer, m_layout, firstSheet, m_layout->LayoutSettings().GetTilesOrientation(), false);
+    printer->setDocName(m_layout->LayoutSettings().GetTitle());
+    printer->setResolution(static_cast<int>(PrintDPI));
+
+    // display print preview dialog
+    QPrintPreviewDialog preview(printer.data());
+    connect(&preview, &QPrintPreviewDialog::paintRequested, this, &VPMainWindow::on_printLayoutTiledPages);
+    preview.exec();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_printLayoutSheets(QPrinter *printer)
+{
+    PrintLayoutSheets(printer, m_layout->GetSheets());
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_printLayoutTiledPages(QPrinter *printer)
+{
+    PrintLayoutTiledSheets(printer, m_layout->GetSheets());
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_actionPrintSheet_triggered()
+{
+    VPSheetPtr sheet = m_layout->GetFocusedSheet();
+    if (sheet.isNull())
+    {
+        return;
+    }
+
+    if (not AskLayoutIsInvalid(QList<VPSheetPtr>{sheet}))
+    {
+        return;
+    }
+
+    QSharedPointer<QPrinter> printer = PreparePrinter(QPrinterInfo::defaultPrinter(), QPrinter::HighResolution);
+    if (printer.isNull())
+    {
+        qCritical("%s\n\n%s", qUtf8Printable(tr("Print error")),
+                  qUtf8Printable(tr("Cannot proceed because there are no available printers in your system.")));
+        return;
+    }
+
+    printer->setCreator(QGuiApplication::applicationDisplayName() + QChar(QChar::Space) +
+                        QCoreApplication::applicationVersion());
+
+    qreal xScale = m_layout->LayoutSettings().HorizontalScale();
+    qreal yScale = m_layout->LayoutSettings().VerticalScale();
+
+    SetPrinterSheetPageSettings(printer, sheet, xScale, yScale);
+    printer->setDocName(sheet->GetName());
+    printer->setOutputFileName(QString());//Disable printing to file if was enabled.
+    printer->setOutputFormat(QPrinter::NativeFormat);
+
+    QPrintDialog dialog(printer.data(), this);
+    // If only user couldn't change page margins we could use method setMinMax();
+    dialog.setOption(QPrintDialog::PrintCurrentPage, false);
+
+    if (dialog.exec() == QDialog::Accepted)
+    {
+        printer->setResolution(static_cast<int>(PrintDPI));
+        on_printLayoutSheet(printer.data());
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_actionPrintPreviewSheet_triggered()
+{
+    VPSheetPtr sheet = m_layout->GetFocusedSheet();
+    if (sheet.isNull())
+    {
+        return;
+    }
+
+    if (not AskLayoutIsInvalid(QList<VPSheetPtr>{sheet}))
+    {
+        return;
+    }
+
+    QSharedPointer<QPrinter> printer = PreparePrinter(QPrinterInfo::defaultPrinter());
+    if (printer.isNull())
+    {
+        qCritical("%s\n\n%s", qUtf8Printable(tr("Print error")),
+                  qUtf8Printable(tr("Cannot proceed because there are no available printers in your system.")));
+        return;
+    }
+
+    printer->setCreator(QGuiApplication::applicationDisplayName() + QChar(QChar::Space) +
+                        QCoreApplication::applicationVersion());
+
+    qreal xScale = m_layout->LayoutSettings().HorizontalScale();
+    qreal yScale = m_layout->LayoutSettings().VerticalScale();
+
+    SetPrinterSheetPageSettings(printer, sheet, xScale, yScale);
+    printer->setDocName(sheet->GetName());
+    printer->setResolution(static_cast<int>(PrintDPI));
+
+    // display print preview dialog
+    QPrintPreviewDialog preview(printer.data());
+    connect(&preview, &QPrintPreviewDialog::paintRequested, this, &VPMainWindow::on_printLayoutSheet);
+    preview.exec();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_actionPrintTiledSheet_triggered()
+{
+    VPSheetPtr sheet = m_layout->GetFocusedSheet();
+    if (sheet.isNull())
+    {
+        return;
+    }
+
+    QSharedPointer<QPrinter> printer = PreparePrinter(QPrinterInfo::defaultPrinter(), QPrinter::HighResolution);
+    if (printer.isNull())
+    {
+        qCritical("%s\n\n%s", qUtf8Printable(tr("Print error")),
+                  qUtf8Printable(tr("Cannot proceed because there are no available printers in your system.")));
+        return;
+    }
+
+    printer->setCreator(QGuiApplication::applicationDisplayName() + QChar(QChar::Space) +
+                        QCoreApplication::applicationVersion());
+
+    SetPrinterTiledPageSettings(printer, m_layout, sheet, m_layout->LayoutSettings().GetTilesOrientation(), false);
+    printer->setDocName(sheet->GetName());
+    printer->setOutputFileName(QString());//Disable printing to file if was enabled.
+    printer->setOutputFormat(QPrinter::NativeFormat);
+
+    QPrintDialog dialog(printer.data(), this);
+    // If only user couldn't change page margins we could use method setMinMax();
+    dialog.setOption(QPrintDialog::PrintCurrentPage, false);
+
+    if (dialog.exec() == QDialog::Accepted)
+    {
+        printer->setResolution(static_cast<int>(PrintDPI));
+        on_printLayoutSheetTiledPages(printer.data());
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_actionPrintPreviewTiledSheet_triggered()
+{
+    VPSheetPtr sheet = m_layout->GetFocusedSheet();
+    if (sheet.isNull())
+    {
+        return;
+    }
+
+    QSharedPointer<QPrinter> printer = PreparePrinter(QPrinterInfo::defaultPrinter(), QPrinter::HighResolution);
+    if (printer.isNull())
+    {
+        qCritical("%s\n\n%s", qUtf8Printable(tr("Print error")),
+                  qUtf8Printable(tr("Cannot proceed because there are no available printers in your system.")));
+        return;
+    }
+
+    printer->setCreator(QGuiApplication::applicationDisplayName() + QChar(QChar::Space) +
+                        QCoreApplication::applicationVersion());
+
+    SetPrinterTiledPageSettings(printer, m_layout, sheet, m_layout->LayoutSettings().GetTilesOrientation(), false);
+    printer->setDocName(sheet->GetName());
+    printer->setResolution(static_cast<int>(PrintDPI));
+
+    // display print preview dialog
+    QPrintPreviewDialog preview(printer.data());
+    connect(&preview, &QPrintPreviewDialog::paintRequested, this, &VPMainWindow::on_printLayoutSheetTiledPages);
+    preview.exec();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_printLayoutSheet(QPrinter *printer)
+{
+    VPSheetPtr sheet = m_layout->GetFocusedSheet();
+    if (sheet.isNull())
+    {
+        return;
+    }
+
+    PrintLayoutSheets(printer, QList<VPSheetPtr>{sheet});
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::on_printLayoutSheetTiledPages(QPrinter *printer)
+{
+    VPSheetPtr sheet = m_layout->GetFocusedSheet();
+    if (sheet.isNull())
+    {
+        return;
+    }
+
+    PrintLayoutTiledSheets(printer, QList<VPSheetPtr>{sheet});
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::CreateWatermark()
+{
+    CleanWaterkmarkEditors();
+    OpenWatermark();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::EditCurrentWatermark()
+{
+    CleanWaterkmarkEditors();
+
+    QString watermarkFile = m_layout->LayoutSettings().WatermarkPath();
+    if (not watermarkFile.isEmpty())
+    {
+        OpenWatermark(watermarkFile);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::LoadWatermark()
+{
+    const QString filter(tr("Watermark files") + QLatin1String(" (*.vwm)"));
+    QString dir = QDir::homePath();
+    qDebug("Run QFileDialog::getOpenFileName: dir = %s.", qUtf8Printable(dir));
+    const QString filePath = QFileDialog::getOpenFileName(this, tr("Open file"), dir, filter, nullptr,
+                                                          VAbstractApplication::VApp()->NativeFileDialog());
+    if (filePath.isEmpty())
+    {
+        return;
+    }
+
+    m_layout->LayoutSettings().SetWatermarkPath(filePath);
+    LayoutWasSaved(false);
+    m_layout->TileFactory()->refreshTileInfos();
+    m_graphicsView->RefreshLayout();
+    ui->actionRemoveWatermark->setEnabled(true);
+    ui->actionEditCurrentWatermark->setEnabled(true);
+
+    if (not m_layout->LayoutSettings().WatermarkPath().isEmpty())
+    {
+        m_layoutWatcher->addPath(m_layout->LayoutSettings().WatermarkPath());
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPMainWindow::RemoveWatermark()
+{
+    m_layout->LayoutSettings().SetWatermarkPath(QString());
+    LayoutWasSaved(false);
+    m_layout->TileFactory()->refreshTileInfos();
+    m_graphicsView->RefreshLayout();
+    ui->actionRemoveWatermark->setEnabled(false);
+    ui->actionEditCurrentWatermark->setEnabled(false);
+
+    if (not m_layout->LayoutSettings().WatermarkPath().isEmpty())
+    {
+        m_layoutWatcher->removePath(m_layout->LayoutSettings().WatermarkPath());
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+#if defined(Q_OS_MAC)
+void VPMainWindow::AboutToShowDockMenu()
+{
+    if (QMenu *menu = qobject_cast<QMenu *>(sender()))
+    {
+        menu->clear();
+        CreateWindowMenu(menu);
+
+        menu->addSeparator();
+
+        QAction *actionPreferences = menu->addAction(tr("Preferences"));
+        actionPreferences->setMenuRole(QAction::NoRole);
+        connect(actionPreferences, &QAction::triggered, this, &VPMainWindow::on_actionPreferences_triggered);
+    }
+}
+#endif //defined(Q_OS_MAC)
diff --git a/src/app/puzzle/vpmainwindow.h b/src/app/puzzle/vpmainwindow.h
new file mode 100644
index 000000000..c83ccbe9c
--- /dev/null
+++ b/src/app/puzzle/vpmainwindow.h
@@ -0,0 +1,482 @@
+/************************************************************************
+ **
+ **  @file   vpmainwindow.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   16 2, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#ifndef VPMAINWINDOW_H
+#define VPMAINWINDOW_H
+
+#include <QMainWindow>
+#include <QMessageBox>
+#include <QDoubleSpinBox>
+#include <QPointer>
+
+#include "../vmisc/def.h"
+#include "carousel/vpcarrousel.h"
+#include "scene/vpmaingraphicsview.h"
+#include "layout/vplayout.h"
+#include "layout/vppiece.h"
+#include "../vlayout/vlayoutpiece.h"
+#include "vptilefactory.h"
+#include "vpcommandline.h"
+#include "../vlayout/vlayoutdef.h"
+#include "../vwidgets/vabstractmainwindow.h"
+#include "../vmisc/vlockguard.h"
+#include "../vlayout/dialogs/vabstractlayoutdialog.h"
+
+namespace Ui
+{
+    class VPMainWindow;
+}
+
+class QFileSystemWatcher;
+template <typename T> class QSharedPointer;
+class DialogPuzzlePreferences;
+struct VPExportData;
+class WatermarkWindow;
+
+class VPMainWindow : public VAbstractMainWindow
+{
+    Q_OBJECT
+
+public:
+    explicit VPMainWindow(const VPCommandLinePtr &cmd, QWidget *parent = nullptr);
+    virtual ~VPMainWindow();
+
+    QString CurrentFile() const;
+
+    /**
+     * @brief LoadFile Loads the layout file of given path in m_layout.
+     * This function doesn't update the gui.
+     * @param path path to layout
+     * @return true if success
+     */
+    bool LoadFile(QString path);
+
+    void LayoutWasSaved(bool saved);
+    void SetCurrentFile(const QString &fileName);
+
+    /**
+     * @brief SaveLayout Saves the current layout to the layout file of given path
+     * @param path path to layout file
+     * @return true if success
+     */
+    bool SaveLayout(const QString &path, QString &error);
+
+    /**
+     * @brief ImportRawLayouts The function imports the raw layouts of given paths
+     * @param rawLayouts paths of the layouts to import
+     */
+    void ImportRawLayouts(const QStringList &rawLayouts);
+
+    /**
+     * @brief InitZoom Initialises the zoom to fit best
+     */
+    void InitZoom();
+
+    void UpdateWindowTitle();
+
+public slots:
+    /**
+     * @brief on_actionNew_triggered When the menu action File > New
+     * is triggered
+     */
+    void on_actionNew_triggered();
+
+    virtual void ShowToolTip(const QString &toolTip) override;
+
+protected:
+    virtual void closeEvent(QCloseEvent *event) override;
+    virtual void changeEvent(QEvent* event) override;
+    virtual QStringList RecentFileList() const override;
+
+private slots:
+    /**
+     * @brief on_actionOpen_triggered When the menu action File > Open is
+     * triggered.
+     * The slot is automatically connected through name convention.
+     */
+    void on_actionOpen_triggered();
+
+    /**
+     * @brief on_actionSave_triggered When the menu action File > Save is
+     * triggered.
+     * The slot is automatically connected through name convention.
+     */
+    bool on_actionSave_triggered();
+
+    /**
+     * @brief on_actionSaveAs_triggered When the menu action File > Save As
+     * is triggered.
+     * The slot is automatically connected through name convention.
+     */
+    bool on_actionSaveAs_triggered();
+
+    /**
+     * @brief on_actionImportRawLayout_triggered When the menu action
+     * File > Import Raw Layout is triggered.
+     * The slot is automatically connected through name convention.
+     */
+    void on_actionImportRawLayout_triggered();
+
+    /**
+     * @brief on_actionAboutQt_triggered When the menu action Help > About Qt
+     * is triggered.
+     * The slot is automatically connected through name convention.
+     */
+    void on_actionAboutQt_triggered();
+
+    /**
+     * @brief on_actionAboutPuzzle_triggered When the menu action Help > About Puzzle
+     * is triggered.
+     * The slot is automatically connected through name convention.
+     */
+    void on_actionAboutPuzzle_triggered();
+
+    /**
+     * @brief on_LayoutUnitChanged When the unit is changed in
+     * the layout property tab.
+     * The slot is automatically connected through name convention.
+     * @param index the index of the selected unit
+     */
+    void on_LayoutUnitChanged(int index);
+
+    /**
+     * @brief on_SheetSizeChanged When the width or the length has been changed in
+     * the sheet property tab
+     */
+    void on_SheetSizeChanged();
+
+    /**
+     * @brief on_SheetOrientationChanged When one of the radio boxes for the sheet
+     * orientation has been clicked
+     */
+    void on_SheetOrientationChanged(bool checked);
+
+    /**
+     * @brief on_SheetMarginChanged When one of the margin values has been changed
+     * in the sheet property tab.
+     */
+    void on_SheetMarginChanged();
+
+    /**
+     * @brief on_checkBoxSheetShowGrid_toggled When the checkbox "show grid" is
+     * clicked
+     * @param checked show grid
+     */
+    void on_checkBoxSheetShowGrid_toggled(bool checked);
+
+    /**
+     * @brief on_doubleSpinBoxSheetGridColWidth_valueChanged When the "grid placement
+     * column width" value is changed in the layout property tab.
+     * The slot is automatically connected through name convention.
+     * @param value the new value of the grid placement column width
+     */
+    void on_doubleSpinBoxSheetGridColWidth_valueChanged(double value);
+
+    /**
+     * @brief on_doubleSpinBoxSheetGridRowHeight_valueChanged When the "grid placement
+     * row height" value is changed in the layout property tab.
+     * The slot is automatically connected through name convention.
+     * @param value the new value of the grid placement row height
+     */
+    void on_doubleSpinBoxSheetGridRowHeight_valueChanged(double value);
+
+    /**
+     * @brief on_TilesSizeChanged When the width or the length has been changed in
+     * the tiles property tab
+     */
+    void on_TilesSizeChanged();
+
+    /**
+     * @brief on_TilesOrientationChanged When one of the radio boxes for the tiles
+     * orientation has been clicked
+     */
+    void on_TilesOrientationChanged(bool checked);
+
+    /**
+     * @brief on_TilesMarginChanged When one of the margin values has been changed
+     * in the tiles property tab.
+     */
+    void on_TilesMarginChanged();
+
+    /**
+     * @brief CarrouselLocationChanged When the piece carrousel's location
+     * has been changed
+     * @param area The new area where the piece carrousel has been placed
+     */
+    void on_CarrouselLocationChanged(Qt::DockWidgetArea area);
+
+    /**
+     * @brief on_PieceSelectionChanged When the piece selection has changed
+     */
+    void on_PieceSelectionChanged();
+
+    /**
+     * @brief on_ScaleChanged When the scale of the graphic view is changed
+     */
+    void on_ScaleChanged(qreal scale);
+
+    /**
+     * @brief mouseMove save mouse position and show user.
+     * @param scenePos position mouse.
+     */
+    void on_MouseMoved(const QPointF &scenePos);
+
+    void on_actionPreferences_triggered();
+
+    void ShowWindow() const;
+
+    void ToolBarStyles();
+
+    void on_actionAddSheet_triggered();
+
+    void on_ApplyPieceTransformation();
+
+    void on_ResetPieceTransformationSettings();
+
+    void on_RelativeTranslationChanged(bool checked);
+
+    void on_ConvertPaperSize();
+
+    void on_ExportLayout();
+    void on_ExportSheet();
+
+    void on_actionPrintLayout_triggered();
+    void on_actionPrintPreviewLayout_triggered();
+    void on_actionPrintTiledLayout_triggered();
+    void on_actionPrintPreviewTiledLayout_triggered();
+
+    void on_printLayoutSheets(QPrinter *printer);
+    void on_printLayoutTiledPages(QPrinter *printer);
+
+    void on_actionPrintSheet_triggered();
+    void on_actionPrintPreviewSheet_triggered();
+    void on_actionPrintTiledSheet_triggered();
+    void on_actionPrintPreviewTiledSheet_triggered();
+
+    void on_printLayoutSheet(QPrinter *printer);
+    void on_printLayoutSheetTiledPages(QPrinter *printer);
+
+    void CreateWatermark();
+    void EditCurrentWatermark();
+    void LoadWatermark();
+    void RemoveWatermark();
+
+#if defined(Q_OS_MAC)
+    void AboutToShowDockMenu();
+#endif //defined(Q_OS_MAC)
+
+private:
+    Q_DISABLE_COPY(VPMainWindow)
+    Ui::VPMainWindow *ui;
+
+    VPCarrousel *m_carrousel{nullptr};
+    VPMainGraphicsView *m_graphicsView{nullptr};
+
+    VPCommandLinePtr m_cmd;
+
+    QUndoStack *m_undoStack;
+
+    VPLayoutPtr m_layout;
+
+    /**
+     * @brief spin box with the scale factor of the graphic view
+     */
+    QPointer<QDoubleSpinBox> m_doubleSpinBoxScale{nullptr};
+
+    /**
+     * @brief mouseCoordinate pointer to label who show mouse coordinate.
+     */
+    QLabel* m_mouseCoordinate{nullptr};
+
+    QLabel* m_statusLabel{nullptr};
+
+    QString curFile{};
+
+    bool isInitialized{false};
+
+    QSharedPointer<VLockGuard<char>> lock{nullptr};
+
+    QFileSystemWatcher *m_layoutWatcher;
+
+    QAction *undoAction{nullptr};
+    QAction *redoAction{nullptr};
+
+    Unit m_oldPieceTranslationUnit{Unit::Mm};
+    Unit m_oldLayoutUnit{Unit::Mm};
+
+    bool m_scaleConnected{true};
+
+    QList<QPointer<WatermarkWindow>> m_watermarkEditors{};
+
+    QFileSystemWatcher *m_watermarkWatcher{nullptr};
+
+    /**
+     * @brief InitMenuBar Inits the menu bar (File, Edit, Help ...)
+     */
+    void SetupMenu();
+
+    /**
+     * @brief InitProperties Init the properties
+     */
+    void InitProperties();
+
+    /**
+     * @brief InitPropertyTabCurrentPiece Inits the current piece tab in the properties
+     */
+    void InitPropertyTabCurrentPiece();
+
+    /**
+     * @brief InitPropertyTabCurrentSheet Inits the current sheet tab in the properties;
+     */
+    void InitPropertyTabCurrentSheet();
+
+    /**
+     * @brief InitPropertyTabLayout Inits the layout tab in the properties
+     */
+    void InitPropertyTabLayout();
+
+    /**
+     * @brief InitPropertyTabTiles Inits the tiles tab in the properties
+     */
+    void InitPropertyTabTiles();
+
+    /**
+     * @brief InitCarrousel Inits the carrousel
+     */
+    void InitCarrousel();
+
+    /**
+     * @brief InitMainGraphics Initialises the puzzle main graphics
+     */
+    void InitMainGraphics();
+
+    /**
+     * @brief InitToolBar Initialises the tool bar
+     */
+    void InitZoomToolBar();
+
+    /**
+     * @brief InitScaleToolBar Initialises the scale tool bar
+     */
+    void InitScaleToolBar();
+
+    /**
+     * @brief SetPropertiesData Sets the values of UI elements
+     * in all the property tabs to the values saved in m_layout
+     */
+    void SetPropertiesData();
+
+    /**
+     * @brief SetPropertyTabCurrentPieceData Sets the values of UI elements
+     * in the Current Piece Tab to the values saved in m_layout
+     */
+    void SetPropertyTabCurrentPieceData();
+
+    /**
+     * @brief SetPropertyTabSheetData Sets the values of UI elements
+     * in the Sheet Tab to the values saved in focused sheet
+     */
+    void SetPropertyTabSheetData();
+
+    /**
+     * @brief SetPropertyTabTilesData Sets the values of UI elements
+     * in the Tiles Tab to the values saved in m_layout
+     */
+    void SetPropertyTabTilesData();
+
+    /**
+    * @brief SetPropertyTabLayoutData Sets the values of UI elements
+    * in the Layout Tab to the values saved in m_layout
+    */
+    void SetPropertyTabLayoutData();
+
+    void ReadSettings();
+    void WriteSettings();
+
+    auto MaybeSave() -> bool;
+
+    void CreateWindowMenu(QMenu *menu);
+
+    auto IsLayoutReadOnly() const -> bool;
+
+    void ConnectToPreferences(const QSharedPointer<DialogPuzzlePreferences> &preferences);
+
+    auto SelectedPieces() const -> QList<VPPiecePtr>;
+
+    auto TranslateUnit() const -> Unit;
+    auto LayoutUnit() const -> Unit;
+
+    QSizeF Template(VAbstractLayoutDialog::PaperSizeTemplate t) const;
+    QSizeF SheetTemplate() const;
+    QSizeF TileTemplate() const;
+
+    void SheetSize(const QSizeF &size);
+    void TileSize(const QSizeF &size);
+
+    void CorrectPaperDecimals();
+
+    void SheetPaperSizeChanged();
+    void TilePaperSizeChanged();
+
+    void MinimumSheetPaperSize();
+    void MinimumTilePaperSize();
+
+    void FindTemplate(QComboBox *box, qreal width, qreal height);
+    void FindSheetTemplate();
+    void FindTileTemplate();
+
+    void CorrectTileMaxMargins();
+    void CorrectSheetMaxMargins();
+    void CorrectMaxMargins();
+
+    void RotatePiecesToGrainline();
+
+    void ExportData(const VPExportData &data);
+    void ExportApparelLayout(const VPExportData &data, const QVector<VLayoutPiece> &details, const QString &name,
+                             const QSize &size) const;
+    void ExportFlatLayout(const VPExportData &data);
+    void ExportScene(const VPExportData &data);
+    void ExportUnifiedPdfFile(const VPExportData &data);
+    void GenerateUnifiedPdfFile(const VPExportData &data, const QString &name);
+    void ExportPdfTiledFile(const VPExportData &data);
+    void GeneratePdfTiledFile(const VPSheetPtr &sheet, bool showTilesScheme, QPainter *painter,
+                              const QSharedPointer<QPrinter> &printer, bool &firstPage);
+
+    void UpdateScaleConnection() const;
+
+    void OpenWatermark(const QString &path = QString());
+    void CleanWaterkmarkEditors();
+
+    void DrawTilesScheme(QPrinter *printer, QPainter *painter, const VPSheetPtr &sheet, bool &firstPage);
+
+    auto AskLayoutIsInvalid(const QList<VPSheetPtr> &sheets) -> bool;
+
+    void PrintLayoutSheets(QPrinter *printer, const QList<VPSheetPtr> &sheets);
+    void PrintLayoutTiledSheets(QPrinter *printer, const QList<VPSheetPtr> &sheets);
+};
+
+#endif // VPMAINWINDOW_H
diff --git a/src/app/puzzle/vpmainwindow.ui b/src/app/puzzle/vpmainwindow.ui
new file mode 100644
index 000000000..9e4dc5a5a
--- /dev/null
+++ b/src/app/puzzle/vpmainwindow.ui
@@ -0,0 +1,2361 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>VPMainWindow</class>
+ <widget class="QMainWindow" name="VPMainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>1427</width>
+    <height>904</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Puzzle</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="share/resources/puzzleicon.qrc">
+    <normaloff>:/puzzleicon/64x64/logo.png</normaloff>:/puzzleicon/64x64/logo.png</iconset>
+  </property>
+  <property name="layoutDirection">
+   <enum>Qt::LeftToRight</enum>
+  </property>
+  <widget class="QWidget" name="centralWidget">
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
+   <property name="layoutDirection">
+    <enum>Qt::LeftToRight</enum>
+   </property>
+   <layout class="QVBoxLayout" name="verticalLayout_15">
+    <property name="sizeConstraint">
+     <enum>QLayout::SetDefaultConstraint</enum>
+    </property>
+   </layout>
+  </widget>
+  <widget class="QMenuBar" name="menuBar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>1427</width>
+     <height>22</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="menuFile">
+    <property name="title">
+     <string>&amp;File</string>
+    </property>
+    <addaction name="actionNew"/>
+    <addaction name="actionOpen"/>
+    <addaction name="actionSave"/>
+    <addaction name="actionSaveAs"/>
+    <addaction name="separator"/>
+    <addaction name="actionImportRawLayout"/>
+    <addaction name="separator"/>
+    <addaction name="actionPreferences"/>
+    <addaction name="separator"/>
+    <addaction name="actionExit"/>
+   </widget>
+   <widget class="QMenu" name="menuSheet">
+    <property name="title">
+     <string>&amp;Sheet</string>
+    </property>
+    <addaction name="separator"/>
+    <addaction name="actionAddSheet"/>
+    <addaction name="separator"/>
+    <addaction name="actionPrintSheet"/>
+    <addaction name="actionPrintPreviewSheet"/>
+    <addaction name="actionPrintTiledSheet"/>
+    <addaction name="actionPrintPreviewTiledSheet"/>
+    <addaction name="separator"/>
+    <addaction name="actionExportSheet"/>
+   </widget>
+   <widget class="QMenu" name="menuWindow">
+    <property name="title">
+     <string>&amp;Window</string>
+    </property>
+    <addaction name="separator"/>
+   </widget>
+   <widget class="QMenu" name="menuHelp">
+    <property name="title">
+     <string>&amp;Help</string>
+    </property>
+    <addaction name="actionAboutQt"/>
+    <addaction name="actionAboutPuzzle"/>
+   </widget>
+   <widget class="QMenu" name="menuLayout">
+    <property name="title">
+     <string>&amp;Layout</string>
+    </property>
+    <addaction name="actionPrintLayout"/>
+    <addaction name="actionPrintPreviewLayout"/>
+    <addaction name="actionPrintTiledLayout"/>
+    <addaction name="actionPrintPreviewTiledLayout"/>
+    <addaction name="separator"/>
+    <addaction name="actionExportLayout"/>
+   </widget>
+   <widget class="QMenu" name="menuWatermark">
+    <property name="title">
+     <string>Watermark</string>
+    </property>
+    <addaction name="actionWatermarkEditor"/>
+    <addaction name="actionEditCurrentWatermark"/>
+    <addaction name="separator"/>
+    <addaction name="actionLoadWatermark"/>
+    <addaction name="actionRemoveWatermark"/>
+   </widget>
+   <addaction name="menuFile"/>
+   <addaction name="menuLayout"/>
+   <addaction name="menuSheet"/>
+   <addaction name="menuWatermark"/>
+   <addaction name="menuWindow"/>
+   <addaction name="menuHelp"/>
+  </widget>
+  <widget class="QToolBar" name="mainToolBar">
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
+   <property name="windowTitle">
+    <string>Menu</string>
+   </property>
+   <property name="toolButtonStyle">
+    <enum>Qt::ToolButtonTextUnderIcon</enum>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionNew"/>
+   <addaction name="actionOpen"/>
+   <addaction name="actionSave"/>
+  </widget>
+  <widget class="QDockWidget" name="dockWidgetCarrousel">
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="minimumSize">
+    <size>
+     <width>30</width>
+     <height>46</height>
+    </size>
+   </property>
+   <property name="styleSheet">
+    <string notr="true"/>
+   </property>
+   <property name="features">
+    <set>QDockWidget::DockWidgetMovable</set>
+   </property>
+   <property name="allowedAreas">
+    <set>Qt::AllDockWidgetAreas</set>
+   </property>
+   <property name="windowTitle">
+    <string>Piece Carrousel</string>
+   </property>
+   <attribute name="dockWidgetArea">
+    <number>1</number>
+   </attribute>
+   <widget class="QWidget" name="widgetCarrousel">
+    <property name="sizePolicy">
+     <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+      <horstretch>0</horstretch>
+      <verstretch>0</verstretch>
+     </sizepolicy>
+    </property>
+    <property name="minimumSize">
+     <size>
+      <width>0</width>
+      <height>0</height>
+     </size>
+    </property>
+    <layout class="QVBoxLayout" name="verticalLayout_10">
+     <property name="spacing">
+      <number>0</number>
+     </property>
+    </layout>
+   </widget>
+  </widget>
+  <widget class="QDockWidget" name="dockWidgetProperties">
+   <property name="minimumSize">
+    <size>
+     <width>140</width>
+     <height>153</height>
+    </size>
+   </property>
+   <property name="features">
+    <set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable</set>
+   </property>
+   <property name="allowedAreas">
+    <set>Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea</set>
+   </property>
+   <property name="windowTitle">
+    <string>Properties</string>
+   </property>
+   <attribute name="dockWidgetArea">
+    <number>2</number>
+   </attribute>
+   <widget class="QWidget" name="dockWidgetPropertiesContents">
+    <layout class="QVBoxLayout" name="verticalLayout_13">
+     <property name="leftMargin">
+      <number>4</number>
+     </property>
+     <item>
+      <widget class="QTabWidget" name="tabWidgetProperties">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="tabShape">
+        <enum>QTabWidget::Rounded</enum>
+       </property>
+       <property name="currentIndex">
+        <number>2</number>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>32</width>
+         <height>32</height>
+        </size>
+       </property>
+       <widget class="QWidget" name="tabCurrentPieceProperty">
+        <property name="styleSheet">
+         <string notr="true"/>
+        </property>
+        <attribute name="icon">
+         <iconset resource="share/resources/puzzleicon.qrc">
+          <normaloff>:/puzzleicon/64x64/iconCurrentPiece.png</normaloff>:/puzzleicon/64x64/iconCurrentPiece.png</iconset>
+        </attribute>
+        <attribute name="title">
+         <string/>
+        </attribute>
+        <attribute name="toolTip">
+         <string>Current piece properties</string>
+        </attribute>
+        <layout class="QVBoxLayout" name="verticalLayoutCurrentPieceProperty">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QScrollArea" name="scrollAreaCurrentPiece">
+           <property name="enabled">
+            <bool>true</bool>
+           </property>
+           <property name="styleSheet">
+            <string notr="true"/>
+           </property>
+           <property name="frameShape">
+            <enum>QFrame::NoFrame</enum>
+           </property>
+           <property name="frameShadow">
+            <enum>QFrame::Plain</enum>
+           </property>
+           <property name="lineWidth">
+            <number>0</number>
+           </property>
+           <property name="widgetResizable">
+            <bool>true</bool>
+           </property>
+           <widget class="QWidget" name="scrollAreaWidgetContentsCurrentPiece">
+            <property name="geometry">
+             <rect>
+              <x>0</x>
+              <y>0</y>
+              <width>392</width>
+              <height>700</height>
+             </rect>
+            </property>
+            <layout class="QVBoxLayout" name="verticalLayout_23">
+             <item>
+              <widget class="QLabel" name="labelCurrentPiece">
+               <property name="styleSheet">
+                <string notr="true">font-weight:bold;</string>
+               </property>
+               <property name="text">
+                <string>Current piece</string>
+               </property>
+               <property name="textFormat">
+                <enum>Qt::AutoText</enum>
+               </property>
+               <property name="alignment">
+                <set>Qt::AlignCenter</set>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QWidget" name="containerCurrentPieceData" native="true">
+               <layout class="QVBoxLayout" name="containerCurrentPieceDataLayout">
+                <property name="leftMargin">
+                 <number>0</number>
+                </property>
+                <property name="topMargin">
+                 <number>0</number>
+                </property>
+                <property name="rightMargin">
+                 <number>0</number>
+                </property>
+                <property name="bottomMargin">
+                 <number>0</number>
+                </property>
+                <item>
+                 <widget class="QGroupBox" name="groupBoxCurrentPieceInfo">
+                  <property name="title">
+                   <string>Infos</string>
+                  </property>
+                  <layout class="QFormLayout" name="formLayout_4">
+                   <item row="1" column="0">
+                    <widget class="QLabel" name="labelCurrentPieceName">
+                     <property name="text">
+                      <string>Name:</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="1" column="1">
+                    <widget class="QLineEdit" name="lineEditCurrentPieceName">
+                     <property name="text">
+                      <string>DummyName</string>
+                     </property>
+                     <property name="readOnly">
+                      <bool>true</bool>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="2" column="0">
+                    <widget class="QLabel" name="labelCurrentPieceUUID">
+                     <property name="text">
+                      <string>UUID:</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="2" column="1">
+                    <widget class="QPlainTextEdit" name="plainTextEditCurrentPieceUUID">
+                     <property name="maximumSize">
+                      <size>
+                       <width>16777215</width>
+                       <height>48</height>
+                      </size>
+                     </property>
+                     <property name="readOnly">
+                      <bool>true</bool>
+                     </property>
+                     <property name="plainText">
+                      <string>{7b2ce4ae-96f5-4905-bb34-405cb40ca208}</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="3" column="0">
+                    <widget class="QLabel" name="label_4">
+                     <property name="text">
+                      <string>Gradation id:</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="3" column="1">
+                    <widget class="QLineEdit" name="lineEditCurrentPieceGradationId">
+                     <property name="readOnly">
+                      <bool>true</bool>
+                     </property>
+                    </widget>
+                   </item>
+                  </layout>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QGroupBox" name="groupBoxPieceTransformation">
+                  <property name="sizePolicy">
+                   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                   </sizepolicy>
+                  </property>
+                  <property name="title">
+                   <string>Transformation</string>
+                  </property>
+                  <layout class="QVBoxLayout" name="verticalLayout_25">
+                   <item>
+                    <widget class="QTabWidget" name="tabWidgetPieceTransformation">
+                     <property name="currentIndex">
+                      <number>0</number>
+                     </property>
+                     <widget class="QWidget" name="tabTranslate">
+                      <attribute name="title">
+                       <string comment="Translate piece">Translate</string>
+                      </attribute>
+                      <layout class="QVBoxLayout" name="verticalLayout">
+                       <item>
+                        <widget class="QGroupBox" name="groupBoxCurrentPiecePlacement">
+                         <property name="title">
+                          <string>Placement</string>
+                         </property>
+                         <layout class="QVBoxLayout" name="verticalLayout_26">
+                          <item>
+                           <layout class="QGridLayout" name="gridLayout">
+                            <item row="0" column="0">
+                             <widget class="QLabel" name="labelCurrentPieceTranslateX">
+                              <property name="text">
+                               <string>Horizontal:</string>
+                              </property>
+                             </widget>
+                            </item>
+                            <item row="0" column="1">
+                             <widget class="QDoubleSpinBox" name="doubleSpinBoxCurrentPieceBoxPositionX">
+                              <property name="minimum">
+                               <double>-10000.000000000000000</double>
+                              </property>
+                              <property name="maximum">
+                               <double>10000.000000000000000</double>
+                              </property>
+                              <property name="singleStep">
+                               <double>0.100000000000000</double>
+                              </property>
+                             </widget>
+                            </item>
+                            <item row="0" column="2">
+                             <widget class="QComboBox" name="comboBoxTranslateUnit"/>
+                            </item>
+                            <item row="1" column="0">
+                             <widget class="QLabel" name="labelCurrentPieceTranslateY">
+                              <property name="text">
+                               <string>Vertical:</string>
+                              </property>
+                             </widget>
+                            </item>
+                            <item row="1" column="1">
+                             <widget class="QDoubleSpinBox" name="doubleSpinBoxCurrentPieceBoxPositionY">
+                              <property name="minimum">
+                               <double>-10000.000000000000000</double>
+                              </property>
+                              <property name="maximum">
+                               <double>10000.000000000000000</double>
+                              </property>
+                              <property name="singleStep">
+                               <double>0.100000000000000</double>
+                              </property>
+                             </widget>
+                            </item>
+                           </layout>
+                          </item>
+                          <item>
+                           <widget class="QCheckBox" name="checkBoxRelativeTranslation">
+                            <property name="text">
+                             <string>Relative translation</string>
+                            </property>
+                            <property name="checked">
+                             <bool>true</bool>
+                            </property>
+                           </widget>
+                          </item>
+                         </layout>
+                        </widget>
+                       </item>
+                      </layout>
+                     </widget>
+                     <widget class="QWidget" name="tabRotate">
+                      <attribute name="title">
+                       <string>Rotate</string>
+                      </attribute>
+                      <layout class="QVBoxLayout" name="verticalLayout_24">
+                       <item>
+                        <widget class="QGroupBox" name="groupBoxCurrentPieceRotation">
+                         <property name="title">
+                          <string>Rotation</string>
+                         </property>
+                         <layout class="QGridLayout" name="gridLayout_2">
+                          <item row="0" column="3">
+                           <widget class="QToolButton" name="toolButtonCurrentPieceRotationClockwise">
+                            <property name="text">
+                             <string notr="true"/>
+                            </property>
+                            <property name="icon">
+                             <iconset theme="object-rotate-right">
+                              <normaloff>.</normaloff>.</iconset>
+                            </property>
+                            <property name="checkable">
+                             <bool>true</bool>
+                            </property>
+                            <attribute name="buttonGroup">
+                             <string notr="true">buttonGroupRotationDirection</string>
+                            </attribute>
+                           </widget>
+                          </item>
+                          <item row="0" column="1">
+                           <widget class="QDoubleSpinBox" name="doubleSpinBoxCurrentPieceAngle">
+                            <property name="decimals">
+                             <number>3</number>
+                            </property>
+                            <property name="minimum">
+                             <double>-360.000000000000000</double>
+                            </property>
+                            <property name="maximum">
+                             <double>360.000000000000000</double>
+                            </property>
+                            <property name="singleStep">
+                             <double>0.100000000000000</double>
+                            </property>
+                           </widget>
+                          </item>
+                          <item row="0" column="4">
+                           <spacer name="horizontalSpacer">
+                            <property name="orientation">
+                             <enum>Qt::Horizontal</enum>
+                            </property>
+                            <property name="sizeHint" stdset="0">
+                             <size>
+                              <width>40</width>
+                              <height>20</height>
+                             </size>
+                            </property>
+                           </spacer>
+                          </item>
+                          <item row="0" column="2">
+                           <widget class="QToolButton" name="toolButtonCurrentPieceRotationAnticlockwise">
+                            <property name="text">
+                             <string notr="true"/>
+                            </property>
+                            <property name="icon">
+                             <iconset theme="object-rotate-left">
+                              <normaloff>.</normaloff>.</iconset>
+                            </property>
+                            <property name="checkable">
+                             <bool>true</bool>
+                            </property>
+                            <property name="checked">
+                             <bool>true</bool>
+                            </property>
+                            <attribute name="buttonGroup">
+                             <string notr="true">buttonGroupRotationDirection</string>
+                            </attribute>
+                           </widget>
+                          </item>
+                          <item row="0" column="0">
+                           <widget class="QLabel" name="labelCurrentPieceAngle">
+                            <property name="sizePolicy">
+                             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                              <horstretch>0</horstretch>
+                              <verstretch>0</verstretch>
+                             </sizepolicy>
+                            </property>
+                            <property name="text">
+                             <string>Angle:</string>
+                            </property>
+                           </widget>
+                          </item>
+                          <item row="1" column="0">
+                           <spacer name="verticalSpacer">
+                            <property name="orientation">
+                             <enum>Qt::Vertical</enum>
+                            </property>
+                            <property name="sizeHint" stdset="0">
+                             <size>
+                              <width>20</width>
+                              <height>40</height>
+                             </size>
+                            </property>
+                           </spacer>
+                          </item>
+                         </layout>
+                        </widget>
+                       </item>
+                      </layout>
+                     </widget>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QCheckBox" name="checkBoxTransformSeparately">
+                     <property name="text">
+                      <string>Apply to each piece separately</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QDialogButtonBox" name="buttonBox">
+                     <property name="standardButtons">
+                      <set>QDialogButtonBox::Apply|QDialogButtonBox::Reset</set>
+                     </property>
+                    </widget>
+                   </item>
+                  </layout>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QGroupBox" name="groupBoxCurrentPieceSeamline">
+                  <property name="title">
+                   <string>Seamline</string>
+                  </property>
+                  <layout class="QVBoxLayout" name="verticalLayout_8">
+                   <item>
+                    <widget class="QCheckBox" name="checkBoxCurrentPieceShowSeamline">
+                     <property name="text">
+                      <string>Show Seamline</string>
+                     </property>
+                     <property name="checked">
+                      <bool>true</bool>
+                     </property>
+                    </widget>
+                   </item>
+                  </layout>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QGroupBox" name="groupBoxCurrentPieceGeometry">
+                  <property name="title">
+                   <string>Geometry</string>
+                  </property>
+                  <layout class="QVBoxLayout" name="verticalLayout_9">
+                   <item>
+                    <widget class="QCheckBox" name="checkBoxCurrentPieceMirrorPiece">
+                     <property name="text">
+                      <string>Mirror piece</string>
+                     </property>
+                    </widget>
+                   </item>
+                  </layout>
+                 </widget>
+                </item>
+               </layout>
+              </widget>
+             </item>
+             <item alignment="Qt::AlignHCenter|Qt::AlignVCenter">
+              <widget class="QLabel" name="labelCurrentPieceNoPieceSelected">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+                 <horstretch>0</horstretch>
+                 <verstretch>1</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="font">
+                <font>
+                 <pointsize>18</pointsize>
+                </font>
+               </property>
+               <property name="text">
+                <string>No piece selected</string>
+               </property>
+               <property name="alignment">
+                <set>Qt::AlignCenter</set>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <spacer name="verticalSpacerCurrentPiece">
+               <property name="orientation">
+                <enum>Qt::Vertical</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>20</width>
+                 <height>40</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+            </layout>
+           </widget>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+       <widget class="QWidget" name="tabSheetProperty">
+        <attribute name="icon">
+         <iconset resource="share/resources/puzzleicon.qrc">
+          <normaloff>:/puzzleicon/64x64/iconLayout.png</normaloff>:/puzzleicon/64x64/iconLayout.png</iconset>
+        </attribute>
+        <attribute name="title">
+         <string/>
+        </attribute>
+        <attribute name="toolTip">
+         <string>Sheet properties</string>
+        </attribute>
+        <layout class="QVBoxLayout" name="verticalLayoutSheetProperty">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QScrollArea" name="scrollAreaSheet">
+           <property name="frameShape">
+            <enum>QFrame::NoFrame</enum>
+           </property>
+           <property name="frameShadow">
+            <enum>QFrame::Plain</enum>
+           </property>
+           <property name="lineWidth">
+            <number>0</number>
+           </property>
+           <property name="widgetResizable">
+            <bool>true</bool>
+           </property>
+           <widget class="QWidget" name="scrollAreaWidgetContentsLayout">
+            <property name="geometry">
+             <rect>
+              <x>0</x>
+              <y>0</y>
+              <width>378</width>
+              <height>829</height>
+             </rect>
+            </property>
+            <layout class="QVBoxLayout" name="verticalLayout_12">
+             <item>
+              <widget class="QLabel" name="labelSheet">
+               <property name="styleSheet">
+                <string notr="true">font-weight: bold;</string>
+               </property>
+               <property name="text">
+                <string>Current sheet</string>
+               </property>
+               <property name="alignment">
+                <set>Qt::AlignCenter</set>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QGroupBox" name="groupBoxSheetInfos">
+               <property name="title">
+                <string>Infos</string>
+               </property>
+               <layout class="QVBoxLayout" name="verticalLayout_17">
+                <item>
+                 <layout class="QFormLayout" name="formLayout_8">
+                  <item row="0" column="0">
+                   <widget class="QLabel" name="labelSheetName">
+                    <property name="text">
+                     <string>Name </string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="0" column="1">
+                   <widget class="QLineEdit" name="lineEditSheetName"/>
+                  </item>
+                 </layout>
+                </item>
+               </layout>
+              </widget>
+             </item>
+             <item>
+              <widget class="QGroupBox" name="groupBoxPaperFormat">
+               <property name="autoFillBackground">
+                <bool>false</bool>
+               </property>
+               <property name="title">
+                <string>Format</string>
+               </property>
+               <property name="flat">
+                <bool>false</bool>
+               </property>
+               <property name="checkable">
+                <bool>false</bool>
+               </property>
+               <property name="checked">
+                <bool>false</bool>
+               </property>
+               <layout class="QVBoxLayout" name="verticalLayout_2">
+                <item>
+                 <layout class="QFormLayout" name="formLayout_2">
+                  <property name="fieldGrowthPolicy">
+                   <enum>QFormLayout::ExpandingFieldsGrow</enum>
+                  </property>
+                  <item row="0" column="0">
+                   <widget class="QLabel" name="labelLayoutUnit">
+                    <property name="text">
+                     <string>Unit:</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="0" column="1">
+                   <widget class="QComboBox" name="comboBoxLayoutUnit"/>
+                  </item>
+                  <item row="1" column="0">
+                   <widget class="QLabel" name="label_2">
+                    <property name="sizePolicy">
+                     <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                      <horstretch>0</horstretch>
+                      <verstretch>0</verstretch>
+                     </sizepolicy>
+                    </property>
+                    <property name="text">
+                     <string>Templates:</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="1" column="1">
+                   <widget class="QComboBox" name="comboBoxSheetTemplates"/>
+                  </item>
+                 </layout>
+                </item>
+                <item>
+                 <widget class="Line" name="line">
+                  <property name="orientation">
+                   <enum>Qt::Horizontal</enum>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <layout class="QGridLayout" name="gridLayout_3">
+                  <item row="1" column="1">
+                   <widget class="QDoubleSpinBox" name="doubleSpinBoxSheetPaperHeight">
+                    <property name="minimumSize">
+                     <size>
+                      <width>94</width>
+                      <height>0</height>
+                     </size>
+                    </property>
+                    <property name="decimals">
+                     <number>2</number>
+                    </property>
+                    <property name="maximum">
+                     <double>99999.000000000000000</double>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="0" column="1">
+                   <widget class="QDoubleSpinBox" name="doubleSpinBoxSheetPaperWidth">
+                    <property name="minimumSize">
+                     <size>
+                      <width>94</width>
+                      <height>0</height>
+                     </size>
+                    </property>
+                    <property name="decimals">
+                     <number>2</number>
+                    </property>
+                    <property name="maximum">
+                     <double>99999.990000000005239</double>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="1" column="0">
+                   <widget class="QLabel" name="labelLength">
+                    <property name="sizePolicy">
+                     <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+                      <horstretch>0</horstretch>
+                      <verstretch>0</verstretch>
+                     </sizepolicy>
+                    </property>
+                    <property name="text">
+                     <string>Length:</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="2" column="0">
+                   <layout class="QHBoxLayout" name="horizontalLayout_3">
+                    <item>
+                     <widget class="QToolButton" name="toolButtonSheetPortraitOritation">
+                      <property name="text">
+                       <string notr="true">...</string>
+                      </property>
+                      <property name="icon">
+                       <iconset resource="../../libs/vmisc/share/resources/icon.qrc">
+                        <normaloff>:/icon/16x16/portrait.png</normaloff>:/icon/16x16/portrait.png</iconset>
+                      </property>
+                      <property name="checkable">
+                       <bool>true</bool>
+                      </property>
+                      <property name="checked">
+                       <bool>true</bool>
+                      </property>
+                      <property name="autoRaise">
+                       <bool>true</bool>
+                      </property>
+                      <attribute name="buttonGroup">
+                       <string notr="true">buttonGroupSheetOrientation</string>
+                      </attribute>
+                     </widget>
+                    </item>
+                    <item>
+                     <widget class="QToolButton" name="toolButtonSheetLandscapeOrientation">
+                      <property name="text">
+                       <string notr="true">...</string>
+                      </property>
+                      <property name="icon">
+                       <iconset resource="../../libs/vmisc/share/resources/icon.qrc">
+                        <normaloff>:/icon/16x16/landscape.png</normaloff>:/icon/16x16/landscape.png</iconset>
+                      </property>
+                      <property name="checkable">
+                       <bool>true</bool>
+                      </property>
+                      <property name="checked">
+                       <bool>false</bool>
+                      </property>
+                      <property name="autoRaise">
+                       <bool>true</bool>
+                      </property>
+                      <attribute name="buttonGroup">
+                       <string notr="true">buttonGroupSheetOrientation</string>
+                      </attribute>
+                     </widget>
+                    </item>
+                   </layout>
+                  </item>
+                  <item row="0" column="0">
+                   <widget class="QLabel" name="labelWidth">
+                    <property name="sizePolicy">
+                     <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+                      <horstretch>0</horstretch>
+                      <verstretch>0</verstretch>
+                     </sizepolicy>
+                    </property>
+                    <property name="text">
+                     <string>Width:</string>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </item>
+                <item>
+                 <layout class="QHBoxLayout" name="horizontalLayout_5">
+                  <item>
+                   <widget class="QLabel" name="label_5">
+                    <property name="text">
+                     <string>Grainline orientation:</string>
+                    </property>
+                    <property name="wordWrap">
+                     <bool>true</bool>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <layout class="QHBoxLayout" name="horizontalLayout">
+                    <item>
+                     <widget class="QToolButton" name="toolButtonGrainlineHorizontalOrientation">
+                      <property name="toolTip">
+                       <string>Force the grainline orientation to always be horizontal</string>
+                      </property>
+                      <property name="text">
+                       <string notr="true">...</string>
+                      </property>
+                      <property name="icon">
+                       <iconset resource="share/resources/puzzleicon.qrc">
+                        <normaloff>:/puzzleicon/32X32/horizontal_grainline.png</normaloff>:/puzzleicon/32X32/horizontal_grainline.png</iconset>
+                      </property>
+                      <property name="iconSize">
+                       <size>
+                        <width>24</width>
+                        <height>24</height>
+                       </size>
+                      </property>
+                      <property name="checkable">
+                       <bool>true</bool>
+                      </property>
+                     </widget>
+                    </item>
+                    <item>
+                     <widget class="QToolButton" name="toolButtonGrainlineVerticalOrientation">
+                      <property name="toolTip">
+                       <string>Force the grainline orientation to always be vertical</string>
+                      </property>
+                      <property name="text">
+                       <string notr="true">...</string>
+                      </property>
+                      <property name="icon">
+                       <iconset resource="share/resources/puzzleicon.qrc">
+                        <normaloff>:/puzzleicon/32X32/vertical_grainline.png</normaloff>:/puzzleicon/32X32/vertical_grainline.png</iconset>
+                      </property>
+                      <property name="iconSize">
+                       <size>
+                        <width>24</width>
+                        <height>24</height>
+                       </size>
+                      </property>
+                      <property name="checkable">
+                       <bool>true</bool>
+                      </property>
+                     </widget>
+                    </item>
+                    <item>
+                     <spacer name="horizontalSpacer_2">
+                      <property name="orientation">
+                       <enum>Qt::Horizontal</enum>
+                      </property>
+                      <property name="sizeHint" stdset="0">
+                       <size>
+                        <width>40</width>
+                        <height>20</height>
+                       </size>
+                      </property>
+                     </spacer>
+                    </item>
+                   </layout>
+                  </item>
+                 </layout>
+                </item>
+                <item>
+                 <widget class="QPushButton" name="pushButtonSheetRemoveUnusedLength">
+                  <property name="text">
+                   <string>Remove unused length</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </widget>
+             </item>
+             <item>
+              <widget class="QGroupBox" name="groupBoxSheetMargin">
+               <property name="title">
+                <string>Margins</string>
+               </property>
+               <layout class="QVBoxLayout" name="verticalLayout_4">
+                <item>
+                 <layout class="QGridLayout" name="gridLayout_4">
+                  <item row="1" column="2">
+                   <widget class="QLabel" name="labelSheetMarginRight">
+                    <property name="text">
+                     <string>Right:</string>
+                    </property>
+                    <property name="alignment">
+                     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="0" column="2">
+                   <widget class="QDoubleSpinBox" name="doubleSpinBoxSheetMarginTop">
+                    <property name="alignment">
+                     <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+                    </property>
+                    <property name="singleStep">
+                     <double>0.100000000000000</double>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="0" column="1">
+                   <widget class="QLabel" name="labelSheetMarginTop">
+                    <property name="text">
+                     <string>Top:</string>
+                    </property>
+                    <property name="alignment">
+                     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="1" column="1">
+                   <widget class="QDoubleSpinBox" name="doubleSpinBoxSheetMarginLeft">
+                    <property name="singleStep">
+                     <double>0.100000000000000</double>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="1" column="3">
+                   <widget class="QDoubleSpinBox" name="doubleSpinBoxSheetMarginRight">
+                    <property name="singleStep">
+                     <double>0.100000000000000</double>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="1" column="0">
+                   <widget class="QLabel" name="labelSheetMarginLeft">
+                    <property name="text">
+                     <string>Left:</string>
+                    </property>
+                    <property name="alignment">
+                     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="2" column="1">
+                   <widget class="QLabel" name="labelSheetMarginBottom">
+                    <property name="text">
+                     <string>Bottom:</string>
+                    </property>
+                    <property name="alignment">
+                     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="2" column="2">
+                   <widget class="QDoubleSpinBox" name="doubleSpinBoxSheetMarginBottom">
+                    <property name="singleStep">
+                     <double>0.100000000000000</double>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </item>
+                <item>
+                 <widget class="QCheckBox" name="checkBoxLayoutIgnoreFileds">
+                  <property name="sizePolicy">
+                   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                   </sizepolicy>
+                  </property>
+                  <property name="text">
+                   <string>Ignore margins</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </widget>
+             </item>
+             <item>
+              <widget class="QGroupBox" name="groupBoxSheetGrid">
+               <property name="title">
+                <string>Placement Grid</string>
+               </property>
+               <layout class="QVBoxLayout" name="verticalLayout_21">
+                <item>
+                 <layout class="QFormLayout" name="formLayout_9">
+                  <item row="0" column="0" colspan="2">
+                   <widget class="QCheckBox" name="checkBoxSheetShowGrid">
+                    <property name="layoutDirection">
+                     <enum>Qt::LeftToRight</enum>
+                    </property>
+                    <property name="text">
+                     <string>Show Grid</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="1" column="0">
+                   <widget class="QLabel" name="labelSheetGridColWidth">
+                    <property name="text">
+                     <string>Column width</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="1" column="1">
+                   <widget class="QDoubleSpinBox" name="doubleSpinBoxSheetGridColWidth">
+                    <property name="maximum">
+                     <double>1000.000000000000000</double>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="2" column="0">
+                   <widget class="QLabel" name="labelSheetGridRowHeight">
+                    <property name="text">
+                     <string>Row height</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="2" column="1">
+                   <widget class="QDoubleSpinBox" name="doubleSpinBoxSheetGridRowHeight">
+                    <property name="maximum">
+                     <double>1000.000000000000000</double>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </item>
+               </layout>
+              </widget>
+             </item>
+             <item>
+              <widget class="QGroupBox" name="groupBoxSheetExport">
+               <property name="title">
+                <string>Export</string>
+               </property>
+               <layout class="QVBoxLayout" name="verticalLayout_7">
+                <item>
+                 <widget class="QPushButton" name="pushButtonSheetExport">
+                  <property name="text">
+                   <string>Export Sheet</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </widget>
+             </item>
+             <item>
+              <spacer name="verticalSpacerSheet">
+               <property name="orientation">
+                <enum>Qt::Vertical</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>20</width>
+                 <height>40</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+            </layout>
+           </widget>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+       <widget class="QWidget" name="tabTilesProperty">
+        <attribute name="icon">
+         <iconset resource="share/resources/puzzleicon.qrc">
+          <normaloff>:/puzzleicon/64x64/iconTiles.png</normaloff>:/puzzleicon/64x64/iconTiles.png</iconset>
+        </attribute>
+        <attribute name="title">
+         <string/>
+        </attribute>
+        <attribute name="toolTip">
+         <string>Tiles properties</string>
+        </attribute>
+        <layout class="QVBoxLayout" name="verticalLayoutTilesProperty">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QScrollArea" name="scrollAreaTiles">
+           <property name="frameShape">
+            <enum>QFrame::NoFrame</enum>
+           </property>
+           <property name="frameShadow">
+            <enum>QFrame::Plain</enum>
+           </property>
+           <property name="lineWidth">
+            <number>0</number>
+           </property>
+           <property name="widgetResizable">
+            <bool>true</bool>
+           </property>
+           <widget class="QWidget" name="scrollAreaWidgetContentsTiles">
+            <property name="geometry">
+             <rect>
+              <x>0</x>
+              <y>0</y>
+              <width>392</width>
+              <height>700</height>
+             </rect>
+            </property>
+            <layout class="QVBoxLayout" name="verticalLayout_5">
+             <item>
+              <widget class="QLabel" name="labelTiles">
+               <property name="styleSheet">
+                <string notr="true">font-weight: bold;</string>
+               </property>
+               <property name="text">
+                <string>Tiled Pdf Export</string>
+               </property>
+               <property name="alignment">
+                <set>Qt::AlignCenter</set>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QGroupBox" name="groupBoxTilePaperFormat">
+               <property name="autoFillBackground">
+                <bool>false</bool>
+               </property>
+               <property name="title">
+                <string>Format</string>
+               </property>
+               <property name="flat">
+                <bool>false</bool>
+               </property>
+               <property name="checkable">
+                <bool>false</bool>
+               </property>
+               <property name="checked">
+                <bool>false</bool>
+               </property>
+               <layout class="QVBoxLayout" name="verticalLayout_3">
+                <item>
+                 <layout class="QFormLayout" name="formLayout_10">
+                  <property name="fieldGrowthPolicy">
+                   <enum>QFormLayout::ExpandingFieldsGrow</enum>
+                  </property>
+                  <item row="0" column="0">
+                   <widget class="QLabel" name="label_3">
+                    <property name="sizePolicy">
+                     <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                      <horstretch>0</horstretch>
+                      <verstretch>0</verstretch>
+                     </sizepolicy>
+                    </property>
+                    <property name="text">
+                     <string>Templates:</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="0" column="1">
+                   <widget class="QComboBox" name="comboBoxTileTemplates"/>
+                  </item>
+                 </layout>
+                </item>
+                <item>
+                 <widget class="Line" name="line_2">
+                  <property name="orientation">
+                   <enum>Qt::Horizontal</enum>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <layout class="QGridLayout" name="gridLayout_5">
+                  <item row="2" column="0">
+                   <layout class="QHBoxLayout" name="horizontalLayout_4">
+                    <item>
+                     <widget class="QToolButton" name="toolButtonTilePortraitOrientation">
+                      <property name="text">
+                       <string notr="true">...</string>
+                      </property>
+                      <property name="icon">
+                       <iconset resource="../../libs/vmisc/share/resources/icon.qrc">
+                        <normaloff>:/icon/16x16/portrait.png</normaloff>:/icon/16x16/portrait.png</iconset>
+                      </property>
+                      <property name="checkable">
+                       <bool>true</bool>
+                      </property>
+                      <property name="checked">
+                       <bool>true</bool>
+                      </property>
+                      <property name="autoRaise">
+                       <bool>true</bool>
+                      </property>
+                      <attribute name="buttonGroup">
+                       <string notr="true">buttonGroupTileOrientation</string>
+                      </attribute>
+                     </widget>
+                    </item>
+                    <item>
+                     <widget class="QToolButton" name="toolButtonTileLandscapeOrientation">
+                      <property name="text">
+                       <string notr="true">...</string>
+                      </property>
+                      <property name="icon">
+                       <iconset resource="../../libs/vmisc/share/resources/icon.qrc">
+                        <normaloff>:/icon/16x16/landscape.png</normaloff>:/icon/16x16/landscape.png</iconset>
+                      </property>
+                      <property name="checkable">
+                       <bool>true</bool>
+                      </property>
+                      <property name="checked">
+                       <bool>false</bool>
+                      </property>
+                      <property name="autoRaise">
+                       <bool>true</bool>
+                      </property>
+                      <attribute name="buttonGroup">
+                       <string notr="true">buttonGroupTileOrientation</string>
+                      </attribute>
+                     </widget>
+                    </item>
+                   </layout>
+                  </item>
+                  <item row="0" column="0">
+                   <widget class="QLabel" name="labelWidth_2">
+                    <property name="sizePolicy">
+                     <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+                      <horstretch>0</horstretch>
+                      <verstretch>0</verstretch>
+                     </sizepolicy>
+                    </property>
+                    <property name="text">
+                     <string>Width:</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="1" column="0">
+                   <widget class="QLabel" name="labelHeight_2">
+                    <property name="sizePolicy">
+                     <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+                      <horstretch>0</horstretch>
+                      <verstretch>0</verstretch>
+                     </sizepolicy>
+                    </property>
+                    <property name="text">
+                     <string>Height:</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="1" column="1">
+                   <widget class="QDoubleSpinBox" name="doubleSpinBoxTilePaperHeight">
+                    <property name="minimumSize">
+                     <size>
+                      <width>94</width>
+                      <height>0</height>
+                     </size>
+                    </property>
+                    <property name="decimals">
+                     <number>2</number>
+                    </property>
+                    <property name="maximum">
+                     <double>99999.000000000000000</double>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="0" column="1">
+                   <widget class="QDoubleSpinBox" name="doubleSpinBoxTilePaperWidth">
+                    <property name="minimumSize">
+                     <size>
+                      <width>94</width>
+                      <height>0</height>
+                     </size>
+                    </property>
+                    <property name="decimals">
+                     <number>2</number>
+                    </property>
+                    <property name="maximum">
+                     <double>99999.990000000005239</double>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </item>
+               </layout>
+              </widget>
+             </item>
+             <item>
+              <widget class="QGroupBox" name="groupBoxTileMargins">
+               <property name="title">
+                <string>Margins</string>
+               </property>
+               <layout class="QVBoxLayout" name="verticalLayout_6">
+                <item>
+                 <layout class="QGridLayout" name="gridLayout_6">
+                  <item row="1" column="2">
+                   <widget class="QLabel" name="labelSheetMarginRight_2">
+                    <property name="text">
+                     <string>Right:</string>
+                    </property>
+                    <property name="alignment">
+                     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="0" column="2">
+                   <widget class="QDoubleSpinBox" name="doubleSpinBoxTileMarginTop">
+                    <property name="alignment">
+                     <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+                    </property>
+                    <property name="singleStep">
+                     <double>0.100000000000000</double>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="0" column="1">
+                   <widget class="QLabel" name="labelSheetMarginTop_2">
+                    <property name="text">
+                     <string>Top:</string>
+                    </property>
+                    <property name="alignment">
+                     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="1" column="1">
+                   <widget class="QDoubleSpinBox" name="doubleSpinBoxTileMarginLeft">
+                    <property name="singleStep">
+                     <double>0.100000000000000</double>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="1" column="3">
+                   <widget class="QDoubleSpinBox" name="doubleSpinBoxTileMarginRight">
+                    <property name="singleStep">
+                     <double>0.100000000000000</double>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="1" column="0">
+                   <widget class="QLabel" name="labelSheetMarginLeft_2">
+                    <property name="text">
+                     <string>Left:</string>
+                    </property>
+                    <property name="alignment">
+                     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="2" column="1">
+                   <widget class="QLabel" name="labelSheetMarginBottom_2">
+                    <property name="text">
+                     <string>Bottom:</string>
+                    </property>
+                    <property name="alignment">
+                     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="2" column="2">
+                   <widget class="QDoubleSpinBox" name="doubleSpinBoxTileMarginBottom">
+                    <property name="singleStep">
+                     <double>0.100000000000000</double>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </item>
+                <item>
+                 <widget class="QCheckBox" name="checkBoxTileIgnoreFileds">
+                  <property name="sizePolicy">
+                   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                   </sizepolicy>
+                  </property>
+                  <property name="text">
+                   <string>Ignore margins</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </widget>
+             </item>
+             <item>
+              <widget class="QGroupBox" name="groupBoxTilesControl">
+               <property name="title">
+                <string>Control</string>
+               </property>
+               <layout class="QVBoxLayout" name="verticalLayout_19">
+                <item>
+                 <widget class="QCheckBox" name="checkBoxTilesShowTiles">
+                  <property name="text">
+                   <string>Show Tiles on sheet</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QCheckBox" name="checkBoxTilesShowWatermark">
+                  <property name="toolTip">
+                   <string>Show watermark preview</string>
+                  </property>
+                  <property name="text">
+                   <string>Show watermark</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QCheckBox" name="checkBoxPrintTilesScheme">
+                  <property name="text">
+                   <string>Print tiles scheme</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </widget>
+             </item>
+             <item>
+              <spacer name="verticalSpacerTiles">
+               <property name="orientation">
+                <enum>Qt::Vertical</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>20</width>
+                 <height>40</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+            </layout>
+           </widget>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+       <widget class="QWidget" name="tabLayoutProperty">
+        <attribute name="icon">
+         <iconset resource="share/resources/puzzleicon.qrc">
+          <normaloff>:/puzzleicon/64x64/iconProperties.png</normaloff>:/puzzleicon/64x64/iconProperties.png</iconset>
+        </attribute>
+        <attribute name="title">
+         <string/>
+        </attribute>
+        <attribute name="toolTip">
+         <string>Layout properties</string>
+        </attribute>
+        <layout class="QVBoxLayout" name="verticalLayoutLayoutProperty">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QScrollArea" name="scrollAreaLayout">
+           <property name="frameShape">
+            <enum>QFrame::NoFrame</enum>
+           </property>
+           <property name="frameShadow">
+            <enum>QFrame::Plain</enum>
+           </property>
+           <property name="lineWidth">
+            <number>0</number>
+           </property>
+           <property name="widgetResizable">
+            <bool>true</bool>
+           </property>
+           <widget class="QWidget" name="scrollAreaWidgetContents">
+            <property name="geometry">
+             <rect>
+              <x>0</x>
+              <y>0</y>
+              <width>392</width>
+              <height>700</height>
+             </rect>
+            </property>
+            <layout class="QVBoxLayout" name="verticalLayout_27">
+             <item>
+              <widget class="QLabel" name="labelLayout">
+               <property name="styleSheet">
+                <string notr="true">font-weight: bold;</string>
+               </property>
+               <property name="text">
+                <string>Layout</string>
+               </property>
+               <property name="alignment">
+                <set>Qt::AlignCenter</set>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QGroupBox" name="groupBoxLayoutInfos">
+               <property name="title">
+                <string>Infos</string>
+               </property>
+               <layout class="QVBoxLayout" name="verticalLayout_16">
+                <item>
+                 <layout class="QFormLayout" name="formLayout_7">
+                  <item row="0" column="0">
+                   <widget class="QLabel" name="labelLayoutName">
+                    <property name="text">
+                     <string>Name:</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="0" column="1">
+                   <widget class="QLineEdit" name="lineEditLayoutName">
+                    <property name="text">
+                     <string/>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </item>
+                <item>
+                 <widget class="QLabel" name="label">
+                  <property name="text">
+                   <string>Description</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QPlainTextEdit" name="plainTextEditLayoutDescription"/>
+                </item>
+               </layout>
+              </widget>
+             </item>
+             <item>
+              <widget class="QGroupBox" name="groupBoxLayoutControl">
+               <property name="title">
+                <string>Control</string>
+               </property>
+               <layout class="QVBoxLayout" name="verticalLayout_14">
+                <item>
+                 <widget class="QCheckBox" name="checkBoxLayoutWarningPiecesSuperposition">
+                  <property name="text">
+                   <string>Warning superposition of pieces</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QCheckBox" name="checkBoxLayoutWarningPiecesOutOfBound">
+                  <property name="text">
+                   <string>Warning pieces out of bound</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QCheckBox" name="checkBoxSheetStickyEdges">
+                  <property name="text">
+                   <string>Sticky edges</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QCheckBox" name="checkBoxFollowGainline">
+                  <property name="text">
+                   <string>Follow grainline</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <layout class="QHBoxLayout" name="horizontalLayout_2">
+                  <item>
+                   <widget class="QLabel" name="labelSheetPiecesGap">
+                    <property name="text">
+                     <string>Pieces gap:</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QDoubleSpinBox" name="doubleSpinBoxSheetPiecesGap"/>
+                  </item>
+                 </layout>
+                </item>
+               </layout>
+              </widget>
+             </item>
+             <item>
+              <widget class="QGroupBox" name="groupBoxLayoutScale">
+               <property name="title">
+                <string>Scale</string>
+               </property>
+               <layout class="QHBoxLayout" name="horizontalLayout_12">
+                <item>
+                 <layout class="QVBoxLayout" name="verticalLayout_11">
+                  <item>
+                   <widget class="QLabel" name="label_11">
+                    <property name="sizePolicy">
+                     <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                      <horstretch>0</horstretch>
+                      <verstretch>0</verstretch>
+                     </sizepolicy>
+                    </property>
+                    <property name="text">
+                     <string>Horizontal:</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QLabel" name="label_12">
+                    <property name="sizePolicy">
+                     <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                      <horstretch>0</horstretch>
+                      <verstretch>0</verstretch>
+                     </sizepolicy>
+                    </property>
+                    <property name="text">
+                     <string>Vertical:</string>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </item>
+                <item>
+                 <layout class="QVBoxLayout" name="verticalLayout_20">
+                  <item>
+                   <widget class="QDoubleSpinBox" name="doubleSpinBoxHorizontalScale">
+                    <property name="suffix">
+                     <string notr="true">%</string>
+                    </property>
+                    <property name="decimals">
+                     <number>1</number>
+                    </property>
+                    <property name="minimum">
+                     <double>1.000000000000000</double>
+                    </property>
+                    <property name="maximum">
+                     <double>300.000000000000000</double>
+                    </property>
+                    <property name="singleStep">
+                     <double>0.100000000000000</double>
+                    </property>
+                    <property name="value">
+                     <double>100.000000000000000</double>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QDoubleSpinBox" name="doubleSpinBoxVerticalScale">
+                    <property name="suffix">
+                     <string notr="true">%</string>
+                    </property>
+                    <property name="decimals">
+                     <number>1</number>
+                    </property>
+                    <property name="minimum">
+                     <double>1.000000000000000</double>
+                    </property>
+                    <property name="maximum">
+                     <double>300.000000000000000</double>
+                    </property>
+                    <property name="singleStep">
+                     <double>0.100000000000000</double>
+                    </property>
+                    <property name="value">
+                     <double>100.000000000000000</double>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </item>
+                <item>
+                 <layout class="QVBoxLayout" name="verticalLayout_22">
+                  <property name="spacing">
+                   <number>1</number>
+                  </property>
+                  <property name="leftMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="bottomMargin">
+                   <number>0</number>
+                  </property>
+                  <item>
+                   <widget class="QLabel" name="label_13">
+                    <property name="sizePolicy">
+                     <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                      <horstretch>0</horstretch>
+                      <verstretch>0</verstretch>
+                     </sizepolicy>
+                    </property>
+                    <property name="font">
+                     <font>
+                      <pointsize>10</pointsize>
+                     </font>
+                    </property>
+                    <property name="text">
+                     <string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:16pt;&quot;&gt;┐&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                    </property>
+                    <property name="alignment">
+                     <set>Qt::AlignCenter</set>
+                    </property>
+                   </widget>
+                  </item>
+                  <item alignment="Qt::AlignHCenter">
+                   <widget class="QToolButton" name="toolButtonScaleConnected">
+                    <property name="minimumSize">
+                     <size>
+                      <width>0</width>
+                      <height>0</height>
+                     </size>
+                    </property>
+                    <property name="text">
+                     <string notr="true">...</string>
+                    </property>
+                    <property name="icon">
+                     <iconset resource="../../libs/vmisc/share/resources/icon.qrc">
+                      <normaloff>:/icon/32x32/link.png</normaloff>:/icon/32x32/link.png</iconset>
+                    </property>
+                    <property name="iconSize">
+                     <size>
+                      <width>32</width>
+                      <height>32</height>
+                     </size>
+                    </property>
+                    <property name="popupMode">
+                     <enum>QToolButton::DelayedPopup</enum>
+                    </property>
+                   </widget>
+                  </item>
+                  <item alignment="Qt::AlignHCenter">
+                   <widget class="QLabel" name="label_14">
+                    <property name="sizePolicy">
+                     <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                      <horstretch>0</horstretch>
+                      <verstretch>0</verstretch>
+                     </sizepolicy>
+                    </property>
+                    <property name="text">
+                     <string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:16pt; font-weight:600;&quot;&gt;┘&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </item>
+                <item>
+                 <spacer name="horizontalSpacer_3">
+                  <property name="orientation">
+                   <enum>Qt::Horizontal</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>40</width>
+                    <height>20</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+               </layout>
+              </widget>
+             </item>
+             <item>
+              <widget class="QGroupBox" name="groupBoxLayoutExport">
+               <property name="title">
+                <string>Export</string>
+               </property>
+               <layout class="QVBoxLayout" name="verticalLayout_18">
+                <item>
+                 <widget class="QPushButton" name="pushButtonLayoutExport">
+                  <property name="text">
+                   <string>Export Layout</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <widget class="QToolBar" name="toolBarZoom">
+   <property name="windowTitle">
+    <string>zoom</string>
+   </property>
+   <property name="toolButtonStyle">
+    <enum>Qt::ToolButtonTextUnderIcon</enum>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionZoomIn"/>
+   <addaction name="actionZoomOut"/>
+   <addaction name="actionZoomOriginal"/>
+   <addaction name="actionZoomFitBest"/>
+  </widget>
+  <widget class="QStatusBar" name="statusBar"/>
+  <widget class="QToolBar" name="toolBarScale">
+   <property name="windowTitle">
+    <string>Scale</string>
+   </property>
+   <property name="allowedAreas">
+    <set>Qt::AllToolBarAreas</set>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>BottomToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+  </widget>
+  <widget class="QToolBar" name="toolBarUndoCommands">
+   <property name="windowTitle">
+    <string>Undo commands</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+  </widget>
+  <action name="actionOpen">
+   <property name="icon">
+    <iconset theme="document-open">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Open</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+O</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::ApplicationSpecificRole</enum>
+   </property>
+  </action>
+  <action name="actionSave">
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset theme="document-save">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Save</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+S</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::ApplicationSpecificRole</enum>
+   </property>
+  </action>
+  <action name="actionSaveAs">
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset theme="document-save-as">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>Save &amp;As</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Shift+S</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::ApplicationSpecificRole</enum>
+   </property>
+  </action>
+  <action name="actionImportRawLayout">
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Import Raw Layout Data</string>
+   </property>
+  </action>
+  <action name="actionExit">
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset theme="application-exit">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>E&amp;xit</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Q</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::QuitRole</enum>
+   </property>
+  </action>
+  <action name="actionNew">
+   <property name="icon">
+    <iconset theme="document-new">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;New</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+N</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::ApplicationSpecificRole</enum>
+   </property>
+  </action>
+  <action name="actionAboutQt">
+   <property name="text">
+    <string>About &amp;Qt</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::AboutQtRole</enum>
+   </property>
+  </action>
+  <action name="actionAboutPuzzle">
+   <property name="icon">
+    <iconset theme="help-about">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>About &amp;Puzzle</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::AboutRole</enum>
+   </property>
+  </action>
+  <action name="actionProperties">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Properties</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::PreferencesRole</enum>
+   </property>
+  </action>
+  <action name="actionZoomIn">
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset theme="zoom-in">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>Zoom in</string>
+   </property>
+  </action>
+  <action name="actionZoomOut">
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset theme="zoom-out">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>Zoom out</string>
+   </property>
+  </action>
+  <action name="actionZoomOriginal">
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset theme="zoom-original">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>Zoom 1:1</string>
+   </property>
+  </action>
+  <action name="actionZoomFitBest">
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset theme="zoom-fit-best">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>Zoom fit best</string>
+   </property>
+   <property name="toolTip">
+    <string>Zoom sheet</string>
+   </property>
+  </action>
+  <action name="actionPreferences">
+   <property name="text">
+    <string>Preferences</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::PreferencesRole</enum>
+   </property>
+  </action>
+  <action name="actionAddSheet">
+   <property name="text">
+    <string>Add Sheet</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::ApplicationSpecificRole</enum>
+   </property>
+  </action>
+  <action name="actionPrintLayout">
+   <property name="icon">
+    <iconset theme="document-print">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>Print</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::ApplicationSpecificRole</enum>
+   </property>
+  </action>
+  <action name="actionPrintPreviewLayout">
+   <property name="icon">
+    <iconset theme="document-print-preview">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>Print preview</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::ApplicationSpecificRole</enum>
+   </property>
+  </action>
+  <action name="actionPrintTiledLayout">
+   <property name="icon">
+    <iconset theme="document-print">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>Print tiled</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::ApplicationSpecificRole</enum>
+   </property>
+  </action>
+  <action name="actionPrintPreviewTiledLayout">
+   <property name="icon">
+    <iconset theme="document-print-preview">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>Print preview tiled</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::ApplicationSpecificRole</enum>
+   </property>
+  </action>
+  <action name="actionExportLayout">
+   <property name="text">
+    <string>Export</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::ApplicationSpecificRole</enum>
+   </property>
+  </action>
+  <action name="actionPrintSheet">
+   <property name="icon">
+    <iconset theme="document-print">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>Print</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::ApplicationSpecificRole</enum>
+   </property>
+  </action>
+  <action name="actionPrintPreviewSheet">
+   <property name="icon">
+    <iconset theme="document-print-preview">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>Print preview</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::ApplicationSpecificRole</enum>
+   </property>
+  </action>
+  <action name="actionPrintTiledSheet">
+   <property name="icon">
+    <iconset theme="document-print">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>Print tiled</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::ApplicationSpecificRole</enum>
+   </property>
+  </action>
+  <action name="actionPrintPreviewTiledSheet">
+   <property name="icon">
+    <iconset theme="document-print-preview">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>Print preview tiled</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::ApplicationSpecificRole</enum>
+   </property>
+  </action>
+  <action name="actionExportSheet">
+   <property name="text">
+    <string>Export</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::ApplicationSpecificRole</enum>
+   </property>
+  </action>
+  <action name="actionWatermarkEditor">
+   <property name="icon">
+    <iconset theme="document-new">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>Editor</string>
+   </property>
+   <property name="toolTip">
+    <string>Create or edit a watermark</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::ApplicationSpecificRole</enum>
+   </property>
+  </action>
+  <action name="actionEditCurrentWatermark">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Edit current</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::ApplicationSpecificRole</enum>
+   </property>
+  </action>
+  <action name="actionLoadWatermark">
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset theme="document-open">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>Load</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::ApplicationSpecificRole</enum>
+   </property>
+  </action>
+  <action name="actionRemoveWatermark">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="icon">
+    <iconset theme="edit-delete">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>Remove</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::ApplicationSpecificRole</enum>
+   </property>
+  </action>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <tabstops>
+  <tabstop>scrollAreaCurrentPiece</tabstop>
+  <tabstop>scrollAreaSheet</tabstop>
+  <tabstop>scrollAreaTiles</tabstop>
+  <tabstop>lineEditCurrentPieceName</tabstop>
+  <tabstop>plainTextEditCurrentPieceUUID</tabstop>
+  <tabstop>checkBoxCurrentPieceShowSeamline</tabstop>
+  <tabstop>checkBoxCurrentPieceMirrorPiece</tabstop>
+  <tabstop>doubleSpinBoxCurrentPieceAngle</tabstop>
+  <tabstop>doubleSpinBoxCurrentPieceBoxPositionX</tabstop>
+  <tabstop>doubleSpinBoxCurrentPieceBoxPositionY</tabstop>
+  <tabstop>lineEditSheetName</tabstop>
+  <tabstop>pushButtonSheetExport</tabstop>
+  <tabstop>checkBoxTilesShowTiles</tabstop>
+  <tabstop>lineEditLayoutName</tabstop>
+  <tabstop>plainTextEditLayoutDescription</tabstop>
+  <tabstop>checkBoxLayoutWarningPiecesSuperposition</tabstop>
+  <tabstop>checkBoxLayoutWarningPiecesOutOfBound</tabstop>
+ </tabstops>
+ <resources>
+  <include location="share/resources/puzzleicon.qrc"/>
+  <include location="../../libs/vmisc/share/resources/icon.qrc"/>
+ </resources>
+ <connections/>
+ <buttongroups>
+  <buttongroup name="buttonGroupSheetOrientation"/>
+  <buttongroup name="buttonGroupRotationDirection"/>
+  <buttongroup name="buttonGroupTileOrientation"/>
+ </buttongroups>
+</ui>
diff --git a/src/app/puzzle/vpsettings.cpp b/src/app/puzzle/vpsettings.cpp
new file mode 100644
index 000000000..f7da12b33
--- /dev/null
+++ b/src/app/puzzle/vpsettings.cpp
@@ -0,0 +1,318 @@
+/************************************************************************
+ **
+ **  @file   vpsettings.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   16 2, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#include "vpsettings.h"
+
+#include <QMarginsF>
+
+namespace
+{
+Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingDockWidgetPropertiesActive, (QLatin1String("dockWidget/properties")))
+Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingDockPropertiesContentsActive, (QLatin1String("dockWidget/contents")))
+Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingLayoutUnit, (QLatin1String("layout/unit")))
+Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingLayoutSheetPaperWidth, (QLatin1String("layout/sheetPaperWidth")))
+Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingLayoutSheetPaperHeight, (QLatin1String("layout/sheetPaperHeight")))
+Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingLayoutTilePaperWidth, (QLatin1String("layout/tilePaperWidth")))
+Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingLayoutTilePaperHeight, (QLatin1String("layout/tilePaperHeight")))
+Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingLayoutSheetMargins, (QLatin1String("layout/sheetMargins")))
+Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingLayoutTileMargins, (QLatin1String("layout/tileMargins")))
+Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingLayoutSheetIgnoreMargins, (QLatin1String("layout/sheetIgnoreMargins")))
+Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingLayoutTileIgnoreMargins, (QLatin1String("layout/tileIgnoreMargins")))
+Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingLayoutTileShowTiles, (QLatin1String("layout/tileShowTiles")))
+Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingLayoutTileShowWatermark, (QLatin1String("layout/tileShowWatermark")))
+Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingLayoutWarningPiecesSuperposition,
+                          (QLatin1String("layout/warningPiecesSuperposition")))
+Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingLayoutStickyEdges, (QLatin1String("layout/stickyEdges")))
+Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingLayoutWarningPiecesOutOfBound,
+                          (QLatin1String("layout/warningPiecesOutOfBound")))
+Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingLayoutFollowGrainline, (QLatin1String("layout/followGrainline")))
+Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingLayoutPieceGap, (QLatin1String("layout/pieceGap")))
+Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingLayoutExportFormat, (QLatin1String("layout/exportFormat")))
+}  // namespace
+
+Q_DECLARE_METATYPE(QMarginsF)
+
+//---------------------------------------------------------------------------------------------------------------------
+VPSettings::VPSettings(Format format, Scope scope, const QString &organization, const QString &application,
+                                 QObject *parent)
+    : VCommonSettings(format, scope, organization, application, parent)
+{
+    qRegisterMetaTypeStreamOperators<QMarginsF>("QMarginsF");
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+VPSettings::VPSettings(const QString &fileName, QSettings::Format format, QObject *parent)
+    : VCommonSettings(fileName, format, parent)
+{
+    qRegisterMetaTypeStreamOperators<QMarginsF>("QMarginsF");
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSettings::IsDockWidgetPropertiesActive() const -> bool
+{
+    return value(*settingDockWidgetPropertiesActive, GetDefDockWidgetPropertiesActive()).toBool();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSettings::GetDefDockWidgetPropertiesActive() -> bool
+{
+    return true;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSettings::SetDockWidgetPropertiesActive(bool value)
+{
+    setValue(*settingDockWidgetPropertiesActive, value);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSettings::IsDockWidgetPropertiesContentsActive() const -> bool
+{
+    return value(*settingDockWidgetPropertiesActive, GetDefDockWidgetPropertiesActive()).toBool();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSettings::GetDefDockWidgetPropertiesContentsActive() -> bool
+{
+    return true;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSettings::SetDockWidgetPropertiesContentsActive(bool value)
+{
+    setValue(*settingDockPropertiesContentsActive, value);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSettings::SetLayoutUnit(Unit unit)
+{
+    setValue(*settingLayoutUnit, UnitsToStr(unit));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSettings::LayoutUnit() const -> Unit
+{
+    return StrToUnits(value(*settingLayoutUnit, QString()).toString());
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSettings::SetLayoutSheetPaperWidth(qreal width)
+{
+    setValue(*settingLayoutSheetPaperWidth, width);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSettings::GetLayoutSheetPaperWidth() const -> qreal
+{
+    return ValueOrDef<qreal>(*this, *settingLayoutSheetPaperWidth, UnitConvertor(841/*A0*/, Unit::Mm, Unit::Px));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSettings::SetLayoutSheetPaperHeight(qreal height)
+{
+    setValue(*settingLayoutSheetPaperHeight, height);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSettings::GetLayoutSheetPaperHeight() const -> qreal
+{
+    return ValueOrDef<qreal>(*this, *settingLayoutSheetPaperHeight, UnitConvertor(1189/*A0*/, Unit::Mm, Unit::Px));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSettings::SetLayoutTilePaperWidth(qreal width)
+{
+    setValue(*settingLayoutTilePaperWidth, width);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSettings::GetLayoutTilePaperWidth() const -> qreal
+{
+    return ValueOrDef<qreal>(*this, *settingLayoutTilePaperWidth, UnitConvertor(210/*A4*/, Unit::Mm, Unit::Px));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSettings::SetLayoutTilePaperHeight(qreal height)
+{
+    setValue(*settingLayoutTilePaperHeight, height);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSettings::GetLayoutTilePaperHeight() const -> qreal
+{
+    return ValueOrDef<qreal>(*this, *settingLayoutTilePaperHeight, UnitConvertor(297/*A4*/, Unit::Mm, Unit::Px));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSettings::SetLayoutSheetMargins(const QMarginsF &margins)
+{
+    setValue(*settingLayoutSheetMargins, QVariant::fromValue(margins));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSettings::GetLayoutSheetMargins() const -> QMarginsF
+{
+    return ValueOrDef<QMarginsF>(*this, *settingLayoutSheetMargins, QMarginsF());
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSettings::SetLayoutTileMargins(const QMarginsF &margins)
+{
+    setValue(*settingLayoutTileMargins, QVariant::fromValue(margins));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSettings::GetLayoutTileMargins() const -> QMarginsF
+{
+    return ValueOrDef<QMarginsF>(*this, *settingLayoutTileMargins, QMarginsF());
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSettings::SetLayoutSheetIgnoreMargins(bool value)
+{
+    setValue(*settingLayoutSheetIgnoreMargins, value);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSettings::GetLayoutSheetIgnoreMargins() const -> bool
+{
+    return value(*settingLayoutSheetIgnoreMargins, false).toBool();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSettings::SetLayoutTileIgnoreMargins(bool value)
+{
+    setValue(*settingLayoutTileIgnoreMargins, value);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSettings::GetLayoutTileIgnoreMargins() const -> bool
+{
+    return value(*settingLayoutTileIgnoreMargins, false).toBool();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSettings::SetLayoutTileShowTiles(bool value)
+{
+    setValue(*settingLayoutTileShowTiles, value);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSettings::GetLayoutTileShowTiles() const -> bool
+{
+    return value(*settingLayoutTileShowTiles, true).toBool();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSettings::SetLayoutTileShowWatermark(bool value)
+{
+    setValue(*settingLayoutTileShowWatermark, value);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSettings::GetLayoutTileShowWatermark() const -> bool
+{
+    return value(*settingLayoutTileShowWatermark, false).toBool();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSettings::SetLayoutWarningPiecesSuperposition(bool value)
+{
+    setValue(*settingLayoutWarningPiecesSuperposition, value);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSettings::GetLayoutWarningPiecesSuperposition() const -> bool
+{
+    return value(*settingLayoutWarningPiecesSuperposition, true).toBool();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSettings::SetLayoutStickyEdges(bool value)
+{
+    setValue(*settingLayoutStickyEdges, value);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSettings::GetLayoutStickyEdges() const -> bool
+{
+    return value(*settingLayoutStickyEdges, true).toBool();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSettings::SetLayoutWarningPiecesOutOfBound(bool value)
+{
+    setValue(*settingLayoutWarningPiecesOutOfBound, value);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSettings::GetLayoutWarningPiecesOutOfBound() const -> bool
+{
+    return value(*settingLayoutWarningPiecesOutOfBound, true).toBool();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSettings::SetLayoutFollowGrainline(bool value)
+{
+    setValue(*settingLayoutFollowGrainline, value);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSettings::GetLayoutFollowGrainline() const -> bool
+{
+    return value(*settingLayoutFollowGrainline, false).toBool();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+qreal VPSettings::GetMaxLayoutPieceGap()
+{
+    return UnitConvertor(50, Unit::Cm, Unit::Px);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSettings::SetLayoutPieceGap(qreal value)
+{
+    setValue(*settingLayoutPieceGap, value);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPSettings::GetLayoutPieceGap() const -> qreal
+{
+    return ValueOrDef<qreal>(*this, *settingLayoutPieceGap, UnitConvertor(5, Unit::Mm, Unit::Px));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+qint8 VPSettings::GetLayoutExportFormat() const
+{
+    return qvariant_cast<qint8>(value(*settingLayoutExportFormat, 0));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPSettings::SetLayoutExportFormat(qint8 format)
+{
+    setValue(*settingLayoutExportFormat, format);
+}
diff --git a/src/app/puzzle/vpsettings.h b/src/app/puzzle/vpsettings.h
new file mode 100644
index 000000000..032f86a7f
--- /dev/null
+++ b/src/app/puzzle/vpsettings.h
@@ -0,0 +1,107 @@
+/************************************************************************
+ **
+ **  @file   vpsettings.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   16 2, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#ifndef VPSETTINGS_H
+#define VPSETTINGS_H
+
+#include <QByteArray>
+
+#include "vcommonsettings.h"
+
+class VPSettings : public VCommonSettings
+{
+    Q_OBJECT
+public:
+    VPSettings(Format format, Scope scope, const QString &organization, const QString &application = QString(),
+                    QObject *parent = nullptr);
+    VPSettings(const QString &fileName, Format format, QObject *parent = nullptr);
+
+    auto IsDockWidgetPropertiesActive() const -> bool;
+    static auto GetDefDockWidgetPropertiesActive() -> bool;
+    void SetDockWidgetPropertiesActive(bool value);
+
+    auto IsDockWidgetPropertiesContentsActive() const -> bool;
+    static auto GetDefDockWidgetPropertiesContentsActive() -> bool;
+    void SetDockWidgetPropertiesContentsActive(bool value);
+
+    void SetLayoutUnit(Unit unit);
+    auto LayoutUnit() const -> Unit;
+
+    void SetLayoutSheetPaperWidth(qreal width);
+    auto GetLayoutSheetPaperWidth() const -> qreal;
+
+    void SetLayoutSheetPaperHeight(qreal height);
+    auto GetLayoutSheetPaperHeight() const -> qreal;
+
+    void SetLayoutTilePaperWidth(qreal width);
+    auto GetLayoutTilePaperWidth() const -> qreal;
+
+    void SetLayoutTilePaperHeight(qreal height);
+    auto GetLayoutTilePaperHeight() const -> qreal;
+
+    void SetLayoutSheetMargins(const QMarginsF &margins);
+    auto GetLayoutSheetMargins() const -> QMarginsF;
+
+    void SetLayoutTileMargins(const QMarginsF &margins);
+    auto GetLayoutTileMargins() const -> QMarginsF;
+
+    void SetLayoutSheetIgnoreMargins(bool value);
+    auto GetLayoutSheetIgnoreMargins() const -> bool;
+
+    void SetLayoutTileIgnoreMargins(bool value);
+    auto GetLayoutTileIgnoreMargins() const -> bool;
+
+    void SetLayoutTileShowTiles(bool value);
+    auto GetLayoutTileShowTiles() const -> bool;
+
+    void SetLayoutTileShowWatermark(bool value);
+    auto GetLayoutTileShowWatermark() const -> bool;
+
+    void SetLayoutWarningPiecesSuperposition(bool value);
+    auto GetLayoutWarningPiecesSuperposition() const -> bool;
+
+    void SetLayoutStickyEdges(bool value);
+    auto GetLayoutStickyEdges() const -> bool;
+
+    void SetLayoutWarningPiecesOutOfBound(bool value);
+    auto GetLayoutWarningPiecesOutOfBound() const -> bool;
+
+    void SetLayoutFollowGrainline(bool value);
+    auto GetLayoutFollowGrainline() const -> bool;
+
+    static auto GetMaxLayoutPieceGap() -> qreal;
+    void SetLayoutPieceGap(qreal value);
+    auto GetLayoutPieceGap() const -> qreal;
+
+    auto GetLayoutExportFormat() const -> qint8;
+    void SetLayoutExportFormat(qint8 format);
+
+private:
+    Q_DISABLE_COPY(VPSettings)
+};
+
+#endif // VPSETTINGS_H
diff --git a/src/app/puzzle/vptilefactory.cpp b/src/app/puzzle/vptilefactory.cpp
new file mode 100644
index 000000000..7de5e03f3
--- /dev/null
+++ b/src/app/puzzle/vptilefactory.cpp
@@ -0,0 +1,631 @@
+#include "vptilefactory.h"
+
+#include <QtSvg>
+
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "layout/vpsheet.h"
+#include "scene/vpmaingraphicsview.h"
+#include "../vmisc/def.h"
+#include "../vmisc/vcommonsettings.h"
+#include "../vlayout/vprintlayout.h"
+
+namespace
+{
+const QColor tileColor(180, 180, 180);
+
+//---------------------------------------------------------------------------------------------------------------------
+auto Grayscale(QImage image) -> QImage
+{
+    for (int ii = 0; ii < image.height(); ii++)
+    {
+        uchar* scan = image.scanLine(ii);
+        int depth = 4;
+        for (int jj = 0; jj < image.width(); jj++)
+        {
+            QRgb* rgbpixel = reinterpret_cast<QRgb*>(scan + jj * depth);
+            int gray = qGray(*rgbpixel);
+            *rgbpixel = QColor(gray, gray, gray, qAlpha(*rgbpixel)).rgba();
+        }
+    }
+
+    return image;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto WatermarkImageFromCache(const VWatermarkData &watermarkData, const QString &watermarkPath, qreal xScale,
+                             qreal yScale, QString &error) -> QPixmap
+{
+    const qreal opacity = watermarkData.opacity/100.;
+    QPixmap pixmap;
+    QString imagePath = AbsoluteMPath(watermarkPath, watermarkData.path);
+    QString imageCacheKey = QString("puzzle=path%1+opacity%2+rotation%3+grayscale%4+xscale%5+yxcale%6")
+            .arg(imagePath, QString::number(opacity), QString::number(watermarkData.imageRotation),
+                 watermarkData.grayscale ? trueStr : falseStr ).arg(xScale).arg(yScale);
+
+    if (not QPixmapCache::find(imageCacheKey, &pixmap))
+    {
+        QImageReader imageReader(imagePath);
+        QImage watermark = imageReader.read();
+        if (watermark.isNull())
+        {
+            error = imageReader.errorString();
+            return pixmap;
+        }
+
+        if (watermarkData.grayscale)
+        {
+            watermark = Grayscale(watermark);
+        }
+
+        // Workaround for QGraphicsPixmapItem opacity problem.
+        // Opacity applied only if use a cached pixmap and only after first draw. First image always has opacity 1.
+        // Preparing an image manually allows to avoid the problem.
+        QSize scaledSize(qRound(watermark.width() * xScale), qRound(watermark.height() * yScale));
+        QImage tmp(scaledSize, watermark.format());
+        tmp = tmp.convertToFormat(QImage::Format_ARGB32);
+        tmp.fill(Qt::transparent);
+
+        QPainter p(&tmp);
+        p.setOpacity(opacity);
+
+        QTransform t;
+        t.translate(tmp.width()/2., tmp.height()/2.);
+        t.rotate(-watermarkData.imageRotation);
+        t.translate(-tmp.width()/2., -tmp.height()/2.);
+        p.setTransform(t);
+
+        p.drawImage(QRectF(QPointF(), scaledSize), watermark);
+
+        pixmap = QPixmap::fromImage(tmp);
+
+        QPixmapCache::insert(imageCacheKey, pixmap);
+    }
+    return pixmap;
+}
+}  // namespace
+
+//---------------------------------------------------------------------------------------------------------------------
+VPTileFactory::VPTileFactory(const VPLayoutPtr &layout, VCommonSettings *commonSettings):
+    m_layout(layout),
+    m_commonSettings(commonSettings)
+{
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPTileFactory::refreshTileInfos()
+{
+    VPLayoutPtr layout = m_layout.toStrongRef();
+    if(not layout.isNull())
+    {
+        QSizeF tilesSize = layout->LayoutSettings().GetTilesSize();
+        QMarginsF tilesMargins = layout->LayoutSettings().GetTilesMargins();
+
+        // sets the drawing height
+        m_drawingAreaHeight = tilesSize.height();
+
+        if (not layout->LayoutSettings().IgnoreTilesMargins())
+        {
+            m_drawingAreaHeight -= tilesMargins.top() + tilesMargins.bottom();
+        }
+
+        // sets the drawing width
+        m_drawingAreaWidth = tilesSize.width();
+
+        if (not layout->LayoutSettings().IgnoreTilesMargins())
+        {
+            m_drawingAreaWidth -= tilesMargins.left() + tilesMargins.right();
+        }
+
+        m_watermarkData = layout->WatermarkData();
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPTileFactory::drawTile(QPainter *painter, QPrinter *printer, const VPSheetPtr &sheet, int row, int col)
+{
+    SCASSERT(painter != nullptr)
+    SCASSERT(printer != nullptr)
+
+    VPLayoutPtr layout = m_layout.toStrongRef();
+    if(layout.isNull())
+    {
+        return;
+    }
+
+    if (sheet.isNull())
+    {
+        return;
+    }
+
+    QMarginsF sheetMargins;
+    if (not sheet->IgnoreMargins())
+    {
+        sheetMargins = sheet->GetSheetMargins();
+    }
+
+    const int nbCol = ColNb(sheet);
+    const int nbRow = RowNb(sheet);
+
+    if (row < 0 || row > nbRow || col < 0 || col > nbCol)
+    {
+        return;
+    }
+
+    QPen penTileInfos = QPen(tileColor, m_commonSettings->WidthHairLine(), Qt::DashLine, Qt::RoundCap,
+                             Qt::RoundJoin);
+    QPen penTileDrawing = QPen(Qt::black, m_commonSettings->WidthMainLine(), Qt::SolidLine, Qt::RoundCap,
+                               Qt::RoundJoin);
+
+    painter->setPen(penTileDrawing);
+
+    // paint the content of the page
+    qreal xScale = layout->LayoutSettings().HorizontalScale();
+    qreal yScale = layout->LayoutSettings().VerticalScale();
+    QRectF source = QRectF(sheetMargins.left() + col*(m_drawingAreaWidth - tileStripeWidth) / xScale,
+                           sheetMargins.top() + row*(m_drawingAreaHeight - tileStripeWidth) / yScale,
+                           m_drawingAreaWidth / xScale,
+                           m_drawingAreaHeight / yScale);
+
+    QRectF target = QRectF(0,
+                           0,
+                           m_drawingAreaWidth,
+                           m_drawingAreaHeight);
+    sheet->SceneData()->Scene()->render(painter, VPrintLayout::SceneTargetRect(printer, target), source,
+                                        Qt::IgnoreAspectRatio);
+
+    QScopedPointer<QSvgRenderer> svgRenderer(new QSvgRenderer());
+
+    // ------------- prepare triangles for position marks
+    QRectF rectBasic = QRectF(-UnitConvertor(0.5, Unit::Cm, Unit::Px),
+                         0,
+                         UnitConvertor(1, Unit::Cm, Unit::Px),
+                         UnitConvertor(0.5, Unit::Cm, Unit::Px)
+                         );
+    QPainterPath triangleBasic;
+    triangleBasic.moveTo(rectBasic.topLeft());
+    triangleBasic.lineTo(rectBasic.topRight());
+    triangleBasic.lineTo(rectBasic.left() + (rectBasic.width() / 2), rectBasic.bottom());
+    triangleBasic.lineTo(rectBasic.topLeft());
+
+    QBrush triangleBush = QBrush(QColor(200,200,200));
+
+    // add the tiles decorations (cutting and gluing lines, scissors, infos etc.)
+    painter->setPen(penTileInfos);
+
+    if(row > 0)
+    {
+        // add top triangle
+        QPainterPath triangleTop =
+                QTransform()
+                .translate(m_drawingAreaWidth/2, 0)
+                .map(triangleBasic);
+        painter->fillPath(triangleTop, triangleBush);
+
+        //  scissors along the top line
+        svgRenderer->load(QStringLiteral("://puzzleicon/svg/icon_scissors_horizontal.svg"));
+        svgRenderer->render(painter, QRectF(m_drawingAreaWidth - tileStripeWidth, 0,
+                                            UnitConvertor(0.95, Unit::Cm, Unit::Px),
+                                            UnitConvertor(0.56, Unit::Cm, Unit::Px)));
+
+        // dashed top line (for cutting)
+        penTileInfos.setStyle(Qt::DashLine);
+        painter->setPen(penTileInfos);
+        painter->drawLine(QPointF(), QPointF(m_drawingAreaWidth, 0));
+    }
+    else
+    {
+        // solid top line stopping at the edge
+        penTileInfos.setStyle(Qt::SolidLine);
+        painter->setPen(penTileInfos);
+
+        if(col < nbCol - 1)
+        {
+            painter->drawLine(QPointF(), QPointF(m_drawingAreaWidth, 0));
+        }
+        else
+        {
+            painter->drawLine(QPointF(), QPointF(m_drawingAreaWidth - tileStripeWidth, 0));
+        }
+    }
+
+    if(col > 0)
+    {
+        // add left triangle
+        QPainterPath triangleLeft =
+                QTransform()
+                .translate(0, m_drawingAreaHeight/2)
+                .rotate(-90)
+                .map(triangleBasic);
+        painter->fillPath(triangleLeft, triangleBush);
+
+        //  scissors along the left line
+        svgRenderer->load(QStringLiteral("://puzzleicon/svg/icon_scissors_vertical.svg"));
+        svgRenderer->render(painter, QRectF(0, m_drawingAreaHeight - tileStripeWidth,
+                                            UnitConvertor(0.56, Unit::Cm, Unit::Px),
+                                            UnitConvertor(0.95, Unit::Cm, Unit::Px)));
+
+        // dashed left line (for cutting)
+        penTileInfos.setStyle(Qt::DashLine);
+        painter->setPen(penTileInfos);
+        painter->drawLine(QPointF(), QPointF(0, m_drawingAreaHeight));
+    }
+    else
+    {
+        // solid left line at the edge
+        penTileInfos.setStyle(Qt::SolidLine);
+        painter->setPen(penTileInfos);
+
+        if(row < nbRow - 1)
+        {
+            painter->drawLine(QPointF(), QPointF(0, m_drawingAreaHeight));
+        }
+        else
+        {
+            painter->drawLine(QPointF(), QPointF(0, m_drawingAreaHeight - tileStripeWidth));
+        }
+    }
+
+    if(row < nbRow-1)
+    {
+        // add bottom triangle
+        QPainterPath triangleBottom =
+                QTransform()
+                .translate(m_drawingAreaWidth/2, m_drawingAreaHeight - tileStripeWidth)
+                .rotate(180)
+                .map(triangleBasic);
+
+        painter->fillPath(triangleBottom, triangleBush);
+
+        // dotted bottom line (for glueing)
+        penTileInfos.setStyle(Qt::DotLine);
+        painter->setPen(penTileInfos);
+        painter->drawLine(QPointF(0, m_drawingAreaHeight - tileStripeWidth),
+                          QPointF(m_drawingAreaWidth, m_drawingAreaHeight - tileStripeWidth));
+    }
+    else
+    {
+        // solid bottom line at the edge
+        penTileInfos.setStyle(Qt::SolidLine);
+        painter->setPen(penTileInfos);
+
+        if(col < nbCol - 1)
+        {
+            painter->drawLine(QPointF(0, m_drawingAreaHeight - tileStripeWidth),
+                              QPointF(m_drawingAreaWidth, m_drawingAreaHeight - tileStripeWidth));
+        }
+        else
+        {
+            painter->drawLine(QPointF(0, m_drawingAreaHeight - tileStripeWidth),
+                              QPointF(m_drawingAreaWidth - tileStripeWidth, m_drawingAreaHeight - tileStripeWidth));;
+        }
+    }
+
+    DrawRuler(painter);
+    DrawWatermark(painter);
+
+    if(col < nbCol-1)
+    {
+        // add right triangle
+        QPainterPath triangleRight =
+                QTransform()
+                .translate(m_drawingAreaWidth - tileStripeWidth, m_drawingAreaHeight/2)
+                .rotate(90)
+                .map(triangleBasic);
+        painter->fillPath(triangleRight, triangleBush);
+
+        // dotted right line (for glueing)
+        penTileInfos.setStyle(Qt::DotLine);
+        painter->setPen(penTileInfos);
+        painter->drawLine(QPointF(m_drawingAreaWidth - tileStripeWidth, 0),
+                          QPointF(m_drawingAreaWidth - tileStripeWidth, m_drawingAreaHeight));
+    }
+    else
+    {
+        // solid right line at the edge
+        penTileInfos.setStyle(Qt::SolidLine);
+        painter->setPen(penTileInfos);
+
+        if(row < nbRow - 1)
+        {
+            painter->drawLine(QPointF(m_drawingAreaWidth - tileStripeWidth, 0),
+                              QPointF(m_drawingAreaWidth - tileStripeWidth, m_drawingAreaHeight));
+        }
+        else
+        {
+            painter->drawLine(QPointF(m_drawingAreaWidth - tileStripeWidth, 0),
+                              QPointF(m_drawingAreaWidth - tileStripeWidth, m_drawingAreaHeight - tileStripeWidth));
+        }
+    }
+
+    // prepare the painting for the text information
+    QTextDocument td;
+    td.setPageSize(QSizeF(m_drawingAreaWidth - UnitConvertor(2, Unit::Cm, Unit::Px), m_drawingAreaHeight));
+
+    // paint the grid information
+    const QString grid = tr("Grid ( %1 , %2 )").arg(row+1).arg(col+1);
+    const QString tileColorStr = QString("%1,%2,%3").arg(tileColor.red()).arg(tileColor.green()).arg(tileColor.blue());
+
+    td.setHtml(QString("<table width='100%' style='color:rgb(%1);'>"
+                       "<tr>"
+                       "<td align='center'>%2</td>"
+                       "</tr>"
+                       "</table>")
+               .arg(tileColorStr, grid));
+    painter->setPen(penTileInfos);
+    painter->save();
+    painter->translate(QPointF(UnitConvertor(1, Unit::Cm, Unit::Px), m_drawingAreaHeight - tileStripeWidth/1.3));
+    td.drawContents(painter);
+    painter->restore();
+
+    // paint the page information
+    const QString page = tr("Page %1 of %2").arg(row*nbCol+col+1).arg(nbCol*nbRow);
+
+    td.setPageSize(QSizeF(m_drawingAreaHeight - UnitConvertor(2, Unit::Cm, Unit::Px), m_drawingAreaWidth));
+
+    QFontMetrics metrix = QFontMetrics(td.defaultFont());
+    QString clippedSheetName = metrix.elidedText(sheet->GetName(), Qt::ElideMiddle,
+                                                 metrix.width(QString().fill('z', 50)));
+
+    td.setHtml(QString("<table width='100%' style='color:rgb(%1);'>"
+                       "<tr>"
+                       "<td align='center'>%2 - %3</td>"
+                       "</tr>"
+                       "</table>")
+               .arg(tileColorStr).arg(page).arg(clippedSheetName));
+    painter->save();
+    painter->rotate(-90);
+    painter->translate(QPointF(-(m_drawingAreaHeight) + UnitConvertor(1, Unit::Cm, Unit::Px),
+                               m_drawingAreaWidth - tileStripeWidth));
+    td.drawContents(painter);
+    painter->restore();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPTileFactory::RowNb(const VPSheetPtr &sheet) const -> int
+{
+    if (sheet.isNull())
+    {
+        return 0;
+    }
+
+    qreal yScale = 1;
+    VPLayoutPtr layout = m_layout.toStrongRef();
+    if(not layout.isNull())
+    {
+        yScale = layout->LayoutSettings().VerticalScale();
+    }
+
+    QRectF sheetSize = sheet->GetMarginsRect();
+    return qCeil(sheetSize.height() * yScale / (m_drawingAreaHeight - tileStripeWidth));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPTileFactory::ColNb(const VPSheetPtr &sheet) const -> int
+{
+    if (sheet.isNull())
+    {
+        return 0;
+    }
+
+    qreal xScale = 1;
+    VPLayoutPtr layout = m_layout.toStrongRef();
+    if(not layout.isNull())
+    {
+        xScale = layout->LayoutSettings().HorizontalScale();
+    }
+
+    QRectF sheetSize = sheet->GetMarginsRect();
+    return qCeil(sheetSize.width() * xScale / (m_drawingAreaWidth - tileStripeWidth));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPTileFactory::DrawingAreaHeight() const -> qreal
+{
+    return m_drawingAreaHeight;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPTileFactory::DrawingAreaWidth() const -> qreal
+{
+    return m_drawingAreaWidth;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPTileFactory::WatermarkData() const -> const VWatermarkData &
+{
+    return m_watermarkData;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPTileFactory::DrawRuler(QPainter *painter)
+{
+    VPLayoutPtr layout = m_layout.toStrongRef();
+    if(layout.isNull())
+    {
+        return;
+    }
+
+    QPen rulePen(tileColor, 1, Qt::SolidLine);
+
+    painter->save();
+    painter->setPen(rulePen);
+
+    const qreal notchHeight = UnitConvertor(3, Unit::Mm, Unit::Px);
+    const qreal shortNotchHeight = UnitConvertor(1.1, Unit::Mm, Unit::Px);
+    Unit layoutUnits = layout->LayoutSettings().GetUnit();
+    const qreal step = UnitConvertor(1, layoutUnits, Unit::Px);
+    double marksCount = (m_drawingAreaWidth-tileStripeWidth) / step;
+    int i = 0;
+    while (i < marksCount)
+    {
+        if (i != 0)
+        { // don't need 0 notch
+            // middle ruler line
+            painter->drawLine(QPointF(step * i - step / 2., m_drawingAreaHeight-tileStripeWidth),
+                              QPointF(step * i - step / 2., m_drawingAreaHeight - tileStripeWidth + shortNotchHeight));
+
+            // ruler line
+            painter->drawLine(QPointF(step * i, m_drawingAreaHeight-tileStripeWidth),
+                              QPointF(step * i, m_drawingAreaHeight - tileStripeWidth + notchHeight));
+        }
+        else
+        {
+            QString units = layoutUnits == Unit::Cm || layoutUnits == Unit::Mm ? tr("cm", "unit") : tr("in", "unit");
+            QFont fnt = painter->font();
+            fnt.setPointSize(10);
+
+            qreal unitsWidth = 0;
+            QFontMetrics fm(fnt);
+        #if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
+            unitsWidth = fm.horizontalAdvance(units);
+        #else
+            unitsWidth = fm.width(units);
+        #endif
+            painter->drawText(QPointF(step*0.5-unitsWidth*0.6,
+                                      m_drawingAreaHeight - tileStripeWidth + notchHeight+shortNotchHeight), units);
+        }
+        ++i;
+    }
+
+    painter->restore();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPTileFactory::DrawWatermark(QPainter *painter)
+{
+    SCASSERT(painter != nullptr)
+
+    VPLayoutPtr layout = m_layout.toStrongRef();
+    if(layout.isNull())
+    {
+        return;
+    }
+
+    if (m_watermarkData.opacity > 0)
+    {
+        QRectF img(0, 0,
+                   m_drawingAreaWidth - tileStripeWidth,
+                   m_drawingAreaHeight - tileStripeWidth);
+
+        if (m_watermarkData.showImage && not m_watermarkData.path.isEmpty())
+        {
+            PaintWatermarkImage(painter, img, m_watermarkData,
+                                layout->LayoutSettings().WatermarkPath(),
+                                layout->LayoutSettings().HorizontalScale(),
+                                layout->LayoutSettings().VerticalScale());
+        }
+
+        if (m_watermarkData.showText && not m_watermarkData.text.isEmpty())
+        {
+            PaintWatermarkText(painter, img, m_watermarkData,
+                               layout->LayoutSettings().HorizontalScale(),
+                               layout->LayoutSettings().VerticalScale());
+        }
+    }
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPTileFactory::PaintWatermarkText(QPainter *painter, const QRectF &img, const VWatermarkData &watermarkData,
+                                       qreal xScale, qreal yScale)
+{
+    SCASSERT(painter != nullptr)
+
+    painter->save();
+
+    painter->setOpacity(watermarkData.opacity/100.);
+
+    QPen pen = painter->pen();
+    pen.setWidth(1);
+    pen.setColor(watermarkData.textColor);
+    pen.setStyle(Qt::SolidLine);
+    painter->setPen(pen);
+
+    painter->setBrush(watermarkData.textColor);
+
+    QTransform t;
+    t.translate(img.center().x(), img.center().y());
+    t.rotate(-watermarkData.textRotation);
+    t.translate(-img.center().x(), -img.center().y());
+    t.scale(xScale, yScale);
+
+    QPainterPath text;
+    text.addText(img.center(), watermarkData.font, watermarkData.text);
+
+    text = t.map(text);
+
+    QPointF center = img.center() - text.boundingRect().center();
+    t = QTransform();
+    t.translate(center.x(), center.y());
+
+    text = t.map(text);
+
+    painter->drawPath(text);
+
+    painter->restore();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPTileFactory::PaintWatermarkImage(QPainter *painter, const QRectF &img, const VWatermarkData &watermarkData,
+                         const QString &watermarkPath, qreal xScale, qreal yScale)
+{
+    SCASSERT(painter != nullptr)
+
+    auto BrokenImage = [img, watermarkData, watermarkPath]()
+    {
+        const qreal opacity = watermarkData.opacity/100.;
+        QPixmap watermark;
+        QString imagePath = QString("puzzle=path%1+opacity%2_broken")
+                .arg(AbsoluteMPath(watermarkPath, watermarkData.path), QString::number(opacity));
+
+        if (not QPixmapCache::find(imagePath, &watermark))
+        {
+            QScopedPointer<QSvgRenderer> svgRenderer(new QSvgRenderer());
+
+            QRect imageRect(0, 0, qRound(img.width()/4.), qRound(img.width()/4.));
+            watermark = QPixmap(imageRect.size());
+            watermark.fill(Qt::transparent);
+
+            QPainter imagePainter(&watermark);
+            imagePainter.setOpacity(opacity);
+
+            svgRenderer->load(QStringLiteral("://puzzleicon/svg/no_watermark_image.svg"));
+            svgRenderer->render(&imagePainter, imageRect);
+
+            QPixmapCache::insert(imagePath, watermark);
+
+            return watermark;
+        }
+
+        return watermark;
+    };
+
+    QPixmap watermark;
+    QFileInfo f(watermarkData.path);
+    if (f.suffix() == "png" || f.suffix() == "jpg" || f.suffix() == "jpeg" || f.suffix() == "bmp")
+    {
+        QString error;
+        watermark = WatermarkImageFromCache(watermarkData, watermarkPath, xScale, yScale, error);
+
+        if (watermark.isNull())
+        {
+            watermark = BrokenImage();
+        }
+    }
+    else
+    {
+        watermark = BrokenImage();
+    }
+
+    if (watermark.width() < img.width() && watermark.height() < img.height())
+    {
+        QRect imagePosition(0, 0, watermark.width(), watermark.height());
+        imagePosition.translate(img.center().toPoint() - imagePosition.center());
+
+        painter->drawPixmap(imagePosition, watermark);
+    }
+    else
+    {
+        painter->drawPixmap(img.toRect(), watermark);
+    }
+}
diff --git a/src/app/puzzle/vptilefactory.h b/src/app/puzzle/vptilefactory.h
new file mode 100644
index 000000000..55484e2a6
--- /dev/null
+++ b/src/app/puzzle/vptilefactory.h
@@ -0,0 +1,123 @@
+/************************************************************************
+ **
+ **  @file   vptilefactory.h
+ **  @author Ronan Le Tiec
+ **  @date   19 11, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+#ifndef VPTILEFACTORY_H
+#define VPTILEFACTORY_H
+
+#include <QtMath>
+#include <QObject>
+
+#include "layout/vplayout.h"
+#include "../ifc/ifcdef.h"
+
+class QGraphicsScene;
+class VCommonSettings;
+class QPainter;
+
+class VPTileFactory : QObject
+{
+    Q_OBJECT
+
+public:
+    VPTileFactory(const VPLayoutPtr &layout, VCommonSettings *commonSettings);
+
+    virtual ~VPTileFactory() = default;
+
+    /**
+     * @brief drawTile draws the tile of given coordinate (row, col) from the
+     * current sheet of the layout with the given painter
+     * @param painter pointer to painter
+     * @param row current row
+     * @param col current column
+     */
+    void drawTile(QPainter *painter, QPrinter *printer, const VPSheetPtr &sheet, int row, int col);
+
+    /**
+     * @brief refreshTileInfos Resfreshes the tile infos (m_drawingAreaHeight, m_drawingAreaWidth)
+     */
+    void refreshTileInfos();
+
+    /**
+     * @brief RowNb Returns the number of row pages
+     * @return number of row pages
+     */
+    auto RowNb(const VPSheetPtr &sheet) const -> int;
+
+    /**
+     * @brief ColNb Returns the number of col pages
+     * @return number of col pages
+     */
+    auto ColNb(const VPSheetPtr &sheet) const -> int;
+
+    /**
+     * @brief DrawingAreaHeight Returns the usable height of the tile in Px
+     * @return usable height of the tile in Px
+     */
+    auto DrawingAreaHeight() const -> qreal;
+
+    /**
+     * @brief DrawingAreaWidth Returns the usable width of the tile in Px
+     * @return usable width of the tile in Px
+     */
+    auto DrawingAreaWidth() const -> qreal;
+
+    /**
+     * @brief tileStripeWidth the width of the info / glueing stripe in Px
+     */
+    static constexpr qreal tileStripeWidth = UnitConvertor(1, Unit::Cm, Unit::Px);
+
+    auto WatermarkData() const -> const VWatermarkData &;
+
+    static void PaintWatermarkText(QPainter *painter, const QRectF &img, const VWatermarkData &watermarkData,
+                                   qreal xScale = 1.0, qreal yScale = 1.0);
+    static void PaintWatermarkImage(QPainter *painter, const QRectF &img, const VWatermarkData &watermarkData,
+                                    const QString &watermarkPath, qreal xScale = 1.0, qreal yScale = 1.0);
+
+private:
+    Q_DISABLE_COPY(VPTileFactory)
+
+    VPLayoutWeakPtr  m_layout;
+    VCommonSettings *m_commonSettings{nullptr};
+
+    /**
+     * @brief m_drawingAreaHeight the height of the drawing area
+     */
+    qreal m_drawingAreaHeight{0};
+
+    /**
+     * @brief m_drawingAreaWidth the width of the drawing area
+     */
+    qreal m_drawingAreaWidth{0};
+
+    VWatermarkData m_watermarkData{};
+
+    void DrawRuler(QPainter *painter);
+    void DrawWatermark(QPainter *painter);
+};
+
+#endif // VPTILEFACTORY_H
diff --git a/src/app/puzzle/warnings.pri b/src/app/puzzle/warnings.pri
new file mode 100644
index 000000000..da69ccfc3
--- /dev/null
+++ b/src/app/puzzle/warnings.pri
@@ -0,0 +1,85 @@
+#Turn on compilers warnings.
+unix {
+    *g++*{
+        QMAKE_CXXFLAGS += \
+            # Key -isystem disable checking errors in system headers.
+            -isystem "$${OUT_PWD}/$${UI_DIR}" \
+            -isystem "$${OUT_PWD}/$${MOC_DIR}" \
+            -isystem "$${OUT_PWD}/$${RCC_DIR}" \
+            $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
+
+        checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
+            QMAKE_CXXFLAGS += -Werror
+        }
+
+        noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer
+            # do nothing
+        } else {
+            CONFIG(debug, debug|release){
+                # Debug mode
+                #gcc’s 4.8.0 Address Sanitizer
+                #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/
+                QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer
+                QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer
+                QMAKE_LFLAGS += -fsanitize=address
+            }
+        }
+
+        gccUbsan{ # For enable run qmake with CONFIG+=gccUbsan
+            CONFIG(debug, debug|release){
+                # Debug mode
+                #gcc’s 4.9.0 Undefined Behavior Sanitizer (ubsan)
+                QMAKE_CXXFLAGS += -fsanitize=undefined
+                QMAKE_CFLAGS += -fsanitize=undefined
+                QMAKE_LFLAGS += -fsanitize=undefined
+            }
+        }
+    }
+
+    *clang*{
+        QMAKE_CXXFLAGS += \
+            # Key -isystem disable checking errors in system headers.
+            -isystem "$${OUT_PWD}/$${UI_DIR}" \
+            -isystem "$${OUT_PWD}/$${MOC_DIR}" \
+            -isystem "$${OUT_PWD}/$${RCC_DIR}" \
+            $$CLANG_DEBUG_CXXFLAGS # See common.pri for more details.
+
+        checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
+            QMAKE_CXXFLAGS += -Werror
+        }
+
+        # -isystem key works only for headers. In some cases it's not enough. But we can't delete this warnings and
+        # want them in global list. Compromise decision delete them from local list.
+        QMAKE_CXXFLAGS -= \
+            -Wundefined-reinterpret-cast \
+            -Wmissing-prototypes # rcc folder
+    }
+
+    *-icc-*{
+        QMAKE_CXXFLAGS += \
+            -isystem "$${OUT_PWD}/$${UI_DIR}" \
+            -isystem "$${OUT_PWD}/$${MOC_DIR}" \
+            -isystem "$${OUT_PWD}/$${RCC_DIR}" \
+            $$ICC_DEBUG_CXXFLAGS
+
+        checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
+            QMAKE_CXXFLAGS += -Werror
+        }
+    }
+} else { # Windows
+    *g++*{
+        QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
+
+        checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
+            QMAKE_CXXFLAGS += -Werror
+        }
+    }
+
+    *msvc*{
+        QMAKE_CXXFLAGS += $$MSVC_DEBUG_CXXFLAGS # See common.pri for more details.
+
+        checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
+            QMAKE_CXXFLAGS += -WX
+        }
+    }
+}
diff --git a/src/app/puzzle/xml/vplayoutfilereader.cpp b/src/app/puzzle/xml/vplayoutfilereader.cpp
new file mode 100644
index 000000000..9185180c7
--- /dev/null
+++ b/src/app/puzzle/xml/vplayoutfilereader.cpp
@@ -0,0 +1,1029 @@
+/************************************************************************
+ **
+ **  @file   vplayoutfilereader.cpp
+ **  @author Ronan Le Tiec
+ **  @date   18 4, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ ** *************************************************************************/
+
+#include <Qt>
+#include <QFont>
+#include <QXmlStreamAttributes>
+#include "vplayoutfilereader.h"
+#include "vplayoutfilewriter.h"
+#include "vplayoutliterals.h"
+#include "../layout/vpsheet.h"
+#include "../vlayout/vlayoutpiecepath.h"
+#include "../vlayout/vtextmanager.h"
+#include "../ifc/exception/vexception.h"
+#include "../ifc/exception/vexceptionconversionerror.h"
+
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_CLANG("-Wmissing-prototypes")
+QT_WARNING_DISABLE_INTEL(1418)
+
+Q_LOGGING_CATEGORY(MLReader, "mlReader")
+
+QT_WARNING_POP
+
+namespace
+{
+
+//---------------------------------------------------------------------------------------------------------------------
+auto StringToTransfrom(const QString &matrix) -> QTransform
+{
+    QStringList elements = matrix.split(ML::groupSep);
+    if (elements.count() == 9)
+    {
+        qreal m11 = elements.at(0).toDouble();
+        qreal m12 = elements.at(1).toDouble();
+        qreal m13 = elements.at(2).toDouble();
+        qreal m21 = elements.at(3).toDouble();
+        qreal m22 = elements.at(4).toDouble();
+        qreal m23 = elements.at(5).toDouble();
+        qreal m31 = elements.at(6).toDouble();
+        qreal m32 = elements.at(7).toDouble();
+        qreal m33 = elements.at(8).toDouble();
+        return {m11, m12, m13, m21, m22, m23, m31, m32, m33};
+    }
+
+    return {};
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto StringToPoint(const QString &point) -> QPointF
+{
+    QStringList coordinates = point.split(ML::coordintatesSep);
+    if (coordinates.count() == 2)
+    {
+        return {coordinates.at(0).toDouble(), coordinates.at(1).toDouble()};
+    }
+
+    return {};
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto StringToPath(const QString &path) -> QVector<QPointF>
+{
+    QVector<QPointF> p;
+    QStringList points = path.split(ML::pointsSep);
+    for (const auto& point : points)
+    {
+        p.append(StringToPoint(point));
+    }
+
+    return p;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto StringToGrainlineArrowDirrection(const QString &dirrection) -> GrainlineArrowDirection
+{
+    const QStringList arrows
+    {
+        ML::atFrontStr, // 0
+        ML::atRearStr,  // 1
+        ML::atBothStr   // 2
+    };
+
+    GrainlineArrowDirection arrowDirection = GrainlineArrowDirection::atBoth;
+    switch (arrows.indexOf(dirrection))
+    {
+        case 0:// at front
+            arrowDirection = GrainlineArrowDirection::atFront;
+            break;
+        case 1:// at rear
+            arrowDirection = GrainlineArrowDirection::atRear;
+            break;
+        case 2:// at both
+        default:
+            arrowDirection = GrainlineArrowDirection::atBoth;
+            break;
+    }
+    return arrowDirection;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto StringToLine(const QString &string) -> QLineF
+{
+    QStringList points = string.split(ML::groupSep);
+    if (points.count() == 2)
+    {
+        return {StringToPoint(points.at(0)), StringToPoint(points.at(1))};
+    }
+
+    return {};
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto StringToLines(const QString &string) -> QVector<QLineF>
+{
+    QStringList lines = string.split(ML::itemsSep);
+    QVector<QLineF> path;
+
+    for (const auto& line : lines)
+    {
+        QLineF l = StringToLine(line);
+        if (not l.isNull())
+        {
+            path.append(StringToLine(line));
+        }
+    }
+
+    return path;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto StringToRect(const QString &string) -> QRectF
+{
+    QStringList points = string.split(ML::groupSep);
+    if (points.count() == 4)
+    {
+        return {points.at(0).toDouble(), points.at(1).toDouble(), points.at(2).toDouble(), points.at(3).toDouble()};
+    }
+
+    return {};
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto StringToMarkerShape(const QString &string) -> PlaceLabelImg
+{
+    PlaceLabelImg shape;
+    QStringList paths = string.split(ML::itemsSep);
+    for (const auto& path : paths)
+    {
+        shape.append(StringToPath(path));
+    }
+
+    return shape;
+}
+}  // namespace
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutFileReader::ReadFile(const VPLayoutPtr &layout, QFile *file) -> bool
+{
+    setDevice(file);
+
+    try
+    {
+        if (readNextStartElement())
+        {
+            ReadLayout(layout);
+        }
+    }
+    catch(const VException &e)
+    {
+        raiseError(e.ErrorMessage());
+    }
+
+    return hasError();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileReader::ReadLayout(const VPLayoutPtr &layout)
+{
+    AssertRootTag(ML::TagLayout);
+
+    const QStringList tags
+    {
+        ML::TagProperties,     // 0
+        ML::TagUnplacedPieces, // 1
+        ML::TagSheets          // 2
+    };
+
+    while (readNextStartElement())
+    {
+        switch (tags.indexOf(name().toString()))
+        {
+            case 0: // ML::TagProperties
+                ReadProperties(layout);
+                break;
+            case 1: // ML::TagUnplacedPieces
+                ReadUnplacedPieces(layout);
+                break;
+            case 2: // ML::TagSheets
+                ReadSheets(layout);
+                break;
+            default:
+                qCDebug(MLReader, "Ignoring tag %s", qUtf8Printable(name().toString()));
+                skipCurrentElement();
+                break;
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileReader::ReadProperties(const VPLayoutPtr &layout)
+{
+    AssertRootTag(ML::TagProperties);
+
+    const QStringList tags
+    {
+        ML::TagUnit,        // 0
+        ML::TagTitle,       // 1
+        ML::TagDescription, // 2
+        ML::TagControl,     // 3
+        ML::TagTiles,       // 4
+        ML::TagScale,       // 5
+        ML::TagWatermark    // 6
+    };
+
+    while (readNextStartElement())
+    {
+        qDebug() << name().toString();
+
+        switch (tags.indexOf(name().toString()))
+        {
+            case 0:// unit
+                qDebug("read unit");
+                layout->LayoutSettings().SetUnit(StrToUnits(readElementText()));
+                break;
+            case 1:// title
+                qDebug("read title");
+                layout->LayoutSettings().SetTitle(readElementText());
+                break;
+            case 2:// description
+                qDebug("read description");
+                layout->LayoutSettings().SetDescription(readElementText());
+                break;
+            case 3: // control
+                qDebug("read control");
+                ReadControl(layout);
+                break;
+            case 4: // tiles
+                qDebug("read tiles");
+                ReadTiles(layout);
+                break;
+            case 5: // scale
+                qDebug("read scale");
+                ReadScale(layout);
+                break;
+            case 6: // watermark
+                qDebug("read watermark");
+                ReadWatermark(layout);
+                break;
+            default:
+                qCDebug(MLReader, "Ignoring tag %s", qUtf8Printable(name().toString()));
+                skipCurrentElement();
+                break;
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileReader::ReadControl(const VPLayoutPtr &layout)
+{
+    AssertRootTag(ML::TagControl);
+
+    QXmlStreamAttributes attribs = attributes();
+    layout->LayoutSettings().SetWarningSuperpositionOfPieces(
+                ReadAttributeBool(attribs, ML::AttrWarningSuperposition, trueStr));
+    layout->LayoutSettings().SetWarningPiecesOutOfBound(ReadAttributeBool(attribs, ML::AttrWarningOutOfBound, trueStr));
+    layout->LayoutSettings().SetStickyEdges(ReadAttributeBool(attribs, ML::AttrStickyEdges, trueStr));
+    layout->LayoutSettings().SetPiecesGap(qMax(ReadAttributeDouble(attribs, ML::AttrPiecesGap, QChar('0')), 0.0));
+    layout->LayoutSettings().SetFollowGrainline(ReadAttributeBool(attribs, ML::AttrFollowGrainline, falseStr));
+
+    readElementText();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileReader::ReadUnplacedPieces(const VPLayoutPtr &layout)
+{
+    AssertRootTag(ML::TagUnplacedPieces);
+
+    ReadPieces(layout);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileReader::ReadTiles(const VPLayoutPtr &layout)
+{
+    AssertRootTag(ML::TagTiles);
+
+    QXmlStreamAttributes attribs = attributes();
+    layout->LayoutSettings().SetShowTiles(ReadAttributeBool(attribs, ML::AttrVisible, falseStr));
+    layout->LayoutSettings().SetPrintTilesScheme(ReadAttributeBool(attribs, ML::AttrPrintScheme, falseStr));
+//    attribs.value(ML::AttrMatchingMarks); // TODO
+
+    const QStringList tags
+    {
+        ML::TagSize,  // 0
+        ML::TagMargin // 1
+    };
+
+    while (readNextStartElement())
+    {
+        switch (tags.indexOf(name().toString()))
+        {
+            case 0: // size
+                layout->LayoutSettings().SetTilesSize(ReadSize());
+                break;
+            case 1: // margin
+                ReadLayoutMargins(layout);
+                break;
+            default:
+                qCDebug(MLReader, "Ignoring tag %s", qUtf8Printable(name().toString()));
+                skipCurrentElement();
+                break;
+        }
+    }
+
+    readElementText();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileReader::ReadScale(const VPLayoutPtr &layout)
+{
+    AssertRootTag(ML::TagScale);
+
+    QXmlStreamAttributes attribs = attributes();
+    layout->LayoutSettings().SetHorizontalScale(ReadAttributeDouble(attribs, ML::AttrXScale, QChar('1')));
+    layout->LayoutSettings().SetVerticalScale(ReadAttributeDouble(attribs, ML::AttrYScale, QChar('1')));
+
+    readElementText();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileReader::ReadSheets(const VPLayoutPtr &layout)
+{
+    AssertRootTag(ML::TagSheets);
+
+    while (readNextStartElement())
+    {
+        if (name() == ML::TagSheet)
+        {
+            ReadSheet(layout);
+        }
+        else
+        {
+            qCDebug(MLReader, "Ignoring tag %s", qUtf8Printable(name().toString()));
+            skipCurrentElement();
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileReader::ReadSheet(const VPLayoutPtr &layout)
+{
+    AssertRootTag(ML::TagSheet);
+
+    VPSheetPtr sheet(new VPSheet(layout));
+
+    QXmlStreamAttributes attribs = attributes();
+    sheet->SetGrainlineType(StrToGrainlineType(ReadAttributeEmptyString(attribs, ML::AttrGrainlineType)));
+
+    const QStringList tags
+    {
+        ML::TagName,   // 0
+        ML::TagSize,   // 1
+        ML::TagMargin, // 2
+        ML::TagPieces  // 3
+    };
+
+    while (readNextStartElement())
+    {
+        switch (tags.indexOf(name().toString()))
+        {
+            case 0: // name
+                sheet->SetName(readElementText());
+                break;
+            case 1: // size
+                sheet->SetSheetSize(ReadSize());
+                break;
+            case 2: // margin
+                ReadSheetMargins(sheet);
+                break;
+            case 3: // pieces
+                ReadPieces(layout, sheet);
+                break;
+            default:
+                qCDebug(MLReader, "Ignoring tag %s", qUtf8Printable(name().toString()));
+                skipCurrentElement();
+                break;
+        }
+    }
+
+    readElementText();
+
+    layout->AddSheet(sheet);
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileReader::ReadPieces(const VPLayoutPtr &layout, const VPSheetPtr &sheet)
+{
+    while (readNextStartElement())
+    {
+        if (name() == ML::TagPiece)
+        {
+            VPPiecePtr piece(new VPPiece());
+            ReadPiece(piece);
+
+            if (not piece->IsValid())
+            {
+                throw VException(tr("Piece %1 invalid.").arg(piece->GetName()));
+            }
+
+            piece->SetSheet(sheet);
+            VPLayout::AddPiece(layout, piece);
+        }
+        else
+        {
+            qCDebug(MLReader, "Ignoring tag %s", qUtf8Printable(name().toString()));
+            skipCurrentElement();
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileReader::ReadPiece(const VPPiecePtr &piece)
+{
+    AssertRootTag(ML::TagPiece);
+
+    QXmlStreamAttributes attribs = attributes();
+    piece->SetName(ReadAttributeString(attribs, ML::AttrName, tr("Piece")));
+
+    QString uuidStr = ReadAttributeString(attribs, ML::AttrID, QUuid::createUuid().toString());
+    piece->SetUUID(QUuid(uuidStr));
+
+    piece->SetName(ReadAttributeEmptyString(attribs, ML::AttrGradationLabel));
+    piece->SetCopyNumber(static_cast<quint16>(ReadAttributeUInt(attribs, ML::AttrCopyNumber, QChar('1'))));
+    piece->SetHideMainPath(not ReadAttributeBool(attribs, ML::AttrShowSeamline, trueStr));
+    piece->SetXScale(ReadAttributeDouble(attribs, ML::AttrXScale, QChar('1')));
+    piece->SetYScale(ReadAttributeDouble(attribs, ML::AttrYScale, QChar('1')));
+
+    bool pieceMirrored = ReadAttributeBool(attribs, ML::AttrMirrored, falseStr);
+    piece->SetMirror(pieceMirrored);
+
+    QString matrix = ReadAttributeEmptyString(attribs, ML::AttrTransform);
+    piece->SetMatrix(StringToTransfrom(matrix));
+
+    const QStringList tags
+    {
+        ML::TagSeamLine,      // 0
+        ML::TagSeamAllowance, // 1
+        ML::TagGrainline,     // 2
+        ML::TagNotches,       // 3
+        ML::TagInternalPaths, // 4
+        ML::TagMarkers,       // 5
+        ML::TagLabels         // 6
+    };
+
+    while (readNextStartElement())
+    {
+        switch (tags.indexOf(name().toString()))
+        {
+            case 0: // seam line
+                piece->SetCountourPoints(StringToPath(readElementText()));
+                break;
+            case 1: // seam allowance
+                ReadSeamAllowance(piece);
+                break;
+            case 2: // grainline
+                ReadGrainline(piece);
+                break;
+            case 3: // notches
+                ReadNotches(piece);
+                break;
+            case 4: // internal paths
+                ReadInternalPaths(piece);
+                break;
+            case 5: // markers
+                ReadMarkers(piece);
+                break;
+            case 6: // labels
+                ReadLabels(piece);
+                break;
+            default:
+                qCDebug(MLReader, "Ignoring tag %s", qUtf8Printable(name().toString()));
+                skipCurrentElement();
+                break;
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileReader::ReadSeamAllowance(const VPPiecePtr &piece)
+{
+    AssertRootTag(ML::TagSeamAllowance);
+
+    QXmlStreamAttributes attribs = attributes();
+    bool enabled = ReadAttributeBool(attribs, ML::AttrEnabled, falseStr);
+    piece->SetSeamAllowance(enabled);
+
+    bool builtIn = ReadAttributeBool(attribs, ML::AttrBuiltIn, falseStr);
+    QVector<QPointF> path = StringToPath(readElementText());
+
+    if (enabled)
+    {
+        if (not builtIn)
+        {
+            if (path.isEmpty())
+            {
+                throw VException(tr("Error in line %1. Seam allowance is empty.").arg(lineNumber()));
+            }
+            piece->SetSeamAllowancePoints(path);
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileReader::ReadGrainline(const VPPiecePtr &piece)
+{
+    AssertRootTag(ML::TagGrainline);
+
+    QXmlStreamAttributes attribs = attributes();
+    bool enabled = ReadAttributeBool(attribs, ML::AttrEnabled, falseStr);
+    piece->SetGrainlineEnabled(enabled);
+    QVector<QPointF> path = StringToPath(readElementText());
+
+    if (enabled)
+    {
+        piece->SetGrainlineAngle(ReadAttributeDouble(attribs, ML::AttrAngle, QChar('0')));
+        QString arrowDirection = ReadAttributeEmptyString(attribs, ML::AttrArrowDirection);
+        piece->SetGrainlineArrowType(StringToGrainlineArrowDirrection(arrowDirection));
+
+        if (path.isEmpty())
+        {
+            throw VException(tr("Error in line %1. Grainline is empty.").arg(lineNumber()));
+        }
+        piece->SetGrainlinePoints(path);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileReader::ReadNotches(const VPPiecePtr &piece)
+{
+    AssertRootTag(ML::TagNotches);
+
+    QVector<VLayoutPassmark> passmarks;
+
+    while (readNextStartElement())
+    {
+        if (name() == ML::TagNotch)
+        {
+            passmarks.append(ReadNotch());
+        }
+        else
+        {
+            qCDebug(MLReader, "Ignoring tag %s", qUtf8Printable(name().toString()));
+            skipCurrentElement();
+        }
+    }
+
+    piece->SetPassmarks(passmarks);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutFileReader::ReadNotch() -> VLayoutPassmark
+{
+    AssertRootTag(ML::TagNotch);
+
+    QXmlStreamAttributes attribs = attributes();
+
+    VLayoutPassmark passmark;
+    passmark.isBuiltIn = ReadAttributeBool(attribs, ML::AttrBuiltIn, falseStr);
+    passmark.baseLine = StringToLine(ReadAttributeEmptyString(attribs, ML::AttrBaseLine));
+    passmark.lines = StringToLines(ReadAttributeEmptyString(attribs, ML::AttrPath));
+
+    QString defaultType = QString::number(static_cast<int>(PassmarkLineType::OneLine));
+    passmark.type = static_cast<PassmarkLineType>(ReadAttributeUInt(attribs, ML::AttrType, defaultType));
+
+    readElementText();
+
+    return passmark;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileReader::ReadInternalPaths(const VPPiecePtr &piece)
+{
+    AssertRootTag(ML::TagInternalPaths);
+
+    QVector<VLayoutPiecePath> internalPaths;
+
+    while (readNextStartElement())
+    {
+        if (name() == ML::TagInternalPath)
+        {
+            internalPaths.append(ReadInternalPath());
+        }
+        else
+        {
+            qCDebug(MLReader, "Ignoring tag %s", qUtf8Printable(name().toString()));
+            skipCurrentElement();
+        }
+    }
+
+    piece->SetInternalPaths(internalPaths);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutFileReader::ReadInternalPath() -> VLayoutPiecePath
+{
+    AssertRootTag(ML::TagInternalPath);
+
+    VLayoutPiecePath path;
+
+    QXmlStreamAttributes attribs = attributes();
+    path.SetCutPath(ReadAttributeBool(attribs, ML::AttrCut, falseStr));
+    path.SetPenStyle(LineStyleToPenStyle(ReadAttributeString(attribs, ML::AttrPenStyle, TypeLineLine)));
+
+    QVector<QPointF> shape = StringToPath(readElementText());
+    if (shape.isEmpty())
+    {
+        throw VException(tr("Error in line %1. Internal path shape is empty.").arg(lineNumber()));
+    }
+
+    path.SetPoints(shape);
+
+    return path;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileReader::ReadMarkers(const VPPiecePtr &piece)
+{
+    AssertRootTag(ML::TagMarkers);
+
+    QVector<VLayoutPlaceLabel> markers;
+
+    while (readNextStartElement())
+    {
+        if (name() == ML::TagMarker)
+        {
+            markers.append(ReadMarker());
+        }
+        else
+        {
+            qCDebug(MLReader, "Ignoring tag %s", qUtf8Printable(name().toString()));
+            skipCurrentElement();
+        }
+    }
+
+    piece->SetPlaceLabels(markers);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutFileReader::ReadMarker() -> VLayoutPlaceLabel
+{
+    AssertRootTag(ML::TagMarker);
+
+    VLayoutPlaceLabel marker;
+
+    QXmlStreamAttributes attribs = attributes();
+
+    QString matrix = ReadAttributeEmptyString(attribs, ML::AttrTransform);
+    marker.rotationMatrix = StringToTransfrom(matrix);
+
+    marker.type = static_cast<PlaceLabelType>(ReadAttributeUInt(attribs, ML::AttrType, QChar('0')));
+    marker.center = StringToPoint(ReadAttributeEmptyString(attribs, ML::AttrCenter));
+    marker.box = StringToRect(ReadAttributeEmptyString(attribs, ML::AttrBox));
+
+    PlaceLabelImg shape = StringToMarkerShape(readElementText());
+    if (shape.isEmpty())
+    {
+        throw VException(tr("Error in line %1. Marker shape is empty.").arg(lineNumber()));
+    }
+
+    marker.shape = shape;
+
+    return marker;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileReader::ReadLabels(const VPPiecePtr &piece)
+{
+    AssertRootTag(ML::TagLabels);
+
+    while (readNextStartElement())
+    {
+        if (name() == ML::TagPieceLabel)
+        {
+            ReadPieceLabel(piece);
+        }
+        else if (name() == ML::TagPatternLabel)
+        {
+            ReadPatternLabel(piece);
+        }
+        else
+        {
+            qCDebug(MLReader, "Ignoring tag %s", qUtf8Printable(name().toString()));
+            skipCurrentElement();
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileReader::ReadPieceLabel(const VPPiecePtr &piece)
+{
+    AssertRootTag(ML::TagPieceLabel);
+
+    QXmlStreamAttributes attribs = attributes();
+    piece->SetPieceLabelRect(StringToPath(ReadAttributeEmptyString(attribs, ML::AttrShape)));
+
+    while (readNextStartElement())
+    {
+        if (name() == ML::TagLines)
+        {
+            piece->SetPieceLabelData(ReadLabelLines());
+        }
+        else
+        {
+            qCDebug(MLReader, "Ignoring tag %s", qUtf8Printable(name().toString()));
+            skipCurrentElement();
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileReader::ReadPatternLabel(const VPPiecePtr &piece)
+{
+    AssertRootTag(ML::TagPatternLabel);
+
+    QXmlStreamAttributes attribs = attributes();
+    piece->SetPatternLabelRect(StringToPath(ReadAttributeEmptyString(attribs, ML::AttrShape)));
+
+    while (readNextStartElement())
+    {
+        if (name() == ML::TagLines)
+        {
+            piece->SetPatternLabelData(ReadLabelLines());
+        }
+        else
+        {
+            qCDebug(MLReader, "Ignoring tag %s", qUtf8Printable(name().toString()));
+            skipCurrentElement();
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutFileReader::ReadLabelLines() -> VTextManager
+{
+    AssertRootTag(ML::TagLines);
+
+    VTextManager text;
+    QVector<TextLine> lines;
+
+    QXmlStreamAttributes attribs = attributes();
+    QFont f;
+    f.fromString(ReadAttributeEmptyString(attribs, ML::AttrFont));
+    text.SetFont(f);
+
+    while (readNextStartElement())
+    {
+        if (name() == ML::TagLine)
+        {
+            lines.append(ReadLabelLine());
+        }
+        else
+        {
+            qCDebug(MLReader, "Ignoring tag %s", qUtf8Printable(name().toString()));
+            skipCurrentElement();
+        }
+    }
+
+    text.SetAllSourceLines(lines);
+
+    return text;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutFileReader::ReadLabelLine() -> TextLine
+{
+    AssertRootTag(ML::TagLine);
+
+    TextLine line;
+
+    QXmlStreamAttributes attribs = attributes();
+
+    line.m_iFontSize = ReadAttributeInt(attribs, ML::AttrFontSize, QString::number(MIN_FONT_SIZE));
+    line.m_bold = ReadAttributeBool(attribs, ML::AttrBold, falseStr);
+    line.m_italic = ReadAttributeBool(attribs, ML::AttrItalic, falseStr);
+    int alignment = ReadAttributeInt(attribs, ML::AttrAlignment, QString::number(static_cast<int>(Qt::AlignCenter)));
+    line.m_eAlign = static_cast<Qt::Alignment>(alignment);
+    line.m_qsText = readElementText();
+
+    return line;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileReader::ReadWatermark(const VPLayoutPtr &layout)
+{
+    AssertRootTag(ML::TagWatermark);
+
+    QXmlStreamAttributes attribs = attributes();
+    layout->LayoutSettings().SetShowWatermark(ReadAttributeBool(attribs, ML::AttrShowPreview, falseStr));
+    layout->LayoutSettings().SetWatermarkPath(readElementText());
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileReader::ReadLayoutMargins(const VPLayoutPtr &layout)
+{
+    QXmlStreamAttributes attribs = attributes();
+
+    QMarginsF margins = QMarginsF();
+    margins.setLeft(ReadAttributeDouble(attribs, ML::AttrLeft, QChar('0')));
+    margins.setTop(ReadAttributeDouble(attribs, ML::AttrTop, QChar('0')));
+    margins.setRight(ReadAttributeDouble(attribs, ML::AttrRight, QChar('0')));
+    margins.setBottom(ReadAttributeDouble(attribs, ML::AttrBottom, QChar('0')));
+    layout->LayoutSettings().SetTilesMargins(margins);
+
+    layout->LayoutSettings().SetIgnoreTilesMargins(ReadAttributeBool(attribs, ML::AttrIgnoreMargins, falseStr));
+
+    readElementText();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileReader::ReadSheetMargins(const VPSheetPtr &sheet)
+{
+    QXmlStreamAttributes attribs = attributes();
+
+    QMarginsF margins = QMarginsF();
+    margins.setLeft(ReadAttributeDouble(attribs, ML::AttrLeft, QChar('0')));
+    margins.setTop(ReadAttributeDouble(attribs, ML::AttrTop, QChar('0')));
+    margins.setRight(ReadAttributeDouble(attribs, ML::AttrRight, QChar('0')));
+    margins.setBottom(ReadAttributeDouble(attribs, ML::AttrBottom, QChar('0')));
+    sheet->SetSheetMargins(margins);
+
+    sheet->SetIgnoreMargins(ReadAttributeBool(attribs, ML::AttrIgnoreMargins, falseStr));
+
+    readElementText();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutFileReader::ReadSize() -> QSizeF
+{
+    QSizeF size;
+
+    QXmlStreamAttributes attribs = attributes();
+    size.setWidth(ReadAttributeDouble(attribs, ML::AttrWidth, QChar('0')));
+    size.setHeight(ReadAttributeDouble(attribs, ML::AttrLength, QChar('0')));
+
+    readElementText();
+
+    return size;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileReader::AssertRootTag(const QString &tag) const
+{
+    if (not (isStartElement() && name() == tag))
+    {
+        throw VException(tr("Unexpected tag %1 in line %2").arg(name().toString()).arg(lineNumber()));
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutFileReader::ReadAttributeString(const QXmlStreamAttributes &attribs, const QString &name,
+                                                const QString &defValue) -> QString
+{
+    const QString parameter = attribs.value(name).toString();
+    if (parameter.isEmpty())
+    {
+        if (defValue.isEmpty())
+        {
+            throw VException(tr("Got empty attribute '%1'").arg(name));
+        }
+        return defValue;
+    }
+    return parameter;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutFileReader::ReadAttributeEmptyString(const QXmlStreamAttributes &attribs, const QString &name) -> QString
+{
+    return attribs.value(name).toString();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutFileReader::ReadAttributeBool(const QXmlStreamAttributes &attribs, const QString &name,
+                                           const QString &defValue) -> bool
+{
+    QString parametr;
+    bool val = true;
+
+    const QString message = QObject::tr("Can't convert toBool parameter");
+    try
+    {
+        parametr = ReadAttributeString(attribs, name, defValue);
+
+        const QStringList bools {trueStr, falseStr, QChar('1'), QChar('0')};
+        switch (bools.indexOf(parametr))
+        {
+            case 0: // true
+            case 2: // 1
+                val = true;
+                break;
+            case 1: // false
+            case 3: // 0
+                val = false;
+                break;
+            default:// others
+                throw VExceptionConversionError(message, name);
+        }
+    }
+    catch (const VException &e)
+    {
+        VExceptionConversionError excep(message, name);
+        excep.AddMoreInformation(e.ErrorMessage());
+        throw excep;
+    }
+
+    return val;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutFileReader::ReadAttributeDouble(const QXmlStreamAttributes &attribs, const QString &name,
+                                             const QString &defValue) -> qreal
+{
+    bool ok = false;
+    qreal param = 0;
+
+    const QString message = QObject::tr("Can't convert toDouble parameter");
+    try
+    {
+        QString parametr = ReadAttributeString(attribs, name, defValue);
+        param = parametr.replace(QChar(','), QChar('.')).toDouble(&ok);
+        if (not ok)
+        {
+            throw VExceptionConversionError(message, name);
+        }
+    }
+    catch (const VException &e)
+    {
+        VExceptionConversionError excep(message, name);
+        excep.AddMoreInformation(e.ErrorMessage());
+        throw excep;
+    }
+    return param;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutFileReader::ReadAttributeUInt(const QXmlStreamAttributes &attribs, const QString &name,
+                                           const QString &defValue) -> quint32
+{
+    bool ok = false;
+    quint32 param = 0;
+
+    const QString message = QObject::tr("Can't convert toUInt parameter");
+    try
+    {
+        QString parametr = ReadAttributeString(attribs, name, defValue);
+        param = parametr.replace(QChar(','), QChar('.')).toUInt(&ok);
+        if (not ok)
+        {
+            throw VExceptionConversionError(message, name);
+        }
+    }
+    catch (const VException &e)
+    {
+        VExceptionConversionError excep(message, name);
+        excep.AddMoreInformation(e.ErrorMessage());
+        throw excep;
+    }
+    return param;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VPLayoutFileReader::ReadAttributeInt(const QXmlStreamAttributes &attribs, const QString &name,
+                                          const QString &defValue) -> int
+{
+    bool ok = false;
+    int param = 0;
+
+    const QString message = QObject::tr("Can't convert toInt parameter");
+    try
+    {
+        QString parametr = ReadAttributeString(attribs, name, defValue);
+        param = parametr.replace(QChar(','), QChar('.')).toInt(&ok);
+        if (not ok)
+        {
+            throw VExceptionConversionError(message, name);
+        }
+    }
+    catch (const VException &e)
+    {
+        VExceptionConversionError excep(message, name);
+        excep.AddMoreInformation(e.ErrorMessage());
+        throw excep;
+    }
+    return param;
+}
diff --git a/src/app/puzzle/xml/vplayoutfilereader.h b/src/app/puzzle/xml/vplayoutfilereader.h
new file mode 100644
index 000000000..e2a25b5c6
--- /dev/null
+++ b/src/app/puzzle/xml/vplayoutfilereader.h
@@ -0,0 +1,99 @@
+/************************************************************************
+ **
+ **  @file   vplayoutfilereader.h
+ **  @author Ronan Le Tiec
+ **  @date   18 4, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ ** *************************************************************************/
+
+#ifndef VPLAYOUTFILEREADER_H
+#define VPLAYOUTFILEREADER_H
+
+#include <QXmlStreamReader>
+#include "../ifc/xml/vabstractconverter.h"
+#include "../layout/vplayout.h"
+#include "../layout/vppiece.h"
+
+#include <QLoggingCategory>
+
+Q_DECLARE_LOGGING_CATEGORY(MLReader)
+
+struct TextLine;
+
+class VPLayoutFileReader : public QXmlStreamReader
+{
+    Q_DECLARE_TR_FUNCTIONS(VPLayoutFileReader)
+public:
+    VPLayoutFileReader()=default;
+    ~VPLayoutFileReader()=default;
+
+    auto ReadFile(const VPLayoutPtr &layout, QFile *file) -> bool;
+
+private:
+    Q_DISABLE_COPY(VPLayoutFileReader)
+
+    void ReadLayout(const VPLayoutPtr &layout);
+    void ReadProperties(const VPLayoutPtr &layout);
+    void ReadControl(const VPLayoutPtr &layout);
+    void ReadTiles(const VPLayoutPtr &layout);
+    void ReadScale(const VPLayoutPtr &layout);
+    void ReadUnplacedPieces(const VPLayoutPtr &layout);
+    void ReadSheets(const VPLayoutPtr &layout);
+    void ReadSheet(const VPLayoutPtr &layout);
+    void ReadPieces(const VPLayoutPtr &layout, const VPSheetPtr &sheet=VPSheetPtr());
+    void ReadPiece(const VPPiecePtr &piece);
+    void ReadSeamAllowance(const VPPiecePtr &piece);
+    void ReadGrainline(const VPPiecePtr &piece);
+    void ReadNotches(const VPPiecePtr &piece);
+    auto ReadNotch() -> VLayoutPassmark;
+    void ReadInternalPaths(const VPPiecePtr &piece);
+    auto ReadInternalPath() -> VLayoutPiecePath;
+    void ReadMarkers(const VPPiecePtr &piece);
+    auto ReadMarker() -> VLayoutPlaceLabel;
+    void ReadLabels(const VPPiecePtr &piece);
+    void ReadPieceLabel(const VPPiecePtr &piece);
+    void ReadPatternLabel(const VPPiecePtr &piece);
+    auto ReadLabelLines() -> VTextManager;
+    auto ReadLabelLine() -> TextLine;
+    void ReadWatermark(const VPLayoutPtr &layout);
+
+    void ReadLayoutMargins(const VPLayoutPtr &layout);
+    void ReadSheetMargins(const VPSheetPtr &sheet);
+    auto ReadSize() -> QSizeF;
+
+    void AssertRootTag(const QString &tag) const;
+
+    static auto ReadAttributeString(const QXmlStreamAttributes &attribs, const QString &name,
+                                    const QString &defValue) -> QString;
+    static auto ReadAttributeEmptyString(const QXmlStreamAttributes &attribs, const QString &name) -> QString;
+    static auto ReadAttributeBool(const QXmlStreamAttributes &attribs, const QString &name,
+                                  const QString &defValue) -> bool;
+    static auto ReadAttributeDouble(const QXmlStreamAttributes &attribs, const QString &name,
+                                    const QString &defValue) -> qreal;
+    static auto ReadAttributeUInt(const QXmlStreamAttributes &attribs, const QString &name,
+                                  const QString &defValue) -> quint32;
+    static auto ReadAttributeInt(const QXmlStreamAttributes &attribs, const QString &name,
+                                 const QString &defValue) -> int;
+};
+
+#endif // VPLAYOUTFILEREADER_H
diff --git a/src/app/puzzle/xml/vplayoutfilewriter.cpp b/src/app/puzzle/xml/vplayoutfilewriter.cpp
new file mode 100644
index 000000000..44aa011d4
--- /dev/null
+++ b/src/app/puzzle/xml/vplayoutfilewriter.cpp
@@ -0,0 +1,414 @@
+/************************************************************************
+ **
+ **  @file   vplayoutfilewriter.cpp
+ **  @author Ronan Le Tiec
+ **  @date   18 4, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+#include "vplayoutfilewriter.h"
+#include "../layout/vplayout.h"
+#include "../layout/vpsheet.h"
+#include "../layout/vppiece.h"
+#include "vplayoutliterals.h"
+#include "../ifc/xml/vlayoutconverter.h"
+#include "../vmisc/projectversion.h"
+#include "../vlayout/vlayoutpiecepath.h"
+#include "../vlayout/vtextmanager.h"
+
+namespace
+{
+//---------------------------------------------------------------------------------------------------------------------
+template <class T>
+auto NumberToString(T number) -> QString
+{
+    const QLocale locale = QLocale::c();
+    return locale.toString(number, 'g', 12).remove(locale.groupSeparator());
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto TransformToString(const QTransform &m) -> QString
+{
+    QStringList matrix
+    {
+        NumberToString(m.m11()),
+        NumberToString(m.m12()),
+        NumberToString(m.m13()),
+        NumberToString(m.m21()),
+        NumberToString(m.m22()),
+        NumberToString(m.m23()),
+        NumberToString(m.m31()),
+        NumberToString(m.m32()),
+        NumberToString(m.m33())
+    };
+    return matrix.join(ML::groupSep);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto PointToString(const QPointF &p) -> QString
+{
+    return NumberToString(p.x()) + ML::coordintatesSep + NumberToString(p.y());
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto PathToString(const QVector<QPointF> &pathPoints) -> QString
+{
+    QStringList path;
+
+    for (auto point : pathPoints)
+    {
+        path.append(PointToString(point));
+    }
+
+    return path.join(ML::pointsSep);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto RectToString(const QRectF &r) -> QString
+{
+    return NumberToString(r.x()) + ML::groupSep +
+            NumberToString(r.y()) + ML::groupSep +
+            NumberToString(r.width()) + ML::groupSep +
+            NumberToString(r.height());
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto MarkerShapeToString(const PlaceLabelImg &shape) -> QString
+{
+    QStringList s;
+    for (const auto& path : shape)
+    {
+        s.append(PathToString(path));
+    }
+    return s.join(ML::itemsSep);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto LineToString(const QLineF &line) -> QString
+{
+    return PointToString(line.p1()) + ML::groupSep + PointToString(line.p2());
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto LinesToString(const QVector<QLineF> &lines) -> QString
+{
+    QStringList l;
+    for (auto line : lines)
+    {
+        l.append(LineToString(line));
+    }
+    return l.join(ML::itemsSep);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto GrainlineArrowDirrectionToString(GrainlineArrowDirection type) -> QString
+{
+    switch(type)
+    {
+        case GrainlineArrowDirection::atFront:
+            return ML::atFrontStr;
+        case GrainlineArrowDirection::atRear:
+            return ML::atRearStr;
+        case GrainlineArrowDirection::atBoth:
+        default:
+            return ML::atBothStr;
+    }
+}
+}  // namespace
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileWriter::WriteFile(const VPLayoutPtr &layout, QIODevice *file)
+{
+    setDevice(file);
+    setAutoFormatting(true);
+
+    writeStartDocument();
+    writeComment(QStringLiteral("Layout created with Valentina v%1 (https://smart-pattern.com.ua/).")
+                 .arg(APP_VERSION_STR));
+    WriteLayout(layout);
+    writeEndDocument();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileWriter::WriteLayout(const VPLayoutPtr &layout)
+{
+    writeStartElement(ML::TagLayout);
+    SetAttribute(ML::AttrVersion, VLayoutConverter::LayoutMaxVerStr);
+    WriteLayoutProperties(layout);
+    WritePieceList(layout->GetUnplacedPieces(), ML::TagUnplacedPieces);
+    WriteSheets(layout);
+    writeEndElement(); //layout
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileWriter::WriteLayoutProperties(const VPLayoutPtr &layout)
+{
+    writeStartElement(ML::TagProperties);
+
+    writeTextElement(ML::TagUnit, UnitsToStr(layout->LayoutSettings().GetUnit()));
+    writeTextElement(ML::TagTitle, layout->LayoutSettings().GetTitle());
+    writeTextElement(ML::TagDescription, layout->LayoutSettings().GetDescription());
+
+    writeStartElement(ML::TagControl);
+    SetAttribute(ML::AttrWarningSuperposition, layout->LayoutSettings().GetWarningSuperpositionOfPieces());
+    SetAttribute(ML::AttrWarningOutOfBound, layout->LayoutSettings().GetWarningPiecesOutOfBound());
+    SetAttribute(ML::AttrStickyEdges, layout->LayoutSettings().GetStickyEdges());
+    SetAttribute(ML::AttrPiecesGap, layout->LayoutSettings().GetPiecesGap());
+    SetAttribute(ML::AttrFollowGrainline, layout->LayoutSettings().GetFollowGrainline());
+    writeEndElement(); // control
+
+    WriteTiles(layout);
+
+    writeStartElement(ML::TagScale);
+    SetAttribute(ML::AttrXScale, layout->LayoutSettings().HorizontalScale());
+    SetAttribute(ML::AttrYScale, layout->LayoutSettings().VerticalScale());
+    writeEndElement(); // scale
+
+    writeStartElement(ML::TagWatermark);
+    SetAttributeOrRemoveIf<bool>(ML::AttrShowPreview, layout->LayoutSettings().GetShowWatermark(),
+                                 [](bool show){return not show;});
+    writeCharacters(layout->LayoutSettings().WatermarkPath());
+    writeEndElement(); // watermark
+
+    writeEndElement(); // properties
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileWriter::WriteSheets(const VPLayoutPtr &layout)
+{
+    writeStartElement(ML::TagSheets);
+
+    QList<VPSheetPtr> sheets = layout->GetSheets();
+    for (const auto &sheet : sheets)
+    {
+        if (not sheet.isNull())
+        {
+            WriteSheet(sheet);
+        }
+    }
+
+    writeEndElement(); // sheets
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileWriter::WriteSheet(const VPSheetPtr &sheet)
+{
+    writeStartElement(ML::TagSheet);
+    SetAttributeOrRemoveIf<QString>(ML::AttrGrainlineType, GrainlineTypeToStr(sheet->GetGrainlineType()),
+                                    [](const QString &type)
+    {return type == GrainlineTypeToStr(GrainlineType::NotFixed);});
+
+    writeTextElement(ML::TagName, sheet->GetName());
+    WriteSize(sheet->GetSheetSize());
+    WriteMargins(sheet->GetSheetMargins(), sheet->IgnoreMargins());
+    WritePieceList(sheet->GetPieces(), ML::TagPieces);
+
+    writeEndElement(); // sheet
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileWriter::WriteTiles(const VPLayoutPtr &layout)
+{
+    Q_UNUSED(layout); // to be removed
+
+   writeStartElement(ML::TagTiles);
+   SetAttribute(ML::AttrVisible, layout->LayoutSettings().GetShowTiles());
+   SetAttribute(ML::AttrMatchingMarks, "standard"); // TODO / Fixme get the right value
+   SetAttributeOrRemoveIf<bool>(ML::AttrPrintScheme, layout->LayoutSettings().GetPrintTilesScheme(),
+                                [](bool print){return not print;});
+
+   WriteSize(layout->LayoutSettings().GetTilesSize());
+   WriteMargins(layout->LayoutSettings().GetTilesMargins(), layout->LayoutSettings().IgnoreTilesMargins());
+
+   writeEndElement(); // tiles
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileWriter::WritePieceList(const QList<VPPiecePtr> &list, const QString &tagName)
+{
+    writeStartElement(tagName); // piece list
+    for (const auto &piece : list)
+    {
+        WritePiece(piece);
+    }
+
+    writeEndElement(); // piece list
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileWriter::WritePiece(const VPPiecePtr &piece)
+{
+    writeStartElement(ML::TagPiece);
+    SetAttribute(ML::AttrID, piece->GetUUID().toString());
+    SetAttribute(ML::AttrName, piece->GetName());
+    SetAttributeOrRemoveIf<bool>(ML::AttrMirrored, piece->IsMirror(), [](bool mirrored){return not mirrored;});
+    SetAttribute(ML::AttrTransform, TransformToString(piece->GetMatrix()));
+    SetAttributeOrRemoveIf<QString>(ML::AttrGradationLabel, piece->GetGradationId(),
+                                    [](const QString &label){return label.isEmpty();});
+    SetAttribute(ML::AttrCopyNumber, piece->CopyNumber());
+    SetAttributeOrRemoveIf<bool>(ML::AttrShowSeamline, not piece->IsHideMainPath(), [](bool show){return show;});
+    SetAttributeOrRemoveIf<qreal>(ML::AttrXScale, piece->GetXScale(),
+                                  [](qreal xs){return VFuzzyComparePossibleNulls(xs, 1.0);});
+    SetAttributeOrRemoveIf<qreal>(ML::AttrYScale, piece->GetYScale(),
+                                  [](qreal ys){return VFuzzyComparePossibleNulls(ys, 1.0);});
+
+    writeStartElement(ML::TagSeamLine);
+    writeCharacters(PathToString(piece->GetContourPoints()));
+    writeEndElement();
+
+    writeStartElement(ML::TagSeamAllowance);
+    SetAttributeOrRemoveIf<bool>(ML::AttrEnabled, piece->IsSeamAllowance(), [](bool enabled){return not enabled;});
+    SetAttributeOrRemoveIf<bool>(ML::AttrBuiltIn, piece->IsSeamAllowanceBuiltIn(),
+                                 [](bool builtin){return not builtin;});
+    if (piece->IsSeamAllowance() && not piece->IsSeamAllowanceBuiltIn())
+    {
+        writeCharacters(PathToString(piece->GetSeamAllowancePoints()));
+    }
+    writeEndElement();
+
+    writeStartElement(ML::TagGrainline);
+    SetAttributeOrRemoveIf<bool>(ML::AttrEnabled, piece->IsGrainlineEnabled(), [](bool enabled){return not enabled;});
+    if (piece->IsGrainlineEnabled())
+    {
+        SetAttribute(ML::AttrAngle, piece->GrainlineAngle());
+        SetAttribute(ML::AttrArrowDirection, GrainlineArrowDirrectionToString(piece->GrainlineArrowType()));
+        writeCharacters(PathToString(piece->GetGrainline()));
+    }
+    writeEndElement();
+
+    writeStartElement(ML::TagNotches);
+    QVector<VLayoutPassmark> passmarks = piece->GetPassmarks();
+    for (const auto& passmark : passmarks)
+    {
+        writeStartElement(ML::TagNotch);
+        SetAttribute(ML::AttrBuiltIn, passmark.isBuiltIn);
+        SetAttribute(ML::AttrType, static_cast<int>(passmark.type));
+        SetAttribute(ML::AttrBaseLine, LineToString(passmark.baseLine));
+        SetAttribute(ML::AttrPath, LinesToString(passmark.lines));
+        writeEndElement();
+    }
+    writeEndElement();
+
+    writeStartElement(ML::TagInternalPaths);
+    QVector<VLayoutPiecePath> internalPaths = piece->GetInternalPaths();
+    for (const auto& path : internalPaths)
+    {
+        writeStartElement(ML::TagInternalPath);
+        SetAttribute(ML::AttrCut, path.IsCutPath());
+        SetAttribute(ML::AttrPenStyle, PenStyleToLineStyle(path.PenStyle()));
+        writeCharacters(PathToString(path.Points()));
+        writeEndElement();
+    }
+    writeEndElement();
+
+    writeStartElement(ML::TagMarkers);
+    QVector<VLayoutPlaceLabel> placelabels = piece->GetPlaceLabels();
+    for (const auto& label : placelabels)
+    {
+        writeStartElement(ML::TagMarker);
+        SetAttribute(ML::AttrTransform, TransformToString(label.rotationMatrix));
+        SetAttribute(ML::AttrType, static_cast<int>(label.type));
+        SetAttribute(ML::AttrCenter, PointToString(label.center));
+        SetAttribute(ML::AttrBox, RectToString(label.box));
+        writeCharacters(MarkerShapeToString(label.shape));
+
+        writeEndElement();
+    }
+    writeEndElement();
+
+    writeStartElement(ML::TagLabels);
+    WriteLabel(piece->GetPieceLabelRect(), piece->GetPieceLabelData(), ML::TagPieceLabel);
+    WriteLabel(piece->GetPatternLabelRect(), piece->GetPatternLabelData(), ML::TagPatternLabel);
+    writeEndElement();
+
+    writeEndElement();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileWriter::WriteLabel(const QVector<QPointF> &labelShape, const VTextManager &tm, const QString &tagName)
+{
+    if (labelShape.size() > 2 && tm.GetSourceLinesCount() > 0)
+    {
+        writeStartElement(tagName);
+        SetAttribute(ML::AttrShape, PathToString(labelShape));
+        WriteLabelLines(tm);
+        writeEndElement();
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileWriter::WriteLabelLines(const VTextManager &tm)
+{
+    writeStartElement(ML::TagLines);
+    SetAttribute(ML::AttrFont, tm.GetFont().toString());
+
+    for (int i = 0; i < tm.GetSourceLinesCount(); ++i)
+    {
+        writeStartElement(ML::TagLine);
+        const TextLine& tl = tm.GetSourceLine(i);
+        SetAttribute(ML::AttrFontSize, tl.m_iFontSize);
+        SetAttribute(ML::AttrBold, tl.m_bold);
+        SetAttribute(ML::AttrItalic, tl.m_italic);
+        SetAttribute(ML::AttrAlignment, static_cast<int>(tl.m_eAlign));
+        writeCharacters(tl.m_qsText);
+        writeEndElement();
+    }
+    writeEndElement();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileWriter::WriteMargins(const QMarginsF &margins, bool ignore)
+{
+    writeStartElement(ML::TagMargin);
+
+    SetAttributeOrRemoveIf<qreal>(ML::AttrLeft, margins.left(), [](qreal margin){return margin <= 0;});
+    SetAttributeOrRemoveIf<qreal>(ML::AttrTop, margins.top(), [](qreal margin){return margin <= 0;});
+    SetAttributeOrRemoveIf<qreal>(ML::AttrRight, margins.right(), [](qreal margin){return margin <= 0;});
+    SetAttributeOrRemoveIf<qreal>(ML::AttrBottom, margins.bottom(), [](qreal margin){return margin <= 0;});
+
+    SetAttributeOrRemoveIf<bool>(ML::AttrIgnoreMargins, ignore, [](bool ignore){return not ignore;});
+
+    writeEndElement(); // margin
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VPLayoutFileWriter::WriteSize(QSizeF size)
+{
+    // maybe not necessary to test this, the writer should "stupidly write", the application should take care of these tests
+    qreal width = size.width();
+    if(width < 0)
+    {
+        width = 0;
+    }
+
+    qreal length = size.height();
+    if(length < 0)
+    {
+        length = 0;
+    }
+
+    writeStartElement(ML::TagSize);
+    SetAttribute(ML::AttrWidth, width);
+    SetAttribute(ML::AttrLength, length);
+    writeEndElement(); // size
+}
diff --git a/src/app/puzzle/xml/vplayoutfilewriter.h b/src/app/puzzle/xml/vplayoutfilewriter.h
new file mode 100644
index 000000000..a55d3e394
--- /dev/null
+++ b/src/app/puzzle/xml/vplayoutfilewriter.h
@@ -0,0 +1,130 @@
+/************************************************************************
+ **
+ **  @file   vplayoutfilewriter.h
+ **  @author Ronan Le Tiec
+ **  @date   18 4, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ ** *************************************************************************/
+
+#ifndef VPLAYOUTFILEWRITER_H
+#define VPLAYOUTFILEWRITER_H
+
+#include <QLocale>
+#include <QXmlStreamWriter>
+#include <QCoreApplication>
+#include <functional>
+
+#include "../vmisc/literals.h"
+#include "../layout/layoutdef.h"
+
+class VPLayout;
+class VPSheet;
+class VPPieceList;
+class VPPiece;
+class QFile;
+class QMarginsF;
+class VTextManager;
+
+class VPLayoutFileWriter : public QXmlStreamWriter
+{
+    Q_DECLARE_TR_FUNCTIONS(VPLayoutFileWriter)
+public:
+    VPLayoutFileWriter()= default;
+    ~VPLayoutFileWriter()= default;
+
+    void WriteFile(const VPLayoutPtr &layout, QIODevice *file);
+
+private:
+    void WriteLayout(const VPLayoutPtr &layout);
+    void WriteLayoutProperties(const VPLayoutPtr &layout);
+    void WriteSheets(const VPLayoutPtr &layout);
+    void WriteSheet(const VPSheetPtr &sheet);
+    void WriteTiles(const VPLayoutPtr &layout);
+    void WritePieceList(const QList<VPPiecePtr> &list, const QString &tagName);
+    void WritePiece(const VPPiecePtr &piece);
+    void WriteLabel(const QVector<QPointF> &labelShape, const VTextManager &tm, const QString &tagName);
+    void WriteLabelLines(const VTextManager &tm);
+
+    void WriteMargins(const QMarginsF &margins, bool ignore);
+    void WriteSize(QSizeF size);
+
+    template <typename T>
+    void SetAttribute(const QString &name, const T &value);
+
+    template <size_t N>
+    void SetAttribute(const QString &name, const char (&value)[N]);
+
+    template <typename T>
+    void SetAttributeOrRemoveIf(const QString &name, const T &value,
+                                const std::function<bool(const T&)> &removeCondition);
+};
+
+//---------------------------------------------------------------------------------------------------------------------
+template<typename T>
+void VPLayoutFileWriter::SetAttribute(const QString &name, const T &value)
+{
+    // See specification for xs:decimal
+    const QLocale locale = QLocale::c();
+    writeAttribute(name, locale.toString(value).remove(locale.groupSeparator()));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+template <>
+inline void VPLayoutFileWriter::SetAttribute<QString>(const QString &name, const QString &value)
+{
+    writeAttribute(name, value);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+template <>
+inline void VPLayoutFileWriter::SetAttribute<QChar>(const QString &name, const QChar &value)
+{
+    writeAttribute(name, value);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+template <>
+inline void VPLayoutFileWriter::SetAttribute<bool>(const QString &name, const bool &value)
+{
+    writeAttribute(name, value ? trueStr : falseStr);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+template <size_t N>
+inline void VPLayoutFileWriter::SetAttribute(const QString &name, const char (&value)[N])
+{
+    writeAttribute(name, QString(value));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+template <typename T>
+inline void VPLayoutFileWriter::SetAttributeOrRemoveIf(const QString &name, const T &value,
+                                                       const std::function<bool(const T&)> &removeCondition)
+{
+    if (not removeCondition(value))
+    {
+        SetAttribute(name, value);
+    }
+}
+
+#endif // VPLAYOUTFILEWRITER_H
diff --git a/src/app/puzzle/xml/vplayoutliterals.cpp b/src/app/puzzle/xml/vplayoutliterals.cpp
new file mode 100644
index 000000000..a4d11f82c
--- /dev/null
+++ b/src/app/puzzle/xml/vplayoutliterals.cpp
@@ -0,0 +1,117 @@
+/************************************************************************
+ **
+ **  @file   vplayoutliterals.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   23 4, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#include "vplayoutliterals.h"
+
+namespace ML // Manual layout
+{
+const QString TagLayout              = QStringLiteral("layout");
+const QString TagProperties          = QStringLiteral("properties");
+const QString TagUnit                = QStringLiteral("unit");
+const QString TagTitle               = QStringLiteral("title");
+const QString TagDescription         = QStringLiteral("description");
+const QString TagSize                = QStringLiteral("size");
+const QString TagMargin              = QStringLiteral("margin");
+const QString TagControl             = QStringLiteral("control");
+const QString TagTiles               = QStringLiteral("tiles");
+const QString TagUnplacedPieces      = QStringLiteral("unplacedPieces");
+const QString TagPieces              = QStringLiteral("pieces");
+const QString TagPiece               = QStringLiteral("piece");
+const QString TagSheets              = QStringLiteral("sheets");
+const QString TagSheet               = QStringLiteral("sheet");
+const QString TagName                = QStringLiteral("name");
+const QString TagSeamLine            = QStringLiteral("seamLine");
+const QString TagSeamAllowance       = QStringLiteral("seamAllowance");
+const QString TagGrainline           = QStringLiteral("grainline");
+const QString TagNotches             = QStringLiteral("notches");
+const QString TagNotch               = QStringLiteral("notch");
+const QString TagInternalPaths       = QStringLiteral("internalPaths");
+const QString TagInternalPath        = QStringLiteral("internalPath");
+const QString TagMarkers             = QStringLiteral("markers");
+const QString TagMarker              = QStringLiteral("marker");
+const QString TagLabels              = QStringLiteral("labels");
+const QString TagPieceLabel          = QStringLiteral("pieceLabel");
+const QString TagPatternLabel        = QStringLiteral("patternLabel");
+const QString TagLines               = QStringLiteral("lines");
+const QString TagLine                = QStringLiteral("line");
+const QString TagScale               = QStringLiteral("scale");
+const QString TagWatermark           = QStringLiteral("watermark");
+
+const QString AttrVersion              = QStringLiteral("version");
+const QString AttrWarningSuperposition = QStringLiteral("warningSuperposition");
+const QString AttrWarningOutOfBound    = QStringLiteral("warningOutOfBound");
+const QString AttrStickyEdges          = QStringLiteral("stickyEdges");
+const QString AttrPiecesGap            = QStringLiteral("piecesGap");
+const QString AttrVisible              = QStringLiteral("visible");
+const QString AttrMatchingMarks        = QStringLiteral("matchingMarks");
+const QString AttrName                 = QStringLiteral("name");
+const QString AttrLeft                 = QStringLiteral("left");
+const QString AttrTop                  = QStringLiteral("top");
+const QString AttrRight                = QStringLiteral("right");
+const QString AttrBottom               = QStringLiteral("bottom");
+const QString AttrWidth                = QStringLiteral("width");
+const QString AttrLength               = QStringLiteral("length");
+const QString AttrFollowGrainline      = QStringLiteral("followGrainline");
+const QString AttrID                   = QStringLiteral("id");
+const QString AttrMirrored             = QStringLiteral("mirrored");
+const QString AttrTransform            = QStringLiteral("transform");
+const QString AttrShowSeamline         = QStringLiteral("showSeamline");
+const QString AttrEnabled              = QStringLiteral("enabled");
+const QString AttrBuiltIn              = QStringLiteral("builtIn");
+const QString AttrAngle                = QStringLiteral("angle");
+const QString AttrArrowDirection       = QStringLiteral("arrowDirection");
+const QString AttrType                 = QStringLiteral("type");
+const QString AttrBaseLine             = QStringLiteral("baseLine");
+const QString AttrPath                 = QStringLiteral("path");
+const QString AttrCut                  = QStringLiteral("cut");
+const QString AttrPenStyle             = QStringLiteral("penStyle");
+const QString AttrCenter               = QStringLiteral("center");
+const QString AttrBox                  = QStringLiteral("box");
+const QString AttrShape                = QStringLiteral("shape");
+const QString AttrFont                 = QStringLiteral("font");
+const QString AttrFontSize             = QStringLiteral("fontSize");
+const QString AttrBold                 = QStringLiteral("bold");
+const QString AttrItalic               = QStringLiteral("italic");
+const QString AttrAlignment            = QStringLiteral("alignment");
+const QString AttrGradationLabel       = QStringLiteral("gradationLabel");
+const QString AttrCopyNumber           = QStringLiteral("copyNumber");
+const QString AttrGrainlineType        = QStringLiteral("grainlineType");
+const QString AttrXScale               = QStringLiteral("xScale");
+const QString AttrYScale               = QStringLiteral("yScale");
+const QString AttrIgnoreMargins        = QStringLiteral("ignoreMargins");
+const QString AttrShowPreview          = QStringLiteral("showPreview");
+const QString AttrPrintScheme          = QStringLiteral("printScheme");
+
+const QString atFrontStr               = QStringLiteral("atFront");
+const QString atRearStr                = QStringLiteral("atRear");
+const QString atBothStr                = QStringLiteral("atBoth");
+
+const QChar groupSep                   = QLatin1Char(';');
+const QChar coordintatesSep            = QLatin1Char(',');
+const QChar pointsSep                  = QLatin1Char(' ');
+const QChar itemsSep                   = QLatin1Char('*');
+}  // namespace ML
diff --git a/src/app/puzzle/xml/vplayoutliterals.h b/src/app/puzzle/xml/vplayoutliterals.h
new file mode 100644
index 000000000..e80d28439
--- /dev/null
+++ b/src/app/puzzle/xml/vplayoutliterals.h
@@ -0,0 +1,125 @@
+/************************************************************************
+ **
+ **  @file   vplayoutliterals.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   23 4, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#ifndef VPLAYOUTLITERALS_H
+#define VPLAYOUTLITERALS_H
+
+#include <QString>
+
+// All tags and attributes present in manual layout file format
+
+namespace ML
+{
+extern const QString TagLayout;
+extern const QString TagProperties;
+extern const QString TagUnit;
+extern const QString TagTitle;
+extern const QString TagDescription;
+extern const QString TagSize;
+extern const QString TagMargin;
+extern const QString TagControl;
+extern const QString TagTiles;
+extern const QString TagUnplacedPieces;
+extern const QString TagPieces;
+extern const QString TagPiece;
+extern const QString TagSheets;
+extern const QString TagSheet;
+extern const QString TagName;
+extern const QString TagSeamLine;
+extern const QString TagSeamAllowance;
+extern const QString TagGrainline;
+extern const QString TagNotches;
+extern const QString TagNotch;
+extern const QString TagInternalPaths;
+extern const QString TagInternalPath;
+extern const QString TagMarkers;
+extern const QString TagMarker;
+extern const QString TagLabels;
+extern const QString TagPieceLabel;
+extern const QString TagPatternLabel;
+extern const QString TagLines;
+extern const QString TagLine;
+extern const QString TagScale;
+extern const QString TagWatermark;
+
+extern const QString AttrVersion;
+extern const QString AttrWarningSuperposition;
+extern const QString AttrWarningOutOfBound;
+extern const QString AttrStickyEdges;
+extern const QString AttrPiecesGap;
+extern const QString AttrVisible;
+extern const QString AttrMatchingMarks;
+extern const QString AttrName;
+extern const QString AttrLeft;
+extern const QString AttrTop;
+extern const QString AttrRight;
+extern const QString AttrBottom;
+extern const QString AttrWidth;
+extern const QString AttrLength;
+extern const QString AttrFollowGrainline;
+extern const QString AttrID;
+extern const QString AttrMirrored;
+extern const QString AttrTransform;
+extern const QString AttrShowSeamline;
+extern const QString AttrEnabled;
+extern const QString AttrBuiltIn;
+extern const QString AttrAngle;
+extern const QString AttrArrowDirection;
+extern const QString AttrType;
+extern const QString AttrBaseLine;
+extern const QString AttrPath;
+extern const QString AttrCut;
+extern const QString AttrPenStyle;
+extern const QString AttrCenter;
+extern const QString AttrBox;
+extern const QString AttrShape;
+extern const QString AttrFont;
+extern const QString AttrFontSize;
+extern const QString AttrBold;
+extern const QString AttrItalic;
+extern const QString AttrAlignment;
+extern const QString AttrGradationLabel;
+extern const QString AttrCopyNumber;
+extern const QString AttrGrainlineType;
+extern const QString AttrXScale;
+extern const QString AttrYScale;
+extern const QString AttrIgnoreMargins;
+extern const QString AttrShowPreview;
+extern const QString AttrPrintScheme;
+
+extern const QString atFrontStr;
+extern const QString atRearStr;
+extern const QString atBothStr;
+
+extern const QChar groupSep;
+extern const QChar coordintatesSep;
+extern const QChar pointsSep;
+extern const QChar itemsSep;
+}
+
+
+#endif // VPLAYOUTLITERALS_H
diff --git a/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.cpp b/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.cpp
index 2e49a0060..31e47d3fd 100644
--- a/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.cpp
+++ b/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.cpp
@@ -29,7 +29,7 @@
 #include "tapepreferencesconfigurationpage.h"
 #include "ui_tapepreferencesconfigurationpage.h"
 #include "../../mapplication.h"
-#include "../vmisc/vtapesettings.h"
+#include "../../vtapesettings.h"
 #include "../vpatterndb/variables/vmeasurement.h"
 #include "../vpatterndb/pmsystems.h"
 
diff --git a/src/app/tape/dialogs/configpages/tapepreferencespathpage.cpp b/src/app/tape/dialogs/configpages/tapepreferencespathpage.cpp
index c40ec8b8b..0b958396d 100644
--- a/src/app/tape/dialogs/configpages/tapepreferencespathpage.cpp
+++ b/src/app/tape/dialogs/configpages/tapepreferencespathpage.cpp
@@ -29,7 +29,7 @@
 #include "tapepreferencespathpage.h"
 #include "ui_tapepreferencespathpage.h"
 #include "../../mapplication.h"
-#include "../vmisc/vtapesettings.h"
+#include "../../vtapesettings.h"
 
 #include <QDir>
 #include <QFileDialog>
@@ -70,6 +70,7 @@ void TapePreferencesPathPage::Apply()
     settings->SetPathMultisizeMeasurements(ui->pathTable->item(1, 1)->text());
     settings->SetPathPattern(ui->pathTable->item(2, 1)->text());
     settings->SetPathTemplate(ui->pathTable->item(3, 1)->text());
+    settings->SetPathManualLayouts(ui->pathTable->item(4, 1)->text());
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -107,6 +108,9 @@ void TapePreferencesPathPage::DefaultPath()
         case 3: // templates
             path = VCommonSettings::GetDefPathTemplate();
             break;
+        case 4: // layouts
+            path = VCommonSettings::GetDefPathManualLayouts();
+            break;
         default:
             break;
     }
@@ -138,6 +142,9 @@ void TapePreferencesPathPage::EditPath()
         case 3: // templates
             path = MApplication::VApp()->TapeSettings()->GetPathTemplate();
             break;
+        case 4: // layouts
+            path = MApplication::VApp()->TapeSettings()->GetPathManualLayouts();
+            break;
         default:
             break;
     }
@@ -171,7 +178,7 @@ void TapePreferencesPathPage::EditPath()
 void TapePreferencesPathPage::InitTable()
 {
     ui->pathTable->clearContents();
-    ui->pathTable->setRowCount(4);
+    ui->pathTable->setRowCount(5);
     ui->pathTable->setColumnCount(2);
 
     const VTapeSettings *settings = MApplication::VApp()->TapeSettings();
@@ -204,6 +211,13 @@ void TapePreferencesPathPage::InitTable()
         ui->pathTable->setItem(3, 1, item);
     }
 
+    {
+        ui->pathTable->setItem(4, 0, new QTableWidgetItem(tr("My Layouts")));
+        QTableWidgetItem *item = new QTableWidgetItem(settings->GetPathManualLayouts());
+        item->setToolTip(settings->GetPathManualLayouts());
+        ui->pathTable->setItem(4, 1, item);
+    }
+
     ui->pathTable->verticalHeader()->setDefaultSectionSize(20);
     ui->pathTable->resizeColumnsToContents();
     ui->pathTable->resizeRowsToContents();
diff --git a/src/app/tape/dialogs/dialognewmeasurements.cpp b/src/app/tape/dialogs/dialognewmeasurements.cpp
index 2d0fa2202..7a2c83e79 100644
--- a/src/app/tape/dialogs/dialognewmeasurements.cpp
+++ b/src/app/tape/dialogs/dialognewmeasurements.cpp
@@ -30,7 +30,7 @@
 #include "ui_dialognewmeasurements.h"
 
 #include "../vpatterndb/variables/vmeasurement.h"
-#include "../vmisc/vtapesettings.h"
+#include "../vtapesettings.h"
 #include "../mapplication.h"
 
 #include <QShowEvent>
diff --git a/src/app/tape/dialogs/dialogtapepreferences.cpp b/src/app/tape/dialogs/dialogtapepreferences.cpp
index 11cf0e732..8be017276 100644
--- a/src/app/tape/dialogs/dialogtapepreferences.cpp
+++ b/src/app/tape/dialogs/dialogtapepreferences.cpp
@@ -89,7 +89,7 @@ void DialogTapePreferences::showEvent(QShowEvent *event)
     // do your init stuff here
 
     QSize sz = VAbstractApplication::VApp()->Settings()->GetPreferenceDialogSize();
-    if (sz.isEmpty() == false)
+    if (not sz.isEmpty())
     {
         resize(sz);
     }
diff --git a/src/app/tape/mapplication.cpp b/src/app/tape/mapplication.cpp
index 95807c57c..6727c3d93 100644
--- a/src/app/tape/mapplication.cpp
+++ b/src/app/tape/mapplication.cpp
@@ -382,7 +382,7 @@ bool MApplication::IsTestMode() const
  */
 bool MApplication::IsAppInGUIMode() const
 {
-    return IsTestMode();
+    return not IsTestMode();
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -436,8 +436,9 @@ void MApplication::InitOptions()
     ActivateDarkMode();
     QResource::registerResource(diagramsPath());
 }
-// Dark mode
 
+//---------------------------------------------------------------------------------------------------------------------
+// Dark mode
 void MApplication::ActivateDarkMode()
 {
     VTapeSettings *settings = MApplication::VApp()->TapeSettings();
@@ -861,6 +862,7 @@ TMainWindow *MApplication::NewMainWindow()
     if (not MApplication::VApp()->IsTestMode())
     {
         tape->show();
+        tape->UpdateWindowTitle();
     }
     return tape;
 }
diff --git a/src/app/tape/mapplication.h b/src/app/tape/mapplication.h
index 5725b6bbd..2e7010618 100644
--- a/src/app/tape/mapplication.h
+++ b/src/app/tape/mapplication.h
@@ -31,11 +31,10 @@
 
 #include "../vpatterndb/vtranslatevars.h"
 #include "../vmisc/def.h"
-#include "../vmisc/vtapesettings.h"
+#include "vtapesettings.h"
 #include "../vmisc/vabstractapplication.h"
 #include "dialogs/dialogmdatabase.h"
 
-class MApplication;// use in define
 class TMainWindow;
 class QLocalServer;
 
@@ -63,7 +62,7 @@ public:
 
     virtual void  OpenSettings() override;
     VTapeSettings *TapeSettings();
-    void               ActivateDarkMode();
+    void ActivateDarkMode();
 
     QString diagramsPath() const;
 
@@ -98,8 +97,8 @@ private:
 
     void Clean();
 };
-//---------------------------------------------------------------------------------------------------------------------
 
+//---------------------------------------------------------------------------------------------------------------------
 inline const VTranslateVars *MApplication::TrVars()
 {
     return trVars;
diff --git a/src/app/tape/tape.pri b/src/app/tape/tape.pri
index 32d965def..fd2e7443e 100644
--- a/src/app/tape/tape.pri
+++ b/src/app/tape/tape.pri
@@ -15,6 +15,7 @@ SOURCES  += \
     $$PWD/dialogs/dialogtapepreferences.cpp \
     $$PWD/dialogs/configpages/tapepreferencesconfigurationpage.cpp \
     $$PWD/dialogs/configpages/tapepreferencespathpage.cpp \
+    $$PWD/vtapesettings.cpp \
     $$PWD/dialogs/dialogsetupmultisize.cpp
 
 *msvc*:SOURCES += $$PWD/stable.cpp
@@ -34,6 +35,7 @@ HEADERS  += \
     $$PWD/dialogs/dialogtapepreferences.h \
     $$PWD/dialogs/configpages/tapepreferencesconfigurationpage.h \
     $$PWD/dialogs/configpages/tapepreferencespathpage.h \
+    $$PWD/vtapesettings.h \
     $$PWD/dialogs/dialogsetupmultisize.h
 
 FORMS    += \
diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp
index 78d89bab1..28b06e561 100644
--- a/src/app/tape/tmainwindow.cpp
+++ b/src/app/tape/tmainwindow.cpp
@@ -133,7 +133,7 @@ TMainWindow::TMainWindow(QWidget *parent)
     connect(gradation, &QTimer::timeout, this, &TMainWindow::GradationChanged);
 
     SetupMenu();
-    UpdateWindowTitle();
+
     ReadSettings();
 
 #if defined(Q_OS_MAC)
@@ -278,21 +278,20 @@ bool TMainWindow::LoadFile(const QString &path)
 
         // Check if file already opened
         const QList<TMainWindow*> list = MApplication::VApp()->MainWindows();
-        for (auto w : list)
+        auto w = std::find_if(list.begin(), list.end(),
+                              [path](TMainWindow *window) { return window->CurrentFile() == path; });
+        if (w != list.end())
         {
-            if (w->CurrentFile() == path)
-            {
-                w->activateWindow();
-                close();
-                return false;
-            }
+            (*w)->activateWindow();
+            close();
+            return false;
         }
 
         VlpCreateLock(lock, path);
 
         if (not lock->IsLocked())
         {
-            if (not IgnoreLocking(lock->GetLockError(), path))
+            if (not IgnoreLocking(lock->GetLockError(), path, MApplication::VApp()->IsAppInGUIMode()))
             {
                 return false;
             }
@@ -388,13 +387,6 @@ bool TMainWindow::LoadFile(const QString &path)
     return true;
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-void TMainWindow::ShowToolTip(const QString &toolTip)
-{
-    Q_UNUSED(toolTip)
-    // do nothing
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 void TMainWindow::FileNew()
 {
@@ -597,11 +589,13 @@ void TMainWindow::changeEvent(QEvent *event)
 {
     if (event->type() == QEvent::LanguageChange)
     {
-        VAbstractApplication::VApp()->Settings()->GetOsSeparator() ? setLocale(QLocale()) : setLocale(QLocale::c());
+        WindowsLocale();
 
         // retranslate designer form (single inheritance approach)
         ui->retranslateUi(this);
 
+        UpdateWindowTitle();
+
         InitMeasurementUnits();
 
         if (mType == MeasurementsType::Multisize)
@@ -782,48 +776,9 @@ bool TMainWindow::FileSave()
         return false;
     }
 
-#ifdef Q_OS_WIN32
-        qt_ntfs_permission_lookup++; // turn checking on
-#endif /*Q_OS_WIN32*/
-    const bool isFileWritable = QFileInfo(curFile).isWritable();
-#ifdef Q_OS_WIN32
-        qt_ntfs_permission_lookup--; // turn it off again
-#endif /*Q_OS_WIN32*/
-    if (not isFileWritable)
+    if (not CheckFilePermissions(curFile, this))
     {
-        QMessageBox messageBox(this);
-        messageBox.setIcon(QMessageBox::Question);
-        messageBox.setText(tr("The measurements document has no write permissions."));
-        messageBox.setInformativeText(tr("Do you want to change the premissions?"));
-        messageBox.setStandardButtons(QMessageBox::Yes | QMessageBox::Cancel);
-        messageBox.setDefaultButton(QMessageBox::Yes);
-
-        if (messageBox.exec() == QMessageBox::Yes)
-        {
-#ifdef Q_OS_WIN32
-            qt_ntfs_permission_lookup++; // turn checking on
-#endif /*Q_OS_WIN32*/
-            bool changed = QFile::setPermissions(curFile,
-                                                 QFileInfo(curFile).permissions() | QFileDevice::WriteUser);
-#ifdef Q_OS_WIN32
-            qt_ntfs_permission_lookup--; // turn it off again
-#endif /*Q_OS_WIN32*/
-
-            if (not changed)
-            {
-                messageBox.setIcon(QMessageBox::Warning);
-                messageBox.setText(tr("Cannot set permissions for %1 to writable.").arg(curFile));
-                messageBox.setInformativeText(tr("Could not save the file."));
-                messageBox.setStandardButtons(QMessageBox::Ok);
-                messageBox.setDefaultButton(QMessageBox::Ok);
-                messageBox.exec();
-                return false;
-            }
-        }
-        else
-        {
-            return false;
-        }
+        return false;
     }
 
     QString error;
@@ -2415,7 +2370,6 @@ void TMainWindow::SetupMenu()
     m_separatorAct->setVisible(false);
     ui->menuFile->insertAction(ui->actionPreferences, m_separatorAct );
 
-
     connect(ui->actionQuit, &QAction::triggered, this, &TMainWindow::close);
     ui->actionQuit->setShortcuts(QKeySequence::Quit);
 
@@ -3294,7 +3248,15 @@ void TMainWindow::UpdateWindowTitle()
     }
     else
     {
-        showName = tr("untitled %1").arg(MApplication::VApp()->MainWindows().size()+1);
+        int index = MApplication::VApp()->MainWindows().indexOf(this);
+        if (index != -1)
+        {
+            showName = tr("untitled %1").arg(index+1);
+        }
+        else
+        {
+            showName = tr("untitled");
+        }
         mType == MeasurementsType::Multisize ? showName += QLatin1String(".vst") : showName += QLatin1String(".vit");
     }
 
@@ -3530,21 +3492,20 @@ bool TMainWindow::LoadFromExistingFile(const QString &path)
 
         // Check if file already opened
         const QList<TMainWindow*> list = MApplication::VApp()->MainWindows();
-        for (auto w : list)
+        auto w = std::find_if(list.begin(), list.end(),
+                              [path](TMainWindow *window) { return window->CurrentFile() == path; });
+        if (w != list.end())
         {
-            if (w->CurrentFile() == path)
-            {
-                w->activateWindow();
-                close();
-                return false;
-            }
+            (*w)->activateWindow();
+            close();
+            return false;
         }
 
         VlpCreateLock(lock, path);
 
         if (not lock->IsLocked())
         {
-            if (not IgnoreLocking(lock->GetLockError(), path))
+            if (not IgnoreLocking(lock->GetLockError(), path, MApplication::VApp()->IsAppInGUIMode()))
             {
                 return false;
             }
@@ -3658,7 +3619,11 @@ void TMainWindow::CreateWindowMenu(QMenu *menu)
             window->isWindowModified() ? title.replace(index, 3, QChar('*')) : title.replace(index, 3, QString());
         }
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
         QAction *action = menu->addAction(title, this, SLOT(ShowWindow()));
+#else
+        QAction *action = menu->addAction(title, this, &TMainWindow::ShowWindow);
+#endif //QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
         action->setData(i);
         action->setCheckable(true);
         action->setMenuRole(QAction::NoRole);
@@ -3669,72 +3634,6 @@ void TMainWindow::CreateWindowMenu(QMenu *menu)
     }
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-bool TMainWindow::IgnoreLocking(int error, const QString &path)
-{
-    QMessageBox::StandardButton answer = QMessageBox::Abort;
-    if (not MApplication::VApp()->IsTestMode())
-    {
-        switch(error)
-        {
-            case QLockFile::LockFailedError:
-                answer = QMessageBox::warning(this, tr("Locking file"),
-                                              tr("This file already opened in another window. Ignore if you want "
-                                                 "to continue (not recommended, can cause a data corruption)."),
-                                              QMessageBox::Abort|QMessageBox::Ignore, QMessageBox::Abort);
-                break;
-            case QLockFile::PermissionError:
-                answer = QMessageBox::question(this, tr("Locking file"),
-                                               tr("The lock file could not be created, for lack of permissions. "
-                                                  "Ignore if you want to continue (not recommended, can cause "
-                                                  "a data corruption)."),
-                                               QMessageBox::Abort|QMessageBox::Ignore, QMessageBox::Abort);
-                break;
-            case QLockFile::UnknownError:
-                answer = QMessageBox::question(this, tr("Locking file"),
-                                               tr("Unknown error happened, for instance a full partition "
-                                                  "prevented writing out the lock file. Ignore if you want to "
-                                                  "continue (not recommended, can cause a data corruption)."),
-                                               QMessageBox::Abort|QMessageBox::Ignore, QMessageBox::Abort);
-                break;
-            default:
-                answer = QMessageBox::Abort;
-                break;
-        }
-    }
-
-    if (answer == QMessageBox::Abort)
-    {
-        qCDebug(tMainWindow, "Failed to lock %s", qUtf8Printable(path));
-        qCDebug(tMainWindow, "Error type: %d", error);
-        if (MApplication::VApp()->IsTestMode())
-        {
-            switch(error)
-            {
-                case QLockFile::LockFailedError:
-                    qCCritical(tMainWindow, "%s",
-                               qUtf8Printable(tr("This file already opened in another window.")));
-                    break;
-                case QLockFile::PermissionError:
-                    qCCritical(tMainWindow, "%s",
-                               qUtf8Printable(tr("The lock file could not be created, for lack of permissions.")));
-                    break;
-                case QLockFile::UnknownError:
-                    qCCritical(tMainWindow, "%s",
-                               qUtf8Printable(tr("Unknown error happened, for instance a full partition "
-                                                 "prevented writing out the lock file.")));
-                    break;
-                default:
-                    break;
-            }
-
-            qApp->exit(V_EX_NOINPUT);
-        }
-        return false;
-    }
-    return true;
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 void TMainWindow::HackDimensionBaseValue()
 {
diff --git a/src/app/tape/tmainwindow.h b/src/app/tape/tmainwindow.h
index d8040d6f3..2bb9436e1 100644
--- a/src/app/tape/tmainwindow.h
+++ b/src/app/tape/tmainwindow.h
@@ -65,8 +65,7 @@ public:
 
     bool LoadFile(const QString &path);
 
-public slots:
-    virtual void ShowToolTip(const QString &toolTip) override;
+    void UpdateWindowTitle();
 
 protected:
     virtual void closeEvent(QCloseEvent *event) override;
@@ -218,7 +217,6 @@ private:
     void MeasurementGUI();
     void Controls();
     void MFields(bool enabled);
-    void UpdateWindowTitle();
 
     void ReadSettings();
     void WriteSettings();
@@ -231,8 +229,6 @@ private:
 
     void CreateWindowMenu(QMenu *menu);
 
-    bool IgnoreLocking(int error, const QString &path);
-
     template <class T>
     void HackWidget(T **widget);
     void HackDimensionBaseValue();
diff --git a/src/libs/vmisc/vtapesettings.cpp b/src/app/tape/vtapesettings.cpp
similarity index 100%
rename from src/libs/vmisc/vtapesettings.cpp
rename to src/app/tape/vtapesettings.cpp
diff --git a/src/libs/vmisc/vtapesettings.h b/src/app/tape/vtapesettings.h
similarity index 100%
rename from src/libs/vmisc/vtapesettings.h
rename to src/app/tape/vtapesettings.h
diff --git a/src/app/valentina/core/core.pri b/src/app/valentina/core/core.pri
index 8cd2a23c9..f77f5e908 100644
--- a/src/app/valentina/core/core.pri
+++ b/src/app/valentina/core/core.pri
@@ -6,7 +6,7 @@ HEADERS += \
     $$PWD/vformulaproperty.h \
     $$PWD/vformulapropertyeditor.h \
     $$PWD/vtooloptionspropertybrowser.h \
-    $$PWD/vcmdexport.h
+    $$PWD/vcmdexport.h 
 
 SOURCES += \
     $$PWD/vapplication.cpp \
diff --git a/src/app/valentina/core/vapplication.cpp b/src/app/valentina/core/vapplication.cpp
index 648050fd9..f5456f2b7 100644
--- a/src/app/valentina/core/vapplication.cpp
+++ b/src/app/valentina/core/vapplication.cpp
@@ -39,7 +39,7 @@
 #include "../qmuparser/qmuparsererror.h"
 #include "../mainwindow.h"
 #include "../vmisc/qt_dispatch/qt_dispatch.h"
-#include "../vmisc/vsettings.h"
+#include "vvalentinasettings.h"
 
 #include <QtDebug>
 #include <QDir>
@@ -64,6 +64,28 @@ QT_WARNING_POP
 
 Q_DECL_CONSTEXPR auto DAYS_TO_KEEP_LOGS = 3;
 
+namespace
+{
+QString AppFilePath(const QString &appName)
+{
+    QString appNameExe = appName;
+#ifdef Q_OS_WIN
+    appNameExe += ".exe";
+#endif
+    QFileInfo canonicalFile(QString("%1/%2").arg(QCoreApplication::applicationDirPath(), appNameExe));
+    if (canonicalFile.exists())
+    {
+        return canonicalFile.absoluteFilePath();
+    }
+    else
+    {
+        QFileInfo debugFile(QString("%1/../../%2/bin/%3")
+                                .arg(QCoreApplication::applicationDirPath(), appName, appNameExe));
+        return debugFile.exists() ? debugFile.absoluteFilePath() : appNameExe;
+    }
+}
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 inline void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
 {
@@ -442,9 +464,10 @@ bool VApplication::notify(QObject *receiver, QEvent *event)
     return false;
 }
 
+//---------------------------------------------------------------------------------------------------------------------
 void VApplication::ActivateDarkMode()
 {
-     VSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
+     VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
      if (settings->GetDarkMode())
      {
          QFile f(QStringLiteral(":qdarkstyle/style.qss"));
@@ -462,58 +485,16 @@ void VApplication::ActivateDarkMode()
      }
 }
 
-
 //---------------------------------------------------------------------------------------------------------------------
 QString VApplication::TapeFilePath() const
 {
-    const QString tape = QStringLiteral("tape");
-#ifdef Q_OS_WIN
-    QFileInfo tapeFile(QCoreApplication::applicationDirPath() + "/" + tape + ".exe");
-    if (tapeFile.exists())
-    {
-        return tapeFile.absoluteFilePath();
-    }
-    else
-    {
-        return QCoreApplication::applicationDirPath() + "/../../tape/bin/" + tape + ".exe";
-    }
-#elif defined(Q_OS_MAC)
-    QFileInfo tapeFile(QCoreApplication::applicationDirPath() + "/" + tape);
-    if (tapeFile.exists())
-    {
-        return tapeFile.absoluteFilePath();
-    }
-    else
-    {
-        QFileInfo file(QCoreApplication::applicationDirPath() + "/../../tape/bin/" + tape);
-        if (file.exists())
-        {
-            return file.absoluteFilePath();
-        }
-        else
-        {
-            return tape;
-        }
-    }
-#else // Unix
-    QFileInfo file(QCoreApplication::applicationDirPath() + "/../../tape/bin/" + tape);
-    if (file.exists())
-    {
-        return file.absoluteFilePath();
-    }
-    else
-    {
-        QFileInfo tapeFile(QCoreApplication::applicationDirPath() + "/" + tape);
-        if (tapeFile.exists())
-        {
-            return tapeFile.absoluteFilePath();
-        }
-        else
-        {
-            return tape;
-        }
-    }
-#endif
+    return AppFilePath(QStringLiteral("tape"));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QString VApplication::PuzzleFilePath() const
+{
+    return AppFilePath(QStringLiteral("puzzle"));
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/app/valentina/core/vapplication.h b/src/app/valentina/core/vapplication.h
index a0b10b4e8..103087837 100644
--- a/src/app/valentina/core/vapplication.h
+++ b/src/app/valentina/core/vapplication.h
@@ -53,6 +53,7 @@ public:
     void               InitOptions();
 
     QString            TapeFilePath() const;
+    QString            PuzzleFilePath() const;
 
     QTimer             *getAutoSaveTimer() const;
     void               setAutoSaveTimer(QTimer *value);
diff --git a/src/app/valentina/core/vcmdexport.cpp b/src/app/valentina/core/vcmdexport.cpp
index 3cdde15a6..ec8cd4225 100644
--- a/src/app/valentina/core/vcmdexport.cpp
+++ b/src/app/valentina/core/vcmdexport.cpp
@@ -32,7 +32,7 @@
 #include "../ifc/xml/vdomdocument.h"
 #include "../vformat/vmeasurements.h"
 #include "../vmisc/commandoptions.h"
-#include "../vmisc/vsettings.h"
+#include "vvalentinasettings.h"
 #include "../vmisc/dialogs/dialogexporttocsv.h"
 #include "../vlayout/vlayoutgenerator.h"
 #include "../vpatterndb/variables/vmeasurement.h"
@@ -834,7 +834,7 @@ QStringList VCommandLine::OptionValues(const QString &option) const
 //---------------------------------------------------------------------------------------------------------------------
 int VCommandLine::OptNestingTime() const
 {
-    int time = VSettings::GetDefNestingTime();
+    int time = VValentinaSettings::GetDefNestingTime();
     if (IsOptionSet(LONG_OPTION_NESTING_TIME))
     {
         bool ok = false;
@@ -854,7 +854,7 @@ int VCommandLine::OptNestingTime() const
 //---------------------------------------------------------------------------------------------------------------------
 qreal VCommandLine::OptEfficiencyCoefficient() const
 {
-    qreal coefficient = VSettings::GetDefEfficiencyCoefficient();
+    qreal coefficient = VValentinaSettings::GetDefEfficiencyCoefficient();
     if (IsOptionSet(LONG_OPTION_EFFICIENCY_COEFFICIENT))
     {
         bool ok = false;
diff --git a/src/app/valentina/dialogs/configpages/preferencesconfigurationpage.cpp b/src/app/valentina/dialogs/configpages/preferencesconfigurationpage.cpp
index e2f5320f4..22737dad9 100644
--- a/src/app/valentina/dialogs/configpages/preferencesconfigurationpage.cpp
+++ b/src/app/valentina/dialogs/configpages/preferencesconfigurationpage.cpp
@@ -30,7 +30,7 @@
 #include "ui_preferencesconfigurationpage.h"
 #include "../../core/vapplication.h"
 #include "../vpatterndb/pmsystems.h"
-#include "../vmisc/vsettings.h"
+#include "../vmisc/vvalentinasettings.h"
 
 #include <QDir>
 #include <QDirIterator>
@@ -112,13 +112,13 @@ PreferencesConfigurationPage::PreferencesConfigurationPage(QWidget *parent)
     //----------------------------- Pattern Editing
     connect(ui->resetWarningsButton, &QPushButton::released, this, []()
     {
-        VSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
+        VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
 
         settings->SetConfirmItemDelete(true);
         settings->SetConfirmFormatRewriting(true);
     });
 
-    VSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
+    VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
 
     ui->checkBoxFreeCurve->setChecked(settings->IsFreeCurveMode());
     ui->checkBoxZoomFitBestCurrentPP->setChecked(settings->IsDoubleClickZoomFitBestCurrentPP());
@@ -136,24 +136,24 @@ PreferencesConfigurationPage::PreferencesConfigurationPage(QWidget *parent)
     ui->checkBoxDontUseNativeDialog->setChecked(settings->IsDontUseNativeDialog());
 
     // Tab Scrolling
-    ui->spinBoxDuration->setMinimum(VSettings::scrollingDurationMin);
-    ui->spinBoxDuration->setMaximum(VSettings::scrollingDurationMax);
+    ui->spinBoxDuration->setMinimum(VCommonSettings::scrollingDurationMin);
+    ui->spinBoxDuration->setMaximum(VCommonSettings::scrollingDurationMax);
     ui->spinBoxDuration->setValue(settings->GetScrollingDuration());
 
-    ui->spinBoxUpdateInterval->setMinimum(VSettings::scrollingUpdateIntervalMin);
-    ui->spinBoxUpdateInterval->setMaximum(VSettings::scrollingUpdateIntervalMax);
+    ui->spinBoxUpdateInterval->setMinimum(VCommonSettings::scrollingUpdateIntervalMin);
+    ui->spinBoxUpdateInterval->setMaximum(VCommonSettings::scrollingUpdateIntervalMax);
     ui->spinBoxUpdateInterval->setValue(settings->GetScrollingUpdateInterval());
 
-    ui->doubleSpinBoxSensor->setMinimum(VSettings::sensorMouseScaleMin);
-    ui->doubleSpinBoxSensor->setMaximum(VSettings::sensorMouseScaleMax);
+    ui->doubleSpinBoxSensor->setMinimum(VCommonSettings::sensorMouseScaleMin);
+    ui->doubleSpinBoxSensor->setMaximum(VCommonSettings::sensorMouseScaleMax);
     ui->doubleSpinBoxSensor->setValue(settings->GetSensorMouseScale());
 
-    ui->doubleSpinBoxWheel->setMinimum(VSettings::wheelMouseScaleMin);
-    ui->doubleSpinBoxWheel->setMaximum(VSettings::wheelMouseScaleMax);
+    ui->doubleSpinBoxWheel->setMinimum(VCommonSettings::wheelMouseScaleMin);
+    ui->doubleSpinBoxWheel->setMaximum(VCommonSettings::wheelMouseScaleMax);
     ui->doubleSpinBoxWheel->setValue(settings->GetWheelMouseScale());
 
-    ui->doubleSpinBoxAcceleration->setMinimum(VSettings::scrollingAccelerationMin);
-    ui->doubleSpinBoxAcceleration->setMaximum(VSettings::scrollingAccelerationMax);
+    ui->doubleSpinBoxAcceleration->setMinimum(VCommonSettings::scrollingAccelerationMin);
+    ui->doubleSpinBoxAcceleration->setMaximum(VCommonSettings::scrollingAccelerationMax);
     ui->doubleSpinBoxAcceleration->setValue(settings->GetScrollingAcceleration());
 }
 
@@ -168,7 +168,7 @@ QStringList PreferencesConfigurationPage::Apply()
 {
     // Tab General
     QStringList preferences;
-    VSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
+    VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
     settings->SetAutosaveState(ui->autoSaveCheck->isChecked());
     settings->SetAutosaveTime(ui->autoTime->value());
 
diff --git a/src/app/valentina/dialogs/configpages/preferencesconfigurationpage.ui b/src/app/valentina/dialogs/configpages/preferencesconfigurationpage.ui
index 5004dcd15..17f6b00c3 100644
--- a/src/app/valentina/dialogs/configpages/preferencesconfigurationpage.ui
+++ b/src/app/valentina/dialogs/configpages/preferencesconfigurationpage.ui
@@ -33,9 +33,9 @@
           <property name="geometry">
            <rect>
             <x>0</x>
-            <y>-189</y>
+            <y>0</y>
             <width>624</width>
-            <height>745</height>
+            <height>765</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_2">
diff --git a/src/app/valentina/dialogs/configpages/preferencespathpage.cpp b/src/app/valentina/dialogs/configpages/preferencespathpage.cpp
index 6ffe3b2df..92651e534 100644
--- a/src/app/valentina/dialogs/configpages/preferencespathpage.cpp
+++ b/src/app/valentina/dialogs/configpages/preferencespathpage.cpp
@@ -28,7 +28,7 @@
 
 #include "preferencespathpage.h"
 #include "ui_preferencespathpage.h"
-#include "../vmisc/vsettings.h"
+#include "../vmisc/vvalentinasettings.h"
 #include "../../core/vapplication.h"
 
 #include <QDir>
@@ -65,13 +65,14 @@ PreferencesPathPage::~PreferencesPathPage()
 //---------------------------------------------------------------------------------------------------------------------
 QStringList PreferencesPathPage::Apply()
 {
-    VSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
+    VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
     settings->SetPathIndividualMeasurements(ui->pathTable->item(0, 1)->text());
     settings->SetPathMultisizeMeasurements(ui->pathTable->item(1, 1)->text());
     settings->SetPathPattern(ui->pathTable->item(2, 1)->text());
     settings->SetPathLayout(ui->pathTable->item(3, 1)->text());
     settings->SetPathTemplate(ui->pathTable->item(4, 1)->text());
     settings->SetPathLabelTemplate(ui->pathTable->item(5, 1)->text());
+    settings->SetPathManualLayouts(ui->pathTable->item(6, 1)->text());
 
     return QStringList(); // No changes those require restart.
 }
@@ -104,13 +105,13 @@ void PreferencesPathPage::DefaultPath()
             path = VCommonSettings::GetDefPathMultisizeMeasurements();
             break;
         case 2: // pattern path
-            path = VSettings::GetDefPathPattern();
+            path = VValentinaSettings::GetDefPathPattern();
             break;
         case 0: // individual measurements
             path = VCommonSettings::GetDefPathIndividualMeasurements();
             break;
         case 3: // layout path
-            path = VSettings::GetDefPathLayout();
+            path = VValentinaSettings::GetDefPathLayout();
             break;
         case 4: // templates
             path = VCommonSettings::GetDefPathTemplate();
@@ -118,6 +119,9 @@ void PreferencesPathPage::DefaultPath()
         case 5: // label templates
             path = VCommonSettings::GetDefPathLabelTemplate();
             break;
+        case 6: // manual layouts
+            path = VCommonSettings::GetDefPathManualLayouts();
+            break;
         default:
             break;
     }
@@ -155,6 +159,9 @@ void PreferencesPathPage::EditPath()
         case 5: // label templates
             path = VAbstractValApplication::VApp()->ValentinaSettings()->GetPathLabelTemplate();
             break;
+        case 6: // manual layouts
+            path = VAbstractValApplication::VApp()->ValentinaSettings()->GetPathManualLayouts();
+            break;
         default:
             break;
     }
@@ -192,10 +199,10 @@ void PreferencesPathPage::EditPath()
 void PreferencesPathPage::InitTable()
 {
     ui->pathTable->clearContents();
-    ui->pathTable->setRowCount(6);
+    ui->pathTable->setRowCount(7);
     ui->pathTable->setColumnCount(2);
 
-    const VSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
+    const VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
 
     {
         ui->pathTable->setItem(0, 0, new QTableWidgetItem(tr("My Individual Measurements")));
@@ -239,6 +246,13 @@ void PreferencesPathPage::InitTable()
         ui->pathTable->setItem(5, 1, item);
     }
 
+    {
+        ui->pathTable->setItem(6, 0, new QTableWidgetItem(tr("My manual layouts")));
+        QTableWidgetItem *item = new QTableWidgetItem(settings->GetPathManualLayouts());
+        item->setToolTip(settings->GetPathManualLayouts());
+        ui->pathTable->setItem(6, 1, item);
+    }
+
     ui->pathTable->verticalHeader()->setDefaultSectionSize(20);
     ui->pathTable->resizeColumnsToContents();
     ui->pathTable->resizeRowsToContents();
diff --git a/src/app/valentina/dialogs/configpages/preferencespatternpage.cpp b/src/app/valentina/dialogs/configpages/preferencespatternpage.cpp
index 193a48960..535c68be4 100644
--- a/src/app/valentina/dialogs/configpages/preferencespatternpage.cpp
+++ b/src/app/valentina/dialogs/configpages/preferencespatternpage.cpp
@@ -32,7 +32,7 @@
 #include "../ifc/xml/vabstractpattern.h"
 #include "../dialogdatetimeformats.h"
 #include "../dialogknownmaterials.h"
-#include "../vmisc/vsettings.h"
+#include "../vmisc/vvalentinasettings.h"
 
 #include <QMessageBox>
 #include <QDate>
@@ -64,7 +64,7 @@ PreferencesPatternPage::PreferencesPatternPage(QWidget *parent)
     ui->setupUi(this);
     RetranslateUi();
 
-    VSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
+    VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
 
     ui->graphOutputCheck->setChecked(settings->GetGraphicalOutput());
     ui->checkBoxOpenGLRender->setChecked(settings->IsOpenGLRender());
@@ -126,7 +126,7 @@ QStringList PreferencesPatternPage::Apply()
 {
     QStringList preferences;
 
-    VSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
+    VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
 
     // Scene antialiasing
     if (settings->GetGraphicalOutput() != ui->graphOutputCheck->isChecked())
@@ -202,7 +202,7 @@ void PreferencesPatternPage::changeEvent(QEvent *event)
 //---------------------------------------------------------------------------------------------------------------------
 void PreferencesPatternPage::EditDateTimeFormats()
 {
-    VSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
+    VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
 
     QPushButton *button = qobject_cast<QPushButton *>(sender());
     if (button == ui->pushButtonEditDateFormats)
@@ -232,7 +232,7 @@ void PreferencesPatternPage::ManageKnownMaterials()
 //---------------------------------------------------------------------------------------------------------------------
 void PreferencesPatternPage::InitLabelDateTimeFormats()
 {
-    VSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
+    VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
 
     InitComboBoxFormats(ui->comboBoxDateFormats,
                         VCommonSettings::PredefinedDateFormats() + settings->GetUserDefinedDateFormats(),
diff --git a/src/app/valentina/dialogs/dialogaboutapp.cpp b/src/app/valentina/dialogs/dialogaboutapp.cpp
index d4efe750c..f1046c9ba 100644
--- a/src/app/valentina/dialogs/dialogaboutapp.cpp
+++ b/src/app/valentina/dialogs/dialogaboutapp.cpp
@@ -35,7 +35,7 @@
 #include <QtDebug>
 #include "../core/vapplication.h"
 #include "../fervor/fvupdater.h"
-#include "../vmisc/vsettings.h"
+#include "../vmisc/vvalentinasettings.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 DialogAboutApp::DialogAboutApp(QWidget *parent) :
diff --git a/src/app/valentina/dialogs/dialogfinalmeasurements.cpp b/src/app/valentina/dialogs/dialogfinalmeasurements.cpp
index f6b2e8845..490796738 100644
--- a/src/app/valentina/dialogs/dialogfinalmeasurements.cpp
+++ b/src/app/valentina/dialogs/dialogfinalmeasurements.cpp
@@ -28,7 +28,7 @@
 
 #include "dialogfinalmeasurements.h"
 #include "ui_dialogfinalmeasurements.h"
-#include "../vmisc/vsettings.h"
+#include "../vmisc/vvalentinasettings.h"
 #include "../vmisc/compatibility.h"
 #include "../qmuparser/qmudef.h"
 #include "../qmuparser/qmutokenparser.h"
diff --git a/src/app/valentina/dialogs/dialogincrements.cpp b/src/app/valentina/dialogs/dialogincrements.cpp
index c50fdd14e..adf88c226 100644
--- a/src/app/valentina/dialogs/dialogincrements.cpp
+++ b/src/app/valentina/dialogs/dialogincrements.cpp
@@ -29,7 +29,7 @@
 #include "dialogincrements.h"
 #include "ui_dialogincrements.h"
 #include "../vwidgets/vwidgetpopup.h"
-#include "../vmisc/vsettings.h"
+#include "../vmisc/vvalentinasettings.h"
 #include "../qmuparser/qmudef.h"
 #include "../qmuparser/qmutokenparser.h"
 #include "../vpatterndb/vtranslatevars.h"
diff --git a/src/app/valentina/dialogs/dialoglayoutprogress.cpp b/src/app/valentina/dialogs/dialoglayoutprogress.cpp
index c760b0b54..1427c89aa 100644
--- a/src/app/valentina/dialogs/dialoglayoutprogress.cpp
+++ b/src/app/valentina/dialogs/dialoglayoutprogress.cpp
@@ -29,7 +29,7 @@
 #include "dialoglayoutprogress.h"
 #include "ui_dialoglayoutprogress.h"
 #include "../core/vapplication.h"
-#include "../vmisc/vsettings.h"
+#include "../vmisc/vvalentinasettings.h"
 
 #include <QMessageBox>
 #include <QPushButton>
diff --git a/src/app/valentina/dialogs/dialoglayoutsettings.cpp b/src/app/valentina/dialogs/dialoglayoutsettings.cpp
index 87a573f6a..9155d0201 100644
--- a/src/app/valentina/dialogs/dialoglayoutsettings.cpp
+++ b/src/app/valentina/dialogs/dialoglayoutsettings.cpp
@@ -30,7 +30,7 @@
 #include "ui_dialoglayoutsettings.h"
 #include "../core/vapplication.h"
 #include "../ifc/xml/vdomdocument.h"
-#include "../vmisc/vsettings.h"
+#include "../vmisc/vvalentinasettings.h"
 #include "../vmisc/vmath.h"
 #include "../vlayout/vlayoutgenerator.h"
 
@@ -699,17 +699,17 @@ void DialogLayoutSettings::RestoreDefaults()
     InitPrinter();
     ui->comboBoxPrinter->blockSignals(false);
 
-    SetLayoutWidth(VSettings::GetDefLayoutWidth());
-    SetGroup(VSettings::GetDefLayoutGroup());
-    SetFollowGrainline(VSettings::GetDefLayoutFollowGrainline());
-    SetManualPriority(VSettings::GetDefLayoutManualPriority());
+    SetLayoutWidth(VValentinaSettings::GetDefLayoutWidth());
+    SetGroup(VValentinaSettings::GetDefLayoutGroup());
+    SetFollowGrainline(VValentinaSettings::GetDefLayoutFollowGrainline());
+    SetManualPriority(VValentinaSettings::GetDefLayoutManualPriority());
     SetFields(GetDefPrinterFields());
-    SetIgnoreAllFields(VSettings::GetDefIgnoreAllFields());
-    SetMultiplier(VSettings::GetDefMultiplier());
-    SetNestingTime(VSettings::GetDefNestingTime());
-    SetEfficiencyCoefficient(VSettings::GetDefEfficiencyCoefficient());
-    SetNestQuantity(VSettings::GetDefLayoutNestQuantity());
-    SetPreferOneSheetSolution(VSettings::GetDefLayoutPreferOneSheetSolution());
+    SetIgnoreAllFields(VValentinaSettings::GetDefIgnoreAllFields());
+    SetMultiplier(VValentinaSettings::GetDefMultiplier());
+    SetNestingTime(VValentinaSettings::GetDefNestingTime());
+    SetEfficiencyCoefficient(VValentinaSettings::GetDefEfficiencyCoefficient());
+    SetNestQuantity(VValentinaSettings::GetDefLayoutNestQuantity());
+    SetPreferOneSheetSolution(VValentinaSettings::GetDefLayoutPreferOneSheetSolution());
 
     CorrectMaxFileds();
     IgnoreAllFields(ui->checkBoxIgnoreFileds->isChecked());
@@ -1019,7 +1019,7 @@ void DialogLayoutSettings::MinimumLayoutSize()
 //---------------------------------------------------------------------------------------------------------------------
 void DialogLayoutSettings::ReadSettings()
 {
-    const VSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
+    const VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
     SetLayoutWidth(settings->GetLayoutWidth());
     SetNestingTime(settings->GetNestingTime());
     SetEfficiencyCoefficient(settings->GetEfficiencyCoefficient());
@@ -1051,7 +1051,7 @@ void DialogLayoutSettings::ReadSettings()
 //---------------------------------------------------------------------------------------------------------------------
 void DialogLayoutSettings::WriteSettings() const
 {
-    VSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
+    VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
     settings->SetLayoutWidth(GetLayoutWidth());
     settings->SetLayoutGroup(GetGroup());
     settings->SetLayoutPaperHeight(GetPaperHeight());
diff --git a/src/app/valentina/dialogs/dialognewpattern.cpp b/src/app/valentina/dialogs/dialognewpattern.cpp
index a84bd292f..7a1f076b7 100644
--- a/src/app/valentina/dialogs/dialognewpattern.cpp
+++ b/src/app/valentina/dialogs/dialognewpattern.cpp
@@ -29,7 +29,7 @@
 #include "dialognewpattern.h"
 #include "ui_dialognewpattern.h"
 #include "../core/vapplication.h"
-#include "../vmisc/vsettings.h"
+#include "../vmisc/vvalentinasettings.h"
 #include "../vpatterndb/vcontainer.h"
 
 #include <QFileDialog>
diff --git a/src/app/valentina/dialogs/dialogpatternproperties.cpp b/src/app/valentina/dialogs/dialogpatternproperties.cpp
index 8f8acc0ae..0868f34e7 100644
--- a/src/app/valentina/dialogs/dialogpatternproperties.cpp
+++ b/src/app/valentina/dialogs/dialogpatternproperties.cpp
@@ -42,7 +42,7 @@
 #include "../core/vapplication.h"
 #include "../vtools/dialogs/support/dialogeditlabel.h"
 #include "dialogknownmaterials.h"
-#include "../vmisc/vsettings.h"
+#include "../vmisc/vvalentinasettings.h"
 #include "../qmuparser/qmudef.h"
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -60,7 +60,7 @@ DialogPatternProperties::DialogPatternProperties(VPattern *doc,  VContainer *pat
 
     SCASSERT(doc != nullptr)
 
-    VSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
+    VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
     settings->GetOsSeparator() ? setLocale(QLocale()) : setLocale(QLocale::c());
 
     if (VAbstractValApplication::VApp()->GetPatternPath().isEmpty())
@@ -137,6 +137,11 @@ DialogPatternProperties::DialogPatternProperties(VPattern *doc,  VContainer *pat
     m_completer->setModelSorting(QCompleter::UnsortedModel);
     m_completer->setFilterMode(Qt::MatchContains);
     m_completer->setCaseSensitivity(Qt::CaseSensitive);
+    connect(m_completer, QOverload<const QString &>::of(&QCompleter::activated), this, [this]()
+    {
+        ValidatePassmarkLength();
+        DescEdited();
+    });
 
     ui->lineEditPassmarkLength->setCompleter(m_completer);
     connect(ui->lineEditPassmarkLength, &QLineEdit::textEdited, this, [this]()
diff --git a/src/app/valentina/dialogs/dialogpreferences.cpp b/src/app/valentina/dialogs/dialogpreferences.cpp
index 83ae97e77..cbd2106d5 100644
--- a/src/app/valentina/dialogs/dialogpreferences.cpp
+++ b/src/app/valentina/dialogs/dialogpreferences.cpp
@@ -32,7 +32,7 @@
 #include "configpages/preferencesconfigurationpage.h"
 #include "configpages/preferencespatternpage.h"
 #include "configpages/preferencespathpage.h"
-#include "../vmisc/vsettings.h"
+#include "../vmisc/vvalentinasettings.h"
 
 #include <QMessageBox>
 #include <QPushButton>
diff --git a/src/app/valentina/dialogs/dialogsavelayout.cpp b/src/app/valentina/dialogs/dialogsavelayout.cpp
index 3b514ba27..980ebcf9f 100644
--- a/src/app/valentina/dialogs/dialogsavelayout.cpp
+++ b/src/app/valentina/dialogs/dialogsavelayout.cpp
@@ -29,7 +29,7 @@
 #include "dialogsavelayout.h"
 #include "ui_dialogsavelayout.h"
 #include "../core/vapplication.h"
-#include "../vmisc/vsettings.h"
+#include "../vmisc/vvalentinasettings.h"
 #include "../ifc/exception/vexception.h"
 #include "../vlayout/vlayoutexporter.h"
 
@@ -69,8 +69,7 @@ DialogSaveLayout::DialogSaveLayout(int count, Draw mode, const QString &fileName
     ui->lineEditPath->setClearButtonEnabled(true);
     ui->lineEditFileName->setClearButtonEnabled(true);
 
-    VAbstractValApplication::VApp()->ValentinaSettings()->GetOsSeparator() ? setLocale(QLocale())
-                                                                           : setLocale(QLocale::c());
+    VAbstractApplication::VApp()->Settings()->GetOsSeparator() ? setLocale(QLocale()) : setLocale(QLocale::c());
 
     QPushButton *bOk = ui->buttonBox->button(QDialogButtonBox::Ok);
     SCASSERT(bOk != nullptr)
@@ -112,6 +111,7 @@ DialogSaveLayout::DialogSaveLayout(int count, Draw mode, const QString &fileName
     }
     else
     {
+        RemoveFormatFromList(LayoutExportFormats::RLD);
         ui->checkBoxTextAsPaths->setVisible(false);
     }
 
@@ -148,7 +148,7 @@ DialogSaveLayout::DialogSaveLayout(int count, Draw mode, const QString &fileName
 
     ui->lineEditPath->setText(VAbstractValApplication::VApp()->ValentinaSettings()->GetPathLayout());
 
-    InitTemplates(ui->comboBoxTemplates);
+    InitTileTemplates(ui->comboBoxTemplates);
 
     connect(ui->toolButtonScaleConnected, &QToolButton::clicked, this, &DialogSaveLayout::ToggleScaleConnection);
 
@@ -162,20 +162,6 @@ DialogSaveLayout::DialogSaveLayout(int count, Draw mode, const QString &fileName
     ShowExample();//Show example for current format.
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-void DialogSaveLayout::InitTemplates(QComboBox *comboBoxTemplates)
-{
-    SCASSERT(comboBoxTemplates != nullptr)
-    VAbstractLayoutDialog::InitTemplates(comboBoxTemplates);
-
-    // remove unused formats
-    for (int i = static_cast<int>(PaperSizeTemplate::Roll24in); i <= static_cast<int>(PaperSizeTemplate::Custom); ++i)
-    {
-       comboBoxTemplates->removeItem(comboBoxTemplates->findData(i));
-    }
-}
-
-
 //---------------------------------------------------------------------------------------------------------------------
 
 void DialogSaveLayout::SelectFormat(LayoutExportFormats format)
@@ -235,6 +221,7 @@ void DialogSaveLayout::SetBinaryDXFFormat(bool binary)
         case LayoutExportFormats::PS:
         case LayoutExportFormats::EPS:
         case LayoutExportFormats::NC:
+        case LayoutExportFormats::RLD:
         case LayoutExportFormats::TIF:
         default:
             ui->checkBoxBinaryDXF->setChecked(false);
@@ -283,6 +270,7 @@ bool DialogSaveLayout::IsBinaryDXFFormat() const
         case LayoutExportFormats::PS:
         case LayoutExportFormats::EPS:
         case LayoutExportFormats::NC:
+        case LayoutExportFormats::RLD:
         case LayoutExportFormats::TIF:
         default:
             return false;
@@ -344,147 +332,6 @@ Draw DialogSaveLayout::Mode() const
     return m_mode;
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-QString DialogSaveLayout::ExportFormatDescription(LayoutExportFormats format)
-{
-    const QString dxfSuffix = QStringLiteral("(*.dxf)");
-    const QString dxfFlatFilesStr = tr("(flat) files");
-    const QString filesStr = tr("files");
-
-    switch(format)
-    {
-        case LayoutExportFormats::SVG:
-            return QStringLiteral("Svg %1 (*.svg)").arg(filesStr);
-        case LayoutExportFormats::PDF:
-            return QStringLiteral("PDF %1 (*.pdf)").arg(filesStr);
-        case LayoutExportFormats::PNG:
-            return tr("Image files") + QStringLiteral(" (*.png)");
-        case LayoutExportFormats::OBJ:
-            return QStringLiteral("Wavefront OBJ (*.obj)");
-        case LayoutExportFormats::PS:
-            return QStringLiteral("PS %1 (*.ps)").arg(filesStr);
-        case LayoutExportFormats::EPS:
-            return QStringLiteral("EPS %1 (*.eps)").arg(filesStr);
-        case LayoutExportFormats::DXF_AC1006_Flat:
-            return QStringLiteral("AutoCAD DXF R10 %1 %2").arg(dxfFlatFilesStr, dxfSuffix);
-        case LayoutExportFormats::DXF_AC1009_Flat:
-            return QStringLiteral("AutoCAD DXF R11/12 %1 %2").arg(dxfFlatFilesStr, dxfSuffix);
-        case LayoutExportFormats::DXF_AC1012_Flat:
-            return QStringLiteral("AutoCAD DXF R13 %1 %2").arg(dxfFlatFilesStr, dxfSuffix);
-        case LayoutExportFormats::DXF_AC1014_Flat:
-            return QStringLiteral("AutoCAD DXF R14 %1 %2").arg(dxfFlatFilesStr, dxfSuffix);
-        case LayoutExportFormats::DXF_AC1015_Flat:
-            return QStringLiteral("AutoCAD DXF 2000 %1 %2").arg(dxfFlatFilesStr, dxfSuffix);
-        case LayoutExportFormats::DXF_AC1018_Flat:
-            return QStringLiteral("AutoCAD DXF 2004 %1 %2").arg(dxfFlatFilesStr, dxfSuffix);
-        case LayoutExportFormats::DXF_AC1021_Flat:
-            return QStringLiteral("AutoCAD DXF 2007 %1 %2").arg(dxfFlatFilesStr, dxfSuffix);
-        case LayoutExportFormats::DXF_AC1024_Flat:
-            return QStringLiteral("AutoCAD DXF 2010 %1 %2").arg(dxfFlatFilesStr, dxfSuffix);
-        case LayoutExportFormats::DXF_AC1027_Flat:
-            return QStringLiteral("AutoCAD DXF 2013 %1 %2").arg(dxfFlatFilesStr, dxfSuffix);
-        case LayoutExportFormats::DXF_AC1006_AAMA:
-            return QStringLiteral("AutoCAD DXF R10 AAMA %1 %2").arg(filesStr, dxfSuffix);
-        case LayoutExportFormats::DXF_AC1009_AAMA:
-            return QStringLiteral("AutoCAD DXF R11/12 AAMA %1 %2").arg(filesStr, dxfSuffix);
-        case LayoutExportFormats::DXF_AC1012_AAMA:
-            return QStringLiteral("AutoCAD DXF R13 AAMA %1 %2").arg(filesStr, dxfSuffix);
-        case LayoutExportFormats::DXF_AC1014_AAMA:
-            return QStringLiteral("AutoCAD DXF R14 AAMA %1 %2").arg(filesStr, dxfSuffix);
-        case LayoutExportFormats::DXF_AC1015_AAMA:
-            return QStringLiteral("AutoCAD DXF 2000 AAMA %1 %2").arg(filesStr, dxfSuffix);
-        case LayoutExportFormats::DXF_AC1018_AAMA:
-            return QStringLiteral("AutoCAD DXF 2004 AAMA %1 %2").arg(filesStr, dxfSuffix);
-        case LayoutExportFormats::DXF_AC1021_AAMA:
-            return QStringLiteral("AutoCAD DXF 2007 AAMA %1 %2").arg(filesStr, dxfSuffix);
-        case LayoutExportFormats::DXF_AC1024_AAMA:
-            return QStringLiteral("AutoCAD DXF 2010 AAMA %1 %2").arg(filesStr, dxfSuffix);
-        case LayoutExportFormats::DXF_AC1027_AAMA:
-            return QStringLiteral("AutoCAD DXF 2013 AAMA %1 %2").arg(filesStr, dxfSuffix);
-        case LayoutExportFormats::DXF_AC1006_ASTM:
-            return QStringLiteral("AutoCAD DXF R10 ASTM %1 %2").arg(filesStr, dxfSuffix);
-        case LayoutExportFormats::DXF_AC1009_ASTM:
-            return QStringLiteral("AutoCAD DXF R11/12 ASTM %1 %2").arg(filesStr, dxfSuffix);
-        case LayoutExportFormats::DXF_AC1012_ASTM:
-            return QStringLiteral("AutoCAD DXF R13 ASTM %1 %2").arg(filesStr, dxfSuffix);
-        case LayoutExportFormats::DXF_AC1014_ASTM:
-            return QStringLiteral("AutoCAD DXF R14 ASTM %1 %2").arg(filesStr, dxfSuffix);
-        case LayoutExportFormats::DXF_AC1015_ASTM:
-            return QStringLiteral("AutoCAD DXF 2000 ASTM %1 %2").arg(filesStr, dxfSuffix);
-        case LayoutExportFormats::DXF_AC1018_ASTM:
-            return QStringLiteral("AutoCAD DXF 2004 ASTM %1 %2").arg(filesStr, dxfSuffix);
-        case LayoutExportFormats::DXF_AC1021_ASTM:
-            return QStringLiteral("AutoCAD DXF 2007 ASTM %1 %2").arg(filesStr, dxfSuffix);
-        case LayoutExportFormats::DXF_AC1024_ASTM:
-            return QStringLiteral("AutoCAD DXF 2010 ASTM %1 %2").arg(filesStr, dxfSuffix);
-        case LayoutExportFormats::DXF_AC1027_ASTM:
-            return QStringLiteral("AutoCAD DXF 2013 ASTM %1 %2").arg(filesStr, dxfSuffix);
-        case LayoutExportFormats::PDFTiled:
-            return QStringLiteral("PDF %1 %2 (*.pdf)").arg(tr("tiled"), filesStr);
-        case LayoutExportFormats::NC:
-            return QStringLiteral("%1 %2 (*.nc)").arg(tr("Numerical control"), filesStr);
-        case LayoutExportFormats::TIF:
-            return QStringLiteral("TIFF %1 (*.tif)").arg(filesStr);
-        default:
-            return QString();
-    }
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-QString DialogSaveLayout::ExportFormatSuffix(LayoutExportFormats format)
-{
-    switch(format)
-    {
-        case LayoutExportFormats::SVG:
-            return QStringLiteral(".svg");
-        case LayoutExportFormats::PDF:
-        case LayoutExportFormats::PDFTiled:
-            return QStringLiteral(".pdf");
-        case LayoutExportFormats::PNG:
-            return QStringLiteral(".png");
-        case LayoutExportFormats::OBJ:
-            return QStringLiteral(".obj");
-        case LayoutExportFormats::PS:
-            return QStringLiteral(".ps");
-        case LayoutExportFormats::EPS:
-            return QStringLiteral(".eps");
-        case LayoutExportFormats::DXF_AC1006_Flat:
-        case LayoutExportFormats::DXF_AC1009_Flat:
-        case LayoutExportFormats::DXF_AC1012_Flat:
-        case LayoutExportFormats::DXF_AC1014_Flat:
-        case LayoutExportFormats::DXF_AC1015_Flat:
-        case LayoutExportFormats::DXF_AC1018_Flat:
-        case LayoutExportFormats::DXF_AC1021_Flat:
-        case LayoutExportFormats::DXF_AC1024_Flat:
-        case LayoutExportFormats::DXF_AC1027_Flat:
-        case LayoutExportFormats::DXF_AC1006_AAMA:
-        case LayoutExportFormats::DXF_AC1009_AAMA:
-        case LayoutExportFormats::DXF_AC1012_AAMA:
-        case LayoutExportFormats::DXF_AC1014_AAMA:
-        case LayoutExportFormats::DXF_AC1015_AAMA:
-        case LayoutExportFormats::DXF_AC1018_AAMA:
-        case LayoutExportFormats::DXF_AC1021_AAMA:
-        case LayoutExportFormats::DXF_AC1024_AAMA:
-        case LayoutExportFormats::DXF_AC1027_AAMA:
-        case LayoutExportFormats::DXF_AC1006_ASTM:
-        case LayoutExportFormats::DXF_AC1009_ASTM:
-        case LayoutExportFormats::DXF_AC1012_ASTM:
-        case LayoutExportFormats::DXF_AC1014_ASTM:
-        case LayoutExportFormats::DXF_AC1015_ASTM:
-        case LayoutExportFormats::DXF_AC1018_ASTM:
-        case LayoutExportFormats::DXF_AC1021_ASTM:
-        case LayoutExportFormats::DXF_AC1024_ASTM:
-        case LayoutExportFormats::DXF_AC1027_ASTM:
-            return QStringLiteral(".dxf");
-        case LayoutExportFormats::NC:
-            return QStringLiteral(".nc");
-        case LayoutExportFormats::TIF:
-            return QStringLiteral(".tif");
-        default:
-            return QString();
-    }
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 DialogSaveLayout::~DialogSaveLayout()
 {
@@ -516,7 +363,7 @@ void DialogSaveLayout::Save()
 
     for (int i=0; i < count; ++i)
     {
-        const QString name = Path()+'/'+FileName()+QString::number(i+1)+ExportFormatSuffix(Format());
+        const QString name = Path()+'/'+FileName()+QString::number(i+1)+VLayoutExporter::ExportFormatSuffix(Format());
         if (QFile::exists(name))
         {
             QMessageBox::StandardButton res = QMessageBox::question(this, tr("Name conflict"),
@@ -564,11 +411,12 @@ void DialogSaveLayout::PathChanged(const QString &text)
 void DialogSaveLayout::ShowExample()
 {
     const LayoutExportFormats currentFormat = Format();
-    ui->labelExample->setText(tr("Example:") + FileName() + QLatin1Char('1') + ExportFormatSuffix(currentFormat));
+    ui->labelExample->setText(tr("Example:") + FileName() + QLatin1Char('1') + VLayoutExporter::ExportFormatSuffix(currentFormat));
 
     ui->checkBoxBinaryDXF->setEnabled(false);
     ui->groupBoxPaperFormat->setEnabled(false);
     ui->groupBoxMargins->setEnabled(false);
+    ui->checkBoxTextAsPaths->setEnabled(true);
 
     switch(currentFormat)
     {
@@ -605,6 +453,9 @@ void DialogSaveLayout::ShowExample()
             ui->groupBoxPaperFormat->setEnabled(true);
             ui->groupBoxMargins->setEnabled(true);
             break;
+        case LayoutExportFormats::RLD:
+            ui->checkBoxTextAsPaths->setEnabled(false);
+            break;
         case LayoutExportFormats::SVG:
         case LayoutExportFormats::PDF:
         case LayoutExportFormats::PNG:
@@ -809,7 +660,7 @@ QVector<std::pair<QString, LayoutExportFormats> > DialogSaveLayout::InitFormats(
 
     auto InitFormat = [&list](LayoutExportFormats format)
     {
-        list.append(std::make_pair(ExportFormatDescription(format), format));
+        list.append(std::make_pair(VLayoutExporter::ExportFormatDescription(format), format));
     };
 
     InitFormat(LayoutExportFormats::SVG);
@@ -850,6 +701,7 @@ QVector<std::pair<QString, LayoutExportFormats> > DialogSaveLayout::InitFormats(
     InitFormat(LayoutExportFormats::DXF_AC1027_ASTM);
     InitFormat(LayoutExportFormats::PDFTiled); 
 //    InitFormat(LayoutExportFormats::NC);
+    InitFormat(LayoutExportFormats::RLD);
     InitFormat(LayoutExportFormats::TIF);
 
     return list;
@@ -873,7 +725,7 @@ void DialogSaveLayout::RemoveFormatFromList(LayoutExportFormats format)
  */
 void DialogSaveLayout::ReadSettings()
 {
-    VSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
+    VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
     const Unit unit = VAbstractValApplication::VApp()->patternUnits();
 
     // read Margins top, right, bottom, left
@@ -936,7 +788,7 @@ void DialogSaveLayout::WriteSettings() const
         return;
     }
 
-    VSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
+    VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
     const Unit unit = VAbstractValApplication::VApp()->patternUnits();
 
     // write Margins top, right, bottom, left
diff --git a/src/app/valentina/dialogs/dialogsavelayout.h b/src/app/valentina/dialogs/dialogsavelayout.h
index 4eaafc775..3daee718f 100644
--- a/src/app/valentina/dialogs/dialogsavelayout.h
+++ b/src/app/valentina/dialogs/dialogsavelayout.h
@@ -61,9 +61,6 @@ public:
 
     Draw Mode() const;
 
-    static QString ExportFormatDescription(LayoutExportFormats format);
-    static QString ExportFormatSuffix(LayoutExportFormats format);
-
     bool IsTextAsPaths() const;
     void SetTextAsPaths(bool textAsPaths);
 
@@ -86,7 +83,6 @@ public:
 
 protected:
     virtual void showEvent(QShowEvent *event) override;
-    void InitTemplates(QComboBox *comboBoxTemplates);
 
 private slots:
     void Save();
diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp
index f3c687682..c57d987bf 100644
--- a/src/app/valentina/mainwindow.cpp
+++ b/src/app/valentina/mainwindow.cpp
@@ -38,7 +38,7 @@
 #include "version.h"
 #include "core/vapplication.h"
 #include "../vmisc/customevents.h"
-#include "../vmisc/vsettings.h"
+#include "../vmisc/vvalentinasettings.h"
 #include "../vmisc/def.h"
 #include "../vmisc/qxtcsvmodel.h"
 #include "../vmisc/vmodifierkey.h"
@@ -65,10 +65,11 @@
 #include "../qmuparser/qmuparsererror.h"
 #include "../vtools/dialogs/support/dialogeditlabel.h"
 #include "../vformat/vpatternrecipe.h"
-#include "watermarkwindow.h"
+#include "../vlayout/dialogs/watermarkwindow.h"
 #include "../vmisc/backport/qoverload.h"
 #include "../vlayout/vlayoutexporter.h"
 #include "../vwidgets/vgraphicssimpletextitem.h"
+#include "../vlayout/dialogs/dialoglayoutscale.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
 #include "../vmisc/backport/qscopeguard.h"
@@ -331,7 +332,7 @@ MainWindow::MainWindow(QWidget *parent)
 
     connect(ui->toolButtonMessagesZoomInFont, &QToolButton::clicked, this, [this]()
     {
-        VSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
+        VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
         QFont f = ui->plainTextEditPatternMessages->font();
         if (f.pointSize() < settings->GetDefMaxPatternMessageFontSize())
         {
@@ -343,7 +344,7 @@ MainWindow::MainWindow(QWidget *parent)
 
     connect(ui->toolButtonMessagesZoomOutFont, &QToolButton::clicked, this, [this]()
     {
-        VSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
+        VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
         QFont f = ui->plainTextEditPatternMessages->font();
         if (f.pointSize() > settings->GetDefMinPatternMessageFontSize())
         {
@@ -2452,7 +2453,7 @@ void MainWindow::ToolBarTools()
     ui->actionIncreaseLabelFont->setShortcut(QKeySequence(Qt::ShiftModifier + Qt::Key_Plus));
     connect(ui->actionIncreaseLabelFont, &QAction::triggered, this, [this]()
     {
-        VSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
+        VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
         settings->SetLabelFontSize(settings->GetLabelFontSize() + 1);
         if (sceneDraw)
         {
@@ -2468,7 +2469,7 @@ void MainWindow::ToolBarTools()
     ui->actionDecreaseLabelFont->setShortcut(QKeySequence(Qt::ShiftModifier + Qt::Key_Minus));
     connect(ui->actionDecreaseLabelFont, &QAction::triggered, this, [this]()
     {
-        VSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
+        VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
         settings->SetLabelFontSize(settings->GetLabelFontSize() - 1);
         if (sceneDraw)
         {
@@ -2484,7 +2485,7 @@ void MainWindow::ToolBarTools()
     ui->actionOriginalLabelFont->setShortcut(QKeySequence(Qt::ShiftModifier + Qt::Key_0));
     connect(ui->actionOriginalLabelFont, &QAction::triggered, this, [this]()
     {
-        VSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
+        VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
         settings->SetLabelFontSize(settings->GetDefLabelFontSize());
         if (sceneDraw)
         {
@@ -3318,52 +3319,9 @@ bool MainWindow::on_actionSave_triggered()
             return false;
         }
 
-#ifdef Q_OS_WIN32
-        qt_ntfs_permission_lookup++; // turn checking on
-#endif /*Q_OS_WIN32*/
-        const bool isFileWritable = QFileInfo(VAbstractValApplication::VApp()->GetPatternPath()).isWritable();
-#ifdef Q_OS_WIN32
-        qt_ntfs_permission_lookup--; // turn it off again
-#endif /*Q_OS_WIN32*/
-        if (not isFileWritable)
+        if (not CheckFilePermissions(VAbstractValApplication::VApp()->GetPatternPath(), this))
         {
-            QMessageBox messageBox(this);
-            messageBox.setIcon(QMessageBox::Question);
-            messageBox.setText(tr("The document has no write permissions."));
-            messageBox.setInformativeText(tr("Do you want to change the premissions?"));
-            messageBox.setStandardButtons(QMessageBox::Yes | QMessageBox::Cancel);
-            messageBox.setDefaultButton(QMessageBox::Yes);
-
-            if (messageBox.exec() == QMessageBox::Yes)
-            {
-#ifdef Q_OS_WIN32
-                qt_ntfs_permission_lookup++; // turn checking on
-#endif /*Q_OS_WIN32*/
-                bool changed =
-                        QFile::setPermissions(VAbstractValApplication::VApp()->GetPatternPath(),
-                                              QFileInfo(VAbstractValApplication::VApp()
-                                                        ->GetPatternPath()).permissions() | QFileDevice::WriteUser);
-#ifdef Q_OS_WIN32
-                qt_ntfs_permission_lookup--; // turn it off again
-#endif /*Q_OS_WIN32*/
-
-                if (not changed)
-                {
-                    QMessageBox messageBox(this);
-                    messageBox.setIcon(QMessageBox::Warning);
-                    messageBox.setText(tr("Cannot set permissions for %1 to writable.")
-                                       .arg(VAbstractValApplication::VApp()->GetPatternPath()));
-                    messageBox.setInformativeText(tr("Could not save the file."));
-                    messageBox.setDefaultButton(QMessageBox::Ok);
-                    messageBox.setStandardButtons(QMessageBox::Ok);
-                    messageBox.exec();
-                    return false;
-                }
-            }
-            else
-            {
-                return false;
-            }
+            return false;
         }
 
         QString error;
@@ -3418,6 +3376,166 @@ void MainWindow::on_actionOpen_triggered()
     LoadPattern(filePath);
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+void MainWindow::on_actionOpenPuzzle_triggered()
+{
+    const QString puzzle = VApplication::VApp()->PuzzleFilePath();
+    const QString workingDirectory = QFileInfo(puzzle).absoluteDir().absolutePath();
+
+    QStringList arguments;
+    if (isNoScaling)
+    {
+        arguments.append(QLatin1String("--") + LONG_OPTION_NO_HDPI_SCALING);
+    }
+
+    QProcess::startDetached(puzzle, arguments, workingDirectory);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void MainWindow::on_actionCreateManualLayout_triggered()
+{
+    QTemporaryFile rldFile(QDir::tempPath()+"/puzzle.rld.XXXXXX");
+    if (rldFile.open())
+    {
+        QVector<DetailForLayout> detailsInLayout = SortDetailsForLayout(pattern->DataPieces());
+
+        if (detailsInLayout.count() == 0)
+        {
+            QMessageBox::information(this, tr("Layout mode"),  tr("You don't have enough details to export. Please, "
+                                                                 "include at least one detail in layout."),
+                                     QMessageBox::Ok, QMessageBox::Ok);
+            return;
+        }
+
+        QVector<VLayoutPiece> listDetails;
+        try
+        {
+            listDetails = PrepareDetailsForLayout(detailsInLayout);
+        }
+        catch (VException &e)
+        {
+            QMessageBox::warning(this, tr("Export details"),
+                                 tr("Can't export details.") + QLatin1String(" \n") + e.ErrorMessage(),
+                                 QMessageBox::Ok, QMessageBox::Ok);
+            return;
+        }
+
+        DialogLayoutScale layoutScale(false, this);
+        layoutScale.SetXScale(1);
+        layoutScale.SetYScale(1);
+        layoutScale.exec();
+
+        VLayoutExporter exporter;
+        exporter.SetFileName(rldFile.fileName());
+        exporter.SetXScale(layoutScale.GetXScale());
+        exporter.SetYScale(layoutScale.GetYScale());
+        exporter.ExportToRLD(listDetails);
+
+        QStringList arguments {"-r", rldFile.fileName()};
+        if (isNoScaling)
+        {
+            arguments.append(QLatin1String("--") + LONG_OPTION_NO_HDPI_SCALING);
+        }
+
+        rldFile.setAutoRemove(false);
+
+        const QString puzzle = VApplication::VApp()->PuzzleFilePath();
+        const QString workingDirectory = QFileInfo(puzzle).absoluteDir().absolutePath();
+        QProcess::startDetached(puzzle, arguments, workingDirectory);
+    }
+    else
+    {
+        qCCritical(vMainWindow, "%s", qUtf8Printable(tr("Unable to prepare raw layout data.")));
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void MainWindow::on_actionUpdateManualLayout_triggered()
+{
+    const QString filter(tr("Manual layout files") + QLatin1String(" (*.vlt)"));
+
+    //Use standard path to manual layouts
+    const QString path = VAbstractValApplication::VApp()->ValentinaSettings()->GetPathManualLayouts();
+
+    bool usedNotExistedDir = false;
+    QDir directory(path);
+    if (not directory.exists())
+    {
+        usedNotExistedDir = directory.mkpath(QChar('.'));
+    }
+
+    auto RemoveUnsuded = qScopeGuard([usedNotExistedDir, path]()
+    {
+        if (usedNotExistedDir)
+        {
+            QDir directory(path);
+            directory.rmpath(QChar('.'));
+        }
+    });
+
+    const QString filePath = QFileDialog::getOpenFileName(this, tr("Select manual layout"), path, filter, nullptr);
+
+    if (filePath.isEmpty())
+    {
+        return;
+    }
+
+    QTemporaryFile rldFile(QDir::tempPath()+"/puzzle.rld.XXXXXX");
+    rldFile.setAutoRemove(false);
+    if (rldFile.open())
+    {
+        QVector<DetailForLayout> detailsInLayout = SortDetailsForLayout(pattern->DataPieces());
+
+        if (detailsInLayout.count() == 0)
+        {
+            QMessageBox::information(this, tr("Layout mode"),  tr("You don't have enough details to export. Please, "
+                                                                 "include at least one detail in layout."),
+                                     QMessageBox::Ok, QMessageBox::Ok);
+            return;
+        }
+
+        QVector<VLayoutPiece> listDetails;
+        try
+        {
+            listDetails = PrepareDetailsForLayout(detailsInLayout);
+        }
+        catch (VException &e)
+        {
+            QMessageBox::warning(this, tr("Export details"),
+                                 tr("Can't export details.") + QLatin1String(" \n") + e.ErrorMessage(),
+                                 QMessageBox::Ok, QMessageBox::Ok);
+            return;
+        }
+
+        DialogLayoutScale layoutScale(false, this);
+        layoutScale.SetXScale(1);
+        layoutScale.SetYScale(1);
+        layoutScale.exec();
+
+        VLayoutExporter exporter;
+        exporter.SetFileName(rldFile.fileName());
+        exporter.SetXScale(layoutScale.GetXScale());
+        exporter.SetYScale(layoutScale.GetYScale());
+        exporter.ExportToRLD(listDetails);
+
+        QStringList arguments {filePath, "-r", rldFile.fileName()};
+        if (isNoScaling)
+        {
+            arguments.append(QLatin1String("--") + LONG_OPTION_NO_HDPI_SCALING);
+        }
+
+        rldFile.setAutoRemove(false);
+
+        const QString puzzle = VApplication::VApp()->PuzzleFilePath();
+        const QString workingDirectory = QFileInfo(puzzle).absoluteDir().absolutePath();
+        QProcess::startDetached(puzzle, arguments, workingDirectory);
+    }
+    else
+    {
+        qCCritical(vMainWindow, "%s", qUtf8Printable(tr("Unable to prepare raw layout data.")));
+    }
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief Clear reset to default window.
@@ -3823,7 +3941,9 @@ void MainWindow::SetEnableWidgets(bool enable)
 {
     const bool drawStage = (VAbstractValApplication::VApp()->GetDrawMode() == Draw::Calculation);
     const bool detailsStage = (VAbstractValApplication::VApp()->GetDrawMode() == Draw::Modeling);
+    const bool layoutStage = (VAbstractValApplication::VApp()->GetDrawMode() == Draw::Layout);
     const bool designStage = (drawStage || detailsStage);
+    const bool piecesStage = (detailsStage || layoutStage);
 
     comboBoxDraws->setEnabled(enable && drawStage);
     ui->actionOptionDraw->setEnabled(enable && drawStage);
@@ -3857,6 +3977,8 @@ void MainWindow::SetEnableWidgets(bool enable)
     ui->actionDecreaseLabelFont->setEnabled(enable);
     ui->actionOriginalLabelFont->setEnabled(enable);
     ui->actionHideLabels->setEnabled(enable);
+    ui->actionCreateManualLayout->setEnabled(enable && piecesStage);
+    ui->actionUpdateManualLayout->setEnabled(enable && piecesStage);
 
     ui->actionLoadWatermark->setEnabled(enable);
     ui->actionRemoveWatermark->setEnabled(enable && not doc->GetWatermarkPath().isEmpty());
@@ -4401,7 +4523,7 @@ void MainWindow::setCurrentFile(const QString &fileName)
     if (not VAbstractValApplication::VApp()->GetPatternPath().isEmpty() && VApplication::IsGUIMode())
     {
         qCDebug(vMainWindow, "Updating recent file list.");
-        VSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
+        VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
         QStringList files = settings->GetRecentFileList();
         files.removeAll(fileName);
         files.prepend(fileName);
@@ -4430,7 +4552,7 @@ void MainWindow::setCurrentFile(const QString &fileName)
 void MainWindow::ReadSettings()
 {
     qCDebug(vMainWindow, "Reading settings.");
-    const VSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
+    const VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
 
     if (settings->status() == QSettings::NoError)
     {
@@ -4475,7 +4597,7 @@ void MainWindow::WriteSettings()
 {
     ActionDraw(true);
 
-    VSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
+    VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
     settings->SetGeometry(saveGeometry());
     settings->SetWindowState(saveState());
     settings->SetToolbarsState(saveState(APP_VERSION));
@@ -5243,7 +5365,7 @@ bool MainWindow::LoadPattern(QString fileName, const QString& customMeasureFile)
     }
     else
     {
-        if (not IgnoreLocking(lock->GetLockError(), fileName))
+        if (not IgnoreLocking(lock->GetLockError(), fileName, VApplication::IsGUIMode()))
         {
             return false;
         }
@@ -6375,73 +6497,6 @@ void MainWindow::UpdateWindowTitle()
 #endif //defined(Q_OS_MAC)
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-bool MainWindow::IgnoreLocking(int error, const QString &path)
-{
-    QMessageBox::StandardButton answer = QMessageBox::Abort;
-    if (VApplication::IsGUIMode())
-    {
-        switch(error)
-        {
-            case QLockFile::LockFailedError:
-                answer = QMessageBox::warning(this, tr("Locking file"),
-                                               tr("This file already opened in another window. Ignore if you want "
-                                                  "to continue (not recommended, can cause a data corruption)."),
-                                               QMessageBox::Abort|QMessageBox::Ignore, QMessageBox::Abort);
-                break;
-            case QLockFile::PermissionError:
-                answer = QMessageBox::question(this, tr("Locking file"),
-                                               tr("The lock file could not be created, for lack of permissions. "
-                                                  "Ignore if you want to continue (not recommended, can cause "
-                                                  "a data corruption)."),
-                                               QMessageBox::Abort|QMessageBox::Ignore, QMessageBox::Abort);
-                break;
-            case QLockFile::UnknownError:
-                answer = QMessageBox::question(this, tr("Locking file"),
-                                               tr("Unknown error happened, for instance a full partition prevented "
-                                                  "writing out the lock file. Ignore if you want to continue (not "
-                                                  "recommended, can cause a data corruption)."),
-                                               QMessageBox::Abort|QMessageBox::Ignore, QMessageBox::Abort);
-                break;
-            default:
-                answer = QMessageBox::Abort;
-                break;
-        }
-    }
-
-    if (answer == QMessageBox::Abort)
-    {
-        qCDebug(vMainWindow, "Failed to lock %s", qUtf8Printable(path));
-        qCDebug(vMainWindow, "Error type: %d", error);
-        Clear();
-        if (not VApplication::IsGUIMode())
-        {
-            switch(error)
-            {
-                case QLockFile::LockFailedError:
-                    qCCritical(vMainWindow, "%s",
-                               qUtf8Printable(tr("This file already opened in another window.")));
-                    break;
-                case QLockFile::PermissionError:
-                    qCCritical(vMainWindow, "%s",
-                               qUtf8Printable(tr("The lock file could not be created, for lack of permissions.")));
-                    break;
-                case QLockFile::UnknownError:
-                    qCCritical(vMainWindow, "%s",
-                               qUtf8Printable(tr("Unknown error happened, for instance a full partition prevented "
-                                                 "writing out the lock file.")));
-                    break;
-                default:
-                    break;
-            }
-
-            qApp->exit(V_EX_NOINPUT);
-        }
-        return false;
-    }
-    return true;
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 void MainWindow::ToolSelectPoint()
 {
diff --git a/src/app/valentina/mainwindow.h b/src/app/valentina/mainwindow.h
index b6a9136be..f456b7e07 100644
--- a/src/app/valentina/mainwindow.h
+++ b/src/app/valentina/mainwindow.h
@@ -188,6 +188,10 @@ private slots:
     bool on_actionSave_triggered();
     void on_actionOpen_triggered();
 
+    void on_actionOpenPuzzle_triggered();
+    void on_actionCreateManualLayout_triggered();
+    void on_actionUpdateManualLayout_triggered();
+
     void ClosedDialogUnionDetails(int result);
     void ClosedDialogDuplicateDetail(int result);
     void ClosedDialogGroup(int result);
@@ -389,8 +393,6 @@ private:
 
     void               UpdateWindowTitle();
 
-    bool               IgnoreLocking(int error, const QString &path);
-
     void ToolSelectPoint();
     void ToolSelectPointByPress();
     void ToolSelectPointByRelease();
diff --git a/src/app/valentina/mainwindow.ui b/src/app/valentina/mainwindow.ui
index 53bf8b65c..21deed217 100644
--- a/src/app/valentina/mainwindow.ui
+++ b/src/app/valentina/mainwindow.ui
@@ -1119,7 +1119,7 @@
        <property name="geometry">
         <rect>
          <x>0</x>
-         <y>-53</y>
+         <y>0</y>
          <width>126</width>
          <height>237</height>
         </rect>
@@ -1828,12 +1828,21 @@
     <addaction name="actionLoadWatermark"/>
     <addaction name="actionRemoveWatermark"/>
    </widget>
+   <widget class="QMenu" name="menuManual_Layout">
+    <property name="title">
+     <string>Manual Layout</string>
+    </property>
+    <addaction name="actionOpenPuzzle"/>
+    <addaction name="actionCreateManualLayout"/>
+    <addaction name="actionUpdateManualLayout"/>
+   </widget>
    <addaction name="menuFile"/>
    <addaction name="menuPatternPiece"/>
    <addaction name="menuMode"/>
    <addaction name="menuMeasurements"/>
    <addaction name="menuHistory"/>
    <addaction name="menuWatermark"/>
+   <addaction name="menuManual_Layout"/>
    <addaction name="menuWindow"/>
    <addaction name="menuHelp"/>
   </widget>
@@ -3008,7 +3017,7 @@
   </action>
   <action name="actionLoadWatermark">
    <property name="enabled">
-    <bool>false</bool>
+    <bool>true</bool>
    </property>
    <property name="icon">
     <iconset theme="document-open">
@@ -3050,6 +3059,36 @@
     <string>Create or edit a watermark</string>
    </property>
   </action>
+  <action name="actionOpenPuzzle">
+   <property name="text">
+    <string>Open Puzzle</string>
+   </property>
+   <property name="toolTip">
+    <string>Open the Puzzle app</string>
+   </property>
+  </action>
+  <action name="actionCreateManualLayout">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Create</string>
+   </property>
+   <property name="toolTip">
+    <string>Create manual layout</string>
+   </property>
+  </action>
+  <action name="actionUpdateManualLayout">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Update</string>
+   </property>
+   <property name="toolTip">
+    <string>Update manual layout</string>
+   </property>
+  </action>
   <action name="actionShop">
    <property name="text">
     <string>Shop</string>
diff --git a/src/app/valentina/mainwindowsnogui.cpp b/src/app/valentina/mainwindowsnogui.cpp
index 6df6607e9..900111ec3 100644
--- a/src/app/valentina/mainwindowsnogui.cpp
+++ b/src/app/valentina/mainwindowsnogui.cpp
@@ -54,7 +54,8 @@
 #include "../ifc/xml/vvstconverter.h"
 #include "../ifc/xml/vvitconverter.h"
 #include "../ifc/xml/vwatermarkconverter.h"
-#include "../vmisc/vsettings.h"
+#include "../vlayout/vrawlayout.h"
+#include "../vmisc/vvalentinasettings.h"
 
 #include <QFileDialog>
 #include <QFileInfo>
@@ -505,14 +506,15 @@ void MainWindowsNoGUI::ExportData(const QVector<VLayoutPiece> &listDetails)
         format == LayoutExportFormats::DXF_AC1018_ASTM ||
         format == LayoutExportFormats::DXF_AC1021_ASTM ||
         format == LayoutExportFormats::DXF_AC1024_ASTM ||
-        format == LayoutExportFormats::DXF_AC1027_ASTM)
+        format == LayoutExportFormats::DXF_AC1027_ASTM ||
+        format == LayoutExportFormats::RLD)
     {
         if (m_dialogSaveLayout->Mode() == Draw::Layout)
         {
             for (int i = 0; i < detailsOnLayout.size(); ++i)
             {
                 const QString name = m_dialogSaveLayout->Path() + '/' + m_dialogSaveLayout->FileName() +
-                        QString::number(i+1) + DialogSaveLayout::ExportFormatSuffix(m_dialogSaveLayout->Format());
+                        QString::number(i+1) + VLayoutExporter::ExportFormatSuffix(m_dialogSaveLayout->Format());
 
                 QGraphicsRectItem *paper = qgraphicsitem_cast<QGraphicsRectItem *>(
                             m_layoutSettings->LayoutPapers().at(i));
@@ -746,6 +748,9 @@ void MainWindowsNoGUI::ExportApparelLayout(const QVector<VLayoutPiece> &details,
             exporter.SetDxfVersion(DRW::AC1027);
             exporter.ExportToAAMADXF(details);
             break;
+        case LayoutExportFormats::RLD:
+            exporter.ExportToRLD(details);
+            break;
         default:
             qDebug() << "Can't recognize file type." << Q_FUNC_INFO;
             break;
@@ -774,6 +779,7 @@ void MainWindowsNoGUI::ExportDetailsAsApparelLayout(QVector<VLayoutPiece> listDe
         {
             const qreal x = item->boundingRect().x();
             piece.Mirror();
+            delete item;
             item = piece.GetItem(m_dialogSaveLayout->IsTextAsPaths());
             diff = item->boundingRect().x() - x;
         }
@@ -828,7 +834,7 @@ void MainWindowsNoGUI::ExportDetailsAsApparelLayout(QVector<VLayoutPiece> listDe
     }
 
     const QString name = m_dialogSaveLayout->Path() + '/' + m_dialogSaveLayout->FileName() +
-            QString::number(1) + DialogSaveLayout::ExportFormatSuffix(m_dialogSaveLayout->Format());
+            QString::number(1) + VLayoutExporter::ExportFormatSuffix(m_dialogSaveLayout->Format());
 
     ExportApparelLayout(listDetails, name, rect.size());
 }
@@ -855,7 +861,7 @@ void MainWindowsNoGUI::PrintPreviewTiled()
     }
     else
     {
-        VSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
+        VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
         m_layoutSettings->SetTiledMargins(QMarginsF(settings->GetTiledPDFMargins(Unit::Mm)));
         m_layoutSettings->SetTiledPDFOrientation(settings->GetTiledPDFOrientation());
         m_layoutSettings->SetTiledPDFPaperSize(QSizeF(settings->GetTiledPDFPaperWidth(Unit::Mm),
@@ -889,7 +895,7 @@ void MainWindowsNoGUI::PrintTiled()
     }
     else
     {
-        VSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
+        VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
         m_layoutSettings->SetTiledMargins(QMarginsF(settings->GetTiledPDFMargins(Unit::Mm)));
         m_layoutSettings->SetTiledPDFOrientation(settings->GetTiledPDFOrientation());
         m_layoutSettings->SetTiledPDFPaperSize(QSizeF(settings->GetTiledPDFPaperWidth(Unit::Mm),
@@ -1076,7 +1082,7 @@ void MainWindowsNoGUI::PdfTiledFile(const QString &name)
     }
     else
     {
-        VSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
+        VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
         m_layoutSettings->SetTiledMargins(QMarginsF(settings->GetTiledPDFMargins(Unit::Mm)));
         m_layoutSettings->SetTiledPDFOrientation(settings->GetTiledPDFOrientation());
         m_layoutSettings->SetTiledPDFPaperSize(QSizeF(settings->GetTiledPDFPaperWidth(Unit::Mm),
@@ -1117,7 +1123,7 @@ void MainWindowsNoGUI::ExportScene(const QList<QGraphicsScene *> &scenes,
         if (paper != nullptr)
         {
             const QString name = m_dialogSaveLayout->Path() + '/' + m_dialogSaveLayout->FileName() +
-                    QString::number(i+1) + DialogSaveLayout::ExportFormatSuffix(m_dialogSaveLayout->Format());
+                    QString::number(i+1) + VLayoutExporter::ExportFormatSuffix(m_dialogSaveLayout->Format());
             auto *brush = new QBrush();
             brush->setColor( QColor( Qt::white ) );
             QGraphicsScene *scene = scenes.at(i);
@@ -1166,55 +1172,55 @@ void MainWindowsNoGUI::ExportScene(const QList<QGraphicsScene *> &scenes,
                 case LayoutExportFormats::DXF_AC1006_Flat:
                     paper->setVisible(false);
                     exporter.SetDxfVersion(DRW::AC1006);
-                    exporter.ExportToFlatDXF(scene, details);
+                    exporter.ExportToFlatDXF(scene, details.at(i));
                     paper->setVisible(true);
                     break;
                 case LayoutExportFormats::DXF_AC1009_Flat:
                     paper->setVisible(false);
                     exporter.SetDxfVersion(DRW::AC1009);
-                    exporter.ExportToFlatDXF(scene, details);
+                    exporter.ExportToFlatDXF(scene, details.at(i));
                     paper->setVisible(true);
                     break;
                 case LayoutExportFormats::DXF_AC1012_Flat:
                     paper->setVisible(false);
                     exporter.SetDxfVersion(DRW::AC1012);
-                    exporter.ExportToFlatDXF(scene, details);
+                    exporter.ExportToFlatDXF(scene, details.at(i));
                     paper->setVisible(true);
                     break;
                 case LayoutExportFormats::DXF_AC1014_Flat:
                     paper->setVisible(false);
                     exporter.SetDxfVersion(DRW::AC1014);
-                    exporter.ExportToFlatDXF(scene, details);
+                    exporter.ExportToFlatDXF(scene, details.at(i));
                     paper->setVisible(true);
                     break;
                 case LayoutExportFormats::DXF_AC1015_Flat:
                     paper->setVisible(false);
                     exporter.SetDxfVersion(DRW::AC1015);
-                    exporter.ExportToFlatDXF(scene, details);
+                    exporter.ExportToFlatDXF(scene, details.at(i));
                     paper->setVisible(true);
                     break;
                 case LayoutExportFormats::DXF_AC1018_Flat:
                     paper->setVisible(false);
                     exporter.SetDxfVersion(DRW::AC1018);
-                    exporter.ExportToFlatDXF(scene, details);
+                    exporter.ExportToFlatDXF(scene, details.at(i));
                     paper->setVisible(true);
                     break;
                 case LayoutExportFormats::DXF_AC1021_Flat:
                     paper->setVisible(false);
                     exporter.SetDxfVersion(DRW::AC1021);
-                    exporter.ExportToFlatDXF(scene, details);
+                    exporter.ExportToFlatDXF(scene, details.at(i));
                     paper->setVisible(true);
                     break;
                 case LayoutExportFormats::DXF_AC1024_Flat:
                     paper->setVisible(false);
                     exporter.SetDxfVersion(DRW::AC1024);
-                    exporter.ExportToFlatDXF(scene, details);
+                    exporter.ExportToFlatDXF(scene, details.at(i));
                     paper->setVisible(true);
                     break;
                 case LayoutExportFormats::DXF_AC1027_Flat:
                     paper->setVisible(false);
                     exporter.SetDxfVersion(DRW::AC1027);
-                    exporter.ExportToFlatDXF(scene, details);
+                    exporter.ExportToFlatDXF(scene, details.at(i));
                     paper->setVisible(true);
                     break;
                 case LayoutExportFormats::TIF:
diff --git a/src/app/valentina/mainwindowsnogui.h b/src/app/valentina/mainwindowsnogui.h
index 27d25e471..0e43a8ba0 100644
--- a/src/app/valentina/mainwindowsnogui.h
+++ b/src/app/valentina/mainwindowsnogui.h
@@ -141,6 +141,7 @@ protected:
     QSharedPointer<VMeasurements> OpenMeasurementFile(const QString &path) const;
 
     void CheckRequiredMeasurements(const VMeasurements *m) const;
+
 private:
     Q_DISABLE_COPY(MainWindowsNoGUI)
 
diff --git a/src/app/valentina/valentina.pri b/src/app/valentina/valentina.pri
index 32fa0d9dd..ee92ea3db 100644
--- a/src/app/valentina/valentina.pri
+++ b/src/app/valentina/valentina.pri
@@ -10,8 +10,7 @@ include(core/core.pri)
 SOURCES += \
         $$PWD/main.cpp \
         $$PWD/mainwindow.cpp \
-        $$PWD/mainwindowsnogui.cpp \
-        $$PWD/watermarkwindow.cpp
+        $$PWD/mainwindowsnogui.cpp
 
 *msvc*:SOURCES += $$PWD/stable.cpp
 
@@ -20,10 +19,8 @@ HEADERS  += \
         $$PWD/mainwindow.h \
         $$PWD/stable.h \
         $$PWD/version.h \
-        $$PWD/mainwindowsnogui.h \
-        $$PWD/watermarkwindow.h
+        $$PWD/mainwindowsnogui.h
 
 # Main forms
 FORMS    += \
-        $$PWD/mainwindow.ui \
-        $$PWD/watermarkwindow.ui
+        $$PWD/mainwindow.ui
diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro
index f726878b6..097031c58 100644
--- a/src/app/valentina/valentina.pro
+++ b/src/app/valentina/valentina.pro
@@ -149,66 +149,80 @@ unix{
         tape.path = $$BINDIR
         tape.files += $${OUT_PWD}/../tape/$${DESTDIR}/tape
 
+        puzzle.path = $$BINDIR
+        puzzle.files += $${OUT_PWD}/../puzzle/$${DESTDIR}/puzzle
+
         # .desktop file
         desktop.path = $$DATADIR/applications/
         desktop.files += ../../../dist/$${TARGET}.desktop \
-        desktop.files += ../../../dist/tape.desktop
+        desktop.files += ../../../dist/tape.desktop \
+        desktop.files += ../../../dist/puzzle.desktop
 
         # logo
         hicolor_48_apps.path = $$DATADIR/icons/hicolor/48x48/apps/
         hicolor_48_apps.files += \
             ../../../share/icons/48x48/apps/$${TARGET}.png \
-            ../../../share/icons/48x48/apps/tape.png
+            ../../../share/icons/48x48/apps/tape.png \
+            ../../../share/icons/48x48/apps/puzzle.png
 
         hicolor_48_mimetypes.path = $$DATADIR/icons/hicolor/48x48/mimetypes/
         hicolor_48_mimetypes.files += \
             ../../../share/icons/48x48/mimetypes/application-x-valentina-pattern.png \
             ../../../share/icons/48x48/mimetypes/application-x-valentina-i-measurements.png \
-            ../../../share/icons/48x48/mimetypes/application-x-valentina-s-measurements.png
+            ../../../share/icons/48x48/mimetypes/application-x-valentina-s-measurements.png \
+            ../../../share/icons/48x48/mimetypes/application-x-valentina-layout.png
 
         hicolor_64_apps.path = $$DATADIR/icons/hicolor/64x64/apps/
         hicolor_64_apps.files += \
             ../../../share/icons/64x64/apps/$${TARGET}.png \
-            ../../../share/icons/64x64/apps/tape.png
+            ../../../share/icons/64x64/apps/tape.png \
+            ../../../share/icons/64x64/apps/puzzle.png
 
         hicolor_64_mimetypes.path = $$DATADIR/icons/hicolor/64x64/mimetypes/
         hicolor_64_mimetypes.files += \
             ../../../share/icons/64x64/mimetypes/application-x-valentina-pattern.png \
             ../../../share/icons/64x64/mimetypes/application-x-valentina-i-measurements.png \
-            ../../../share/icons/64x64/mimetypes/application-x-valentina-s-measurements.png
+            ../../../share/icons/64x64/mimetypes/application-x-valentina-s-measurements.png \
+            ../../../share/icons/64x64/mimetypes/application-x-valentina-layout.png
 
         hicolor_128_apps.path = $$DATADIR/icons/hicolor/128x128/apps/
         hicolor_128_apps.files += \
             ../../../share/icons/128x128/apps/$${TARGET}.png \
-            ../../../share/icons/128x128/apps/tape.png
+            ../../../share/icons/128x128/apps/tape.png \
+            ../../../share/icons/128x128/apps/puzzle.png
 
         hicolor_128_mimetypes.path = $$DATADIR/icons/hicolor/128x128/mimetypes/
         hicolor_128_mimetypes.files += \
             ../../../share/icons/128x128/mimetypes/application-x-valentina-pattern.png \
             ../../../share/icons/128x128/mimetypes/application-x-valentina-i-measurements.png \
-            ../../../share/icons/128x128/mimetypes/application-x-valentina-s-measurements.png
+            ../../../share/icons/128x128/mimetypes/application-x-valentina-s-measurements.png \
+            ../../../share/icons/128x128/mimetypes/application-x-valentina-layout.png
 
         hicolor_256_apps.path = $$DATADIR/icons/hicolor/256x256/apps/
         hicolor_256_apps.files += \
             ../../../share/icons/256x256/apps/$${TARGET}.png \
-            ../../../share/icons/256x256/apps/tape.png
+            ../../../share/icons/256x256/apps/tape.png \
+            ../../../share/icons/256x256/apps/puzzle.png
 
         hicolor_256_mimetypes.path = $$DATADIR/icons/hicolor/256x256/mimetypes/
         hicolor_256_mimetypes.files += \
             ../../../share/icons/256x256/mimetypes/application-x-valentina-pattern.png \
             ../../../share/icons/256x256/mimetypes/application-x-valentina-i-measurements.png \
-            ../../../share/icons/256x256/mimetypes/application-x-valentina-s-measurements.png
+            ../../../share/icons/256x256/mimetypes/application-x-valentina-s-measurements.png \
+            ../../../share/icons/256x256/mimetypes/application-x-valentina-layout.png
 
         hicolor_512_apps.path = $$DATADIR/icons/hicolor/512x512/apps/
         hicolor_512_apps.files += \
             ../../../share/icons/512x512/apps/$${TARGET}.png \
-            ../../../share/icons/512x512/apps/tape.png
+            ../../../share/icons/512x512/apps/tape.png \
+            ../../../share/icons/512x512/apps/puzzle.png
 
         hicolor_512_mimetypes.path = $$DATADIR/icons/hicolor/512x512/mimetypes/
         hicolor_512_mimetypes.files += \
             ../../../share/icons/512x512/mimetypes/application-x-valentina-pattern.png \
             ../../../share/icons/512x512/mimetypes/application-x-valentina-i-measurements.png \
-            ../../../share/icons/512x512/mimetypes/application-x-valentina-s-measurements.png
+            ../../../share/icons/512x512/mimetypes/application-x-valentina-s-measurements.png \
+            ../../../share/icons/512x512/mimetypes/application-x-valentina-layout.png
 
         # Path to translation files after installation
         translations.path = $$PKGDATADIR/translations/
@@ -229,6 +243,7 @@ unix{
         INSTALLS += \
             target \
             tape \
+            puzzle \
             desktop \
             hicolor_48_apps \
             hicolor_48_mimetypes \
@@ -273,6 +288,9 @@ unix{
             tape.path = $$MACOS_DIR
             tape.files += $${OUT_PWD}/../tape/$${DESTDIR}/tape.app/$$MACOS_DIR/tape
 
+            puzzle.path = $$MACOS_DIR
+            puzzle.files += $${OUT_PWD}/../puzzle/$${DESTDIR}/puzzle.app/$$MACOS_DIR/puzzle
+
             # Utility pdftops need for saving a layout image to PS and EPS formates.
             xpdf.path = $$MACOS_DIR
             xpdf.files += $${PWD}/../../../dist/macx/bin64/pdftops
@@ -298,6 +316,7 @@ unix{
             icns_resources.files += $$PWD/../../../dist/macx/i-measurements.icns
             icns_resources.files += $$PWD/../../../dist/macx/s-measurements.icns
             icns_resources.files += $$PWD/../../../dist/macx/pattern.icns
+            icns_resources.files += $$PWD/../../../dist/macx/layout.icns
 
             # Copy to bundle multisize measurements files
             # We cannot add none exist files to bundle through QMAKE_BUNDLE_DATA. That's why we must do this manually.
@@ -309,6 +328,7 @@ unix{
                 label \
                 libraries \
                 tape \
+                puzzle \
                 xpdf \
                 icns_resources
         }
@@ -322,11 +342,13 @@ win32:*g++* {
     package.files += \
         $${OUT_PWD}/$${DESTDIR}/valentina.exe \
         $${OUT_PWD}/../tape/$${DESTDIR}/tape.exe \
+        $${OUT_PWD}/../puzzle/$${DESTDIR}/puzzle.exe \
         $${OUT_PWD}/../tape/$${DESTDIR}/diagrams.rcc \
         $$PWD/../../../dist/win/valentina.ico \
         $$PWD/../../../dist/win/i-measurements.ico \
         $$PWD/../../../dist/win/s-measurements.ico \
         $$PWD/../../../dist/win/pattern.ico \
+        $$PWD/../../../dist/win/layout.ico \
         $$PWD/../../../dist/win/pdftops.exe \
         $$PWD/../../../dist/win/EUDC.TTE \
         $$PWD/../../../AUTHORS.txt \
@@ -566,6 +588,15 @@ DEPENDPATH += $$PWD/../../libs/vtools
 win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vtools/$${DESTDIR}/vtools.lib
 else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vtools/$${DESTDIR}/libvtools.a
 
+# VLayout static library  (depend on IFC, VGeometry)
+unix|win32: LIBS += -L$$OUT_PWD/../../libs/vlayout/$${DESTDIR}/ -lvlayout
+
+INCLUDEPATH += $$PWD/../../libs/vlayout
+DEPENDPATH += $$PWD/../../libs/vlayout
+
+win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vlayout/$${DESTDIR}/vlayout.lib
+else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vlayout/$${DESTDIR}/libvlayout.a
+
 #VWidgets static library
 unix|win32: LIBS += -L$$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/ -lvwidgets
 
@@ -584,7 +615,7 @@ DEPENDPATH += $$PWD/../../libs/vformat
 win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vformat/$${DESTDIR}/vformat.lib
 else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vformat/$${DESTDIR}/libvformat.a
 
-#VPatternDB static library (depend on vgeometry, vmisc, VLayout)
+#VPatternDB static library (depend on vgeometry, vmisc)
 unix|win32: LIBS += -L$$OUT_PWD/../../libs/vpatterndb/$${DESTDIR} -lvpatterndb
 
 INCLUDEPATH += $$PWD/../../libs/vpatterndb
@@ -593,15 +624,6 @@ DEPENDPATH += $$PWD/../../libs/vpatterndb
 win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vpatterndb/$${DESTDIR}/vpatterndb.lib
 else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vpatterndb/$${DESTDIR}/libvpatterndb.a
 
-# VLayout static library  (depend on IFC, VGeometry)
-unix|win32: LIBS += -L$$OUT_PWD/../../libs/vlayout/$${DESTDIR}/ -lvlayout
-
-INCLUDEPATH += $$PWD/../../libs/vlayout
-DEPENDPATH += $$PWD/../../libs/vlayout
-
-win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vlayout/$${DESTDIR}/vlayout.lib
-else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vlayout/$${DESTDIR}/libvlayout.a
-
 # VGeometry static library (depend on ifc)
 unix|win32: LIBS += -L$$OUT_PWD/../../libs/vgeometry/$${DESTDIR}/ -lvgeometry
 
diff --git a/src/app/valentina/xml/vpattern.cpp b/src/app/valentina/xml/vpattern.cpp
index 74828e4c7..1cbd3da6b 100644
--- a/src/app/valentina/xml/vpattern.cpp
+++ b/src/app/valentina/xml/vpattern.cpp
@@ -40,7 +40,7 @@
 #include "../ifc/exception/vexceptionundo.h"
 #include "../ifc/xml/vpatternconverter.h"
 #include "../vmisc/customevents.h"
-#include "../vmisc/vsettings.h"
+#include "../vmisc/vvalentinasettings.h"
 #include "../vmisc/vmath.h"
 #include "../vmisc/projectversion.h"
 #include "../vmisc/compatibility.h"
@@ -875,6 +875,8 @@ void VPattern::ParseDetailElement(QDomElement &domElement, const Document &parse
         VToolSeamAllowanceInitData initData;
         initData.id = GetParametrId(domElement);
         initData.detail.SetName(GetParametrString(domElement, AttrName, tr("Detail")));
+        initData.detail.SetUUID(GetParametrEmptyString(domElement, AttrUUID));
+        initData.detail.SetGradationLabel(GetParametrEmptyString(domElement, AttrGradationLabel));
         initData.detail.SetMx(VAbstractValApplication::VApp()
                               ->toPixel(GetParametrDouble(domElement, AttrMx, QStringLiteral("0.0"))));
         initData.detail.SetMy(VAbstractValApplication::VApp()
@@ -964,7 +966,7 @@ void VPattern::ParseDetailInternals(const QDomElement &domElement, VPiece &detai
                     if (version == 1)
                     {
                         // TODO. Delete if minimal supported version is 0.4.0
-                        Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 4, 0),
+                        Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 4, 0),
                                           "Time to refactor the code.");
                         const bool closed = GetParametrUInt(domElement, AttrClosed, QChar('1'));
                         const qreal width = GetParametrDouble(domElement, AttrWidth, QStringLiteral("0.0"));
@@ -4311,7 +4313,7 @@ void VPattern::SetReadOnly(bool rOnly)
 
     if (not pattern.isNull())
     {
-        SetAttributeOrRemoveIf(pattern, AttrReadOnly, rOnly, not rOnly);
+        SetAttributeOrRemoveIf<bool>(pattern, AttrReadOnly, rOnly, [](bool rOnly){return not rOnly;});
         modified = true;
     }
 }
diff --git a/src/app/valentina/xml/vpattern.h b/src/app/valentina/xml/vpattern.h
index c99c393f0..8e598eb2a 100644
--- a/src/app/valentina/xml/vpattern.h
+++ b/src/app/valentina/xml/vpattern.h
@@ -214,7 +214,7 @@ private:
     void ParseToolTrueDarts(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse);
 
     // TODO. Delete if minimal supported version is 0.2.7
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 7),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 7),
                       "Time to refactor the code.");
     void ParseOldToolSpline(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse);
 
@@ -222,7 +222,7 @@ private:
     void ParseToolCubicBezier(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse);
 
     // TODO. Delete if minimal supported version is 0.2.7
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 7),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 7),
                       "Time to refactor the code.");
     void ParseOldToolSplinePath(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse);
 
diff --git a/src/libs/ifc/ifcdef.cpp b/src/libs/ifc/ifcdef.cpp
index bf2c32bd6..4763c56ce 100644
--- a/src/libs/ifc/ifcdef.cpp
+++ b/src/libs/ifc/ifcdef.cpp
@@ -47,6 +47,8 @@ const QString AttrType        = QStringLiteral("type");
 const QString AttrMx          = QStringLiteral("mx");
 const QString AttrMy          = QStringLiteral("my");
 const QString AttrName        = QStringLiteral("name");
+const QString AttrUUID        = QStringLiteral("uuid");
+const QString AttrGradationLabel = QStringLiteral("gradationLabel");
 const QString AttrMx1         = QStringLiteral("mx1");
 const QString AttrMy1         = QStringLiteral("my1");
 const QString AttrName1       = QStringLiteral("name1");
diff --git a/src/libs/ifc/ifcdef.h b/src/libs/ifc/ifcdef.h
index d74fbdb69..e37920783 100644
--- a/src/libs/ifc/ifcdef.h
+++ b/src/libs/ifc/ifcdef.h
@@ -35,6 +35,7 @@
 #  include <qt_windows.h>
 #endif /*Q_OS_WIN*/
 
+#include <QColor>
 #include <QFont>
 #include <QString>
 #include <QStringList>
@@ -65,6 +66,8 @@ extern const QString AttrType;
 extern const QString AttrMx;
 extern const QString AttrMy;
 extern const QString AttrName;
+extern const QString AttrUUID;
+extern const QString AttrGradationLabel;
 extern const QString AttrMx1;
 extern const QString AttrMy1;
 extern const QString AttrName1;
@@ -260,6 +263,8 @@ struct VWatermarkData
     QString path{};
     int     imageRotation{0};
     bool    grayscale{false};
+    bool    invalidFile{false};
+    QColor  textColor{Qt::black};
 };
 
 QT_WARNING_POP
diff --git a/src/libs/ifc/schema.qrc b/src/libs/ifc/schema.qrc
index f804d75c8..96f6d0b17 100644
--- a/src/libs/ifc/schema.qrc
+++ b/src/libs/ifc/schema.qrc
@@ -63,6 +63,7 @@
         <file>schema/pattern/v0.8.9.xsd</file>
         <file>schema/pattern/v0.8.10.xsd</file>
         <file>schema/pattern/v0.8.11.xsd</file>
+        <file>schema/pattern/v0.8.12.xsd</file>
         <file>schema/multisize_measurements/v0.3.0.xsd</file>
         <file>schema/multisize_measurements/v0.4.0.xsd</file>
         <file>schema/multisize_measurements/v0.4.1.xsd</file>
@@ -81,5 +82,7 @@
         <file>schema/individual_measurements/v0.5.1.xsd</file>
         <file>schema/label_template/v1.0.0.xsd</file>
         <file>schema/watermark/v1.0.0.xsd</file>
+        <file>schema/watermark/v1.1.0.xsd</file>
+        <file>schema/layout/v0.1.0.xsd</file>
     </qresource>
 </RCC>
diff --git a/src/libs/ifc/schema/layout/v0.1.0.xsd b/src/libs/ifc/schema/layout/v0.1.0.xsd
new file mode 100644
index 000000000..6dcc17583
--- /dev/null
+++ b/src/libs/ifc/schema/layout/v0.1.0.xsd
@@ -0,0 +1,520 @@
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:element name="layout">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="properties">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element type="units" name="unit"/>
+              <xs:element type="xs:string" name="title"/>    
+              <xs:element type="xs:string" name="description"/>
+              <xs:element name="control">
+                <xs:complexType>
+                  <xs:attribute type="xs:boolean" name="warningSuperposition"/>
+                  <xs:attribute type="xs:boolean" name="warningOutOfBound"/>
+                  <xs:attribute type="xs:boolean" name="stickyEdges"/>
+                  <xs:attribute type="xs:boolean" name="followGrainline"/>
+                  <xs:attribute type="xs:float" name="piecesGap"/>
+                </xs:complexType>
+              </xs:element>
+              <xs:element name="tiles">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="size">
+                      <xs:complexType>
+                        <xs:attribute type="xs:float" name="width" use="required"/>
+                        <xs:attribute type="xs:float" name="length" use="required"/>
+                      </xs:complexType>
+                    </xs:element>
+                    <xs:element name="margin">
+                      <xs:complexType>
+                        <xs:attribute type="xs:float" name="top"/>
+                        <xs:attribute type="xs:float" name="right"/>
+                        <xs:attribute type="xs:float" name="bottom"/>
+                        <xs:attribute type="xs:float" name="left"/>
+                        <xs:attribute type="xs:boolean" name="ignoreMargins"/>
+                      </xs:complexType>
+                    </xs:element>
+                  </xs:sequence>
+                  <xs:attribute type="xs:boolean" name="visible"/>
+                  <xs:attribute type="xs:string" name="matchingMarks"/>
+                  <xs:attribute type="xs:boolean" name="printScheme"/>
+                </xs:complexType>
+              </xs:element>
+              <xs:element name="scale">
+                <xs:complexType>
+                  <xs:attribute type="LayoutScale" name="xScale"/>
+                  <xs:attribute type="LayoutScale" name="yScale"/>
+                </xs:complexType>
+              </xs:element>
+              <xs:element name="watermark">
+                <xs:complexType>
+                  <xs:simpleContent>
+                    <xs:extension base="xs:string">
+                      <xs:attribute type="xs:boolean" name="showPreview" use="optional"/>
+                    </xs:extension>
+                  </xs:simpleContent>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="unplacedPieces">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="piece" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element type="PathNotEmpty" name="seamLine"/>
+                    <xs:element name="seamAllowance">
+                      <xs:complexType>
+                        <xs:simpleContent>
+                          <xs:extension base="PathOrEmpty">
+                            <xs:attribute type="xs:boolean" name="enabled" use="optional"/>
+                          </xs:extension>
+                        </xs:simpleContent>
+                      </xs:complexType>
+                    </xs:element>
+                    <xs:element name="grainline">
+                      <xs:complexType>
+                        <xs:simpleContent>
+                          <xs:extension base="PathOrEmpty">
+                            <xs:attribute type="xs:boolean" name="enabled" use="optional"/>
+                            <xs:attribute type="xs:float" name="angle" use="optional"/>
+                            <xs:attribute type="ArrowDirection" name="arrowDirection" use="optional"/>
+                          </xs:extension>
+                        </xs:simpleContent>
+                      </xs:complexType>
+                    </xs:element>
+                    <xs:element name="notches">
+                      <xs:complexType>
+                        <xs:sequence>
+                          <xs:element name="notch" minOccurs="0" maxOccurs="unbounded">
+                            <xs:complexType>
+                              <xs:attribute type="xs:boolean" name="builtIn" use="optional"/>
+                              <xs:attribute type="NotchType" name="type" use="optional"/>
+                              <xs:attribute type="LinePath" name="baseLine" use="optional"/>
+                              <xs:attribute type="LinesPath" name="path" use="optional"/>
+                            </xs:complexType>
+                          </xs:element>
+                        </xs:sequence>
+                      </xs:complexType>
+                    </xs:element>
+                    <xs:element name="internalPaths">
+                      <xs:complexType>
+                        <xs:sequence>
+                          <xs:element name="internalPath" minOccurs="0" maxOccurs="unbounded">
+                            <xs:complexType>
+                              <xs:simpleContent>
+                                <xs:extension base="PathNotEmpty">
+                                  <xs:attribute type="xs:boolean" name="cut" use="optional"/>
+                                  <xs:attribute type="CurvePenStyle" name="penStyle" use="optional"/>    
+                                </xs:extension>
+                              </xs:simpleContent>
+                            </xs:complexType>
+                          </xs:element>
+                        </xs:sequence>
+                      </xs:complexType>
+                    </xs:element>
+                    <xs:element name="markers">
+                      <xs:complexType mixed="true">
+                        <xs:sequence>
+                          <xs:element name="marker" maxOccurs="unbounded" minOccurs="0">
+                            <xs:complexType>
+                              <xs:simpleContent>
+                                <xs:extension base="MarkerShapePath">
+                                  <xs:attribute type="Transformation" name="transform" use="required"/>
+                                  <xs:attribute type="MarkerType" name="type" use="required"/>
+                                  <xs:attribute type="PointPath" name="center" use="required"/>
+                                  <xs:attribute type="RectPath" name="box" use="required"/>
+                                </xs:extension>
+                              </xs:simpleContent>
+                            </xs:complexType>
+                          </xs:element>
+                        </xs:sequence>
+                      </xs:complexType>
+                    </xs:element>
+                    <xs:element name="labels">
+                      <xs:complexType>
+                        <xs:sequence>
+                          <xs:element name="pieceLabel" minOccurs="0" maxOccurs="1">
+                            <xs:complexType>
+                              <xs:sequence>
+                                <xs:element name="lines">
+                                  <xs:complexType>
+                                    <xs:sequence>
+                                      <xs:element name="line" minOccurs="0" maxOccurs="unbounded">
+                                        <xs:complexType>
+                                          <xs:simpleContent>
+                                            <xs:extension base="xs:string">
+                                              <xs:attribute type="xs:boolean" name="bold" use="optional"/>
+                                              <xs:attribute type="xs:boolean" name="italic" use="optional"/>
+                                              <xs:attribute type="xs:unsignedInt" name="alignment" use="optional"/>
+                                              <xs:attribute type="xs:unsignedInt" name="fontSize" use="optional"/>
+                                            </xs:extension>
+                                          </xs:simpleContent>
+                                        </xs:complexType>
+                                      </xs:element>
+                                    </xs:sequence>
+                                    <xs:attribute type="xs:string" name="font"/>
+                                  </xs:complexType>
+                                </xs:element>
+                              </xs:sequence>
+                              <xs:attribute type="xs:string" name="shape" use="required"/>
+                            </xs:complexType>
+                          </xs:element>
+                          <xs:element name="patternLabel" minOccurs="0" maxOccurs="1">
+                            <xs:complexType>
+                              <xs:sequence>
+                                <xs:element name="lines">
+                                  <xs:complexType>
+                                    <xs:sequence>
+                                      <xs:element name="line" minOccurs="0" maxOccurs="unbounded">
+                                        <xs:complexType>
+                                          <xs:simpleContent>
+                                            <xs:extension base="xs:string">
+                                              <xs:attribute type="xs:boolean" name="bold" use="optional"/>
+                                              <xs:attribute type="xs:boolean" name="italic" use="optional"/>
+                                              <xs:attribute type="xs:unsignedInt" name="alignment" use="optional"/>
+                                              <xs:attribute type="xs:unsignedInt" name="fontSize" use="optional"/>
+                                            </xs:extension>
+                                          </xs:simpleContent>
+                                        </xs:complexType>
+                                      </xs:element>
+                                    </xs:sequence>
+                                    <xs:attribute type="xs:string" name="font"/>
+                                  </xs:complexType>
+                                </xs:element>
+                              </xs:sequence>
+                              <xs:attribute type="xs:string" name="shape" use="required"/>
+                            </xs:complexType>
+                          </xs:element>
+                        </xs:sequence>
+                      </xs:complexType>
+                    </xs:element>
+                  </xs:sequence>
+                  <xs:attribute name="id" type="uuid" use="required"/>
+                  <xs:attribute type="xs:string" name="name"/>
+                  <xs:attribute type="xs:boolean" name="mirrored"/>
+                  <xs:attribute type="Transformation" name="transform"/>
+                  <xs:attribute type="xs:string" name="gradationLabel"/>
+                  <xs:attribute type="xs:unsignedInt" name="copyNumber"/>
+                  <xs:attribute type="xs:boolean" name="showSeamline"/>
+                  <xs:attribute type="xs:float" name="xScale"/>  
+                  <xs:attribute type="xs:float" name="yScale"/> 
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="sheets">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="sheet" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element type="xs:string" name="name"/>
+                    <xs:element name="size">
+                      <xs:complexType>
+                        <xs:attribute type="xs:float" name="width" use="required"/>
+                        <xs:attribute type="xs:float" name="length" use="required"/>
+                      </xs:complexType>
+                    </xs:element>
+                    <xs:element name="margin">
+                      <xs:complexType>
+                        <xs:attribute type="xs:float" name="top"/>
+                        <xs:attribute type="xs:float" name="right"/>
+                        <xs:attribute type="xs:float" name="bottom"/>
+                        <xs:attribute type="xs:float" name="left"/>
+                        <xs:attribute type="xs:boolean" name="ignoreMargins"/>
+                      </xs:complexType>
+                    </xs:element>
+                    <xs:element name="pieces">
+                      <xs:complexType>
+                        <xs:sequence>
+                          <xs:element name="piece" minOccurs="0" maxOccurs="unbounded">
+                            <xs:complexType>
+                              <xs:sequence>
+                                <xs:element type="PathNotEmpty" name="seamLine"/>
+                                <xs:element name="seamAllowance">
+                                  <xs:complexType>
+                                    <xs:simpleContent>
+                                      <xs:extension base="PathOrEmpty">
+                                        <xs:attribute type="xs:boolean" name="enabled" use="optional"/>
+                                      </xs:extension>
+                                    </xs:simpleContent>
+                                  </xs:complexType>
+                                </xs:element>
+                                <xs:element name="grainline">
+                                  <xs:complexType>
+                                    <xs:simpleContent>
+                                      <xs:extension base="PathOrEmpty">
+                                        <xs:attribute type="xs:boolean" name="enabled" use="optional"/>
+                                        <xs:attribute type="xs:float" name="angle" use="optional"/>
+                                        <xs:attribute type="ArrowDirection" name="arrowDirection" use="optional"/>
+                                      </xs:extension>
+                                    </xs:simpleContent>
+                                  </xs:complexType>
+                                </xs:element>
+                                <xs:element name="notches">
+                                  <xs:complexType>
+                                    <xs:sequence>
+                                      <xs:element name="notch" minOccurs="0" maxOccurs="unbounded">
+                                        <xs:complexType>
+                                          <xs:attribute type="xs:boolean" name="builtIn" use="optional"/>
+                                          <xs:attribute type="NotchType" name="type" use="optional"/>
+                                          <xs:attribute type="LinePath" name="baseLine" use="optional"/>
+                                          <xs:attribute type="LinesPath" name="path" use="optional"/>
+                                        </xs:complexType>
+                                      </xs:element>
+                                    </xs:sequence>
+                                  </xs:complexType>
+                                </xs:element>
+                                <xs:element name="internalPaths">
+                                  <xs:complexType>
+                                    <xs:sequence>
+                                      <xs:element name="internalPath" minOccurs="0" maxOccurs="unbounded">
+                                        <xs:complexType>
+                                          <xs:simpleContent>
+                                            <xs:extension base="PathNotEmpty">
+                                              <xs:attribute type="xs:boolean" name="cut" use="optional"/>
+                                              <xs:attribute type="CurvePenStyle" name="penStyle" use="optional"/>    
+                                            </xs:extension>
+                                          </xs:simpleContent>
+                                        </xs:complexType>
+                                      </xs:element>
+                                    </xs:sequence>
+                                  </xs:complexType>
+                                </xs:element>
+                                <xs:element name="markers">
+                                  <xs:complexType mixed="true">
+                                    <xs:sequence>
+                                      <xs:element name="marker" maxOccurs="unbounded" minOccurs="0">
+                                        <xs:complexType>
+                                          <xs:simpleContent>
+                                            <xs:extension base="MarkerShapePath">
+                                              <xs:attribute type="Transformation" name="transform" use="required"/>
+                                              <xs:attribute type="MarkerType" name="type" use="required"/>
+                                              <xs:attribute type="PointPath" name="center" use="required"/>
+                                              <xs:attribute type="RectPath" name="box" use="required"/>
+                                            </xs:extension>
+                                          </xs:simpleContent>
+                                        </xs:complexType>
+                                      </xs:element>
+                                    </xs:sequence>
+                                  </xs:complexType>
+                                </xs:element>
+                                <xs:element name="labels">
+                                  <xs:complexType>
+                                    <xs:sequence>
+                                      <xs:element name="pieceLabel" minOccurs="0" maxOccurs="1">
+                                        <xs:complexType>
+                                          <xs:sequence>
+                                            <xs:element name="lines">
+                                              <xs:complexType>
+                                                <xs:sequence>
+                                                  <xs:element name="line" minOccurs="0" maxOccurs="unbounded">
+                                                    <xs:complexType>
+                                                      <xs:simpleContent>
+                                                        <xs:extension base="xs:string">
+                                                          <xs:attribute type="xs:boolean" name="bold" use="optional"/>
+                                                          <xs:attribute type="xs:boolean" name="italic" use="optional"/>
+                                                          <xs:attribute type="AlignmentType" name="alignment" use="optional"/>
+                                                          <xs:attribute type="xs:unsignedInt" name="fontSize" use="optional"/>
+                                                        </xs:extension>
+                                                      </xs:simpleContent>
+                                                    </xs:complexType>
+                                                  </xs:element>
+                                                </xs:sequence>
+                                                <xs:attribute type="xs:string" name="font"/>
+                                              </xs:complexType>
+                                            </xs:element>
+                                          </xs:sequence>
+                                          <xs:attribute type="PathNotEmpty" name="shape" use="required"/>
+                                        </xs:complexType>
+                                      </xs:element>
+                                      <xs:element name="patternLabel" minOccurs="0" maxOccurs="1">
+                                        <xs:complexType>
+                                          <xs:sequence>
+                                            <xs:element name="lines">
+                                              <xs:complexType>
+                                                <xs:sequence>
+                                                  <xs:element name="line" minOccurs="0" maxOccurs="unbounded">
+                                                    <xs:complexType>
+                                                      <xs:simpleContent>
+                                                        <xs:extension base="xs:string">
+                                                          <xs:attribute type="xs:boolean" name="bold" use="optional"/>
+                                                          <xs:attribute type="xs:boolean" name="italic" use="optional"/>
+                                                          <xs:attribute type="AlignmentType" name="alignment" use="optional"/>
+                                                          <xs:attribute type="xs:unsignedInt" name="fontSize" use="optional"/>
+                                                        </xs:extension>
+                                                      </xs:simpleContent>
+                                                    </xs:complexType>
+                                                  </xs:element>
+                                                </xs:sequence>
+                                                <xs:attribute type="xs:string" name="font"/>
+                                              </xs:complexType>
+                                            </xs:element>
+                                          </xs:sequence>
+                                          <xs:attribute type="PathNotEmpty" name="shape" use="required"/>
+                                        </xs:complexType>
+                                      </xs:element>
+                                    </xs:sequence>
+                                  </xs:complexType>
+                                </xs:element>
+                              </xs:sequence>
+                              <xs:attribute name="id" type="uuid" use="required"/>
+                              <xs:attribute type="xs:string" name="name"/>
+                              <xs:attribute type="xs:boolean" name="mirrored"/>
+                              <xs:attribute type="Transformation" name="transform"/>
+                              <xs:attribute type="xs:string" name="gradationLabel"/>
+                              <xs:attribute type="xs:unsignedInt" name="copyNumber"/>
+                              <xs:attribute type="xs:boolean" name="showSeamline"/>
+                              <xs:attribute type="xs:float" name="xScale"/>  
+                              <xs:attribute type="xs:float" name="yScale"/>    
+                            </xs:complexType>
+                          </xs:element>
+                        </xs:sequence>
+                      </xs:complexType>
+                    </xs:element>  
+                  </xs:sequence>
+                  <xs:attribute type="GrainlineType" name="grainlineType"/>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+      </xs:sequence>
+      <xs:attribute type="formatVersion" name="version" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  <!--Types-->
+  <xs:simpleType name="formatVersion">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,}"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="units">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="mm"/>
+      <xs:enumeration value="cm"/>
+      <xs:enumeration value="inch"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="uuid">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="|\{[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}\}"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="ArrowDirection">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="atFront"/>
+      <xs:enumeration value="atRear"/>
+      <xs:enumeration value="atBoth"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="NotchType">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:enumeration value="0"/>
+      <!--OneLine-->
+      <xs:enumeration value="1"/>
+      <!--TwoLines-->
+      <xs:enumeration value="2"/>
+      <!--ThreeLines-->
+      <xs:enumeration value="3"/>
+      <!--TMark-->
+      <xs:enumeration value="4"/>
+      <!--VMark-->
+      <xs:enumeration value="5"/>
+      <!--VMark2-->
+      <xs:enumeration value="6"/>
+      <!--UMark-->
+      <xs:enumeration value="7"/>
+      <!--BoxMark-->
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="CurvePenStyle">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="hair"/>
+      <xs:enumeration value="dashLine"/>
+      <xs:enumeration value="dotLine"/>
+      <xs:enumeration value="dashDotLine"/>
+      <xs:enumeration value="dashDotDotLine"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="MarkerType">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:enumeration value="0"/><!--Segment-->
+      <xs:enumeration value="1"/><!--Rectangle-->
+      <xs:enumeration value="2"/><!--Cross-->
+      <xs:enumeration value="3"/><!--Tshaped-->
+      <xs:enumeration value="4"/><!--Doubletree-->
+      <xs:enumeration value="5"/><!--Corner-->
+      <xs:enumeration value="6"/><!--Triangle-->
+      <xs:enumeration value="7"/><!--Hshaped-->
+      <xs:enumeration value="8"/><!--Button-->
+      <xs:enumeration value="9"/><!--Circle-->
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="AlignmentType">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:enumeration value="0"/><!--default (no aligns)-->
+      <xs:enumeration value="1"/><!--aligns with the left edge-->
+      <xs:enumeration value="2"/><!--aligns with the right edge-->
+      <xs:enumeration value="4"/><!--Centers horizontally in the available space-->
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="Transformation">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="([-+]?\d+\.?\d*([eE][-+]?\d+)?;){8,}[-+]?\d+\.?\d*([eE][-+]?\d+)?"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="PathNotEmpty">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="([-+]?\d+\.?\d*([eE][-+]?\d+)?,[-+]?\d+\.?\d*([eE][-+]?\d+)?\s){0,}[-+]?\d+\.?\d*([eE][-+]?\d+)?,[-+]?\d+\.?\d*([eE][-+]?\d+)?"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="PathOrEmpty">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="|([-+]?\d+\.?\d*([eE][-+]?\d+)?,[-+]?\d+\.?\d*([eE][-+]?\d+)?\s){0,}[-+]?\d+\.?\d*([eE][-+]?\d+)?,[-+]?\d+\.?\d*([eE][-+]?\d+)?"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="LinePath">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="[-+]?\d+\.?\d*([eE][-+]?\d+)?,[-+]?\d+\.?\d*([eE][-+]?\d+)?;[-+]?\d+\.?\d*([eE][-+]?\d+)?,[-+]?\d+\.?\d*([eE][-+]?\d+)?"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="LinesPath">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="([-+]?\d+\.?\d*([eE][-+]?\d+)?,[-+]?\d+\.?\d*([eE][-+]?\d+)?;[-+]?\d+\.?\d*([eE][-+]?\d+)?,[-+]?\d+\.?\d*([eE][-+]?\d+)?\*){0,}[-+]?\d+\.?\d*([eE][-+]?\d+)?,[-+]?\d+\.?\d*([eE][-+]?\d+)?;[-+]?\d+\.?\d*([eE][-+]?\d+)?,[-+]?\d+\.?\d*([eE][-+]?\d+)?"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="PointPath">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="[-+]?\d+\.?\d*([eE][-+]?\d+)?,[-+]?\d+\.?\d*([eE][-+]?\d+)?"/>
+    </xs:restriction>
+  </xs:simpleType>   
+  <xs:simpleType name="RectPath">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="([-+]?\d+\.?\d*([eE][-+]?\d+)?;){3,}[-+]?\d+\.?\d*([eE][-+]?\d+)?"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="MarkerShapePath">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="(([-+]?\d+\.?\d*([eE][-+]?\d+)?,[-+]?\d+\.?\d*([eE][-+]?\d+)?\s){0,}[-+]?\d+\.?\d*([eE][-+]?\d+)?,[-+]?\d+\.?\d*([eE][-+]?\d+)?\*){0,}([-+]?\d+\.?\d*([eE][-+]?\d+)?,[-+]?\d+\.?\d*([eE][-+]?\d+)?\s){0,}[-+]?\d+\.?\d*([eE][-+]?\d+)?,[-+]?\d+\.?\d*([eE][-+]?\d+)?"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="GrainlineType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="horizontal"/>
+      <xs:enumeration value="vertical"/>
+      <xs:enumeration value="notFixed"/>
+    </xs:restriction>
+  </xs:simpleType>  
+  <xs:simpleType name="LayoutScale">
+    <xs:restriction base="xs:float">
+      <xs:minInclusive value="0.01"/>
+      <xs:maxInclusive value="3"/>
+    </xs:restriction>
+  </xs:simpleType>
+</xs:schema>
diff --git a/src/libs/ifc/schema/pattern/v0.8.10.xsd b/src/libs/ifc/schema/pattern/v0.8.10.xsd
index 66ca72f87..c619bee02 100644
--- a/src/libs/ifc/schema/pattern/v0.8.10.xsd
+++ b/src/libs/ifc/schema/pattern/v0.8.10.xsd
@@ -706,6 +706,7 @@
                         <xs:attribute name="mx" type="xs:double"/>
                         <xs:attribute name="my" type="xs:double"/>
                         <xs:attribute name="name" type="xs:string"/>
+                        <xs:attribute name="uuid" type="uuid"/>
                         <xs:attribute name="bufferName" type="xs:string"/>
                         <xs:attribute name="inLayout" type="xs:boolean"/>
                         <xs:attribute name="bufferInLayout" type="xs:boolean"/>
@@ -777,6 +778,11 @@
       <xs:pattern value="([^\p{Nd}\p{Zs}*/&amp;|!&lt;&gt;^&#10;\()\-−+.,٫, ٬.’=?:;'\&quot;]){1,1}([^\p{Zs}*/&amp;|!&lt;&gt;^&#10;\()\-−+.,٫, ٬.’=?:;\&quot;]){0,}"/>
     </xs:restriction>
   </xs:simpleType>
+  <xs:simpleType name="uuid">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="|\{[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}\}"/>
+    </xs:restriction>
+  </xs:simpleType>
   <xs:simpleType name="units">
     <xs:restriction base="xs:string">
       <xs:enumeration value="mm"/>
diff --git a/src/libs/ifc/schema/pattern/v0.8.11.xsd b/src/libs/ifc/schema/pattern/v0.8.11.xsd
index ea5ac8902..f5af96d4e 100644
--- a/src/libs/ifc/schema/pattern/v0.8.11.xsd
+++ b/src/libs/ifc/schema/pattern/v0.8.11.xsd
@@ -710,6 +710,7 @@
                         <xs:attribute name="mx" type="xs:double"/>
                         <xs:attribute name="my" type="xs:double"/>
                         <xs:attribute name="name" type="xs:string"/>
+                        <xs:attribute name="uuid" type="uuid"/>
                         <xs:attribute name="bufferName" type="xs:string"/>
                         <xs:attribute name="inLayout" type="xs:boolean"/>
                         <xs:attribute name="bufferInLayout" type="xs:boolean"/>
@@ -782,6 +783,11 @@
       <xs:pattern value="([^\p{Nd}\p{Zs}*/&amp;|!&lt;&gt;^&#10;\()\-−+.,٫, ٬.’=?:;'\&quot;]){1,1}([^\p{Zs}*/&amp;|!&lt;&gt;^&#10;\()\-−+.,٫, ٬.’=?:;\&quot;]){0,}"/>
     </xs:restriction>
   </xs:simpleType>
+  <xs:simpleType name="uuid">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="|\{[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}\}"/>
+    </xs:restriction>
+  </xs:simpleType>
   <xs:simpleType name="units">
     <xs:restriction base="xs:string">
       <xs:enumeration value="mm"/>
diff --git a/src/libs/ifc/schema/pattern/v0.8.12.xsd b/src/libs/ifc/schema/pattern/v0.8.12.xsd
new file mode 100644
index 000000000..9b20f38f9
--- /dev/null
+++ b/src/libs/ifc/schema/pattern/v0.8.12.xsd
@@ -0,0 +1,1134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
+  <!-- XML Schema Generated from XML Document-->
+  <xs:element name="pattern">
+    <xs:complexType>
+      <xs:sequence minOccurs="1" maxOccurs="unbounded">
+        <xs:element name="version" type="formatVersion"/>
+        <xs:element name="unit" type="units"/>
+        <xs:element name="image" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:simpleContent>
+              <xs:extension base="xs:string">
+                <xs:attribute name="extension" type="imageExtension"/>
+              </xs:extension>
+            </xs:simpleContent>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="notes" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="patternName" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="patternNumber" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="company" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="customer" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="birthDate" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="email" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="patternLabel" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="line" type="templateLine" minOccurs="0" maxOccurs="unbounded">
+              </xs:element>
+            </xs:sequence>
+            <xs:attribute name="dateFormat" type="xs:string"/>
+            <xs:attribute name="timeFormat" type="xs:string"/>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="watermark" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="patternMaterials" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="material" minOccurs="0" maxOccurs="20">
+                <xs:complexType>
+                  <xs:attribute name="number" type="userMaterialType" use="required"/>
+                  <xs:attribute name="name" type="xs:string"/>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="finalMeasurements" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:sequence minOccurs="0" maxOccurs="unbounded">
+              <xs:element name="finalMeasurment" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:attribute name="description" type="xs:string"/>
+                  <xs:attribute name="name" type="shortName" use="required"/>
+                  <xs:attribute name="formula" type="xs:string" use="required"/>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="measurements" type="xs:string"/>
+        <xs:element name="increments">
+          <xs:complexType>
+            <xs:sequence minOccurs="0" maxOccurs="unbounded">
+              <xs:element name="increment" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:attribute name="description" type="xs:string"/>
+                  <xs:attribute name="name" type="shortName" use="required"/>
+                  <xs:attribute name="formula" type="xs:string"/>
+                  <xs:attribute name="type" type="incrementType"/>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="previewCalculations">
+          <xs:complexType>
+            <xs:sequence minOccurs="0" maxOccurs="unbounded">
+              <xs:element name="increment" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:attribute name="description" type="xs:string"/>
+                  <xs:attribute name="name" type="shortName" use="required"/>
+                  <xs:attribute name="formula" type="xs:string"/>
+                  <xs:attribute name="type" type="incrementType"/>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="draw" minOccurs="1" maxOccurs="unbounded">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="calculation" minOccurs="1" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                      <xs:element name="point" minOccurs="0" maxOccurs="unbounded">
+                        <xs:complexType>
+                          <xs:attribute name="id" type="xs:unsignedInt" use="required"/>
+                          <xs:attribute name="x" type="xs:double"/>
+                          <xs:attribute name="y" type="xs:double"/>
+                          <xs:attribute name="mx" type="xs:double"/>
+                          <xs:attribute name="my" type="xs:double"/>
+                          <xs:attribute name="type" type="xs:string"/>
+                          <xs:attribute name="name" type="shortName"/>
+                          <xs:attribute name="firstPoint" type="xs:unsignedInt"/>
+                          <xs:attribute name="secondPoint" type="xs:unsignedInt"/>
+                          <xs:attribute name="thirdPoint" type="xs:unsignedInt"/>
+                          <xs:attribute name="basePoint" type="xs:unsignedInt"/>
+                          <xs:attribute name="pShoulder" type="xs:unsignedInt"/>
+                          <xs:attribute name="p1Line" type="xs:unsignedInt"/>
+                          <xs:attribute name="p2Line" type="xs:unsignedInt"/>
+                          <xs:attribute name="length" type="xs:string"/>
+                          <xs:attribute name="angle" type="xs:string"/>
+                          <xs:attribute name="typeLine" type="linePenStyle"/>
+                          <xs:attribute name="splinePath" type="xs:unsignedInt"/>
+                          <xs:attribute name="spline" type="xs:unsignedInt"/>
+                          <xs:attribute name="p1Line1" type="xs:unsignedInt"/>
+                          <xs:attribute name="p1Line2" type="xs:unsignedInt"/>
+                          <xs:attribute name="p2Line1" type="xs:unsignedInt"/>
+                          <xs:attribute name="p2Line2" type="xs:unsignedInt"/>
+                          <xs:attribute name="center" type="xs:unsignedInt"/>
+                          <xs:attribute name="radius" type="xs:string"/>
+                          <xs:attribute name="axisP1" type="xs:unsignedInt"/>
+                          <xs:attribute name="axisP2" type="xs:unsignedInt"/>
+                          <xs:attribute name="arc" type="xs:unsignedInt"/>
+                          <xs:attribute name="elArc" type="xs:unsignedInt"/>
+                          <xs:attribute name="curve" type="xs:unsignedInt"/>
+                          <xs:attribute name="curve1" type="xs:unsignedInt"/>
+                          <xs:attribute name="curve2" type="xs:unsignedInt"/>
+                          <xs:attribute name="lineColor" type="colors"/>
+                          <xs:attribute name="color" type="colors"/>
+                          <xs:attribute name="firstArc" type="xs:unsignedInt"/>
+                          <xs:attribute name="secondArc" type="xs:unsignedInt"/>
+                          <xs:attribute name="crossPoint" type="crossType"/>
+                          <xs:attribute name="vCrossPoint" type="crossType"/>
+                          <xs:attribute name="hCrossPoint" type="crossType"/>
+                          <xs:attribute name="c1Center" type="xs:unsignedInt"/>
+                          <xs:attribute name="c2Center" type="xs:unsignedInt"/>
+                          <xs:attribute name="c1Radius" type="xs:string"/>
+                          <xs:attribute name="c2Radius" type="xs:string"/>
+                          <xs:attribute name="cRadius" type="xs:string"/>
+                          <xs:attribute name="tangent" type="xs:unsignedInt"/>
+                          <xs:attribute name="cCenter" type="xs:unsignedInt"/>
+                          <xs:attribute name="name1" type="shortName"/>
+                          <xs:attribute name="mx1" type="xs:double"/>
+                          <xs:attribute name="my1" type="xs:double"/>
+                          <xs:attribute name="name2" type="shortName"/>
+                          <xs:attribute name="mx2" type="xs:double"/>
+                          <xs:attribute name="my2" type="xs:double"/>
+                          <xs:attribute name="point1" type="xs:unsignedInt"/>
+                          <xs:attribute name="point2" type="xs:unsignedInt"/>
+                          <xs:attribute name="dartP1" type="xs:unsignedInt"/>
+                          <xs:attribute name="dartP2" type="xs:unsignedInt"/>
+                          <xs:attribute name="dartP3" type="xs:unsignedInt"/>
+                          <xs:attribute name="baseLineP1" type="xs:unsignedInt"/>
+                          <xs:attribute name="baseLineP2" type="xs:unsignedInt"/>
+                          <xs:attribute name="showLabel" type="xs:boolean"/>
+                          <xs:attribute name="showLabel1" type="xs:boolean"/>
+                          <xs:attribute name="showLabel2" type="xs:boolean"/>
+                          <xs:attribute name="notes" type="xs:string"/>
+                          <xs:attribute name="alias1" type="xs:string"/>
+                          <xs:attribute name="alias2" type="xs:string"/>
+                          <xs:attribute name="curve1Alias1" type="xs:string"/>
+                          <xs:attribute name="curve1Alias2" type="xs:string"/>
+                          <xs:attribute name="curve2Alias1" type="xs:string"/>
+                          <xs:attribute name="curve2Alias2" type="xs:string"/>
+                        </xs:complexType>
+                      </xs:element>
+                      <xs:element name="line" minOccurs="0" maxOccurs="unbounded">
+                        <xs:complexType>
+                          <xs:attribute name="id" type="xs:unsignedInt" use="required"/>
+                          <xs:attribute name="firstPoint" type="xs:unsignedInt"/>
+                          <xs:attribute name="secondPoint" type="xs:unsignedInt"/>
+                          <xs:attribute name="typeLine" type="linePenStyle"/>
+                          <xs:attribute name="lineColor" type="colors"/>
+                          <xs:attribute name="notes" type="xs:string"/>
+                        </xs:complexType>
+                      </xs:element>
+                      <xs:element name="operation" minOccurs="0" maxOccurs="unbounded">
+                        <xs:complexType>
+                          <xs:sequence>
+                            <xs:element name="source" minOccurs="1" maxOccurs="1">
+                              <xs:complexType>
+                                <xs:sequence>
+                                  <xs:element name="item" minOccurs="1" maxOccurs="unbounded">
+                                    <xs:complexType>
+                                      <xs:attribute name="idObject" type="xs:unsignedInt" use="required"/>
+                                      <xs:attribute name="alias" type="xs:string"/>
+                                      <xs:attribute name="color" type="operationColors"/>
+                                      <xs:attribute name="penStyle" type="operationPenStyle"/> 
+                                    </xs:complexType>
+                                  </xs:element>
+                                </xs:sequence>
+                              </xs:complexType>
+                            </xs:element>
+                            <xs:element name="destination" minOccurs="1" maxOccurs="1">
+                              <xs:complexType>
+                                <xs:sequence>
+                                  <xs:element name="item" minOccurs="1" maxOccurs="unbounded">
+                                    <xs:complexType>
+                                      <xs:attribute name="idObject" type="xs:unsignedInt" use="required"/>
+                                      <xs:attribute name="mx" type="xs:double"/>
+                                      <xs:attribute name="my" type="xs:double"/>
+                                      <xs:attribute name="showLabel" type="xs:boolean"/>
+                                    </xs:complexType>
+                                  </xs:element>
+                                </xs:sequence>
+                              </xs:complexType>
+                            </xs:element>
+                          </xs:sequence>
+                          <xs:attribute name="id" type="xs:unsignedInt" use="required"/>
+                          <xs:attribute name="center" type="xs:unsignedInt"/>
+                          <xs:attribute name="angle" type="xs:string"/>
+                          <xs:attribute name="rotationAngle" type="xs:string"/>
+                          <xs:attribute name="length" type="xs:string"/>
+                          <xs:attribute name="suffix" type="xs:string"/>
+                          <xs:attribute name="type" type="xs:string" use="required"/>
+                          <xs:attribute name="p1Line" type="xs:unsignedInt"/>
+                          <xs:attribute name="p2Line" type="xs:unsignedInt"/>
+                          <xs:attribute name="axisType" type="axisType"/>
+                          <xs:attribute name="notes" type="xs:string"/>
+                        </xs:complexType>
+                      </xs:element>
+                      <xs:element name="arc" minOccurs="0" maxOccurs="unbounded">
+                        <xs:complexType>
+                          <xs:attribute name="angle1" type="xs:string"/>
+                          <xs:attribute name="id" type="xs:unsignedInt" use="required"/>
+                          <xs:attribute name="angle2" type="xs:string"/>
+                          <xs:attribute name="radius" type="xs:string"/>
+                          <xs:attribute name="center" type="xs:unsignedInt"/>
+                          <xs:attribute name="type" type="xs:string"/>
+                          <xs:attribute name="color" type="colors"/>
+                          <xs:attribute name="penStyle" type="curvePenStyle"/>
+                          <xs:attribute name="length" type="xs:string"/>
+                          <xs:attribute name="aScale" type="ApproximationScaleType"/>
+                          <xs:attribute name="notes" type="xs:string"/>
+                          <xs:attribute name="alias" type="xs:string"/>  
+                        </xs:complexType>
+                      </xs:element>
+                      <xs:element name="elArc" minOccurs="0" maxOccurs="unbounded">
+                        <xs:complexType>
+                          <xs:attribute name="angle1" type="xs:string"/>
+                          <xs:attribute name="id" type="xs:unsignedInt" use="required"/>
+                          <xs:attribute name="angle2" type="xs:string"/>
+                          <xs:attribute name="rotationAngle" type="xs:string"/>
+                          <xs:attribute name="radius1" type="xs:string"/>
+                          <xs:attribute name="radius2" type="xs:string"/>
+                          <xs:attribute name="center" type="xs:unsignedInt"/>
+                          <xs:attribute name="type" type="xs:string"/>
+                          <xs:attribute name="color" type="colors"/>
+                          <xs:attribute name="penStyle" type="curvePenStyle"/>
+                          <xs:attribute name="length" type="xs:string"/>
+                          <xs:attribute name="aScale" type="ApproximationScaleType"/>
+                          <xs:attribute name="notes" type="xs:string"/>
+                          <xs:attribute name="alias" type="xs:string"/>
+                        </xs:complexType>
+                      </xs:element>
+                      <xs:element name="spline" minOccurs="0" maxOccurs="unbounded">
+                        <xs:complexType>
+                          <xs:sequence>
+                            <xs:element name="pathPoint" minOccurs="0" maxOccurs="unbounded">
+                              <xs:complexType>
+                                <xs:attribute name="kAsm2" type="xs:string"/>
+                                <xs:attribute name="pSpline" type="xs:unsignedInt"/>
+                                <xs:attribute name="angle" type="xs:string"/>
+                                <xs:attribute name="angle1" type="xs:string"/>
+                                <xs:attribute name="angle2" type="xs:string"/>
+                                <xs:attribute name="length1" type="xs:string"/>
+                                <xs:attribute name="length2" type="xs:string"/>
+                                <xs:attribute name="kAsm1" type="xs:string"/>
+                              </xs:complexType>
+                            </xs:element>
+                          </xs:sequence>
+                          <xs:attribute name="id" type="xs:unsignedInt" use="required"/>
+                          <xs:attribute name="kCurve" type="xs:double"/>
+                          <xs:attribute name="type" type="xs:string"/>
+                          <xs:attribute name="kAsm1" type="xs:double"/>
+                          <xs:attribute name="kAsm2" type="xs:double"/>
+                          <xs:attribute name="angle1" type="xs:string"/>
+                          <xs:attribute name="angle2" type="xs:string"/>
+                          <xs:attribute name="length1" type="xs:string"/>
+                          <xs:attribute name="length2" type="xs:string"/>
+                          <xs:attribute name="point1" type="xs:unsignedInt"/>
+                          <xs:attribute name="point2" type="xs:unsignedInt"/>
+                          <xs:attribute name="point3" type="xs:unsignedInt"/>
+                          <xs:attribute name="point4" type="xs:unsignedInt"/>
+                          <xs:attribute name="color" type="colors"/>
+                          <xs:attribute name="penStyle" type="curvePenStyle"/>
+                          <xs:attribute name="duplicate" type="xs:unsignedInt"/>
+                          <xs:attribute name="aScale" type="ApproximationScaleType"/>
+                          <xs:attribute name="notes" type="xs:string"/>
+                          <xs:attribute name="alias" type="xs:string"/>
+                        </xs:complexType>
+                      </xs:element>
+                    </xs:choice>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+              <xs:element name="modeling" minOccurs="1" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                      <xs:element name="point" minOccurs="0" maxOccurs="unbounded">
+                        <xs:complexType>
+                          <xs:attribute name="id" type="xs:unsignedInt" use="required"/>
+                          <xs:attribute name="idObject" type="xs:unsignedInt"/>
+                          <xs:attribute name="mx" type="xs:double"/>
+                          <xs:attribute name="my" type="xs:double"/>
+                          <xs:attribute name="type" type="xs:string"/>
+                          <xs:attribute name="idTool" type="xs:unsignedInt"/>
+                          <xs:attribute name="inUse" type="xs:boolean"/>
+                          <xs:attribute name="angle" type="xs:string"/>
+                          <xs:attribute name="width" type="xs:string"/>
+                          <xs:attribute name="height" type="xs:string"/>
+                          <xs:attribute name="placeLabelType" type="placeLabelType"/>
+                          <xs:attribute name="showLabel" type="xs:boolean"/>
+                          <xs:attribute name="visible" type="xs:string"/>
+                          <xs:attribute name="checkWidth" type="xs:string"/>
+                          <xs:attribute name="checkHeight" type="xs:string"/>
+                          <xs:attribute name="checkWidthReference" type="checkReference"/>
+                          <xs:attribute name="checkHeightReference" type="checkReference"/> 
+                          <xs:attribute name="checkStop" type="cuttingStop"/>
+                          <xs:attribute name="cuttingNumber" type="xs:unsignedInt"/>
+                          <xs:attribute name="cuttingMode" type="cuttingMode"/>
+                          <xs:attribute name="cuttingVelocityReduction" type="velocityReduction"/> 
+                        </xs:complexType>
+                      </xs:element>
+                      <xs:element name="arc" minOccurs="0" maxOccurs="unbounded">
+                        <xs:complexType>
+                          <xs:attribute name="id" type="xs:unsignedInt" use="required"/>
+                          <xs:attribute name="idObject" type="xs:unsignedInt"/>
+                          <xs:attribute name="type" type="xs:string"/>
+                          <xs:attribute name="idTool" type="xs:unsignedInt"/>
+                          <xs:attribute name="inUse" type="xs:boolean"/>
+                        </xs:complexType>
+                      </xs:element>
+                      <xs:element name="elArc" minOccurs="0" maxOccurs="unbounded">
+                        <xs:complexType>
+                          <xs:attribute name="id" type="xs:unsignedInt" use="required"/>
+                          <xs:attribute name="idObject" type="xs:unsignedInt"/>
+                          <xs:attribute name="type" type="xs:string"/>
+                          <xs:attribute name="idTool" type="xs:unsignedInt"/>
+                          <xs:attribute name="inUse" type="xs:boolean"/>
+                        </xs:complexType>
+                      </xs:element>
+                      <xs:element name="spline" minOccurs="0" maxOccurs="unbounded">
+                        <xs:complexType>
+                          <xs:attribute name="id" type="xs:unsignedInt" use="required"/>
+                          <xs:attribute name="idObject" type="xs:unsignedInt"/>
+                          <xs:attribute name="type" type="xs:string"/>
+                          <xs:attribute name="idTool" type="xs:unsignedInt"/>
+                          <xs:attribute name="inUse" type="xs:boolean"/>
+                        </xs:complexType>
+                      </xs:element>
+                      <xs:element name="path" minOccurs="0" maxOccurs="unbounded">
+                        <xs:complexType>
+                          <xs:sequence>
+                            <xs:element name="nodes" minOccurs="1" maxOccurs="1">
+                              <xs:complexType>
+                                <xs:sequence>
+                                  <xs:element name="node" minOccurs="1" maxOccurs="unbounded">
+                                    <xs:complexType>
+                                      <xs:attribute name="type" type="xs:string" use="required"/>
+                                      <xs:attribute name="idObject" type="xs:unsignedInt" use="required"/>
+                                      <xs:attribute name="reverse" type="xs:unsignedInt"/>
+                                      <xs:attribute name="excluded" type="xs:boolean"/>
+                                      <xs:attribute name="softExcluded" type="xs:boolean"/>
+                                      <xs:attribute name="bufferSoftExcluded" type="xs:boolean"/>
+                                      <xs:attribute name="checkUniqueness" type="xs:boolean"/>
+                                      <xs:attribute name="before" type="xs:string"/>
+                                      <xs:attribute name="after" type="xs:string"/>
+                                      <xs:attribute name="angle" type="nodeAngle"/>
+                                      <xs:attribute name="passmark" type="xs:boolean"/>
+                                      <xs:attribute name="passmarkLine" type="passmarkLineType"/>
+                                      <xs:attribute name="passmarkAngle" type="passmarkAngleType"/>
+                                      <xs:attribute name="showSecondPassmark" type="xs:boolean"/>
+                                      <xs:attribute name="allowCollapse" type="xs:boolean"/>
+                                      <xs:attribute name="checkWidth" type="xs:string"/>
+                                      <xs:attribute name="checkHeight" type="xs:string"/>
+                                      <xs:attribute name="checkWidthReference" type="checkReference"/>
+                                      <xs:attribute name="checkHeightReference" type="checkReference"/>
+                                      <xs:attribute name="manualPassmarkLength" type="xs:boolean"/>
+                                      <xs:attribute name="passmarkLength" type="xs:string"/> 
+                                      <xs:attribute name="singlePassmarkCuttingStop" type="cuttingStop"/>
+                                      <xs:attribute name="leftPassmarkCuttingStop" type="cuttingStop"/>
+                                      <xs:attribute name="rightPassmarkCuttingStop" type="cuttingStop"/>
+                                      <xs:attribute name="builtInPassmarkCuttingStop" type="cuttingStop"/>
+                                      <xs:attribute name="singlePassmarkCuttingNumber" type="xs:int"/>
+                                      <xs:attribute name="leftPassmarkCuttingNumber" type="xs:int"/>
+                                      <xs:attribute name="rightPassmarkCuttingNumber" type="xs:int"/>
+                                      <xs:attribute name="builtInPassmarkCuttingNumber" type="xs:int"/>
+                                      <xs:attribute name="singlePassmarkCuttingMode" type="cuttingMode"/>
+                                      <xs:attribute name="leftPassmarkCuttingMode" type="cuttingMode"/>
+                                      <xs:attribute name="rightPassmarkCuttingMode" type="cuttingMode"/>
+                                      <xs:attribute name="builtInPassmarkCuttingMode" type="cuttingMode"/>
+                                    </xs:complexType>
+                                  </xs:element>
+                                </xs:sequence>
+                              </xs:complexType>
+                            </xs:element>
+                          </xs:sequence>
+                          <xs:attribute name="id" type="xs:unsignedInt" use="required"/>
+                          <xs:attribute name="type" type="piecePathType"/>
+                          <xs:attribute name="idTool" type="xs:unsignedInt"/>
+                          <xs:attribute name="inUse" type="xs:boolean"/>
+                          <xs:attribute name="name" type="xs:string"/>
+                          <xs:attribute name="typeLine" type="curvePenStyle"/>
+                          <xs:attribute name="cut" type="xs:boolean"/>
+                          <xs:attribute name="visible" type="xs:string"/>
+                          <xs:attribute name="firstToCountour" type="xs:boolean"/>
+                          <xs:attribute name="lastToCountour" type="xs:boolean"/>
+                          <xs:attribute name="cuttingNumber" type="xs:unsignedInt"/>
+                          <xs:attribute name="cuttingVelocityReduction" type="velocityReduction"/>   
+                        </xs:complexType>
+                      </xs:element>
+                      <xs:element name="tools" minOccurs="0" maxOccurs="unbounded">
+                        <xs:complexType>
+                          <xs:sequence>
+                            <xs:element name="det" minOccurs="2" maxOccurs="2">
+                              <xs:complexType>
+                                <xs:sequence>
+                                  <xs:element name="nodes" minOccurs="1" maxOccurs="1">
+                                    <xs:complexType>
+                                      <xs:sequence>
+                                        <xs:element name="node" minOccurs="1" maxOccurs="unbounded">
+                                          <xs:complexType>
+                                            <xs:attribute name="type" type="xs:string" use="required"/>
+                                            <xs:attribute name="idObject" type="xs:unsignedInt" use="required"/>
+                                            <xs:attribute name="reverse" type="xs:unsignedInt"/>
+                                            <xs:attribute name="excluded" type="xs:boolean"/>
+                                            <xs:attribute name="softExcluded" type="xs:boolean"/>
+                                            <xs:attribute name="bufferSoftExcluded" type="xs:boolean"/>
+                                            <xs:attribute name="checkUniqueness" type="xs:boolean"/>
+                                            <xs:attribute name="before" type="xs:string"/>
+                                            <xs:attribute name="after" type="xs:string"/>
+                                            <xs:attribute name="angle" type="nodeAngle"/>
+                                            <xs:attribute name="passmark" type="xs:boolean"/>
+                                            <xs:attribute name="passmarkLine" type="passmarkLineType"/>
+                                            <xs:attribute name="passmarkAngle" type="passmarkAngleType"/>
+                                            <xs:attribute name="showSecondPassmark" type="xs:boolean"/>
+                                            <xs:attribute name="allowCollapse" type="xs:boolean"/>
+                                            <xs:attribute name="manualPassmarkLength" type="xs:boolean"/>
+                                            <xs:attribute name="passmarkLength" type="xs:string"/>
+                                            <xs:attribute name="singlePassmarkCuttingStop" type="cuttingStop"/>
+                                            <xs:attribute name="leftPassmarkCuttingStop" type="cuttingStop"/>
+                                            <xs:attribute name="rightPassmarkCuttingStop" type="cuttingStop"/>
+                                            <xs:attribute name="builtInPassmarkCuttingStop" type="cuttingStop"/>
+                                            <xs:attribute name="singlePassmarkCuttingNumber" type="xs:int"/>
+                                            <xs:attribute name="leftPassmarkCuttingNumber" type="xs:int"/>
+                                            <xs:attribute name="rightPassmarkCuttingNumber" type="xs:int"/>
+                                            <xs:attribute name="builtInPassmarkCuttingNumber" type="xs:int"/>
+                                            <xs:attribute name="singlePassmarkCuttingMode" type="cuttingMode"/>
+                                            <xs:attribute name="leftPassmarkCuttingMode" type="cuttingMode"/>
+                                            <xs:attribute name="rightPassmarkCuttingMode" type="cuttingMode"/>
+                                            <xs:attribute name="builtInPassmarkCuttingMode" type="cuttingMode"/>  
+                                          </xs:complexType>
+                                        </xs:element>
+                                      </xs:sequence>
+                                    </xs:complexType>
+                                  </xs:element>
+                                  <xs:element name="csa" minOccurs="0" maxOccurs="1">
+                                    <xs:complexType>
+                                      <xs:sequence>
+                                        <xs:element name="record" minOccurs="1" maxOccurs="unbounded">
+                                          <xs:complexType>
+                                            <xs:attribute name="start" type="xs:unsignedInt"/>
+                                            <xs:attribute name="path" type="xs:unsignedInt" use="required"/>
+                                            <xs:attribute name="end" type="xs:unsignedInt"/>
+                                            <xs:attribute name="reverse" type="xs:boolean"/>
+                                            <xs:attribute name="includeAs" type="piecePathIncludeType"/>
+                                          </xs:complexType>
+                                        </xs:element>
+                                      </xs:sequence>
+                                    </xs:complexType>
+                                  </xs:element>
+                                  <xs:element name="iPaths" minOccurs="0" maxOccurs="1">
+                                    <xs:complexType>
+                                      <xs:sequence>
+                                        <xs:element name="record" minOccurs="1" maxOccurs="unbounded">
+                                          <xs:complexType>
+                                            <xs:attribute name="path" type="xs:unsignedInt" use="required"/>
+                                          </xs:complexType>
+                                        </xs:element>
+                                      </xs:sequence>
+                                    </xs:complexType>
+                                  </xs:element>
+                                  <xs:element name="pins" minOccurs="0" maxOccurs="1">
+                                    <xs:complexType>
+                                      <xs:sequence>
+                                        <xs:element name="record" type="xs:unsignedInt" minOccurs="1" maxOccurs="unbounded"/>
+                                      </xs:sequence>
+                                    </xs:complexType>
+                                  </xs:element>
+                                  <xs:element name="placeLabels" minOccurs="0" maxOccurs="1">
+                                    <xs:complexType>
+                                      <xs:sequence>
+                                        <xs:element name="record" type="xs:unsignedInt" minOccurs="0" maxOccurs="unbounded"/>
+                                      </xs:sequence>
+                                    </xs:complexType>
+                                  </xs:element>
+                                </xs:sequence>
+                              </xs:complexType>
+                            </xs:element>
+                            <xs:element name="children" minOccurs="1" maxOccurs="1">
+                              <xs:complexType>
+                                <xs:sequence>
+                                  <xs:element name="nodes" minOccurs="0" maxOccurs="1">
+                                    <xs:complexType>
+                                      <xs:sequence>
+                                        <xs:element name="child" type="xs:unsignedInt" minOccurs="1" maxOccurs="unbounded"/>
+                                      </xs:sequence>
+                                    </xs:complexType>
+                                  </xs:element>
+                                  <xs:element name="csa" minOccurs="0" maxOccurs="1">
+                                    <xs:complexType>
+                                      <xs:sequence>
+                                        <xs:element name="child" type="xs:unsignedInt" minOccurs="0" maxOccurs="unbounded"/>
+                                      </xs:sequence>
+                                    </xs:complexType>
+                                  </xs:element>
+                                  <xs:element name="iPaths" minOccurs="0" maxOccurs="1">
+                                    <xs:complexType>
+                                      <xs:sequence>
+                                        <xs:element name="child" type="xs:unsignedInt" minOccurs="0" maxOccurs="unbounded"/>
+                                      </xs:sequence>
+                                    </xs:complexType>
+                                  </xs:element>
+                                  <xs:element name="pins" minOccurs="0" maxOccurs="1">
+                                    <xs:complexType>
+                                      <xs:sequence>
+                                        <xs:element name="child" type="xs:unsignedInt" minOccurs="0" maxOccurs="unbounded"/>
+                                      </xs:sequence>
+                                    </xs:complexType>
+                                  </xs:element>
+                                  <xs:element name="placeLabels" minOccurs="0" maxOccurs="1">
+                                    <xs:complexType>
+                                      <xs:sequence>
+                                        <xs:element name="child" type="xs:unsignedInt" minOccurs="0" maxOccurs="unbounded"/>
+                                      </xs:sequence>
+                                    </xs:complexType>
+                                  </xs:element>
+                                </xs:sequence>
+                              </xs:complexType>
+                            </xs:element>
+                          </xs:sequence>
+                          <xs:attribute name="id" type="xs:unsignedInt" use="required"/>
+                          <xs:attribute name="type" type="xs:string"/>
+                          <xs:attribute name="indexD1" type="xs:unsignedInt"/>
+                          <xs:attribute name="indexD2" type="xs:unsignedInt"/>
+                          <xs:attribute name="inUse" type="xs:boolean"/>
+                          <xs:attribute name="version" type="unionVersion"/>
+                        </xs:complexType>
+                      </xs:element>
+                    </xs:choice>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+              <xs:element name="details" minOccurs="1" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="detail" minOccurs="0" maxOccurs="unbounded">
+                      <xs:complexType>
+                        <xs:sequence>
+                          <xs:element name="data" minOccurs="0" maxOccurs="1">
+                            <xs:complexType>
+                              <xs:sequence>
+                                <xs:element name="line" type="templateLine" minOccurs="0" maxOccurs="unbounded" />
+                              </xs:sequence>
+                              <xs:attribute name="letter" type="xs:string"/>
+                              <xs:attribute name="annotation" type="xs:string"/>
+                              <xs:attribute name="orientation" type="xs:string"/>
+                              <xs:attribute name="rotationWay" type="xs:string"/>
+                              <xs:attribute name="tilt" type="xs:string"/>
+                              <xs:attribute name="foldPosition" type="xs:string"/>
+                              <xs:attribute name="visible" type="xs:boolean"/>
+                              <xs:attribute name="onFold" type="xs:boolean"/>
+                              <xs:attribute name="fontSize" type="xs:unsignedInt"/>
+                              <xs:attribute name="mx" type="xs:double"/>
+                              <xs:attribute name="my" type="xs:double"/>
+                              <xs:attribute name="width" type="xs:string"/>
+                              <xs:attribute name="height" type="xs:string"/>
+                              <xs:attribute name="rotation" type="xs:string"/>
+                              <xs:attribute name="centerPin" type="xs:unsignedInt"/>
+                              <xs:attribute name="topLeftPin" type="xs:unsignedInt"/>
+                              <xs:attribute name="quantity" type="xs:unsignedInt"/>
+                              <xs:attribute name="bottomRightPin" type="xs:unsignedInt"/>
+                              <xs:attribute name="noBufferMaterial" type="pieceMaterialType"/>
+                              <xs:attribute name="withBufferMaterial" type="pieceMaterialType"/>
+                              <xs:attribute name="bufferMaterial" type="pieceMaterialType"/>
+                            </xs:complexType>
+                          </xs:element>
+                          <xs:element name="patternInfo" minOccurs="0" maxOccurs="1">
+                            <xs:complexType>
+                              <xs:attribute name="visible" type="xs:boolean"/>
+                              <xs:attribute name="fontSize" type="xs:unsignedInt"/>
+                              <xs:attribute name="mx" type="xs:double"/>
+                              <xs:attribute name="my" type="xs:double"/>
+                              <xs:attribute name="width" type="xs:string"/>
+                              <xs:attribute name="height" type="xs:string"/>
+                              <xs:attribute name="rotation" type="xs:string"/>
+                              <xs:attribute name="centerPin" type="xs:unsignedInt"/>
+                              <xs:attribute name="topLeftPin" type="xs:unsignedInt"/>
+                              <xs:attribute name="bottomRightPin" type="xs:unsignedInt"/>
+                            </xs:complexType>
+                          </xs:element>
+                          <xs:element name="grainline" minOccurs="0" maxOccurs="1">
+                            <xs:complexType>
+                              <xs:attribute name="visible" type="xs:boolean"/>
+                              <xs:attribute name="mx" type="xs:double"/>
+                              <xs:attribute name="my" type="xs:double"/>
+                              <xs:attribute name="length" type="xs:string"/>
+                              <xs:attribute name="rotation" type="xs:string"/>
+                              <xs:attribute name="arrows" type="arrowType"/>
+                              <xs:attribute name="centerPin" type="xs:unsignedInt"/>
+                              <xs:attribute name="topPin" type="xs:unsignedInt"/>
+                              <xs:attribute name="bottomPin" type="xs:unsignedInt"/>
+                            </xs:complexType>
+                          </xs:element>
+                          <xs:element name="nodes" minOccurs="1" maxOccurs="1">
+                            <xs:complexType>
+                              <xs:sequence>
+                                <xs:element name="node" minOccurs="1" maxOccurs="unbounded">
+                                  <xs:complexType>
+                                    <xs:attribute name="type" type="xs:string" use="required"/>
+                                    <xs:attribute name="idObject" type="xs:unsignedInt" use="required"/>
+                                    <xs:attribute name="reverse" type="xs:unsignedInt"/>
+                                    <xs:attribute name="excluded" type="xs:boolean"/>
+                                    <xs:attribute name="softExcluded" type="xs:boolean"/>
+                                    <xs:attribute name="bufferSoftExcluded" type="xs:boolean"/>
+                                    <xs:attribute name="checkUniqueness" type="xs:boolean"/>
+                                    <xs:attribute name="before" type="xs:string"/>
+                                    <xs:attribute name="after" type="xs:string"/>
+                                    <xs:attribute name="angle" type="nodeAngle"/>
+                                    <xs:attribute name="mx" type="xs:double"/>
+                                    <xs:attribute name="my" type="xs:double"/>
+                                    <xs:attribute name="passmark" type="xs:boolean"/>
+                                    <xs:attribute name="passmarkLine" type="passmarkLineType"/>
+                                    <xs:attribute name="passmarkAngle" type="passmarkAngleType"/>
+                                    <xs:attribute name="showSecondPassmark" type="xs:boolean"/>
+                                    <xs:attribute name="allowCollapse" type="xs:boolean"/>
+                                    <xs:attribute name="checkWidth" type="xs:string"/>
+                                    <xs:attribute name="checkHeight" type="xs:string"/>
+                                    <xs:attribute name="checkWidthReference" type="checkReference"/>
+                                    <xs:attribute name="checkHeightReference" type="checkReference"/>
+                                    <xs:attribute name="checkStop" type="cuttingStop"/>
+                                    <xs:attribute name="manualPassmarkLength" type="xs:boolean"/>
+                                    <xs:attribute name="passmarkLength" type="xs:string"/>
+                                    <xs:attribute name="singlePassmarkCuttingStop" type="cuttingStop"/>
+                                    <xs:attribute name="leftPassmarkCuttingStop" type="cuttingStop"/>
+                                    <xs:attribute name="rightPassmarkCuttingStop" type="cuttingStop"/>
+                                    <xs:attribute name="builtInPassmarkCuttingStop" type="cuttingStop"/>
+                                    <xs:attribute name="singlePassmarkCuttingNumber" type="xs:int"/>
+                                    <xs:attribute name="leftPassmarkCuttingNumber" type="xs:int"/>
+                                    <xs:attribute name="rightPassmarkCuttingNumber" type="xs:int"/>
+                                    <xs:attribute name="builtInPassmarkCuttingNumber" type="xs:int"/>
+                                    <xs:attribute name="singlePassmarkCuttingMode" type="cuttingMode"/>
+                                    <xs:attribute name="leftPassmarkCuttingMode" type="cuttingMode"/>
+                                    <xs:attribute name="rightPassmarkCuttingMode" type="cuttingMode"/>
+                                    <xs:attribute name="builtInPassmarkCuttingMode" type="cuttingMode"/>
+                                  </xs:complexType>
+                                </xs:element>
+                              </xs:sequence>
+                            </xs:complexType>
+                          </xs:element>
+                          <xs:element name="csa" minOccurs="0" maxOccurs="1">
+                            <xs:complexType>
+                              <xs:sequence>
+                                <xs:element name="record" minOccurs="1" maxOccurs="unbounded">
+                                  <xs:complexType>
+                                    <xs:attribute name="start" type="xs:unsignedInt"/>
+                                    <xs:attribute name="path" type="xs:unsignedInt" use="required"/>
+                                    <xs:attribute name="end" type="xs:unsignedInt"/>
+                                    <xs:attribute name="reverse" type="xs:boolean"/>
+                                    <xs:attribute name="includeAs" type="piecePathIncludeType"/>
+                                  </xs:complexType>
+                                </xs:element>
+                              </xs:sequence>
+                            </xs:complexType>
+                          </xs:element>
+                          <xs:element name="iPaths" minOccurs="0" maxOccurs="1">
+                            <xs:complexType>
+                              <xs:sequence>
+                                <xs:element name="record" minOccurs="1" maxOccurs="unbounded">
+                                  <xs:complexType>
+                                    <xs:attribute name="path" type="xs:unsignedInt" use="required"/>
+                                  </xs:complexType>
+                                </xs:element>
+                              </xs:sequence>
+                            </xs:complexType>
+                          </xs:element>
+                          <xs:element name="pins" minOccurs="0" maxOccurs="1">
+                            <xs:complexType>
+                              <xs:sequence>
+                                <xs:element name="record" type="xs:unsignedInt" minOccurs="0" maxOccurs="unbounded"/>
+                              </xs:sequence>
+                            </xs:complexType>
+                          </xs:element>
+                          <xs:element name="placeLabels" minOccurs="0" maxOccurs="1">
+                            <xs:complexType>
+                              <xs:sequence>
+                                <xs:element name="record" type="xs:unsignedInt" minOccurs="0" maxOccurs="unbounded"/>
+                              </xs:sequence>
+                            </xs:complexType>
+                          </xs:element>
+                        </xs:sequence>
+                        <xs:attribute name="id" type="xs:unsignedInt" use="required"/>
+                        <xs:attribute name="version" type="pieceVersion"/>
+                        <xs:attribute name="mx" type="xs:double"/>
+                        <xs:attribute name="my" type="xs:double"/>
+                        <xs:attribute name="name" type="xs:string"/>
+                        <xs:attribute name="uuid" type="uuid"/>
+                        <xs:attribute name="gradationLabel" type="xs:string"/>
+                        <xs:attribute name="bufferName" type="xs:string"/>
+                        <xs:attribute name="inLayout" type="xs:boolean"/>
+                        <xs:attribute name="bufferInLayout" type="xs:boolean"/>
+                        <xs:attribute name="forbidFlipping" type="xs:boolean"/>
+                        <xs:attribute name="forceFlipping" type="xs:boolean"/>
+                        <xs:attribute name="width" type="xs:string"/>
+                        <xs:attribute name="bufferVisible" type="xs:string"/>
+                        <xs:attribute name="bufferWidth" type="xs:string"/>
+                        <xs:attribute name="seamAllowance" type="xs:boolean"/>
+                        <xs:attribute name="seamAllowanceBuiltIn" type="xs:boolean"/>
+                        <xs:attribute name="united" type="xs:boolean"/>
+                        <xs:attribute name="closed" type="xs:unsignedInt"/>
+                        <xs:attribute name="hideMainPath" type="xs:boolean"/>
+                        <xs:attribute name="priority" type="piecePriorityType"/>
+                        <xs:attribute name="gravity" type="layoutSideGravityType"/>
+                        <xs:attribute name="cuttingTime" type="cuttingTime"/>
+                        <xs:attribute name="nestTogethWithNext" type="xs:boolean"/>
+                      </xs:complexType>
+                    </xs:element>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+              <xs:element name="groups" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="group" minOccurs="0" maxOccurs="unbounded">
+                      <xs:complexType>
+                        <xs:sequence>
+                          <xs:element name="item" minOccurs="0" maxOccurs="unbounded">
+                            <xs:complexType>
+                              <xs:attribute name="object" type="xs:unsignedInt"/>
+                              <xs:attribute name="tool" type="xs:unsignedInt"/>
+                            </xs:complexType>
+                          </xs:element>
+                        </xs:sequence>
+                        <xs:attribute name="id" type="xs:unsignedInt" use="required"/>
+                        <xs:attribute name="name" type="xs:string"/>
+                        <xs:attribute name="visible" type="xs:boolean"/>
+                        <xs:attribute name="tool" type="xs:unsignedInt"/>
+                        <xs:attribute name="tags" type="xs:string"/>
+                      </xs:complexType>
+                    </xs:element>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+            <xs:attribute name="name" type="xs:string"/>
+          </xs:complexType>
+        </xs:element>
+      </xs:sequence>
+      <xs:attribute name="readOnly" type="xs:boolean"/>
+      <xs:attribute name="labelPrefix" type="labelPrefixType"/>
+      <xs:attribute name="passmarkLength" type="xs:string"/>
+    </xs:complexType>
+    <xs:unique name="incrementName">
+      <xs:selector xpath=".//increment"/>
+      <xs:field xpath="@name"/>
+    </xs:unique>
+    <xs:unique name="uniqueDrawName">
+      <xs:selector xpath="draw"/>
+      <xs:field xpath="@name"/>
+    </xs:unique>
+    <xs:unique name="uniquePatternMaterialNumber">
+      <xs:selector xpath="patternMaterials/material"/>
+      <xs:field xpath="@number"/>
+    </xs:unique>
+  </xs:element>
+  <xs:simpleType name="shortName">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="([^\p{Nd}\p{Zs}*/&amp;|!&lt;&gt;^&#10;\()\-−+.,٫, ٬.’=?:;'\&quot;]){1,1}([^\p{Zs}*/&amp;|!&lt;&gt;^&#10;\()\-−+.,٫, ٬.’=?:;\&quot;]){0,}"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="uuid">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="|\{[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}\}"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="units">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="mm"/>
+      <xs:enumeration value="cm"/>
+      <xs:enumeration value="inch"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="measurementsTypes">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="standard"/>
+      <xs:enumeration value="individual"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="formatVersion">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,}"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="imageExtension">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="PNG"/>
+      <xs:enumeration value="JPG"/>
+      <xs:enumeration value="BMP"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="colors">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="black"/>
+      <xs:enumeration value="green"/>
+      <xs:enumeration value="blue"/>
+      <xs:enumeration value="darkRed"/>
+      <xs:enumeration value="darkGreen"/>
+      <xs:enumeration value="darkBlue"/>
+      <xs:enumeration value="yellow"/>
+      <xs:enumeration value="lightsalmon"/>
+      <xs:enumeration value="goldenrod"/>
+      <xs:enumeration value="orange"/>
+      <xs:enumeration value="deeppink"/>
+      <xs:enumeration value="violet"/>
+      <xs:enumeration value="darkviolet"/>
+      <xs:enumeration value="mediumseagreen"/>
+      <xs:enumeration value="lime"/>
+      <xs:enumeration value="deepskyblue"/>
+      <xs:enumeration value="cornflowerblue"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="operationColors">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value=""/><!--Same as default-->
+      <xs:enumeration value="default"/>
+      <xs:enumeration value="black"/>
+      <xs:enumeration value="green"/>
+      <xs:enumeration value="blue"/>
+      <xs:enumeration value="darkRed"/>
+      <xs:enumeration value="darkGreen"/>
+      <xs:enumeration value="darkBlue"/>
+      <xs:enumeration value="yellow"/>
+      <xs:enumeration value="lightsalmon"/>
+      <xs:enumeration value="goldenrod"/>
+      <xs:enumeration value="orange"/>
+      <xs:enumeration value="deeppink"/>
+      <xs:enumeration value="violet"/>
+      <xs:enumeration value="darkviolet"/>
+      <xs:enumeration value="mediumseagreen"/>
+      <xs:enumeration value="lime"/>
+      <xs:enumeration value="deepskyblue"/>
+      <xs:enumeration value="cornflowerblue"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="linePenStyle">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="none"/>
+      <xs:enumeration value="hair"/>
+      <xs:enumeration value="dashLine"/>
+      <xs:enumeration value="dotLine"/>
+      <xs:enumeration value="dashDotLine"/>
+      <xs:enumeration value="dashDotDotLine"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="operationPenStyle">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value=""/><!--Same as default-->
+      <xs:enumeration value="default"/>
+      <xs:enumeration value="none"/>
+      <xs:enumeration value="hair"/>
+      <xs:enumeration value="dashLine"/>
+      <xs:enumeration value="dotLine"/>
+      <xs:enumeration value="dashDotLine"/>
+      <xs:enumeration value="dashDotDotLine"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="curvePenStyle">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="hair"/>
+      <xs:enumeration value="dashLine"/>
+      <xs:enumeration value="dotLine"/>
+      <xs:enumeration value="dashDotLine"/>
+      <xs:enumeration value="dashDotDotLine"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="crossType">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:enumeration value="1"/>
+      <xs:enumeration value="2"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="axisType">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:enumeration value="1"/>
+      <xs:enumeration value="2"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="arrowType">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:enumeration value="0"/>
+      <!--Both-->
+      <xs:enumeration value="1"/>
+      <!--Front-->
+      <xs:enumeration value="2"/>
+      <!--Rear-->
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="pieceVersion">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:enumeration value="1"/>
+      <!--Old version-->
+      <xs:enumeration value="2"/>
+      <!--New version-->
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="nodeAngle">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:enumeration value="0"/>
+      <!--by length-->
+      <xs:enumeration value="1"/>
+      <!--by points intersections-->
+      <xs:enumeration value="2"/>
+      <!--by first edge symmetry-->
+      <xs:enumeration value="3"/>
+      <!--by second edge symmetry-->
+      <xs:enumeration value="4"/>
+      <!--by first edge right angle-->
+      <xs:enumeration value="5"/>
+      <!--by second edge right angle-->
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="piecePathType">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:enumeration value="1"/>
+      <!--custom seam allowance-->
+      <xs:enumeration value="2"/>
+      <!--internal path-->
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="piecePathIncludeType">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:enumeration value="0"/>
+      <!--as main path-->
+      <xs:enumeration value="1"/>
+      <!--as custom seam allowance-->
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="passmarkLineType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="one"/>
+      <xs:enumeration value="two"/>
+      <xs:enumeration value="three"/>
+      <xs:enumeration value="tMark"/>
+      <xs:enumeration value="vMark"/>
+      <xs:enumeration value="vMark2"/>
+      <xs:enumeration value="uMark"/>
+      <xs:enumeration value="boxMark"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="passmarkAngleType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="straightforward"/>
+      <xs:enumeration value="bisector"/>
+      <xs:enumeration value="intersection"/>
+      <xs:enumeration value="intersectionLeft"/>
+      <xs:enumeration value="intersectionRight"/>
+      <xs:enumeration value="intersection2"/>
+      <xs:enumeration value="intersection2Left"/>
+      <xs:enumeration value="intersection2Right"/>  
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="alignmentType">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:enumeration value="0"/><!--default (no aligns)-->
+      <xs:enumeration value="1"/><!--aligns with the left edge-->
+      <xs:enumeration value="2"/><!--aligns with the right edge-->
+      <xs:enumeration value="4"/><!--Centers horizontally in the available space-->
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="userMaterialType">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:minInclusive value="1"/>
+      <xs:maxInclusive value="20"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="pieceMaterialType">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:minInclusive value="0"/>
+      <xs:maxInclusive value="20"/><!--keep syncr with userMaterialType -->
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="ApproximationScaleType">
+    <xs:restriction base="xs:double">
+      <xs:minInclusive value="0"/>
+      <xs:maxInclusive value="10"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="placeLabelType">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:enumeration value="0"/><!--Segment-->
+      <xs:enumeration value="1"/><!--Rectangle-->
+      <xs:enumeration value="2"/><!--Cross-->
+      <xs:enumeration value="3"/><!--Tshaped-->
+      <xs:enumeration value="4"/><!--Doubletree-->
+      <xs:enumeration value="5"/><!--Corner-->
+      <xs:enumeration value="6"/><!--Triangle-->
+      <xs:enumeration value="7"/><!--Hshaped-->
+      <xs:enumeration value="8"/><!--Button-->
+      <xs:enumeration value="9"/><!--Circle-->
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="unionVersion">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:enumeration value="1"/>
+      <!--Old version-->
+      <xs:enumeration value="2"/>
+      <!--New version-->
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="labelPrefixType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="de"/>
+      <xs:enumeration value="en"/>
+      <xs:enumeration value="fr"/>
+      <xs:enumeration value="ru"/>
+      <xs:enumeration value="uk"/>
+      <xs:enumeration value="hr"/>
+      <xs:enumeration value="sr"/>
+      <xs:enumeration value="bs"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="incrementType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="increment"/>
+      <xs:enumeration value="separator"/>
+      <xs:enumeration value="checkWidth"/>
+      <xs:enumeration value="checkHeight"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="checkReference">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="[1-9]+[0-9]*&lt;\*&gt;[1-9]+[0-9]*"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="cuttingStop">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:enumeration value="0"/>
+      <!--No-->
+      <xs:enumeration value="1"/>
+      <!--Yes-->
+      <xs:enumeration value="2"/>
+      <!--With Confirmation-->
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="cuttingTime">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:enumeration value="0"/>
+      <!--Before-->
+      <xs:enumeration value="1"/>
+      <!--Together-->
+      <xs:enumeration value="2"/>
+      <!--After-->
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="cuttingMode">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:enumeration value="0"/>
+      <!--Draw-->
+      <xs:enumeration value="1"/>
+      <!--Cut-->
+      <xs:enumeration value="2"/>
+      <!--Punch-->
+      <xs:enumeration value="3"/>
+      <!--Drill-->
+      <xs:enumeration value="4"/>
+      <!--AuxDrill-->
+     <xs:enumeration value="5"/>
+      <!--Quality-->
+     <xs:enumeration value="6"/>
+      <!--None-->
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="velocityReduction">
+    <xs:restriction base="xs:int">
+      <xs:enumeration value="-1"/>
+      <!--NONE-->
+      <xs:enumeration value="5"/>
+      <!--5%-->
+      <xs:enumeration value="10"/>
+      <!--10%-->
+      <xs:enumeration value="15"/>
+      <!--15%-->
+      <xs:enumeration value="20"/>
+      <!--20%-->
+      <xs:enumeration value="25"/>
+      <!--25%-->
+      <xs:enumeration value="30"/>
+      <!--30%-->
+      <xs:enumeration value="35"/>
+      <!--35%-->
+      <xs:enumeration value="40"/>
+      <!--40%-->
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="piecePriorityType">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:minInclusive value="0"/>
+      <xs:maxInclusive value="99"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="layoutSideGravityType">
+    <xs:restriction base="xs:int">
+      <xs:enumeration value="-1"/>
+      <!--Negative-->
+      <xs:enumeration value="0"/>
+      <!--Neutral-->
+      <xs:enumeration value="1"/>
+      <!--Positive-->
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:complexType name="templateLine">
+    <xs:attribute name="text" type="xs:string" use="required"/>
+    <xs:attribute name="bold" type="xs:boolean"/>
+    <xs:attribute name="italic" type="xs:boolean"/>
+    <xs:attribute name="alignment" type="alignmentType"/>
+    <xs:attribute name="sfIncrement" type="xs:unsignedInt"/>
+  </xs:complexType>
+</xs:schema>
diff --git a/src/libs/ifc/schema/pattern/v0.8.8.xsd b/src/libs/ifc/schema/pattern/v0.8.8.xsd
index 93ef3d153..be5cf7ba7 100644
--- a/src/libs/ifc/schema/pattern/v0.8.8.xsd
+++ b/src/libs/ifc/schema/pattern/v0.8.8.xsd
@@ -692,6 +692,7 @@
                         <xs:attribute name="mx" type="xs:double"/>
                         <xs:attribute name="my" type="xs:double"/>
                         <xs:attribute name="name" type="xs:string"/>
+                        <xs:attribute name="uuid" type="uuid"/>
                         <xs:attribute name="bufferName" type="xs:string"/>
                         <xs:attribute name="inLayout" type="xs:boolean"/>
                         <xs:attribute name="bufferInLayout" type="xs:boolean"/>
@@ -763,6 +764,11 @@
       <xs:pattern value="([^\p{Nd}\p{Zs}*/&amp;|!&lt;&gt;^&#10;\()\-−+.,٫, ٬.’=?:;'\&quot;]){1,1}([^\p{Zs}*/&amp;|!&lt;&gt;^&#10;\()\-−+.,٫, ٬.’=?:;\&quot;]){0,}"/>
     </xs:restriction>
   </xs:simpleType>
+  <xs:simpleType name="uuid">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="|\{[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}\}"/>
+    </xs:restriction>
+  </xs:simpleType>
   <xs:simpleType name="units">
     <xs:restriction base="xs:string">
       <xs:enumeration value="mm"/>
diff --git a/src/libs/ifc/schema/pattern/v0.8.9.xsd b/src/libs/ifc/schema/pattern/v0.8.9.xsd
index 02072e940..664dd2202 100644
--- a/src/libs/ifc/schema/pattern/v0.8.9.xsd
+++ b/src/libs/ifc/schema/pattern/v0.8.9.xsd
@@ -698,6 +698,7 @@
                         <xs:attribute name="mx" type="xs:double"/>
                         <xs:attribute name="my" type="xs:double"/>
                         <xs:attribute name="name" type="xs:string"/>
+                        <xs:attribute name="uuid" type="uuid"/>
                         <xs:attribute name="bufferName" type="xs:string"/>
                         <xs:attribute name="inLayout" type="xs:boolean"/>
                         <xs:attribute name="bufferInLayout" type="xs:boolean"/>
@@ -769,6 +770,11 @@
       <xs:pattern value="([^\p{Nd}\p{Zs}*/&amp;|!&lt;&gt;^&#10;\()\-−+.,٫, ٬.’=?:;'\&quot;]){1,1}([^\p{Zs}*/&amp;|!&lt;&gt;^&#10;\()\-−+.,٫, ٬.’=?:;\&quot;]){0,}"/>
     </xs:restriction>
   </xs:simpleType>
+  <xs:simpleType name="uuid">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="|\{[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}\}"/>
+    </xs:restriction>
+  </xs:simpleType>
   <xs:simpleType name="units">
     <xs:restriction base="xs:string">
       <xs:enumeration value="mm"/>
diff --git a/src/libs/ifc/schema/watermark/v1.1.0.xsd b/src/libs/ifc/schema/watermark/v1.1.0.xsd
new file mode 100644
index 000000000..963ba099d
--- /dev/null
+++ b/src/libs/ifc/schema/watermark/v1.1.0.xsd
@@ -0,0 +1,54 @@
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:element name="watermark">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element type="formatVersion" name="version"/>
+        <xs:element name="text">
+          <xs:complexType>
+            <xs:simpleContent>
+              <xs:extension base="xs:string">
+                <xs:attribute type="xs:boolean" name="show"/>
+                <xs:attribute type="xs:string" name="text"/>
+                <xs:attribute type="rotationType" name="rotation"/>
+                <xs:attribute type="xs:string" name="font"/>
+                <xs:attribute type="xs:string" name="color"/>
+              </xs:extension>
+            </xs:simpleContent>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="image">
+          <xs:complexType>
+            <xs:simpleContent>
+              <xs:extension base="xs:string">
+                <xs:attribute type="xs:boolean" name="show"/>
+                <xs:attribute type="xs:string" name="path"/>
+                <xs:attribute type="rotationType" name="rotation"/>
+                <xs:attribute type="xs:boolean" name="grayscale"/>
+              </xs:extension>
+            </xs:simpleContent>
+          </xs:complexType>
+        </xs:element>
+      </xs:sequence>
+      <xs:attribute type="opacityType" name="opacity"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:simpleType name="formatVersion">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,}"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="opacityType">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:minInclusive value="0"/>
+      <xs:maxInclusive value="100"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="rotationType">
+    <xs:restriction base="xs:int">
+      <xs:minInclusive value="-360"/>
+      <xs:maxInclusive value="360"/>
+    </xs:restriction>
+  </xs:simpleType>
+</xs:schema>
+
+
diff --git a/src/libs/ifc/xml/vabstractconverter.cpp b/src/libs/ifc/xml/vabstractconverter.cpp
index 293b12bcb..990a98d14 100644
--- a/src/libs/ifc/xml/vabstractconverter.cpp
+++ b/src/libs/ifc/xml/vabstractconverter.cpp
@@ -112,14 +112,11 @@ void MessageHandler::handleMessage(QtMsgType type, const QString &description, c
 
 //---------------------------------------------------------------------------------------------------------------------
 VAbstractConverter::VAbstractConverter(const QString &fileName)
-    : VDomDocument(),
-      m_ver(0x0),
+    : m_ver(0x0),
       m_originalFileName(fileName),
-      m_convertedFileName(fileName),
-      m_tmpFile()
+      m_convertedFileName(fileName)
 {
     setXMLContent(m_convertedFileName);// Throw an exception on error
-    m_ver = GetFormatVersion(GetFormatVersionStr());
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/ifc/xml/vabstractconverter.h b/src/libs/ifc/xml/vabstractconverter.h
index 708898531..eefac4be4 100644
--- a/src/libs/ifc/xml/vabstractconverter.h
+++ b/src/libs/ifc/xml/vabstractconverter.h
@@ -37,7 +37,10 @@
 
 #include "vdomdocument.h"
 
-#define FORMAT_VERSION(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
+constexpr inline auto FormatVersion(unsigned major, unsigned minor, unsigned patch) -> unsigned
+{
+    return ((major<<16u)|(minor<<8u)|patch);
+}
 
 class VAbstractConverter :public VDomDocument
 {
@@ -81,7 +84,7 @@ protected:
 private:
     Q_DISABLE_COPY(VAbstractConverter)
 
-    QTemporaryFile m_tmpFile;
+    QTemporaryFile m_tmpFile{};
 
     void ReserveFile() const;
 };
diff --git a/src/libs/ifc/xml/vabstractmconverter.cpp b/src/libs/ifc/xml/vabstractmconverter.cpp
index af2ab9b3c..f6967f1f8 100644
--- a/src/libs/ifc/xml/vabstractmconverter.cpp
+++ b/src/libs/ifc/xml/vabstractmconverter.cpp
@@ -39,6 +39,7 @@
 VAbstractMConverter::VAbstractMConverter(const QString &fileName)
     :VAbstractConverter(fileName)
 {
+    m_ver = GetFormatVersion(GetFormatVersionStr());
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/ifc/xml/vabstractpattern.cpp b/src/libs/ifc/xml/vabstractpattern.cpp
index fa6b96b96..673bad8bc 100644
--- a/src/libs/ifc/xml/vabstractpattern.cpp
+++ b/src/libs/ifc/xml/vabstractpattern.cpp
@@ -1951,7 +1951,8 @@ void VAbstractPattern::SetFMeasurements(QDomElement &element, const QVector<VFin
 
             SetAttribute(tagFMeasurement, AttrName, m.name);
             SetAttribute(tagFMeasurement, AttrFormula, m.formula);
-            SetAttributeOrRemoveIf(tagFMeasurement, AttrDescription, m.description, m.description.isEmpty());
+            SetAttributeOrRemoveIf<QString>(tagFMeasurement, AttrDescription, m.description,
+                                            [](const QString &description){return description.isEmpty();});
 
             element.appendChild(tagFMeasurement);
         }
@@ -2028,8 +2029,9 @@ QDomElement VAbstractPattern::CreateGroup(quint32 id, const QString &name, const
     SetAttribute(group, AttrId, id);
     SetAttribute(group, AttrName, name);
     SetAttribute(group, AttrVisible, true);
-    SetAttributeOrRemoveIf(group, AttrTool, tool, tool == null_id);
-    SetAttributeOrRemoveIf(group, AttrTags, preparedTags, preparedTags.isEmpty());
+    SetAttributeOrRemoveIf<vidtype>(group, AttrTool, tool, [](vidtype tool){ return tool == null_id;});
+    SetAttributeOrRemoveIf<QString>(group, AttrTags, preparedTags,
+                                    [](const QString &preparedTags){return preparedTags.isEmpty();});
 
     auto i = groupData.constBegin();
     while (i != groupData.constEnd())
@@ -2109,8 +2111,8 @@ void VAbstractPattern::SetGroupTags(quint32 id, const QStringList &tags)
     QDomElement group = elementById(id, TagGroup);
     if (group.isElement())
     {
-        const QString rawTags = tags.join(',');
-        SetAttributeOrRemoveIf(group, AttrTags, rawTags, rawTags.isEmpty());
+        SetAttributeOrRemoveIf<QString>(group, AttrTags, tags.join(','),
+                                        [](const QString &rawTags){return rawTags.isEmpty();});
         modified = true;
         emit patternChanged(false);
     }
diff --git a/src/libs/ifc/xml/vdomdocument.h b/src/libs/ifc/xml/vdomdocument.h
index 97a5f0c57..b0feda21f 100644
--- a/src/libs/ifc/xml/vdomdocument.h
+++ b/src/libs/ifc/xml/vdomdocument.h
@@ -42,6 +42,7 @@
 #include <QtGlobal>
 #include <QLocale>
 #include <QLoggingCategory>
+#include <functional>
 
 #include "../ifc/ifcdef.h"
 #include "../vmisc/def.h"
@@ -103,7 +104,7 @@ public:
 
     template <typename T>
     void SetAttributeOrRemoveIf(QDomElement &domElement, const QString &name, const T &value,
-                                bool removeCondition) const;
+                                const std::function<bool(const T&)> &removeCondition) const;
 
     static quint32 GetParametrUInt(const QDomElement& domElement, const QString &name, const QString &defValue);
     static int     GetParametrInt(const QDomElement& domElement, const QString &name, const QString &defValue);
@@ -127,7 +128,7 @@ public:
     QString        Major() const;
     QString        Minor() const;
     QString        Patch() const;
-    QString        GetFormatVersionStr() const;
+    virtual QString GetFormatVersionStr() const;
     static int     GetFormatVersion(const QString &version);
     static void    RemoveAllChildren(QDomElement &domElement);
 
@@ -218,9 +219,9 @@ inline void VDomDocument::SetAttribute<MeasurementsType>(QDomElement &domElement
 //---------------------------------------------------------------------------------------------------------------------
 template <typename T>
 inline void VDomDocument::SetAttributeOrRemoveIf(QDomElement &domElement, const QString &name, const T &value,
-                                                 bool removeCondition) const
+                                                 const std::function<bool(const T&)> &removeCondition) const
 {
-    not removeCondition ? SetAttribute(domElement, name, value) : domElement.removeAttribute(name);
+    not removeCondition(value) ? SetAttribute(domElement, name, value) : domElement.removeAttribute(name);
 }
 
 QT_WARNING_POP
diff --git a/src/libs/ifc/xml/vlabeltemplateconverter.cpp b/src/libs/ifc/xml/vlabeltemplateconverter.cpp
index 3fbd71777..aa74ec4f4 100644
--- a/src/libs/ifc/xml/vlabeltemplateconverter.cpp
+++ b/src/libs/ifc/xml/vlabeltemplateconverter.cpp
@@ -47,6 +47,7 @@ const QString VLabelTemplateConverter::CurrentSchema          = QStringLiteral("
 VLabelTemplateConverter::VLabelTemplateConverter(const QString &fileName)
     : VAbstractConverter(fileName)
 {
+    m_ver = GetFormatVersion(GetFormatVersionStr());
     ValidateInputFile(CurrentSchema);
 }
 
@@ -79,7 +80,7 @@ QString VLabelTemplateConverter::XSDSchema(int ver) const
 {
     switch (ver)
     {
-        case (0x010000):
+        case (FormatVersion(1, 0, 0)):
             return CurrentSchema;
         default:
             InvalidVersion(ver);
@@ -93,7 +94,7 @@ void VLabelTemplateConverter::ApplyPatches()
 {
     switch (m_ver)
     {
-        case (0x010000):
+        case (FormatVersion(1, 0, 0)):
             break;
         default:
             InvalidVersion(m_ver);
diff --git a/src/libs/ifc/xml/vlabeltemplateconverter.h b/src/libs/ifc/xml/vlabeltemplateconverter.h
index 72524f08c..d3f7ca5e8 100644
--- a/src/libs/ifc/xml/vlabeltemplateconverter.h
+++ b/src/libs/ifc/xml/vlabeltemplateconverter.h
@@ -39,8 +39,8 @@ public:
 
     static const QString LabelTemplateMaxVerStr;
     static const QString CurrentSchema;
-    static Q_DECL_CONSTEXPR const int LabelTemplateMinVer = FORMAT_VERSION(1, 0, 0);
-    static Q_DECL_CONSTEXPR const int LabelTemplateMaxVer = FORMAT_VERSION(1, 0, 0);
+    static Q_DECL_CONSTEXPR const int LabelTemplateMinVer = FormatVersion(1, 0, 0);
+    static Q_DECL_CONSTEXPR const int LabelTemplateMaxVer = FormatVersion(1, 0, 0);
 
 protected:
     virtual int     MinVer() const override;
diff --git a/src/libs/ifc/xml/vlayoutconverter.cpp b/src/libs/ifc/xml/vlayoutconverter.cpp
new file mode 100644
index 000000000..ed60eae5d
--- /dev/null
+++ b/src/libs/ifc/xml/vlayoutconverter.cpp
@@ -0,0 +1,114 @@
+/************************************************************************
+ **
+ **  @file   vlayoutconverter.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   23 4, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#include "vlayoutconverter.h"
+
+/*
+ * Version rules:
+ * 1. Version have three parts "major.minor.patch";
+ * 2. major part only for stable releases;
+ * 3. minor - 10 or more patch changes, or one big change;
+ * 4. patch - little change.
+ */
+
+const QString VLayoutConverter::LayoutMinVerStr = QStringLiteral("0.1.0");
+const QString VLayoutConverter::LayoutMaxVerStr = QStringLiteral("0.1.0");
+const QString VLayoutConverter::CurrentSchema   = QStringLiteral("://schema/layout/v0.1.0.xsd");
+
+//VLayoutConverter::LayoutMinVer; // <== DON'T FORGET TO UPDATE TOO!!!!
+//VLayoutConverter::LayoutMaxVer; // <== DON'T FORGET TO UPDATE TOO!!!!
+
+namespace
+{
+// The list of all string we use for conversion
+// Better to use global variables because repeating QStringLiteral blows up code size
+Q_GLOBAL_STATIC_WITH_ARGS(const QString, strVersion, (QLatin1String("version")))
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+VLayoutConverter::VLayoutConverter(const QString &fileName)
+    : VAbstractConverter(fileName)
+{
+    m_ver = GetFormatVersion(GetFormatVersionStr());
+    ValidateInputFile(CurrentSchema);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VLayoutConverter::GetFormatVersionStr() const -> QString
+{
+    QDomNode root = documentElement();
+    if (not root.isNull() && root.isElement())
+    {
+        const QDomElement layoutElement = root.toElement();
+        if (not layoutElement.isNull())
+        {
+            return GetParametrString(layoutElement, *strVersion, QStringLiteral("0.0.0"));
+        }
+    }
+    return QStringLiteral("0.0.0");
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QString VLayoutConverter::XSDSchema(int ver) const
+{
+    QHash <int, QString> schemas =
+    {
+        std::make_pair(FormatVersion(0, 1, 0), CurrentSchema)
+    };
+
+    if (schemas.contains(ver))
+    {
+        return schemas.value(ver);
+    }
+
+    InvalidVersion(ver);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VLayoutConverter::ApplyPatches()
+{
+    switch (m_ver)
+    {
+        case (FormatVersion(0, 1, 0)):
+            break;
+        default:
+            InvalidVersion(m_ver);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VLayoutConverter::DowngradeToCurrentMaxVersion()
+{
+    SetVersion(LayoutMaxVerStr);
+    Save();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+bool VLayoutConverter::IsReadOnly() const
+{
+    return false;
+}
diff --git a/src/libs/ifc/xml/vlayoutconverter.h b/src/libs/ifc/xml/vlayoutconverter.h
new file mode 100644
index 000000000..eee9aadd1
--- /dev/null
+++ b/src/libs/ifc/xml/vlayoutconverter.h
@@ -0,0 +1,92 @@
+/************************************************************************
+ **
+ **  @file   vlayoutconverter.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   23 4, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#ifndef VLAYOUTCONVERTER_H
+#define VLAYOUTCONVERTER_H
+
+#include "vabstractconverter.h"
+
+class QDomElement;
+class QString;
+
+class VLayoutConverter : public VAbstractConverter
+{
+    Q_DECLARE_TR_FUNCTIONS(VLayoutConverter)
+public:
+    explicit VLayoutConverter(const QString &fileName);
+    virtual ~VLayoutConverter() Q_DECL_EQ_DEFAULT;
+
+    virtual QString GetFormatVersionStr() const override;
+
+    static const QString LayoutMaxVerStr;
+    static const QString CurrentSchema;
+    static Q_DECL_CONSTEXPR const int LayoutMinVer = FormatVersion(0, 1, 0);
+    static Q_DECL_CONSTEXPR const int LayoutMaxVer = FormatVersion(0, 1, 0);
+
+protected:
+    virtual int     MinVer() const override;
+    virtual int     MaxVer() const override;
+
+    virtual QString MinVerStr() const override;
+    virtual QString MaxVerStr() const override;
+
+    virtual QString XSDSchema(int ver) const override;
+    virtual void    ApplyPatches() override;
+    virtual void    DowngradeToCurrentMaxVersion() override;
+
+    virtual bool IsReadOnly() const override;
+
+private:
+    Q_DISABLE_COPY(VLayoutConverter)
+    static const QString LayoutMinVerStr;
+};
+
+//---------------------------------------------------------------------------------------------------------------------
+inline int VLayoutConverter::MinVer() const
+{
+    return LayoutMinVer;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline int VLayoutConverter::MaxVer() const
+{
+    return LayoutMaxVer;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline QString VLayoutConverter::MinVerStr() const
+{
+    return LayoutMinVerStr;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline QString VLayoutConverter::MaxVerStr() const
+{
+    return LayoutMaxVerStr;
+}
+
+#endif // VLAYOUTCONVERTER_H
diff --git a/src/libs/ifc/xml/vpatternconverter.cpp b/src/libs/ifc/xml/vpatternconverter.cpp
index 6d2474940..6c14beeb8 100644
--- a/src/libs/ifc/xml/vpatternconverter.cpp
+++ b/src/libs/ifc/xml/vpatternconverter.cpp
@@ -41,6 +41,7 @@
 #include <QStringDataPtr>
 #include <algorithm>
 #include <QGlobalStatic>
+#include <QUuid>
 
 #include "../exception/vexception.h"
 #include "../exception/vexceptionemptyparameter.h"
@@ -59,8 +60,8 @@ class QDomElement;
  */
 
 const QString VPatternConverter::PatternMinVerStr = QStringLiteral("0.1.4");
-const QString VPatternConverter::PatternMaxVerStr = QStringLiteral("0.8.11");
-const QString VPatternConverter::CurrentSchema    = QStringLiteral("://schema/pattern/v0.8.11.xsd");
+const QString VPatternConverter::PatternMaxVerStr = QStringLiteral("0.8.12");
+const QString VPatternConverter::CurrentSchema    = QStringLiteral("://schema/pattern/v0.8.12.xsd");
 
 //VPatternConverter::PatternMinVer; // <== DON'T FORGET TO UPDATE TOO!!!!
 //VPatternConverter::PatternMaxVer; // <== DON'T FORGET TO UPDATE TOO!!!!
@@ -135,6 +136,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(const QString, strMy, (QLatin1String("my")))
 //Q_GLOBAL_STATIC_WITH_ARGS(const QString, strForbidFlipping, (QLatin1String("forbidFlipping")))
 //Q_GLOBAL_STATIC_WITH_ARGS(const QString, strInLayout, (QLatin1String("inLayout")))
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, strSeamAllowance, (QLatin1String("seamAllowance")))
+Q_GLOBAL_STATIC_WITH_ARGS(const QString, strUUID, (QLatin1String("uuid")))
 //Q_GLOBAL_STATIC_WITH_ARGS(const QString, strNodeType, (QLatin1String("nodeType")))
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, strDet, (QLatin1String("det")))
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, strTypeObject, (QLatin1String("typeObject")))
@@ -171,6 +173,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(const QString, strQuantity, (QLatin1String("quantity")
 VPatternConverter::VPatternConverter(const QString &fileName)
     : VAbstractConverter(fileName)
 {
+    m_ver = GetFormatVersion(GetFormatVersionStr());
     ValidateInputFile(CurrentSchema);
 }
 
@@ -179,69 +182,70 @@ QString VPatternConverter::XSDSchema(int ver) const
 {
     QHash <int, QString> schemas =
     {
-        std::make_pair(FORMAT_VERSION(0, 1, 4), QStringLiteral("://schema/pattern/v0.1.4.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 2, 0), QStringLiteral("://schema/pattern/v0.2.0.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 2, 1), QStringLiteral("://schema/pattern/v0.2.1.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 2, 2), QStringLiteral("://schema/pattern/v0.2.2.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 2, 3), QStringLiteral("://schema/pattern/v0.2.3.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 2, 4), QStringLiteral("://schema/pattern/v0.2.4.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 2, 5), QStringLiteral("://schema/pattern/v0.2.5.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 2, 6), QStringLiteral("://schema/pattern/v0.2.6.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 2, 7), QStringLiteral("://schema/pattern/v0.2.7.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 3, 0), QStringLiteral("://schema/pattern/v0.3.0.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 3, 1), QStringLiteral("://schema/pattern/v0.3.1.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 3, 2), QStringLiteral("://schema/pattern/v0.3.2.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 3, 3), QStringLiteral("://schema/pattern/v0.3.3.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 3, 4), QStringLiteral("://schema/pattern/v0.3.4.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 3, 5), QStringLiteral("://schema/pattern/v0.3.5.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 3, 6), QStringLiteral("://schema/pattern/v0.3.6.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 3, 7), QStringLiteral("://schema/pattern/v0.3.7.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 3, 8), QStringLiteral("://schema/pattern/v0.3.8.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 3, 9), QStringLiteral("://schema/pattern/v0.3.9.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 4, 0), QStringLiteral("://schema/pattern/v0.4.0.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 4, 1), QStringLiteral("://schema/pattern/v0.4.1.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 4, 2), QStringLiteral("://schema/pattern/v0.4.2.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 4, 3), QStringLiteral("://schema/pattern/v0.4.3.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 4, 4), QStringLiteral("://schema/pattern/v0.4.4.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 4, 5), QStringLiteral("://schema/pattern/v0.4.5.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 4, 6), QStringLiteral("://schema/pattern/v0.4.6.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 4, 7), QStringLiteral("://schema/pattern/v0.4.7.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 4, 8), QStringLiteral("://schema/pattern/v0.4.8.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 5, 0), QStringLiteral("://schema/pattern/v0.5.0.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 5, 1), QStringLiteral("://schema/pattern/v0.5.1.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 6, 0), QStringLiteral("://schema/pattern/v0.6.0.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 6, 1), QStringLiteral("://schema/pattern/v0.6.1.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 6, 2), QStringLiteral("://schema/pattern/v0.6.2.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 6, 3), QStringLiteral("://schema/pattern/v0.6.3.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 6, 4), QStringLiteral("://schema/pattern/v0.6.4.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 6, 5), QStringLiteral("://schema/pattern/v0.6.5.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 6, 6), QStringLiteral("://schema/pattern/v0.6.6.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 7, 0), QStringLiteral("://schema/pattern/v0.7.0.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 7, 1), QStringLiteral("://schema/pattern/v0.7.1.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 7, 2), QStringLiteral("://schema/pattern/v0.7.2.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 7, 3), QStringLiteral("://schema/pattern/v0.7.3.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 7, 4), QStringLiteral("://schema/pattern/v0.7.4.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 7, 5), QStringLiteral("://schema/pattern/v0.7.5.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 7, 6), QStringLiteral("://schema/pattern/v0.7.6.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 7, 7), QStringLiteral("://schema/pattern/v0.7.7.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 7, 8), QStringLiteral("://schema/pattern/v0.7.8.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 7, 9), QStringLiteral("://schema/pattern/v0.7.9.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 7, 10), QStringLiteral("://schema/pattern/v0.7.10.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 7, 11), QStringLiteral("://schema/pattern/v0.7.11.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 7, 12), QStringLiteral("://schema/pattern/v0.7.12.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 7, 13), QStringLiteral("://schema/pattern/v0.7.13.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 8, 0), QStringLiteral("://schema/pattern/v0.8.0.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 8, 1), QStringLiteral("://schema/pattern/v0.8.1.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 8, 2), QStringLiteral("://schema/pattern/v0.8.2.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 8, 3), QStringLiteral("://schema/pattern/v0.8.3.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 8, 4), QStringLiteral("://schema/pattern/v0.8.4.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 8, 5), QStringLiteral("://schema/pattern/v0.8.5.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 8, 6), QStringLiteral("://schema/pattern/v0.8.6.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 8, 7), QStringLiteral("://schema/pattern/v0.8.7.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 8, 8), QStringLiteral("://schema/pattern/v0.8.8.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 8, 9), QStringLiteral("://schema/pattern/v0.8.9.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 8, 10), QStringLiteral("://schema/pattern/v0.8.10.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 8, 11), CurrentSchema)
+        std::make_pair(FormatVersion(0, 1, 4), QStringLiteral("://schema/pattern/v0.1.4.xsd")),
+        std::make_pair(FormatVersion(0, 2, 0), QStringLiteral("://schema/pattern/v0.2.0.xsd")),
+        std::make_pair(FormatVersion(0, 2, 1), QStringLiteral("://schema/pattern/v0.2.1.xsd")),
+        std::make_pair(FormatVersion(0, 2, 2), QStringLiteral("://schema/pattern/v0.2.2.xsd")),
+        std::make_pair(FormatVersion(0, 2, 3), QStringLiteral("://schema/pattern/v0.2.3.xsd")),
+        std::make_pair(FormatVersion(0, 2, 4), QStringLiteral("://schema/pattern/v0.2.4.xsd")),
+        std::make_pair(FormatVersion(0, 2, 5), QStringLiteral("://schema/pattern/v0.2.5.xsd")),
+        std::make_pair(FormatVersion(0, 2, 6), QStringLiteral("://schema/pattern/v0.2.6.xsd")),
+        std::make_pair(FormatVersion(0, 2, 7), QStringLiteral("://schema/pattern/v0.2.7.xsd")),
+        std::make_pair(FormatVersion(0, 3, 0), QStringLiteral("://schema/pattern/v0.3.0.xsd")),
+        std::make_pair(FormatVersion(0, 3, 1), QStringLiteral("://schema/pattern/v0.3.1.xsd")),
+        std::make_pair(FormatVersion(0, 3, 2), QStringLiteral("://schema/pattern/v0.3.2.xsd")),
+        std::make_pair(FormatVersion(0, 3, 3), QStringLiteral("://schema/pattern/v0.3.3.xsd")),
+        std::make_pair(FormatVersion(0, 3, 4), QStringLiteral("://schema/pattern/v0.3.4.xsd")),
+        std::make_pair(FormatVersion(0, 3, 5), QStringLiteral("://schema/pattern/v0.3.5.xsd")),
+        std::make_pair(FormatVersion(0, 3, 6), QStringLiteral("://schema/pattern/v0.3.6.xsd")),
+        std::make_pair(FormatVersion(0, 3, 7), QStringLiteral("://schema/pattern/v0.3.7.xsd")),
+        std::make_pair(FormatVersion(0, 3, 8), QStringLiteral("://schema/pattern/v0.3.8.xsd")),
+        std::make_pair(FormatVersion(0, 3, 9), QStringLiteral("://schema/pattern/v0.3.9.xsd")),
+        std::make_pair(FormatVersion(0, 4, 0), QStringLiteral("://schema/pattern/v0.4.0.xsd")),
+        std::make_pair(FormatVersion(0, 4, 1), QStringLiteral("://schema/pattern/v0.4.1.xsd")),
+        std::make_pair(FormatVersion(0, 4, 2), QStringLiteral("://schema/pattern/v0.4.2.xsd")),
+        std::make_pair(FormatVersion(0, 4, 3), QStringLiteral("://schema/pattern/v0.4.3.xsd")),
+        std::make_pair(FormatVersion(0, 4, 4), QStringLiteral("://schema/pattern/v0.4.4.xsd")),
+        std::make_pair(FormatVersion(0, 4, 5), QStringLiteral("://schema/pattern/v0.4.5.xsd")),
+        std::make_pair(FormatVersion(0, 4, 6), QStringLiteral("://schema/pattern/v0.4.6.xsd")),
+        std::make_pair(FormatVersion(0, 4, 7), QStringLiteral("://schema/pattern/v0.4.7.xsd")),
+        std::make_pair(FormatVersion(0, 4, 8), QStringLiteral("://schema/pattern/v0.4.8.xsd")),
+        std::make_pair(FormatVersion(0, 5, 0), QStringLiteral("://schema/pattern/v0.5.0.xsd")),
+        std::make_pair(FormatVersion(0, 5, 1), QStringLiteral("://schema/pattern/v0.5.1.xsd")),
+        std::make_pair(FormatVersion(0, 6, 0), QStringLiteral("://schema/pattern/v0.6.0.xsd")),
+        std::make_pair(FormatVersion(0, 6, 1), QStringLiteral("://schema/pattern/v0.6.1.xsd")),
+        std::make_pair(FormatVersion(0, 6, 2), QStringLiteral("://schema/pattern/v0.6.2.xsd")),
+        std::make_pair(FormatVersion(0, 6, 3), QStringLiteral("://schema/pattern/v0.6.3.xsd")),
+        std::make_pair(FormatVersion(0, 6, 4), QStringLiteral("://schema/pattern/v0.6.4.xsd")),
+        std::make_pair(FormatVersion(0, 6, 5), QStringLiteral("://schema/pattern/v0.6.5.xsd")),
+        std::make_pair(FormatVersion(0, 6, 6), QStringLiteral("://schema/pattern/v0.6.6.xsd")),
+        std::make_pair(FormatVersion(0, 7, 0), QStringLiteral("://schema/pattern/v0.7.0.xsd")),
+        std::make_pair(FormatVersion(0, 7, 1), QStringLiteral("://schema/pattern/v0.7.1.xsd")),
+        std::make_pair(FormatVersion(0, 7, 2), QStringLiteral("://schema/pattern/v0.7.2.xsd")),
+        std::make_pair(FormatVersion(0, 7, 3), QStringLiteral("://schema/pattern/v0.7.3.xsd")),
+        std::make_pair(FormatVersion(0, 7, 4), QStringLiteral("://schema/pattern/v0.7.4.xsd")),
+        std::make_pair(FormatVersion(0, 7, 5), QStringLiteral("://schema/pattern/v0.7.5.xsd")),
+        std::make_pair(FormatVersion(0, 7, 6), QStringLiteral("://schema/pattern/v0.7.6.xsd")),
+        std::make_pair(FormatVersion(0, 7, 7), QStringLiteral("://schema/pattern/v0.7.7.xsd")),
+        std::make_pair(FormatVersion(0, 7, 8), QStringLiteral("://schema/pattern/v0.7.8.xsd")),
+        std::make_pair(FormatVersion(0, 7, 9), QStringLiteral("://schema/pattern/v0.7.9.xsd")),
+        std::make_pair(FormatVersion(0, 7, 10), QStringLiteral("://schema/pattern/v0.7.10.xsd")),
+        std::make_pair(FormatVersion(0, 7, 11), QStringLiteral("://schema/pattern/v0.7.11.xsd")),
+        std::make_pair(FormatVersion(0, 7, 12), QStringLiteral("://schema/pattern/v0.7.12.xsd")),
+        std::make_pair(FormatVersion(0, 7, 13), QStringLiteral("://schema/pattern/v0.7.13.xsd")),
+        std::make_pair(FormatVersion(0, 8, 0), QStringLiteral("://schema/pattern/v0.8.0.xsd")),
+        std::make_pair(FormatVersion(0, 8, 1), QStringLiteral("://schema/pattern/v0.8.1.xsd")),
+        std::make_pair(FormatVersion(0, 8, 2), QStringLiteral("://schema/pattern/v0.8.2.xsd")),
+        std::make_pair(FormatVersion(0, 8, 3), QStringLiteral("://schema/pattern/v0.8.3.xsd")),
+        std::make_pair(FormatVersion(0, 8, 4), QStringLiteral("://schema/pattern/v0.8.4.xsd")),
+        std::make_pair(FormatVersion(0, 8, 5), QStringLiteral("://schema/pattern/v0.8.5.xsd")),
+        std::make_pair(FormatVersion(0, 8, 6), QStringLiteral("://schema/pattern/v0.8.6.xsd")),
+        std::make_pair(FormatVersion(0, 8, 7), QStringLiteral("://schema/pattern/v0.8.7.xsd")),
+        std::make_pair(FormatVersion(0, 8, 8), QStringLiteral("://schema/pattern/v0.8.8.xsd")),
+        std::make_pair(FormatVersion(0, 8, 9), QStringLiteral("://schema/pattern/v0.8.9.xsd")),
+        std::make_pair(FormatVersion(0, 8, 10), QStringLiteral("://schema/pattern/v0.8.10.xsd")),
+        std::make_pair(FormatVersion(0, 8, 11), QStringLiteral("://schema/pattern/v0.8.11.xsd")),
+        std::make_pair(FormatVersion(0, 8, 12), CurrentSchema)
     };
 
     if (schemas.contains(ver))
@@ -257,255 +261,259 @@ void VPatternConverter::ApplyPatches()
 {
     switch (m_ver)
     {
-        case (FORMAT_VERSION(0, 1, 4)):
+        case (FormatVersion(0, 1, 4)):
             ToV0_2_0();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 2, 0)));
+            ValidateXML(XSDSchema(FormatVersion(0, 2, 0)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 2, 0)):
+        case (FormatVersion(0, 2, 0)):
             ToV0_2_1();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 2, 1)));
+            ValidateXML(XSDSchema(FormatVersion(0, 2, 1)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 2, 1)):
+        case (FormatVersion(0, 2, 1)):
             ToV0_2_2();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 2, 2)));
+            ValidateXML(XSDSchema(FormatVersion(0, 2, 2)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 2, 2)):
+        case (FormatVersion(0, 2, 2)):
             ToV0_2_3();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 2, 3)));
+            ValidateXML(XSDSchema(FormatVersion(0, 2, 3)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 2, 3)):
+        case (FormatVersion(0, 2, 3)):
             ToV0_2_4();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 2, 4)));
+            ValidateXML(XSDSchema(FormatVersion(0, 2, 4)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 2, 4)):
+        case (FormatVersion(0, 2, 4)):
             ToV0_2_5();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 2, 5)));
+            ValidateXML(XSDSchema(FormatVersion(0, 2, 5)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 2, 5)):
+        case (FormatVersion(0, 2, 5)):
             ToV0_2_6();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 2, 6)));
+            ValidateXML(XSDSchema(FormatVersion(0, 2, 6)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 2, 6)):
+        case (FormatVersion(0, 2, 6)):
             ToV0_2_7();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 2, 7)));
+            ValidateXML(XSDSchema(FormatVersion(0, 2, 7)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 2, 7)):
+        case (FormatVersion(0, 2, 7)):
             ToV0_3_0();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 3, 0)));
+            ValidateXML(XSDSchema(FormatVersion(0, 3, 0)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 3, 0)):
+        case (FormatVersion(0, 3, 0)):
             ToV0_3_1();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 3, 1)));
+            ValidateXML(XSDSchema(FormatVersion(0, 3, 1)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 3, 1)):
+        case (FormatVersion(0, 3, 1)):
             ToV0_3_2();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 3, 2)));
+            ValidateXML(XSDSchema(FormatVersion(0, 3, 2)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 3, 2)):
+        case (FormatVersion(0, 3, 2)):
             ToV0_3_3();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 3, 3)));
+            ValidateXML(XSDSchema(FormatVersion(0, 3, 3)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 3, 3)):
+        case (FormatVersion(0, 3, 3)):
             ToV0_3_4();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 3, 4)));
+            ValidateXML(XSDSchema(FormatVersion(0, 3, 4)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 3, 4)):
+        case (FormatVersion(0, 3, 4)):
             ToV0_3_5();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 3, 5)));
+            ValidateXML(XSDSchema(FormatVersion(0, 3, 5)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 3, 5)):
+        case (FormatVersion(0, 3, 5)):
             ToV0_3_6();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 3, 6)));
+            ValidateXML(XSDSchema(FormatVersion(0, 3, 6)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 3, 6)):
+        case (FormatVersion(0, 3, 6)):
             ToV0_3_7();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 3, 7)));
+            ValidateXML(XSDSchema(FormatVersion(0, 3, 7)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 3, 7)):
+        case (FormatVersion(0, 3, 7)):
             ToV0_3_8();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 3, 8)));
+            ValidateXML(XSDSchema(FormatVersion(0, 3, 8)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 3, 8)):
+        case (FormatVersion(0, 3, 8)):
             ToV0_3_9();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 3, 9)));
+            ValidateXML(XSDSchema(FormatVersion(0, 3, 9)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 3, 9)):
+        case (FormatVersion(0, 3, 9)):
             ToV0_4_0();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 0)));
+            ValidateXML(XSDSchema(FormatVersion(0, 4, 0)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 4, 0)):
+        case (FormatVersion(0, 4, 0)):
             ToV0_4_1();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 1)));
+            ValidateXML(XSDSchema(FormatVersion(0, 4, 1)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 4, 1)):
+        case (FormatVersion(0, 4, 1)):
             ToV0_4_2();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 2)));
+            ValidateXML(XSDSchema(FormatVersion(0, 4, 2)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 4, 2)):
+        case (FormatVersion(0, 4, 2)):
             ToV0_4_3();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 3)));
+            ValidateXML(XSDSchema(FormatVersion(0, 4, 3)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 4, 3)):
+        case (FormatVersion(0, 4, 3)):
             ToV0_4_4();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 4)));
+            ValidateXML(XSDSchema(FormatVersion(0, 4, 4)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 4, 4)):
+        case (FormatVersion(0, 4, 4)):
             ToV0_4_5();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 5)));
+            ValidateXML(XSDSchema(FormatVersion(0, 4, 5)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 4, 5)):
+        case (FormatVersion(0, 4, 5)):
             ToV0_4_6();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 6)));
+            ValidateXML(XSDSchema(FormatVersion(0, 4, 6)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 4, 6)):
+        case (FormatVersion(0, 4, 6)):
             ToV0_4_7();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 7)));
+            ValidateXML(XSDSchema(FormatVersion(0, 4, 7)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 4, 7)):
+        case (FormatVersion(0, 4, 7)):
             ToV0_4_8();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 8)));
+            ValidateXML(XSDSchema(FormatVersion(0, 4, 8)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 4, 8)):
+        case (FormatVersion(0, 4, 8)):
             ToV0_5_0();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 5, 0)));
+            ValidateXML(XSDSchema(FormatVersion(0, 5, 0)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 5, 0)):
+        case (FormatVersion(0, 5, 0)):
             ToV0_5_1();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 5, 1)));
+            ValidateXML(XSDSchema(FormatVersion(0, 5, 1)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 5, 1)):
+        case (FormatVersion(0, 5, 1)):
             ToV0_6_0();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 6, 0)));
+            ValidateXML(XSDSchema(FormatVersion(0, 6, 0)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 6, 0)):
+        case (FormatVersion(0, 6, 0)):
             ToV0_6_1();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 6, 1)));
+            ValidateXML(XSDSchema(FormatVersion(0, 6, 1)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 6, 1)):
+        case (FormatVersion(0, 6, 1)):
             ToV0_6_2();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 6, 2)));
+            ValidateXML(XSDSchema(FormatVersion(0, 6, 2)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 6, 2)):
+        case (FormatVersion(0, 6, 2)):
             ToV0_6_3();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 6, 3)));
+            ValidateXML(XSDSchema(FormatVersion(0, 6, 3)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 6, 3)):
+        case (FormatVersion(0, 6, 3)):
             ToV0_6_4();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 6, 4)));
+            ValidateXML(XSDSchema(FormatVersion(0, 6, 4)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 6, 4)):
+        case (FormatVersion(0, 6, 4)):
             ToV0_6_5();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 6, 5)));
+            ValidateXML(XSDSchema(FormatVersion(0, 6, 5)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 6, 5)):
+        case (FormatVersion(0, 6, 5)):
             ToV0_6_6();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 6, 6)));
+            ValidateXML(XSDSchema(FormatVersion(0, 6, 6)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 6, 6)):
+        case (FormatVersion(0, 6, 6)):
             ToV0_7_0();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 7, 0)));
+            ValidateXML(XSDSchema(FormatVersion(0, 7, 0)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 7, 0)):
+        case (FormatVersion(0, 7, 0)):
             ToV0_7_1();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 7, 1)));
+            ValidateXML(XSDSchema(FormatVersion(0, 7, 1)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 7, 1)):
+        case (FormatVersion(0, 7, 1)):
             ToV0_7_2();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 7, 2)));
+            ValidateXML(XSDSchema(FormatVersion(0, 7, 2)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 7, 2)):
+        case (FormatVersion(0, 7, 2)):
             ToV0_7_3();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 7, 3)));
+            ValidateXML(XSDSchema(FormatVersion(0, 7, 3)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 7, 3)):
+        case (FormatVersion(0, 7, 3)):
             ToV0_7_4();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 7, 4)));
+            ValidateXML(XSDSchema(FormatVersion(0, 7, 4)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 7, 4)):
+        case (FormatVersion(0, 7, 4)):
             ToV0_7_5();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 7, 5)));
+            ValidateXML(XSDSchema(FormatVersion(0, 7, 5)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 7, 5)):
+        case (FormatVersion(0, 7, 5)):
             ToV0_7_6();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 7, 6)));
+            ValidateXML(XSDSchema(FormatVersion(0, 7, 6)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 7, 6)):
+        case (FormatVersion(0, 7, 6)):
             ToV0_7_7();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 7, 7)));
+            ValidateXML(XSDSchema(FormatVersion(0, 7, 7)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 7, 7)):
+        case (FormatVersion(0, 7, 7)):
             ToV0_7_8();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 7, 8)));
+            ValidateXML(XSDSchema(FormatVersion(0, 7, 8)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 7, 8)):
+        case (FormatVersion(0, 7, 8)):
             ToV0_7_9();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 7, 9)));
+            ValidateXML(XSDSchema(FormatVersion(0, 7, 9)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 7, 9)):
+        case (FormatVersion(0, 7, 9)):
             ToV0_7_10();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 7, 10)));
+            ValidateXML(XSDSchema(FormatVersion(0, 7, 10)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 7, 10)):
+        case (FormatVersion(0, 7, 10)):
             ToV0_7_11();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 7, 11)));
+            ValidateXML(XSDSchema(FormatVersion(0, 7, 11)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 7, 11)):
+        case (FormatVersion(0, 7, 11)):
             ToV0_7_12();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 7, 12)));
+            ValidateXML(XSDSchema(FormatVersion(0, 7, 12)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 7, 12)):
+        case (FormatVersion(0, 7, 12)):
             ToV0_7_13();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 7, 13)));
+            ValidateXML(XSDSchema(FormatVersion(0, 7, 13)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 7, 13)):
+        case (FormatVersion(0, 7, 13)):
             ToV0_8_0();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 8, 0)));
+            ValidateXML(XSDSchema(FormatVersion(0, 8, 0)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 8, 0)):
+        case (FormatVersion(0, 8, 0)):
             ToV0_8_1();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 8, 1)));
+            ValidateXML(XSDSchema(FormatVersion(0, 8, 1)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 8, 1)):
+        case (FormatVersion(0, 8, 1)):
             ToV0_8_2();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 8, 2)));
+            ValidateXML(XSDSchema(FormatVersion(0, 8, 2)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 8, 2)):
+        case (FormatVersion(0, 8, 2)):
             ToV0_8_3();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 8, 3)));
+            ValidateXML(XSDSchema(FormatVersion(0, 8, 3)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 8, 3)):
+        case (FormatVersion(0, 8, 3)):
             ToV0_8_4();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 8, 4)));
+            ValidateXML(XSDSchema(FormatVersion(0, 8, 4)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 8, 4)):
+        case (FormatVersion(0, 8, 4)):
             ToV0_8_5();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 8, 5)));
+            ValidateXML(XSDSchema(FormatVersion(0, 8, 5)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 8, 5)):
+        case (FormatVersion(0, 8, 5)):
             ToV0_8_6();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 8, 6)));
+            ValidateXML(XSDSchema(FormatVersion(0, 8, 6)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 8, 6)):
+        case (FormatVersion(0, 8, 6)):
             ToV0_8_7();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 8, 7)));
+            ValidateXML(XSDSchema(FormatVersion(0, 8, 7)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 8, 7)):
+        case (FormatVersion(0, 8, 7)):
             ToV0_8_8();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 8, 8)));
+            ValidateXML(XSDSchema(FormatVersion(0, 8, 8)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 8, 8)):
+        case (FormatVersion(0, 8, 8)):
             ToV0_8_9();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 8, 9)));
+            ValidateXML(XSDSchema(FormatVersion(0, 8, 9)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 8, 9)):
+        case (FormatVersion(0, 8, 9)):
             ToV0_8_10();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 8, 10)));
+            ValidateXML(XSDSchema(FormatVersion(0, 8, 10)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 8, 10)):
+        case (FormatVersion(0, 8, 10)):
             ToV0_8_11();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 8, 11)));
+            ValidateXML(XSDSchema(FormatVersion(0, 8, 11)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 8, 11)):
+        case (FormatVersion(0, 8, 11)):
+            ToV0_8_12();
+            ValidateXML(XSDSchema(FormatVersion(0, 8, 12)));
+            Q_FALLTHROUGH();
+        case (FormatVersion(0, 8, 12)):
             break;
         default:
             InvalidVersion(m_ver);
@@ -523,7 +531,7 @@ void VPatternConverter::DowngradeToCurrentMaxVersion()
 bool VPatternConverter::IsReadOnly() const
 {
     // Check if attribute readOnly was not changed in file format
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMaxVer == FORMAT_VERSION(0, 8, 11),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMaxVer == FormatVersion(0, 8, 12),
                       "Check attribute readOnly.");
 
     // Possibly in future attribute readOnly will change position etc.
@@ -544,7 +552,7 @@ bool VPatternConverter::IsReadOnly() const
 void VPatternConverter::ToV0_2_0()
 {
     // TODO. Delete if minimal supported version is 0.2.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0),
                       "Time to refactor the code.");
 
     SetVersion(QStringLiteral("0.2.0"));
@@ -559,7 +567,7 @@ void VPatternConverter::ToV0_2_0()
 void VPatternConverter::ToV0_2_1()
 {
     // TODO. Delete if minimal supported version is 0.2.1
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 1),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 1),
                       "Time to refactor the code.");
 
     SetVersion(QStringLiteral("0.2.1"));
@@ -571,7 +579,7 @@ void VPatternConverter::ToV0_2_1()
 void VPatternConverter::ToV0_2_2()
 {
     // TODO. Delete if minimal supported version is 0.2.2
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 2),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 2),
                       "Time to refactor the code.");
 
     SetVersion(QStringLiteral("0.2.2"));
@@ -582,7 +590,7 @@ void VPatternConverter::ToV0_2_2()
 void VPatternConverter::ToV0_2_3()
 {
     // TODO. Delete if minimal supported version is 0.2.3
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 3),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 3),
                       "Time to refactor the code.");
 
     SetVersion(QStringLiteral("0.2.3"));
@@ -593,7 +601,7 @@ void VPatternConverter::ToV0_2_3()
 void VPatternConverter::ToV0_2_4()
 {
     // TODO. Delete if minimal supported version is 0.2.4
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 4),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 4),
                       "Time to refactor the code.");
 
     FixToolUnionToV0_2_4();
@@ -605,7 +613,7 @@ void VPatternConverter::ToV0_2_4()
 void VPatternConverter::ToV0_2_5()
 {
     // TODO. Delete if minimal supported version is 0.2.5
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 5),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 5),
                       "Time to refactor the code.");
 
     SetVersion(QStringLiteral("0.2.5"));
@@ -616,7 +624,7 @@ void VPatternConverter::ToV0_2_5()
 void VPatternConverter::ToV0_2_6()
 {
     // TODO. Delete if minimal supported version is 0.2.6
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 6),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 6),
                       "Time to refactor the code.");
 
     SetVersion(QStringLiteral("0.2.6"));
@@ -627,7 +635,7 @@ void VPatternConverter::ToV0_2_6()
 void VPatternConverter::ToV0_2_7()
 {
     // TODO. Delete if minimal supported version is 0.2.7
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 7),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 7),
                       "Time to refactor the code.");
 
     SetVersion(QStringLiteral("0.2.7"));
@@ -638,7 +646,7 @@ void VPatternConverter::ToV0_2_7()
 void VPatternConverter::ToV0_3_0()
 {
     // TODO. Delete if minimal supported version is 0.3.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 3, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 3, 0),
                       "Time to refactor the code.");
 
     //Cutting path do not create anymore subpaths
@@ -652,7 +660,7 @@ void VPatternConverter::ToV0_3_0()
 void VPatternConverter::ToV0_3_1()
 {
     // TODO. Delete if minimal supported version is 0.3.1
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 3, 1),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 3, 1),
                       "Time to refactor the code.");
 
     SetVersion(QStringLiteral("0.3.1"));
@@ -664,7 +672,7 @@ void VPatternConverter::ToV0_3_1()
 void VPatternConverter::ToV0_3_2()
 {
     // TODO. Delete if minimal supported version is 0.3.2
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 3, 2),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 3, 2),
                       "Time to refactor the code.");
 
     SetVersion(QStringLiteral("0.3.2"));
@@ -675,7 +683,7 @@ void VPatternConverter::ToV0_3_2()
 void VPatternConverter::ToV0_3_3()
 {
     // TODO. Delete if minimal supported version is 0.3.3
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 3, 3),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 3, 3),
                       "Time to refactor the code.");
 
     SetVersion(QStringLiteral("0.3.3"));
@@ -686,7 +694,7 @@ void VPatternConverter::ToV0_3_3()
 void VPatternConverter::ToV0_3_4()
 {
     // TODO. Delete if minimal supported version is 0.3.4
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 3, 4),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 3, 4),
                       "Time to refactor the code.");
 
     SetVersion(QStringLiteral("0.3.4"));
@@ -697,7 +705,7 @@ void VPatternConverter::ToV0_3_4()
 void VPatternConverter::ToV0_3_5()
 {
     // TODO. Delete if minimal supported version is 0.3.5
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 3, 5),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 3, 5),
                       "Time to refactor the code.");
 
     SetVersion(QStringLiteral("0.3.5"));
@@ -708,7 +716,7 @@ void VPatternConverter::ToV0_3_5()
 void VPatternConverter::ToV0_3_6()
 {
     // TODO. Delete if minimal supported version is 0.3.6
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 3, 6),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 3, 6),
                       "Time to refactor the code.");
 
     SetVersion(QStringLiteral("0.3.6"));
@@ -719,7 +727,7 @@ void VPatternConverter::ToV0_3_6()
 void VPatternConverter::ToV0_3_7()
 {
     // TODO. Delete if minimal supported version is 0.3.7
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 3, 7),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 3, 7),
                       "Time to refactor the code.");
 
     SetVersion(QStringLiteral("0.3.7"));
@@ -730,7 +738,7 @@ void VPatternConverter::ToV0_3_7()
 void VPatternConverter::ToV0_3_8()
 {
     // TODO. Delete if minimal supported version is 0.3.8
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 3, 8),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 3, 8),
                       "Time to refactor the code.");
 
     SetVersion(QStringLiteral("0.3.8"));
@@ -741,7 +749,7 @@ void VPatternConverter::ToV0_3_8()
 void VPatternConverter::ToV0_3_9()
 {
     // TODO. Delete if minimal supported version is 0.3.9
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 3, 9),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 3, 9),
                       "Time to refactor the code.");
 
     SetVersion(QStringLiteral("0.3.9"));
@@ -752,7 +760,7 @@ void VPatternConverter::ToV0_3_9()
 void VPatternConverter::ToV0_4_0()
 {
     // TODO. Delete if minimal supported version is 0.4.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 4, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 4, 0),
                       "Time to refactor the code.");
 
     SetVersion(QStringLiteral("0.4.0"));
@@ -766,7 +774,7 @@ void VPatternConverter::ToV0_4_0()
 void VPatternConverter::ToV0_4_1()
 {
     // TODO. Delete if minimal supported version is 0.4.1
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 4, 1),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 4, 1),
                       "Time to refactor the code.");
 
     SetVersion(QStringLiteral("0.4.1"));
@@ -777,7 +785,7 @@ void VPatternConverter::ToV0_4_1()
 void VPatternConverter::ToV0_4_2()
 {
     // TODO. Delete if minimal supported version is 0.4.2
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 4, 2),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 4, 2),
                       "Time to refactor the code.");
 
     SetVersion(QStringLiteral("0.4.2"));
@@ -788,7 +796,7 @@ void VPatternConverter::ToV0_4_2()
 void VPatternConverter::ToV0_4_3()
 {
     // TODO. Delete if minimal supported version is 0.4.3
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 4, 3),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 4, 3),
                       "Time to refactor the code.");
 
     SetVersion(QStringLiteral("0.4.3"));
@@ -799,7 +807,7 @@ void VPatternConverter::ToV0_4_3()
 void VPatternConverter::ToV0_4_4()
 {
     // TODO. Delete if minimal supported version is 0.4.4
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 4, 4),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 4, 4),
                       "Time to refactor the code.");
 
     SetVersion(QStringLiteral("0.4.4"));
@@ -812,7 +820,7 @@ void VPatternConverter::ToV0_4_4()
 void VPatternConverter::ToV0_4_5()
 {
     // TODO. Delete if minimal supported version is 0.4.5
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 4, 5),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 4, 5),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.4.5"));
     Save();
@@ -822,7 +830,7 @@ void VPatternConverter::ToV0_4_5()
 void VPatternConverter::ToV0_4_6()
 {
     // TODO. Delete if minimal supported version is 0.4.6
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 4, 6),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 4, 6),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.4.6"));
     Save();
@@ -832,7 +840,7 @@ void VPatternConverter::ToV0_4_6()
 void VPatternConverter::ToV0_4_7()
 {
     // TODO. Delete if minimal supported version is 0.4.7
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 4, 7),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 4, 7),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.4.7"));
     Save();
@@ -842,7 +850,7 @@ void VPatternConverter::ToV0_4_7()
 void VPatternConverter::ToV0_4_8()
 {
     // TODO. Delete if minimal supported version is 0.4.8
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 4, 8),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 4, 8),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.4.8"));
     Save();
@@ -852,7 +860,7 @@ void VPatternConverter::ToV0_4_8()
 void VPatternConverter::ToV0_5_0()
 {
     // TODO. Delete if minimal supported version is 0.5.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 5, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 5, 0),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.5.0"));
     Save();
@@ -862,7 +870,7 @@ void VPatternConverter::ToV0_5_0()
 void VPatternConverter::ToV0_5_1()
 {
     // TODO. Delete if minimal supported version is 0.5.1
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 5, 1),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 5, 1),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.5.1"));
     Save();
@@ -872,7 +880,7 @@ void VPatternConverter::ToV0_5_1()
 void VPatternConverter::ToV0_6_0()
 {
     // TODO. Delete if minimal supported version is 0.6.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 6, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 6, 0),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.6.0"));
     QDomElement label = AddTagPatternLabelV0_5_1();
@@ -886,7 +894,7 @@ void VPatternConverter::ToV0_6_0()
 void VPatternConverter::ToV0_6_1()
 {
     // TODO. Delete if minimal supported version is 0.6.1
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 6, 1),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 6, 1),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.6.1"));
     Save();
@@ -896,7 +904,7 @@ void VPatternConverter::ToV0_6_1()
 void VPatternConverter::ToV0_6_2()
 {
     // TODO. Delete if minimal supported version is 0.6.2
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 6, 2),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 6, 2),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.6.2"));
     AddTagPreviewCalculationsV0_6_2();
@@ -907,7 +915,7 @@ void VPatternConverter::ToV0_6_2()
 void VPatternConverter::ToV0_6_3()
 {
     // TODO. Delete if minimal supported version is 0.6.3
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 6, 3),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 6, 3),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.6.3"));
     Save();
@@ -917,7 +925,7 @@ void VPatternConverter::ToV0_6_3()
 void VPatternConverter::ToV0_6_4()
 {
     // TODO. Delete if minimal supported version is 0.6.4
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 6, 4),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 6, 4),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.6.4"));
     Save();
@@ -927,7 +935,7 @@ void VPatternConverter::ToV0_6_4()
 void VPatternConverter::ToV0_6_5()
 {
     // TODO. Delete if minimal supported version is 0.6.5
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 6, 5),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 6, 5),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.6.5"));
     Save();
@@ -937,7 +945,7 @@ void VPatternConverter::ToV0_6_5()
 void VPatternConverter::ToV0_6_6()
 {
     // TODO. Delete if minimal supported version is 0.6.6
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 6, 6),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 6, 6),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.6.6"));
     Save();
@@ -947,7 +955,7 @@ void VPatternConverter::ToV0_6_6()
 void VPatternConverter::ToV0_7_0()
 {
     // TODO. Delete if minimal supported version is 0.7.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 7, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 7, 0),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.7.0"));
     Save();
@@ -957,7 +965,7 @@ void VPatternConverter::ToV0_7_0()
 void VPatternConverter::ToV0_7_1()
 {
     // TODO. Delete if minimal supported version is 0.7.1
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 7, 1),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 7, 1),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.7.1"));
     Save();
@@ -967,7 +975,7 @@ void VPatternConverter::ToV0_7_1()
 void VPatternConverter::ToV0_7_2()
 {
     // TODO. Delete if minimal supported version is 0.7.2
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 7, 2),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 7, 2),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.7.2"));
     Save();
@@ -977,7 +985,7 @@ void VPatternConverter::ToV0_7_2()
 void VPatternConverter::ToV0_7_3()
 {
     // TODO. Delete if minimal supported version is 0.7.3
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 7, 3),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 7, 3),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.7.3"));
     Save();
@@ -987,7 +995,7 @@ void VPatternConverter::ToV0_7_3()
 void VPatternConverter::ToV0_7_4()
 {
     // TODO. Delete if minimal supported version is 0.7.4
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 7, 4),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 7, 4),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.7.4"));
     Save();
@@ -997,7 +1005,7 @@ void VPatternConverter::ToV0_7_4()
 void VPatternConverter::ToV0_7_5()
 {
     // TODO. Delete if minimal supported version is 0.7.5
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 7, 5),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 7, 5),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.7.5"));
     Save();
@@ -1007,7 +1015,7 @@ void VPatternConverter::ToV0_7_5()
 void VPatternConverter::ToV0_7_6()
 {
     // TODO. Delete if minimal supported version is 0.7.6
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 7, 6),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 7, 6),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.7.6"));
     Save();
@@ -1017,7 +1025,7 @@ void VPatternConverter::ToV0_7_6()
 void VPatternConverter::ToV0_7_7()
 {
     // TODO. Delete if minimal supported version is 0.7.7
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 7, 7),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 7, 7),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.7.7"));
     Save();
@@ -1027,7 +1035,7 @@ void VPatternConverter::ToV0_7_7()
 void VPatternConverter::ToV0_7_8()
 {
     // TODO. Delete if minimal supported version is 0.7.8
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 7, 8),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 7, 8),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.7.8"));
     Save();
@@ -1037,7 +1045,7 @@ void VPatternConverter::ToV0_7_8()
 void VPatternConverter::ToV0_7_9()
 {
     // TODO. Delete if minimal supported version is 0.7.9
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 7, 9),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 7, 9),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.7.9"));
     Save();
@@ -1047,7 +1055,7 @@ void VPatternConverter::ToV0_7_9()
 void VPatternConverter::ToV0_7_10()
 {
     // TODO. Delete if minimal supported version is 0.7.10
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 7, 10),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 7, 10),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.7.10"));
     Save();
@@ -1057,7 +1065,7 @@ void VPatternConverter::ToV0_7_10()
 void VPatternConverter::ToV0_7_11()
 {
     // TODO. Delete if minimal supported version is 0.7.11
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 7, 11),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 7, 11),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.7.11"));
     Save();
@@ -1067,7 +1075,7 @@ void VPatternConverter::ToV0_7_11()
 void VPatternConverter::ToV0_7_12()
 {
     // TODO. Delete if minimal supported version is 0.7.12
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 7, 12),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 7, 12),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.7.12"));
     Save();
@@ -1077,7 +1085,7 @@ void VPatternConverter::ToV0_7_12()
 void VPatternConverter::ToV0_7_13()
 {
     // TODO. Delete if minimal supported version is 0.7.13
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 7, 13),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 7, 13),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.7.13"));
     Save();
@@ -1087,7 +1095,7 @@ void VPatternConverter::ToV0_7_13()
 void VPatternConverter::ToV0_8_0()
 {
     // TODO. Delete if minimal supported version is 0.8.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 8, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 8, 0),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.8.0"));
     Save();
@@ -1097,7 +1105,7 @@ void VPatternConverter::ToV0_8_0()
 void VPatternConverter::ToV0_8_1()
 {
     // TODO. Delete if minimal supported version is 0.8.1
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 8, 1),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 8, 1),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.8.1"));
     Save();
@@ -1107,7 +1115,7 @@ void VPatternConverter::ToV0_8_1()
 void VPatternConverter::ToV0_8_2()
 {
     // TODO. Delete if minimal supported version is 0.8.2
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 8, 2),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 8, 2),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.8.2"));
     Save();
@@ -1117,7 +1125,7 @@ void VPatternConverter::ToV0_8_2()
 void VPatternConverter::ToV0_8_3()
 {
     // TODO. Delete if minimal supported version is 0.8.3
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 8, 3),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 8, 3),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.8.3"));
     Save();
@@ -1127,7 +1135,7 @@ void VPatternConverter::ToV0_8_3()
 void VPatternConverter::ToV0_8_4()
 {
     // TODO. Delete if minimal supported version is 0.8.4
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 8, 4),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 8, 4),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.8.4"));
     Save();
@@ -1137,7 +1145,7 @@ void VPatternConverter::ToV0_8_4()
 void VPatternConverter::ToV0_8_5()
 {
     // TODO. Delete if minimal supported version is 0.8.5
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 8, 5),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 8, 5),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.8.5"));
     Save();
@@ -1147,7 +1155,7 @@ void VPatternConverter::ToV0_8_5()
 void VPatternConverter::ToV0_8_6()
 {
     // TODO. Delete if minimal supported version is 0.8.6
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 8, 6),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 8, 6),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.8.6"));
     Save();
@@ -1157,7 +1165,7 @@ void VPatternConverter::ToV0_8_6()
 void VPatternConverter::ToV0_8_7()
 {
     // TODO. Delete if minimal supported version is 0.8.7
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 8, 7),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 8, 7),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.8.7"));
     Save();
@@ -1167,10 +1175,11 @@ void VPatternConverter::ToV0_8_7()
 void VPatternConverter::ToV0_8_8()
 {
     // TODO. Delete if minimal supported version is 0.8.8
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 8, 8),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 8, 8),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.8.8"));
     RemoveGradationV0_8_8();
+    AddPieceUUIDV0_8_8();  
     Save();
 }
 
@@ -1178,7 +1187,7 @@ void VPatternConverter::ToV0_8_8()
 void VPatternConverter::ToV0_8_9()
 {
     // TODO. Delete if minimal supported version is 0.8.9
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 8, 9),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 8, 9),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.8.9"));
     Save();
@@ -1188,7 +1197,7 @@ void VPatternConverter::ToV0_8_9()
 void VPatternConverter::ToV0_8_10()
 {
     // TODO. Delete if minimal supported version is 0.8.10
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 8, 10),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 8, 10),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.8.10"));
     Save();
@@ -1198,17 +1207,27 @@ void VPatternConverter::ToV0_8_10()
 void VPatternConverter::ToV0_8_11()
 {
     // TODO. Delete if minimal supported version is 0.8.11
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 8, 11),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 8, 11),
                       "Time to refactor the code.");
     SetVersion(QStringLiteral("0.8.11"));
     Save();
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+void VPatternConverter::ToV0_8_12()
+{
+    // TODO. Delete if minimal supported version is 0.8.12
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 8, 12),
+                      "Time to refactor the code.");
+    SetVersion(QStringLiteral("0.8.12"));
+    Save();
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 void VPatternConverter::TagUnitToV0_2_0()
 {
     // TODO. Delete if minimal supported version is 0.2.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0),
                       "Time to refactor the code.");
 
     QDomElement patternElement = documentElement();
@@ -1220,7 +1239,7 @@ void VPatternConverter::TagUnitToV0_2_0()
 void VPatternConverter::TagIncrementToV0_2_0()
 {
     // TODO. Delete if minimal supported version is 0.2.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0),
                       "Time to refactor the code.");
 
     const QSet<QString> names = FixIncrementsToV0_2_0();
@@ -1234,7 +1253,7 @@ void VPatternConverter::TagIncrementToV0_2_0()
 void VPatternConverter::ConvertMeasurementsToV0_2_0()
 {
     // TODO. Delete if minimal supported version is 0.2.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0),
                       "Time to refactor the code.");
 
     const QMap<QString, QString> names = OldNamesToNewNames_InV0_2_0();
@@ -1247,7 +1266,7 @@ void VPatternConverter::ConvertMeasurementsToV0_2_0()
 QSet<QString> VPatternConverter::FixIncrementsToV0_2_0()
 {
     // TODO. Delete if minimal supported version is 0.2.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0),
                       "Time to refactor the code.");
 
     QSet<QString> names;
@@ -1293,7 +1312,7 @@ QSet<QString> VPatternConverter::FixIncrementsToV0_2_0()
 void VPatternConverter::FixPointExpressionsToV0_2_0(const QSet<QString> &names)
 {
     // TODO. Delete if minimal supported version is 0.2.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0),
                       "Time to refactor the code.");
 
     QString formula;
@@ -1357,7 +1376,7 @@ void VPatternConverter::FixPointExpressionsToV0_2_0(const QSet<QString> &names)
 void VPatternConverter::FixArcExpressionsToV0_2_0(const QSet<QString> &names)
 {
     // TODO. Delete if minimal supported version is 0.2.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0),
                       "Time to refactor the code.");
 
     QString formula;
@@ -1412,7 +1431,7 @@ void VPatternConverter::FixArcExpressionsToV0_2_0(const QSet<QString> &names)
 void VPatternConverter::FixPathPointExpressionsToV0_2_0(const QSet<QString> &names)
 {
     // TODO. Delete if minimal supported version is 0.2.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0),
                       "Time to refactor the code.");
 
     QString formula;
@@ -1457,7 +1476,7 @@ void VPatternConverter::FixPathPointExpressionsToV0_2_0(const QSet<QString> &nam
 void VPatternConverter::ConvertPointExpressionsToV0_2_0(const QMap<QString, QString> &names)
 {
     // TODO. Delete if minimal supported version is 0.2.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0),
                       "Time to refactor the code.");
 
     QString formula;
@@ -1521,7 +1540,7 @@ void VPatternConverter::ConvertPointExpressionsToV0_2_0(const QMap<QString, QStr
 void VPatternConverter::ConvertArcExpressionsToV0_2_0(const QMap<QString, QString> &names)
 {
     // TODO. Delete if minimal supported version is 0.2.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0),
                       "Time to refactor the code.");
 
     QString formula;
@@ -1576,7 +1595,7 @@ void VPatternConverter::ConvertArcExpressionsToV0_2_0(const QMap<QString, QStrin
 void VPatternConverter::ConvertPathPointExpressionsToV0_2_0(const QMap<QString, QString> &names)
 {
     // TODO. Delete if minimal supported version is 0.2.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0),
                       "Time to refactor the code.");
 
     QString formula;
@@ -1621,7 +1640,7 @@ void VPatternConverter::ConvertPathPointExpressionsToV0_2_0(const QMap<QString,
 QString VPatternConverter::FixMeasurementInFormulaToV0_2_0(const QString &formula, const QMap<QString, QString> &names)
 {
     // TODO. Delete if minimal supported version is 0.2.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0),
                       "Time to refactor the code.");
 
     QScopedPointer<qmu::QmuTokenParser> cal(new qmu::QmuTokenParser(formula, false, false));// Eval formula
@@ -1655,7 +1674,7 @@ QString VPatternConverter::FixMeasurementInFormulaToV0_2_0(const QString &formul
 QString VPatternConverter::FixIncrementInFormulaToV0_2_0(const QString &formula, const QSet<QString> &names)
 {
     // TODO. Delete if minimal supported version is 0.2.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0),
                       "Time to refactor the code.");
 
     qmu::QmuTokenParser *cal = new qmu::QmuTokenParser(formula, false, false);// Eval formula
@@ -1689,7 +1708,7 @@ QString VPatternConverter::FixIncrementInFormulaToV0_2_0(const QString &formula,
 void VPatternConverter::TagMeasurementsToV0_2_0()
 {
     // TODO. Delete if minimal supported version is 0.2.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0),
                       "Time to refactor the code.");
 
     QDomElement ms = TagMeasurementsV0_1_4();
@@ -1706,7 +1725,7 @@ void VPatternConverter::TagMeasurementsToV0_2_0()
 void VPatternConverter::ConvertMeasurementsToV0_2_1()
 {
     // TODO. Delete if minimal supported version is 0.2.1
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 1),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 1),
                       "Time to refactor the code.");
 
     const QMap<QString, QString> names = OldNamesToNewNames_InV0_2_1();
@@ -1721,7 +1740,7 @@ void VPatternConverter::ConvertMeasurementsToV0_2_1()
 void VPatternConverter::RemoveColorToolCutV0_3_1()
 {
     // TODO. Delete if minimal supported version is 0.3.1
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 3, 1),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 3, 1),
                       "Time to refactor the code.");
 
     const QDomNodeList list = elementsByTagName(*strPoint);
@@ -1743,7 +1762,7 @@ void VPatternConverter::RemoveColorToolCutV0_3_1()
 QString VPatternConverter::MUnitV0_1_4() const
 {
     // TODO. Delete if minimal supported version is 0.2.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0),
                       "Time to refactor the code.");
 
     const QDomElement element = TagMeasurementsV0_1_4();
@@ -1763,7 +1782,7 @@ QString VPatternConverter::MUnitV0_1_4() const
 QDomElement VPatternConverter::TagMeasurementsV0_1_4() const
 {
     // TODO. Delete if minimal supported version is 0.2.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0),
                       "Time to refactor the code.");
 
     const QDomNodeList list = elementsByTagName(*strMeasurements);
@@ -1780,7 +1799,7 @@ QDomElement VPatternConverter::TagMeasurementsV0_1_4() const
 QDomElement VPatternConverter::TagIncrementsV0_1_4() const
 {
     // TODO. Delete if minimal supported version is 0.2.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0),
                       "Time to refactor the code.");
 
     const QDomNodeList list = elementsByTagName(*strIncrements);
@@ -1797,7 +1816,7 @@ QDomElement VPatternConverter::TagIncrementsV0_1_4() const
 void VPatternConverter::FixToolUnionToV0_2_4()
 {
     // TODO. Delete if minimal supported version is 0.2.4
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 4),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 4),
                       "Time to refactor the code.");
 
     QDomElement root = documentElement();
@@ -1812,7 +1831,7 @@ void VPatternConverter::FixToolUnionToV0_2_4()
 void VPatternConverter::ParseModelingToV0_2_4(const QDomElement &modeling)
 {
     // TODO. Delete if minimal supported version is 0.2.4
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 4),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 4),
                       "Time to refactor the code.");
 
     QDomElement node = modeling.firstChild().toElement();
@@ -1851,7 +1870,7 @@ void VPatternConverter::ParseModelingToV0_2_4(const QDomElement &modeling)
 void VPatternConverter::SaveChildrenToolUnionToV0_2_4(quint32 id, const QVector<quint32> &children)
 {
     // TODO. Delete if minimal supported version is 0.2.4
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 4),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 4),
                       "Time to refactor the code.");
 
     QDomElement toolUnion = elementById(id);
@@ -1874,7 +1893,7 @@ void VPatternConverter::SaveChildrenToolUnionToV0_2_4(quint32 id, const QVector<
 QMap<QString, QString> VPatternConverter::OldNamesToNewNames_InV0_2_0()
 {
     // TODO. Delete if minimal supported version is 0.2.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0),
                       "Time to refactor the code.");
 
     // old name, new name
@@ -2054,7 +2073,7 @@ QMap<QString, QString> VPatternConverter::OldNamesToNewNames_InV0_2_0()
 QMap<QString, QString> VPatternConverter::OldNamesToNewNames_InV0_2_1()
 {
     // TODO. Delete if minimal supported version is 0.2.1
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 1),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 1),
                       "Time to refactor the code.");
 
     // old name, new name
@@ -2252,7 +2271,7 @@ void VPatternConverter::FixSubPaths(int i, quint32 id, quint32 baseCurve)
 void VPatternConverter::TagRemoveAttributeTypeObjectInV0_4_0()
 {
     // TODO. Delete if minimal supported version is 0.4.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 4, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 4, 0),
                       "Time to refactor the code.");
 
     const QDomNodeList list = elementsByTagName(*strModeling);
@@ -2282,7 +2301,7 @@ void VPatternConverter::TagRemoveAttributeTypeObjectInV0_4_0()
 void VPatternConverter::TagDetailToV0_4_0()
 {
     // TODO. Delete if minimal supported version is 0.4.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 4, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 4, 0),
                       "Time to refactor the code.");
 
     const QDomNodeList list = elementsByTagName(*strDetail);
@@ -2422,7 +2441,7 @@ QDomElement VPatternConverter::GetUnionChildrenNodesV0_4_0(const QDomElement &de
 void VPatternConverter::LabelTagToV0_4_4(const QString &tagName)
 {
     // TODO. Delete if minimal supported version is 0.4.4
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 4, 4),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 4, 4),
                       "Time to refactor the code.");
 
     Unit unit = Unit::Cm;
@@ -2474,7 +2493,7 @@ void VPatternConverter::LabelTagToV0_4_4(const QString &tagName)
 QDomElement VPatternConverter::AddTagPatternLabelV0_5_1()
 {
     // TODO. Delete if minimal supported version is 0.6.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 6, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 6, 0),
                       "Time to refactor the code.");
 
     const QDomNodeList list = elementsByTagName(*strPatternLabel);
@@ -2512,7 +2531,7 @@ QDomElement VPatternConverter::AddTagPatternLabelV0_5_1()
 void VPatternConverter::PortPatternLabeltoV0_6_0(QDomElement &label)
 {
     // TODO. Delete if minimal supported version is 0.6.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 6, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 6, 0),
                       "Time to refactor the code.");
 
     if (not UniqueTagText(*strCompanyName).isEmpty())
@@ -2565,7 +2584,7 @@ void VPatternConverter::AddLabelTemplateLineV0_6_0(QDomElement &label, const QSt
                                                    int alignment, int fontSizeIncrement)
 {
     // TODO. Delete if minimal supported version is 0.6.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 6, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 6, 0),
                       "Time to refactor the code.");
 
     QDomElement tagLine = createElement(*strLine);
@@ -2583,7 +2602,7 @@ void VPatternConverter::AddLabelTemplateLineV0_6_0(QDomElement &label, const QSt
 void VPatternConverter::PortPieceLabelstoV0_6_0()
 {
     // TODO. Delete if minimal supported version is 0.6.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 6, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 6, 0),
                       "Time to refactor the code.");
 
     const QDomNodeList nodeList = elementsByTagName(*strData);
@@ -2671,7 +2690,7 @@ void VPatternConverter::PortPieceLabelstoV0_6_0()
 void VPatternConverter::RemoveUnusedTagsV0_6_0()
 {
     // TODO. Delete if minimal supported version is 0.6.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 6, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 6, 0),
                       "Time to refactor the code.");
 
     RemoveUniqueTagV0_6_0(*strAuthor);
@@ -2695,7 +2714,7 @@ void VPatternConverter::RemoveUnusedTagsV0_6_0()
 void VPatternConverter::RemoveUniqueTagV0_6_0(const QString &tag)
 {
     // TODO. Delete if minimal supported version is 0.6.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 6, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 6, 0),
                       "Time to refactor the code.");
 
     const QDomNodeList nodeList = elementsByTagName(tag);
@@ -2712,7 +2731,7 @@ void VPatternConverter::RemoveUniqueTagV0_6_0(const QString &tag)
 void VPatternConverter::AddTagPreviewCalculationsV0_6_2()
 {
     // TODO. Delete if minimal supported version is 0.6.2
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 6, 2),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 6, 2),
                       "Time to refactor the code.");
 
     const QDomNodeList list = elementsByTagName(*strIncrements);
@@ -2737,11 +2756,30 @@ void VPatternConverter::RemoveGradationV0_8_8()
     }
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+void VPatternConverter::AddPieceUUIDV0_8_8()
+{
+    // TODO. Delete if minimal supported version is 0.8.8
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 8, 8),
+                      "Time to refactor the code.");
+
+    const QDomNodeList list = elementsByTagName(*strDetail);
+    for (int i=0; i < list.size(); ++i)
+    {
+        QDomElement dom = list.at(i).toElement();
+
+        if (not dom.isNull())
+        {
+            dom.setAttribute(*strUUID, QUuid::createUuid().toString());
+        }
+    }
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 void VPatternConverter::TagUnionDetailsToV0_4_0()
 {
     // TODO. Delete if minimal supported version is 0.4.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 4, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 4, 0),
                       "Time to refactor the code.");
 
     const QDomNodeList list = elementsByTagName(*strTools);
diff --git a/src/libs/ifc/xml/vpatternconverter.h b/src/libs/ifc/xml/vpatternconverter.h
index 6bd1d9913..df8e93ac6 100644
--- a/src/libs/ifc/xml/vpatternconverter.h
+++ b/src/libs/ifc/xml/vpatternconverter.h
@@ -52,8 +52,8 @@ public:
 
     static const QString PatternMaxVerStr;
     static const QString CurrentSchema;
-    static Q_DECL_CONSTEXPR const int PatternMinVer = FORMAT_VERSION(0, 1, 4);
-    static Q_DECL_CONSTEXPR const int PatternMaxVer = FORMAT_VERSION(0, 8, 11);
+    static Q_DECL_CONSTEXPR const int PatternMinVer = FormatVersion(0, 1, 4);
+    static Q_DECL_CONSTEXPR const int PatternMaxVer = FormatVersion(0, 8, 12);
 
 protected:
     virtual int     MinVer() const override;
@@ -134,6 +134,7 @@ private:
     void ToV0_8_9();
     void ToV0_8_10();
     void ToV0_8_11();
+    void ToV0_8_12();
 
     void          TagUnitToV0_2_0();
     void          TagIncrementToV0_2_0();
@@ -188,6 +189,7 @@ private:
     void AddTagPreviewCalculationsV0_6_2();
 
     void RemoveGradationV0_8_8();
+    void AddPieceUUIDV0_8_8();
 };
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/ifc/xml/vvitconverter.cpp b/src/libs/ifc/xml/vvitconverter.cpp
index c4da6193a..a5b770c30 100644
--- a/src/libs/ifc/xml/vvitconverter.cpp
+++ b/src/libs/ifc/xml/vvitconverter.cpp
@@ -83,14 +83,14 @@ QString VVITConverter::XSDSchema(int ver) const
 {
     QHash <int, QString> schemas =
     {
-        std::make_pair(FORMAT_VERSION(0, 2, 0), QStringLiteral("://schema/individual_measurements/v0.2.0.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 3, 0), QStringLiteral("://schema/individual_measurements/v0.3.0.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 3, 1), QStringLiteral("://schema/individual_measurements/v0.3.1.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 3, 2), QStringLiteral("://schema/individual_measurements/v0.3.2.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 3, 3), QStringLiteral("://schema/individual_measurements/v0.3.3.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 4, 0), QStringLiteral("://schema/individual_measurements/v0.4.0.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 5, 0), QStringLiteral("://schema/individual_measurements/v0.5.0.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 5, 1), CurrentSchema),
+        std::make_pair(FormatVersion(0, 2, 0), QStringLiteral("://schema/individual_measurements/v0.2.0.xsd")),
+        std::make_pair(FormatVersion(0, 3, 0), QStringLiteral("://schema/individual_measurements/v0.3.0.xsd")),
+        std::make_pair(FormatVersion(0, 3, 1), QStringLiteral("://schema/individual_measurements/v0.3.1.xsd")),
+        std::make_pair(FormatVersion(0, 3, 2), QStringLiteral("://schema/individual_measurements/v0.3.2.xsd")),
+        std::make_pair(FormatVersion(0, 3, 3), QStringLiteral("://schema/individual_measurements/v0.3.3.xsd")),
+        std::make_pair(FormatVersion(0, 4, 0), QStringLiteral("://schema/individual_measurements/v0.4.0.xsd")),
+        std::make_pair(FormatVersion(0, 5, 0), QStringLiteral("://schema/individual_measurements/v0.5.0.xsd")),
+        std::make_pair(FormatVersion(0, 5, 1), CurrentSchema),
     };
 
     if (schemas.contains(ver))
@@ -108,35 +108,35 @@ void VVITConverter::ApplyPatches()
 {
     switch (m_ver)
     {
-        case (FORMAT_VERSION(0, 2, 0)):
+        case (FormatVersion(0, 2, 0)):
             ToV0_3_0();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 3, 0)));
+            ValidateXML(XSDSchema(FormatVersion(0, 3, 0)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 3, 0)):
+        case (FormatVersion(0, 3, 0)):
             ToV0_3_1();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 3, 1)));
+            ValidateXML(XSDSchema(FormatVersion(0, 3, 1)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 3, 1)):
+        case (FormatVersion(0, 3, 1)):
             ToV0_3_2();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 3, 2)));
+            ValidateXML(XSDSchema(FormatVersion(0, 3, 2)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 3, 2)):
+        case (FormatVersion(0, 3, 2)):
             ToV0_3_3();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 3, 3)));
+            ValidateXML(XSDSchema(FormatVersion(0, 3, 3)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 3, 3)):
+        case (FormatVersion(0, 3, 3)):
             ToV0_4_0();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 0)));
+            ValidateXML(XSDSchema(FormatVersion(0, 4, 0)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 4, 0)):
+        case (FormatVersion(0, 4, 0)):
             ToV0_5_0();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 5, 0)));
+            ValidateXML(XSDSchema(FormatVersion(0, 5, 0)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 5, 0)):
+        case (FormatVersion(0, 5, 0)):
             ToV0_5_1();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 5, 1)));
+            ValidateXML(XSDSchema(FormatVersion(0, 5, 1)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 5, 1)):
+        case (FormatVersion(0, 5, 1)):
             break;
         default:
             InvalidVersion(m_ver);
@@ -155,7 +155,7 @@ void VVITConverter::DowngradeToCurrentMaxVersion()
 bool VVITConverter::IsReadOnly() const
 {
     // Check if attribute read-only was not changed in file format
-    Q_STATIC_ASSERT_X(VVITConverter::MeasurementMaxVer == FORMAT_VERSION(0, 5, 1),
+    Q_STATIC_ASSERT_X(VVITConverter::MeasurementMaxVer == FormatVersion(0, 5, 1),
                       "Check attribute read-only.");
 
     // Possibly in future attribute read-only will change position etc.
@@ -169,7 +169,7 @@ bool VVITConverter::IsReadOnly() const
 void VVITConverter::AddNewTagsForV0_3_0()
 {
     // TODO. Delete if minimal supported version is 0.3.0
-    Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FORMAT_VERSION(0, 3, 0),
+    Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FormatVersion(0, 3, 0),
                       "Time to refactor the code.");
 
     QDomElement rootElement = this->documentElement();
@@ -185,7 +185,7 @@ void VVITConverter::AddNewTagsForV0_3_0()
 QString VVITConverter::MUnitV0_2_0()
 {
     // TODO. Delete if minimal supported version is 0.3.0
-    Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FORMAT_VERSION(0, 3, 0),
+    Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FormatVersion(0, 3, 0),
                       "Time to refactor the code.");
 
     return UniqueTagText(QStringLiteral("unit"), QStringLiteral("cm"));
@@ -195,7 +195,7 @@ QString VVITConverter::MUnitV0_2_0()
 void VVITConverter::ConvertMeasurementsToV0_3_0()
 {
     // TODO. Delete if minimal supported version is 0.3.0
-    Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FORMAT_VERSION(0, 3, 0),
+    Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FormatVersion(0, 3, 0),
                       "Time to refactor the code.");
 
     const QString tagBM = QStringLiteral("body-measurements");
@@ -238,7 +238,7 @@ void VVITConverter::ConvertMeasurementsToV0_3_0()
 QDomElement VVITConverter::AddMV0_3_0(const QString &name, qreal value)
 {
     // TODO. Delete if minimal supported version is 0.3.0
-    Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FORMAT_VERSION(0, 3, 0),
+    Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FormatVersion(0, 3, 0),
                       "Time to refactor the code.");
 
     QDomElement element = createElement(QStringLiteral("m"));
@@ -255,7 +255,7 @@ QDomElement VVITConverter::AddMV0_3_0(const QString &name, qreal value)
 void VVITConverter::GenderV0_3_1()
 {
     // TODO. Delete if minimal supported version is 0.3.1
-    Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FORMAT_VERSION(0, 3, 1),
+    Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FormatVersion(0, 3, 1),
                       "Time to refactor the code.");
 
     const QDomNodeList nodeList = this->elementsByTagName(QStringLiteral("sex"));
@@ -268,7 +268,7 @@ void VVITConverter::GenderV0_3_1()
 void VVITConverter::PM_SystemV0_3_2()
 {
     // TODO. Delete if minimal supported version is 0.3.2
-    Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FORMAT_VERSION(0, 3, 2),
+    Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FormatVersion(0, 3, 2),
                       "Time to refactor the code.");
 
     const QDomNodeList nodeList = this->elementsByTagName(QStringLiteral("personal"));
@@ -282,7 +282,7 @@ void VVITConverter::PM_SystemV0_3_2()
 void VVITConverter::ConvertMeasurementsToV0_3_3()
 {
     // TODO. Delete if minimal supported version is 0.3.3
-    Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FORMAT_VERSION(0, 3, 3),
+    Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FormatVersion(0, 3, 3),
                       "Time to refactor the code.");
 
     const QMap<QString, QString> names = OldNamesToNewNames_InV0_3_3();
@@ -365,7 +365,7 @@ void VVITConverter::ConverCustomerNameToV0_4_0()
 void VVITConverter::ToV0_3_0()
 {
     // TODO. Delete if minimal supported version is 0.3.0
-    Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FORMAT_VERSION(0, 3, 0),
+    Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FormatVersion(0, 3, 0),
                       "Time to refactor the code.");
 
     AddRootComment();
@@ -379,7 +379,7 @@ void VVITConverter::ToV0_3_0()
 void VVITConverter::ToV0_3_1()
 {
     // TODO. Delete if minimal supported version is 0.3.1
-    Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FORMAT_VERSION(0, 3, 1),
+    Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FormatVersion(0, 3, 1),
                       "Time to refactor the code.");
 
     SetVersion(QStringLiteral("0.3.1"));
@@ -391,7 +391,7 @@ void VVITConverter::ToV0_3_1()
 void VVITConverter::ToV0_3_2()
 {
     // TODO. Delete if minimal supported version is 0.3.2
-    Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FORMAT_VERSION(0, 3, 2),
+    Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FormatVersion(0, 3, 2),
                       "Time to refactor the code.");
 
     SetVersion(QStringLiteral("0.3.2"));
@@ -403,7 +403,7 @@ void VVITConverter::ToV0_3_2()
 void VVITConverter::ToV0_3_3()
 {
     // TODO. Delete if minimal supported version is 0.3.3
-    Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FORMAT_VERSION(0, 3, 3),
+    Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FormatVersion(0, 3, 3),
                       "Time to refactor the code.");
 
     SetVersion(QStringLiteral("0.3.3"));
@@ -415,7 +415,7 @@ void VVITConverter::ToV0_3_3()
 void VVITConverter::ToV0_4_0()
 {
     // TODO. Delete if minimal supported version is 0.4.0
-    Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FORMAT_VERSION(0, 4, 0),
+    Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FormatVersion(0, 4, 0),
                       "Time to refactor the code.");
 
     SetVersion(QStringLiteral("0.4.0"));
@@ -427,7 +427,7 @@ void VVITConverter::ToV0_4_0()
 void VVITConverter::ToV0_5_0()
 {
     // TODO. Delete if minimal supported version is 0.5.0
-    Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FORMAT_VERSION(0, 5, 0),
+    Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FormatVersion(0, 5, 0),
                       "Time to refactor the code.");
 
     SetVersion(QStringLiteral("0.5.0"));
@@ -438,7 +438,7 @@ void VVITConverter::ToV0_5_0()
 void VVITConverter::ToV0_5_1()
 {
     // TODO. Delete if minimal supported version is 0.5.1
-    Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FORMAT_VERSION(0, 5, 1),
+    Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FormatVersion(0, 5, 1),
                       "Time to refactor the code.");
 
     SetVersion(QStringLiteral("0.5.1"));
diff --git a/src/libs/ifc/xml/vvitconverter.h b/src/libs/ifc/xml/vvitconverter.h
index aa7360f71..80430488e 100644
--- a/src/libs/ifc/xml/vvitconverter.h
+++ b/src/libs/ifc/xml/vvitconverter.h
@@ -48,8 +48,8 @@ public:
 
     static const QString MeasurementMaxVerStr;
     static const QString CurrentSchema;
-    static Q_DECL_CONSTEXPR const int MeasurementMinVer = FORMAT_VERSION(0, 2, 0);
-    static Q_DECL_CONSTEXPR const int MeasurementMaxVer = FORMAT_VERSION(0, 5, 1);
+    static Q_DECL_CONSTEXPR const int MeasurementMinVer = FormatVersion(0, 2, 0);
+    static Q_DECL_CONSTEXPR const int MeasurementMaxVer = FormatVersion(0, 5, 1);
 
 protected:
     virtual int     MinVer() const override;
diff --git a/src/libs/ifc/xml/vvstconverter.cpp b/src/libs/ifc/xml/vvstconverter.cpp
index 34c2d9018..42fa41bec 100644
--- a/src/libs/ifc/xml/vvstconverter.cpp
+++ b/src/libs/ifc/xml/vvstconverter.cpp
@@ -77,14 +77,14 @@ QString VVSTConverter::XSDSchema(int ver) const
 {
     QHash <int, QString> schemas =
     {
-        std::make_pair(FORMAT_VERSION(0, 3, 0), QStringLiteral("://schema/multisize_measurements/v0.3.0.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 4, 0), QStringLiteral("://schema/multisize_measurements/v0.4.0.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 4, 1), QStringLiteral("://schema/multisize_measurements/v0.4.1.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 4, 2), QStringLiteral("://schema/multisize_measurements/v0.4.2.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 4, 3), QStringLiteral("://schema/multisize_measurements/v0.4.3.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 4, 4), QStringLiteral("://schema/multisize_measurements/v0.4.4.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 5, 0), QStringLiteral("://schema/multisize_measurements/v0.5.0.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 5, 1), CurrentSchema),
+        std::make_pair(FormatVersion(0, 3, 0), QStringLiteral("://schema/multisize_measurements/v0.3.0.xsd")),
+        std::make_pair(FormatVersion(0, 4, 0), QStringLiteral("://schema/multisize_measurements/v0.4.0.xsd")),
+        std::make_pair(FormatVersion(0, 4, 1), QStringLiteral("://schema/multisize_measurements/v0.4.1.xsd")),
+        std::make_pair(FormatVersion(0, 4, 2), QStringLiteral("://schema/multisize_measurements/v0.4.2.xsd")),
+        std::make_pair(FormatVersion(0, 4, 3), QStringLiteral("://schema/multisize_measurements/v0.4.3.xsd")),
+        std::make_pair(FormatVersion(0, 4, 4), QStringLiteral("://schema/multisize_measurements/v0.4.4.xsd")),
+        std::make_pair(FormatVersion(0, 5, 0), QStringLiteral("://schema/multisize_measurements/v0.5.0.xsd")),
+        std::make_pair(FormatVersion(0, 5, 1), CurrentSchema),
     };
 
     if (schemas.contains(ver))
@@ -102,35 +102,35 @@ void VVSTConverter::ApplyPatches()
 {
     switch (m_ver)
     {
-        case (FORMAT_VERSION(0, 3, 0)):
+        case (FormatVersion(0, 3, 0)):
             ToV0_4_0();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 0)));
+            ValidateXML(XSDSchema(FormatVersion(0, 4, 0)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 4, 0)):
+        case (FormatVersion(0, 4, 0)):
             ToV0_4_1();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 1)));
+            ValidateXML(XSDSchema(FormatVersion(0, 4, 1)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 4, 1)):
+        case (FormatVersion(0, 4, 1)):
             ToV0_4_2();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 2)));
+            ValidateXML(XSDSchema(FormatVersion(0, 4, 2)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 4, 2)):
+        case (FormatVersion(0, 4, 2)):
             ToV0_4_3();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 3)));
+            ValidateXML(XSDSchema(FormatVersion(0, 4, 3)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 4, 3)):
+        case (FormatVersion(0, 4, 3)):
             ToV0_4_4();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 4)));
+            ValidateXML(XSDSchema(FormatVersion(0, 4, 4)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 4, 4)):
+        case (FormatVersion(0, 4, 4)):
             ToV0_5_0();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 5, 0)));
+            ValidateXML(XSDSchema(FormatVersion(0, 5, 0)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 5, 0)):
+        case (FormatVersion(0, 5, 0)):
             ToV0_5_1();
-            ValidateXML(XSDSchema(FORMAT_VERSION(0, 5, 1)));
+            ValidateXML(XSDSchema(FormatVersion(0, 5, 1)));
             Q_FALLTHROUGH();
-        case (FORMAT_VERSION(0, 5, 1)):
+        case (FormatVersion(0, 5, 1)):
             break;
         default:
             InvalidVersion(m_ver);
@@ -149,7 +149,7 @@ void VVSTConverter::DowngradeToCurrentMaxVersion()
 bool VVSTConverter::IsReadOnly() const
 {
     // Check if attribute read-only was not changed in file format
-    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMaxVer == FORMAT_VERSION(0, 5, 1),
+    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMaxVer == FormatVersion(0, 5, 1),
                       "Check attribute read-only.");
 
     // Possibly in future attribute read-only will change position etc.
@@ -163,7 +163,7 @@ bool VVSTConverter::IsReadOnly() const
 void VVSTConverter::AddNewTagsForV0_4_0()
 {
     // TODO. Delete if minimal supported version is 0.4.0
-    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 4, 0),
+    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FormatVersion(0, 4, 0),
                       "Time to refactor the code.");
 
     QDomElement rootElement = this->documentElement();
@@ -179,7 +179,7 @@ void VVSTConverter::AddNewTagsForV0_4_0()
 void VVSTConverter::RemoveTagsForV0_4_0()
 {
     // TODO. Delete if minimal supported version is 0.4.0
-    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 4, 0),
+    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FormatVersion(0, 4, 0),
                       "Time to refactor the code.");
 
     QDomElement rootElement = this->documentElement();
@@ -205,7 +205,7 @@ void VVSTConverter::RemoveTagsForV0_4_0()
 void VVSTConverter::ConvertMeasurementsToV0_4_0()
 {
     // TODO. Delete if minimal supported version is 0.4.0
-    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 4, 0),
+    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FormatVersion(0, 4, 0),
                       "Time to refactor the code.");
 
     const QString tagBM = QStringLiteral("body-measurements");
@@ -255,7 +255,7 @@ void VVSTConverter::ConvertMeasurementsToV0_4_0()
 QDomElement VVSTConverter::AddMV0_4_0(const QString &name, qreal value, qreal sizeIncrease, qreal heightIncrease)
 {
     // TODO. Delete if minimal supported version is 0.4.0
-    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 4, 0),
+    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FormatVersion(0, 4, 0),
                       "Time to refactor the code.");
 
     QDomElement element = createElement(QStringLiteral("m"));
@@ -274,7 +274,7 @@ QDomElement VVSTConverter::AddMV0_4_0(const QString &name, qreal value, qreal si
 void VVSTConverter::PM_SystemV0_4_1()
 {
     // TODO. Delete if minimal supported version is 0.4.1
-    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 4, 1),
+    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FormatVersion(0, 4, 1),
                       "Time to refactor the code.");
 
     const QDomNodeList nodeList = this->elementsByTagName(QStringLiteral("size"));
@@ -288,7 +288,7 @@ void VVSTConverter::PM_SystemV0_4_1()
 void VVSTConverter::ConvertMeasurementsToV0_4_2()
 {
     // TODO. Delete if minimal supported version is 0.4.2
-    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 4, 2),
+    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FormatVersion(0, 4, 2),
                       "Time to refactor the code.");
 
     const QMap<QString, QString> names = OldNamesToNewNames_InV0_3_3();
@@ -321,7 +321,7 @@ void VVSTConverter::ConvertMeasurementsToV0_4_2()
 void VVSTConverter::AddNewTagsForV0_5_0()
 {
     // TODO. Delete if minimal supported version is 0.5.0
-    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 5, 0),
+    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FormatVersion(0, 5, 0),
                       "Time to refactor the code.");
 
     QDomElement root = documentElement();
@@ -385,7 +385,7 @@ void VVSTConverter::AddNewTagsForV0_5_0()
 void VVSTConverter::RemoveTagsForV0_5_0()
 {
     // TODO. Delete if minimal supported version is 0.5.0
-    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 5, 0),
+    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FormatVersion(0, 5, 0),
                       "Time to refactor the code.");
 
     QDomElement root = documentElement();
@@ -407,7 +407,7 @@ void VVSTConverter::RemoveTagsForV0_5_0()
 void VVSTConverter::ConvertMeasurementsToV0_5_0()
 {
     // TODO. Delete if minimal supported version is 0.5.0
-    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 5, 0),
+    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FormatVersion(0, 5, 0),
                       "Time to refactor the code.");
 
     const QDomNodeList measurements = elementsByTagName(QStringLiteral("m"));
@@ -427,7 +427,7 @@ void VVSTConverter::ConvertMeasurementsToV0_5_0()
 void VVSTConverter::ToV0_4_0()
 {
     // TODO. Delete if minimal supported version is 0.4.0
-    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 4, 0),
+    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FormatVersion(0, 4, 0),
                       "Time to refactor the code.");
 
     AddRootComment();
@@ -442,7 +442,7 @@ void VVSTConverter::ToV0_4_0()
 void VVSTConverter::ToV0_4_1()
 {
     // TODO. Delete if minimal supported version is 0.4.1
-    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 4, 1),
+    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FormatVersion(0, 4, 1),
                       "Time to refactor the code.");
 
     SetVersion(QStringLiteral("0.4.1"));
@@ -454,7 +454,7 @@ void VVSTConverter::ToV0_4_1()
 void VVSTConverter::ToV0_4_2()
 {
     // TODO. Delete if minimal supported version is 0.4.2
-    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 4, 2),
+    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FormatVersion(0, 4, 2),
                       "Time to refactor the code.");
 
     SetVersion(QStringLiteral("0.4.2"));
@@ -466,7 +466,7 @@ void VVSTConverter::ToV0_4_2()
 void VVSTConverter::ToV0_4_3()
 {
     // TODO. Delete if minimal supported version is 0.4.3
-    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 4, 3),
+    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FormatVersion(0, 4, 3),
                       "Time to refactor the code.");
 
     SetVersion(QStringLiteral("0.4.3"));
@@ -477,7 +477,7 @@ void VVSTConverter::ToV0_4_3()
 void VVSTConverter::ToV0_4_4()
 {
     // TODO. Delete if minimal supported version is 0.4.4
-    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 4, 4),
+    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FormatVersion(0, 4, 4),
                       "Time to refactor the code.");
 
     SetVersion(QStringLiteral("0.4.4"));
@@ -488,7 +488,7 @@ void VVSTConverter::ToV0_4_4()
 void VVSTConverter::ToV0_5_0()
 {
     // TODO. Delete if minimal supported version is 0.5.0
-    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 5, 0),
+    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FormatVersion(0, 5, 0),
                       "Time to refactor the code.");
 
     SetVersion(QStringLiteral("0.5.0"));
@@ -502,7 +502,7 @@ void VVSTConverter::ToV0_5_0()
 void VVSTConverter::ToV0_5_1()
 {
     // TODO. Delete if minimal supported version is 0.5.1
-    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 5, 1),
+    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FormatVersion(0, 5, 1),
                       "Time to refactor the code.");
 
     SetVersion(QStringLiteral("0.5.1"));
diff --git a/src/libs/ifc/xml/vvstconverter.h b/src/libs/ifc/xml/vvstconverter.h
index 5b50d9d52..176a51121 100644
--- a/src/libs/ifc/xml/vvstconverter.h
+++ b/src/libs/ifc/xml/vvstconverter.h
@@ -50,11 +50,11 @@ public:
     static const QString CurrentSchema;
 // GCC 4.6 doesn't allow constexpr and const together
 #if !defined(__INTEL_COMPILER) && !defined(__clang__) && defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) <= 406
-    static Q_DECL_CONSTEXPR int MeasurementMinVer = FORMAT_VERSION(0, 3, 0);
-    static Q_DECL_CONSTEXPR int MeasurementMaxVer = FORMAT_VERSION(0, 5, 1);
+    static Q_DECL_CONSTEXPR int MeasurementMinVer = FormatVersion(0, 3, 0);
+    static Q_DECL_CONSTEXPR int MeasurementMaxVer = FormatVersion(0, 5, 1);
 #else
-    static Q_DECL_CONSTEXPR const int MeasurementMinVer = FORMAT_VERSION(0, 3, 0);
-    static Q_DECL_CONSTEXPR const int MeasurementMaxVer = FORMAT_VERSION(0, 5, 1);
+    static Q_DECL_CONSTEXPR const int MeasurementMinVer = FormatVersion(0, 3, 0);
+    static Q_DECL_CONSTEXPR const int MeasurementMaxVer = FormatVersion(0, 5, 1);
 #endif
 
 protected:
diff --git a/src/libs/ifc/xml/vwatermarkconverter.cpp b/src/libs/ifc/xml/vwatermarkconverter.cpp
index bb42aa389..d5453637a 100644
--- a/src/libs/ifc/xml/vwatermarkconverter.cpp
+++ b/src/libs/ifc/xml/vwatermarkconverter.cpp
@@ -27,6 +27,8 @@
  *************************************************************************/
 #include "vwatermarkconverter.h"
 
+#include <QtGlobal>
+
 /*
  * Version rules:
  * 1. Version have three parts "major.minor.patch";
@@ -36,8 +38,8 @@
  */
 
 const QString VWatermarkConverter::WatermarkMinVerStr = QStringLiteral("1.0.0");
-const QString VWatermarkConverter::WatermarkMaxVerStr = QStringLiteral("1.0.0");
-const QString VWatermarkConverter::CurrentSchema          = QStringLiteral("://schema/watermark/v1.0.0.xsd");
+const QString VWatermarkConverter::WatermarkMaxVerStr = QStringLiteral("1.1.0");
+const QString VWatermarkConverter::CurrentSchema      = QStringLiteral("://schema/watermark/v1.1.0.xsd");
 
 //VWatermarkConverter::WatermarkMinVer; // <== DON'T FORGET TO UPDATE TOO!!!!
 //VWatermarkConverter::WatermarkMaxVer; // <== DON'T FORGET TO UPDATE TOO!!!!
@@ -46,6 +48,7 @@ const QString VWatermarkConverter::CurrentSchema          = QStringLiteral("://s
 VWatermarkConverter::VWatermarkConverter(const QString &fileName)
     : VAbstractConverter(fileName)
 {
+    m_ver = GetFormatVersion(GetFormatVersionStr());
     ValidateInputFile(CurrentSchema);
 }
 
@@ -76,15 +79,18 @@ QString VWatermarkConverter::MaxVerStr() const
 //---------------------------------------------------------------------------------------------------------------------
 QString VWatermarkConverter::XSDSchema(int ver) const
 {
-    switch (ver)
+    QHash <int, QString> schemas =
     {
-        case (0x010000):
-            return CurrentSchema;
-        default:
-            InvalidVersion(ver);
-            break;
+        std::make_pair(FormatVersion(1, 0, 0), QStringLiteral("://schema/watermark/v1.0.0.xsd")),
+        std::make_pair(FormatVersion(1, 1, 0), CurrentSchema)
+    };
+
+    if (schemas.contains(ver))
+    {
+        return schemas.value(ver);
     }
-    return QString();//unreachable code
+
+    InvalidVersion(ver);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -92,11 +98,14 @@ void VWatermarkConverter::ApplyPatches()
 {
     switch (m_ver)
     {
-        case (0x010000):
+        case (FormatVersion(1, 0, 0)):
+            ToV1_1_0();
+            ValidateXML(XSDSchema(FormatVersion(1, 1, 0)));
+            Q_FALLTHROUGH();
+        case (FormatVersion(1, 1, 0)):
             break;
         default:
             InvalidVersion(m_ver);
-            break;
     }
 }
 
@@ -106,3 +115,14 @@ void VWatermarkConverter::DowngradeToCurrentMaxVersion()
     SetVersion(WatermarkMaxVerStr);
     Save();
 }
+
+//---------------------------------------------------------------------------------------------------------------------
+void VWatermarkConverter::ToV1_1_0()
+{
+    // TODO. Delete if minimal supported version is 1.1.0
+    Q_STATIC_ASSERT_X(VWatermarkConverter::WatermarkMinVer < FormatVersion(1, 1, 0),
+                      "Time to refactor the code.");
+
+    SetVersion(QStringLiteral("1.1.0"));
+    Save();
+}
diff --git a/src/libs/ifc/xml/vwatermarkconverter.h b/src/libs/ifc/xml/vwatermarkconverter.h
index 3254d2534..0d4770c73 100644
--- a/src/libs/ifc/xml/vwatermarkconverter.h
+++ b/src/libs/ifc/xml/vwatermarkconverter.h
@@ -38,8 +38,8 @@ public:
 
     static const QString WatermarkMaxVerStr;
     static const QString CurrentSchema;
-    static Q_DECL_CONSTEXPR const int WatermarkMinVer = FORMAT_VERSION(1, 0, 0);
-    static Q_DECL_CONSTEXPR const int WatermarkMaxVer = FORMAT_VERSION(1, 0, 0);
+    static Q_DECL_CONSTEXPR const int WatermarkMinVer = FormatVersion(1, 0, 0);
+    static Q_DECL_CONSTEXPR const int WatermarkMaxVer = FormatVersion(1, 1, 0);
 
 protected:
     virtual int     MinVer() const override;
@@ -57,6 +57,8 @@ protected:
 private:
     Q_DISABLE_COPY(VWatermarkConverter)
     static const QString WatermarkMinVerStr;
+
+    void ToV1_1_0();
 };
 
 #endif // VWATERMARKCONVERTER_H
diff --git a/src/libs/ifc/xml/xml.pri b/src/libs/ifc/xml/xml.pri
index 1c558ea04..0a6f39591 100644
--- a/src/libs/ifc/xml/xml.pri
+++ b/src/libs/ifc/xml/xml.pri
@@ -4,6 +4,7 @@
 HEADERS += \
     $$PWD/vabstractconverter.h \
     $$PWD/vdomdocument.h \
+    $$PWD/vlayoutconverter.h \
     $$PWD/vpatternconverter.h \
     $$PWD/vtoolrecord.h \
     $$PWD/vabstractpattern.h \
@@ -16,6 +17,7 @@ HEADERS += \
 SOURCES += \
     $$PWD/vabstractconverter.cpp \
     $$PWD/vdomdocument.cpp \
+    $$PWD/vlayoutconverter.cpp \
     $$PWD/vpatternconverter.cpp \
     $$PWD/vtoolrecord.cpp \
     $$PWD/vabstractpattern.cpp \
diff --git a/src/libs/vdxf/vdxfengine.cpp b/src/libs/vdxf/vdxfengine.cpp
index ad8887f86..6fab0f9c1 100644
--- a/src/libs/vdxf/vdxfengine.cpp
+++ b/src/libs/vdxf/vdxfengine.cpp
@@ -727,7 +727,7 @@ void VDxfEngine::ExportAAMADraw(dx_ifaceBlock *detailBlock, const VLayoutPiece &
         }
     }
 
-    const QVector<QVector<QPointF>> drawIntCut = detail.InternalPathsForCut(false);
+    const QVector<QVector<QPointF>> drawIntCut = detail.MappedInternalPathsForCut(false);
     for(auto &intCut : drawIntCut)
     {
         if (DRW_Entity *e = AAMAPolygon(intCut, QChar('8'), false))
@@ -736,7 +736,7 @@ void VDxfEngine::ExportAAMADraw(dx_ifaceBlock *detailBlock, const VLayoutPiece &
         }
     }
 
-    const QVector<VLayoutPlaceLabel> labels = detail.GetPlaceLabels();
+    const QVector<VLayoutPlaceLabel> labels = detail.GetMappedPlaceLabels();
     for(auto &label : labels)
     {
         if (label.type != PlaceLabelType::Doubletree && label.type != PlaceLabelType::Button
@@ -756,7 +756,7 @@ void VDxfEngine::ExportAAMADraw(dx_ifaceBlock *detailBlock, const VLayoutPiece &
 //---------------------------------------------------------------------------------------------------------------------
 void VDxfEngine::ExportAAMAIntcut(dx_ifaceBlock *detailBlock, const VLayoutPiece &detail)
 {
-    QVector<QVector<QPointF>> drawIntCut = detail.InternalPathsForCut(true);
+    QVector<QVector<QPointF>> drawIntCut = detail.MappedInternalPathsForCut(true);
     for(auto &intCut : drawIntCut)
     {
         if (DRW_Entity *e = AAMAPolygon(intCut, "11", false))
@@ -771,7 +771,7 @@ void VDxfEngine::ExportAAMANotch(dx_ifaceBlock *detailBlock, const VLayoutPiece
 {
     if (detail.IsSeamAllowance())
     {
-        const QVector<VLayoutPassmark> passmarks = detail.GetPassmarks();
+        const QVector<VLayoutPassmark> passmarks = detail.GetMappedPassmarks();
         for(auto &passmark : passmarks)
         {
             for (auto &line : passmark.lines)
@@ -788,7 +788,7 @@ void VDxfEngine::ExportAAMANotch(dx_ifaceBlock *detailBlock, const VLayoutPiece
 //---------------------------------------------------------------------------------------------------------------------
 void VDxfEngine::ExportAAMAGrainline(dx_ifaceBlock *detailBlock, const VLayoutPiece &detail)
 {
-    const QVector<QPointF> grainline = detail.GetGrainline();
+    const QVector<QPointF> grainline = detail.GetMappedGrainline();
     if (grainline.count() > 1)
     {
         if (DRW_Entity *e = AAMALine(QLineF(grainline.first(), grainline.last()), QChar('7')))
@@ -833,7 +833,7 @@ void VDxfEngine::ExportStyleSystemText(const QSharedPointer<dx_iface> &input, co
 //---------------------------------------------------------------------------------------------------------------------
 void VDxfEngine::ExportAAMADrill(dx_ifaceBlock *detailBlock, const VLayoutPiece &detail)
 {
-    const QVector<VLayoutPlaceLabel> labels = detail.GetPlaceLabels();
+    const QVector<VLayoutPlaceLabel> labels = detail.GetMappedPlaceLabels();
 
     for(auto &label : labels)
     {
@@ -953,7 +953,7 @@ void VDxfEngine::ExportASTMSewLine(dx_ifaceBlock *detailBlock, const VLayoutPiec
 //---------------------------------------------------------------------------------------------------------------------
 void VDxfEngine::ExportASTMInternalLine(dx_ifaceBlock *detailBlock, const VLayoutPiece &detail)
 {
-    const QVector<QVector<QPointF>> drawIntCut = detail.InternalPathsForCut(false);
+    const QVector<QVector<QPointF>> drawIntCut = detail.MappedInternalPathsForCut(false);
     for(auto &intCut : drawIntCut)
     {
         // Internal line
@@ -969,7 +969,7 @@ void VDxfEngine::ExportASTMInternalLine(dx_ifaceBlock *detailBlock, const VLayou
         }
     }
 
-    const QVector<VLayoutPlaceLabel> labels = detail.GetPlaceLabels();
+    const QVector<VLayoutPlaceLabel> labels = detail.GetMappedPlaceLabels();
     for(auto &label : labels)
     {
         if (label.type != PlaceLabelType::Doubletree && label.type != PlaceLabelType::Button
@@ -996,7 +996,7 @@ void VDxfEngine::ExportASTMInternalLine(dx_ifaceBlock *detailBlock, const VLayou
 //---------------------------------------------------------------------------------------------------------------------
 void VDxfEngine::ExportASTMInternalCutout(dx_ifaceBlock *detailBlock, const VLayoutPiece &detail)
 {
-    QVector<QVector<QPointF>> drawIntCut = detail.InternalPathsForCut(true);
+    QVector<QVector<QPointF>> drawIntCut = detail.MappedInternalPathsForCut(true);
     for(auto &intCut : drawIntCut)
     {
         // Internal cutout
@@ -1026,7 +1026,7 @@ void VDxfEngine::ExportASTMAnnotationText(dx_ifaceBlock *detailBlock, const VLay
 //---------------------------------------------------------------------------------------------------------------------
 void VDxfEngine::ExportASTMDrill(dx_ifaceBlock *detailBlock, const VLayoutPiece &detail)
 {
-    const QVector<VLayoutPlaceLabel> labels = detail.GetPlaceLabels();
+    const QVector<VLayoutPlaceLabel> labels = detail.GetMappedPlaceLabels();
 
     for(auto &label : labels)
     {
@@ -1053,7 +1053,7 @@ void VDxfEngine::ExportASTMNotch(dx_ifaceBlock *detailBlock, const VLayoutPiece
 {
     if (detail.IsSeamAllowance())
     {
-        const QVector<VLayoutPassmark> passmarks = detail.GetPassmarks();
+        const QVector<VLayoutPassmark> passmarks = detail.GetMappedPassmarks();
         for(auto &passmark : passmarks)
         {
             DRW_ASTMNotch *notch = new DRW_ASTMNotch();
diff --git a/src/libs/vformat/vmeasurements.cpp b/src/libs/vformat/vmeasurements.cpp
index 8b16c66e2..3b2716a93 100644
--- a/src/libs/vformat/vmeasurements.cpp
+++ b/src/libs/vformat/vmeasurements.cpp
@@ -649,7 +649,7 @@ void VMeasurements::SetFullCircumference(bool fc)
     QDomElement dimenstionsTag = documentElement().firstChildElement(TagDimensions);
     if (not dimenstionsTag.isNull())
     {
-        SetAttributeOrRemoveIf(dimenstionsTag, AttrFullCircumference, fc, not fc);
+        SetAttributeOrRemoveIf<bool>(dimenstionsTag, AttrFullCircumference, fc, [](bool fc){return not fc;});
     }
     else
     {
@@ -747,7 +747,7 @@ void VMeasurements::SetMSpecialUnits(const QString &name, bool special)
     QDomElement node = FindM(name);
     if (not node.isNull())
     {
-        SetAttributeOrRemoveIf(node, AttrSpecialUnits, special, not special);
+        SetAttributeOrRemoveIf<bool>(node, AttrSpecialUnits, special, [](bool special){return not special;});
     }
     else
     {
@@ -819,7 +819,8 @@ void VMeasurements::SetMDimension(const QString &name, IMD type)
     QDomElement node = FindM(name);
     if (not node.isNull())
     {
-        SetAttributeOrRemoveIf(node, AttrDimension, VMeasurements::IMDToStr(type), type == IMD::N);
+        SetAttributeOrRemoveIf<QString>(node, AttrDimension, VMeasurements::IMDToStr(type),
+                                        [](const QString &type){return type == VMeasurements::IMDToStr(IMD::N);});
     }
     else
     {
@@ -893,10 +894,12 @@ void VMeasurements::SetRestrictions(const QMap<QString, VDimensionRestriction> &
         QDomElement restrictionTag = createElement(TagRestriction);
 
         SetAttribute(restrictionTag, AttrCoordinates, i.key());
-        SetAttributeOrRemoveIf(restrictionTag, AttrMin, i.value().GetMin(), qFuzzyIsNull(i.value().GetMin()));
-        SetAttributeOrRemoveIf(restrictionTag, AttrMax, i.value().GetMax(), qFuzzyIsNull(i.value().GetMax()));
-        SetAttributeOrRemoveIf(restrictionTag, AttrExclude, i.value().GetExcludeString(),
-                               i.value().GetExcludeString().isEmpty());
+        SetAttributeOrRemoveIf<qreal>(restrictionTag, AttrMin, i.value().GetMin(),
+                                      [](qreal min){return qFuzzyIsNull(min);});
+        SetAttributeOrRemoveIf<qreal>(restrictionTag, AttrMax, i.value().GetMax(),
+                                      [](qreal max){return qFuzzyIsNull(max);});
+        SetAttributeOrRemoveIf<QString>(restrictionTag, AttrExclude, i.value().GetExcludeString(),
+                                        [](const QString &exlcuded){return exlcuded.isEmpty();});
 
         restrictionsTag.appendChild(restrictionTag);
         ++i;
diff --git a/src/libs/vformat/vpatternrecipe.cpp b/src/libs/vformat/vpatternrecipe.cpp
index a3722a9d7..9da2c41bd 100644
--- a/src/libs/vformat/vpatternrecipe.cpp
+++ b/src/libs/vformat/vpatternrecipe.cpp
@@ -1117,7 +1117,8 @@ void VPatternRecipe::CurveAttributes(QDomElement &step, T *tool)
     SetAttribute(step, AttrPenStyle, tool->GetPenStyle());
     SetAttribute(step, AttrAScale, tool->GetApproximationScale());
     SetAttribute(step, AttrDuplicate, tool->GetDuplicate());
-    SetAttributeOrRemoveIf(step, AttrAlias, tool->GetAliasSuffix(), tool->GetAliasSuffix().isEmpty());
+    SetAttributeOrRemoveIf<QString>(step, AttrAlias, tool->GetAliasSuffix(),
+                                    [](const QString &suffix){return suffix.isEmpty();});
 }
 
 
@@ -1125,8 +1126,10 @@ void VPatternRecipe::CurveAttributes(QDomElement &step, T *tool)
 template<typename T>
 void VPatternRecipe::CutCurveAttributes(QDomElement &step, T *tool)
 {
-    SetAttributeOrRemoveIf(step, AttrAlias1, tool->GetAliasSuffix1(), tool->GetAliasSuffix1().isEmpty());
-    SetAttributeOrRemoveIf(step, AttrAlias2, tool->GetAliasSuffix2(), tool->GetAliasSuffix2().isEmpty());
+    SetAttributeOrRemoveIf<QString>(step, AttrAlias1, tool->GetAliasSuffix1(),
+                                    [](const QString &suffix){return suffix.isEmpty();});
+    SetAttributeOrRemoveIf<QString>(step, AttrAlias2, tool->GetAliasSuffix2(),
+                                    [](const QString &suffix){return suffix.isEmpty();});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -1168,7 +1171,7 @@ QDomElement VPatternRecipe::GroupOperationSource(VAbstractOperation *tool, quint
         }
 
         SetAttribute(node, AttrItem, obj->ObjectName());
-        SetAttributeOrRemoveIf(node, AttrAlias, item.alias, item.alias.isEmpty());
+        SetAttributeOrRemoveIf<QString>(node, AttrAlias, item.alias, [](const QString &alias){return alias.isEmpty();});
 
         if (obj->getType() != GOType::Point)
         {
diff --git a/src/libs/vformat/vwatermark.cpp b/src/libs/vformat/vwatermark.cpp
index 97e5d0aba..e7a91e241 100644
--- a/src/libs/vformat/vwatermark.cpp
+++ b/src/libs/vformat/vwatermark.cpp
@@ -28,6 +28,7 @@
 #include "vwatermark.h"
 
 #include "../vmisc/projectversion.h"
+#include "../ifc/xml/vwatermarkconverter.h"
 
 const QString VWatermark::TagWatermark = QStringLiteral("watermark");
 const QString VWatermark::TagText      = QStringLiteral("text");
@@ -61,7 +62,7 @@ void VWatermark::CreateEmptyWatermark()
     QDomElement wElement = this->createElement(TagWatermark);
 
     wElement.appendChild(createComment(FileComment()));
-    wElement.appendChild(CreateElementWithText(TagVersion, "1.0.0" /*VWatermarkConverter::WatermarkMaxVerStr*/));
+    wElement.appendChild(CreateElementWithText(TagVersion, VWatermarkConverter::WatermarkMaxVerStr));
     wElement.appendChild(createElement(TagText));
     wElement.appendChild(createElement(TagImage));
 
@@ -102,6 +103,12 @@ VWatermarkData VWatermark::GetWatermark() const
             data.text = GetParametrEmptyString(text, AttrText);
             data.textRotation = GetParametrInt(text, AttrRotation, QChar('0'));
             data.font.fromString(GetParametrEmptyString(text, AttrFont));
+            QColor color(GetParametrString(text, AttrColor, QColor(Qt::black).name()));
+            if (not color.isValid())
+            {
+                color = Qt::black;
+            }
+            data.textColor = color;
         }
 
         QDomElement image = rootElement.firstChildElement(TagImage);
@@ -130,19 +137,25 @@ void VWatermark::SetWatermark(const VWatermarkData &data)
         if (not text.isNull())
         {
             SetAttribute(text, AttrShow, data.showText);
-            SetAttributeOrRemoveIf(text, AttrText, data.text, data.text.isEmpty());
-            SetAttributeOrRemoveIf(text, AttrRotation, data.textRotation, data.textRotation == 0);
-            const QString fontString = data.font.toString();
-            SetAttributeOrRemoveIf(text, AttrFont, fontString, fontString.isEmpty());
+            SetAttributeOrRemoveIf<QString>(text, AttrText, data.text,
+                                            [](const QString &text){return text.isEmpty();});
+            SetAttributeOrRemoveIf<int>(text, AttrRotation, data.textRotation,
+                                        [](int textRotation){return textRotation == 0;});
+            SetAttributeOrRemoveIf<QString>(text, AttrFont, data.font.toString(),
+                                            [](const QString &fontString){return fontString.isEmpty();});
+            SetAttribute(text, AttrColor, data.textColor.name());
         }
 
         QDomElement image = rootElement.firstChildElement(TagImage);
         if (not image.isNull())
         {
             SetAttribute(image, AttrShow, data.showImage);
-            SetAttributeOrRemoveIf(image, AttrPath, data.path, data.path.isEmpty());
-            SetAttributeOrRemoveIf(image, AttrRotation, data.imageRotation, data.imageRotation == 0);
-            SetAttributeOrRemoveIf(image, AttrGrayscale, data.grayscale, data.grayscale == false);
+            SetAttributeOrRemoveIf<QString>(image, AttrPath, data.path,
+                                            [](const QString &path){return path.isEmpty();});
+            SetAttributeOrRemoveIf<int>(image, AttrRotation, data.imageRotation,
+                                        [](int imageRotation){return imageRotation == 0;});
+            SetAttributeOrRemoveIf<bool>(image, AttrGrayscale, data.grayscale,
+                                         [](bool grayscale){return not grayscale;});
         }
     }
 }
diff --git a/src/libs/vlayout/dialogs/dialoglayoutscale.cpp b/src/libs/vlayout/dialogs/dialoglayoutscale.cpp
index 5166e7a1d..5fc1a67b4 100644
--- a/src/libs/vlayout/dialogs/dialoglayoutscale.cpp
+++ b/src/libs/vlayout/dialogs/dialoglayoutscale.cpp
@@ -29,7 +29,7 @@
 #include "dialoglayoutscale.h"
 #include "ui_dialoglayoutscale.h"
 #include "../vmisc/vabstractvalapplication.h"
-#include "../vmisc/vsettings.h"
+#include "../vmisc/vcommonsettings.h"
 
 #include <QPushButton>
 #include <QShowEvent>
diff --git a/src/libs/vlayout/dialogs/dialogs.pri b/src/libs/vlayout/dialogs/dialogs.pri
index 98b4202d8..bd2234f7f 100644
--- a/src/libs/vlayout/dialogs/dialogs.pri
+++ b/src/libs/vlayout/dialogs/dialogs.pri
@@ -3,11 +3,14 @@
 
 HEADERS += \
     $$PWD/dialoglayoutscale.h \
-    $$PWD/vabstractlayoutdialog.h
+    $$PWD/vabstractlayoutdialog.h \
+    $$PWD/watermarkwindow.h
 
 SOURCES += \
     $$PWD/dialoglayoutscale.cpp \
-    $$PWD/vabstractlayoutdialog.cpp
+    $$PWD/vabstractlayoutdialog.cpp \
+    $$PWD/watermarkwindow.cpp
 
 FORMS += \
-    $$PWD/dialoglayoutscale.ui
+    $$PWD/dialoglayoutscale.ui \
+    $$PWD/watermarkwindow.ui
diff --git a/src/libs/vlayout/dialogs/vabstractlayoutdialog.cpp b/src/libs/vlayout/dialogs/vabstractlayoutdialog.cpp
index 1df41c2cf..aa060591e 100644
--- a/src/libs/vlayout/dialogs/vabstractlayoutdialog.cpp
+++ b/src/libs/vlayout/dialogs/vabstractlayoutdialog.cpp
@@ -84,6 +84,23 @@ void VAbstractLayoutDialog::InitTemplates(QComboBox *comboBoxTemplates)
     comboBoxTemplates->setCurrentIndex(-1);
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+void VAbstractLayoutDialog::InitTileTemplates(QComboBox *comboBoxTemplates, bool keepCustom)
+{
+    SCASSERT(comboBoxTemplates != nullptr)
+    InitTemplates(comboBoxTemplates);
+
+    // remove unused formats
+    for (int i = static_cast<int>(PaperSizeTemplate::Roll24in); i <= static_cast<int>(PaperSizeTemplate::Custom); ++i)
+    {
+        if (keepCustom && i == static_cast<int>(PaperSizeTemplate::Custom))
+        {
+            continue;
+        }
+        comboBoxTemplates->removeItem(comboBoxTemplates->findData(i));
+    }
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 auto VAbstractLayoutDialog::GetTemplateSize(PaperSizeTemplate tmpl, Unit unit) -> QSizeF
 {
diff --git a/src/libs/vlayout/dialogs/vabstractlayoutdialog.h b/src/libs/vlayout/dialogs/vabstractlayoutdialog.h
index 811f9a10a..6ba849af1 100644
--- a/src/libs/vlayout/dialogs/vabstractlayoutdialog.h
+++ b/src/libs/vlayout/dialogs/vabstractlayoutdialog.h
@@ -61,6 +61,9 @@ public:
 
     static auto GetTemplateSize(PaperSizeTemplate tmpl, Unit unit) -> QSizeF;
 
+    static void InitTemplates(QComboBox *comboBoxTemplates);
+    static void InitTileTemplates(QComboBox *comboBoxTemplates, bool keepCustom = false);
+
 protected:
     typedef QStringList FormatsVector;
     const static FormatsVector pageFormatNames;
@@ -68,7 +71,7 @@ protected:
 
     static auto RoundTemplateSize(qreal width, qreal height, Unit unit) -> QSizeF;
 
-    static void InitTemplates(QComboBox *comboBoxTemplates);
+
 private:
     Q_DISABLE_COPY(VAbstractLayoutDialog)
 };
diff --git a/src/app/valentina/watermarkwindow.cpp b/src/libs/vlayout/dialogs/watermarkwindow.cpp
similarity index 91%
rename from src/app/valentina/watermarkwindow.cpp
rename to src/libs/vlayout/dialogs/watermarkwindow.cpp
index 6c62258d3..fcd1525ac 100644
--- a/src/app/valentina/watermarkwindow.cpp
+++ b/src/libs/vlayout/dialogs/watermarkwindow.cpp
@@ -34,14 +34,15 @@
 #include <QFontDialog>
 #include <QFuture>
 #include <QMessageBox>
+#include <QStyle>
 #include <QtConcurrent>
 
 #include "../vmisc/def.h"
-#include "core/vapplication.h"
+#include "../vmisc/vabstractapplication.h"
 #include "../vpropertyexplorer/checkablemessagebox.h"
 #include "../ifc/exception/vexception.h"
 #include "../ifc/xml/vwatermarkconverter.h"
-#include "../vmisc/vsettings.h"
+#include "../vmisc/vvalentinasettings.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 WatermarkWindow::WatermarkWindow(const QString &patternPath, QWidget *parent) :
@@ -109,6 +110,31 @@ WatermarkWindow::WatermarkWindow(const QString &patternPath, QWidget *parent) :
 
     connect(ui->groupBoxWatermarkText, &QGroupBox::toggled, this, [this](){WatermarkChangesWereSaved(false);});
     connect(ui->groupBoxWatermarkImage, &QGroupBox::toggled, this, [this](){WatermarkChangesWereSaved(false);});
+
+    ui->pushButtonColorPicker->insertColor(Qt::black, tr("Black", "color"));
+    ui->pushButtonColorPicker->insertColor(Qt::red, tr("Red", "color"));
+    ui->pushButtonColorPicker->insertColor(Qt::darkRed, tr("Dark red", "color"));
+    ui->pushButtonColorPicker->insertColor(Qt::green, tr("Green", "color"));
+    ui->pushButtonColorPicker->insertColor(Qt::darkGreen, tr("Dark green", "color"));
+    ui->pushButtonColorPicker->insertColor(Qt::blue, tr("Blue", "color"));
+    ui->pushButtonColorPicker->insertColor(Qt::darkBlue, tr("Dark blue", "color"));
+    ui->pushButtonColorPicker->insertColor(Qt::cyan, tr("Cyan", "color"));
+    ui->pushButtonColorPicker->insertColor(Qt::darkCyan, tr("Dark cyan", "color"));
+    ui->pushButtonColorPicker->insertColor(Qt::magenta, tr("Magenta", "color"));
+    ui->pushButtonColorPicker->insertColor(Qt::darkMagenta, tr("Dark magenta", "color"));
+    ui->pushButtonColorPicker->insertColor(Qt::yellow, tr("Yellow", "color"));
+    ui->pushButtonColorPicker->insertColor(Qt::darkYellow, tr("Dark yellow", "color"));
+    ui->pushButtonColorPicker->insertColor(Qt::gray, tr("Gray", "color"));
+    ui->pushButtonColorPicker->insertColor(Qt::darkGray, tr("Dark gray", "color"));
+    ui->pushButtonColorPicker->insertColor(Qt::lightGray, tr("Light gray", "color"));
+
+    QVector<QColor> colors = VAbstractApplication::VApp()->Settings()->GetWatermarkCustomColors();
+    for (const auto& color : colors)
+    {
+        ui->pushButtonColorPicker->insertColor(color);
+    }
+
+    connect(ui->pushButtonColorPicker, &QtColorPicker::colorChanged, this, [this](){WatermarkChangesWereSaved(false);});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -242,7 +268,7 @@ void WatermarkWindow::showEvent(QShowEvent *event)
     }
     // do your init stuff here
 
-    QSize sz = VAbstractValApplication::VApp()->ValentinaSettings()->GetWatermarkEditorSize();
+    QSize sz = VAbstractApplication::VApp()->Settings()->GetWatermarkEditorSize();
     if (sz.isEmpty() == false)
     {
         resize(sz);
@@ -259,7 +285,7 @@ void WatermarkWindow::resizeEvent(QResizeEvent *event)
     // window creating, which would
     if (m_isInitialized)
     {
-        VAbstractValApplication::VApp()->ValentinaSettings()->SetWatermarkEditorSize(size());
+        VAbstractApplication::VApp()->Settings()->SetWatermarkEditorSize(size());
     }
     QMainWindow::resizeEvent(event);
 }
@@ -584,7 +610,7 @@ bool WatermarkWindow::ContinueFormatRewrite(const QString &currentFormatVersion,
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool WatermarkWindow::SaveWatermark(const QString &fileName, QString &error)
+auto WatermarkWindow::SaveWatermark(const QString &fileName, QString &error) -> bool
 {
     m_data.opacity = ui->spinBoxOpacity->value();
     m_data.showText = ui->groupBoxWatermarkText->isChecked();
@@ -594,6 +620,7 @@ bool WatermarkWindow::SaveWatermark(const QString &fileName, QString &error)
     m_data.path = RelativeMPath(fileName, ui->lineEditPath->text());
     m_data.imageRotation = ui->spinBoxImageRotation->value();
     m_data.grayscale = ui->checkBoxGrayColor->isChecked();
+    m_data.textColor = ui->pushButtonColorPicker->currentColor();
 
     VWatermark doc;
     doc.CreateEmptyWatermark();
@@ -605,6 +632,8 @@ bool WatermarkWindow::SaveWatermark(const QString &fileName, QString &error)
         SetCurrentFile(fileName);
         statusBar()->showMessage(tr("File saved"), 5000);
         WatermarkChangesWereSaved(result);
+
+        VAbstractApplication::VApp()->Settings()->SetWatermarkCustomColors(ui->pushButtonColorPicker->CustomColors());
     }
     return result;
 }
@@ -717,6 +746,10 @@ void WatermarkWindow::ShowWatermark()
     ui->checkBoxGrayColor->blockSignals(true);
     ui->checkBoxGrayColor->setChecked(m_data.grayscale);
     ui->checkBoxGrayColor->blockSignals(false);
+
+    ui->pushButtonColorPicker->blockSignals(true);
+    ui->pushButtonColorPicker->setCurrentColor(m_data.textColor);
+    ui->pushButtonColorPicker->blockSignals(false);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/app/valentina/watermarkwindow.h b/src/libs/vlayout/dialogs/watermarkwindow.h
similarity index 100%
rename from src/app/valentina/watermarkwindow.h
rename to src/libs/vlayout/dialogs/watermarkwindow.h
diff --git a/src/app/valentina/watermarkwindow.ui b/src/libs/vlayout/dialogs/watermarkwindow.ui
similarity index 91%
rename from src/app/valentina/watermarkwindow.ui
rename to src/libs/vlayout/dialogs/watermarkwindow.ui
index 9258e69c0..c3d979f99 100644
--- a/src/app/valentina/watermarkwindow.ui
+++ b/src/libs/vlayout/dialogs/watermarkwindow.ui
@@ -14,7 +14,7 @@
    <string>Watermark</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../libs/vmisc/share/resources/icon.qrc">
+   <iconset resource="../../vmisc/share/resources/icon.qrc">
     <normaloff>:/icon/64x64/icon64x64.png</normaloff>:/icon/64x64/icon64x64.png</iconset>
   </property>
   <property name="toolButtonStyle">
@@ -32,8 +32,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>512</width>
-         <height>344</height>
+         <width>498</width>
+         <height>367</height>
         </rect>
        </property>
        <layout class="QVBoxLayout" name="verticalLayout">
@@ -132,6 +132,9 @@
              <property name="suffix">
               <string notr="true">°</string>
              </property>
+             <property name="minimum">
+              <number>-360</number>
+             </property>
              <property name="maximum">
               <number>360</number>
              </property>
@@ -171,7 +174,7 @@
                 <string notr="true">...</string>
                </property>
                <property name="icon">
-                <iconset resource="../../libs/vmisc/share/resources/icon.qrc">
+                <iconset resource="../../vmisc/share/resources/icon.qrc">
                  <normaloff>:/icon/24x24/font_preferences.png</normaloff>:/icon/24x24/font_preferences.png</iconset>
                </property>
                <property name="iconSize">
@@ -184,6 +187,20 @@
              </item>
             </layout>
            </item>
+           <item row="3" column="1">
+            <widget class="QtColorPicker" name="pushButtonColorPicker">
+             <property name="text">
+              <string>Color</string>
+             </property>
+            </widget>
+           </item>
+           <item row="3" column="0">
+            <widget class="QLabel" name="label_4">
+             <property name="text">
+              <string>Color:</string>
+             </property>
+            </widget>
+           </item>
           </layout>
          </widget>
         </item>
@@ -245,8 +262,11 @@
              <property name="suffix">
               <string notr="true">°</string>
              </property>
+             <property name="minimum">
+              <number>-360</number>
+             </property>
              <property name="maximum">
-              <number>100</number>
+              <number>360</number>
              </property>
             </widget>
            </item>
@@ -365,8 +385,15 @@
    </property>
   </action>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QtColorPicker</class>
+   <extends>QPushButton</extends>
+   <header>qtcolorpicker.h</header>
+  </customwidget>
+ </customwidgets>
  <resources>
-  <include location="../../libs/vmisc/share/resources/icon.qrc"/>
+  <include location="../../vmisc/share/resources/icon.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/src/libs/vlayout/vabstractpiece.cpp b/src/libs/vlayout/vabstractpiece.cpp
index 5434c9100..c52219852 100644
--- a/src/libs/vlayout/vabstractpiece.cpp
+++ b/src/libs/vlayout/vabstractpiece.cpp
@@ -49,7 +49,7 @@
 #include <QJsonDocument>
 
 const quint32 VAbstractPieceData::streamHeader = 0x05CDD73A; // CRC-32Q string "VAbstractPieceData"
-const quint16 VAbstractPieceData::classVersion = 2;
+const quint16 VAbstractPieceData::classVersion = 3;
 
 const qreal maxL = 3.5;
 
@@ -1611,6 +1611,31 @@ void VAbstractPiece::SetPriority(uint value)
     d->m_priority = value;
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+QUuid VAbstractPiece::GetUUID() const
+{
+    return d->m_uuid;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VAbstractPiece::SetUUID(const QUuid &uuid)
+{
+    d->m_uuid = uuid;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VAbstractPiece::SetUUID(const QString &uuid)
+{
+    const QUuid temp = QUuid(uuid);
+    d->m_uuid = temp.isNull() ? QUuid::createUuid() : temp;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VAbstractPiece::GetUniqueID() const -> QString
+{
+    return d->m_uuid.toString();
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 qreal VSAPoint::GetSABefore(qreal width) const
 {
diff --git a/src/libs/vlayout/vabstractpiece.h b/src/libs/vlayout/vabstractpiece.h
index d212db645..1d74135db 100644
--- a/src/libs/vlayout/vabstractpiece.h
+++ b/src/libs/vlayout/vabstractpiece.h
@@ -92,6 +92,16 @@ public:
     uint GetPriority() const;
     void SetPriority(uint value);
 
+    QUuid GetUUID() const;
+    void  SetUUID(const QUuid &uuid);
+    void  SetUUID(const QString &uuid);
+
+    /**
+     * @brief GetUniqueID returns unique piece id. Combines UUID and gradation label.
+     * @return unique piece id.
+     */
+    virtual QString GetUniqueID() const;
+
     static QVector<QPointF> Equidistant(QVector<VSAPoint> points, qreal width, const QString &name);
     static qreal            SumTrapezoids(const QVector<QPointF> &points);
     static QVector<QPointF> CheckLoops(const QVector<QPointF> &points);
diff --git a/src/libs/vlayout/vabstractpiece_p.h b/src/libs/vlayout/vabstractpiece_p.h
index 91d0efbe5..6aa88ad06 100644
--- a/src/libs/vlayout/vabstractpiece_p.h
+++ b/src/libs/vlayout/vabstractpiece_p.h
@@ -32,6 +32,7 @@
 #include <QSharedData>
 #include <QString>
 #include <QCoreApplication>
+#include <QUuid>
 
 #include "../vmisc/diagnostic.h"
 #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
@@ -62,7 +63,8 @@ public:
           m_width(piece.m_width),
           m_mx(piece.m_mx),
           m_my(piece.m_my),
-          m_priority(piece.m_priority)
+          m_priority(piece.m_priority),
+          m_uuid(piece.m_uuid)
     {}
 
     ~VAbstractPieceData() Q_DECL_EQ_DEFAULT;
@@ -81,6 +83,7 @@ public:
     qreal   m_mx{0};
     qreal   m_my{0};
     uint    m_priority{0};
+    QUuid   m_uuid{QUuid::createUuid()};
 
 private:
     Q_DISABLE_ASSIGN(VAbstractPieceData)
@@ -111,6 +114,9 @@ inline QDataStream &operator<<(QDataStream &dataStream, const VAbstractPieceData
     // Added in classVersion = 2
     dataStream << piece.m_priority;
 
+    // Added in classVersion = 3
+    dataStream << piece.m_uuid;
+
     return dataStream;
 }
 
@@ -155,6 +161,11 @@ inline QDataStream &operator>>(QDataStream &dataStream, VAbstractPieceData &piec
         dataStream >> piece.m_priority;
     }
 
+    if (actualClassVersion >= 3)
+    {
+        dataStream >> piece.m_uuid;
+    }
+
     return dataStream;
 }
 
diff --git a/src/libs/vlayout/vlayout.pri b/src/libs/vlayout/vlayout.pri
index 81a129b99..785368167 100644
--- a/src/libs/vlayout/vlayout.pri
+++ b/src/libs/vlayout/vlayout.pri
@@ -17,6 +17,7 @@ HEADERS += \
     $$PWD/vcontour_p.h \
     $$PWD/vbestsquare.h \
     $$PWD/vposition.h \
+    $$PWD/vrawlayout.h \ 
     $$PWD/vprintlayout.h \
     $$PWD/vsapoint.h \
     $$PWD/vtextmanager.h \
@@ -40,6 +41,7 @@ SOURCES += \
     $$PWD/vcontour.cpp \
     $$PWD/vbestsquare.cpp \
     $$PWD/vposition.cpp \
+    $$PWD/vrawlayout.cpp \  
     $$PWD/vprintlayout.cpp \
     $$PWD/vtextmanager.cpp \
     $$PWD/vposter.cpp \
diff --git a/src/libs/vlayout/vlayoutdef.h b/src/libs/vlayout/vlayoutdef.h
index f9d041cd1..21a9dde1c 100644
--- a/src/libs/vlayout/vlayoutdef.h
+++ b/src/libs/vlayout/vlayoutdef.h
@@ -73,7 +73,8 @@ enum class LayoutExportFormats : qint8
     DXF_AC1027_ASTM = 32, /* ACAD 2013. */
     PDFTiled = 33,
     NC = 34,              /*G-code. Reserved for future*/
-    TIF = 35,
+    RLD = 35,             /*Raw Layout Data*/
+    TIF = 36,
     COUNT                 /*Use only for validation*/
 };
 
diff --git a/src/libs/vlayout/vlayoutexporter.cpp b/src/libs/vlayout/vlayoutexporter.cpp
index c2daf0ef0..8e93de220 100644
--- a/src/libs/vlayout/vlayoutexporter.cpp
+++ b/src/libs/vlayout/vlayoutexporter.cpp
@@ -45,6 +45,10 @@
 #include "../vmisc/def.h"
 #include "../vobj/vobjpaintdevice.h"
 #include "../vdxf/vdxfpaintdevice.h"
+#include "vrawlayout.h"
+#include "../vmisc/vabstractvalapplication.h"
+#include "../ifc/exception/vexception.h"
+#include "vprintlayout.h"
 
 namespace
 {
@@ -63,21 +67,18 @@ Q_GLOBAL_STATIC_WITH_ARGS(const QString, PDFTOPS, (QLatin1String("pdftops")))
  *
  * @param placeholder placeholder that will be appended to each QGraphicsSimpleTextItem item's text string.
  */
-void PrepareTextForDXF(const QString &placeholder, const QList<QList<QGraphicsItem *> > &details)
+void PrepareTextForDXF(const QString &placeholder, const QList<QGraphicsItem *> &paperItems)
 {
-    for (const auto &paperItems : details)
+    for (auto *item : paperItems)
     {
-        for (auto *item : paperItems)
+        QList<QGraphicsItem *> pieceChildren = item->childItems();
+        for (auto *child : qAsConst(pieceChildren))
         {
-            QList<QGraphicsItem *> pieceChildren = item->childItems();
-            for (auto *child : qAsConst(pieceChildren))
+            if (child->type() == QGraphicsSimpleTextItem::Type)
             {
-                if (child->type() == QGraphicsSimpleTextItem::Type)
+                if(auto *textItem = qgraphicsitem_cast<QGraphicsSimpleTextItem *>(child))
                 {
-                    if(auto *textItem = qgraphicsitem_cast<QGraphicsSimpleTextItem *>(child))
-                    {
-                        textItem->setText(textItem->text() + placeholder);
-                    }
+                    textItem->setText(textItem->text() + placeholder);
                 }
             }
         }
@@ -93,23 +94,20 @@ void PrepareTextForDXF(const QString &placeholder, const QList<QList<QGraphicsIt
  *
  * @param placeholder placeholder that will be removed from each QGraphicsSimpleTextItem item's text string.
  */
-void RestoreTextAfterDXF(const QString &placeholder, const QList<QList<QGraphicsItem *> > &details)
+void RestoreTextAfterDXF(const QString &placeholder, const QList<QGraphicsItem *> &paperItems)
 {
-    for (const auto &paperItems : details)
+    for (auto *item : paperItems)
     {
-        for (auto *item : paperItems)
+        QList<QGraphicsItem *> pieceChildren = item->childItems();
+        for (auto *child : qAsConst(pieceChildren))
         {
-            QList<QGraphicsItem *> pieceChildren = item->childItems();
-            for (auto *child : qAsConst(pieceChildren))
+            if (child->type() == QGraphicsSimpleTextItem::Type)
             {
-                if (child->type() == QGraphicsSimpleTextItem::Type)
+                if(auto *textItem = qgraphicsitem_cast<QGraphicsSimpleTextItem *>(child))
                 {
-                    if(auto *textItem = qgraphicsitem_cast<QGraphicsSimpleTextItem *>(child))
-                    {
-                        QString text = textItem->text();
-                        text.replace(placeholder, QString());
-                        textItem->setText(text);
-                    }
+                    QString text = textItem->text();
+                    text.replace(placeholder, QString());
+                    textItem->setText(text);
                 }
             }
         }
@@ -206,46 +204,7 @@ void VLayoutExporter::ExportToTIF(QGraphicsScene *scene) const
 //---------------------------------------------------------------------------------------------------------------------
 void VLayoutExporter::ExportToPDF(QGraphicsScene *scene) const
 {
-    QPrinter printer;
-    printer.setCreator(QGuiApplication::applicationDisplayName() + QChar(QChar::Space) +
-                       QCoreApplication::applicationVersion());
-    printer.setOutputFormat(QPrinter::PdfFormat);
-    printer.setOutputFileName(m_fileName);
-    printer.setDocName(QFileInfo(m_fileName).fileName());
-    printer.setResolution(static_cast<int>(PrintDPI));
-    printer.setPageOrientation(QPageLayout::Portrait);
-    printer.setFullPage(m_ignorePrinterMargins);
-
-    qreal width = FromPixel(m_imageRect.width() * m_xScale + m_margins.left() + m_margins.right(), Unit::Mm);
-    qreal height = FromPixel(m_imageRect.height() * m_yScale + m_margins.top() + m_margins.bottom(), Unit::Mm);
-
-    if (not printer.setPageSize(QPageSize(QSizeF(width, height), QPageSize::Millimeter)))
-    {
-        qWarning() << tr("Cannot set printer page size");
-    }
-
-    const qreal left = FromPixel(m_margins.left(), Unit::Mm);
-    const qreal top = FromPixel(m_margins.top(), Unit::Mm);
-    const qreal right = FromPixel(m_margins.right(), Unit::Mm);
-    const qreal bottom = FromPixel(m_margins.bottom(), Unit::Mm);
-
-    if (not printer.setPageMargins(QMarginsF(left, top, right, bottom), QPageLayout::Millimeter))
-    {
-        qWarning() << tr("Cannot set printer margins");
-    }
-
-    QPainter painter;
-    if (not painter.begin(&printer))
-    { // failed to open file
-        qCritical() << qUtf8Printable(tr("Can't open file '%1'").arg(m_fileName));
-        return;
-    }
-    painter.setRenderHint(QPainter::Antialiasing, true);
-    painter.setPen(m_pen);
-    painter.setBrush(QBrush(Qt::NoBrush));
-    painter.scale(m_xScale, m_yScale);
-    scene->render(&painter, m_imageRect, m_imageRect, Qt::IgnoreAspectRatio);
-    painter.end();
+    ExportToPDF(scene, m_fileName);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -268,8 +227,9 @@ void VLayoutExporter::ExportToPS(QGraphicsScene *scene) const
     QTemporaryFile tmp;
     if (tmp.open())
     {
-        ExportToPDF(scene);
-        PdfToPs(QStringList{tmp.fileName(), m_fileName});
+        const QString fileName = m_fileName;
+        ExportToPDF(scene, tmp.fileName());
+        PdfToPs(QStringList{tmp.fileName(), fileName});
     }
 }
 
@@ -279,13 +239,14 @@ void VLayoutExporter::ExportToEPS(QGraphicsScene *scene) const
     QTemporaryFile tmp;
     if (tmp.open())
     {
-        ExportToPDF(scene);
-        PdfToPs(QStringList{QStringLiteral("-eps"), tmp.fileName(), m_fileName});
+        const QString fileName = m_fileName;
+        ExportToPDF(scene, tmp.fileName());
+        PdfToPs(QStringList{QStringLiteral("-eps"), tmp.fileName(), fileName});
     }
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VLayoutExporter::ExportToFlatDXF(QGraphicsScene *scene, const QList<QList<QGraphicsItem *> > &details) const
+void VLayoutExporter::ExportToFlatDXF(QGraphicsScene *scene, const QList<QGraphicsItem *> &details) const
 {
     PrepareTextForDXF(endStringPlaceholder, details);
 
@@ -350,6 +311,29 @@ void VLayoutExporter::ExportToASTMDXF(const QVector<VLayoutPiece> &details) cons
     }
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+void VLayoutExporter::ExportToRLD(const QVector<VLayoutPiece> &details) const
+{
+    QVector<VLayoutPiece> scaledPieces;
+    scaledPieces.reserve(details.size());
+
+    for(auto detail : details)
+    {
+        detail.Scale(m_xScale, m_yScale);
+        scaledPieces.append(detail);
+    }
+
+    VRawLayoutData layoutData;
+    layoutData.pieces = scaledPieces;
+
+    VRawLayout generator;
+    if (not generator.WriteFile(m_fileName, layoutData))
+    {
+        const QString errorMsg = tr("Export raw layout data failed. %1.").arg(generator.ErrorString());
+        VAbstractApplication::VApp()->IsPedantic() ? throw VException(errorMsg) : qCritical() << errorMsg;
+    }
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 auto VLayoutExporter::SupportPDFConversion() -> bool
 {
@@ -382,7 +366,7 @@ QPointF VLayoutExporter::offset() const
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VLayoutExporter::SetOffset(QPointF newOffset)
+void VLayoutExporter::SetOffset(const QPointF &newOffset)
 {
     m_offset = newOffset;
 }
@@ -424,3 +408,201 @@ void VLayoutExporter::PdfToPs(const QStringList &params)
         qCritical() << qUtf8Printable(tr("Creating file '%1' failed! %2").arg(params.last(), proc.errorString()));
     }
 }
+
+//---------------------------------------------------------------------------------------------------------------------
+void VLayoutExporter::ExportToPDF(QGraphicsScene *scene, const QString &filename) const
+{
+    QPrinter printer;
+    printer.setCreator(QGuiApplication::applicationDisplayName() + QChar(QChar::Space) +
+                       QCoreApplication::applicationVersion());
+    printer.setOutputFormat(QPrinter::PdfFormat);
+    printer.setOutputFileName(filename);
+    printer.setDocName(QFileInfo(filename).fileName());
+    printer.setResolution(static_cast<int>(PrintDPI));
+    printer.setFullPage(m_ignorePrinterMargins);
+
+    QPageLayout::Orientation imageOrientation = m_imageRect.height() >= m_imageRect.width() ? QPageLayout::Portrait
+                                                                                            : QPageLayout::Landscape;
+
+    qreal width = FromPixel(m_imageRect.width() * m_xScale + m_margins.left() + m_margins.right(), Unit::Mm);
+    qreal height = FromPixel(m_imageRect.height() * m_yScale + m_margins.top() + m_margins.bottom(), Unit::Mm);
+
+    QSizeF pageSize = imageOrientation == QPageLayout::Portrait ? QSizeF(width, height) : QSizeF(height, width);
+    if (not printer.setPageSize(QPageSize(pageSize, QPageSize::Millimeter)))
+    {
+        qWarning() << tr("Cannot set printer page size");
+    }
+
+    printer.setPageOrientation(imageOrientation);
+
+    if (not m_ignorePrinterMargins)
+    {
+        const qreal left = FromPixel(m_margins.left(), Unit::Mm);
+        const qreal top = FromPixel(m_margins.top(), Unit::Mm);
+        const qreal right = FromPixel(m_margins.right(), Unit::Mm);
+        const qreal bottom = FromPixel(m_margins.bottom(), Unit::Mm);
+
+        if (not printer.setPageMargins(QMarginsF(left, top, right, bottom), QPageLayout::Millimeter))
+        {
+            qWarning() << tr("Cannot set printer margins");
+        }
+    }
+
+    QPainter painter;
+    if (not painter.begin(&printer))
+    { // failed to open file
+        qCritical() << qUtf8Printable(tr("Can't open file '%1'").arg(m_fileName));
+        return;
+    }
+    painter.setRenderHint(QPainter::Antialiasing, true);
+    painter.setPen(m_pen);
+    painter.setBrush(QBrush(Qt::NoBrush));
+    painter.scale(m_xScale, m_yScale);
+    scene->render(&painter, VPrintLayout::SceneTargetRect(&printer, m_imageRect), m_imageRect, Qt::IgnoreAspectRatio);
+    painter.end();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QString VLayoutExporter::ExportFormatDescription(LayoutExportFormats format)
+{
+    const QString dxfSuffix = QStringLiteral("(*.dxf)");
+    const QString dxfFlatFilesStr = tr("(flat) files");
+    const QString filesStr = tr("files");
+
+    switch(format)
+    {
+        case LayoutExportFormats::SVG:
+            return QStringLiteral("Svg %1 (*.svg)").arg(filesStr);
+        case LayoutExportFormats::PDF:
+            return QStringLiteral("PDF %1 (*.pdf)").arg(filesStr);
+        case LayoutExportFormats::PNG:
+            return tr("Image files") + QStringLiteral(" (*.png)");
+        case LayoutExportFormats::OBJ:
+            return QStringLiteral("Wavefront OBJ (*.obj)");
+        case LayoutExportFormats::PS:
+            return QStringLiteral("PS %1 (*.ps)").arg(filesStr);
+        case LayoutExportFormats::EPS:
+            return QStringLiteral("EPS %1 (*.eps)").arg(filesStr);
+        case LayoutExportFormats::DXF_AC1006_Flat:
+            return QStringLiteral("AutoCAD DXF R10 %1 %2").arg(dxfFlatFilesStr, dxfSuffix);
+        case LayoutExportFormats::DXF_AC1009_Flat:
+            return QStringLiteral("AutoCAD DXF R11/12 %1 %2").arg(dxfFlatFilesStr, dxfSuffix);
+        case LayoutExportFormats::DXF_AC1012_Flat:
+            return QStringLiteral("AutoCAD DXF R13 %1 %2").arg(dxfFlatFilesStr, dxfSuffix);
+        case LayoutExportFormats::DXF_AC1014_Flat:
+            return QStringLiteral("AutoCAD DXF R14 %1 %2").arg(dxfFlatFilesStr, dxfSuffix);
+        case LayoutExportFormats::DXF_AC1015_Flat:
+            return QStringLiteral("AutoCAD DXF 2000 %1 %2").arg(dxfFlatFilesStr, dxfSuffix);
+        case LayoutExportFormats::DXF_AC1018_Flat:
+            return QStringLiteral("AutoCAD DXF 2004 %1 %2").arg(dxfFlatFilesStr, dxfSuffix);
+        case LayoutExportFormats::DXF_AC1021_Flat:
+            return QStringLiteral("AutoCAD DXF 2007 %1 %2").arg(dxfFlatFilesStr, dxfSuffix);
+        case LayoutExportFormats::DXF_AC1024_Flat:
+            return QStringLiteral("AutoCAD DXF 2010 %1 %2").arg(dxfFlatFilesStr, dxfSuffix);
+        case LayoutExportFormats::DXF_AC1027_Flat:
+            return QStringLiteral("AutoCAD DXF 2013 %1 %2").arg(dxfFlatFilesStr, dxfSuffix);
+        case LayoutExportFormats::DXF_AC1006_AAMA:
+            return QStringLiteral("AutoCAD DXF R10 AAMA %1 %2").arg(filesStr, dxfSuffix);
+        case LayoutExportFormats::DXF_AC1009_AAMA:
+            return QStringLiteral("AutoCAD DXF R11/12 AAMA %1 %2").arg(filesStr, dxfSuffix);
+        case LayoutExportFormats::DXF_AC1012_AAMA:
+            return QStringLiteral("AutoCAD DXF R13 AAMA %1 %2").arg(filesStr, dxfSuffix);
+        case LayoutExportFormats::DXF_AC1014_AAMA:
+            return QStringLiteral("AutoCAD DXF R14 AAMA %1 %2").arg(filesStr, dxfSuffix);
+        case LayoutExportFormats::DXF_AC1015_AAMA:
+            return QStringLiteral("AutoCAD DXF 2000 AAMA %1 %2").arg(filesStr, dxfSuffix);
+        case LayoutExportFormats::DXF_AC1018_AAMA:
+            return QStringLiteral("AutoCAD DXF 2004 AAMA %1 %2").arg(filesStr, dxfSuffix);
+        case LayoutExportFormats::DXF_AC1021_AAMA:
+            return QStringLiteral("AutoCAD DXF 2007 AAMA %1 %2").arg(filesStr, dxfSuffix);
+        case LayoutExportFormats::DXF_AC1024_AAMA:
+            return QStringLiteral("AutoCAD DXF 2010 AAMA %1 %2").arg(filesStr, dxfSuffix);
+        case LayoutExportFormats::DXF_AC1027_AAMA:
+            return QStringLiteral("AutoCAD DXF 2013 AAMA %1 %2").arg(filesStr, dxfSuffix);
+        case LayoutExportFormats::DXF_AC1006_ASTM:
+            return QStringLiteral("AutoCAD DXF R10 ASTM %1 %2").arg(filesStr, dxfSuffix);
+        case LayoutExportFormats::DXF_AC1009_ASTM:
+            return QStringLiteral("AutoCAD DXF R11/12 ASTM %1 %2").arg(filesStr, dxfSuffix);
+        case LayoutExportFormats::DXF_AC1012_ASTM:
+            return QStringLiteral("AutoCAD DXF R13 ASTM %1 %2").arg(filesStr, dxfSuffix);
+        case LayoutExportFormats::DXF_AC1014_ASTM:
+            return QStringLiteral("AutoCAD DXF R14 ASTM %1 %2").arg(filesStr, dxfSuffix);
+        case LayoutExportFormats::DXF_AC1015_ASTM:
+            return QStringLiteral("AutoCAD DXF 2000 ASTM %1 %2").arg(filesStr, dxfSuffix);
+        case LayoutExportFormats::DXF_AC1018_ASTM:
+            return QStringLiteral("AutoCAD DXF 2004 ASTM %1 %2").arg(filesStr, dxfSuffix);
+        case LayoutExportFormats::DXF_AC1021_ASTM:
+            return QStringLiteral("AutoCAD DXF 2007 ASTM %1 %2").arg(filesStr, dxfSuffix);
+        case LayoutExportFormats::DXF_AC1024_ASTM:
+            return QStringLiteral("AutoCAD DXF 2010 ASTM %1 %2").arg(filesStr, dxfSuffix);
+        case LayoutExportFormats::DXF_AC1027_ASTM:
+            return QStringLiteral("AutoCAD DXF 2013 ASTM %1 %2").arg(filesStr, dxfSuffix);
+        case LayoutExportFormats::PDFTiled:
+            return QStringLiteral("PDF %1 %2 (*.pdf)").arg(tr("tiled"), filesStr);
+        case LayoutExportFormats::NC:
+            return QStringLiteral("%1 %2 (*.nc)").arg(tr("Numerical control"), filesStr);
+        case LayoutExportFormats::RLD:
+            return QStringLiteral("%1 %2 (*.rld)").arg(tr("Raw Layout Data"), filesStr);
+        case LayoutExportFormats::TIF:
+            return QStringLiteral("TIFF %1 (*.tif)").arg(filesStr);
+        default:
+            return QString();
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QString VLayoutExporter::ExportFormatSuffix(LayoutExportFormats format)
+{
+    switch(format)
+    {
+        case LayoutExportFormats::SVG:
+            return QStringLiteral(".svg");
+        case LayoutExportFormats::PDF:
+        case LayoutExportFormats::PDFTiled:
+            return QStringLiteral(".pdf");
+        case LayoutExportFormats::PNG:
+            return QStringLiteral(".png");
+        case LayoutExportFormats::OBJ:
+            return QStringLiteral(".obj");
+        case LayoutExportFormats::PS:
+            return QStringLiteral(".ps");
+        case LayoutExportFormats::EPS:
+            return QStringLiteral(".eps");
+        case LayoutExportFormats::DXF_AC1006_Flat:
+        case LayoutExportFormats::DXF_AC1009_Flat:
+        case LayoutExportFormats::DXF_AC1012_Flat:
+        case LayoutExportFormats::DXF_AC1014_Flat:
+        case LayoutExportFormats::DXF_AC1015_Flat:
+        case LayoutExportFormats::DXF_AC1018_Flat:
+        case LayoutExportFormats::DXF_AC1021_Flat:
+        case LayoutExportFormats::DXF_AC1024_Flat:
+        case LayoutExportFormats::DXF_AC1027_Flat:
+        case LayoutExportFormats::DXF_AC1006_AAMA:
+        case LayoutExportFormats::DXF_AC1009_AAMA:
+        case LayoutExportFormats::DXF_AC1012_AAMA:
+        case LayoutExportFormats::DXF_AC1014_AAMA:
+        case LayoutExportFormats::DXF_AC1015_AAMA:
+        case LayoutExportFormats::DXF_AC1018_AAMA:
+        case LayoutExportFormats::DXF_AC1021_AAMA:
+        case LayoutExportFormats::DXF_AC1024_AAMA:
+        case LayoutExportFormats::DXF_AC1027_AAMA:
+        case LayoutExportFormats::DXF_AC1006_ASTM:
+        case LayoutExportFormats::DXF_AC1009_ASTM:
+        case LayoutExportFormats::DXF_AC1012_ASTM:
+        case LayoutExportFormats::DXF_AC1014_ASTM:
+        case LayoutExportFormats::DXF_AC1015_ASTM:
+        case LayoutExportFormats::DXF_AC1018_ASTM:
+        case LayoutExportFormats::DXF_AC1021_ASTM:
+        case LayoutExportFormats::DXF_AC1024_ASTM:
+        case LayoutExportFormats::DXF_AC1027_ASTM:
+            return QStringLiteral(".dxf");
+        case LayoutExportFormats::NC:
+            return QStringLiteral(".nc");
+        case LayoutExportFormats::RLD:
+            return QStringLiteral(".rld");
+        case LayoutExportFormats::TIF:
+            return QStringLiteral(".tif");
+        default:
+            return QString();
+    }
+}
diff --git a/src/libs/vlayout/vlayoutexporter.h b/src/libs/vlayout/vlayoutexporter.h
index ed8246c44..1966090f2 100644
--- a/src/libs/vlayout/vlayoutexporter.h
+++ b/src/libs/vlayout/vlayoutexporter.h
@@ -34,6 +34,8 @@
 #include <QString>
 #include <QCoreApplication>
 
+#include "../vlayout/vlayoutdef.h"
+
 class QGraphicsScene;
 class QGraphicsItem;
 class VLayoutPiece;
@@ -84,14 +86,20 @@ public:
     void ExportToOBJ(QGraphicsScene *scene) const;
     void ExportToPS(QGraphicsScene *scene) const;
     void ExportToEPS(QGraphicsScene *scene) const;
-    void ExportToFlatDXF(QGraphicsScene *scene, const QList<QList<QGraphicsItem *> > &details) const;
+    void ExportToFlatDXF(QGraphicsScene *scene, const QList<QGraphicsItem *> &details) const;
     void ExportToAAMADXF(const QVector<VLayoutPiece> &details) const;
     void ExportToASTMDXF(const QVector<VLayoutPiece> &details) const;
+    void ExportToRLD(const QVector<VLayoutPiece> &details) const;
 
     static auto SupportPDFConversion() -> bool;
 
+
+    static QString ExportFormatDescription(LayoutExportFormats format);
+    static QString ExportFormatSuffix(LayoutExportFormats format);
+    static void PdfToPs(const QStringList &params);
+
     auto offset() const -> QPointF;
-    void SetOffset(QPointF newOffset);
+    void SetOffset(const QPointF &newOffset);
 
 private:
     QString   m_fileName{};
@@ -107,7 +115,7 @@ private:
     int       m_dxfVersion{0};
     QPointF   m_offset{};
 
-    static void PdfToPs(const QStringList &params);
+    void ExportToPDF(QGraphicsScene *scene, const QString &filename) const;
 };
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vlayout/vlayoutpaper.cpp b/src/libs/vlayout/vlayoutpaper.cpp
index c20b862ac..3253085a1 100644
--- a/src/libs/vlayout/vlayoutpaper.cpp
+++ b/src/libs/vlayout/vlayoutpaper.cpp
@@ -303,7 +303,7 @@ bool VLayoutPaper::SaveResult(const VBestSquare &bestResult, const VLayoutPiece
         d->globalContour.SetContour(newGContour);
 
         VCachedPositions positionChache;
-        QVector<QPointF> layoutPoints = workDetail.GetLayoutAllowancePoints();
+        QVector<QPointF> layoutPoints = workDetail.GetMappedLayoutAllowancePoints();
         positionChache.boundingRect = VLayoutPiece::BoundingRect(layoutPoints);
         positionChache.layoutAllowancePath = VAbstractPiece::PainterPath(layoutPoints);
         d->positionsCache.append(positionChache);
diff --git a/src/libs/vlayout/vlayoutpiece.cpp b/src/libs/vlayout/vlayoutpiece.cpp
index d650cf0b1..767b8f195 100644
--- a/src/libs/vlayout/vlayoutpiece.cpp
+++ b/src/libs/vlayout/vlayoutpiece.cpp
@@ -44,6 +44,7 @@
 #include <QTransform>
 #include <Qt>
 #include <QtDebug>
+#include <QUuid>
 
 #include "../vpatterndb/floatItemData/vpatternlabeldata.h"
 #include "../vpatterndb/floatItemData/vpiecelabeldata.h"
@@ -62,7 +63,7 @@
 #include "vgraphicsfillitem.h"
 
 const quint32 VLayoutPieceData::streamHeader = 0x80D7D009; // CRC-32Q string "VLayoutPieceData"
-const quint16 VLayoutPieceData::classVersion = 2;
+const quint16 VLayoutPieceData::classVersion = 3;
 
 namespace
 {
@@ -428,6 +429,87 @@ QVector<VLayoutPassmark> ConvertPassmarks(const VPiece &piece, const VContainer
 
     return layoutPassmarks;
 }
+
+//---------------------------------------------------------------------------------------------------------------------
+auto PrepareGradationPlaceholders(const VContainer *data) -> QMap<QString, QString>
+{
+    SCASSERT(data != nullptr)
+
+    QMap<QString, QString> placeholders;
+
+    QString heightValue = QString::number(VAbstractValApplication::VApp()->GetDimensionHeight());
+    placeholders.insert(pl_height, heightValue);
+
+    QString sizeValue = QString::number(VAbstractValApplication::VApp()->GetDimensionSize());
+    placeholders.insert(pl_size, sizeValue);
+
+    QString hipValue = QString::number(VAbstractValApplication::VApp()->GetDimensionHip());
+    placeholders.insert(pl_hip, hipValue);
+
+    QString waistValue = QString::number(VAbstractValApplication::VApp()->GetDimensionWaist());
+    placeholders.insert(pl_waist, waistValue);
+
+    {
+        QString label = VAbstractValApplication::VApp()->GetDimensionHeightLabel();
+        placeholders.insert(pl_heightLabel, not label.isEmpty() ? label : heightValue);
+
+        label = VAbstractValApplication::VApp()->GetDimensionSizeLabel();
+        placeholders.insert(pl_sizeLabel, not label.isEmpty() ? label : sizeValue);
+
+        label = VAbstractValApplication::VApp()->GetDimensionHipLabel();
+        placeholders.insert(pl_hipLabel, not label.isEmpty() ? label : hipValue);
+
+        label = VAbstractValApplication::VApp()->GetDimensionWaistLabel();
+        placeholders.insert(pl_waistLabel, not label.isEmpty() ? label : waistValue);
+    }
+
+    {
+        const QMap<QString, QSharedPointer<VMeasurement> > measurements = data->DataMeasurements();
+        auto i = measurements.constBegin();
+        while (i != measurements.constEnd())
+        {
+            placeholders.insert(pl_measurement + i.key(), QString::number(*i.value()->GetValue()));
+            ++i;
+        }
+    }
+
+    return placeholders;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto ReplacePlaceholders(const QMap<QString, QString> &placeholders, QString line) -> QString
+{
+    QChar per('%');
+
+    auto TestDimension = [per, placeholders, line](const QString &placeholder, const QString &errorMsg)
+    {
+        if (line.contains(per+placeholder+per) && placeholders.value(placeholder) == QChar('0'))
+        {
+            VAbstractApplication::VApp()->IsPedantic() ? throw VException(errorMsg) :
+                                              qWarning() << VAbstractValApplication::warningMessageSignature + errorMsg;
+        }
+    };
+
+    TestDimension(pl_height, QObject::tr("No data for the height dimension."));
+    TestDimension(pl_size, QObject::tr("No data for the size dimension."));
+    TestDimension(pl_hip, QObject::tr("No data for the hip dimension."));
+    TestDimension(pl_waist, QObject::tr("No data for the waist dimension."));
+
+    auto i = placeholders.constBegin();
+    while (i != placeholders.constEnd())
+    {
+        line.replace(per+i.key()+per, i.value());
+        ++i;
+    }
+    return line;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto PrepareGradationId(const QString &label, const VContainer *pattern) -> QString
+{
+    const QMap<QString, QString> placeholders = PrepareGradationPlaceholders(pattern);
+    return ReplacePlaceholders(placeholders, label);
+}
 }
 
 // Friend functions
@@ -504,6 +586,8 @@ VLayoutPiece VLayoutPiece::Create(const VPiece &piece, vidtype id, const VContai
     det.SetMy(piece.GetMy());
 
     det.SetName(piece.GetName());
+    det.SetUUID(piece.GetUUID());
+    det.SetGradationId(PrepareGradationId(piece.GetGradationLabel(), pattern));
 
     det.SetSAWidth(VAbstractValApplication::VApp()->toPixel(piece.GetSAWidth()));
     det.SetForbidFlipping(piece.IsForbidFlipping());
@@ -528,7 +612,7 @@ VLayoutPiece VLayoutPiece::Create(const VPiece &piece, vidtype id, const VContai
     det.SetPriority(piece.GetPriority());
 
     // Very important to set main path first!
-    if (det.ContourPath().isEmpty())
+    if (det.MappedContourPath().isEmpty())
     {
         throw VException (tr("Piece %1 doesn't have shape.").arg(piece.GetName()));
     }
@@ -548,7 +632,7 @@ VLayoutPiece VLayoutPiece::Create(const VPiece &piece, vidtype id, const VContai
     }
 
     const VGrainlineData& grainlineGeom = piece.GetGrainlineGeometry();
-    if (grainlineGeom.IsVisible() == true)
+    if (grainlineGeom.IsVisible())
     {
         det.SetGrainline(grainlineGeom, pattern);
     }
@@ -556,9 +640,22 @@ VLayoutPiece VLayoutPiece::Create(const VPiece &piece, vidtype id, const VContai
     return det;
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+auto VLayoutPiece::GetUniqueID() const -> QString
+{
+    QString id = VAbstractPiece::GetUniqueID();
+
+    if (not d->m_gradationId.isEmpty())
+    {
+        id = id + '_' + d->m_gradationId;
+    }
+
+    return id;
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 template <class T>
-QVector<T> VLayoutPiece::Map(QVector<T> points) const
+auto VLayoutPiece::Map(QVector<T> points) const -> QVector<T>
 {
     std::transform(points.begin(), points.end(), points.begin(),
                    [this](const T &point) { return d->matrix.map(point); });
@@ -648,11 +745,17 @@ void VLayoutPiece::SetSeamAllowancePoints(const QVector<QPointF> &points, bool s
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-QVector<QPointF> VLayoutPiece::GetLayoutAllowancePoints() const
+QVector<QPointF> VLayoutPiece::GetMappedLayoutAllowancePoints() const
 {
     return Map(d->layoutAllowance);
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+QVector<QPointF> VLayoutPiece::GetLayoutAllowancePoints() const
+{
+    return d->layoutAllowance;
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 QPointF VLayoutPiece::GetPieceTextPosition() const
 {
@@ -711,6 +814,30 @@ void VLayoutPiece::SetPieceText(const QString& qsName, const VPieceLabelData& da
     d->m_tmDetail.FitFontSize(labelWidth, labelHeight);
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+auto VLayoutPiece::GetPieceLabelRect() const -> QVector<QPointF>
+{
+    return d->detailLabel;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VLayoutPiece::SetPieceLabelRect(const QVector<QPointF> &rect)
+{
+    d->detailLabel = rect;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VLayoutPiece::GetPieceLabelData() const -> VTextManager
+{
+    return d->m_tmDetail;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VLayoutPiece::SetPieceLabelData(const VTextManager &data)
+{
+    d->m_tmDetail = data;
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 QPointF VLayoutPiece::GetPatternTextPosition() const
 {
@@ -769,6 +896,30 @@ void VLayoutPiece::SetPatternInfo(VAbstractPattern* pDoc, const VPatternLabelDat
     d->m_tmPattern.FitFontSize(labelWidth, labelHeight);
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+auto VLayoutPiece::GetPatternLabelRect() const -> QVector<QPointF>
+{
+    return d->patternInfo;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VLayoutPiece::SetPatternLabelRect(const QVector<QPointF> &rect)
+{
+    d->patternInfo = rect;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VLayoutPiece::GetPatternLabelData() const -> VTextManager
+{
+    return d->m_tmPattern;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VLayoutPiece::SetPatternLabelData(const VTextManager &data)
+{
+    d->m_tmPattern = data;
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 void VLayoutPiece::SetGrainline(const VGrainlineData& geom, const VContainer* pattern)
 {
@@ -789,17 +940,47 @@ void VLayoutPiece::SetGrainline(const VGrainlineData& geom, const VContainer* pa
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-QVector<QPointF> VLayoutPiece::GetGrainline() const
+QVector<QPointF> VLayoutPiece::GetMappedGrainline() const
 {
     return Map(d->grainlinePoints);
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+QVector<QPointF> VLayoutPiece::GetGrainline() const
+{
+    return d->grainlinePoints;
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 bool VLayoutPiece::IsGrainlineEnabled() const
 {
     return d->grainlineEnabled;
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+void VLayoutPiece::SetGrainlineEnabled(bool enabled)
+{
+    d->grainlineEnabled = enabled;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VLayoutPiece::SetGrainlineAngle(qreal angle)
+{
+    d->grainlineAngle = angle;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VLayoutPiece::SetGrainlineArrowType(GrainlineArrowDirection type)
+{
+    d->grainlineArrowType = type;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VLayoutPiece::SetGrainlinePoints(const QVector<QPointF> &points)
+{
+    d->grainlinePoints = points;
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 qreal VLayoutPiece::GrainlineAngle() const
 {
@@ -862,15 +1043,24 @@ void VLayoutPiece::SetId(vidtype id)
 
 //---------------------------------------------------------------------------------------------------------------------
 void VLayoutPiece::Translate(qreal dx, qreal dy)
+{
+    Translate(QPointF(dx, dy));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VLayoutPiece::Translate(const QPointF &p)
 {
     QTransform m;
-    m.translate(dx, dy);
+    m.translate(p.x(), p.y());
     d->matrix *= m;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
 void VLayoutPiece::Scale(qreal sx, qreal sy)
 {
+    d->m_xScale *= sx;
+    d->m_yScale *= sy;
+
     QTransform m;
     m.scale(sx, sy);
     d->matrix *= m;
@@ -954,22 +1144,27 @@ int VLayoutPiece::LayoutEdgeByPoint(const QPointF &p1) const
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-QRectF VLayoutPiece::DetailBoundingRect() const
+QRectF VLayoutPiece::MappedDetailBoundingRect() const
 {
-    return IsSeamAllowance() && not IsSeamAllowanceBuiltIn() ? BoundingRect(GetMappedSeamAllowancePoints()) :
-                                                               BoundingRect(GetMappedContourPoints());
+    return BoundingRect(GetMappedExternalContourPoints());
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-QRectF VLayoutPiece::LayoutBoundingRect() const
+QRectF VLayoutPiece::DetailBoundingRect() const
 {
-    return BoundingRect(GetLayoutAllowancePoints());
+    return BoundingRect(GetExternalContourPoints());
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QRectF VLayoutPiece::MappedLayoutBoundingRect() const
+{
+    return BoundingRect(GetMappedLayoutAllowancePoints());
 }
 
 //---------------------------------------------------------------------------------------------------------------------
 qreal VLayoutPiece::Diagonal() const
 {
-    const QRectF rec = LayoutBoundingRect();
+    const QRectF rec = MappedLayoutBoundingRect();
     return qSqrt(pow(rec.height(), 2) + pow(rec.width(), 2));
 }
 
@@ -1035,11 +1230,31 @@ void VLayoutPiece::SetLayoutAllowancePoints()
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-QVector<VLayoutPassmark> VLayoutPiece::GetPassmarks() const
+QVector<QPointF> VLayoutPiece::GetMappedExternalContourPoints() const
+{
+    return IsSeamAllowance() && not IsSeamAllowanceBuiltIn() ? GetMappedSeamAllowancePoints() :
+                                                               GetMappedContourPoints();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QVector<QPointF> VLayoutPiece::GetExternalContourPoints() const
+{
+    return IsSeamAllowance() && not IsSeamAllowanceBuiltIn() ? GetSeamAllowancePoints() :
+                                                               GetContourPoints();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QVector<VLayoutPassmark> VLayoutPiece::GetMappedPassmarks() const
 {
     return Map(d->passmarks);
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+QVector<VLayoutPassmark> VLayoutPiece::GetPassmarks() const
+{
+    return d->passmarks;
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 void VLayoutPiece::SetPassmarks(const QVector<VLayoutPassmark> &passmarks)
 {
@@ -1050,11 +1265,17 @@ void VLayoutPiece::SetPassmarks(const QVector<VLayoutPassmark> &passmarks)
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-QVector<VLayoutPlaceLabel> VLayoutPiece::GetPlaceLabels() const
+QVector<VLayoutPlaceLabel> VLayoutPiece::GetMappedPlaceLabels() const
 {
     return Map(d->m_placeLabels);
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+QVector<VLayoutPlaceLabel> VLayoutPiece::GetPlaceLabels() const
+{
+    return d->m_placeLabels;
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 void VLayoutPiece::SetPlaceLabels(const QVector<VLayoutPlaceLabel> &labels)
 {
@@ -1062,11 +1283,11 @@ void VLayoutPiece::SetPlaceLabels(const QVector<VLayoutPlaceLabel> &labels)
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-QVector<QVector<QPointF> > VLayoutPiece::InternalPathsForCut(bool cut) const
+QVector<QVector<QPointF> > VLayoutPiece::MappedInternalPathsForCut(bool cut) const
 {
     QVector<QVector<QPointF> > paths;
 
-    for (auto &path : d->m_internalPaths)
+    for (const auto &path : d->m_internalPaths)
     {
         if (path.IsCutPath() == cut)
         {
@@ -1089,6 +1310,12 @@ void VLayoutPiece::SetInternalPaths(const QVector<VLayoutPiecePath> &internalPat
     d->m_internalPaths = internalPaths;
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+QPainterPath VLayoutPiece::MappedContourPath() const
+{
+    return d->matrix.map(ContourPath());
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 QPainterPath VLayoutPiece::ContourPath() const
 {
@@ -1097,7 +1324,7 @@ QPainterPath VLayoutPiece::ContourPath() const
     // contour
     if (not IsHideMainPath() || not IsSeamAllowance() || IsSeamAllowanceBuiltIn())
     {
-        path = PainterPath(GetMappedContourPoints());
+        path = PainterPath(GetContourPoints());
     }
 
     // seam allowance
@@ -1106,7 +1333,7 @@ QPainterPath VLayoutPiece::ContourPath() const
         if (not IsSeamAllowanceBuiltIn())
         {
             // Draw seam allowance
-            QVector<QPointF>points = GetMappedSeamAllowancePoints();
+            QVector<QPointF>points = GetSeamAllowancePoints();
 
             if (points.last().toPoint() != points.first().toPoint())
             {
@@ -1126,9 +1353,9 @@ QPainterPath VLayoutPiece::ContourPath() const
         // Draw passmarks
         QPainterPath passmaksPath;
         const QVector<VLayoutPassmark> passmarks = GetPassmarks();
-        for(auto &passmark : passmarks)
+        for(const auto &passmark : passmarks)
         {
-            for (auto &line : passmark.lines)
+            for (const auto &line : passmark.lines)
             {
                 passmaksPath.moveTo(line.p1());
                 passmaksPath.lineTo(line.p2());
@@ -1143,9 +1370,45 @@ QPainterPath VLayoutPiece::ContourPath() const
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-QPainterPath VLayoutPiece::LayoutAllowancePath() const
+QPainterPath VLayoutPiece::MappedLayoutAllowancePath() const
 {
-    return PainterPath(GetLayoutAllowancePoints());
+    return PainterPath(GetMappedLayoutAllowancePoints());
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VLayoutPiece::DrawMiniature(QPainter &painter) const
+{
+    painter.drawPath(ContourPath());
+
+    for (const auto &path : d->m_internalPaths)
+    {
+        painter.save();
+
+        QPen pen = painter.pen();
+        pen.setStyle(path.PenStyle());
+        painter.setPen(pen);
+
+        painter.drawPath(path.GetPainterPath());
+
+        painter.restore();
+    }
+
+    for (const auto &label : d->m_placeLabels)
+    {
+        painter.drawPath(VPlaceLabelItem::LabelShapePath(label.shape));
+    }
+
+    QVector<QPointF> gPoints = GetGrainline();
+    if (not gPoints.isEmpty())
+    {
+        QPainterPath path;
+        path.moveTo(gPoints.at(0));
+        for (auto p : qAsConst(gPoints))
+        {
+            path.lineTo(p);
+        }
+        painter.drawPath(path);
+    }
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -1155,7 +1418,7 @@ QGraphicsItem *VLayoutPiece::GetItem(bool textAsPaths) const
 
     for (auto &path : d->m_internalPaths)
     {
-        QGraphicsPathItem* pathItem = new QGraphicsPathItem(item);
+        auto* pathItem = new QGraphicsPathItem(item);
         pathItem->setPath(d->matrix.map(path.GetPainterPath()));
 
         QPen pen = pathItem->pen();
@@ -1164,9 +1427,9 @@ QGraphicsItem *VLayoutPiece::GetItem(bool textAsPaths) const
         pathItem->setPen(pen);
     }
 
-    for (auto &label : d->m_placeLabels)
+    for (const auto &label : d->m_placeLabels)
     {
-        QGraphicsPathItem* pathItem = new QGraphicsPathItem(item);
+        auto* pathItem = new QGraphicsPathItem(item);
         QPen pen = pathItem->pen();
         pen.setWidthF(VAbstractApplication::VApp()->Settings()->WidthHairLine());
         pathItem->setPen(pen);
@@ -1305,7 +1568,7 @@ void VLayoutPiece::CreateLabelStrings(QGraphicsItem *parent, const QVector<QPoin
                 QPainterPath path;
                 path.addText(0, - static_cast<qreal>(fm.ascent())/6., fnt, qsText);
 
-                QGraphicsPathItem* item = new QGraphicsPathItem(parent);
+                auto* item = new QGraphicsPathItem(parent);
                 item->setPath(path);
                 item->setBrush(QBrush(Qt::black));
                 item->setTransform(labelMatrix);
@@ -1314,7 +1577,7 @@ void VLayoutPiece::CreateLabelStrings(QGraphicsItem *parent, const QVector<QPoin
             }
             else
             {
-                QGraphicsSimpleTextItem* item = new QGraphicsSimpleTextItem(parent);
+                auto* item = new QGraphicsSimpleTextItem(parent);
                 item->setFont(fnt);
                 item->setText(qsText);
                 item->setTransform(labelMatrix);
@@ -1339,7 +1602,7 @@ void VLayoutPiece::CreateGrainlineItem(QGraphicsItem *parent) const
 
     QPainterPath path;
 
-    QVector<QPointF> gPoints = GetGrainline();
+    QVector<QPointF> gPoints = GetMappedGrainline();
     path.moveTo(gPoints.at(0));
     for (auto p : qAsConst(gPoints))
     {
@@ -1368,7 +1631,7 @@ QGraphicsPathItem *VLayoutPiece::GetMainItem() const
     QPen pen = item->pen();
     pen.setWidthF(VAbstractApplication::VApp()->Settings()->WidthHairLine());
     item->setPen(pen);
-    item->setPath(ContourPath());
+    item->setPath(MappedContourPath());
     return item;
 }
 
@@ -1408,6 +1671,42 @@ void VLayoutPiece::SetMirror(bool value)
     d->mirror = value;
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+void VLayoutPiece::SetGradationId(const QString &id)
+{
+    d->m_gradationId = id;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VLayoutPiece::GetGradationId() const -> QString
+{
+    return d->m_gradationId;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VLayoutPiece::GetXScale() const -> qreal
+{
+    return d->m_xScale;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VLayoutPiece::SetXScale(qreal xs)
+{
+    d->m_xScale = xs;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+auto VLayoutPiece::GetYScale() const -> qreal
+{
+    return d->m_yScale;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VLayoutPiece::SetYScale(qreal ys)
+{
+    d->m_yScale = ys;
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 QLineF VLayoutPiece::Edge(const QVector<QPointF> &path, int i) const
 {
diff --git a/src/libs/vlayout/vlayoutpiece.h b/src/libs/vlayout/vlayoutpiece.h
index 77c5bc132..850416a69 100644
--- a/src/libs/vlayout/vlayoutpiece.h
+++ b/src/libs/vlayout/vlayoutpiece.h
@@ -73,6 +73,8 @@ public:
 
     static VLayoutPiece Create(const VPiece &piece, vidtype id, const VContainer *pattern);
 
+    virtual auto GetUniqueID() const -> QString override;
+
     QVector<QPointF> GetMappedContourPoints() const;
     QVector<QPointF> GetContourPoints() const;
     void SetCountourPoints(const QVector<QPointF> &points, bool hideMainPath = false);
@@ -82,16 +84,22 @@ public:
     void SetSeamAllowancePoints(const QVector<QPointF> &points, bool seamAllowance = true,
                                 bool seamAllowanceBuiltIn = false);
 
+    QVector<QPointF> GetMappedLayoutAllowancePoints() const;
     QVector<QPointF> GetLayoutAllowancePoints() const;
     void SetLayoutAllowancePoints();
 
+    QVector<QPointF> GetMappedExternalContourPoints() const;
+    QVector<QPointF> GetExternalContourPoints() const;
+
+    QVector<VLayoutPassmark> GetMappedPassmarks() const;
     QVector<VLayoutPassmark> GetPassmarks() const;
     void SetPassmarks(const QVector<VLayoutPassmark> &passmarks);
 
+    QVector<VLayoutPlaceLabel> GetMappedPlaceLabels() const;
     QVector<VLayoutPlaceLabel> GetPlaceLabels() const;
     void SetPlaceLabels(const QVector<VLayoutPlaceLabel> &labels);
 
-    QVector<QVector<QPointF>> InternalPathsForCut(bool cut) const;
+    QVector<QVector<QPointF>> MappedInternalPathsForCut(bool cut) const;
     QVector<VLayoutPiecePath> GetInternalPaths() const;
     void SetInternalPaths(const QVector<VLayoutPiecePath> &internalPaths);
 
@@ -105,6 +113,7 @@ public:
                         const VContainer *pattern);
 
     void SetGrainline(const VGrainlineData& geom, const VContainer *pattern);
+    QVector<QPointF> GetMappedGrainline() const;
     QVector<QPointF> GetGrainline() const;
     bool  IsGrainlineEnabled() const;
     qreal GrainlineAngle() const;
@@ -125,6 +134,16 @@ public:
     bool IsMirror() const;
     void SetMirror(bool value);
 
+    void SetGradationId(const QString &id);
+    auto GetGradationId() const -> QString;
+
+    auto GetXScale() const -> qreal;
+    void SetXScale(qreal xs);
+
+    auto GetYScale() const -> qreal;
+    void SetYScale(qreal ys);
+
+    void Translate(const QPointF &p);
     void Translate(qreal dx, qreal dy);
     void Scale(qreal sx, qreal sy);
     void Rotate(const QPointF &originPoint, qreal degrees);
@@ -137,8 +156,9 @@ public:
     QLineF LayoutEdge(int i) const;
     int    LayoutEdgeByPoint(const QPointF &p1) const;
 
+    QRectF MappedDetailBoundingRect() const;
     QRectF DetailBoundingRect() const;
-    QRectF LayoutBoundingRect() const;
+    QRectF MappedLayoutBoundingRect() const;
     qreal  Diagonal() const;
 
     static QRectF BoundingRect(QVector<QPointF> points);
@@ -146,8 +166,11 @@ public:
     bool isNull() const;
     qint64 Square() const;
 
+    QPainterPath MappedContourPath() const;
     QPainterPath ContourPath() const;
-    QPainterPath LayoutAllowancePath() const;
+    QPainterPath MappedLayoutAllowancePath() const;
+
+    void DrawMiniature(QPainter &painter) const;
 
     Q_REQUIRED_RESULT QGraphicsItem *GetItem(bool textAsPaths) const;
 
@@ -158,6 +181,24 @@ public:
     friend QDataStream& operator<< (QDataStream& dataStream, const VLayoutPiece& piece);
     friend QDataStream& operator>> (QDataStream& dataStream, VLayoutPiece& piece);
 
+protected:
+    void SetGrainlineEnabled(bool enabled);
+    void SetGrainlineAngle(qreal angle);
+    void SetGrainlineArrowType(GrainlineArrowDirection type);
+    void SetGrainlinePoints(const QVector<QPointF> &points);
+
+    auto GetPieceLabelRect() const -> QVector<QPointF>;
+    void SetPieceLabelRect(const QVector<QPointF> &rect);
+
+    auto GetPieceLabelData() const ->VTextManager;
+    void SetPieceLabelData(const VTextManager &data);
+
+    auto GetPatternLabelRect() const -> QVector<QPointF>;
+    void SetPatternLabelRect(const QVector<QPointF> &rect);
+
+    auto GetPatternLabelData() const ->VTextManager;
+    void SetPatternLabelData(const VTextManager &data);
+
 private:
     QSharedDataPointer<VLayoutPieceData> d;
 
diff --git a/src/libs/vlayout/vlayoutpiece_p.h b/src/libs/vlayout/vlayoutpiece_p.h
index f3e796dfe..2d5c6c3eb 100644
--- a/src/libs/vlayout/vlayoutpiece_p.h
+++ b/src/libs/vlayout/vlayoutpiece_p.h
@@ -77,7 +77,10 @@ public:
           m_placeLabels(detail.m_placeLabels),
           m_square(detail.m_square),
           m_quantity(detail.m_quantity),
-          m_id(detail.m_id)
+          m_id(detail.m_id),
+          m_gradationId(detail.m_gradationId),
+          m_xScale(detail.m_xScale),
+          m_yScale(detail.m_yScale)
     {}
 
     ~VLayoutPieceData() Q_DECL_EQ_DEFAULT;
@@ -117,7 +120,7 @@ public:
     /** @brief grainlineInfo line */
     QVector<QPointF>          grainlinePoints{};
 
-    GrainlineArrowDirection                 grainlineArrowType{GrainlineArrowDirection::atFront};
+    GrainlineArrowDirection   grainlineArrowType{GrainlineArrowDirection::atFront};
     qreal                     grainlineAngle{0};
     bool                      grainlineEnabled{false};
 
@@ -137,6 +140,11 @@ public:
     /** @brief m_id keep id of original piece. */
     vidtype                   m_id;
 
+    QString m_gradationId{};
+
+    qreal m_xScale{1.0};
+    qreal m_yScale{1.0};
+
 private:
     Q_DISABLE_ASSIGN(VLayoutPieceData)
 
@@ -172,6 +180,13 @@ inline QDataStream &operator<<(QDataStream &dataStream, const VLayoutPieceData &
     dataStream << piece.m_quantity;
     dataStream << piece.m_id;
 
+    // Added in classVersion = 3
+    dataStream << piece.m_tmDetail;
+    dataStream << piece.m_tmPattern;
+    dataStream << piece.m_gradationId;
+    dataStream << piece.m_xScale;
+    dataStream << piece.m_yScale;
+
     return dataStream;
 }
 
@@ -224,6 +239,15 @@ inline QDataStream &operator>>(QDataStream &dataStream, VLayoutPieceData &piece)
         dataStream >> piece.m_id;
     }
 
+    if (actualClassVersion >= 3)
+    {
+        dataStream >> piece.m_tmDetail;
+        dataStream >> piece.m_tmPattern;
+        dataStream >> piece.m_gradationId;
+        dataStream >> piece.m_xScale;
+        dataStream >> piece.m_yScale;
+    }
+
     return dataStream;
 }
 
diff --git a/src/libs/vlayout/vposition.cpp b/src/libs/vlayout/vposition.cpp
index 6d4eb99be..c13cdb22c 100644
--- a/src/libs/vlayout/vposition.cpp
+++ b/src/libs/vlayout/vposition.cpp
@@ -299,7 +299,7 @@ void VPosition::SaveCandidate(VBestSquare &bestResult, const VLayoutPiece &detai
     QVector<QPointF> newGContour = m_data.gContour.UniteWithContour(detail, globalI, detJ, type);
     newGContour.append(newGContour.first());
     const QSizeF size = QPolygonF(newGContour).boundingRect().size();
-    const QRectF boundingRect = detail.DetailBoundingRect();
+    const QRectF boundingRect = detail.MappedDetailBoundingRect();
     const qreal depthPosition = m_data.isOriginPaperOrientationPortrait ? boundingRect.y() : boundingRect.x();
     const qreal sidePosition = m_data.isOriginPaperOrientationPortrait ? boundingRect.x() : boundingRect.y();
 
@@ -332,7 +332,7 @@ bool VPosition::CheckCombineEdges(VLayoutPiece &detail, int j, int &dEdge)
 #endif
 
     CrossingType type = CrossingType::Intersection;
-    if (not detail.IsForceFlipping() && SheetContains(detail.DetailBoundingRect()))
+    if (not detail.IsForceFlipping() && SheetContains(detail.MappedDetailBoundingRect()))
     {
         if (not m_data.gContour.GetContour().isEmpty())
         {
@@ -375,7 +375,7 @@ bool VPosition::CheckCombineEdges(VLayoutPiece &detail, int j, int &dEdge)
         }
 
         CrossingType type = CrossingType::Intersection;
-        if (SheetContains(detail.DetailBoundingRect()))
+        if (SheetContains(detail.MappedDetailBoundingRect()))
         {
             type = Crossing(detail);
         }
@@ -417,7 +417,7 @@ bool VPosition::CheckRotationEdges(VLayoutPiece &detail, int j, int dEdge, qreal
 #endif
 
     CrossingType type = CrossingType::Intersection;
-    if (SheetContains(detail.DetailBoundingRect()))
+    if (SheetContains(detail.MappedDetailBoundingRect()))
     {
         type = Crossing(detail);
     }
@@ -469,7 +469,7 @@ VPosition::CrossingType VPosition::Crossing(const VLayoutPiece &detail) const
         return CrossingType::NoIntersection;
     }
 
-    const QVector<QPointF> layoutPoints = detail.GetLayoutAllowancePoints();
+    const QVector<QPointF> layoutPoints = detail.GetMappedLayoutAllowancePoints();
     const QRectF layoutBoundingRect = VLayoutPiece::BoundingRect(layoutPoints);
     const QPainterPath layoutAllowancePath = VAbstractPiece::PainterPath(layoutPoints);
 
diff --git a/src/libs/vlayout/vposter.cpp b/src/libs/vlayout/vposter.cpp
index dab321692..3decf6ec4 100644
--- a/src/libs/vlayout/vposter.cpp
+++ b/src/libs/vlayout/vposter.cpp
@@ -95,7 +95,6 @@ QPixmap WatermarkImageFromCache(const VWatermarkData &watermarkData, const QStri
         if (watermarkData.grayscale)
         {
             watermark = Grayscale(watermark);
-            watermark.save("/home/dismine/grayscale.png", "PNG");
         }
 
         // Workaround for QGraphicsPixmapItem opacity problem.
@@ -272,6 +271,11 @@ QVector<QGraphicsItem *> VPoster::TextWatermark(QGraphicsItem *parent, const Pos
 
     QGraphicsSimpleTextItem *text = new QGraphicsSimpleTextItem(watermarkData.text, parent);
     text->setFont(watermarkData.font);
+
+    QPen pen = text->pen();
+    pen.setColor(watermarkData.textColor);
+    text->setPen(pen);
+
     text->setOpacity(watermarkData.opacity/100.);
     text->setTransformOriginPoint(text->boundingRect().center());
     text->setRotation(-watermarkData.textRotation);
diff --git a/src/libs/vlayout/vprintlayout.cpp b/src/libs/vlayout/vprintlayout.cpp
index b1b09ba4b..e9c250a55 100644
--- a/src/libs/vlayout/vprintlayout.cpp
+++ b/src/libs/vlayout/vprintlayout.cpp
@@ -386,14 +386,6 @@ void VPrintLayout::PrintPages(QPrinter *printer)
 
     VWatermarkData data = WatermarkData();
 
-    // Here we try understand difference between printer's dpi and our.
-    // Get printer rect acording to our dpi.
-    const QRectF printerPageRect(0, 0, ToPixel(printer->pageRect(QPrinter::Millimeter).width(), Unit::Mm),
-                                 ToPixel(printer->pageRect(QPrinter::Millimeter).height(), Unit::Mm));
-    const QRect pageRect = printer->pageLayout().paintRectPixels(printer->resolution());
-    const double xscale = pageRect.width() / printerPageRect.width();
-    const double yscale = pageRect.height() / printerPageRect.height();
-
     for (int i = 0; i < copyCount; ++i)
     {
         for (int j = 0; j < numPages; ++j)
@@ -437,24 +429,8 @@ void VPrintLayout::PrintPages(QPrinter *printer)
                 QRectF source;
                 m_isTiled ? source = poster->at(index).rect : source = paper->rect();
 
-                qreal x;
-                qreal y;
-                if(printer->fullPage())
-                {
-                    QPageLayout layout = printer->pageLayout();
-                    layout.setUnits(QPageLayout::Millimeter);
-                    QMarginsF printerMargins = layout.margins();
-                    x = qFloor(ToPixel(printerMargins.left(), Unit::Mm));
-                    y = qFloor(ToPixel(printerMargins.top(), Unit::Mm));
-                }
-                else
-                {
-                    x = 0; y = 0;
-                }
-
-                QRectF target(x * xscale, y * yscale, source.width() * xscale, source.height() * yscale);
-
-                m_layoutScenes.at(paperIndex)->render(&painter, target, source, Qt::IgnoreAspectRatio);
+                m_layoutScenes.at(paperIndex)->render(&painter, VPrintLayout::SceneTargetRect(printer, source), source,
+                                                      Qt::IgnoreAspectRatio);
 
                 if (m_isTiled)
                 {
@@ -762,3 +738,34 @@ auto VPrintLayout::ContinueIfLayoutStale(QWidget *parent) -> int
 
     return QMessageBox::Yes;
 }
+
+//---------------------------------------------------------------------------------------------------------------------
+QRectF VPrintLayout::SceneTargetRect(QPrinter *printer, const QRectF &source)
+{
+    SCASSERT(printer != nullptr)
+
+    qreal x;
+    qreal y;
+    if(printer->fullPage())
+    {
+        QPageLayout layout = printer->pageLayout();
+        layout.setUnits(QPageLayout::Millimeter);
+        QMarginsF printerMargins = layout.margins();
+        x = qFloor(ToPixel(printerMargins.left(), Unit::Mm));
+        y = qFloor(ToPixel(printerMargins.top(), Unit::Mm));
+    }
+    else
+    {
+        x = 0; y = 0;
+    }
+
+    // Here we try understand difference between printer's dpi and our.
+    // Get printer rect acording to our dpi.
+    const QRectF printerPageRect(0, 0, ToPixel(printer->pageRect(QPrinter::Millimeter).width(), Unit::Mm),
+                                 ToPixel(printer->pageRect(QPrinter::Millimeter).height(), Unit::Mm));
+    const QRect pageRect = printer->pageLayout().paintRectPixels(printer->resolution());
+    const double xscale = pageRect.width() / printerPageRect.width();
+    const double yscale = pageRect.height() / printerPageRect.height();
+
+    return QRectF(x * xscale, y * yscale, source.width() * xscale, source.height() * yscale);
+}
diff --git a/src/libs/vlayout/vprintlayout.h b/src/libs/vlayout/vprintlayout.h
index f23e914ab..d3aafc2e2 100644
--- a/src/libs/vlayout/vprintlayout.h
+++ b/src/libs/vlayout/vprintlayout.h
@@ -121,6 +121,7 @@ public:
     void CleanLayout();
 
     static auto ContinueIfLayoutStale(QWidget *parent) -> int;
+    static auto SceneTargetRect(QPrinter *printer, const QRectF &source) -> QRectF;
 
 private slots:
     void PrintPages (QPrinter *printer);
diff --git a/src/libs/vlayout/vrawlayout.cpp b/src/libs/vlayout/vrawlayout.cpp
new file mode 100644
index 000000000..42d404530
--- /dev/null
+++ b/src/libs/vlayout/vrawlayout.cpp
@@ -0,0 +1,248 @@
+/************************************************************************
+ **
+ **  @file   vrawlayout.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   21 4, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#include "vrawlayout.h"
+
+#include <QDataStream>
+#include <QIODevice>
+#include <QDebug>
+#include <QFile>
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
+#include "../vmisc/backport/qscopeguard.h"
+#else
+#include <QScopeGuard>
+#endif
+
+#include "../vmisc/def.h"
+#include "../vmisc/vdatastreamenum.h"
+#include "../ifc/exception/vexception.h"
+
+const QByteArray VRawLayout::fileHeaderByteArray = QByteArray("RLD!...");
+const quint16 VRawLayout::fileVersion = 1;
+
+const quint32 VRawLayoutData::streamHeader = 0x8B0E8A27; // CRC-32Q string "VRawLayoutData"
+const quint16 VRawLayoutData::classVersion = 1;
+
+//---------------------------------------------------------------------------------------------------------------------
+QDataStream &operator<<(QDataStream &dataStream, const VRawLayoutData &data)
+{
+    dataStream << VRawLayoutData::streamHeader << VRawLayoutData::classVersion;
+
+    // Added in classVersion = 1
+    dataStream << data.pieces;
+
+    // Added in classVersion = 2
+
+    return dataStream;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QDataStream &operator>>(QDataStream &dataStream, VRawLayoutData &data)
+{
+    quint32 actualStreamHeader = 0;
+    dataStream >> actualStreamHeader;
+
+    if (actualStreamHeader != VRawLayoutData::streamHeader)
+    {
+        QString message = QCoreApplication::tr("VRawLayoutData prefix mismatch error: actualStreamHeader = 0x%1 and "
+                                               "streamHeader = 0x%2")
+                              .arg(actualStreamHeader, 8, 0x10, QChar('0'))
+                              .arg(VRawLayoutData::streamHeader, 8, 0x10, QChar('0'));
+        throw VException(message);
+    }
+
+    quint16 actualClassVersion = 0;
+    dataStream >> actualClassVersion;
+
+    if (actualClassVersion > VRawLayoutData::classVersion)
+    {
+        QString message = QCoreApplication::tr("VRawLayoutData compatibility error: actualClassVersion = %1 and "
+                                               "classVersion = %2")
+                              .arg( actualClassVersion ).arg(VRawLayoutData::classVersion);
+        throw VException(message);
+    }
+
+    dataStream >> data.pieces;
+
+//    if (actualClassVersion >= 2)
+//    {
+//        // read value in version 2
+//    }
+
+    return dataStream;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+VRawLayout::VRawLayout()
+{}
+
+//---------------------------------------------------------------------------------------------------------------------
+bool VRawLayout::WriteFile(QIODevice *ioDevice, const VRawLayoutData &data)
+{
+    SCASSERT(ioDevice != nullptr)
+    m_errorString.clear();
+
+    const bool wasOpen = ioDevice->isOpen();
+
+    if (wasOpen || ioDevice->open(QIODevice::WriteOnly))
+    {
+        QDataStream dataStream(ioDevice);
+        dataStream.setVersion(QDataStream::Qt_5_4);
+
+        // Don't use the << operator for QByteArray. See the note in ReadFile() below.
+        dataStream.writeRawData(fileHeaderByteArray.constData(), fileHeaderByteArray.size());
+        dataStream << fileVersion;
+        dataStream << data;
+
+        if (not wasOpen)
+        {
+            ioDevice->close(); // Only close this if it was opened by this function.
+        }
+        return true;
+    }
+    else
+    {
+        m_errorString = ioDevice->errorString();
+        return false;
+    }
+
+    return true;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+bool VRawLayout::ReadFile(QIODevice *ioDevice, VRawLayoutData &data)
+{
+    SCASSERT(ioDevice != nullptr)
+    m_errorString.clear();
+
+    const bool wasOpen = ioDevice->isOpen();
+
+    if (wasOpen || ioDevice->open(QIODevice::ReadOnly))
+    {
+        auto CloseFile = qScopeGuard([wasOpen, ioDevice]()
+                                     {
+                                         if (not wasOpen) // Only close this if it was opened by this function.
+                                         {
+                                             ioDevice->close();
+                                         }
+                                     });
+
+        QDataStream dataStream(ioDevice);
+        dataStream.setVersion(QDataStream::Qt_5_4);
+
+        // Note: we could have used the QDataStream << and >> operators on QByteArray but since the first
+        // bytes of the stream will be the size of the array, we might end up attempting to allocate
+        // a large amount of memory if the wrong file type was read. Instead, we'll just read the
+        // same number of bytes that are in the array we are comparing it to. No size was written.
+        const int len  = fileHeaderByteArray.size();
+        QByteArray actualFileHeaderByteArray( len, '\0' );
+        dataStream.readRawData( actualFileHeaderByteArray.data(), len );
+
+        if (actualFileHeaderByteArray != fileHeaderByteArray)
+        {
+            // prefixes don't match
+            m_errorString = tr("VRawLayout::ReadFile() failed. Raw layout format prefix mismatch error.");
+            return false;
+        }
+
+        quint16 actualFileVersion = 0;
+        dataStream >> actualFileVersion;
+
+        if (actualFileVersion > fileVersion)
+        {
+            // file is from a future version that we don't know how to load
+            m_errorString = tr("VRawLayout::ReadFile() failed.\n"
+                               "Raw layout format compatibility error: actualFileVersion = %1 and fileVersion = %2" )
+                                .arg(actualFileVersion).arg(fileVersion);
+            return false;
+        }
+
+        try
+        {
+            // This may throw an exception if one of the VRawLayoutData objects is corrupt or unsupported.
+            // For example, if this file is from a future version of this code.
+            dataStream >> data;
+        }
+        catch (const VException& e)
+        {
+            qCritical() << e.ErrorMessage();
+
+            m_errorString = e.ErrorMessage();
+            return false;
+        }
+
+        return true;
+    }
+    else
+    {
+        m_errorString = ioDevice->errorString();
+        return false;
+    }
+
+    return true;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+bool VRawLayout::WriteFile(const QString &filePath, const VRawLayoutData &data)
+{
+    QFile file(filePath);
+    if (file.open(QIODevice::WriteOnly | QIODevice::Truncate))
+    {
+        auto CloseFile = qScopeGuard([&file]()
+                                     {
+                                         file.flush();
+                                         file.close();
+                                     });
+        return WriteFile(&file, data);
+    }
+    else
+    {
+        m_errorString = file.errorString();
+        return false;
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+bool VRawLayout::ReadFile(const QString &filePath, VRawLayoutData &data)
+{
+    QFile file(filePath);
+    if (file.open(QIODevice::ReadOnly))
+    {
+        auto CloseFile = qScopeGuard([&file]()
+                                     {
+                                         file.flush();
+                                         file.close();
+                                     });
+        return ReadFile(&file, data);
+    }
+    else
+    {
+        m_errorString = file.errorString();
+        return false;
+    }
+}
diff --git a/src/libs/vlayout/vrawlayout.h b/src/libs/vlayout/vrawlayout.h
new file mode 100644
index 000000000..23078048a
--- /dev/null
+++ b/src/libs/vlayout/vrawlayout.h
@@ -0,0 +1,73 @@
+/************************************************************************
+ **
+ **  @file   vrawlayout.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   21 4, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+#ifndef VRAWLAYOUT_H
+#define VRAWLAYOUT_H
+
+#include "vlayoutpiece.h"
+
+struct VRawLayoutData
+{
+    QVector<VLayoutPiece> pieces{};
+
+    friend QDataStream& operator<< (QDataStream& dataStream, const VRawLayoutData& data);
+    friend QDataStream& operator>> (QDataStream& dataStream, VRawLayoutData& data);
+
+private:
+    static const quint32 streamHeader;
+    static const quint16 classVersion;
+};
+
+
+class VRawLayout
+{
+    Q_DECLARE_TR_FUNCTIONS(VRawLayout)
+public:
+    VRawLayout();
+
+    bool WriteFile(QIODevice* ioDevice, const VRawLayoutData& data);
+    bool ReadFile(QIODevice* ioDevice, VRawLayoutData& data);
+
+    bool WriteFile(const QString& filePath, const VRawLayoutData& data);
+    bool ReadFile(const QString& filePath, VRawLayoutData& data);
+
+    QString ErrorString() const;
+
+private:
+    QString m_errorString{};
+
+    static const QByteArray fileHeaderByteArray;
+    static const quint16 fileVersion;
+};
+
+//---------------------------------------------------------------------------------------------------------------------
+inline QString VRawLayout::ErrorString() const
+{
+    return m_errorString;
+}
+
+#endif // VRAWLAYOUT_H
diff --git a/src/libs/vlayout/vtextmanager.cpp b/src/libs/vlayout/vtextmanager.cpp
index 9c8890bf3..b32df25f6 100644
--- a/src/libs/vlayout/vtextmanager.cpp
+++ b/src/libs/vlayout/vtextmanager.cpp
@@ -51,7 +51,7 @@ const quint16 TextLine::classVersion = 1;
 
 // Friend functions
 //---------------------------------------------------------------------------------------------------------------------
-QDataStream& operator<<(QDataStream &dataStream, const TextLine &data)
+auto operator<<(QDataStream &dataStream, const TextLine &data) -> QDataStream&
 {
     dataStream << TextLine::streamHeader << TextLine::classVersion;
 
@@ -68,7 +68,7 @@ QDataStream& operator<<(QDataStream &dataStream, const TextLine &data)
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-QDataStream& operator>>(QDataStream &dataStream, TextLine &data)
+auto operator>>(QDataStream &dataStream, TextLine &data) -> QDataStream&
 {
     quint32 actualStreamHeader = 0;
     dataStream >> actualStreamHeader;
@@ -113,7 +113,7 @@ const quint16 VTextManager::classVersion = 1;
 
 // Friend functions
 //---------------------------------------------------------------------------------------------------------------------
-QDataStream& operator<<(QDataStream &dataStream, const VTextManager &data)
+auto operator<<(QDataStream &dataStream, const VTextManager &data) -> QDataStream&
 {
     dataStream << VTextManager::streamHeader << VTextManager::classVersion;
 
@@ -127,7 +127,7 @@ QDataStream& operator<<(QDataStream &dataStream, const VTextManager &data)
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-QDataStream& operator>>(QDataStream &dataStream, VTextManager &data)
+auto operator>>(QDataStream &dataStream, VTextManager &data) -> QDataStream&
 {
     quint32 actualStreamHeader = 0;
     dataStream >> actualStreamHeader;
@@ -167,7 +167,7 @@ namespace
 {
 
 //---------------------------------------------------------------------------------------------------------------------
-QMap<QString, QString> PreparePlaceholders(const VAbstractPattern *doc, const VContainer *data)
+auto PreparePlaceholders(const VAbstractPattern *doc, const VContainer *data) -> QMap<QString, QString>
 {
     SCASSERT(doc != nullptr)
     SCASSERT(data != nullptr)
@@ -331,7 +331,7 @@ void InitPiecePlaceholders(QMap<QString, QString> &placeholders, const QString &
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-QString ReplacePlaceholders(const QMap<QString, QString> &placeholders, QString line)
+auto ReplacePlaceholders(const QMap<QString, QString> &placeholders, QString line) -> QString
 {
     QChar per('%');
 
@@ -359,7 +359,7 @@ QString ReplacePlaceholders(const QMap<QString, QString> &placeholders, QString
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-QVector<TextLine> PrepareLines(const QVector<VLabelTemplateLine> &lines)
+auto PrepareLines(const QVector<VLabelTemplateLine> &lines) -> QVector<TextLine>
 {
     QVector<TextLine> textLines;
 
@@ -412,7 +412,7 @@ VTextManager &VTextManager::operator=(const VTextManager &text)
  * @brief GetSpacing returns the vertical spacing between the lines
  * @return spacing
  */
-int VTextManager::GetSpacing() const
+auto VTextManager::GetSpacing() const -> int
 {
     return 0;
 }
@@ -432,7 +432,7 @@ void VTextManager::SetFont(const QFont& font)
  * @brief GetFont returns the text base font
  * @return text base font
  */
-const QFont& VTextManager::GetFont() const
+auto VTextManager::GetFont() const -> const QFont&
 {
     return m_font;
 }
@@ -448,17 +448,23 @@ void VTextManager::SetFontSize(int iFS)
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-QVector<TextLine> VTextManager::GetAllSourceLines() const
+auto VTextManager::GetAllSourceLines() const -> QVector<TextLine>
 {
     return m_liLines;
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+void VTextManager::SetAllSourceLines(const QVector<TextLine> &lines)
+{
+    m_liLines = lines;
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief VTextManager::GetSourceLinesCount returns the number of input text lines
  * @return number of text lines that were added to the list by calling AddLine
  */
-int VTextManager::GetSourceLinesCount() const
+auto VTextManager::GetSourceLinesCount() const -> int
 {
     return m_liLines.count();
 }
@@ -469,7 +475,7 @@ int VTextManager::GetSourceLinesCount() const
  * @param i index of the requested line
  * @return reference to the requested TextLine object
  */
-const TextLine& VTextManager::GetSourceLine(int i) const
+auto VTextManager::GetSourceLine(int i) const -> const TextLine&
 {
     Q_ASSERT(i >= 0);
     Q_ASSERT(i < m_liLines.count());
diff --git a/src/libs/vlayout/vtextmanager.h b/src/libs/vlayout/vtextmanager.h
index 9728d9e15..5968b9aea 100644
--- a/src/libs/vlayout/vtextmanager.h
+++ b/src/libs/vlayout/vtextmanager.h
@@ -57,8 +57,8 @@ struct TextLine
     bool          m_italic{false};
     Qt::Alignment m_eAlign{Qt::AlignCenter};
 
-    friend QDataStream& operator<<(QDataStream& dataStream, const TextLine& data);
-    friend QDataStream& operator>>(QDataStream& dataStream, TextLine& data);
+    friend auto operator<<(QDataStream& dataStream, const TextLine& data) -> QDataStream&;
+    friend auto operator>>(QDataStream& dataStream, TextLine& data) -> QDataStream&;
 private:
     static const quint32 streamHeader;
     static const quint16 classVersion;
@@ -78,22 +78,23 @@ public:
     VTextManager(const VTextManager &text);
     VTextManager &operator=(const VTextManager &text);
 
-    virtual int GetSpacing() const;
+    virtual auto GetSpacing() const -> int;
 
-    void         SetFont(const QFont& font);
-    const QFont& GetFont() const;
-    void         SetFontSize(int iFS);
-    void         FitFontSize(qreal fW, qreal fH);
+    void SetFont(const QFont& font);
+    auto GetFont() const -> const QFont&;
+    void SetFontSize(int iFS);
+    void FitFontSize(qreal fW, qreal fH);
 
-    QVector<TextLine> GetAllSourceLines() const;
-    int               GetSourceLinesCount() const;
-    const TextLine&   GetSourceLine(int i) const;
+    auto GetAllSourceLines() const -> QVector<TextLine>;
+    void SetAllSourceLines(const QVector<TextLine> &lines);
+    auto GetSourceLinesCount() const -> int;
+    auto GetSourceLine(int i) const -> const TextLine&;
 
     void Update(const QString& qsName, const VPieceLabelData& data, const VContainer *pattern);
     void Update(VAbstractPattern* pDoc, const VContainer *pattern);
 
-    friend QDataStream& operator<<(QDataStream& dataStream, const VTextManager& data);
-    friend QDataStream& operator>>(QDataStream& dataStream, VTextManager& data);
+    friend auto operator<<(QDataStream& dataStream, const VTextManager& data) -> QDataStream&;
+    friend auto operator>>(QDataStream& dataStream, VTextManager& data) -> QDataStream&;
 
 private:
     QFont             m_font;
diff --git a/src/libs/vmisc/def.h b/src/libs/vmisc/def.h
index 816379595..8e7bf8cf4 100644
--- a/src/libs/vmisc/def.h
+++ b/src/libs/vmisc/def.h
@@ -525,7 +525,7 @@ Q_DECL_RELAXED_CONSTEXPR inline qreal UnitConvertor(qreal value, const Unit &fro
                 case Unit::Cm:
                     return value / 10.0;
                 case Unit::Inch:
-                    return value / 25.4;
+                    return value / 10.0 / 2.54;
                 case Unit::Px:
                     return (value / 25.4) * PrintDPI;
                 default:
@@ -551,7 +551,7 @@ Q_DECL_RELAXED_CONSTEXPR inline qreal UnitConvertor(qreal value, const Unit &fro
             switch (to)
             {
                 case Unit::Mm:
-                    return value * 25.4;
+                    return value * 2.54 * 10.0;
                 case Unit::Cm:
                     return value * 2.54;
                 case Unit::Inch:
diff --git a/src/libs/vmisc/share/resources/icon.qrc b/src/libs/vmisc/share/resources/icon.qrc
index 72ed1fe0f..7e62554aa 100644
--- a/src/libs/vmisc/share/resources/icon.qrc
+++ b/src/libs/vmisc/share/resources/icon.qrc
@@ -93,5 +93,6 @@
         <file>icon/24x24/star@2x.png</file>
         <file>icon/24x24/close.png</file>
         <file>icon/24x24/close@2x.png</file>
+        <file>icon/layout.png</file>
     </qresource>
 </RCC>
diff --git a/src/libs/vmisc/share/resources/icon/layout.png b/src/libs/vmisc/share/resources/icon/layout.png
new file mode 100644
index 000000000..3f4159168
Binary files /dev/null and b/src/libs/vmisc/share/resources/icon/layout.png differ
diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/object-rotate-right.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/object-rotate-right.png
new file mode 100644
index 000000000..0bf5159f6
Binary files /dev/null and b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/object-rotate-right.png differ
diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/object-rotate-right.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/object-rotate-right.png
new file mode 100644
index 000000000..e9d8f5bbc
Binary files /dev/null and b/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/object-rotate-right.png differ
diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/object-rotate-right.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/object-rotate-right.png
new file mode 100644
index 000000000..353989137
Binary files /dev/null and b/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/object-rotate-right.png differ
diff --git a/src/libs/vmisc/share/resources/theme.qrc b/src/libs/vmisc/share/resources/theme.qrc
index 7d28e0b69..ce2d67a93 100644
--- a/src/libs/vmisc/share/resources/theme.qrc
+++ b/src/libs/vmisc/share/resources/theme.qrc
@@ -102,5 +102,8 @@
         <file alias="16x16/actions/view-refresh.png">icons/win.icon.theme/16x16/actions/view-refresh.png</file>
         <file alias="24x24/actions/view-refresh.png">icons/win.icon.theme/24x24/actions/view-refresh.png</file>
         <file alias="32x32/actions/view-refresh.png">icons/win.icon.theme/32x32/actions/view-refresh.png</file>
+        <file alias="16x16/actions/object-rotate-right.png">icons/win.icon.theme/16x16/actions/object-rotate-right.png</file>
+        <file alias="24x24/actions/object-rotate-right.png">icons/win.icon.theme/24x24/actions/object-rotate-right.png</file>
+        <file alias="32x32/actions/object-rotate-right.png">icons/win.icon.theme/32x32/actions/object-rotate-right.png</file>
     </qresource>
 </RCC>
diff --git a/src/libs/vmisc/testvapplication.h b/src/libs/vmisc/testvapplication.h
index 781307880..d9fdae99f 100644
--- a/src/libs/vmisc/testvapplication.h
+++ b/src/libs/vmisc/testvapplication.h
@@ -31,9 +31,19 @@
 
 #include "vabstractvalapplication.h"
 #include "projectversion.h"
-#include "../vmisc/vsettings.h"
+#include "../vmisc/vcommonsettings.h"
 
-class VTestSettings;
+class VTestSettings : public VCommonSettings
+{
+    Q_OBJECT
+public:
+    VTestSettings(Format format, Scope scope, const QString &organization, const QString &application = QString(),
+                  QObject *parent = nullptr)
+        : VCommonSettings(format, scope, organization, application, parent)
+    {
+        qRegisterMetaTypeStreamOperators<QMarginsF>("QMarginsF");
+    }
+};
 
 class TestVApplication : public VAbstractValApplication
 {
@@ -46,7 +56,7 @@ public:
         setApplicationName("ValentinaTest");
         setOrganizationName(VER_COMPANYNAME_STR);
 
-        OpenSettings();
+        TestVApplication::OpenSettings();
     }
 
     virtual ~TestVApplication() Q_DECL_EQ_DEFAULT;
@@ -58,8 +68,8 @@ public:
 
     virtual void OpenSettings() override
     {
-        settings = new VSettings(QSettings::IniFormat, QSettings::UserScope, QCoreApplication::organizationName(),
-                                 QCoreApplication::applicationName(), this);
+        settings = new VTestSettings(QSettings::IniFormat, QSettings::UserScope, QCoreApplication::organizationName(),
+                                     QCoreApplication::applicationName(), this);
     }
 
     virtual bool IsAppInGUIMode() const override
@@ -89,16 +99,4 @@ private:
     VTranslateVars *m_trVars;
 };
 
-class VTestSettings : public VCommonSettings
-{
-    Q_OBJECT
-public:
-    VTestSettings(Format format, Scope scope, const QString &organization, const QString &application = QString(),
-                  QObject *parent = nullptr)
-        : VCommonSettings(format, scope, organization, application, parent)
-    {
-        qRegisterMetaTypeStreamOperators<QMarginsF>("QMarginsF");
-    }
-};
-
 #endif // TESTVAPPLICATION_H
diff --git a/src/libs/vmisc/vabstractapplication.cpp b/src/libs/vmisc/vabstractapplication.cpp
index fdd06d088..c28041d7d 100644
--- a/src/libs/vmisc/vabstractapplication.cpp
+++ b/src/libs/vmisc/vabstractapplication.cpp
@@ -153,16 +153,14 @@ QString VAbstractApplication::translationsPath(const QString &locale) const
     {
         return dir.absolutePath();
     }
-    else
-    {
+
 #if defined(APPIMAGE) && defined(Q_OS_LINUX)
-        /* Fix path to trasnaltions when run inside AppImage. */
-        return AppImageRoot() + PKGDATADIR + trPath;
+    /* Fix path to trasnaltions when run inside AppImage. */
+    return AppImageRoot() + PKGDATADIR + trPath;
 #else
-        return PKGDATADIR + trPath;
+    return PKGDATADIR + trPath;
 #endif // defined(APPIMAGE) && defined(Q_OS_LINUX)
-    }
-#endif
+#endif // Unix
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vmisc/vabstractvalapplication.cpp b/src/libs/vmisc/vabstractvalapplication.cpp
index d45a02604..450d87a81 100644
--- a/src/libs/vmisc/vabstractvalapplication.cpp
+++ b/src/libs/vmisc/vabstractvalapplication.cpp
@@ -27,7 +27,7 @@
  *************************************************************************/
 #include "vabstractvalapplication.h"
 #include "customevents.h"
-#include "vsettings.h"
+#include "vvalentinasettings.h"
 
 #include <QWidget>
 
@@ -63,15 +63,15 @@ void VAbstractValApplication::PostWarningMessage(const QString &message, QtMsgTy
  */
 void VAbstractValApplication::OpenSettings()
 {
-    settings = new VSettings(QSettings::IniFormat, QSettings::UserScope, QCoreApplication::organizationName(),
-                             QCoreApplication::applicationName(), this);
+    settings = new VValentinaSettings(QSettings::IniFormat, QSettings::UserScope, QCoreApplication::organizationName(),
+                                      QCoreApplication::applicationName(), this);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-VSettings *VAbstractValApplication::ValentinaSettings()
+VValentinaSettings *VAbstractValApplication::ValentinaSettings()
 {
     SCASSERT(settings != nullptr)
-            return qobject_cast<VSettings *>(settings);
+            return qobject_cast<VValentinaSettings *>(settings);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vmisc/vabstractvalapplication.h b/src/libs/vmisc/vabstractvalapplication.h
index cc4c70c89..51164967c 100644
--- a/src/libs/vmisc/vabstractvalapplication.h
+++ b/src/libs/vmisc/vabstractvalapplication.h
@@ -36,7 +36,7 @@ class VAbstractValApplication;// use in define
 class VAbstractPattern;
 class VMainGraphicsView;
 class QGraphicsScene;
-class VSettings;
+class VValentinaSettings;
 
 class VAbstractValApplication : public VAbstractApplication
 {
@@ -121,7 +121,7 @@ public:
     void    SetDimensionWaistLabel(const QString &label);
 
     virtual void OpenSettings() override;
-    VSettings *ValentinaSettings();
+    VValentinaSettings *ValentinaSettings();
 
     static VAbstractValApplication *VApp();
 
diff --git a/src/libs/vmisc/vcommonsettings.cpp b/src/libs/vmisc/vcommonsettings.cpp
index 61ce7fab3..2609b26d3 100644
--- a/src/libs/vmisc/vcommonsettings.cpp
+++ b/src/libs/vmisc/vcommonsettings.cpp
@@ -41,12 +41,34 @@
 #include <QTextCodec>
 #include <QFont>
 #include <QGlobalStatic>
+#include <QMarginsF>
+#include <QColor>
 
 #include "../vmisc/def.h"
 #include "../vmisc/vmath.h"
 #include "../vmisc/compatibility.h"
 #include "../vpatterndb/pmsystems.h"
 
+const int VCommonSettings::defaultScrollingDuration = 300;
+const int VCommonSettings::scrollingDurationMin = 100;
+const int VCommonSettings::scrollingDurationMax = 1000;
+
+const int VCommonSettings::defaultScrollingUpdateInterval = 30;
+const int VCommonSettings::scrollingUpdateIntervalMin = 10;
+const int VCommonSettings::scrollingUpdateIntervalMax = 100;
+
+const qreal VCommonSettings::defaultSensorMouseScale = 2.0;
+const qreal VCommonSettings::sensorMouseScaleMin = 1.0;
+const qreal VCommonSettings::sensorMouseScaleMax = 10.0;
+
+const qreal VCommonSettings::defaultWheelMouseScale = 45.0;
+const qreal VCommonSettings::wheelMouseScaleMin = 1.0;
+const qreal VCommonSettings::wheelMouseScaleMax = 100.0;
+
+const qreal VCommonSettings::defaultScrollingAcceleration = 1.3;
+const qreal VCommonSettings::scrollingAccelerationMin = 1.0;
+const qreal VCommonSettings::scrollingAccelerationMax = 10.0;
+
 Q_DECLARE_METATYPE(QMarginsF)
 
 namespace
@@ -56,6 +78,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingPathsMultisizeMeasurements, (QLa
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingPathsPattern, (QLatin1String("paths/pattern")))
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingPathsTemplates, (QLatin1String("paths/templates")))
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingPathsLabelTemplate, (QLatin1String("paths/labels")))
+Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingPathsManualLayouts, (QLatin1String("paths/manualLayouts")))
 
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingConfigurationOsSeparator, (QLatin1String("configuration/osSeparator")))
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingConfigurationAutosaveState, (QLatin1String("configuration/autosave/state")))
@@ -83,6 +106,8 @@ Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingPatternShowCurveDetails, (QLatin
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingPatternPieceShowMainPath, (QLatin1String("pattern/pieceShowMainPath")))
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingPatternLabelFontSize, (QLatin1String("pattern/labelFontSize")))
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingPatternHideLabels, (QLatin1String("pattern/hideLabels")))
+Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingPatternUseOpenGLRender, (QLatin1String("pattern/useOpenGLRender")))
+Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingPatternGraphicalOutput, (QLatin1String("pattern/graphicalOutput")))
 
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingGeneralRecentFileList, (QLatin1String("recentFileList")))
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingGeneralRestoreFileList, (QLatin1String("restoreFileList")))
@@ -107,15 +132,30 @@ Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingLabelUserDateFormats, (QLatin1St
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingLabelTimeFormat, (QLatin1String("label/timeFormat")))
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingLabelUserTimeFormats, (QLatin1String("label/userTimeFormats")))
 
+Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingScrollingDuration, (QLatin1String("scrolling/duration")))
+Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingScrollingUpdateInterval, (QLatin1String("scrolling/updateInterval")))
+Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingScrollingSensorMouseScale,
+                          (QLatin1String("scrolling/sensorMouseScale")))
+Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingScrollingWheelMouseScale, (QLatin1String("scrolling/wheelMouseScale")))
+Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingScrollingAcceleration, (QLatin1String("scrolling/acceleration")))
+
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingTiledPDFMargins, (QLatin1String("tiledPDF/margins")))
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingTiledPDFOrientation, (QLatin1String("tiledPDF/orientation")))
 
+Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingWatermarkEditorSize, (QLatin1String("watermarkEditorSize")))
+Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingWatermarkCustomColors, (QLatin1String("watermarkCustomColors")))
+
 // Reading settings file is very expensive, cache curve approximation to speed up getting value
 qreal curveApproximationCached = -1;
 Q_GLOBAL_STATIC(QString, localeCached)
 qreal lineWidthCached = 0;
 int labelFontSizeCached = 0;
 int pieceShowMainPath = -1;
+int scrollingDurationCached = -1;
+int scrollingUpdateIntervalCached = -1;
+qreal scrollingSensorMouseScaleCached = -1;
+qreal scrollingWheelMouseScaleCached = -1;
+qreal scrollingAccelerationCached = -1;
 
 //---------------------------------------------------------------------------------------------------------------------
 QStringList ClearFormats(const QStringList &predefinedFormats, QStringList formats)
@@ -431,6 +471,24 @@ void VCommonSettings::SetPathLabelTemplate(const QString &value)
     setValue(*settingPathsLabelTemplate, value);
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+QString VCommonSettings::GetDefPathManualLayouts()
+{
+    return QDir::homePath() + QLatin1String("/valentina/") + tr("manual layouts");
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QString VCommonSettings::GetPathManualLayouts() const
+{
+    return value(*settingPathsManualLayouts, GetDefPathManualLayouts()).toString();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VCommonSettings::SetPathManualLayouts(const QString &value)
+{
+    setValue(*settingPathsManualLayouts, value);
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 bool VCommonSettings::GetOsSeparator() const
 {
@@ -1222,6 +1280,121 @@ qreal VCommonSettings::WidthHairLine() const
     return WidthMainLine()/3.0;
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+int VCommonSettings::GetScrollingDuration() const
+{
+    QSettings settings(this->format(), this->scope(), this->organizationName(), *commonIniFilename);
+    return GetCachedValue(settings, scrollingDurationCached, *settingScrollingDuration, defaultScrollingDuration,
+                          scrollingDurationMin, scrollingDurationMax);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VCommonSettings::SetScrollingDuration(int duration)
+{
+    scrollingDurationCached = qBound(scrollingDurationMin, duration, scrollingDurationMax);
+    QSettings settings(this->format(), this->scope(), this->organizationName(), *commonIniFilename);
+    settings.setValue(*settingScrollingDuration, scrollingDurationCached);
+    settings.sync();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+int VCommonSettings::GetScrollingUpdateInterval() const
+{
+    QSettings settings(this->format(), this->scope(), this->organizationName(), *commonIniFilename);
+    return GetCachedValue(settings, scrollingUpdateIntervalCached, *settingScrollingUpdateInterval,
+                          defaultScrollingUpdateInterval, scrollingUpdateIntervalMin, scrollingUpdateIntervalMax);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VCommonSettings::SetScrollingUpdateInterval(int updateInterval)
+{
+    scrollingUpdateIntervalCached = qBound(scrollingUpdateIntervalMin, updateInterval, scrollingUpdateIntervalMax);
+    QSettings settings(this->format(), this->scope(), this->organizationName(), *commonIniFilename);
+    settings.setValue(*settingScrollingUpdateInterval, scrollingUpdateIntervalCached);
+    settings.sync();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+qreal VCommonSettings::GetSensorMouseScale() const
+{
+    QSettings settings(this->format(), this->scope(), this->organizationName(), *commonIniFilename);
+    return GetCachedValue(settings, scrollingSensorMouseScaleCached, *settingScrollingSensorMouseScale,
+                          defaultSensorMouseScale, sensorMouseScaleMin, sensorMouseScaleMax);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VCommonSettings::SetSensorMouseScale(qreal scale)
+{
+    scrollingSensorMouseScaleCached = qBound(sensorMouseScaleMin, scale, sensorMouseScaleMax);
+    QSettings settings(this->format(), this->scope(), this->organizationName(), *commonIniFilename);
+    settings.setValue(*settingScrollingSensorMouseScale, scrollingSensorMouseScaleCached);
+    settings.sync();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+qreal VCommonSettings::GetWheelMouseScale() const
+{
+    QSettings settings(this->format(), this->scope(), this->organizationName(), *commonIniFilename);
+    return GetCachedValue(settings, scrollingWheelMouseScaleCached, *settingScrollingWheelMouseScale,
+                          defaultWheelMouseScale, wheelMouseScaleMin, wheelMouseScaleMax);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VCommonSettings::SetWheelMouseScale(qreal scale)
+{
+    scrollingWheelMouseScaleCached = qBound(wheelMouseScaleMin, scale, wheelMouseScaleMax);
+    QSettings settings(this->format(), this->scope(), this->organizationName(), *commonIniFilename);
+    settings.setValue(*settingScrollingWheelMouseScale, scrollingWheelMouseScaleCached);
+    settings.sync();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+qreal VCommonSettings::GetScrollingAcceleration() const
+{
+    QSettings settings(this->format(), this->scope(), this->organizationName(), *commonIniFilename);
+    return GetCachedValue(settings, scrollingAccelerationCached, *settingScrollingAcceleration,
+                          defaultScrollingAcceleration, scrollingAccelerationMin, scrollingAccelerationMax);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VCommonSettings::SetScrollingAcceleration(qreal acceleration)
+{
+    scrollingAccelerationCached = qBound(scrollingAccelerationMin, acceleration, scrollingAccelerationMax);
+    QSettings settings(this->format(), this->scope(), this->organizationName(), *commonIniFilename);
+    settings.setValue(*settingScrollingAcceleration, scrollingAccelerationCached);
+    settings.sync();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+bool VCommonSettings::IsOpenGLRender() const
+{
+    QSettings settings(this->format(), this->scope(), this->organizationName(), *commonIniFilename);
+    return settings.value(*settingPatternUseOpenGLRender, 0).toBool();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VCommonSettings::SetOpenGLRender(bool value)
+{
+    QSettings settings(this->format(), this->scope(), this->organizationName(), *commonIniFilename);
+    settings.setValue(*settingPatternUseOpenGLRender, value);
+    settings.sync();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+bool VCommonSettings::GetGraphicalOutput() const
+{
+    QSettings settings(this->format(), this->scope(), this->organizationName(), *commonIniFilename);
+    return settings.value(*settingPatternGraphicalOutput, 1).toBool();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VCommonSettings::SetGraphicalOutput(const bool &value)
+{
+    QSettings settings(this->format(), this->scope(), this->organizationName(), *commonIniFilename);
+    settings.setValue(*settingPatternGraphicalOutput, value);
+    settings.sync();
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief GetTiledPDFMargins returns the tiled pdf margins in the given unit. When the setting is
@@ -1233,7 +1406,8 @@ qreal VCommonSettings::WidthHairLine() const
 auto VCommonSettings::GetTiledPDFMargins(const Unit &unit) const -> QMarginsF
 {
     // default value is 10mm. We save the margins in mm in the setting.
-    return UnitConvertor(ValueOrDef<QMarginsF>(*settingTiledPDFMargins, QMarginsF(10, 10, 10, 10)), Unit::Mm, unit);
+    return UnitConvertor(
+                ValueOrDef<QMarginsF>(*this, *settingTiledPDFMargins, QMarginsF(10, 10, 10, 10)), Unit::Mm, unit);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -1261,3 +1435,63 @@ void VCommonSettings::SetTiledPDFOrientation(PageOrientation value)
 {
     setValue(*settingTiledPDFOrientation, static_cast<bool> (value));
 }
+
+//---------------------------------------------------------------------------------------------------------------------
+QSize VCommonSettings::GetWatermarkEditorSize() const
+{
+    return value(*settingWatermarkEditorSize, QSize(0, 0)).toSize();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VCommonSettings::SetWatermarkEditorSize(const QSize &sz)
+{
+    setValue(*settingWatermarkEditorSize, sz);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QVector<QColor> VCommonSettings::GetWatermarkCustomColors() const
+{
+    QSettings settings(this->format(), this->scope(), this->organizationName(), *commonIniFilename);
+    QStringList colors = settings.value(*settingPatternGraphicalOutput, 1).toStringList();
+
+    QVector<QColor> customColors;
+    customColors.reserve(colors.size());
+
+    for (auto color : colors)
+    {
+        QColor c(color);
+        if (c.isValid())
+        {
+            customColors.append(c);
+        }
+    }
+
+    if (customColors.count() > 7)
+    {
+        customColors.remove(0, customColors.count() - 7);
+    }
+
+    return customColors;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VCommonSettings::SetWatermarkCustomColors(QVector<QColor> colors)
+{
+    QSettings settings(this->format(), this->scope(), this->organizationName(), *commonIniFilename);
+
+    if (colors.count() > 7)
+    {
+        colors.remove(0, colors.count() - 7);
+    }
+
+    QStringList customColors;
+    customColors.reserve(colors.size());
+
+    for (auto color : colors)
+    {
+        customColors.append(color.name());
+    }
+
+    settings.setValue(*settingWatermarkCustomColors, customColors);
+    settings.sync();
+}
diff --git a/src/libs/vmisc/vcommonsettings.h b/src/libs/vmisc/vcommonsettings.h
index 5d2be7c25..53293db6b 100644
--- a/src/libs/vmisc/vcommonsettings.h
+++ b/src/libs/vmisc/vcommonsettings.h
@@ -1,4 +1,4 @@
-/************************************************************************
+/************************************************************************
  **
  **  @file   vcommonsettings.h
  **  @author Roman Telezhynskyi <dismine(at)gmail.com>
@@ -80,6 +80,10 @@ public:
     QString GetPathLabelTemplate() const;
     void SetPathLabelTemplate(const QString &value);
 
+    static QString GetDefPathManualLayouts();
+    QString GetPathManualLayouts() const;
+    void SetPathManualLayouts(const QString &value);
+
     bool GetOsSeparator() const;
     void SetOsSeparator(const bool &value);
 
@@ -231,15 +235,62 @@ public:
     qreal WidthHairLine() const;
 
     // settings for the tiled PDFs
-   auto GetTiledPDFMargins(const Unit &unit) const -> QMarginsF;
-   void SetTiledPDFMargins(const QMarginsF &value, const Unit &unit);
+    auto GetTiledPDFMargins(const Unit &unit) const -> QMarginsF;
+    void SetTiledPDFMargins(const QMarginsF &value, const Unit &unit);
 
-   auto GetTiledPDFOrientation() const -> PageOrientation;
-   void SetTiledPDFOrientation(PageOrientation value);
+    auto GetTiledPDFOrientation() const -> PageOrientation;
+    void SetTiledPDFOrientation(PageOrientation value);
+
+    static const int defaultScrollingDuration;
+    static const int scrollingDurationMin;
+    static const int scrollingDurationMax;
+    int GetScrollingDuration() const;
+    void SetScrollingDuration(int duration);
+
+    static const int defaultScrollingUpdateInterval;
+    static const int scrollingUpdateIntervalMin;
+    static const int scrollingUpdateIntervalMax;
+    int GetScrollingUpdateInterval() const;
+    void SetScrollingUpdateInterval(int updateInterval);
+
+    static const qreal defaultSensorMouseScale;
+    static const qreal sensorMouseScaleMin;
+    static const qreal sensorMouseScaleMax;
+    qreal GetSensorMouseScale() const;
+    void SetSensorMouseScale(qreal scale);
+
+    static const qreal defaultWheelMouseScale;
+    static const qreal wheelMouseScaleMin;
+    static const qreal wheelMouseScaleMax;
+    qreal GetWheelMouseScale() const;
+    void SetWheelMouseScale(qreal scale);
+
+    static const qreal defaultScrollingAcceleration;
+    static const qreal scrollingAccelerationMin;
+    static const qreal scrollingAccelerationMax;
+    qreal GetScrollingAcceleration() const;
+    void SetScrollingAcceleration(qreal acceleration);
+
+    bool IsOpenGLRender() const;
+    void SetOpenGLRender(bool value);
+
+    bool GetGraphicalOutput() const;
+    void SetGraphicalOutput(const bool &value);
+
+    auto GetWatermarkEditorSize() const -> QSize;
+    void SetWatermarkEditorSize(const QSize& sz);
+
+    auto GetWatermarkCustomColors() const -> QVector<QColor>;
+    void SetWatermarkCustomColors(QVector<QColor> colors);
 
 protected:
-   template <class T>
-   T ValueOrDef(const QString &setting, const T &defValue) const;
+
+    template <typename T>
+    static T GetCachedValue(const QSettings &settings, T &cache, const QString &setting, T defValue, T valueMin,
+                            T valueMax);
+
+    template <class T>
+    static T ValueOrDef(const QSettings &settings, const QString &setting, const T &defValue);
 
 private:
     Q_DISABLE_COPY(VCommonSettings)
@@ -264,18 +315,32 @@ inline qreal VCommonSettings::MaximalLineWidth()
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-template <class T>
-inline T VCommonSettings::ValueOrDef(const QString &setting, const T &defValue) const
+template<typename T>
+T VCommonSettings::GetCachedValue(const QSettings &settings, T &cache, const QString &setting, T defValue, T valueMin,
+                                  T valueMax)
 {
-    const QVariant val = value(setting, QVariant::fromValue(defValue));
+    if (cache < 0)
+    {
+        cache = qBound(valueMin, ValueOrDef(settings, setting, defValue), valueMax);
+    }
+
+    return cache;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+template <class T>
+inline T VCommonSettings::ValueOrDef(const QSettings &settings, const QString &setting, const T &defValue)
+{
+    const QVariant val = settings.value(setting, QVariant::fromValue(defValue));
     return val.canConvert<T>() ? val.value<T>() : defValue;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
 template <>
-inline Cases VCommonSettings::ValueOrDef<Cases>(const QString &setting, const Cases &defValue) const
+inline Cases VCommonSettings::ValueOrDef<Cases>(const QSettings &settings, const QString &setting,
+                                                const Cases &defValue)
 {
-    const QVariant val = value(setting, QVariant::fromValue(static_cast<int>(defValue)));
+    const QVariant val = settings.value(setting, QVariant::fromValue(static_cast<int>(defValue)));
     const int g = val.canConvert<int>() ? val.value<int>() : static_cast<int>(defValue);
     if (g < static_cast<int>(Cases::CaseThreeGroup) || g >= static_cast<int>(Cases::UnknownCase))
     {
diff --git a/src/libs/vmisc/vdatastreamenum.h b/src/libs/vmisc/vdatastreamenum.h
index fde42eca4..2df8ccb54 100644
--- a/src/libs/vmisc/vdatastreamenum.h
+++ b/src/libs/vmisc/vdatastreamenum.h
@@ -34,26 +34,22 @@
 
 // (de)serialize enums into QDataStream
 
+// It is very important to use exactly the same way across all Qt versions we need to support. Otherwise, it will break
+// interchange between Valentina versions built on different Qt versions.
+
 #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
-//a function that can serialize any enum into QDataStream
-//it stores the enum in a qint64
-template<typename Enum,
-         typename = typename std::enable_if<std::is_enum<Enum>::value>::type>
-inline QDataStream& operator<<(QDataStream& stream, const Enum& e)
+template <typename T>
+typename std::enable_if<std::is_enum<T>::value, QDataStream &>::type&
+operator<<(QDataStream &s, const T &t)
 {
-    return stream << static_cast<qint64>(e);
+    return s << static_cast<typename std::underlying_type<T>::type>(t);
 }
 
-//a function that can deserialize any enum from QDataStream
-//it reads the enum as if it was stored in qint64
-template<typename Enum,
-         typename = typename std::enable_if<std::is_enum<Enum>::value>::type>
-inline QDataStream& operator>>(QDataStream& stream, Enum& e)
+template <typename T>
+typename std::enable_if<std::is_enum<T>::value, QDataStream &>::type&
+operator>>(QDataStream &s, T &t)
 {
-    qint64 v;
-    stream >> v;
-    e = static_cast<Enum>(v);
-    return stream;
+    return s >> reinterpret_cast<typename std::underlying_type<T>::type &>(t);
 }
 #endif
 
diff --git a/src/libs/vmisc/vmisc.pri b/src/libs/vmisc/vmisc.pri
index 0381a3d48..528738ef4 100644
--- a/src/libs/vmisc/vmisc.pri
+++ b/src/libs/vmisc/vmisc.pri
@@ -4,11 +4,10 @@
 SOURCES += \
     $$PWD/def.cpp \
     $$PWD/vabstractvalapplication.cpp \
-    $$PWD/vsettings.cpp \
     $$PWD/vabstractapplication.cpp \
     $$PWD/projectversion.cpp \
     $$PWD/vcommonsettings.cpp \
-    $$PWD/vtapesettings.cpp \
+    $$PWD/vvalentinasettings.cpp \
     $$PWD/commandoptions.cpp \
     $$PWD/qxtcsvmodel.cpp \
     $$PWD/vtablesearch.cpp \
@@ -30,11 +29,10 @@ HEADERS += \
     $$PWD/def.h \
     $$PWD/vabstractvalapplication.h \
     $$PWD/vmath.h \
-    $$PWD/vsettings.h \
     $$PWD/vabstractapplication.h \
     $$PWD/projectversion.h \
     $$PWD/vcommonsettings.h \
-    $$PWD/vtapesettings.h \
+    $$PWD/vvalentinasettings.h \
     $$PWD/debugbreak.h \
     $$PWD/vlockguard.h \
     $$PWD/vsysexits.h \
diff --git a/src/libs/vmisc/vsettings.cpp b/src/libs/vmisc/vvalentinasettings.cpp
similarity index 64%
rename from src/libs/vmisc/vsettings.cpp
rename to src/libs/vmisc/vvalentinasettings.cpp
index 8b00db74c..6aa8baa18 100644
--- a/src/libs/vmisc/vsettings.cpp
+++ b/src/libs/vmisc/vvalentinasettings.cpp
@@ -26,7 +26,7 @@
  **
  *************************************************************************/
 
-#include "vsettings.h"
+#include "vvalentinasettings.h"
 
 #include <QDir>
 #include <QLocale>
@@ -47,26 +47,6 @@
 
 Q_DECLARE_METATYPE(QMarginsF)
 
-const int VSettings::defaultScrollingDuration = 300;
-const int VSettings::scrollingDurationMin = 100;
-const int VSettings::scrollingDurationMax = 1000;
-
-const int VSettings::defaultScrollingUpdateInterval = 30;
-const int VSettings::scrollingUpdateIntervalMin = 10;
-const int VSettings::scrollingUpdateIntervalMax = 100;
-
-const qreal VSettings::defaultSensorMouseScale = 2.0;
-const qreal VSettings::sensorMouseScaleMin = 1.0;
-const qreal VSettings::sensorMouseScaleMax = 10.0;
-
-const qreal VSettings::defaultWheelMouseScale = 45.0;
-const qreal VSettings::wheelMouseScaleMin = 1.0;
-const qreal VSettings::wheelMouseScaleMax = 100.0;
-
-const qreal VSettings::defaultScrollingAcceleration = 1.3;
-const qreal VSettings::scrollingAccelerationMin = 1.0;
-const qreal VSettings::scrollingAccelerationMax = 10.0;
-
 namespace
 {
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingConfigurationLabelLanguage,
@@ -78,8 +58,6 @@ Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingToolPanelScaling,
 
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingPathsLayout, (QLatin1String("paths/layout")))
 
-Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingPatternGraphicalOutput, (QLatin1String("pattern/graphicalOutput")))
-Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingPatternUseOpenGLRender, (QLatin1String("pattern/useOpenGLRender")))
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingPatternKnownMaterials, (QLatin1String("pattern/knownMaterials")))
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingPatternRememberMaterials, (QLatin1String("pattern/rememberMaterials")))
 
@@ -109,32 +87,16 @@ Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingDetailExportFormat, (QLatin1Stri
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingTiledPDFPaperHeight, (QLatin1String("tiledPDF/paperHeight")))
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingTiledPDFPaperWidth, (QLatin1String("tiledPDF/paperWidth")))
 
-Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingScrollingDuration, (QLatin1String("scrolling/duration")))
-Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingScrollingUpdateInterval, (QLatin1String("scrolling/updateInterval")))
-Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingScrollingSensorMouseScale,
-                          (QLatin1String("scrolling/sensorMouseScale")))
-Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingScrollingWheelMouseScale, (QLatin1String("scrolling/wheelMouseScale")))
-Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingScrollingAcceleration, (QLatin1String("scrolling/acceleration")))
-
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingdockWidgetGroupsActive, (QLatin1String("dockWidget/groupsActive")))
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingDockWidgetToolOptionsActive,
                           (QLatin1String("dockWidget/toolOptionsActive")))
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingDockWidgetPatternMessagesActive,
                           (QLatin1String("dockWidget/patternMessagesActive")))
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingPatternMessagesFontSize, (QLatin1String("font/patternMessagesSize")))
-
-Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingWatermarkEditorSize, (QLatin1String("watermarkEditorSize")))
-
-// Reading settings file is very expensive, cache values to speed up getting a value
-int scrollingDurationCached = -1;
-int scrollingUpdateIntervalCached = -1;
-qreal scrollingSensorMouseScaleCached = -1;
-qreal scrollingWheelMouseScaleCached = -1;
-qreal scrollingAccelerationCached = -1;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-VSettings::VSettings(Format format, Scope scope, const QString &organization, const QString &application,
+VValentinaSettings::VValentinaSettings(Format format, Scope scope, const QString &organization, const QString &application,
                      QObject *parent)
     :VCommonSettings(format, scope, organization, application, parent)
 {
@@ -142,39 +104,39 @@ VSettings::VSettings(Format format, Scope scope, const QString &organization, co
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-VSettings::VSettings(const QString &fileName, QSettings::Format format, QObject *parent)
+VValentinaSettings::VValentinaSettings(const QString &fileName, QSettings::Format format, QObject *parent)
     :VCommonSettings(fileName, format, parent)
 {
     qRegisterMetaTypeStreamOperators<QMarginsF>("QMarginsF");
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-QString VSettings::GetLabelLanguage() const
+QString VValentinaSettings::GetLabelLanguage() const
 {
     return value(*settingConfigurationLabelLanguage, QLocale().bcp47Name()).toString();
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetLabelLanguage(const QString &value)
+void VValentinaSettings::SetLabelLanguage(const QString &value)
 {
     setValue(*settingConfigurationLabelLanguage, value);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-QString VSettings::GetDefPathLayout()
+QString VValentinaSettings::GetDefPathLayout()
 {
     return QDir::homePath() + QStringLiteral("/valentina/") + tr("layouts");
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-QString VSettings::GetPathLayout() const
+QString VValentinaSettings::GetPathLayout() const
 {
     QSettings settings(this->format(), this->scope(), this->organizationName(), this->applicationName());
     return settings.value(*settingPathsLayout, GetDefPathLayout()).toString();
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetPathLayout(const QString &value)
+void VValentinaSettings::SetPathLayout(const QString &value)
 {
     QSettings settings(this->format(), this->scope(), this->organizationName(), this->applicationName());
     settings.setValue(*settingPathsLayout, value);
@@ -182,358 +144,334 @@ void VSettings::SetPathLayout(const QString &value)
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool VSettings::GetGraphicalOutput() const
+qreal VValentinaSettings::GetLayoutPaperHeight() const
 {
-    return value(*settingPatternGraphicalOutput, 1).toBool();
+    return ValueOrDef<qreal>(*this, *settingLayoutPaperHeight, UnitConvertor(1189/*A0*/, Unit::Mm, Unit::Px));
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetGraphicalOutput(const bool &value)
-{
-    setValue(*settingPatternGraphicalOutput, value);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-bool VSettings::IsOpenGLRender() const
-{
-    return value(*settingPatternUseOpenGLRender, 0).toBool();
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetOpenGLRender(bool value)
-{
-    setValue(*settingPatternUseOpenGLRender, value);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-qreal VSettings::GetLayoutPaperHeight() const
-{
-    return ValueOrDef<qreal>(*settingLayoutPaperHeight, UnitConvertor(1189/*A0*/, Unit::Mm, Unit::Px));
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetLayoutPaperHeight(qreal value)
+void VValentinaSettings::SetLayoutPaperHeight(qreal value)
 {
     setValue(*settingLayoutPaperHeight, value);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-qreal VSettings::GetLayoutPaperWidth() const
+qreal VValentinaSettings::GetLayoutPaperWidth() const
 {
-    return ValueOrDef<qreal>(*settingLayoutPaperWidth, UnitConvertor(841/*A0*/, Unit::Mm, Unit::Px));
+    return ValueOrDef<qreal>(*this, *settingLayoutPaperWidth, UnitConvertor(841/*A0*/, Unit::Mm, Unit::Px));
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetLayoutPaperWidth(qreal value)
+void VValentinaSettings::SetLayoutPaperWidth(qreal value)
 {
     setValue(*settingLayoutPaperWidth, value);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-qreal VSettings::GetLayoutWidth() const
+qreal VValentinaSettings::GetLayoutWidth() const
 {
-    return ValueOrDef<qreal>(*settingLayoutWidth, GetDefLayoutWidth());
+    return ValueOrDef<qreal>(*this, *settingLayoutWidth, GetDefLayoutWidth());
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-qreal VSettings::GetDefLayoutWidth()
+qreal VValentinaSettings::GetDefLayoutWidth()
 {
     return UnitConvertor(2.5, Unit::Mm, Unit::Px);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetLayoutWidth(qreal value)
+void VValentinaSettings::SetLayoutWidth(qreal value)
 {
     setValue(*settingLayoutWidth, value);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-int VSettings::GetNestingTime() const
+int VValentinaSettings::GetNestingTime() const
 {
-    return ValueOrDef<int>(*settingNestingTime, GetDefNestingTime());
+    return ValueOrDef<int>(*this, *settingNestingTime, GetDefNestingTime());
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetNestingTime(int value)
+void VValentinaSettings::SetNestingTime(int value)
 {
     setValue(*settingNestingTime, value);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-qreal VSettings::GetEfficiencyCoefficient() const
+qreal VValentinaSettings::GetEfficiencyCoefficient() const
 {
-    return ValueOrDef<qreal>(*settingEfficiencyCoefficient, GetDefEfficiencyCoefficient());
+    return ValueOrDef<qreal>(*this, *settingEfficiencyCoefficient, GetDefEfficiencyCoefficient());
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetEfficiencyCoefficient(qreal value)
+void VValentinaSettings::SetEfficiencyCoefficient(qreal value)
 {
     setValue(*settingEfficiencyCoefficient, value);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-QMarginsF VSettings::GetFields(const QMarginsF &def) const
+QMarginsF VValentinaSettings::GetFields(const QMarginsF &def) const
 {
-    return ValueOrDef<QMarginsF>(*settingFields, def);
+    return ValueOrDef<QMarginsF>(*this, *settingFields, def);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetFields(const QMarginsF &value)
+void VValentinaSettings::SetFields(const QMarginsF &value)
 {
     setValue(*settingFields, QVariant::fromValue(value));
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-Cases VSettings::GetLayoutGroup() const
+Cases VValentinaSettings::GetLayoutGroup() const
 {
-    return ValueOrDef<Cases>(*settingLayoutSorting, GetDefLayoutGroup());
+    return ValueOrDef<Cases>(*this, *settingLayoutSorting, GetDefLayoutGroup());
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-Cases VSettings::GetDefLayoutGroup()
+Cases VValentinaSettings::GetDefLayoutGroup()
 {
     return Cases::CaseDesc;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetLayoutGroup(const Cases &value)
+void VValentinaSettings::SetLayoutGroup(const Cases &value)
 {
     setValue(*settingLayoutSorting, static_cast<int>(value));
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool VSettings::GetLayoutFollowGrainline() const
+bool VValentinaSettings::GetLayoutFollowGrainline() const
 {
     return value(*settingLayoutFollowGrainline, GetDefLayoutFollowGrainline()).toBool();
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool VSettings::GetDefLayoutFollowGrainline()
+bool VValentinaSettings::GetDefLayoutFollowGrainline()
 {
     return false;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetLayoutFollowGrainline(bool value)
+void VValentinaSettings::SetLayoutFollowGrainline(bool value)
 {
     setValue(*settingLayoutFollowGrainline, value);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool VSettings::GetLayoutManualPriority() const
+bool VValentinaSettings::GetLayoutManualPriority() const
 {
     return value(*settingLayoutManualPriority, GetDefLayoutManualPriority()).toBool();
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool VSettings::GetDefLayoutManualPriority()
+bool VValentinaSettings::GetDefLayoutManualPriority()
 {
     return false;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetLayoutManualPriority(bool value)
+void VValentinaSettings::SetLayoutManualPriority(bool value)
 {
     setValue(*settingLayoutManualPriority, value);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool VSettings::GetLayoutNestQuantity() const
+bool VValentinaSettings::GetLayoutNestQuantity() const
 {
     return value(*settingLayoutNestQuantity, GetDefLayoutNestQuantity()).toBool();
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool VSettings::GetDefLayoutNestQuantity()
+bool VValentinaSettings::GetDefLayoutNestQuantity()
 {
     return false;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetLayoutNestQuantity(bool value)
+void VValentinaSettings::SetLayoutNestQuantity(bool value)
 {
     setValue(*settingLayoutNestQuantity, value);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool VSettings::GetLayoutAutoCropLength() const
+bool VValentinaSettings::GetLayoutAutoCropLength() const
 {
     return value(*settingLayoutAutoCropLength, GetDefLayoutAutoCropLength()).toBool();
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool VSettings::GetDefLayoutAutoCropLength()
+bool VValentinaSettings::GetDefLayoutAutoCropLength()
 {
     return false;
 }
 //---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetLayoutAutoCropLength(bool value)
+void VValentinaSettings::SetLayoutAutoCropLength(bool value)
 {
     setValue(*settingLayoutAutoCropLength, value);
 }
 //---------------------------------------------------------------------------------------------------------------------
-bool VSettings::GetLayoutAutoCropWidth() const
+bool VValentinaSettings::GetLayoutAutoCropWidth() const
 {
     return value(*settingLayoutAutoCropWidth, GetDefLayoutAutoCropWidth()).toBool();
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool VSettings::GetDefLayoutAutoCropWidth()
+bool VValentinaSettings::GetDefLayoutAutoCropWidth()
 {
     return false;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetLayoutAutoCropWidth(bool value)
+void VValentinaSettings::SetLayoutAutoCropWidth(bool value)
 {
     setValue(*settingLayoutAutoCropWidth, value);
 }
 //---------------------------------------------------------------------------------------------------------------------
-bool VSettings::GetLayoutSaveLength() const
+bool VValentinaSettings::GetLayoutSaveLength() const
 {
     return value(*settingLayoutSaveLength, GetDefLayoutSaveLength()).toBool();
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool VSettings::GetDefLayoutSaveLength()
+bool VValentinaSettings::GetDefLayoutSaveLength()
 {
     return false;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetLayoutSaveLength(bool value)
+void VValentinaSettings::SetLayoutSaveLength(bool value)
 {
     setValue(*settingLayoutSaveLength, value);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool VSettings::GetLayoutPreferOneSheetSolution() const
+bool VValentinaSettings::GetLayoutPreferOneSheetSolution() const
 {
     return value(*settingLayoutPreferOneSheetSolution, GetDefLayoutPreferOneSheetSolution()).toBool();
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool VSettings::GetDefLayoutPreferOneSheetSolution()
+bool VValentinaSettings::GetDefLayoutPreferOneSheetSolution()
 {
     return false;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetLayoutPreferOneSheetSolution(bool value)
+void VValentinaSettings::SetLayoutPreferOneSheetSolution(bool value)
 {
     setValue(*settingLayoutPreferOneSheetSolution, value);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool VSettings::GetLayoutUnitePages() const
+bool VValentinaSettings::GetLayoutUnitePages() const
 {
     return value(*settingLayoutUnitePages, GetDefLayoutUnitePages()).toBool();
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool VSettings::GetDefLayoutUnitePages()
+bool VValentinaSettings::GetDefLayoutUnitePages()
 {
     return false;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetLayoutUnitePages(bool value)
+void VValentinaSettings::SetLayoutUnitePages(bool value)
 {
     setValue(*settingLayoutUnitePages, value);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool VSettings::GetIgnoreAllFields() const
+bool VValentinaSettings::GetIgnoreAllFields() const
 {
     return value(*settingIgnoreFields, GetDefIgnoreAllFields()).toBool();
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool VSettings::GetDefIgnoreAllFields()
+bool VValentinaSettings::GetDefIgnoreAllFields()
 {
     return false;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetIgnoreAllFields(bool value)
+void VValentinaSettings::SetIgnoreAllFields(bool value)
 {
     setValue(*settingIgnoreFields, value);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool VSettings::GetStripOptimization() const
+bool VValentinaSettings::GetStripOptimization() const
 {
     return value(*settingStripOptimization, GetDefStripOptimization()).toBool();
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool VSettings::GetDefStripOptimization()
+bool VValentinaSettings::GetDefStripOptimization()
 {
     return false;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetStripOptimization(bool value)
+void VValentinaSettings::SetStripOptimization(bool value)
 {
     setValue(*settingStripOptimization, value);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-quint8 VSettings::GetMultiplier() const
+quint8 VValentinaSettings::GetMultiplier() const
 {
     return static_cast<quint8>(value(*settingMultiplier, GetDefMultiplier()).toUInt());
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-quint8 VSettings::GetDefMultiplier()
+quint8 VValentinaSettings::GetDefMultiplier()
 {
     return 1;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetMultiplier(quint8 value)
+void VValentinaSettings::SetMultiplier(quint8 value)
 {
     setValue(*settingMultiplier, value);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool VSettings::GetTextAsPaths() const
+bool VValentinaSettings::GetTextAsPaths() const
 {
     return value(*settingTextAsPaths, GetDefTextAsPaths()).toBool();
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool VSettings::GetDefTextAsPaths()
+bool VValentinaSettings::GetDefTextAsPaths()
 {
     return false;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetTextAsPaths(bool value)
+void VValentinaSettings::SetTextAsPaths(bool value)
 {
     setValue(*settingTextAsPaths, value);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-QStringList VSettings::GetKnownMaterials() const
+QStringList VValentinaSettings::GetKnownMaterials() const
 {
     return value(*settingPatternKnownMaterials, QStringList()).toStringList();
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetKnownMaterials(const QStringList &list)
+void VValentinaSettings::SetKnownMaterials(const QStringList &list)
 {
     setValue(*settingPatternKnownMaterials, list);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool VSettings::IsRememberPatternMaterials() const
+bool VValentinaSettings::IsRememberPatternMaterials() const
 {
     return value(*settingPatternRememberMaterials, true).toBool();
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetRememberPatternMaterials(bool value)
+void VValentinaSettings::SetRememberPatternMaterials(bool value)
 {
     setValue(*settingPatternRememberMaterials, value);
 }
@@ -546,9 +484,9 @@ void VSettings::SetRememberPatternMaterials(bool value)
  * internaly as mm so there is conversion beeing made.
  * @return tiled pdf paper height
  */
-qreal VSettings::GetTiledPDFPaperHeight(const Unit &unit) const
+qreal VValentinaSettings::GetTiledPDFPaperHeight(const Unit &unit) const
 {
-    return UnitConvertor(ValueOrDef<qreal>(*settingTiledPDFPaperHeight, 297 /*A4*/), Unit::Mm, unit);
+    return UnitConvertor(ValueOrDef<qreal>(*this, *settingTiledPDFPaperHeight, 297 /*A4*/), Unit::Mm, unit);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -557,7 +495,7 @@ qreal VSettings::GetTiledPDFPaperHeight(const Unit &unit) const
  * @param value in mm
  * @param unit unit of the given value
  */
-void VSettings::SetTiledPDFPaperHeight(qreal value, const Unit &unit)
+void VValentinaSettings::SetTiledPDFPaperHeight(qreal value, const Unit &unit)
 {
     setValue(*settingTiledPDFPaperHeight, UnitConvertor(value, unit, Unit::Mm));
 }
@@ -569,9 +507,9 @@ void VSettings::SetTiledPDFPaperHeight(qreal value, const Unit &unit)
  * internaly as mm so there is conversion beeing made.
  * @return tiled pdf paper width
  */
-qreal VSettings::GetTiledPDFPaperWidth(const Unit &unit) const
+qreal VValentinaSettings::GetTiledPDFPaperWidth(const Unit &unit) const
 {
-    return UnitConvertor(ValueOrDef<qreal>(*settingTiledPDFPaperWidth, 210 /*A4*/), Unit::Mm, unit);
+    return UnitConvertor(ValueOrDef<qreal>(*this, *settingTiledPDFPaperWidth, 210 /*A4*/), Unit::Mm, unit);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -580,137 +518,68 @@ qreal VSettings::GetTiledPDFPaperWidth(const Unit &unit) const
  * @param unit unit of the given value
  * @param value in mm
  */
-void VSettings::SetTiledPDFPaperWidth(qreal value, const Unit &unit)
+void VValentinaSettings::SetTiledPDFPaperWidth(qreal value, const Unit &unit)
 {
     setValue(*settingTiledPDFPaperWidth, UnitConvertor(value,unit, Unit::Mm));
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-int VSettings::GetScrollingDuration() const
-{
-    return GetCachedValue(scrollingDurationCached, *settingScrollingDuration, defaultScrollingDuration,
-                          scrollingDurationMin, scrollingDurationMax);
-}
 
 //---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetScrollingDuration(int duration)
-{
-    scrollingDurationCached = qBound(scrollingDurationMin, duration, scrollingDurationMax);
-    setValue(*settingScrollingDuration, scrollingDurationCached);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-int VSettings::GetScrollingUpdateInterval() const
-{
-    return GetCachedValue(scrollingUpdateIntervalCached, *settingScrollingUpdateInterval,
-                          defaultScrollingUpdateInterval, scrollingUpdateIntervalMin, scrollingUpdateIntervalMax);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetScrollingUpdateInterval(int updateInterval)
-{
-    scrollingUpdateIntervalCached = qBound(scrollingUpdateIntervalMin, updateInterval, scrollingUpdateIntervalMax);
-    setValue(*settingScrollingUpdateInterval, scrollingUpdateIntervalCached);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-qreal VSettings::GetSensorMouseScale() const
-{
-    return GetCachedValue(scrollingSensorMouseScaleCached, *settingScrollingSensorMouseScale, defaultSensorMouseScale,
-                          sensorMouseScaleMin, sensorMouseScaleMax);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetSensorMouseScale(qreal scale)
-{
-    scrollingSensorMouseScaleCached = qBound(sensorMouseScaleMin, scale, sensorMouseScaleMax);
-    setValue(*settingScrollingSensorMouseScale, scrollingSensorMouseScaleCached);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-qreal VSettings::GetWheelMouseScale() const
-{
-    return GetCachedValue(scrollingWheelMouseScaleCached, *settingScrollingWheelMouseScale, defaultWheelMouseScale,
-                          wheelMouseScaleMin, wheelMouseScaleMax);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetWheelMouseScale(qreal scale)
-{
-    scrollingWheelMouseScaleCached = qBound(wheelMouseScaleMin, scale, wheelMouseScaleMax);
-    setValue(*settingScrollingWheelMouseScale, scrollingWheelMouseScaleCached);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-qreal VSettings::GetScrollingAcceleration() const
-{
-    return GetCachedValue(scrollingAccelerationCached, *settingScrollingAcceleration, defaultScrollingAcceleration,
-                          scrollingAccelerationMin, scrollingAccelerationMax);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetScrollingAcceleration(qreal acceleration)
-{
-    scrollingAccelerationCached = qBound(scrollingAccelerationMin, acceleration, scrollingAccelerationMax);
-    setValue(*settingScrollingAcceleration, scrollingAccelerationCached);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-bool VSettings::IsDockWidgetGroupsActive() const
+bool VValentinaSettings::IsDockWidgetGroupsActive() const
 {
     return value(*settingdockWidgetGroupsActive, GetDefDockWidgetGroupsActive()).toBool();
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool VSettings::GetDefDockWidgetGroupsActive()
+bool VValentinaSettings::GetDefDockWidgetGroupsActive()
 {
     return true;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetDockWidgetGroupsActive(bool value)
+void VValentinaSettings::SetDockWidgetGroupsActive(bool value)
 {
     setValue(*settingdockWidgetGroupsActive, value);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool VSettings::IsDockWidgetToolOptionsActive() const
+bool VValentinaSettings::IsDockWidgetToolOptionsActive() const
 {
     return value(*settingDockWidgetToolOptionsActive, GetDefDockWidgetToolOptionsActive()).toBool();
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool VSettings::GetDefDockWidgetToolOptionsActive()
+bool VValentinaSettings::GetDefDockWidgetToolOptionsActive()
 {
     return true;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetDockWidgetToolOptionsActive(bool value)
+void VValentinaSettings::SetDockWidgetToolOptionsActive(bool value)
 {
     setValue(*settingDockWidgetToolOptionsActive, value);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool VSettings::IsDockWidgetPatternMessagesActive() const
+bool VValentinaSettings::IsDockWidgetPatternMessagesActive() const
 {
     return value(*settingDockWidgetPatternMessagesActive, GetDefDockWidgetPatternMessagesActive()).toBool();
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool VSettings::GetDefDockWidgetPatternMessagesActive()
+bool VValentinaSettings::GetDefDockWidgetPatternMessagesActive()
 {
     return true;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetDockWidgetPatternMessagesActive(bool value)
+void VValentinaSettings::SetDockWidgetPatternMessagesActive(bool value)
 {
     setValue(*settingDockWidgetPatternMessagesActive, value);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-int VSettings::GetPatternMessageFontSize(int fontSizeDef) const
+int VValentinaSettings::GetPatternMessageFontSize(int fontSizeDef) const
 {
     fontSizeDef = qBound(GetDefMinPatternMessageFontSize(), fontSizeDef, GetDefMaxPatternMessageFontSize());
     const int fontSize = value(*settingPatternMessagesFontSize, fontSizeDef).toInt();
@@ -718,87 +587,75 @@ int VSettings::GetPatternMessageFontSize(int fontSizeDef) const
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-int VSettings::GetDefMinPatternMessageFontSize()
+int VValentinaSettings::GetDefMinPatternMessageFontSize()
 {
     return 5;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-int VSettings::GetDefMaxPatternMessageFontSize()
+int VValentinaSettings::GetDefMaxPatternMessageFontSize()
 {
     return 40;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetPatternMessageFontSize(int size)
+void VValentinaSettings::SetPatternMessageFontSize(int size)
 {
     setValue(*settingPatternMessagesFontSize, qBound(GetDefMinPatternMessageFontSize(), size,
                                                      GetDefMaxPatternMessageFontSize()));
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool VSettings::GetAutoRefreshPatternMessage() const
+bool VValentinaSettings::GetAutoRefreshPatternMessage() const
 {
     return value(*settingAutoRefreshPatternMessage, true).toBool();
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetAutoRefreshPatternMessage(bool value)
+void VValentinaSettings::SetAutoRefreshPatternMessage(bool value)
 {
     setValue(*settingAutoRefreshPatternMessage, value);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-QSize VSettings::GetWatermarkEditorSize() const
-{
-    return value(*settingWatermarkEditorSize, QSize(0, 0)).toSize();
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetWatermarkEditorSize(const QSize &sz)
-{
-    setValue(*settingWatermarkEditorSize, sz);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-bool VSettings::GetToolPanelScaling() const
+bool VValentinaSettings::GetToolPanelScaling() const
 {
     return value(*settingToolPanelScaling, false).toBool();
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetToolPanelScaling(const bool &value)
+void VValentinaSettings::SetToolPanelScaling(const bool &value)
 {
     setValue(*settingToolPanelScaling, value);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-auto VSettings::GetLayoutExportFormat() const -> qint8
+auto VValentinaSettings::GetLayoutExportFormat() const -> qint8
 {
     return qvariant_cast<qint8>(value(*settingLayoutExportFormat, 0));
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetLayoutExportFormat(qint8 format)
+void VValentinaSettings::SetLayoutExportFormat(qint8 format)
 {
     setValue(*settingLayoutExportFormat, format);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-qint8 VSettings::GetDetailExportFormat() const
+qint8 VValentinaSettings::GetDetailExportFormat() const
 {
     return qvariant_cast<qint8>(value(*settingDetailExportFormat, 0));
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VSettings::SetDetailExportFormat(qint8 format)
+void VValentinaSettings::SetDetailExportFormat(qint8 format)
 {
     setValue(*settingDetailExportFormat, format);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
 template<typename T>
-T VSettings::GetCachedValue(T &cache, const QString &setting, T defValue, T valueMin, T valueMax) const
+T VValentinaSettings::GetCachedValue(T &cache, const QString &setting, T defValue, T valueMin, T valueMax) const
 {
     if (cache < 0)
     {
diff --git a/src/libs/vmisc/vsettings.h b/src/libs/vmisc/vvalentinasettings.h
similarity index 76%
rename from src/libs/vmisc/vsettings.h
rename to src/libs/vmisc/vvalentinasettings.h
index 84052b2ec..1a79d33d7 100644
--- a/src/libs/vmisc/vsettings.h
+++ b/src/libs/vmisc/vvalentinasettings.h
@@ -1,6 +1,6 @@
 /************************************************************************
  **
- **  @file   vsettings.h
+ **  @file   vvalentinasettings.h
  **  @author Roman Telezhynskyi <dismine(at)gmail.com>
  **  @date   22 11, 2014
  **
@@ -26,8 +26,8 @@
  **
  *************************************************************************/
 
-#ifndef VSETTINGS_H
-#define VSETTINGS_H
+#ifndef VVALENTINASETTINGS_H
+#define VVALENTINASETTINGS_H
 
 #include <QMetaObject>
 #include <QObject>
@@ -39,13 +39,13 @@
 #include "vcommonsettings.h"
 #include "../vlayout/vbank.h"
 
-class VSettings : public VCommonSettings
+class VValentinaSettings : public VCommonSettings
 {
     Q_OBJECT
 public:
-    VSettings(Format format, Scope scope, const QString &organization, const QString &application = QString(),
+    VValentinaSettings(Format format, Scope scope, const QString &organization, const QString &application = QString(),
               QObject *parent = nullptr);
-    VSettings(const QString &fileName, Format format, QObject *parent = nullptr);
+    VValentinaSettings(const QString &fileName, Format format, QObject *parent = nullptr);
 
     QString GetLabelLanguage() const;
     void SetLabelLanguage(const QString &value);
@@ -54,12 +54,6 @@ public:
     QString GetPathLayout() const;
     void SetPathLayout(const QString &value);
 
-    bool GetGraphicalOutput() const;
-    void SetGraphicalOutput(const bool &value);
-
-    bool IsOpenGLRender() const;
-    void SetOpenGLRender(bool value);
-
     // Layout settings
     qreal GetLayoutPaperHeight() const;
     void SetLayoutPaperHeight(qreal value);
@@ -147,36 +141,6 @@ public:
     qreal GetTiledPDFPaperWidth(const Unit &unit) const;
     void  SetTiledPDFPaperWidth(qreal value, const Unit &unit);
 
-    static const int defaultScrollingDuration;
-    static const int scrollingDurationMin;
-    static const int scrollingDurationMax;
-    int GetScrollingDuration() const;
-    void SetScrollingDuration(int duration);
-
-    static const int defaultScrollingUpdateInterval;
-    static const int scrollingUpdateIntervalMin;
-    static const int scrollingUpdateIntervalMax;
-    int GetScrollingUpdateInterval() const;
-    void SetScrollingUpdateInterval(int updateInterval);
-
-    static const qreal defaultSensorMouseScale;
-    static const qreal sensorMouseScaleMin;
-    static const qreal sensorMouseScaleMax;
-    qreal GetSensorMouseScale() const;
-    void SetSensorMouseScale(qreal scale);
-
-    static const qreal defaultWheelMouseScale;
-    static const qreal wheelMouseScaleMin;
-    static const qreal wheelMouseScaleMax;
-    qreal GetWheelMouseScale() const;
-    void SetWheelMouseScale(qreal scale);
-
-    static const qreal defaultScrollingAcceleration;
-    static const qreal scrollingAccelerationMin;
-    static const qreal scrollingAccelerationMax;
-    qreal GetScrollingAcceleration() const;
-    void SetScrollingAcceleration(qreal acceleration);
-
     bool IsDockWidgetGroupsActive() const;
     static bool GetDefDockWidgetGroupsActive();
     void SetDockWidgetGroupsActive(bool value);
@@ -197,9 +161,6 @@ public:
     bool GetAutoRefreshPatternMessage() const;
     void SetAutoRefreshPatternMessage(bool value);
 
-    QSize GetWatermarkEditorSize() const;
-    void SetWatermarkEditorSize(const QSize& sz);
-
     bool GetToolPanelScaling() const;
     void SetToolPanelScaling(const bool &value);
 
@@ -210,10 +171,10 @@ public:
     void SetDetailExportFormat(qint8 format);
 
 private:
-    Q_DISABLE_COPY(VSettings)
+    Q_DISABLE_COPY(VValentinaSettings)
 
     template <typename T>
     T GetCachedValue(T &cache, const QString &setting, T defValue, T valueMin, T valueMax) const;  
 };
 
-#endif // VSETTINGS_H
+#endif // VVALENTINASETTINGS_H
diff --git a/src/libs/vpatterndb/vpiece.cpp b/src/libs/vpatterndb/vpiece.cpp
index 8d1eba71a..daeabbf58 100644
--- a/src/libs/vpatterndb/vpiece.cpp
+++ b/src/libs/vpatterndb/vpiece.cpp
@@ -748,6 +748,18 @@ QVector<QPointF> VPiece::SeamAllowancePointsWithRotation(const VContainer *data,
     return Equidistant(pointsEkv, width, GetName());
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+void VPiece::SetGradationLabel(const QString &label)
+{
+    d->m_gradationLabel = label;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QString VPiece::GetGradationLabel() const
+{
+    return d->m_gradationLabel;
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 QVector<VPieceNode> VPiece::GetUnitedPath(const VContainer *data) const
 {
@@ -1187,7 +1199,7 @@ auto VPiece::GlobalPassmarkLength(const VContainer *data) const -> qreal
         QSharedPointer<VInternalVariable> var = data->GetVariable<VInternalVariable>(passmarkLengthVariable);
         length = *var->GetValue();
 
-        if (length <= accuracyPointOnLine)
+        if (VAbstractValApplication::VApp()->toPixel(length) <= accuracyPointOnLine)
         {
             const QString errorMsg = QObject::tr("Invalid global value for a passmark length. Piece '%1'. Length is "
                                                  "less than minimal allowed.")
diff --git a/src/libs/vpatterndb/vpiece.h b/src/libs/vpatterndb/vpiece.h
index 674baecb0..19e4232ea 100644
--- a/src/libs/vpatterndb/vpiece.h
+++ b/src/libs/vpatterndb/vpiece.h
@@ -134,6 +134,9 @@ public:
 
     QVector<QPointF> SeamAllowancePointsWithRotation(const VContainer *data, int makeFirst) const;
 
+    void SetGradationLabel(const QString &label);
+    auto GetGradationLabel() const -> QString;
+
     static void DumpPiece(const VPiece &piece, const VContainer *data);
 private:
     QSharedDataPointer<VPieceData> d;
diff --git a/src/libs/vpatterndb/vpiece_p.h b/src/libs/vpatterndb/vpiece_p.h
index 5a8ed79e4..1d33a7310 100644
--- a/src/libs/vpatterndb/vpiece_p.h
+++ b/src/libs/vpatterndb/vpiece_p.h
@@ -73,7 +73,8 @@ public:
           m_ppData(detail.m_ppData),
           m_piPatternInfo(detail.m_piPatternInfo),
           m_glGrainline(detail.m_glGrainline),
-          m_formulaWidth(detail.m_formulaWidth)
+          m_formulaWidth(detail.m_formulaWidth),
+          m_gradationLabel(detail.m_gradationLabel)
     {}
 
     ~VPieceData();
@@ -100,6 +101,8 @@ public:
 
     QString m_formulaWidth;
 
+    QString m_gradationLabel{};
+
 private:
     Q_DISABLE_ASSIGN(VPieceData)
 };
diff --git a/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.ui b/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.ui
index a05a66251..3fa41a309 100644
--- a/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.ui
+++ b/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.ui
@@ -7,14 +7,14 @@
     <x>0</x>
     <y>0</y>
     <width>423</width>
-    <height>436</height>
+    <height>437</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Flipping by axis</string>
   </property>
   <property name="windowIcon">
-   <iconset>
+   <iconset resource="../../../vmisc/share/resources/icon.qrc">
     <normaloff>:/icon/64x64/icon64x64.png</normaloff>:/icon/64x64/icon64x64.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -255,7 +255,9 @@
    <header>vlineedit.h</header>
   </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="../../../vmisc/share/resources/icon.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>buttonBox</sender>
diff --git a/src/libs/vtools/dialogs/tools/dialogflippingbyline.ui b/src/libs/vtools/dialogs/tools/dialogflippingbyline.ui
index 364a7fc58..14e250fdf 100644
--- a/src/libs/vtools/dialogs/tools/dialogflippingbyline.ui
+++ b/src/libs/vtools/dialogs/tools/dialogflippingbyline.ui
@@ -7,14 +7,14 @@
     <x>0</x>
     <y>0</y>
     <width>424</width>
-    <height>436</height>
+    <height>454</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Flipping by line</string>
   </property>
   <property name="windowIcon">
-   <iconset>
+   <iconset resource="../../../vmisc/share/resources/icon.qrc">
     <normaloff>:/icon/64x64/icon64x64.png</normaloff>:/icon/64x64/icon64x64.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -255,7 +255,9 @@
    <header>vlineedit.h</header>
   </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="../../../vmisc/share/resources/icon.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>buttonBox</sender>
diff --git a/src/libs/vtools/dialogs/tools/dialogmove.ui b/src/libs/vtools/dialogs/tools/dialogmove.ui
index 6bb6e25d0..1d04509a1 100644
--- a/src/libs/vtools/dialogs/tools/dialogmove.ui
+++ b/src/libs/vtools/dialogs/tools/dialogmove.ui
@@ -10,14 +10,14 @@
     <x>0</x>
     <y>0</y>
     <width>456</width>
-    <height>625</height>
+    <height>636</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Move</string>
   </property>
   <property name="windowIcon">
-   <iconset>
+   <iconset resource="../../../vmisc/share/resources/icon.qrc">
     <normaloff>:/icon/64x64/icon64x64.png</normaloff>:/icon/64x64/icon64x64.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -190,7 +190,7 @@
             <string notr="true">...</string>
            </property>
            <property name="icon">
-            <iconset>
+            <iconset resource="../../../vmisc/share/resources/icon.qrc">
              <normaloff>:/icon/24x24/fx.png</normaloff>:/icon/24x24/fx.png</iconset>
            </property>
            <property name="iconSize">
@@ -207,7 +207,7 @@
             <string/>
            </property>
            <property name="pixmap">
-            <pixmap>:/icon/24x24/equal.png</pixmap>
+            <pixmap resource="../../../vmisc/share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
            </property>
           </widget>
          </item>
@@ -370,7 +370,7 @@
             <string notr="true">...</string>
            </property>
            <property name="icon">
-            <iconset>
+            <iconset resource="../../../vmisc/share/resources/icon.qrc">
              <normaloff>:/icon/24x24/fx.png</normaloff>:/icon/24x24/fx.png</iconset>
            </property>
            <property name="iconSize">
@@ -387,7 +387,7 @@
             <string/>
            </property>
            <property name="pixmap">
-            <pixmap>:/icon/24x24/equal.png</pixmap>
+            <pixmap resource="../../../vmisc/share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
            </property>
           </widget>
          </item>
@@ -550,7 +550,7 @@
             <string notr="true">...</string>
            </property>
            <property name="icon">
-            <iconset>
+            <iconset resource="../../../vmisc/share/resources/icon.qrc">
              <normaloff>:/icon/24x24/fx.png</normaloff>:/icon/24x24/fx.png</iconset>
            </property>
            <property name="iconSize">
@@ -567,7 +567,7 @@
             <string/>
            </property>
            <property name="pixmap">
-            <pixmap>:/icon/24x24/equal.png</pixmap>
+            <pixmap resource="../../../vmisc/share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
            </property>
           </widget>
          </item>
@@ -802,7 +802,9 @@
    <header>vlineedit.h</header>
   </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="../../../vmisc/share/resources/icon.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>buttonBox</sender>
diff --git a/src/libs/vtools/dialogs/tools/dialogrotation.ui b/src/libs/vtools/dialogs/tools/dialogrotation.ui
index 296124517..6a6a9ffa4 100644
--- a/src/libs/vtools/dialogs/tools/dialogrotation.ui
+++ b/src/libs/vtools/dialogs/tools/dialogrotation.ui
@@ -7,14 +7,14 @@
     <x>0</x>
     <y>0</y>
     <width>408</width>
-    <height>461</height>
+    <height>467</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Rotation</string>
   </property>
   <property name="windowIcon">
-   <iconset>
+   <iconset resource="../../../vmisc/share/resources/icon.qrc">
     <normaloff>:/icon/64x64/icon64x64.png</normaloff>:/icon/64x64/icon64x64.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -183,7 +183,7 @@
             <string notr="true">...</string>
            </property>
            <property name="icon">
-            <iconset>
+            <iconset resource="../../../vmisc/share/resources/icon.qrc">
              <normaloff>:/icon/24x24/fx.png</normaloff>:/icon/24x24/fx.png</iconset>
            </property>
            <property name="iconSize">
@@ -200,7 +200,7 @@
             <string/>
            </property>
            <property name="pixmap">
-            <pixmap>:/icon/24x24/equal.png</pixmap>
+            <pixmap resource="../../../vmisc/share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
            </property>
           </widget>
          </item>
@@ -426,7 +426,9 @@
    <header>vlineedit.h</header>
   </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="../../../vmisc/share/resources/icon.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>buttonBox</sender>
diff --git a/src/libs/vtools/dialogs/tools/piece/dialogpatternmaterials.cpp b/src/libs/vtools/dialogs/tools/piece/dialogpatternmaterials.cpp
index b336abfa9..11257e68c 100644
--- a/src/libs/vtools/dialogs/tools/piece/dialogpatternmaterials.cpp
+++ b/src/libs/vtools/dialogs/tools/piece/dialogpatternmaterials.cpp
@@ -32,7 +32,7 @@
 #include "../vmisc/def.h"
 #include "../vmisc/vabstractvalapplication.h"
 #include "../vwidgets/vcomboboxdelegate.h"
-#include "../vmisc/vsettings.h"
+#include "../vmisc/vvalentinasettings.h"
 
 namespace
 {
diff --git a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp
index 034ca9071..b63ec21e7 100644
--- a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp
+++ b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp
@@ -52,11 +52,12 @@
 #include "../vmisc/vmodifierkey.h"
 #include "dialogpatternmaterials.h"
 #include "../vmisc/vabstractvalapplication.h"
-#include "../vmisc/vsettings.h"
+#include "../vmisc/vvalentinasettings.h"
 
 #include <QMenu>
 #include <QMessageBox>
 #include <QTimer>
+#include <QUuid>
 #include <QtNumeric>
 
 enum TabOrder {Paths=0, Pins=1, Labels=2, Grainline=3,  Passmarks=4, PlaceLabels=5, Count=6};
@@ -143,6 +144,7 @@ DialogSeamAllowance::DialogSeamAllowance(const VContainer *data, quint32 toolId,
       flagFormulaAfter(true),
       flagMainPathIsValid(true),
       flagName(true), //We have default name of piece.
+      flagUUID(true),
       flagFormula(true),
       m_bAddMode(true),
       m_dialog(),
@@ -166,7 +168,8 @@ DialogSeamAllowance::DialogSeamAllowance(const VContainer *data, quint32 toolId,
       m_templateLines(),
       m_undoStack(),
       m_newPlaceLabels(),
-      m_newPaths()
+      m_newPaths(),
+      m_placeholdersMenu(new QMenu(this))
 {
     ui->setupUi(this);
 
@@ -177,6 +180,7 @@ DialogSeamAllowance::DialogSeamAllowance(const VContainer *data, quint32 toolId,
     EnableApply(applyAllowed);
 
     InitMainPathTab();
+    InitPieceTab();
     InitSeamAllowanceTab();
     InitInternalPathsTab();
     InitPatternPieceDataTab();
@@ -346,6 +350,8 @@ void DialogSeamAllowance::SetPiece(const VPiece &piece)
     uiTabPaths->checkBoxSeams->setChecked(piece.IsSeamAllowance());
     uiTabPaths->checkBoxBuiltIn->setChecked(piece.IsSeamAllowanceBuiltIn());
     uiTabPaths->lineEditName->setText(piece.GetName());
+    uiTabPaths->lineEditUUID->setText(piece.GetUUID().toString());
+    uiTabPaths->lineEditGradationLabel->setText(piece.GetGradationLabel());
     uiTabPaths->spinBoxPriority->setValue(static_cast<int>(piece.GetPriority()));
 
     uiTabPaths->plainTextEditFormulaWidth->setPlainText(
@@ -532,7 +538,7 @@ void DialogSeamAllowance::CheckState()
 
     if (flagFormula && flagFormulaBefore && flagFormulaAfter)
     {
-        if (flagMainPathIsValid && flagName)
+        if (flagMainPathIsValid && flagName && flagUUID)
         {
             m_ftb->SetTabText(TabOrder::Paths, tr("Paths"));
         }
@@ -547,9 +553,9 @@ void DialogSeamAllowance::CheckState()
         uiTabPaths->tabWidget->setTabIcon(uiTabPaths->tabWidget->indexOf(uiTabPaths->tabSeamAllowance), icon);
     }
 
-    if (flagMainPathIsValid && flagName)
+    if (flagMainPathIsValid)
     {
-        if (flagFormula && flagFormulaBefore && flagFormulaAfter)
+        if (flagFormula && flagFormulaBefore && flagFormulaAfter && flagName && flagUUID)
         {
             m_ftb->SetTabText(TabOrder::Paths, tr("Paths"));
         }
@@ -571,6 +577,22 @@ void DialogSeamAllowance::CheckState()
         uiTabPaths->tabWidget->setTabIcon(uiTabPaths->tabWidget->indexOf(uiTabPaths->tabMainPath), icon);
     }
 
+    if (flagName && flagUUID)
+    {
+        if (flagFormula && flagFormulaBefore && flagFormulaAfter && flagMainPathIsValid)
+        {
+            m_ftb->SetTabText(TabOrder::Paths, tr("Paths"));
+        }
+        uiTabPaths->tabWidget->setTabIcon(uiTabPaths->tabWidget->indexOf(uiTabPaths->tabPiece), QIcon());
+    }
+    else
+    {
+        m_ftb->SetTabText(TabOrder::Paths, tr("Paths") + '*');
+        const QIcon icon = QIcon::fromTheme("dialog-warning",
+                                            QIcon(":/icons/win.icon.theme/16x16/status/dialog-warning.png"));
+        uiTabPaths->tabWidget->setTabIcon(uiTabPaths->tabWidget->indexOf(uiTabPaths->tabPiece), icon);
+    }
+
     uiTabPaths->comboBoxNodes->setEnabled(flagFormulaBefore && flagFormulaAfter);
 
     if (uiTabPassmarks->comboBoxPassmarks->count() == 0)
@@ -623,7 +645,7 @@ void DialogSeamAllowance::showEvent(QShowEvent *event)
         uiTabLabels->lineEditPatternNumber->setText(m_doc->GetPatternNumber());
         uiTabLabels->lineEditCompanyName->setText(m_doc->GetCompanyName());
 
-        VSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
+        VCommonSettings *settings = VAbstractApplication::VApp()->Settings();
         m_patternMaterials = m_doc->GetPatternMaterials();
 
         InitComboBoxFormats(uiTabLabels->comboBoxDateFormat,
@@ -683,6 +705,30 @@ void DialogSeamAllowance::NameDetailChanged()
     CheckState();
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSeamAllowance::DetailUUIDChanged()
+{
+    QLineEdit* edit = qobject_cast<QLineEdit*>(sender());
+    if (edit)
+    {
+        QRegularExpression re("^$|^{[0-9a-fA-F]{8}\\-[0-9a-fA-F]{4}\\-[0-9a-fA-F]{4}\\-[0-9a-fA-F]{4}\\-"
+                              "[0-9a-fA-F]{12}}$");
+        QRegularExpressionMatch match = re.match(edit->text());
+
+        if (match.hasMatch())
+        {
+            flagUUID = true;
+            ChangeColor(uiTabPaths->labelEditUUID, OkColor(this));
+        }
+        else
+        {
+            flagUUID = false;
+            ChangeColor(uiTabPaths->labelEditUUID, errorColor);
+        }
+    }
+    CheckState();
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 void DialogSeamAllowance::ShowMainPathContextMenu(const QPoint &pos)
 {
@@ -2536,6 +2582,8 @@ VPiece DialogSeamAllowance::CreatePiece() const
     piece.SetSeamAllowanceBuiltIn(uiTabPaths->checkBoxBuiltIn->isChecked());
     piece.SetHideMainPath(uiTabPaths->checkBoxHideMainPath->isChecked());
     piece.SetName(uiTabPaths->lineEditName->text());
+    piece.SetUUID(uiTabPaths->lineEditUUID->text());
+    piece.SetGradationLabel(uiTabPaths->lineEditGradationLabel->text());
     piece.SetPriority(static_cast<uint>(uiTabPaths->spinBoxPriority->value()));
     piece.SetFormulaSAWidth(GetFormulaFromUser(uiTabPaths->plainTextEditFormulaWidth), m_saWidth);
     piece.GetPatternPieceData().SetLetter(uiTabLabels->lineEditLetter->text());
@@ -2913,6 +2961,29 @@ void DialogSeamAllowance::InitFancyTabBar()
 
 //---------------------------------------------------------------------------------------------------------------------
 void DialogSeamAllowance::InitMainPathTab()
+{
+    uiTabPaths->checkBoxHideMainPath->setChecked(VAbstractApplication::VApp()->Settings()->IsHideMainPath());
+
+    uiTabPaths->listWidgetMainPath->setContextMenuPolicy(Qt::CustomContextMenu);
+    connect(uiTabPaths->listWidgetMainPath, &QListWidget::customContextMenuRequested, this,
+            &DialogSeamAllowance::ShowMainPathContextMenu);
+    connect(uiTabPaths->listWidgetMainPath->model(), &QAbstractItemModel::rowsMoved, this,
+            &DialogSeamAllowance::ListChanged);
+    connect(uiTabPaths->listWidgetMainPath, &QListWidget::itemSelectionChanged, this,
+            &DialogSeamAllowance::SetMoveControls);
+
+    connect(uiTabPaths->toolButtonTop, &QToolButton::clicked, this,
+            [this](){MoveListRowTop(uiTabPaths->listWidgetMainPath);});
+    connect(uiTabPaths->toolButtonUp, &QToolButton::clicked, this,
+            [this](){MoveListRowUp(uiTabPaths->listWidgetMainPath);});
+    connect(uiTabPaths->toolButtonDown, &QToolButton::clicked, this,
+            [this](){MoveListRowDown(uiTabPaths->listWidgetMainPath);});
+    connect(uiTabPaths->toolButtonBottom, &QToolButton::clicked, this,
+            [this](){MoveListRowBottom(uiTabPaths->listWidgetMainPath);});
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSeamAllowance::InitPieceTab()
 {
     connect(uiTabPaths->lineEditName, &QLineEdit::textChanged, this, &DialogSeamAllowance::NameDetailChanged);
 
@@ -2955,8 +3026,14 @@ void DialogSeamAllowance::InitMainPathTab()
             [this](){MoveListRowUp(uiTabPaths->listWidgetMainPath);});
     connect(uiTabPaths->toolButtonDown, &QToolButton::clicked, this,
             [this](){MoveListRowDown(uiTabPaths->listWidgetMainPath);});
-    connect(uiTabPaths->toolButtonBottom, &QToolButton::clicked, this,
-            [this](){MoveListRowBottom(uiTabPaths->listWidgetMainPath);});
+
+    connect(uiTabPaths->lineEditUUID, &QLineEdit::textChanged, this, &DialogSeamAllowance::DetailUUIDChanged);
+
+    InitGradationPlaceholders();
+    InitGradationPlaceholdersMenu();
+
+    m_placeholdersMenu->setStyleSheet(QStringLiteral("QMenu { menu-scrollable: 1; }"));
+    uiTabPaths->pushButtonGradationPlaceholder->setMenu(m_placeholdersMenu);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -3795,6 +3872,71 @@ void DialogSeamAllowance::SavePatternMaterialData()
     }
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSeamAllowance::InitGradationPlaceholdersMenu()
+{
+    QChar per('%');
+    auto i = m_gradationPlaceholders.constBegin();
+    while (i != m_gradationPlaceholders.constEnd())
+    {
+        auto value = i.value();
+        QAction *action = m_placeholdersMenu->addAction(value.first);
+        action->setData(per + i.key() + per);
+        connect(action, &QAction::triggered, this, &DialogSeamAllowance::InsertGradationPlaceholder);
+        ++i;
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSeamAllowance::InitGradationPlaceholders()
+{
+    // Pattern tags
+    QLocale locale(VAbstractApplication::VApp()->Settings()->GetLocale());
+
+    QString heightValue = QString::number(VAbstractValApplication::VApp()->GetDimensionHeight());
+    m_gradationPlaceholders.insert(pl_height, qMakePair(tr("Height", "dimension"), heightValue));
+
+    QString sizeValue = QString::number(VAbstractValApplication::VApp()->GetDimensionSize());
+    m_gradationPlaceholders.insert(pl_size, qMakePair(tr("Size", "dimension"), sizeValue));
+
+    QString hipValue = QString::number(VAbstractValApplication::VApp()->GetDimensionHip());
+    m_gradationPlaceholders.insert(pl_hip, qMakePair(tr("Hip", "dimension"), hipValue));
+
+    QString waistValue = QString::number(VAbstractValApplication::VApp()->GetDimensionWaist());
+    m_gradationPlaceholders.insert(pl_waist, qMakePair(tr("Waist", "dimension"), waistValue));
+
+    {
+        QString label = VAbstractValApplication::VApp()->GetDimensionHeightLabel();
+        m_gradationPlaceholders.insert(pl_heightLabel, qMakePair(tr("Height label", "dimension"),
+                                                                 not label.isEmpty() ? label : heightValue));
+
+        label = VAbstractValApplication::VApp()->GetDimensionSizeLabel();
+        m_gradationPlaceholders.insert(pl_sizeLabel, qMakePair(tr("Size label", "dimension"),
+                                                               not label.isEmpty() ? label : sizeValue));
+
+        label = VAbstractValApplication::VApp()->GetDimensionHipLabel();
+        m_gradationPlaceholders.insert(pl_hipLabel, qMakePair(tr("Hip label", "dimension"),
+                                                              not label.isEmpty() ? label : hipValue));
+
+        label = VAbstractValApplication::VApp()->GetDimensionWaistLabel();
+        m_gradationPlaceholders.insert(pl_waistLabel, qMakePair(tr("Waist label", "dimension"),
+                                                                not label.isEmpty() ? label : waistValue));
+    }
+
+    {
+        const QMap<QString, QSharedPointer<VMeasurement> > measurements = data->DataMeasurements();
+        auto i = measurements.constBegin();
+        while (i != measurements.constEnd())
+        {
+            QString description = i.value()->GetGuiText().isEmpty() ? i.key() : i.value()->GetGuiText();
+            m_gradationPlaceholders.insert(pl_measurement + i.key(),
+                                           qMakePair(tr("Measurement: %1").arg(description),
+                                                     QString::number(*i.value()->GetValue())));
+            ++i;
+        }
+    }
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 void DialogSeamAllowance::SetMoveControls()
 {
@@ -3872,7 +4014,7 @@ void DialogSeamAllowance::EditPatternLabel()
 //---------------------------------------------------------------------------------------------------------------------
 void DialogSeamAllowance::ManagePatternMaterials()
 {
-    VSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
+    VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
 
     DialogPatternMaterials editor(m_patternMaterials, settings->IsRememberPatternMaterials());
 
@@ -3887,3 +4029,14 @@ void DialogSeamAllowance::ManagePatternMaterials()
         }
     }
 }
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSeamAllowance::InsertGradationPlaceholder()
+{
+    QAction *action = qobject_cast<QAction *>(sender());
+    if (action)
+    {
+        uiTabPaths->lineEditGradationLabel->insert(action->data().toString());
+        uiTabPaths->lineEditGradationLabel->setFocus();
+    }
+}
diff --git a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.h b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.h
index f819cc285..dc0b46a37 100644
--- a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.h
+++ b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.h
@@ -86,6 +86,7 @@ protected:
 
 private slots:
     void NameDetailChanged();
+    void DetailUUIDChanged();
     void ShowMainPathContextMenu(const QPoint &pos);
     void ShowCustomSAContextMenu(const QPoint &pos);
     void ShowInternalPathsContextMenu(const QPoint &pos);
@@ -163,6 +164,8 @@ private slots:
     void EditPatternLabel();
     void ManagePatternMaterials();
 
+    void InsertGradationPlaceholder();
+
 private:
     Q_DISABLE_COPY(DialogSeamAllowance)
 
@@ -197,6 +200,7 @@ private:
     bool   flagFormulaPassmarkLength{true};
     bool   flagMainPathIsValid;
     bool   flagName;
+    bool   flagUUID;
     bool   flagFormula;
     bool   m_bAddMode;
     bool   m_patternLabelDataChanged{false};
@@ -240,6 +244,10 @@ private:
 
     QString m_defLabelValue{};
 
+    QMenu *m_placeholdersMenu;
+
+    QMap<QString, QPair<QString, QString>> m_gradationPlaceholders{};
+
     VPiece CreatePiece() const;
 
     void    NewMainPathItem(const VPieceNode &node);
@@ -264,6 +272,7 @@ private:
 
     void InitFancyTabBar();
     void InitMainPathTab();
+    void InitPieceTab();
     void InitSeamAllowanceTab();
     void InitNodesList();
     void InitPassmarksList();
@@ -308,12 +317,15 @@ private:
     void SavePatternLabelData();
     void SavePatternTemplateData();
     void SavePatternMaterialData();
+
+    void InitGradationPlaceholdersMenu();
+    void InitGradationPlaceholders();
 };
 
 //---------------------------------------------------------------------------------------------------------------------
 inline bool DialogSeamAllowance::IsValid() const
 {
-    return flagName && flagMainPathIsValid && flagFormula && flagFormulaBefore && flagFormulaAfter
+    return flagName && flagUUID && flagMainPathIsValid && flagFormula && flagFormulaBefore && flagFormulaAfter
             && (flagGFormulas || flagGPin) && flagDLAngle && (flagDLFormulas || flagDPin) && flagPLAngle
             && (flagPLFormulas || flagPPin) && flagFormulaPassmarkLength;
 }
diff --git a/src/libs/vtools/dialogs/tools/piece/tabs/tabpaths.ui b/src/libs/vtools/dialogs/tools/piece/tabs/tabpaths.ui
index ed9beef50..5810d5331 100644
--- a/src/libs/vtools/dialogs/tools/piece/tabs/tabpaths.ui
+++ b/src/libs/vtools/dialogs/tools/piece/tabs/tabpaths.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>426</width>
-    <height>637</height>
+    <width>422</width>
+    <height>624</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -28,8 +28,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>406</width>
-        <height>617</height>
+        <width>394</width>
+        <height>612</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout">
@@ -73,64 +73,6 @@
              </item>
             </layout>
            </item>
-           <item>
-            <layout class="QFormLayout" name="formLayout">
-             <property name="fieldGrowthPolicy">
-              <enum>QFormLayout::ExpandingFieldsGrow</enum>
-             </property>
-             <item row="0" column="0">
-              <widget class="QLabel" name="labelEditName">
-               <property name="text">
-                <string>Name of detail:</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="1">
-              <widget class="VLineEdit" name="lineEditName">
-               <property name="text">
-                <string>Detail</string>
-               </property>
-               <property name="placeholderText">
-                <string>Name can't be empty</string>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="0">
-              <widget class="QLabel" name="label">
-               <property name="text">
-                <string>Priority:</string>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="1">
-              <widget class="QSpinBox" name="spinBoxPriority">
-               <property name="toolTip">
-                <string>Controls priority in layout. 0 - no priority.</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-           <item>
-            <widget class="QCheckBox" name="checkBoxForbidFlipping">
-             <property name="toolTip">
-              <string>Forbid piece be mirrored in a layout.</string>
-             </property>
-             <property name="text">
-              <string>Forbid flipping</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QCheckBox" name="checkBoxForceFlipping">
-             <property name="toolTip">
-              <string>Force piece to be always flipped in a layout.</string>
-             </property>
-             <property name="text">
-              <string>Force flipping</string>
-             </property>
-            </widget>
-           </item>
            <item>
             <widget class="QCheckBox" name="checkBoxHideMainPath">
              <property name="toolTip">
@@ -248,6 +190,129 @@
            </item>
           </layout>
          </widget>
+         <widget class="QWidget" name="tabPiece">
+          <attribute name="title">
+           <string>Piece</string>
+          </attribute>
+          <layout class="QVBoxLayout" name="verticalLayout_9">
+           <item>
+            <layout class="QGridLayout" name="gridLayout">
+             <item row="0" column="1">
+              <widget class="VLineEdit" name="lineEditName">
+               <property name="text">
+                <string>Detail</string>
+               </property>
+               <property name="placeholderText">
+                <string>Name can't be empty</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="0">
+              <widget class="QLabel" name="label">
+               <property name="text">
+                <string>Priority:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="0">
+              <widget class="QLabel" name="labelEditName">
+               <property name="text">
+                <string>Name of detail:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1">
+              <widget class="QSpinBox" name="spinBoxPriority">
+               <property name="toolTip">
+                <string>Controls priority in layout. 0 - no priority.</string>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="1">
+              <widget class="QLineEdit" name="lineEditUUID">
+               <property name="toolTip">
+                <string>Universally Unique IDentifier of piece. Used to identifier piece while updating manual layout. Left empty to generate new value.</string>
+               </property>
+               <property name="placeholderText">
+                <string>{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}</string>
+               </property>
+               <property name="clearButtonEnabled">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="0">
+              <widget class="QLabel" name="labelEditUUID">
+               <property name="text">
+                <string notr="true">UUID:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="3" column="0">
+              <widget class="QLabel" name="label_5">
+               <property name="text">
+                <string>Gradation label:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="3" column="1">
+              <layout class="QHBoxLayout" name="horizontalLayout">
+               <item>
+                <widget class="QLineEdit" name="lineEditGradationLabel">
+                 <property name="placeholderText">
+                  <string>%size%_%height%</string>
+                 </property>
+                 <property name="clearButtonEnabled">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QPushButton" name="pushButtonGradationPlaceholder">
+                 <property name="text">
+                  <string>Insert…</string>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </item>
+            </layout>
+           </item>
+           <item>
+            <widget class="QCheckBox" name="checkBoxForbidFlipping">
+             <property name="toolTip">
+              <string>Forbid piece be mirrored in a layout.</string>
+             </property>
+             <property name="text">
+              <string>Forbid flipping</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QCheckBox" name="checkBoxForceFlipping">
+             <property name="toolTip">
+              <string>Force piece to be always flipped in a layout.</string>
+             </property>
+             <property name="text">
+              <string>Force flipping</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="verticalSpacer">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>40</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </widget>
          <widget class="QWidget" name="tabSeamAllowance">
           <attribute name="title">
            <string>Seam allowance</string>
@@ -1062,16 +1127,16 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>VPlainTextEdit</class>
-   <extends>QPlainTextEdit</extends>
-   <header location="global">vplaintextedit.h</header>
-  </customwidget>
   <customwidget>
    <class>VLineEdit</class>
    <extends>QLineEdit</extends>
    <header>vlineedit.h</header>
   </customwidget>
+  <customwidget>
+   <class>VPlainTextEdit</class>
+   <extends>QPlainTextEdit</extends>
+   <header>vplaintextedit.h</header>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="../../../../../vmisc/share/resources/icon.qrc"/>
diff --git a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp
index 6ff388ebf..b10c4bba3 100644
--- a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp
+++ b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp
@@ -228,9 +228,8 @@ void VToolFlippingByAxis::SaveDialog(QDomElement &domElement, QList<quint32> &ol
     doc->SetAttribute(domElement, AttrCenter, QString().setNum(dialogTool->GetOriginPointId()));
     doc->SetAttribute(domElement, AttrAxisType, QString().setNum(static_cast<int>(dialogTool->GetAxisType())));
     doc->SetAttribute(domElement, AttrSuffix, dialogTool->GetSuffix());
-
-    const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, dialogTool->GetNotes(),
+                                         [](const QString &notes){return notes.isEmpty();});
 
     source = dialogTool->GetSourceObjects();
     SaveSourceDestination(domElement);
diff --git a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp
index 576f78eca..23d102bff 100644
--- a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp
+++ b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp
@@ -215,9 +215,8 @@ void VToolFlippingByLine::SaveDialog(QDomElement &domElement, QList<quint32> &ol
     doc->SetAttribute(domElement, AttrP1Line, QString().setNum(dialogTool->GetFirstLinePointId()));
     doc->SetAttribute(domElement, AttrP2Line, QString().setNum(dialogTool->GetSecondLinePointId()));
     doc->SetAttribute(domElement, AttrSuffix, dialogTool->GetSuffix());
-
-    const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, dialogTool->GetNotes(),
+                                         [](const QString &notes){return notes.isEmpty();});
 
     source = dialogTool->GetSourceObjects();
     SaveSourceDestination(domElement);
diff --git a/src/libs/vtools/tools/drawTools/operation/vabstractoperation.cpp b/src/libs/vtools/tools/drawTools/operation/vabstractoperation.cpp
index c63e6ed6b..41904a500 100644
--- a/src/libs/vtools/tools/drawTools/operation/vabstractoperation.cpp
+++ b/src/libs/vtools/tools/drawTools/operation/vabstractoperation.cpp
@@ -748,9 +748,12 @@ void VAbstractOperation::SaveSourceDestination(QDomElement &tag)
     {
         QDomElement item = doc->createElement(TagItem);
         doc->SetAttribute(item, AttrIdObject, sItem.id);
-        doc->SetAttributeOrRemoveIf(item, AttrAlias, sItem.alias, sItem.alias.isEmpty());
-        doc->SetAttributeOrRemoveIf(item, AttrPenStyle, sItem.penStyle, sItem.penStyle == TypeLineDefault);
-        doc->SetAttributeOrRemoveIf(item, AttrColor, sItem.color, sItem.color == ColorDefault);
+        doc->SetAttributeOrRemoveIf<QString>(item, AttrAlias, sItem.alias,
+                                             [](const QString &alias){return alias.isEmpty();});
+        doc->SetAttributeOrRemoveIf<QString>(item, AttrPenStyle, sItem.penStyle,
+                                             [](const QString &penStyle){return penStyle == TypeLineDefault;});
+        doc->SetAttributeOrRemoveIf<QString>(item, AttrColor, sItem.color,
+                                             [](const QString &color){return color == ColorDefault;});
         tagObjects.appendChild(item);
     }
     tag.appendChild(tagObjects);
@@ -763,11 +766,11 @@ void VAbstractOperation::SaveSourceDestination(QDomElement &tag)
 
         VAbstractSimple *obj = operatedObjects.value(dItem.id, nullptr);
 
-        doc->SetAttributeOrRemoveIf(item, AttrMx, VAbstractValApplication::VApp()->fromPixel(dItem.mx),
-                                    obj && obj->GetType() != GOType::Point);
-        doc->SetAttributeOrRemoveIf(item, AttrMy, VAbstractValApplication::VApp()->fromPixel(dItem.my),
-                                    obj && obj->GetType() != GOType::Point);
-        doc->SetAttributeOrRemoveIf<bool>(item, AttrShowLabel, dItem.showLabel, dItem.showLabel);
+        doc->SetAttributeOrRemoveIf<double>(item, AttrMx, VAbstractValApplication::VApp()->fromPixel(dItem.mx),
+                                            [obj](double){return obj && obj->GetType() != GOType::Point;});
+        doc->SetAttributeOrRemoveIf<double>(item, AttrMy, VAbstractValApplication::VApp()->fromPixel(dItem.my),
+                                            [obj](double){return obj && obj->GetType() != GOType::Point;});
+        doc->SetAttributeOrRemoveIf<bool>(item, AttrShowLabel, dItem.showLabel, [](bool showLabel){return showLabel;});
 
         tagObjects.appendChild(item);
     }
diff --git a/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp b/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp
index 624d91b57..7872249d0 100644
--- a/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp
+++ b/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp
@@ -488,9 +488,8 @@ void VToolMove::SaveDialog(QDomElement &domElement, QList<quint32> &oldDependenc
     doc->SetAttribute(domElement, AttrSuffix, dialogTool->GetSuffix());
     doc->SetAttribute(domElement, AttrCenter, QString().setNum(dialogTool->GetRotationOrigPointId()));
     doc->SetAttribute(domElement, AttrRotationAngle, dialogTool->GetRotationAngle());
-
-    const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, dialogTool->GetNotes(),
+                                         [](const QString &notes){return notes.isEmpty();});
 
     source = dialogTool->GetSourceObjects();
     SaveSourceDestination(domElement);
diff --git a/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp b/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp
index f45aad1cf..37abec95a 100644
--- a/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp
+++ b/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp
@@ -364,9 +364,8 @@ void VToolRotation::SaveDialog(QDomElement &domElement, QList<quint32> &oldDepen
     doc->SetAttribute(domElement, AttrCenter, QString().setNum(dialogTool->GetOrigPointId()));
     doc->SetAttribute(domElement, AttrAngle, dialogTool->GetAngle());
     doc->SetAttribute(domElement, AttrSuffix, dialogTool->GetSuffix());
-
-    const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, dialogTool->GetNotes(),
+                                         [](const QString &notes){return notes.isEmpty();});
 
     source = dialogTool->GetSourceObjects();
     SaveSourceDestination(domElement);
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp
index 7902830d9..760ef26ef 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp
@@ -322,7 +322,8 @@ void VAbstractSpline::SaveOptions(QDomElement &tag, QSharedPointer<VGObject> &ob
     doc->SetAttribute(tag, AttrColor, curve->GetColor());
     doc->SetAttribute(tag, AttrPenStyle, curve->GetPenStyle());
     doc->SetAttribute(tag, AttrAScale, curve->GetApproximationScale());
-    doc->SetAttributeOrRemoveIf(tag, AttrAlias, curve->GetAliasSuffix(), curve->GetAliasSuffix().isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(tag, AttrAlias, curve->GetAliasSuffix(),
+                                         [](const QString &suffix){return suffix.isEmpty();});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp
index 0261bbeb7..1670da3f2 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp
@@ -341,11 +341,10 @@ void VToolArc::SaveDialog(QDomElement &domElement, QList<quint32> &oldDependenci
     doc->SetAttribute(domElement, AttrColor, dialogTool->GetColor());
     doc->SetAttribute(domElement, AttrPenStyle, dialogTool->GetPenStyle());
     doc->SetAttribute(domElement, AttrAScale, dialogTool->GetApproximationScale());
-    doc->SetAttributeOrRemoveIf(domElement, AttrAlias, dialogTool->GetAliasSuffix(),
-                                dialogTool->GetAliasSuffix().isEmpty());
-
-    const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrAlias, dialogTool->GetAliasSuffix(),
+                                         [](const QString &suffix){return suffix.isEmpty();});
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, dialogTool->GetNotes(),
+                                         [](const QString &notes){return notes.isEmpty();});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp
index cb0029d35..c4a7bdf6a 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp
@@ -320,11 +320,10 @@ void VToolArcWithLength::SaveDialog(QDomElement &domElement, QList<quint32> &old
     doc->SetAttribute(domElement, AttrColor, dialogTool->GetColor());
     doc->SetAttribute(domElement, AttrPenStyle, dialogTool->GetPenStyle());
     doc->SetAttribute(domElement, AttrAScale, dialogTool->GetApproximationScale());
-    doc->SetAttributeOrRemoveIf(domElement, AttrAlias, dialogTool->GetAliasSuffix(),
-                                dialogTool->GetAliasSuffix().isEmpty());
-
-    const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrAlias, dialogTool->GetAliasSuffix(),
+                                         [](const QString &suffix){return suffix.isEmpty();});
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, dialogTool->GetNotes(),
+                                         [](const QString &notes){return notes.isEmpty();});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp
index f28e5b3d2..1fa0ae4f9 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp
@@ -232,9 +232,8 @@ void VToolCubicBezier::SaveDialog(QDomElement &domElement, QList<quint32> &oldDe
     AddDependence(newDependencies, spl.GetP2().id());
     AddDependence(newDependencies, spl.GetP3().id());
     AddDependence(newDependencies, spl.GetP4().id());
-
-    const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, dialogTool->GetNotes(),
+                                         [](const QString &notes){return notes.isEmpty();});
 
     SetSplineAttributes(domElement, spl);
 }
@@ -291,6 +290,8 @@ void VToolCubicBezier::SetSplineAttributes(QDomElement &domElement, const VCubic
     doc->SetAttribute(domElement, AttrColor,    spl.GetColor());
     doc->SetAttribute(domElement, AttrPenStyle, spl.GetPenStyle());
     doc->SetAttribute(domElement, AttrAScale,   spl.GetApproximationScale());
-    doc->SetAttributeOrRemoveIf(domElement, AttrDuplicate, spl.GetDuplicate(), spl.GetDuplicate() <= 0);
-    doc->SetAttributeOrRemoveIf(domElement, AttrAlias, spl.GetAliasSuffix(), spl.GetAliasSuffix().isEmpty());
+    doc->SetAttributeOrRemoveIf<quint32>(domElement, AttrDuplicate, spl.GetDuplicate(),
+                                         [](quint32 duplicate){return duplicate == 0;});
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrAlias, spl.GetAliasSuffix(),
+                                         [](const QString &suffix){return suffix.isEmpty();});
 }
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp
index 174717407..9444a3aad 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp
@@ -219,8 +219,8 @@ void VToolCubicBezierPath::SaveDialog(QDomElement &domElement, QList<quint32> &o
         AddDependence(newDependencies, splPath.at(i).id());
     }
 
-    const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, dialogTool->GetNotes(),
+                                         [](const QString &notes){return notes.isEmpty();});
 
     SetSplinePathAttributes(domElement, splPath);
 }
@@ -274,7 +274,8 @@ void VToolCubicBezierPath::AddPathPoint(VAbstractPattern *doc, QDomElement &domE
 void VToolCubicBezierPath::SetSplinePathAttributes(QDomElement &domElement, const VCubicBezierPath &path)
 {
     doc->SetAttribute(domElement, AttrType, ToolType);
-    doc->SetAttributeOrRemoveIf(domElement, AttrDuplicate, path.GetDuplicate(), path.GetDuplicate() <= 0);
+    doc->SetAttributeOrRemoveIf<quint32>(domElement, AttrDuplicate, path.GetDuplicate(),
+                                         [](quint32 duplicate){return duplicate <= 0;});
     doc->SetAttribute(domElement, AttrColor, path.GetColor());
     doc->SetAttribute(domElement, AttrPenStyle, path.GetPenStyle());
     doc->SetAttribute(domElement, AttrAScale, path.GetApproximationScale());
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp
index a35e91227..df61bd134 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp
@@ -388,11 +388,10 @@ void VToolEllipticalArc::SaveDialog(QDomElement &domElement, QList<quint32> &old
     doc->SetAttribute(domElement, AttrRotationAngle, dialogTool->GetRotationAngle());
     doc->SetAttribute(domElement, AttrColor, dialogTool->GetColor());
     doc->SetAttribute(domElement, AttrPenStyle, dialogTool->GetPenStyle());
-    doc->SetAttributeOrRemoveIf(domElement, AttrAlias, dialogTool->GetAliasSuffix(),
-                                dialogTool->GetAliasSuffix().isEmpty());
-
-    const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrAlias, dialogTool->GetAliasSuffix(),
+                                         [](const QString &suffix){return suffix.isEmpty();});
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, dialogTool->GetNotes(),
+                                         [](const QString &notes){return notes.isEmpty();});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp
index 84b646ead..1772042aa 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp
@@ -345,8 +345,8 @@ void VToolSpline::SaveDialog(QDomElement &domElement, QList<quint32> &oldDepende
     controlPoints[0]->blockSignals(false);
     controlPoints[1]->blockSignals(false);
 
-    const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, dialogTool->GetNotes(),
+                                         [](const QString &notes){return notes.isEmpty();});
 
     SetSplineAttributes(domElement, spl);
 }
@@ -655,8 +655,10 @@ void VToolSpline::SetSplineAttributes(QDomElement &domElement, const VSpline &sp
     doc->SetAttribute(domElement, AttrColor,   spl.GetColor());
     doc->SetAttribute(domElement, AttrPenStyle, spl.GetPenStyle());
     doc->SetAttribute(domElement, AttrAScale, spl.GetApproximationScale());
-    doc->SetAttributeOrRemoveIf(domElement, AttrDuplicate, spl.GetDuplicate(), spl.GetDuplicate() <= 0);
-    doc->SetAttributeOrRemoveIf(domElement, AttrAlias, spl.GetAliasSuffix(), spl.GetAliasSuffix().isEmpty());
+    doc->SetAttributeOrRemoveIf<quint32>(domElement, AttrDuplicate, spl.GetDuplicate(),
+                                         [](quint32 duplicate){return duplicate == 0;});
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrAlias, spl.GetAliasSuffix(),
+                                         [](const QString &suffix){return suffix.isEmpty();});
 
     if (domElement.hasAttribute(AttrKCurve))
     {
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp
index de573af14..a4adb561d 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp
@@ -397,7 +397,8 @@ void VToolSplinePath::UpdateControlPoints(const VSpline &spl, QSharedPointer<VSp
 void VToolSplinePath::SetSplinePathAttributes(QDomElement &domElement, const VSplinePath &path)
 {
     doc->SetAttribute(domElement, AttrType, ToolType);
-    doc->SetAttributeOrRemoveIf(domElement, AttrDuplicate, path.GetDuplicate(), path.GetDuplicate() <= 0);
+    doc->SetAttributeOrRemoveIf<quint32>(domElement, AttrDuplicate, path.GetDuplicate(),
+                                         [](quint32 duplicate){return duplicate == 0;});
 
     if (domElement.hasAttribute(AttrKCurve))
     {
@@ -407,7 +408,8 @@ void VToolSplinePath::SetSplinePathAttributes(QDomElement &domElement, const VSp
     doc->SetAttribute(domElement, AttrColor, path.GetColor());
     doc->SetAttribute(domElement, AttrPenStyle, path.GetPenStyle());
     doc->SetAttribute(domElement, AttrAScale, path.GetApproximationScale());
-    doc->SetAttributeOrRemoveIf(domElement, AttrAlias, path.GetAliasSuffix(), path.GetAliasSuffix().isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrAlias, path.GetAliasSuffix(),
+                                         [](const QString &suffix){return suffix.isEmpty();});
 
     UpdatePathPoints(doc, domElement, path);
 }
@@ -544,8 +546,8 @@ void VToolSplinePath::SaveDialog(QDomElement &domElement, QList<quint32> &oldDep
         controlPoints[j-1]->blockSignals(false);
     }
 
-    const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, dialogTool->GetNotes(),
+                                         [](const QString &notes){return notes.isEmpty();});
 
     SetSplinePathAttributes(domElement, splPath);
 }
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp
index 74fa8a91e..18dec073e 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp
@@ -290,9 +290,8 @@ void VToolTrueDarts::SaveDialog(QDomElement &domElement, QList<quint32> &oldDepe
     doc->SetAttribute(domElement, AttrDartP1, QString().setNum(dialogTool->GetFirstDartPointId()));
     doc->SetAttribute(domElement, AttrDartP2, QString().setNum(dialogTool->GetSecondDartPointId()));
     doc->SetAttribute(domElement, AttrDartP3, QString().setNum(dialogTool->GetThirdDartPointId()));
-
-    const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, dialogTool->GetNotes(),
+                                         [](const QString &notes){return notes.isEmpty();});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp
index d95ce21a7..ba96d0dbf 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp
@@ -191,8 +191,10 @@ void VToolCut::SaveOptions(QDomElement &tag, QSharedPointer<VGObject> &obj)
 {
     VToolSinglePoint::SaveOptions(tag, obj);
 
-    doc->SetAttributeOrRemoveIf(tag, AttrAlias1, m_aliasSuffix1, m_aliasSuffix1.isEmpty());
-    doc->SetAttributeOrRemoveIf(tag, AttrAlias2, m_aliasSuffix2, m_aliasSuffix2.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(tag, AttrAlias1, m_aliasSuffix1,
+                                         [](const QString &suffix){return suffix.isEmpty();});
+    doc->SetAttributeOrRemoveIf<QString>(tag, AttrAlias2, m_aliasSuffix2,
+                                         [](const QString &suffix){return suffix.isEmpty();});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp
index e59ee7e37..66b62cf9e 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp
@@ -233,13 +233,14 @@ void VToolCutArc::SaveDialog(QDomElement &domElement, QList<quint32> &oldDepende
     doc->SetAttribute(domElement, AttrName, dialogTool->GetPointName());
     doc->SetAttribute(domElement, AttrLength, dialogTool->GetFormula());
     doc->SetAttribute(domElement, AttrArc, QString().setNum(dialogTool->getArcId()));
-    doc->SetAttributeOrRemoveIf(domElement, AttrAlias1, dialogTool->GetAliasSuffix1(),
-                                dialogTool->GetAliasSuffix1().isEmpty());
-    doc->SetAttributeOrRemoveIf(domElement, AttrAlias2, dialogTool->GetAliasSuffix2(),
-                                dialogTool->GetAliasSuffix2().isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrAlias1, dialogTool->GetAliasSuffix1(),
+                                         [](const QString &suffix){return suffix.isEmpty();});
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrAlias2, dialogTool->GetAliasSuffix2(),
+                                         [](const QString &suffix){return suffix.isEmpty();});
 
     const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, notes,
+                                         [](const QString &notes){return notes.isEmpty();});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp
index b290ea1a1..8096b5ad3 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp
@@ -230,13 +230,12 @@ void VToolCutSpline::SaveDialog(QDomElement &domElement, QList<quint32> &oldDepe
     doc->SetAttribute(domElement, AttrName, dialogTool->GetPointName());
     doc->SetAttribute(domElement, AttrLength, dialogTool->GetFormula());
     doc->SetAttribute(domElement, AttrSpline, QString().setNum(dialogTool->getSplineId()));
-    doc->SetAttributeOrRemoveIf(domElement, AttrAlias1, dialogTool->GetAliasSuffix1(),
-                                dialogTool->GetAliasSuffix1().isEmpty());
-    doc->SetAttributeOrRemoveIf(domElement, AttrAlias2, dialogTool->GetAliasSuffix2(),
-                                dialogTool->GetAliasSuffix2().isEmpty());
-
-    const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrAlias1, dialogTool->GetAliasSuffix1(),
+                                         [](const QString &suffix){return suffix.isEmpty();});
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrAlias2, dialogTool->GetAliasSuffix2(),
+                                         [](const QString &suffix){return suffix.isEmpty();});
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, dialogTool->GetNotes(),
+                                         [](const QString &notes){return notes.isEmpty();});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp
index 927e1a804..5b1c42afd 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp
@@ -326,13 +326,14 @@ void VToolCutSplinePath::SaveDialog(QDomElement &domElement, QList<quint32> &old
     doc->SetAttribute(domElement, AttrName, dialogTool->GetPointName());
     doc->SetAttribute(domElement, AttrLength, dialogTool->GetFormula());
     doc->SetAttribute(domElement, AttrSplinePath, QString().setNum(dialogTool->getSplinePathId()));
-    doc->SetAttributeOrRemoveIf(domElement, AttrAlias1, dialogTool->GetAliasSuffix1(),
-                                dialogTool->GetAliasSuffix1().isEmpty());
-    doc->SetAttributeOrRemoveIf(domElement, AttrAlias2, dialogTool->GetAliasSuffix2(),
-                                dialogTool->GetAliasSuffix2().isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrAlias1, dialogTool->GetAliasSuffix1(),
+                                         [](const QString &suffix){return suffix.isEmpty();});
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrAlias2, dialogTool->GetAliasSuffix2(),
+                                         [](const QString &suffix){return suffix.isEmpty();});
 
     const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, notes,
+                                         [](const QString &notes){return notes.isEmpty();});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp
index e830f755f..5689f4841 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp
@@ -107,7 +107,8 @@ void VToolAlongLine::SaveDialog(QDomElement &domElement, QList<quint32> &oldDepe
     doc->SetAttribute(domElement, AttrSecondPoint, dialogTool->GetSecondPointId());
 
     const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, notes,
+                                         [](const QString &notes){return notes.isEmpty();});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp
index f5f23dab4..43083c032 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp
@@ -264,9 +264,8 @@ void VToolBisector::SaveDialog(QDomElement &domElement, QList<quint32> &oldDepen
     doc->SetAttribute(domElement, AttrFirstPoint, QString().setNum(dialogTool->GetFirstPointId()));
     doc->SetAttribute(domElement, AttrSecondPoint, QString().setNum(dialogTool->GetSecondPointId()));
     doc->SetAttribute(domElement, AttrThirdPoint, QString().setNum(dialogTool->GetThirdPointId()));
-
-    const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, dialogTool->GetNotes(),
+                                         [](const QString &notes){return notes.isEmpty();});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp
index 2b5a1a684..d1ad0a0c6 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp
@@ -277,13 +277,12 @@ void VToolCurveIntersectAxis::SaveDialog(QDomElement &domElement, QList<quint32>
     doc->SetAttribute(domElement, AttrAngle, dialogTool->GetAngle());
     doc->SetAttribute(domElement, AttrBasePoint, QString().setNum(dialogTool->GetBasePointId()));
     doc->SetAttribute(domElement, AttrCurve, QString().setNum(dialogTool->getCurveId()));
-    doc->SetAttributeOrRemoveIf(domElement, AttrAlias1, dialogTool->GetAliasSuffix1(),
-                                dialogTool->GetAliasSuffix1().isEmpty());
-    doc->SetAttributeOrRemoveIf(domElement, AttrAlias2, dialogTool->GetAliasSuffix2(),
-                                dialogTool->GetAliasSuffix2().isEmpty());
-
-    const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrAlias1, dialogTool->GetAliasSuffix1(),
+                                         [](const QString &suffix){return suffix.isEmpty();});
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrAlias2, dialogTool->GetAliasSuffix2(),
+                                         [](const QString &suffix){return suffix.isEmpty();});
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, dialogTool->GetNotes(),
+                                         [](const QString &notes){return notes.isEmpty();});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -295,8 +294,10 @@ void VToolCurveIntersectAxis::SaveOptions(QDomElement &tag, QSharedPointer<VGObj
     doc->SetAttribute(tag, AttrAngle, formulaAngle);
     doc->SetAttribute(tag, AttrBasePoint, basePointId);
     doc->SetAttribute(tag, AttrCurve, curveId);
-    doc->SetAttributeOrRemoveIf(tag, AttrAlias1, m_aliasSuffix1, m_aliasSuffix1.isEmpty());
-    doc->SetAttributeOrRemoveIf(tag, AttrAlias2, m_aliasSuffix2, m_aliasSuffix2.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(tag, AttrAlias1, m_aliasSuffix1,
+                                         [](const QString &suffix){return suffix.isEmpty();});
+    doc->SetAttributeOrRemoveIf<QString>(tag, AttrAlias2, m_aliasSuffix2,
+                                         [](const QString &suffix){return suffix.isEmpty();});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp
index c57824b11..fd32cecbd 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp
@@ -193,9 +193,8 @@ void VToolEndLine::SaveDialog(QDomElement &domElement, QList<quint32> &oldDepend
     doc->SetAttribute(domElement, AttrLength, dialogTool->GetFormula());
     doc->SetAttribute(domElement, AttrAngle, dialogTool->GetAngle());
     doc->SetAttribute(domElement, AttrBasePoint, QString().setNum(dialogTool->GetBasePointId()));
-
-    const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, dialogTool->GetNotes(),
+                                         [](const QString &notes){return notes.isEmpty();});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp
index 787878526..8eeded7ee 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp
@@ -225,7 +225,8 @@ void VToolHeight::SaveDialog(QDomElement &domElement, QList<quint32> &oldDepende
     doc->SetAttribute(domElement, AttrP2Line, QString().setNum(dialogTool->GetP2LineId()));
 
     const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, notes,
+                                         [](const QString &notes){return notes.isEmpty();});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp
index 5c710eca1..5d3081105 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp
@@ -281,9 +281,8 @@ void VToolLineIntersectAxis::SaveDialog(QDomElement &domElement, QList<quint32>
     doc->SetAttribute(domElement, AttrBasePoint, QString().setNum(dialogTool->GetBasePointId()));
     doc->SetAttribute(domElement, AttrP1Line, QString().setNum(dialogTool->GetFirstPointId()));
     doc->SetAttribute(domElement, AttrP2Line, QString().setNum(dialogTool->GetSecondPointId()));
-
-    const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, dialogTool->GetNotes(),
+                                         [](const QString &notes){return notes.isEmpty();});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp
index e223b26d4..55960d625 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp
@@ -234,9 +234,8 @@ void VToolNormal::SaveDialog(QDomElement &domElement, QList<quint32> &oldDepende
     doc->SetAttribute(domElement, AttrAngle, QString().setNum(dialogTool->GetAngle()));
     doc->SetAttribute(domElement, AttrFirstPoint, QString().setNum(dialogTool->GetFirstPointId()));
     doc->SetAttribute(domElement, AttrSecondPoint, QString().setNum(dialogTool->GetSecondPointId()));
-
-    const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, dialogTool->GetNotes(),
+                                         [](const QString &notes){return notes.isEmpty();});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp
index dfc03f864..cb272ce5b 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp
@@ -284,7 +284,8 @@ void VToolShoulderPoint::SaveDialog(QDomElement &domElement, QList<quint32> &old
     doc->SetAttribute(domElement, AttrPShoulder, QString().setNum(dialogTool->GetP3()));
 
     const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, notes,
+                                         [](const QString &notes){return notes.isEmpty();});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp
index fa967e5e8..bcb7b5c2a 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp
@@ -274,9 +274,8 @@ void VToolBasePoint::SaveDialog(QDomElement &domElement, QList<quint32> &oldDepe
     doc->SetAttribute(domElement, AttrName, name);
     doc->SetAttribute(domElement, AttrX, QString().setNum(VAbstractValApplication::VApp()->fromPixel(p.x())));
     doc->SetAttribute(domElement, AttrY, QString().setNum(VAbstractValApplication::VApp()->fromPixel(p.y())));
-
-    const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, dialogTool->GetNotes(),
+                                         [](const QString &notes){return notes.isEmpty();});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp
index 0031d57fa..903a6a6bd 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp
@@ -261,9 +261,8 @@ void VToolLineIntersect::SaveDialog(QDomElement &domElement, QList<quint32> &old
     doc->SetAttribute(domElement, AttrP2Line1, QString().setNum(dialogTool->GetP2Line1()));
     doc->SetAttribute(domElement, AttrP1Line2, QString().setNum(dialogTool->GetP1Line2()));
     doc->SetAttribute(domElement, AttrP2Line2, QString().setNum(dialogTool->GetP2Line2()));
-
-    const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, dialogTool->GetNotes(),
+                                         [](const QString &notes){return notes.isEmpty();});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp
index 36b6d2c23..1c15670be 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp
@@ -301,8 +301,8 @@ void VToolPointFromArcAndTangent::SaveDialog(QDomElement &domElement, QList<quin
     doc->SetAttribute(domElement, AttrCrossPoint,
                       QString().setNum(static_cast<int>(dialogTool->GetCrossCirclesPoint())));
 
-    const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, dialogTool->GetNotes(),
+                                         [](const QString &notes){return notes.isEmpty();});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp
index cfb9a6d71..5bdcac6c5 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp
@@ -293,9 +293,8 @@ void VToolPointFromCircleAndTangent::SaveDialog(QDomElement &domElement, QList<q
     doc->SetAttribute(domElement, AttrCRadius, dialogTool->GetCircleRadius());
     doc->SetAttribute(domElement, AttrCrossPoint,
                       QString().setNum(static_cast<int>(dialogTool->GetCrossCirclesPoint())));
-
-    const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, dialogTool->GetNotes(),
+                                         [](const QString &notes){return notes.isEmpty();});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp
index 8cd5ab9fe..51e2a6540 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp
@@ -316,9 +316,8 @@ void VToolPointOfContact::SaveDialog(QDomElement &domElement, QList<quint32> &ol
     doc->SetAttribute(domElement, AttrCenter, QString().setNum(dialogTool->getCenter()));
     doc->SetAttribute(domElement, AttrFirstPoint, QString().setNum(dialogTool->GetFirstPoint()));
     doc->SetAttribute(domElement, AttrSecondPoint, QString().setNum(dialogTool->GetSecondPoint()));
-
-    const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, dialogTool->GetNotes(),
+                                         [](const QString &notes){return notes.isEmpty();});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp
index c6c1d6c4f..ec56ed44f 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp
@@ -209,7 +209,8 @@ void VToolPointOfIntersection::SaveDialog(QDomElement &domElement, QList<quint32
     doc->SetAttribute(domElement, AttrSecondPoint, QString().setNum(dialogTool->GetSecondPointId()));
 
     const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, notes,
+                                         [](const QString &notes){return notes.isEmpty();});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp
index a5d58c658..a20b622df 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp
@@ -321,9 +321,8 @@ void VToolPointOfIntersectionArcs::SaveDialog(QDomElement &domElement, QList<qui
     doc->SetAttribute(domElement, AttrFirstArc, QString().setNum(dialogTool->GetFirstArcId()));
     doc->SetAttribute(domElement, AttrSecondArc, QString().setNum(dialogTool->GetSecondArcId()));
     doc->SetAttribute(domElement, AttrCrossPoint, QString().setNum(static_cast<int>(dialogTool->GetCrossArcPoint())));
-
-    const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, dialogTool->GetNotes(),
+                                         [](const QString &notes){return notes.isEmpty();});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp
index 956229048..aa05af470 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp
@@ -333,9 +333,8 @@ void VToolPointOfIntersectionCircles::SaveDialog(QDomElement &domElement, QList<
     doc->SetAttribute(domElement, AttrC2Radius, dialogTool->GetSecondCircleRadius());
     doc->SetAttribute(domElement, AttrCrossPoint,
                       QString().setNum(static_cast<int>(dialogTool->GetCrossCirclesPoint())));
-
-    const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, dialogTool->GetNotes(),
+                                         [](const QString &notes){return notes.isEmpty();});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp
index e859fc58a..83d987c41 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp
@@ -412,17 +412,16 @@ void VToolPointOfIntersectionCurves::SaveDialog(QDomElement &domElement, QList<q
     doc->SetAttribute(domElement, AttrCurve2, QString().setNum(dialogTool->GetSecondCurveId()));
     doc->SetAttribute(domElement, AttrVCrossPoint, QString().setNum(static_cast<int>(dialogTool->GetVCrossPoint())));
     doc->SetAttribute(domElement, AttrHCrossPoint, QString().setNum(static_cast<int>(dialogTool->GetHCrossPoint())));
-    doc->SetAttributeOrRemoveIf(domElement, AttrCurve1Alias1, dialogTool->GetCurve1AliasSuffix1(),
-                                dialogTool->GetCurve1AliasSuffix1().isEmpty());
-    doc->SetAttributeOrRemoveIf(domElement, AttrCurve1Alias2, dialogTool->GetCurve1AliasSuffix2(),
-                                dialogTool->GetCurve1AliasSuffix2().isEmpty());
-    doc->SetAttributeOrRemoveIf(domElement, AttrCurve2Alias1, dialogTool->GetCurve2AliasSuffix1(),
-                                dialogTool->GetCurve2AliasSuffix1().isEmpty());
-    doc->SetAttributeOrRemoveIf(domElement, AttrCurve2Alias2, dialogTool->GetCurve2AliasSuffix2(),
-                                dialogTool->GetCurve2AliasSuffix2().isEmpty());
-
-    const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrCurve1Alias1, dialogTool->GetCurve1AliasSuffix1(),
+                                         [](const QString &suffix){return suffix.isEmpty();});
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrCurve1Alias2, dialogTool->GetCurve1AliasSuffix2(),
+                                         [](const QString &suffix){return suffix.isEmpty();});
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrCurve2Alias1, dialogTool->GetCurve2AliasSuffix1(),
+                                         [](const QString &suffix){return suffix.isEmpty();});
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrCurve2Alias2, dialogTool->GetCurve2AliasSuffix2(),
+                                         [](const QString &suffix){return suffix.isEmpty();});
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, dialogTool->GetNotes(),
+                                         [](const QString &notes){return notes.isEmpty();});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -435,10 +434,14 @@ void VToolPointOfIntersectionCurves::SaveOptions(QDomElement &tag, QSharedPointe
     doc->SetAttribute(tag, AttrCurve2, secondCurveId);
     doc->SetAttribute(tag, AttrVCrossPoint, static_cast<int>(vCrossPoint));
     doc->SetAttribute(tag, AttrHCrossPoint, static_cast<int>(hCrossPoint));
-    doc->SetAttributeOrRemoveIf(tag, AttrCurve1Alias1, m_curve1AliasSuffix1, m_curve1AliasSuffix1.isEmpty());
-    doc->SetAttributeOrRemoveIf(tag, AttrCurve1Alias2, m_curve1AliasSuffix2, m_curve1AliasSuffix2.isEmpty());
-    doc->SetAttributeOrRemoveIf(tag, AttrCurve2Alias1, m_curve2AliasSuffix1, m_curve2AliasSuffix1.isEmpty());
-    doc->SetAttributeOrRemoveIf(tag, AttrCurve2Alias2, m_curve2AliasSuffix2, m_curve2AliasSuffix2.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(tag, AttrCurve1Alias1, m_curve1AliasSuffix1,
+                                         [](const QString &suffix){return suffix.isEmpty();});
+    doc->SetAttributeOrRemoveIf<QString>(tag, AttrCurve1Alias2, m_curve1AliasSuffix2,
+                                         [](const QString &suffix){return suffix.isEmpty();});
+    doc->SetAttributeOrRemoveIf<QString>(tag, AttrCurve2Alias1, m_curve2AliasSuffix1,
+                                         [](const QString &suffix){return suffix.isEmpty();});
+    doc->SetAttributeOrRemoveIf<QString>(tag, AttrCurve2Alias2, m_curve2AliasSuffix2,
+                                         [](const QString &suffix){return suffix.isEmpty();});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp
index 69d689438..e6b6f08db 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp
@@ -306,7 +306,8 @@ void VToolTriangle::SaveDialog(QDomElement &domElement, QList<quint32> &oldDepen
     doc->SetAttribute(domElement, AttrSecondPoint, QString().setNum(dialogTool->GetSecondPointId()));
 
     const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, notes,
+                                         [](const QString &notes){return notes.isEmpty();});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/tools/drawTools/vdrawtool.cpp b/src/libs/vtools/tools/drawTools/vdrawtool.cpp
index 1a30a49ea..45e3ab8e6 100644
--- a/src/libs/vtools/tools/drawTools/vdrawtool.cpp
+++ b/src/libs/vtools/tools/drawTools/vdrawtool.cpp
@@ -176,7 +176,7 @@ void VDrawTool::SaveOptions(QDomElement &tag, QSharedPointer<VGObject> &obj)
     Q_UNUSED(obj)
 
     doc->SetAttribute(tag, VDomDocument::AttrId, m_id);
-    doc->SetAttributeOrRemoveIf(tag, AttrNotes, m_notes, m_notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(tag, AttrNotes, m_notes, [](const QString &notes){return notes.isEmpty();});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/tools/drawTools/vtoolline.cpp b/src/libs/vtools/tools/drawTools/vtoolline.cpp
index c5356fb07..0be50d268 100644
--- a/src/libs/vtools/tools/drawTools/vtoolline.cpp
+++ b/src/libs/vtools/tools/drawTools/vtoolline.cpp
@@ -393,9 +393,8 @@ void VToolLine::SaveDialog(QDomElement &domElement, QList<quint32> &oldDependenc
     doc->SetAttribute(domElement, AttrSecondPoint, QString().setNum(dialogTool->GetSecondPoint()));
     doc->SetAttribute(domElement, AttrTypeLine, dialogTool->GetTypeLine());
     doc->SetAttribute(domElement, AttrLineColor, dialogTool->GetLineColor());
-
-    const QString notes = dialogTool->GetNotes();
-    doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrNotes, dialogTool->GetNotes(),
+                                         [](const QString &notes){return notes.isEmpty();});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/tools/vabstracttool.cpp b/src/libs/vtools/tools/vabstracttool.cpp
index 863609606..f32b38d25 100644
--- a/src/libs/vtools/tools/vabstracttool.cpp
+++ b/src/libs/vtools/tools/vabstracttool.cpp
@@ -541,9 +541,10 @@ QDomElement VAbstractTool::AddSANode(VAbstractPattern *doc, const QString &tagNa
         }
     }
 
-    doc->SetAttributeOrRemoveIf(nod, VAbstractPattern::AttrNodeExcluded, node.IsExcluded(), not node.IsExcluded());
-    doc->SetAttributeOrRemoveIf(nod, VAbstractPattern::AttrCheckUniqueness, node.IsCheckUniqueness(),
-                                node.IsCheckUniqueness());
+    doc->SetAttributeOrRemoveIf<bool>(nod, VAbstractPattern::AttrNodeExcluded, node.IsExcluded(),
+                                      [](bool exclude){return not exclude;});
+    doc->SetAttributeOrRemoveIf<bool>(nod, VAbstractPattern::AttrCheckUniqueness, node.IsCheckUniqueness(),
+                                      [](bool uniqueness){return uniqueness;});
 
     switch (type)
     {
@@ -600,13 +601,13 @@ QDomElement VAbstractTool::AddSANode(VAbstractPattern *doc, const QString &tagNa
         nod.removeAttribute(VAbstractPattern::AttrNodePassmarkAngle);
     }
 
-    doc->SetAttributeOrRemoveIf(nod, VAbstractPattern::AttrNodeShowSecondPassmark, node.IsShowSecondPassmark(),
-                                node.IsShowSecondPassmark());
+    doc->SetAttributeOrRemoveIf<bool>(nod, VAbstractPattern::AttrNodeShowSecondPassmark, node.IsShowSecondPassmark(),
+                                      [](bool show){return show;});
 
-    doc->SetAttributeOrRemoveIf(nod, VAbstractPattern::AttrManualPassmarkLength, node.IsManualPassmarkLength(),
-                                not node.IsManualPassmarkLength());
-    doc->SetAttributeOrRemoveIf(nod, VAbstractPattern::AttrPassmarkLength, node.GetFormulaPassmarkLength(),
-                                not node.IsManualPassmarkLength());
+    doc->SetAttributeOrRemoveIf<bool>(nod, VAbstractPattern::AttrManualPassmarkLength, node.IsManualPassmarkLength(),
+                                      [](bool manualPassmarkLength){return not manualPassmarkLength;});
+    doc->SetAttributeOrRemoveIf<QString>(nod, VAbstractPattern::AttrPassmarkLength, node.GetFormulaPassmarkLength(),
+                                         [node](const QString &){return not node.IsManualPassmarkLength();});
 
     return nod;
 }
diff --git a/src/libs/vtools/tools/vtoolseamallowance.cpp b/src/libs/vtools/tools/vtoolseamallowance.cpp
index 25aedee20..a6ac6a4be 100644
--- a/src/libs/vtools/tools/vtoolseamallowance.cpp
+++ b/src/libs/vtools/tools/vtoolseamallowance.cpp
@@ -64,6 +64,7 @@
 #include <QMenu>
 #include <QMessageBox>
 #include <QTimer>
+#include <QUuid>
 
 // Current version of seam allowance tag need for backward compatibility
 const quint8 VToolSeamAllowance::pieceVersion = 2;
@@ -253,6 +254,7 @@ auto VToolSeamAllowance::Duplicate(VToolSeamAllowanceInitData &initData) -> VToo
                                                           replacements));
     dupDetail.SetInternalPaths(DuplicateInternalPaths(initData.detail.GetInternalPaths(), initData));
     dupDetail.SetPlaceLabels(DuplicatePlaceLabels(initData.detail.GetPlaceLabels(), initData));
+    dupDetail.SetUUID(QUuid::createUuid());
 
     const QMap<quint32, quint32> mappedPins = DuplicatePins(initData.detail.GetPins(), initData);
     dupDetail.SetPins(mappedPins.values().toVector());
@@ -329,20 +331,25 @@ void VToolSeamAllowance::AddAttributes(VAbstractPattern *doc, QDomElement &domEl
 
     doc->SetAttribute(domElement, VDomDocument::AttrId, id);
     doc->SetAttribute(domElement, AttrName, piece.GetName());
+    doc->SetAttribute(domElement, AttrUUID, piece.GetUUID().toString());
+    doc->SetAttributeOrRemoveIf<QString>(domElement, AttrGradationLabel, piece.GetGradationLabel(),
+                                         [](const QString &label){return label.isEmpty();});
     doc->SetAttribute(domElement, AttrVersion, QString().setNum(pieceVersion));
     doc->SetAttribute(domElement, AttrMx, VAbstractValApplication::VApp()->fromPixel(piece.GetMx()));
     doc->SetAttribute(domElement, AttrMy, VAbstractValApplication::VApp()->fromPixel(piece.GetMy()));
-    doc->SetAttributeOrRemoveIf(domElement, AttrInLayout, piece.IsInLayout(), piece.IsInLayout());
+    doc->SetAttributeOrRemoveIf<bool>(domElement, AttrInLayout, piece.IsInLayout(),
+                                      [](bool inLayout){return inLayout;});
     doc->SetAttribute(domElement, AttrForbidFlipping, piece.IsForbidFlipping());
     doc->SetAttribute(domElement, AttrForceFlipping, piece.IsForceFlipping());
-    doc->SetAttributeOrRemoveIf(domElement, AttrSeamAllowance, piece.IsSeamAllowance(),
-                                not piece.IsSeamAllowance());
+    doc->SetAttributeOrRemoveIf<bool>(domElement, AttrSeamAllowance, piece.IsSeamAllowance(),
+                                      [](bool seamAllowance){return not seamAllowance;});
     doc->SetAttribute(domElement, AttrHideMainPath, piece.IsHideMainPath());
-    doc->SetAttributeOrRemoveIf(domElement, AttrSeamAllowanceBuiltIn, piece.IsSeamAllowanceBuiltIn(),
-                                not piece.IsSeamAllowanceBuiltIn());
+    doc->SetAttributeOrRemoveIf<bool>(domElement, AttrSeamAllowanceBuiltIn, piece.IsSeamAllowanceBuiltIn(),
+                                      [](bool builtin){return not builtin;});
     doc->SetAttribute(domElement, AttrWidth, piece.GetFormulaSAWidth());
-    doc->SetAttributeOrRemoveIf(domElement, AttrUnited, piece.IsUnited(), not piece.IsUnited());
-    doc->SetAttributeOrRemoveIf(domElement, AttrPiecePriority, piece.GetPriority(), piece.GetPriority() == 0);
+    doc->SetAttributeOrRemoveIf<bool>(domElement, AttrUnited, piece.IsUnited(), [](bool united){return not united;});
+    doc->SetAttributeOrRemoveIf<uint>(domElement, AttrPiecePriority, piece.GetPriority(),
+                                      [](uint priority){return priority == 0;});
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -423,9 +430,12 @@ void VToolSeamAllowance::AddPatternPieceData(VAbstractPattern *doc, QDomElement
     doc->SetAttribute(domData, AttrHeight, data.GetLabelHeight());
     doc->SetAttribute(domData, AttrFont, data.GetFontSize());
     doc->SetAttribute(domData, VAbstractPattern::AttrRotation, data.GetRotation());
-    doc->SetAttributeOrRemoveIf(domData, AttrCenterPin, data.CenterPin(), data.CenterPin() <= NULL_ID);
-    doc->SetAttributeOrRemoveIf(domData, AttrTopLeftPin, data.TopLeftPin(), data.TopLeftPin() <= NULL_ID);
-    doc->SetAttributeOrRemoveIf(domData, AttrBottomRightPin, data.BottomRightPin(), data.BottomRightPin() <= NULL_ID);
+    doc->SetAttributeOrRemoveIf<quint32>(domData, AttrCenterPin, data.CenterPin(),
+                                         [](quint32 pin){return pin == NULL_ID;});
+    doc->SetAttributeOrRemoveIf<quint32>(domData, AttrTopLeftPin, data.TopLeftPin(),
+                                         [](quint32 leftPin){return leftPin == NULL_ID;});
+    doc->SetAttributeOrRemoveIf<quint32>(domData, AttrBottomRightPin, data.BottomRightPin(),
+                                         [](quint32 rightPin){return rightPin == NULL_ID;});
     doc->SetLabelTemplate(domData, data.GetLabelTemplate());
 
     domElement.appendChild(domData);
@@ -443,9 +453,12 @@ void VToolSeamAllowance::AddPatternInfo(VAbstractPattern *doc, QDomElement &domE
     doc->SetAttribute(domData, AttrHeight, geom.GetLabelHeight());
     doc->SetAttribute(domData, AttrFont, geom.GetFontSize());
     doc->SetAttribute(domData, VAbstractPattern::AttrRotation, geom.GetRotation());
-    doc->SetAttributeOrRemoveIf(domData, AttrCenterPin, geom.CenterPin(), geom.CenterPin() <= NULL_ID);
-    doc->SetAttributeOrRemoveIf(domData, AttrTopLeftPin, geom.TopLeftPin(), geom.TopLeftPin() <= NULL_ID);
-    doc->SetAttributeOrRemoveIf(domData, AttrBottomRightPin, geom.BottomRightPin(), geom.BottomRightPin() <= NULL_ID);
+    doc->SetAttributeOrRemoveIf<quint32>(domData, AttrCenterPin, geom.CenterPin(),
+                                         [](quint32 pin){return pin <= NULL_ID;});
+    doc->SetAttributeOrRemoveIf<quint32>(domData, AttrTopLeftPin, geom.TopLeftPin(),
+                                         [](quint32 pin){return pin <= NULL_ID;});
+    doc->SetAttributeOrRemoveIf<quint32>(domData, AttrBottomRightPin, geom.BottomRightPin(),
+                                         [](quint32 pin){return pin <= NULL_ID;});
 
     domElement.appendChild(domData);
 }
@@ -462,9 +475,12 @@ void VToolSeamAllowance::AddGrainline(VAbstractPattern *doc, QDomElement &domEle
     doc->SetAttribute(domData, AttrLength, glGeom.GetLength());
     doc->SetAttribute(domData, VAbstractPattern::AttrRotation, glGeom.GetRotation());
     doc->SetAttribute(domData, VAbstractPattern::AttrArrows, int(glGeom.GetArrowType()));
-    doc->SetAttributeOrRemoveIf(domData, AttrCenterPin, glGeom.CenterPin(), glGeom.CenterPin() <= NULL_ID);
-    doc->SetAttributeOrRemoveIf(domData, AttrTopPin, glGeom.TopPin(), glGeom.TopPin() <= NULL_ID);
-    doc->SetAttributeOrRemoveIf(domData, AttrBottomPin, glGeom.BottomPin(), glGeom.BottomPin() <= NULL_ID);
+    doc->SetAttributeOrRemoveIf<quint32>(domData, AttrCenterPin, glGeom.CenterPin(),
+                                         [](quint32 pin){return pin <= NULL_ID;});
+    doc->SetAttributeOrRemoveIf<quint32>(domData, AttrTopPin, glGeom.TopPin(),
+                                         [](quint32 pin){return pin <= NULL_ID;});
+    doc->SetAttributeOrRemoveIf<quint32>(domData, AttrBottomPin, glGeom.BottomPin(),
+                                         [](quint32 pin){return pin <= NULL_ID;});
 
     domElement.appendChild(domData);
 }
@@ -1005,7 +1021,7 @@ void VToolSeamAllowance::RefreshDataInFile()
         // Refresh only parts that we possibly need to update
         {
             // TODO. Delete if minimal supported version is 0.4.0
-            Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 4, 0),
+            Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 4, 0),
                               "Time to refactor the code.");
 
             const uint version = doc->GetParametrUInt(domElement, AttrVersion, QChar('1'));
diff --git a/src/libs/vtools/tools/vtooluniondetails.cpp b/src/libs/vtools/tools/vtooluniondetails.cpp
index 5c5bfd8c2..f3c14902d 100644
--- a/src/libs/vtools/tools/vtooluniondetails.cpp
+++ b/src/libs/vtools/tools/vtooluniondetails.cpp
@@ -1339,7 +1339,7 @@ void UpdateUnitedNodes(const VToolUnionDetailsInitData &initData, qreal dx, qrea
     {
         // This check need for backward compatibility
         // Remove check and "else" part if min version is 0.3.2
-        Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 3, 2),
+        Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 3, 2),
                           "Time to refactor the code.");
         if (children.size() == countNodeD1 + countNodeD2-1)
         {
@@ -1396,7 +1396,7 @@ void UpdateUnitedNodes(const VToolUnionDetailsInitData &initData, qreal dx, qrea
 QVector<quint32> FixChildren(QVector<quint32> records, QVector<quint32> children, VContainer *data)
 {
     // TODO. Delete if minimal supported version is 0.7.0
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 7, 0),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 7, 0),
                       "Time to refactor the code.");
     SCASSERT(data != nullptr)
 
@@ -1434,7 +1434,7 @@ void UpdateUnitedDetailPaths(const VToolUnionDetailsInitData &initData, qreal dx
     if (initData.version == 1)
     {
         // TODO. Delete if minimal supported version is 0.7.0
-        Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 7, 0),
+        Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 7, 0),
                           "Time to refactor the code.");
         // Fixing bug in first version of the tool. Mostly for backward compatibility.
         children = FixChildren(records, children, initData.data);
@@ -1447,7 +1447,7 @@ void UpdateUnitedDetailPaths(const VToolUnionDetailsInitData &initData, qreal dx
         if (initData.version == 1)
         {
             // TODO. Delete if minimal supported version is 0.7.0
-            Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 7, 0),
+            Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 7, 0),
                               "Time to refactor the code.");
             const quint32 updatedId = TakeNextId(children);
 
diff --git a/src/libs/vtools/undocommands/togglepiecestate.cpp b/src/libs/vtools/undocommands/togglepiecestate.cpp
index 7b8d71458..dac2ebfb9 100644
--- a/src/libs/vtools/undocommands/togglepiecestate.cpp
+++ b/src/libs/vtools/undocommands/togglepiecestate.cpp
@@ -74,7 +74,7 @@ void TogglePieceInLayout::Do(bool state)
     QDomElement detail = doc->elementById(m_id, VAbstractPattern::TagDetail);
     if (detail.isElement())
     {
-        doc->SetAttributeOrRemoveIf(detail, AttrInLayout, state, state);
+        doc->SetAttributeOrRemoveIf<bool>(detail, AttrInLayout, state, [](bool state){return state;});
 
         VPiece det = m_data->DataPieces()->value(m_id);
         det.SetInLayout(state);
diff --git a/src/libs/vwidgets/qtcolorpicker.cpp b/src/libs/vwidgets/qtcolorpicker.cpp
new file mode 100644
index 000000000..4d77c6edf
--- /dev/null
+++ b/src/libs/vwidgets/qtcolorpicker.cpp
@@ -0,0 +1,1274 @@
+/****************************************************************************
+** 
+** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+** 
+** This file is part of a Qt Solutions component.
+**
+** Commercial Usage  
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Solutions Commercial License Agreement provided
+** with the Software or, alternatively, in accordance with the terms
+** contained in a written agreement between you and Nokia.
+** 
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** 
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** 
+** GNU General Public License Usage 
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 
+** Please note Third Party Software included with Qt Solutions may impose
+** additional restrictions and it is the user's responsibility to ensure
+** that they have met the licensing requirements of the GPL, LGPL, or Qt
+** Solutions Commercial license and the relevant license of the Third
+** Party Software they are using.
+** 
+** If you are unsure which license is appropriate for your use, please
+** contact Nokia at qt-info@nokia.com.
+** 
+****************************************************************************/
+
+#include <QApplication>
+#include <QPainter>
+#include <QPushButton>
+#include <QColorDialog>
+#include <QtCore/QMap>
+#include <QLayout>
+#include <QStyle>
+#include <QLabel>
+#include <QToolTip>
+#include <QPixmap>
+#include <QFocusEvent>
+#include <QPaintEvent>
+#include <QGridLayout>
+#include <QHideEvent>
+#include <QKeyEvent>
+#include <QShowEvent>
+#include <QMouseEvent>
+#include <cmath>
+
+#include "qtcolorpicker.h"
+
+/*! \class QtColorPicker
+
+    \brief The QtColorPicker class provides a widget for selecting
+    colors from a popup color grid.
+
+    Users can invoke the color picker by clicking on it, or by
+    navigating to it and pressing Space. They can use the mouse or
+    arrow keys to navigate between colors on the grid, and select a
+    color by clicking or by pressing Enter or Space. The
+    colorChanged() signal is emitted whenever the color picker's color
+    changes.
+
+    The widget also supports negative selection: Users can click and
+    hold the mouse button on the QtColorPicker widget, then move the
+    mouse over the color grid and release the mouse button over the
+    color they wish to select.
+
+    The color grid shows a customized selection of colors. An optional
+    ellipsis "..." button (signifying "more") can be added at the
+    bottom of the grid; if the user presses this, a QColorDialog pops
+    up and lets them choose any color they like. This button is made
+    available by using setColorDialogEnabled().
+
+    When a color is selected, the QtColorPicker widget shows the color
+    and its name. If the name cannot be determined, the translatable
+    name "Custom" is used.
+
+    The QtColorPicker object is optionally initialized with the number
+    of columns in the color grid. Colors are then added left to right,
+    top to bottom using insertColor(). If the number of columns is not
+    set, QtColorPicker calculates the number of columns and rows that
+    will make the grid as square as possible.
+
+    \code
+    DrawWidget::DrawWidget(QWidget *parent, const char *name)
+    {
+        QtColorPicker *picker = new QtColorPicker(this);
+        picker->insertColor(red, "Red"));
+        picker->insertColor(QColor("green"), "Green"));
+        picker->insertColor(QColor(0, 0, 255), "Blue"));
+        picker->insertColor(white);
+
+        connect(colors, SIGNAL(colorChanged(const QColor &)), SLOT(setCurrentColor(const QColor &)));
+    }
+    \endcode
+
+    An alternative to adding colors manually is to initialize the grid
+    with QColorDialog's standard colors using setStandardColors().
+
+    QtColorPicker also provides a the static function getColor(),
+    which pops up the grid of standard colors at any given point.
+
+    \img colorpicker1.png
+    \img colorpicker2.png
+
+    \sa QColorDialog
+*/
+
+/*! \fn QtColorPicker::colorChanged(const QColor &color)
+
+    This signal is emitted when the QtColorPicker's color is changed.
+    \a color is the new color.
+
+    To obtain the color's name, use text().
+*/
+
+/*
+    A class  that acts very much  like a QPushButton. It's not styled,
+    so we  can  expect  the  exact  same    look,  feel and   geometry
+    everywhere.     Also,  this  button     always emits   clicked  on
+    mouseRelease, even if the mouse button was  not pressed inside the
+    widget.
+*/
+class ColorPickerButton : public QFrame
+{
+    Q_OBJECT
+
+public:
+    explicit ColorPickerButton(QWidget *parent);
+
+signals:
+    void clicked();
+
+protected:
+    void mousePressEvent(QMouseEvent *e) override;
+    void mouseMoveEvent(QMouseEvent *e) override;
+    void mouseReleaseEvent(QMouseEvent *e) override;
+    void keyPressEvent(QKeyEvent *e) override;
+    void keyReleaseEvent(QKeyEvent *e) override;
+    void paintEvent(QPaintEvent *e) override;
+    void focusInEvent(QFocusEvent *e) override;
+    void focusOutEvent(QFocusEvent *e) override;
+};
+
+/*
+    This class represents each "color" or item in the color grid.
+*/
+class ColorPickerItem : public QFrame
+{
+    Q_OBJECT
+
+public:
+    ColorPickerItem(const QColor &color = Qt::white, const QString &text = QString(),
+		      QWidget *parent = 0);
+    ~ColorPickerItem();
+
+    QColor color() const;
+    QString text() const;
+
+    void setSelected(bool);
+    bool isSelected() const;
+signals:
+    void clicked();
+    void selected();
+
+public slots:
+    void setColor(const QColor &color, const QString &text = QString());
+
+protected:
+    void mousePressEvent(QMouseEvent *e);
+    void mouseReleaseEvent(QMouseEvent *e);
+    void mouseMoveEvent(QMouseEvent *e);
+    void paintEvent(QPaintEvent *e);
+
+private:
+    QColor c;
+    QString t;
+    bool sel;
+};
+
+/*
+
+*/
+class ColorPickerPopup : public QFrame
+{
+    Q_OBJECT
+
+public:
+    ColorPickerPopup(int width, bool withColorDialog,
+               QWidget *parent = nullptr);
+    ~ColorPickerPopup();
+
+    void insertColor(const QColor &col, const QString &text, int index);
+    void exec();
+
+    void setExecFlag();
+
+    QColor lastSelected() const;
+
+    ColorPickerItem *find(const QColor &col) const;
+    QColor color(int index) const;
+
+    auto CustomItems() const -> QVector<ColorPickerItem *>;
+
+signals:
+    void selected(const QColor &);
+    void hid();
+
+public slots:
+    void getColorFromDialog();
+
+protected slots:
+    void updateSelected();
+
+protected:
+    void keyPressEvent(QKeyEvent *e);
+    void showEvent(QShowEvent *e);
+    void hideEvent(QHideEvent *e);
+    void mouseReleaseEvent(QMouseEvent *e);
+
+    void regenerateGrid();
+
+private:
+    Q_DISABLE_COPY(ColorPickerPopup)
+    QMap<int, QMap<int, QWidget *> > widgetAt{};
+    QList<ColorPickerItem *> items{};
+    QGridLayout *grid{nullptr};
+    ColorPickerButton *moreButton{nullptr};
+    QEventLoop *eventLoop{nullptr};
+
+    int lastPos{0};
+    int cols;
+    QColor lastSel{};
+};
+
+/*!
+    Constructs a QtColorPicker widget. The popup will display a grid
+    with \a cols columns, or if \a cols is -1, the number of columns
+    will be calculated automatically.
+
+    If \a enableColorDialog is true, the popup will also have a "More"
+    button (signified by an ellipsis "...") that presents a
+    QColorDialog when clicked.
+
+    After constructing a QtColorPicker, call insertColor() to add
+    individual colors to the popup grid, or call setStandardColors()
+    to add all the standard colors in one go.
+
+    The \a parent argument is passed to QFrame's constructor.
+
+    \sa QFrame
+*/
+QtColorPicker::QtColorPicker(QWidget *parent,
+			     int cols, bool enableColorDialog)
+    : QPushButton(parent), popup(0), withColorDialog(enableColorDialog)
+{
+    setFocusPolicy(Qt::StrongFocus);
+    setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+    setAutoDefault(false);
+    setAutoFillBackground(true);
+    setCheckable(true);
+
+    // Set text
+    setText(tr("Black"));
+    firstInserted = false;
+
+    // Create and set icon
+    col = Qt::black;
+    dirty = true;
+
+    // Create color grid popup and connect to it.
+    popup = new ColorPickerPopup(cols, withColorDialog, this);
+    connect(popup, SIGNAL(selected(const QColor &)),
+	    SLOT(setCurrentColor(const QColor &)));
+    connect(popup, SIGNAL(hid()), SLOT(popupClosed()));
+
+    // Connect this push button's pressed() signal.
+    connect(this, SIGNAL(toggled(bool)), SLOT(buttonPressed(bool)));
+}
+
+/*!
+    Destructs the QtColorPicker.
+*/
+QtColorPicker::~QtColorPicker()
+{
+}
+
+/*! \internal
+
+    Pops up the color grid, and makes sure the status of
+    QtColorPicker's button is right.
+*/
+void QtColorPicker::buttonPressed(bool toggled)
+{
+    if (!toggled)
+        return;
+
+    const QRect desktop = this->parentWidget()->geometry();
+    // Make sure the popup is inside the desktop.
+    QPoint pos = rect().bottomLeft();
+    if (pos.x() < desktop.left())
+       pos.setX(desktop.left());
+    if (pos.y() < desktop.top())
+       pos.setY(desktop.top());
+
+    if ((pos.x() + popup->sizeHint().width()) > desktop.width())
+       pos.setX(desktop.width() - popup->sizeHint().width());
+    if ((pos.y() + popup->sizeHint().height()) > desktop.bottom())
+       pos.setY(desktop.bottom() - popup->sizeHint().height());
+    popup->move(mapToGlobal(pos));
+
+    if (ColorPickerItem *item = popup->find(col))
+        item->setSelected(true);
+
+    // Remove focus from this widget, preventing the focus rect
+    // from showing when the popup is shown. Order an update to
+    // make sure the focus rect is cleared.
+    clearFocus();
+    update();
+
+    // Allow keyboard navigation as soon as the popup shows.
+    popup->setFocus();
+
+    // Execute the popup. The popup will enter the event loop.
+    popup->show();
+}
+
+/*!
+    \internal
+*/
+void QtColorPicker::paintEvent(QPaintEvent *e)
+{
+    if (dirty) {
+        int iconSize = style()->pixelMetric(QStyle::PM_SmallIconSize);
+        QPixmap pix(iconSize, iconSize);
+        pix.fill(palette().button().color());
+
+        QPainter p(&pix);
+
+        int w = pix.width();			// width of cell in pixels
+        int h = pix.height();			// height of cell in pixels
+        p.setPen(QPen(Qt::gray));
+        p.setBrush(col);
+        p.drawRect(2, 2, w - 5, h - 5);
+        setIcon(QIcon(pix));
+
+        dirty = false;
+    }
+    QPushButton::paintEvent(e);
+}
+
+/*! \internal
+
+    Makes sure the button isn't pressed when the popup hides.
+*/
+void QtColorPicker::popupClosed()
+{
+    setChecked(false);
+    setFocus();
+}
+
+/*!
+    Returns the currently selected color.
+
+    \sa text()
+*/
+QColor QtColorPicker::currentColor() const
+{
+    return col;
+}
+
+/*!
+    Returns the color at position \a index.
+*/
+QColor QtColorPicker::color(int index) const
+{
+    return popup->color(index);
+}
+
+/*!
+    Adds the 17 predefined colors from the Qt namespace.
+
+    (The names given to the colors, "Black", "White", "Red", etc., are
+    all translatable.)
+
+    \sa insertColor()
+*/
+void QtColorPicker::setStandardColors()
+{
+    insertColor(Qt::black, tr("Black"));
+    insertColor(Qt::white, tr("White"));
+    insertColor(Qt::red, tr("Red"));
+    insertColor(Qt::darkRed, tr("Dark red"));
+    insertColor(Qt::green, tr("Green"));
+    insertColor(Qt::darkGreen, tr("Dark green"));
+    insertColor(Qt::blue, tr("Blue"));
+    insertColor(Qt::darkBlue, tr("Dark blue"));
+    insertColor(Qt::cyan, tr("Cyan"));
+    insertColor(Qt::darkCyan, tr("Dark cyan"));
+    insertColor(Qt::magenta, tr("Magenta"));
+    insertColor(Qt::darkMagenta, tr("Dark magenta"));
+    insertColor(Qt::yellow, tr("Yellow"));
+    insertColor(Qt::darkYellow, tr("Dark yellow"));
+    insertColor(Qt::gray, tr("Gray"));
+    insertColor(Qt::darkGray, tr("Dark gray"));
+    insertColor(Qt::lightGray, tr("Light gray"));
+}
+
+auto QtColorPicker::CustomColors() const -> QVector<QColor>
+{
+    QVector<QColor> customColor;
+    if (popup != nullptr)
+    {
+        QVector<ColorPickerItem *> items = popup->CustomItems();
+        customColor.reserve(items.size());
+
+        for (auto *item : items)
+        {
+            if (item != nullptr)
+            {
+                customColor.append(item->color());
+            }
+        }
+    }
+    return customColor;
+}
+
+
+/*!
+    Makes \a color current. If \a color is not already in the color grid, it
+    is inserted with the text "Custom".
+
+    This function emits the colorChanged() signal if the new color is
+    valid, and different from the old one.
+*/
+void QtColorPicker::setCurrentColor(const QColor &color)
+{
+    if (col == color || !color.isValid())
+	return;
+
+    ColorPickerItem *item = popup->find(color);
+    if (!item)
+    {
+	insertColor(color, tr("Custom"));
+	item = popup->find(color);
+    }
+
+    col = color;
+    setText(item->text());
+
+    dirty = true;
+
+    popup->hide();
+    repaint();
+
+    item->setSelected(true);
+    emit colorChanged(color);
+}
+
+/*!
+    Adds the color \a color with the name \a text to the color grid,
+    at position \a index. If index is -1, the color is assigned
+    automatically assigned a position, starting from left to right,
+    top to bottom.
+*/
+void QtColorPicker::insertColor(const QColor &color, const QString &text, int index)
+{
+    popup->insertColor(color, text, index);
+    if (!firstInserted) {
+	col = color;
+	setText(text);
+	firstInserted = true;
+    }
+}
+
+/*! \property QtColorPicker::colorDialog
+    \brief Whether the ellipsis "..." (more) button is available.
+
+    If this property is set to TRUE, the color grid popup will include
+    a "More" button (signified by an ellipsis, "...") which pops up a
+    QColorDialog when clicked. The user will then be able to select
+    any custom color they like.
+*/
+void QtColorPicker::setColorDialogEnabled(bool enabled)
+{
+    withColorDialog = enabled;
+}
+bool QtColorPicker::colorDialogEnabled() const
+{
+    return withColorDialog;
+}
+
+/*!
+    Pops up a color grid with Qt default colors at \a point, using
+    global coordinates. If \a allowCustomColors is true, there will
+    also be a button on the popup that invokes QColorDialog.
+
+    For example:
+
+    \code
+        void Drawer::mouseReleaseEvent(QMouseEvent *e)
+        {
+	    if (e->button() & RightButton) {
+                QColor color = QtColorPicker::getColor(mapToGlobal(e->pos()));
+            }
+        }
+    \endcode
+*/
+QColor QtColorPicker::getColor(const QPoint &point, bool allowCustomColors)
+{
+    ColorPickerPopup popup(-1, allowCustomColors);
+
+    popup.insertColor(Qt::black, tr("Black"), 0);
+    popup.insertColor(Qt::white, tr("White"), 1);
+    popup.insertColor(Qt::red, tr("Red"), 2);
+    popup.insertColor(Qt::darkRed, tr("Dark red"), 3);
+    popup.insertColor(Qt::green, tr("Green"), 4);
+    popup.insertColor(Qt::darkGreen, tr("Dark green"), 5);
+    popup.insertColor(Qt::blue, tr("Blue"), 6);
+    popup.insertColor(Qt::darkBlue, tr("Dark blue"), 7);
+    popup.insertColor(Qt::cyan, tr("Cyan"), 8);
+    popup.insertColor(Qt::darkCyan, tr("Dark cyan"), 9);
+    popup.insertColor(Qt::magenta, tr("Magenta"), 10);
+    popup.insertColor(Qt::darkMagenta, tr("Dark magenta"), 11);
+    popup.insertColor(Qt::yellow, tr("Yellow"), 12);
+    popup.insertColor(Qt::darkYellow, tr("Dark yellow"), 13);
+    popup.insertColor(Qt::gray, tr("Gray"), 14);
+    popup.insertColor(Qt::darkGray, tr("Dark gray"), 15);
+    popup.insertColor(Qt::lightGray, tr("Light gray"), 16);
+
+    popup.move(point);
+    popup.exec();
+    return popup.lastSelected();
+}
+
+/*! \internal
+
+    Constructs the popup widget.
+*/
+ColorPickerPopup::ColorPickerPopup(int width, bool withColorDialog, QWidget *parent)
+    : QFrame(parent, Qt::Popup),
+      cols(width)
+{
+    setFrameStyle(QFrame::StyledPanel);
+    setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+
+    setFocusPolicy(Qt::StrongFocus);
+    setMouseTracking(true);
+
+    if (withColorDialog)
+    {
+        moreButton = new ColorPickerButton(this);
+        moreButton->setFixedWidth(24);
+        moreButton->setFixedHeight(21);
+        moreButton->setFrameRect(QRect(2, 2, 20, 17));
+        connect(moreButton, SIGNAL(clicked()), SLOT(getColorFromDialog()));
+    }
+    else
+    {
+        moreButton = 0;
+    }
+
+    eventLoop = nullptr;
+    grid = nullptr;
+    regenerateGrid();
+}
+
+
+/*! \internal
+
+    Destructs the popup widget.
+*/
+ColorPickerPopup::~ColorPickerPopup()
+{
+    if (eventLoop != nullptr)
+    {
+        eventLoop->exit();
+    }
+}
+
+/*! \internal
+
+    If there is an item whole color is equal to \a col, returns a
+    pointer to this item; otherwise returns 0.
+*/
+ColorPickerItem *ColorPickerPopup::find(const QColor &col) const
+{
+    for (auto *item : items)
+    {
+        if (item && item->color() == col)
+        {
+            return item;
+        }
+    }
+
+    return nullptr;
+}
+
+/*! \internal
+
+    Adds \a item to the grid. The items are added from top-left to
+    bottom-right.
+*/
+void ColorPickerPopup::insertColor(const QColor &col, const QString &text, int index)
+{
+    // Don't add colors that we have already.
+    ColorPickerItem *existingItem = find(col);
+    ColorPickerItem *lastSelectedItem = find(lastSelected());
+
+    if (existingItem != nullptr)
+    {
+        if (lastSelectedItem && existingItem != lastSelectedItem)
+        {
+            lastSelectedItem->setSelected(false);
+        }
+        existingItem->setFocus();
+        existingItem->setSelected(true);
+        return;
+    }
+
+    auto *item = new ColorPickerItem(col, text, this);
+
+    if (lastSelectedItem)
+    {
+        lastSelectedItem->setSelected(false);
+    }
+    else
+    {
+        item->setSelected(true);
+        lastSel = col;
+    }
+    item->setFocus();
+
+    connect(item, SIGNAL(selected()), SLOT(updateSelected()));
+
+    if (index == -1)
+    {
+        index = items.count();
+    }
+
+    items.insert(index, item);
+    regenerateGrid();
+
+    update();
+}
+
+/*! \internal
+
+*/
+QColor ColorPickerPopup::color(int index) const
+{
+    if (index < 0 || index > static_cast<int> (items.count() - 1))
+    {
+        return QColor();
+    }
+
+    auto *that = const_cast<ColorPickerPopup *>(this);
+    return that->items.at(index)->color();
+}
+
+auto ColorPickerPopup::CustomItems() const ->QVector<ColorPickerItem *>
+{
+    QVector<ColorPickerItem *> customItems;
+    customItems.reserve(items.size());
+
+    for (auto *item : items)
+    {
+        if (item!= nullptr && item->text() == tr("Custom"))
+        {
+            customItems.append(item);
+        }
+    }
+
+    return customItems;
+}
+
+/*! \internal
+
+*/
+void ColorPickerPopup::exec()
+{
+    show();
+
+    QEventLoop e;
+    eventLoop = &e;
+    (void) e.exec();
+    eventLoop = nullptr;
+}
+
+/*! \internal
+
+*/
+void ColorPickerPopup::updateSelected()
+{
+    QLayoutItem *layoutItem;
+    int i = 0;
+    while ((layoutItem = grid->itemAt(i)) != 0)
+    {
+        QWidget *w = layoutItem->widget();
+        if (w && w->inherits("ColorPickerItem"))
+        {
+            auto *litem = reinterpret_cast<ColorPickerItem *>(layoutItem->widget());
+            if (litem != sender())
+            {
+                litem->setSelected(false);
+            }
+        }
+        ++i;
+    }
+
+    if (sender() && sender()->inherits("ColorPickerItem"))
+    {
+        auto *item = static_cast<ColorPickerItem *>(sender());
+        lastSel = item->color();
+        emit selected(item->color());
+    }
+
+    hide();
+}
+
+/*! \internal
+
+*/
+void ColorPickerPopup::mouseReleaseEvent(QMouseEvent *e)
+{
+    if (!rect().contains(e->pos()))
+    {
+        hide();
+    }
+}
+
+/*! \internal
+
+    Controls keyboard navigation and selection on the color grid.
+*/
+void ColorPickerPopup::keyPressEvent(QKeyEvent *e)
+{
+    int curRow = 0;
+    int curCol = 0;
+
+    bool foundFocus = false;
+    for (int j = 0; !foundFocus && j < grid->rowCount(); ++j)
+    {
+        for (int i = 0; !foundFocus && i < grid->columnCount(); ++i)
+        {
+            if ((widgetAt[j][i] != nullptr) && widgetAt[j][i]->hasFocus())
+            {
+                curRow = j;
+                curCol = i;
+                foundFocus = true;
+                break;
+            }
+        }
+    }
+
+    switch (e->key())
+    {
+        case Qt::Key_Left:
+            if (curCol > 0)
+            {
+                --curCol;
+            }
+            else if (curRow > 0)
+            {
+                --curRow; curCol = grid->columnCount() - 1;
+            }
+            break;
+        case Qt::Key_Right:
+            if (curCol < grid->columnCount() - 1 && widgetAt[curRow][curCol + 1])
+            {
+                ++curCol;
+            }
+            else if (curRow < grid->rowCount() - 1)
+            {
+                ++curRow; curCol = 0;
+            }
+            break;
+        case Qt::Key_Up:
+            if (curRow > 0)
+            {
+                --curRow;
+            }
+            else curCol = 0;
+            break;
+        case Qt::Key_Down:
+            if (curRow < grid->rowCount() - 1)
+            {
+                QWidget *w = widgetAt[curRow + 1][curCol];
+                if (w)
+                {
+                    ++curRow;
+                }
+                else for (int i = 1; i < grid->columnCount(); ++i)
+                {
+                    if (!widgetAt[curRow + 1][i])
+                    {
+                        curCol = i - 1;
+                        ++curRow;
+                        break;
+                    }
+                }
+            }
+            break;
+        case Qt::Key_Space:
+        case Qt::Key_Return:
+        case Qt::Key_Enter:
+        {
+            QWidget *w = widgetAt[curRow][curCol];
+            if ((w != nullptr) && w->inherits("ColorPickerItem"))
+            {
+                ColorPickerItem *wi = reinterpret_cast<ColorPickerItem *>(w);
+                wi->setSelected(true);
+
+                QLayoutItem *layoutItem;
+                int i = 0;
+                while ((layoutItem = grid->itemAt(i)) != 0)
+                {
+                    QWidget *w = layoutItem->widget();
+                    if (w && w->inherits("ColorPickerItem"))
+                    {
+                        ColorPickerItem *litem
+                            = reinterpret_cast<ColorPickerItem *>(layoutItem->widget());
+                        if (litem != wi)
+                        {
+                            litem->setSelected(false);
+                        }
+                    }
+                    ++i;
+                }
+
+                lastSel = wi->color();
+                emit selected(wi->color());
+                hide();
+            }
+            else if (w && w->inherits("QPushButton"))
+            {
+                ColorPickerItem *wi = reinterpret_cast<ColorPickerItem *>(w);
+                wi->setSelected(true);
+
+                QLayoutItem *layoutItem;
+                int i = 0;
+                while ((layoutItem = grid->itemAt(i)) != 0)
+                {
+                    QWidget *w = layoutItem->widget();
+                    if (w && w->inherits("ColorPickerItem"))
+                    {
+                        ColorPickerItem *litem
+                            = reinterpret_cast<ColorPickerItem *>(layoutItem->widget());
+                        if (litem != wi)
+                        {
+                            litem->setSelected(false);
+                        }
+                    }
+                    ++i;
+                }
+
+                lastSel = wi->color();
+                emit selected(wi->color());
+                hide();
+            }
+            break;
+        }
+        case Qt::Key_Escape:
+            hide();
+            break;
+	default:
+	    e->ignore();
+	    break;
+    }
+
+    widgetAt[curRow][curCol]->setFocus();
+}
+
+/*! \internal
+
+*/
+void ColorPickerPopup::hideEvent(QHideEvent *e)
+{
+    if (eventLoop)
+    {
+        eventLoop->exit();
+    }
+
+    setFocus();
+
+    emit hid();
+    QFrame::hideEvent(e);
+}
+
+/*! \internal
+
+*/
+QColor ColorPickerPopup::lastSelected() const
+{
+    return lastSel;
+}
+
+/*! \internal
+
+    Sets focus on the popup to enable keyboard navigation. Draws
+    focusRect and selection rect.
+*/
+void ColorPickerPopup::showEvent(QShowEvent *)
+{
+    bool foundSelected = false;
+    for (int i = 0; i < grid->columnCount(); ++i)
+    {
+        for (int j = 0; j < grid->rowCount(); ++j)
+        {
+            QWidget *w = widgetAt[j][i];
+            if (w && w->inherits("ColorPickerItem"))
+            {
+                if (static_cast<ColorPickerItem *>(w)->isSelected())
+                {
+                    w->setFocus();
+                    foundSelected = true;
+                    break;
+                }
+            }
+        }
+    }
+
+    if (!foundSelected)
+    {
+        if (items.count() == 0)
+        {
+            setFocus();
+        }
+        else
+        {
+            widgetAt[0][0]->setFocus();
+        }
+    }
+}
+
+/*!
+
+*/
+void ColorPickerPopup::regenerateGrid()
+{
+    widgetAt.clear();
+
+    int columns = cols;
+    if (columns == -1)
+    {
+        columns = static_cast<int>(ceil(sqrt(static_cast<float>(items.count()))));
+    }
+
+    // When the number of columns grows, the number of rows will
+    // fall. There's no way to shrink a grid, so we create a new
+    // one.
+    if (grid) delete grid;
+    grid = new QGridLayout(this);
+    grid->setContentsMargins(1, 1, 1, 1);
+    grid->setSpacing(0);
+
+    int ccol = 0, crow = 0;
+    for (int i = 0; i < items.size(); ++i)
+    {
+        if (items.at(i))
+        {
+            widgetAt[crow][ccol] = items.at(i);
+            grid->addWidget(items.at(i), crow, ccol++);
+            if (ccol == columns)
+            {
+                ++crow;
+                ccol = 0;
+            }
+        }
+    }
+
+    if (moreButton)
+    {
+        grid->addWidget(moreButton, crow, ccol);
+        widgetAt[crow][ccol] = moreButton;
+    }
+    updateGeometry();
+}
+
+/*! \internal
+
+    Copies the color dialog's currently selected item and emits
+    itemSelected().
+*/
+void ColorPickerPopup::getColorFromDialog()
+{
+    QColor col = QColorDialog::getColor(lastSel, parentWidget());
+    if (!col.isValid())
+    {
+        return;
+    }
+
+    insertColor(col, tr("Custom"), -1);
+    lastSel = col;
+    emit selected(col);
+}
+
+/*!
+    Constructs a ColorPickerItem whose color is set to \a color, and
+    whose name is set to \a text.
+*/
+ColorPickerItem::ColorPickerItem(const QColor &color, const QString &text,
+				     QWidget *parent)
+    : QFrame(parent), c(color), t(text), sel(false)
+{
+    setToolTip(t);
+    setFixedWidth(24);
+    setFixedHeight(21);
+}
+
+/*!
+    Destructs a ColorPickerItem.
+ */
+ColorPickerItem::~ColorPickerItem()
+{
+}
+
+/*!
+    Returns the item's color.
+
+    \sa text()
+*/
+QColor ColorPickerItem::color() const
+{
+    return c;
+}
+
+/*!
+    Returns the item's text.
+
+    \sa color()
+*/
+QString ColorPickerItem::text() const
+{
+    return t;
+}
+
+/*!
+
+*/
+bool ColorPickerItem::isSelected() const
+{
+    return sel;
+}
+
+/*!
+
+*/
+void ColorPickerItem::setSelected(bool selected)
+{
+    sel = selected;
+    update();
+}
+
+/*!
+    Sets the item's color to \a color, and its name to \a text.
+*/
+void ColorPickerItem::setColor(const QColor &color, const QString &text)
+{
+    c = color;
+    t = text;
+    setToolTip(t);
+    update();
+}
+
+/*!
+
+*/
+void ColorPickerItem::mouseMoveEvent(QMouseEvent *)
+{
+    setFocus();
+    update();
+}
+
+/*!
+
+*/
+void ColorPickerItem::mouseReleaseEvent(QMouseEvent *)
+{
+    sel = true;
+    emit selected();
+}
+
+/*!
+
+*/
+void ColorPickerItem::mousePressEvent(QMouseEvent *)
+{
+    setFocus();
+    update();
+}
+
+/*!
+
+*/
+void ColorPickerItem::paintEvent(QPaintEvent *)
+{
+    QPainter p(this);
+    int w = width();			// width of cell in pixels
+    int h = height();			// height of cell in pixels
+
+    p.setPen( QPen( Qt::gray, 0, Qt::SolidLine ) );
+
+    if (sel)
+    {
+        p.drawRect(1, 1, w - 3, h - 3);
+    }
+
+    p.setPen( QPen( Qt::black, 0, Qt::SolidLine ) );
+    p.drawRect(3, 3, w - 7, h - 7);
+    p.fillRect(QRect(4, 4, w - 8, h - 8), QBrush(c));
+
+    if (hasFocus())
+    {
+        p.drawRect(0, 0, w - 1, h - 1);
+    }
+}
+
+/*!
+
+*/
+ColorPickerButton::ColorPickerButton(QWidget *parent)
+    : QFrame(parent)
+{
+    setFrameStyle(StyledPanel);
+}
+
+/*!
+
+*/
+void ColorPickerButton::mousePressEvent(QMouseEvent *e)
+{
+    Q_UNUSED(e)
+    setFrameShadow(Sunken);
+    update();
+}
+
+/*!
+
+*/
+void ColorPickerButton::mouseMoveEvent(QMouseEvent *e)
+{
+    Q_UNUSED(e)
+    setFocus();
+    update();
+}
+
+/*!
+
+*/
+void ColorPickerButton::mouseReleaseEvent(QMouseEvent *e)
+{
+    Q_UNUSED(e)
+    setFrameShadow(Raised);
+    repaint();
+    emit clicked();
+}
+
+/*!
+
+*/
+void ColorPickerButton::keyPressEvent(QKeyEvent *e)
+{
+    if (e->key() == Qt::Key_Up
+	|| e->key() == Qt::Key_Down
+	|| e->key() == Qt::Key_Left
+    || e->key() == Qt::Key_Right)
+    {
+        QCoreApplication::sendEvent(parent(), e);
+    }
+    else if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Space || e->key() == Qt::Key_Return)
+    {
+        setFrameShadow(Sunken);
+        update();
+    }
+    else
+    {
+        QFrame::keyPressEvent(e);
+    }
+}
+
+/*!
+
+*/
+void ColorPickerButton::keyReleaseEvent(QKeyEvent *e)
+{
+    if (e->key() == Qt::Key_Up
+	|| e->key() == Qt::Key_Down
+	|| e->key() == Qt::Key_Left
+    || e->key() == Qt::Key_Right)
+    {
+        QCoreApplication::sendEvent(parent(), e);
+    }
+    else if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Space || e->key() == Qt::Key_Return)
+    {
+        setFrameShadow(Raised);
+        repaint();
+        emit clicked();
+    }
+    else
+    {
+        QFrame::keyReleaseEvent(e);
+    }
+
+}
+
+/*!
+
+*/
+void ColorPickerButton::focusInEvent(QFocusEvent *e)
+{
+    setFrameShadow(Raised);
+    update();
+    QFrame::focusOutEvent(e);
+}
+
+/*!
+
+*/
+void ColorPickerButton::focusOutEvent(QFocusEvent *e)
+{
+    setFrameShadow(Raised);
+    update();
+    QFrame::focusOutEvent(e);
+}
+
+/*!
+
+*/
+void ColorPickerButton::paintEvent(QPaintEvent *e)
+{
+    QFrame::paintEvent(e);
+
+    QPainter p(this);
+    p.fillRect(contentsRect(), palette().button());
+
+    QRect r = rect();
+
+    int offset = frameShadow() == Sunken ? 1 : 0;
+
+    QPen pen(palette().buttonText(), 1);
+    p.setPen(pen);
+
+    p.drawRect(r.center().x() + offset - 4, r.center().y() + offset, 1, 1);
+    p.drawRect(r.center().x() + offset    , r.center().y() + offset, 1, 1);
+    p.drawRect(r.center().x() + offset + 4, r.center().y() + offset, 1, 1);
+    if (hasFocus())
+    {
+        p.setPen( QPen( Qt::black, 0, Qt::SolidLine ) );
+        p.drawRect(0, 0, width() - 1, height() - 1);
+    }
+
+    p.end();
+
+}
+
+#include "qtcolorpicker.moc"
diff --git a/src/libs/vwidgets/qtcolorpicker.h b/src/libs/vwidgets/qtcolorpicker.h
new file mode 100644
index 000000000..1ef681886
--- /dev/null
+++ b/src/libs/vwidgets/qtcolorpicker.h
@@ -0,0 +1,110 @@
+/****************************************************************************
+** 
+** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+** 
+** This file is part of a Qt Solutions component.
+**
+** Commercial Usage  
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Solutions Commercial License Agreement provided
+** with the Software or, alternatively, in accordance with the terms
+** contained in a written agreement between you and Nokia.
+** 
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** 
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** 
+** GNU General Public License Usage 
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 
+** Please note Third Party Software included with Qt Solutions may impose
+** additional restrictions and it is the user's responsibility to ensure
+** that they have met the licensing requirements of the GPL, LGPL, or Qt
+** Solutions Commercial license and the relevant license of the Third
+** Party Software they are using.
+** 
+** If you are unsure which license is appropriate for your use, please
+** contact Nokia at qt-info@nokia.com.
+** 
+****************************************************************************/
+
+#ifndef QTCOLORPICKER_H
+#define QTCOLORPICKER_H
+#include <QPushButton>
+#include <QtCore/QString>
+#include <QColor>
+
+#include <QLabel>
+#include <QtCore/QEvent>
+#include <QFocusEvent>
+
+
+class ColorPickerPopup;
+class ColorPickerItem;
+
+class QtColorPicker : public QPushButton
+{
+    Q_OBJECT
+
+    Q_PROPERTY(bool colorDialog READ colorDialogEnabled WRITE setColorDialogEnabled)
+
+public:
+    QtColorPicker(QWidget *parent = 0,
+                  int columns = -1, bool enableColorDialog = true);
+
+    ~QtColorPicker();
+
+    void insertColor(const QColor &color, const QString &text = QString(), int index = -1);
+
+    QColor currentColor() const;
+
+    QColor color(int index) const;
+
+    void setColorDialogEnabled(bool enabled);
+    bool colorDialogEnabled() const;
+
+    void setStandardColors();
+
+    auto CustomColors() const -> QVector<QColor>;
+
+    static QColor getColor(const QPoint &pos, bool allowCustomColors = true);
+
+public Q_SLOTS:
+    void setCurrentColor(const QColor &col);
+
+Q_SIGNALS:
+    void colorChanged(const QColor &);
+
+protected:
+    void paintEvent(QPaintEvent *e);
+
+private Q_SLOTS:
+    void buttonPressed(bool toggled);
+    void popupClosed();
+
+private:
+    Q_DISABLE_COPY(QtColorPicker)
+    ColorPickerPopup *popup{nullptr};
+    QColor col{};
+    bool withColorDialog{false};
+    bool dirty{false};
+    bool firstInserted{false};
+};
+
+#endif
diff --git a/src/libs/vwidgets/vabstractmainwindow.cpp b/src/libs/vwidgets/vabstractmainwindow.cpp
index ff5616f33..d26b64db2 100644
--- a/src/libs/vwidgets/vabstractmainwindow.cpp
+++ b/src/libs/vwidgets/vabstractmainwindow.cpp
@@ -31,18 +31,31 @@
 #include "../vmisc/vabstractapplication.h"
 #include "../vmisc/compatibility.h"
 #include "../vmisc/def.h"
+#include "../vmisc/vsysexits.h"
 #include "dialogs/dialogexporttocsv.h"
+#include "../vwidgets/vmaingraphicsview.h"
 
 #include <QStyle>
 #include <QToolBar>
 #include <QFileDialog>
 #include <QAction>
+#include <QLockFile>
+#include <QMessageBox>
 
 #if defined(Q_OS_MAC)
-#include "../vwidgets/vmaingraphicsview.h"
 #include <QStyleFactory>
 #endif
 
+#include <QLoggingCategory>
+
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_CLANG("-Wmissing-prototypes")
+QT_WARNING_DISABLE_INTEL(1418)
+
+Q_LOGGING_CATEGORY(abstactMainWindow, "abs.MainWindow")
+
+QT_WARNING_POP
+
 namespace
 {
 //---------------------------------------------------------------------------------------------------------------------
@@ -134,6 +147,13 @@ VAbstractMainWindow::VAbstractMainWindow(QWidget *parent)
     }
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+void VAbstractMainWindow::ShowToolTip(const QString &toolTip)
+{
+    Q_UNUSED(toolTip)
+    // do nothing
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 bool VAbstractMainWindow::ContinueFormatRewrite(const QString &currentFormatVersion,
                                                 const QString &maxFormatVersion)
@@ -197,6 +217,16 @@ QString VAbstractMainWindow::CSVFilePath()
     return fileName;
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+void VAbstractMainWindow::ExportToCSVData(const QString &fileName, bool withHeader, int mib, const QChar &separator)
+{
+    Q_UNUSED(fileName)
+    Q_UNUSED(withHeader)
+    Q_UNUSED(mib)
+    Q_UNUSED(separator)
+    // do nothing
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 void VAbstractMainWindow::UpdateRecentFileActions()
 {
@@ -219,6 +249,131 @@ void VAbstractMainWindow::UpdateRecentFileActions()
     m_separatorAct->setVisible(numRecentFiles>0);
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+auto VAbstractMainWindow::CheckFilePermissions(const QString &path, QWidget *messageBoxParent) -> bool
+{
+    QFileInfo info(path);
+
+#ifdef Q_OS_WIN32
+        qt_ntfs_permission_lookup++; // turn checking on
+#endif /*Q_OS_WIN32*/
+
+    if (not info.exists())
+    {
+        return true;
+    }
+
+    // cppcheck-suppress unreadVariable
+    const bool isFileWritable = info.isWritable();
+
+#ifdef Q_OS_WIN32
+        qt_ntfs_permission_lookup--; // turn it off again
+#endif /*Q_OS_WIN32*/
+
+    if (not isFileWritable)
+    {
+        QMessageBox messageBox(messageBoxParent);
+        messageBox.setIcon(QMessageBox::Question);
+        messageBox.setText(tr("The file has no write permissions."));
+        messageBox.setInformativeText(tr("Do you want to change the premissions?"));
+        messageBox.setStandardButtons(QMessageBox::Yes | QMessageBox::Cancel);
+        messageBox.setDefaultButton(QMessageBox::Yes);
+
+        if (messageBox.exec() == QMessageBox::Yes)
+        {
+#ifdef Q_OS_WIN32
+            qt_ntfs_permission_lookup++; // turn checking on
+#endif /*Q_OS_WIN32*/
+            bool changed = QFile::setPermissions(path, QFileInfo(path).permissions() | QFileDevice::WriteUser);
+#ifdef Q_OS_WIN32
+            qt_ntfs_permission_lookup--; // turn it off again
+#endif /*Q_OS_WIN32*/
+
+            if (not changed)
+            {
+                messageBox.setIcon(QMessageBox::Warning);
+                messageBox.setText(tr("Cannot set permissions for %1 to writable.").arg(path));
+                messageBox.setInformativeText(tr("Could not save the file."));
+                messageBox.setStandardButtons(QMessageBox::Ok);
+                messageBox.setDefaultButton(QMessageBox::Ok);
+                messageBox.exec();
+                return false;
+            }
+        }
+        else
+        {
+            return false;
+        }
+    }
+    return true;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+bool VAbstractMainWindow::IgnoreLocking(int error, const QString &path, bool guiMode)
+{
+    QMessageBox::StandardButton answer = QMessageBox::Abort;
+    if (guiMode)
+    {
+        switch(error)
+        {
+            case QLockFile::LockFailedError:
+                answer = QMessageBox::warning(this, tr("Locking file"),
+                                              tr("This file already opened in another window. Ignore if you want "
+                                                 "to continue (not recommended, can cause a data corruption)."),
+                                              QMessageBox::Abort|QMessageBox::Ignore, QMessageBox::Abort);
+                break;
+            case QLockFile::PermissionError:
+                answer = QMessageBox::question(this, tr("Locking file"),
+                                               tr("The lock file could not be created, for lack of permissions. "
+                                                  "Ignore if you want to continue (not recommended, can cause "
+                                                  "a data corruption)."),
+                                               QMessageBox::Abort|QMessageBox::Ignore, QMessageBox::Abort);
+                break;
+            case QLockFile::UnknownError:
+                answer = QMessageBox::question(this, tr("Locking file"),
+                                               tr("Unknown error happened, for instance a full partition "
+                                                  "prevented writing out the lock file. Ignore if you want to "
+                                                  "continue (not recommended, can cause a data corruption)."),
+                                               QMessageBox::Abort|QMessageBox::Ignore, QMessageBox::Abort);
+                break;
+            default:
+                answer = QMessageBox::Abort;
+                break;
+        }
+    }
+
+    if (answer == QMessageBox::Abort)
+    {
+        qCDebug(abstactMainWindow, "Failed to lock %s", qUtf8Printable(path));
+        qCDebug(abstactMainWindow, "Error type: %d", error);
+        if (not guiMode)
+        {
+            switch(error)
+            {
+                case QLockFile::LockFailedError:
+                    qCCritical(abstactMainWindow, "%s",
+                               qUtf8Printable(tr("This file already opened in another window.")));
+                    break;
+                case QLockFile::PermissionError:
+                    qCCritical(abstactMainWindow, "%s",
+                               qUtf8Printable(tr("The lock file could not be created, for lack of permissions.")));
+                    break;
+                case QLockFile::UnknownError:
+                    qCCritical(abstactMainWindow, "%s",
+                               qUtf8Printable(tr("Unknown error happened, for instance a full partition "
+                                                 "prevented writing out the lock file.")));
+                    break;
+                default:
+                    break;
+            }
+
+            qApp->exit(V_EX_NOINPUT);
+        }
+        return false;
+    }
+    return true;
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 void VAbstractMainWindow::WindowsLocale()
 {
diff --git a/src/libs/vwidgets/vabstractmainwindow.h b/src/libs/vwidgets/vabstractmainwindow.h
index ad0e4e526..424231817 100644
--- a/src/libs/vwidgets/vabstractmainwindow.h
+++ b/src/libs/vwidgets/vabstractmainwindow.h
@@ -45,7 +45,7 @@ public:
     virtual ~VAbstractMainWindow() Q_DECL_EQ_DEFAULT;
 
 public slots:
-    virtual void ShowToolTip(const QString &toolTip)=0;
+    virtual void ShowToolTip(const QString &toolTip);
     virtual void UpdateVisibilityGroups();
     virtual void UpdateDetailsList();
     virtual void ZoomFitBestCurrent();
@@ -66,11 +66,15 @@ protected:
 
     QString CSVFilePath();
 
-    virtual void ExportToCSVData(const QString &fileName, bool withHeader, int mib, const QChar &separator)=0;
+    virtual void ExportToCSVData(const QString &fileName, bool withHeader, int mib, const QChar &separator);
 
     virtual QStringList RecentFileList() const =0;
     void UpdateRecentFileActions();
 
+    static bool CheckFilePermissions(const QString &path, QWidget *messageBoxParent=nullptr);
+
+    bool IgnoreLocking(int error, const QString &path, bool guiMode);
+
 private:
     Q_DISABLE_COPY(VAbstractMainWindow)
 };
diff --git a/src/libs/vwidgets/vgraphicssimpletextitem.cpp b/src/libs/vwidgets/vgraphicssimpletextitem.cpp
index 2f83e85b2..c218f2afa 100644
--- a/src/libs/vwidgets/vgraphicssimpletextitem.cpp
+++ b/src/libs/vwidgets/vgraphicssimpletextitem.cpp
@@ -152,7 +152,7 @@ void VGraphicsSimpleTextItem::SetShowParentTooltip(bool show)
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VGraphicsSimpleTextItem::SetRealPos(QPointF pos)
+void VGraphicsSimpleTextItem::SetRealPos(const QPointF &pos)
 {
     m_realPos = pos;
 
diff --git a/src/libs/vwidgets/vgraphicssimpletextitem.h b/src/libs/vwidgets/vgraphicssimpletextitem.h
index a30e08fb3..b38a1018d 100644
--- a/src/libs/vwidgets/vgraphicssimpletextitem.h
+++ b/src/libs/vwidgets/vgraphicssimpletextitem.h
@@ -63,7 +63,7 @@ public:
 
     void SetShowParentTooltip(bool show);
 
-    void SetRealPos(QPointF pos);
+    void SetRealPos(const QPointF &pos);
 
     QColor BaseColor() const;
     void   SetBaseColor(const QColor &baseColor);
diff --git a/src/libs/vwidgets/vmaingraphicsview.cpp b/src/libs/vwidgets/vmaingraphicsview.cpp
index a12fed05e..d170bae74 100644
--- a/src/libs/vwidgets/vmaingraphicsview.cpp
+++ b/src/libs/vwidgets/vmaingraphicsview.cpp
@@ -56,7 +56,7 @@
 #include "vsimplecurve.h"
 #include "vcontrolpointspline.h"
 #include "../vmisc/vabstractapplication.h"
-#include "../vmisc/vsettings.h"
+#include "../vmisc/vcommonsettings.h"
 #include "vabstractmainwindow.h"
 #include "global.h"
 
@@ -71,7 +71,7 @@ qreal ScrollingSteps(QWheelEvent* wheel_event)
     const QPoint numPixels = wheel_event->pixelDelta();
     const QPoint numDegrees = wheel_event->angleDelta() / 8;
     qreal numSteps = 0;
-    VSettings *settings = qobject_cast<VSettings *>(VAbstractApplication::VApp()->Settings());
+    VCommonSettings *settings = qobject_cast<VCommonSettings *>(VAbstractApplication::VApp()->Settings());
 
     if (not numPixels.isNull())
     {
@@ -107,7 +107,7 @@ qreal PrepareScrolling(qreal scheduledScrollings, QWheelEvent *wheel_event)
     }
 
     scheduledScrollings *=
-            qobject_cast<VSettings *>(VAbstractApplication::VApp()->Settings())->GetScrollingAcceleration();
+            qobject_cast<VCommonSettings *>(VAbstractApplication::VApp()->Settings())->GetScrollingAcceleration();
 
     return scheduledScrollings;
 }
@@ -199,7 +199,7 @@ void GraphicsViewZoom::set_zoom_factor_base(double value)
 //---------------------------------------------------------------------------------------------------------------------
 void GraphicsViewZoom::InitScrollingAnimation()
 {
-    VSettings *settings = qobject_cast<VSettings *>(VAbstractApplication::VApp()->Settings());
+    VCommonSettings *settings = qobject_cast<VCommonSettings *>(VAbstractApplication::VApp()->Settings());
 
     if (not verticalScrollAnim.isNull())
     {
@@ -430,7 +430,7 @@ VMainGraphicsView::VMainGraphicsView(QWidget *parent)
       m_oldCursor(),
       m_currentCursor(Qt::ArrowCursor)
 {
-    VSettings *settings = qobject_cast<VSettings *>(VAbstractApplication::VApp()->Settings());
+    VCommonSettings *settings = qobject_cast<VCommonSettings *>(VAbstractApplication::VApp()->Settings());
     if (settings && settings->IsOpenGLRender())
     {
         QOpenGLWidget *viewport = new QOpenGLWidget();
@@ -793,7 +793,7 @@ void VMainGraphicsView::NewSceneRect(QGraphicsScene *sc, QGraphicsView *view, QG
     {
         QRectF rect = item->sceneBoundingRect();
         const QList<QGraphicsItem *> children = item->childItems();
-        for (auto child : children)
+        for (auto *child : children)
         {
             if(child->isVisible())
             {
diff --git a/src/libs/vwidgets/vwidgets.pri b/src/libs/vwidgets/vwidgets.pri
index eaf29bd78..023e5efb0 100644
--- a/src/libs/vwidgets/vwidgets.pri
+++ b/src/libs/vwidgets/vwidgets.pri
@@ -2,6 +2,7 @@
 # This need for corect working file translations.pro
 
 SOURCES += \
+    $$PWD/qtcolorpicker.cpp \
     $$PWD/vcomboboxdelegate.cpp \
     $$PWD/vdecorationaligningdelegate.cpp \
     $$PWD/velidedlabel.cpp \
@@ -32,6 +33,7 @@ SOURCES += \
 *msvc*:SOURCES += $$PWD/stable.cpp
 
 HEADERS += \
+    $$PWD/qtcolorpicker.h \
     $$PWD/stable.h \
     $$PWD/vcomboboxdelegate.h \
     $$PWD/vdecorationaligningdelegate.h \