Merge with default.

--HG--
branch : develop

.hgignore

@@ -26,6 +26,7 @@ obj/
 uic/
 rcc/
 man/
+build/
 
 # Ignore Coverity Scan Build Tool
 cov-int/

.hgtags

@@ -4,3 +4,4 @@
 a734ccf61671ef07ba20b24878548174c4a6b092 v0.2.2
 65d32db15b7233b08ecdccb1ec77e94ef2ff5452 v0.2.9
 cdbc7629bd2907c1b4a27337c632a44a418ec9ac v0.3.0
+d8d7cb2fad21a31a81d96060e3a0951feb1ee49f v0.3.1

ChangeLog.txt

@@ -1,3 +1,14 @@
+# Version 0.3.1 Released April 24, 2015
+- [#263] Regression. Union tool doesn't work.
+- For tool Curve intersect axis fixed wrong calculation point in case with too small scene rect size.
+- Fixed crash if a seam allowance doesn't contain 0 points.
+- [#267] Error in the creation of obj files.
+- QMuParser. Bugfix for Bulkmode: Expressions with like "a=b, b*10" did not compute properly.
+- QMuParser. Fix for ParserTokenReader::ExtractOperatorToken incorrectly uses ValidInfixOprtChars().
+- Example of file name in dialog Save Layout appears only after user change format.
+- Fixed regression with removing loops in seam allowance.
+- Removed transparent field for a layout png file.
+
 # Version 0.3.0 Released March 23, 2015
 - Fixed creation equidistant if points less than 4.
 - [#203], [#89], [#90] New Layout Editor.

Valentina.pri

@@ -1,3 +1,9 @@
+win32{
+    unset(QMAKE_COPY)
+    # Because "copy" doesn't support files that containe plus sign (+) in name we will use xcopy instead.
+    QMAKE_COPY = xcopy /y
+}
+
 defineTest(minQtVersion) {
     maj = $$1
     min = $$2

dist/debian/changelog

@@ -1,4 +1,4 @@
-valentina (0.3.0) trusty; urgency=low
+valentina (0.3.1) trusty; urgency=low
 
   * Auto build.
 

dist/rpm/_service

@@ -1,7 +1,7 @@
 <services>                   
   <service name="tar_scm">
   	<param name="url">https://github.com/dismine/Valentina.git</param>
-  	<param name="versionprefix">0.3.0</param>
+  	<param name="versionprefix">0.3.1</param>
     <param name="filename">valentina</param>
   	<param name="scm">git</param>
     <param name="versionformat">%at</param>

dist/rpm/valentina.spec

@@ -41,7 +41,7 @@ BuildRequires: libqt5-qtxmlpatterns-devel
 
 Requires:   poppler-utils
 
-Version:	0.3.0
+Version:	0.3.1
 Release:	0
 URL:		https://bitbucket.org/dismine/valentina
 License:	GPL-3.0+

dist/win/nsis/valentina.nsi

@@ -13,7 +13,7 @@ SetCompressor /FINAL /SOLID lzma
 !define MUI_PRODUCT "Valentina"
 !define MUI_FILE "valentina"
 
-!insertmacro GetPEVersionLocal "c:\pack\valentina\valentina.exe" ver
+!insertmacro GetPEVersionLocal "valentina\valentina.exe" ver
 !define MUI_VERSION "${ver_1}.${ver_2}.${ver_3}"
 
 !define MUI_BRANDINGTEXT "Valentina ${MUI_VERSION}"
@@ -191,7 +191,7 @@ SectionIn RO ; define mandatory sections
  
 ;Add files
 SetOutPath "$INSTDIR" ; Set output path to the installation directory.
-File /r "c:\pack\valentina\*.*"
+File /r "valentina\*.*"
 
 ;create start-menu items  
 !define START_LINK_DIR "$SMPROGRAMS\${MUI_PRODUCT}"

dist/win/symsrv.yes

@@ -0,0 +1 @@
+ 

share/translations/valentina.ts

@@ -1506,10 +1506,6 @@
         <source>Creation a layout</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Finding best position for worpieces. Please, waite.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Couldn&apos;t prepare data for creation layout</source>
         <translation type="unfinished"></translation>
@@ -1526,6 +1522,10 @@
         <source>Several workpieces left not arranged, but none of them match for paper</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Finding best position for worpieces. Please, wait.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogLayoutSettings</name>

share/translations/valentina_cs_CZ.ts

@@ -195,11 +195,11 @@
     </message>
     <message>
         <source>Pattern Editing</source>
-        <translation type="unfinished"></translation>
+        <translation>Upravování střihu</translation>
     </message>
     <message>
         <source>Confirm item deletion</source>
-        <translation type="unfinished"></translation>
+        <translation>Potvrdit smazání položky</translation>
     </message>
 </context>
 <context>
@@ -350,11 +350,11 @@
     </message>
     <message>
         <source>Point at distance along line</source>
-        <translation type="unfinished">Bod ve vzdálenosti podél čáry</translation>
+        <translation>Bod ve vzdálenosti podél čáry</translation>
     </message>
     <message>
         <source>Line color</source>
-        <translation type="unfinished"></translation>
+        <translation>Barva čáry</translation>
     </message>
 </context>
 <context>
@@ -465,7 +465,7 @@
     </message>
     <message>
         <source>Color</source>
-        <translation type="unfinished"></translation>
+        <translation>Barva</translation>
     </message>
 </context>
 <context>
@@ -572,11 +572,11 @@
     </message>
     <message>
         <source>Point along bisector</source>
-        <translation type="unfinished">Bod podél osy úhlu</translation>
+        <translation>Bod podél osy úhlu</translation>
     </message>
     <message>
         <source>Line color</source>
-        <translation type="unfinished"></translation>
+        <translation>Barva čáry</translation>
     </message>
 </context>
 <context>
@@ -659,15 +659,15 @@
     </message>
     <message>
         <source>Point intersect curve and axis</source>
-        <translation type="unfinished"></translation>
+        <translation>Bod průsečíku oblouku a čáry</translation>
     </message>
     <message>
         <source>Axis Point</source>
-        <translation type="unfinished"></translation>
+        <translation>Bod osy</translation>
     </message>
     <message>
         <source>Line color</source>
-        <translation type="unfinished"></translation>
+        <translation>Barva čáry</translation>
     </message>
 </context>
 <context>
@@ -742,11 +742,11 @@
     </message>
     <message>
         <source>Selected arc</source>
-        <translation type="unfinished"></translation>
+        <translation>Vybraný oblouk</translation>
     </message>
     <message>
         <source>Color</source>
-        <translation type="unfinished"></translation>
+        <translation>Barva</translation>
     </message>
 </context>
 <context>
@@ -821,11 +821,11 @@
     </message>
     <message>
         <source>Segmenting a simple curve</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozdělení jednoduché křivky</translation>
     </message>
     <message>
         <source>Color</source>
-        <translation type="unfinished"></translation>
+        <translation>Barva</translation>
     </message>
 </context>
 <context>
@@ -904,7 +904,7 @@
     </message>
     <message>
         <source>Color</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Barva</translation>
     </message>
 </context>
 <context>
@@ -1117,7 +1117,7 @@
     </message>
     <message>
         <source>Line color</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Barva čáry</translation>
     </message>
 </context>
 <context>
@@ -1164,7 +1164,7 @@
     </message>
     <message>
         <source>Line color</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Barva čáry</translation>
     </message>
 </context>
 <context>
@@ -1506,10 +1506,6 @@
         <source>Creation a layout</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Finding best position for worpieces. Please, waite.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Couldn&apos;t prepare data for creation layout</source>
         <translation type="unfinished"></translation>
@@ -1526,6 +1522,10 @@
         <source>Several workpieces left not arranged, but none of them match for paper</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Finding best position for worpieces. Please, wait.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogLayoutSettings</name>
@@ -1634,7 +1634,7 @@
     </message>
     <message>
         <source>Line color</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Barva čáry</translation>
     </message>
 </context>
 <context>
@@ -1772,7 +1772,7 @@
     </message>
     <message>
         <source>Axis Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Bod osy</translation>
     </message>
     <message>
         <source>Second point of line</source>
@@ -1780,7 +1780,7 @@
     </message>
     <message>
         <source>Line color</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Barva čáry</translation>
     </message>
 </context>
 <context>
@@ -1910,7 +1910,7 @@
     </message>
     <message>
         <source>Line color</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Barva čáry</translation>
     </message>
 </context>
 <context>
@@ -2297,7 +2297,7 @@
     </message>
     <message>
         <source>Line color</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Barva čáry</translation>
     </message>
 </context>
 <context>
@@ -2367,7 +2367,7 @@
     </message>
     <message>
         <source>Color</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Barva</translation>
     </message>
 </context>
 <context>
@@ -2410,7 +2410,7 @@
     </message>
     <message>
         <source>Color</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Barva</translation>
     </message>
 </context>
 <context>
@@ -2563,22 +2563,6 @@
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Do you really want union details?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Opravdu chcete sjednotit detaily?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Select first point</source>
-        <translation type="vanished">Vybrat první bod</translation>
-    </message>
-    <message>
-        <source>Select second point</source>
-        <translation type="vanished">Vybrat druhý bod</translation>
-    </message>
-    <message>
-        <source>Select another second point</source>
-        <translation type="vanished">Vybrat jiný druhý bod</translation>
-    </message>
-    <message>
-        <source>Select detail</source>
-        <translation type="vanished">Vybrat detail</translation>
-    </message>
     <message>
         <source>Union tool</source>
         <translation type="unfinished"></translation>
@@ -2831,7 +2815,7 @@
     </message>
     <message>
         <source>&amp;Pattern piece</source>
-        <translation>&amp;Díl střihu</translation>
+        <translation>&amp;Střih</translation>
     </message>
     <message>
         <source>Measurements</source>
@@ -3339,7 +3323,7 @@ Chcete uložit své změny?</translation>
     </message>
     <message>
         <source>Segmenting a simple curve</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Rozdělení jednoduché křivky</translation>
     </message>
     <message>
         <source>Segment a curved path</source>
@@ -3347,7 +3331,7 @@ Chcete uložit své změny?</translation>
     </message>
     <message>
         <source>Point intersect curve and axis</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Bod průsečíku oblouku a čáry</translation>
     </message>
     <message>
         <source>Segment an arc</source>
@@ -5901,14 +5885,6 @@ Chcete uložit své změny?</translation>
 </context>
 <context>
     <name>VAbstractTool</name>
-    <message>
-        <source>Confirm the deletion.</source>
-        <translation type="vanished">Potvrďte smazání.</translation>
-    </message>
-    <message>
-        <source>Do you really want delete?</source>
-        <translation type="vanished">Opravdu chcete smazat?</translation>
-    </message>
     <message>
         <source>black</source>
         <translation type="unfinished"></translation>
@@ -6424,11 +6400,11 @@ Chcete uložit své změny?</translation>
     </message>
     <message>
         <source>Line color</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Barva čáry</translation>
     </message>
     <message>
         <source>Color</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Barva</translation>
     </message>
     <message>
         <source>Point intersection curve and axis</source>

share/translations/valentina_de_DE.ts

@@ -1506,10 +1506,6 @@
         <source>Creation a layout</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Finding best position for worpieces. Please, waite.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Couldn&apos;t prepare data for creation layout</source>
         <translation type="unfinished"></translation>
@@ -1526,6 +1522,10 @@
         <source>Several workpieces left not arranged, but none of them match for paper</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Finding best position for worpieces. Please, wait.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogLayoutSettings</name>
@@ -2563,22 +2563,6 @@
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Do you really want union details?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Soll die Details wirklich vereinigt werden?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Select first point</source>
-        <translation type="vanished">Ersten Punkt auswählen</translation>
-    </message>
-    <message>
-        <source>Select second point</source>
-        <translation type="vanished">Zweiten Punkt auswählen</translation>
-    </message>
-    <message>
-        <source>Select another second point</source>
-        <translation type="vanished">Einen anderen zweiten Punkt auswählen</translation>
-    </message>
-    <message>
-        <source>Select detail</source>
-        <translation type="vanished">Detail auswählen</translation>
-    </message>
     <message>
         <source>Union tool</source>
         <translation type="unfinished"></translation>
@@ -5900,14 +5884,6 @@ Sollen die Änderungen gespeichert werden?</translation>
 </context>
 <context>
     <name>VAbstractTool</name>
-    <message>
-        <source>Confirm the deletion.</source>
-        <translation type="vanished">Löschen bestätigen.</translation>
-    </message>
-    <message>
-        <source>Do you really want delete?</source>
-        <translation type="vanished">Wirklich löschen?</translation>
-    </message>
     <message>
         <source>black</source>
         <translation type="unfinished"></translation>

share/translations/valentina_es_ES.ts

@@ -195,11 +195,11 @@
     </message>
     <message>
         <source>Pattern Editing</source>
-        <translation type="unfinished"></translation>
+        <translation>Editando Patrón</translation>
     </message>
     <message>
         <source>Confirm item deletion</source>
-        <translation type="unfinished"></translation>
+        <translation>Confrimar la eliminacion del objeto</translation>
     </message>
 </context>
 <context>
@@ -1508,7 +1508,7 @@
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Finding best position for worpieces. Please, waite.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Encontrar la mejor posición para las piezas de trabajo. Por favor, espere.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Encontrar la mejor posición para las piezas de trabajo. Por favor, espere.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <source>Couldn&apos;t prepare data for creation layout</source>
@@ -1526,6 +1526,10 @@
         <source>Several workpieces left not arranged, but none of them match for paper</source>
         <translation>Piezas de trabajo no están ordenadas, y no coinciden con el papel</translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Finding best position for worpieces. Please, wait.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogLayoutSettings</name>
@@ -2563,22 +2567,6 @@
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Do you really want union details?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Realmente quiere detalles de la unión?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Select first point</source>
-        <translation type="vanished">Selección primer punto </translation>
-    </message>
-    <message>
-        <source>Select second point</source>
-        <translation type="vanished">Selección segundo punto</translation>
-    </message>
-    <message>
-        <source>Select another second point</source>
-        <translation type="vanished">Selección otro segundo punto</translation>
-    </message>
-    <message>
-        <source>Select detail</source>
-        <translation type="vanished">Selección de detalle</translation>
-    </message>
     <message>
         <source>Union tool</source>
         <translation>herramienta de unión</translation>
@@ -3501,17 +3489,17 @@ Quiere guardar los cambios?</translation>
     <message>
         <source>bustpoint_to_bustpoint</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>separación_pechos</translation>
     </message>
     <message>
         <source>halter_bustpoint_to_bustpoint</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>pecho-dercho_nuca_pecho-izquierdo</translation>
     </message>
     <message>
         <source>neck_to_bustpoint</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>base_de_cuello_a_pecho</translation>
     </message>
     <message>
         <source>crotch_length</source>
@@ -3521,7 +3509,7 @@ Quiere guardar los cambios?</translation>
     <message>
         <source>rise_height</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>altura_de_tiro</translation>
     </message>
     <message>
         <source>shoulder_drop</source>
@@ -3676,7 +3664,7 @@ Quiere guardar los cambios?</translation>
     <message>
         <source>scye_depth</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>profundidad_sisa</translation>
     </message>
     <message>
         <source>shoulder_and_arm_length</source>
@@ -3851,207 +3839,207 @@ Quiere guardar los cambios?</translation>
     <message>
         <source>hips_excluding_protruding_abdomen</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>caderas_excluyendo_abdomen_protuberante</translation>
     </message>
     <message>
         <source>girth_foot_instep</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>circunferencia_empeine_pie</translation>
     </message>
     <message>
         <source>side_waist_to_floor</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>lateral_de_cintura_al_suelo</translation>
     </message>
     <message>
         <source>front_waist_to_floor</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>frontal_de_cintura_al_suelo</translation>
     </message>
     <message>
         <source>arc_through_groin_area</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>arco_a_través_de_la_ingle</translation>
     </message>
     <message>
         <source>waist_to_plane_seat</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>circunferencia_caderas_nalgas</translation>
     </message>
     <message>
         <source>neck_to_radial_point</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>cuello_a_punto_radial</translation>
     </message>
     <message>
         <source>neck_to_third_finger</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>cuello_tercer_dedo</translation>
     </message>
     <message>
         <source>neck_to_first_line_chest_circumference</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>del_cuello_a_primera_línea_contorno_de_pecho</translation>
     </message>
     <message>
         <source>front_waist_length</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>cintura_delantera</translation>
     </message>
     <message>
         <source>arc_through_shoulder_joint</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>arco_a_través_de_la_articulación_del_hombro</translation>
     </message>
     <message>
         <source>neck_to_back_line_chest_circumference</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>del_cuello_al_contorno_pecho_en espalda</translation>
     </message>
     <message>
         <source>waist_to_neck_side</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>cintura_a_base_cuello_espalda</translation>
     </message>
     <message>
         <source>arc_length_upper_body</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>arco_cuerpo_por_base_cuello_lateral</translation>
     </message>
     <message>
         <source>chest_width</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>ancho_de_pecho</translation>
     </message>
     <message>
         <source>anteroposterior_diameter_hands</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>diametro_anterioposterior_mano</translation>
     </message>
     <message>
         <source>height_clavicular_point</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>altura_punto_clavicular</translation>
     </message>
     <message>
         <source>height_armhole_slash</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>altura_sisa</translation>
     </message>
     <message>
         <source>slash_shoulder_height</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>altura_hombro</translation>
     </message>
     <message>
         <source>half_girth_neck</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>medio_contorno_cuello</translation>
     </message>
     <message>
         <source>half_girth_neck_for_shirts</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>Medio_contorno_cuello_para_camisetas</translation>
     </message>
     <message>
         <source>half_girth_chest_first</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>medio_contorno_pecho_primero</translation>
     </message>
     <message>
         <source>half_girth_chest_second</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>medio_contorno_pecho_segundo</translation>
     </message>
     <message>
         <source>half_girth_chest_third</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>medio_contorno_pecho_tercero</translation>
     </message>
     <message>
         <source>half_girth_waist</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>medio_contorno_pecho</translation>
     </message>
     <message>
         <source>half_girth_hips_considering_protruding_abdomen</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>medio_contorno_cadera_considerando_abdomen_prominente</translation>
     </message>
     <message>
         <source>half_girth_hips_excluding_protruding_abdomen</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>medio_contorno_cadera_excluyendo_abdomen_prominente</translation>
     </message>
     <message>
         <source>girth_knee_flexed_feet</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>contorno_rodila_agachado</translation>
     </message>
     <message>
         <source>neck_transverse_diameter</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>diámetro_transversal_cuello</translation>
     </message>
     <message>
         <source>front_slash_shoulder_height</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>altura_hombros_frontal</translation>
     </message>
     <message>
         <source>neck_to_front_waist_line</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>cuello_a_contorno_cintura_frontal</translation>
     </message>
     <message>
         <source>hand_vertical_diameter</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>diametro_vertical_mano</translation>
     </message>
     <message>
         <source>neck_to_knee_point</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>cuello_a_rodilla</translation>
     </message>
     <message>
         <source>waist_to_knee</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>cintura_a_rodilla</translation>
     </message>
     <message>
         <source>shoulder_height</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>altura_hombros</translation>
     </message>
     <message>
         <source>head_height</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>altura_cabeza</translation>
     </message>
     <message>
         <source>body_position</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>posición_del_cuerpo</translation>
     </message>
     <message>
         <source>arc_behind_shoulder_girdle</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>arco_detras_cintura_escapular</translation>
     </message>
     <message>
         <source>neck_to_neck_base</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>de_cuello_a_base_cuello</translation>
     </message>
     <message>
         <source>depth_waist_first</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>profundidad_cintura_primera</translation>
     </message>
     <message>
         <source>depth_waist_second</source>
         <comment>Short measurement name. Don&apos;t use math symbols in name!!!!</comment>
-        <translation type="unfinished"></translation>
+        <translation>profundidad_cintura_segunda</translation>
     </message>
 </context>
 <context>
@@ -4059,237 +4047,237 @@ Quiere guardar los cambios?</translation>
     <message>
         <source>Around fullest part of Head</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Contorno cabeza maximo</translation>
     </message>
     <message>
         <source>Around middle part of Neck</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Mitad del contorno de cuello</translation>
     </message>
     <message>
         <source>Around Neck at base</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Contorno base de cuello</translation>
     </message>
     <message>
         <source>Vertical Distance from Crown to Nape</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Distancia vertical de coronilla a nuca</translation>
     </message>
     <message>
         <source>Front Neck Center over tape at Bustline to Front Waist Center</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Centro cuello delantero sobre línea de pecho a centro cintura frontal</translation>
     </message>
     <message>
         <source>Back Neck Center to Back Waist Center</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Centro cuello espalda centro cintura espalda</translation>
     </message>
     <message>
         <source>NeckPoint to ShoulderTip</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>cuello punta hombro</translation>
     </message>
     <message>
         <source>Armpit to Waist side</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Axila a lado cintura</translation>
     </message>
     <message>
         <source>Around Body from middle of Shoulder length to BustPoint to Crotch up back to beginning point</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Alrededor del cuerpo por hombro medio pasando por pecho entrepierna y volver a hombro medio</translation>
     </message>
     <message>
         <source>Around Arms and Torso, at bicep level parallel to floor, with arms hanging at the sides</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Alrededor de brazos y torso, a nivel bíceps, paralelo al suelo con brazos caidos</translation>
     </message>
     <message>
         <source>Around Chest at Armfold level, will be parallel to floor across back, will not be parallel to floor across front chest</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Contorno pecho a la altura del cruce de brazos, paralelo al suelo en la espalda y no paralelo en el delantero</translation>
     </message>
     <message>
         <source>Around fullest part of Bust, parallel to floor</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Contorno parte sobresaliente del pecho paralelo al suelo</translation>
     </message>
     <message>
         <source>Around Chest below the Bust, parallel to floor</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Contorno pecho bajo el busto paralelo al suelo</translation>
     </message>
     <message>
         <source>Tie a string around smallest part of waist, keep string tied while taking meaasurements. Not usually parallel to floor for front waist or back waist.</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Contorno de cintura por la parte mas estrecha, no suele ser paralela al suelo.</translation>
     </message>
     <message>
         <source>Around HighHip, parallel to floor</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Contorno cadera alta paralelo suelo</translation>
     </message>
     <message>
         <source>Around Hip, parallel to floor</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Contorno cadera paralelo al suelo</translation>
     </message>
     <message>
         <source>Across Front UpperChest, smallest width from armscye to armscye</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Pecho delantero superior, menor distancia de sisa a sisa</translation>
     </message>
     <message>
         <source>Across Front Chest, from armfold to armfold</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Pecho delantero, de brazo a brazo</translation>
     </message>
     <message>
         <source>From ShoulderTip to ShoulderTip, across Front</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Delantero punta hombro a punta hombro</translation>
     </message>
     <message>
         <source>From ShoulderTip to ShoulderTip, across Back</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Espalda punta hombro a punta hombro</translation>
     </message>
     <message>
         <source>Across Back UpperChest, smallest width from armscye to armscye</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Pecho superior en espalda menor medida entre sisas</translation>
     </message>
     <message>
         <source>Across Back Chest, from armfold to armfold</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Pecho en espalda de brazo a brazo</translation>
     </message>
     <message>
         <source>Distance between BustPoints, across Chest</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Distancia entre busto por el pecho</translation>
     </message>
     <message>
         <source>Distance from Bustpoint, behind neck, down to Bustpoint</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Distancia entre busto pasando por la nuca</translation>
     </message>
     <message>
         <source>From NeckPoint to BustPoint</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Distancia desde el busto hasta el cuello</translation>
     </message>
     <message>
         <source>From Front Waist Center, down to crotch, up to Back Waist Center</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Desde centro delantero cintura, pasando por la entrepierna al centro  espalda cintura</translation>
     </message>
     <message>
         <source>Sit on hard chair, measure from side waist straight down to chair bottom</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Sentados en silla, medir desde lado derecho cintura hasta asiento de la silla</translation>
     </message>
     <message>
         <source>Vertical Distance from NeckPoint level to ShoulderTip level</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Distancia vertical desde el cuello al hombro</translation>
     </message>
     <message>
         <source>Degrees of angle from NeckPoint to ShoulderTip – requires goniometer</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Grados del ángulo desde el cuello al hombro, requiere gniómetro</translation>
     </message>
     <message>
         <source>ShoulderTip to Front Waist Center</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Punta del hombro a centro cintura delantero</translation>
     </message>
     <message>
         <source>ShoulderTip to Back Waist Center</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Punta del hombro a centro cintura espalda</translation>
     </message>
     <message>
         <source>NeckPoint straight down front chest to Waistline</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Desde parte derecha cuello bajando por el pecho a la cintura</translation>
     </message>
     <message>
         <source>Back NeckPoint straight down back chest to Waistline</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Desde parte derecha cuello bajando por la espalda a la cintura</translation>
     </message>
     <message>
         <source>NeckPoint to NeckPoint through Front Neck Center</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>De punto a punto de cuello pasando por el centro del cuello</translation>
     </message>
     <message>
         <source>NeckPoint to NeckPoint across Nape</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>De punto a punto de cuello pasando por la nuca</translation>
     </message>
     <message>
         <source>Front upper-bust arc</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Arco busto delantero</translation>
     </message>
     <message>
         <source>Back UpperBust side to side</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Arco busto espalda</translation>
     </message>
     <message>
         <source>Front Waist side to side</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Cintura delantera lado a lado</translation>
     </message>
     <message>
         <source>Back Waist side to side</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Cintura espalda lado a lado</translation>
     </message>
     <message>
         <source>Front UpperHip side to side</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>cadera superior delantero lado lado </translation>
     </message>
     <message>
         <source>Back UpperHip side to side</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>cadera superior espalda lado lado </translation>
     </message>
     <message>
         <source>Front Hip side to side</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>cadera delantero lado lado </translation>
     </message>
     <message>
         <source>Back Hip side to side</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>cadera espalda lado lado </translation>
     </message>
     <message>
         <source>NeckPoint to Front ArmfoldPoint</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>cuello delantero a pliegue brazo</translation>
     </message>
     <message>
         <source>NeckPoint to Back ArmfoldPoint</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>cuello espalda a pliegue brazo</translation>
     </message>
     <message>
         <source>NeckPoint across Front Chest to Waist side</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>cuello atraves del pecho a lado cintura</translation>
     </message>
     <message>
         <source>NeckPoint across Back Chest to Waist side</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>cuello atraves de espalda a lado cintura</translation>
     </message>
     <message>
         <source>Front Neck Center straight down to UpperChest line</source>
@@ -4534,7 +4522,7 @@ Quiere guardar los cambios?</translation>
     <message>
         <source>The distance from the front waist to floor</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation>Distancia delantera desde la cintura al suelo</translation>
     </message>
     <message>
         <source>Arc through groin area</source>
@@ -4699,7 +4687,7 @@ Quiere guardar los cambios?</translation>
     <message>
         <source>Body position</source>
         <comment>Full measurement description</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Posición del cuerpo</translation>
     </message>
     <message>
         <source>Arc behind the shoulder girdle</source>
@@ -4902,7 +4890,7 @@ Quiere guardar los cambios?</translation>
     <message>
         <source>Front upper-bust arc</source>
         <comment>Full measurement name</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Arco busto delantero</translation>
     </message>
     <message>
         <source>Back UpperBust arc</source>
@@ -5037,17 +5025,17 @@ Quiere guardar los cambios?</translation>
     <message>
         <source>Arm length</source>
         <comment>Full measurement name</comment>
-        <translation type="unfinished"></translation>
+        <translation>Largo de brazo</translation>
     </message>
     <message>
         <source>Hand width</source>
         <comment>Full measurement name</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ancho de mano</translation>
     </message>
     <message>
         <source>Hand length</source>
         <comment>Full measurement name</comment>
-        <translation type="unfinished"></translation>
+        <translation>Largo de mano</translation>
     </message>
     <message>
         <source>Hand girth</source>
@@ -5367,7 +5355,7 @@ Quiere guardar los cambios?</translation>
     <message>
         <source>Body position</source>
         <comment>Full measurement name</comment>
-        <translation type="unfinished"></translation>
+        <translation>Posición del cuerpo</translation>
     </message>
     <message>
         <source>Arc behind shoulder girdle</source>
@@ -5901,14 +5889,6 @@ Quiere guardar los cambios?</translation>
 </context>
 <context>
     <name>VAbstractTool</name>
-    <message>
-        <source>Confirm the deletion.</source>
-        <translation type="vanished">Confirmar borrado</translation>
-    </message>
-    <message>
-        <source>Do you really want delete?</source>
-        <translation type="vanished">Realmente quiere borrarlo?</translation>
-    </message>
     <message>
         <source>black</source>
         <translation>negro</translation>
@@ -6497,7 +6477,7 @@ Quiere guardar los cambios?</translation>
     <name>main</name>
     <message>
         <source>Pattern making program.</source>
-        <translation type="unfinished"></translation>
+        <translation>Programa generando patrón</translation>
     </message>
     <message>
         <source>Pattern file.</source>

share/translations/valentina_fr_FR.ts

@@ -1506,10 +1506,6 @@
         <source>Creation a layout</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Finding best position for worpieces. Please, waite.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Couldn&apos;t prepare data for creation layout</source>
         <translation type="unfinished"></translation>
@@ -1526,6 +1522,10 @@
         <source>Several workpieces left not arranged, but none of them match for paper</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Finding best position for worpieces. Please, wait.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogLayoutSettings</name>
@@ -2563,22 +2563,6 @@
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Do you really want union details?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Voulez-vous vraiment fusionner les propriétés ?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Select first point</source>
-        <translation type="vanished">Choisir le premier point</translation>
-    </message>
-    <message>
-        <source>Select second point</source>
-        <translation type="vanished">Choisir le deuxième point</translation>
-    </message>
-    <message>
-        <source>Select another second point</source>
-        <translation type="vanished">Choisir un autre deuxième point</translation>
-    </message>
-    <message>
-        <source>Select detail</source>
-        <translation type="vanished">Choisir les détails</translation>
-    </message>
     <message>
         <source>Union tool</source>
         <translation type="unfinished"></translation>
@@ -5903,14 +5887,6 @@ Voulez-vous sauvegarder les changements ? </translation>
 </context>
 <context>
     <name>VAbstractTool</name>
-    <message>
-        <source>Confirm the deletion.</source>
-        <translation type="vanished">Confirmer la suppression.</translation>
-    </message>
-    <message>
-        <source>Do you really want delete?</source>
-        <translation type="vanished">Voulez vous vraiment supprimer ? </translation>
-    </message>
     <message>
         <source>black</source>
         <translation type="unfinished"></translation>

share/translations/valentina_he_IL.ts

@@ -1506,10 +1506,6 @@
         <source>Creation a layout</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Finding best position for worpieces. Please, waite.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Couldn&apos;t prepare data for creation layout</source>
         <translation type="unfinished"></translation>
@@ -1526,6 +1522,10 @@
         <source>Several workpieces left not arranged, but none of them match for paper</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Finding best position for worpieces. Please, wait.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogLayoutSettings</name>
@@ -2563,14 +2563,6 @@
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Do you really want union details?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Select first point</source>
-        <translation type="vanished">לבחור נקודה ראשונה</translation>
-    </message>
-    <message>
-        <source>Select second point</source>
-        <translation type="vanished">לבחור נקודה שנייה</translation>
-    </message>
     <message>
         <source>Union tool</source>
         <translation type="unfinished"></translation>

share/translations/valentina_id_ID.ts

@@ -1507,10 +1507,6 @@
         <source>Creation a layout</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Finding best position for worpieces. Please, waite.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Couldn&apos;t prepare data for creation layout</source>
         <translation type="unfinished"></translation>
@@ -1527,6 +1523,10 @@
         <source>Several workpieces left not arranged, but none of them match for paper</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Finding best position for worpieces. Please, wait.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogLayoutSettings</name>

share/translations/valentina_it_IT.ts

@@ -1562,10 +1562,6 @@
         <source>Creation a layout</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Finding best position for worpieces. Please, waite.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Couldn&apos;t prepare data for creation layout</source>
         <translation type="unfinished"></translation>
@@ -1582,6 +1578,10 @@
         <source>Several workpieces left not arranged, but none of them match for paper</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Finding best position for worpieces. Please, wait.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogLayoutSettings</name>

share/translations/valentina_nl_NL.ts

@@ -1506,10 +1506,6 @@
         <source>Creation a layout</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Finding best position for worpieces. Please, waite.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Couldn&apos;t prepare data for creation layout</source>
         <translation type="unfinished"></translation>
@@ -1526,6 +1522,10 @@
         <source>Several workpieces left not arranged, but none of them match for paper</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Finding best position for worpieces. Please, wait.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogLayoutSettings</name>
@@ -2563,22 +2563,6 @@
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Do you really want union details?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Wil je echt gezamenlijke details?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Select first point</source>
-        <translation type="vanished">Selecteer eerste punt</translation>
-    </message>
-    <message>
-        <source>Select second point</source>
-        <translation type="vanished">Selecteer tweede punt</translation>
-    </message>
-    <message>
-        <source>Select another second point</source>
-        <translation type="vanished">Selecteer een ander tweede punt</translation>
-    </message>
-    <message>
-        <source>Select detail</source>
-        <translation type="vanished">Selecteer een detail</translation>
-    </message>
     <message>
         <source>Union tool</source>
         <translation type="unfinished"></translation>
@@ -5899,14 +5883,6 @@ Do you want to save your changes?</source>
 </context>
 <context>
     <name>VAbstractTool</name>
-    <message>
-        <source>Confirm the deletion.</source>
-        <translation type="vanished">Bevestig de verwijdering.</translation>
-    </message>
-    <message>
-        <source>Do you really want delete?</source>
-        <translation type="vanished">Wil je echt verwijderen?</translation>
-    </message>
     <message>
         <source>black</source>
         <translation type="unfinished"></translation>

src/app/app.pro

@@ -243,9 +243,10 @@ unix{
         # Path to resources in app bundle
         RESOURCES_DIR = "Contents/Resources"
         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 = $$PREFIX/
+        target.path = $$MACOS_DIR
 
         # Copy in bundle translation files.
         exists($${TRANSLATIONS_PATH}/valentina_ru_RU.qm){
@@ -342,6 +343,9 @@ unix{
     libraries.files += $${OUT_PWD}/../libs/qmuparser/$${DESTDIR}/libqmuparser.2.dylib
     libraries.files += $${OUT_PWD}/../libs/vpropertyexplorer/$${DESTDIR}/libvpropertyexplorer.1.dylib
 
+    # Utility pdftops need for saving a layout image to PS and EPS formates.
+    xpdf.path = $$MACOS_DIR
+    xpdf.files += $${PWD}/../../dist/macx/bin64/pdftops
 
     # logo on macx.
     ICON = ../../dist/Valentina.icns
@@ -352,10 +356,148 @@ unix{
 
     QMAKE_BUNDLE_DATA += \
         standard \
-        libraries
+        libraries \
+        xpdf
     }
 }
 
+# "make install" command for Windows.
+# Depend on nsis script and create installer in folder "package"
+win32{
+    package.path = $${OUT_PWD}/package/valentina
+    package.files += \
+        $${OUT_PWD}/$${DESTDIR}/valentina.exe \
+        $${OUT_PWD}/$${DESTDIR}/valentina.exe.dbg \
+        $$PWD/../../dist/win/valentina.ico \
+        $$PWD/../../dist/win/curl.exe \
+        $$PWD/../../dist/win/exchndl.dll \
+        $$PWD/../../dist/win/dbghelp.dll \
+        $$PWD/../../dist/win/mgwhelp.dll \
+        $$PWD/../../dist/win/symsrv.dll \
+        $$PWD/../../dist/win/symsrv.yes \
+        $$PWD/../../dist/win/pdftops.exe \
+        $$PWD/../../AUTHORS.txt \
+        $$PWD/../../LICENSE_GPL.txt \
+        $$PWD/../../README.txt \
+        $$PWD/../../ChangeLog.txt \
+        $$PWD/../libs/qmuparser/LICENSE_BSD.txt \
+        $${OUT_PWD}/../libs/qmuparser/$${DESTDIR}/qmuparser2.dll \
+        $${OUT_PWD}/../libs/qmuparser/$${DESTDIR}/qmuparser2.dll.dbg \
+        $${OUT_PWD}/../libs/vpropertyexplorer/$${DESTDIR}/vpropertyexplorer.dll \
+        $${OUT_PWD}/../libs/vpropertyexplorer/$${DESTDIR}/vpropertyexplorer.dll.dbg \
+        $$[QT_INSTALL_BINS]/icudt*.dll \ # Different name for different Qt releases
+        $$[QT_INSTALL_BINS]/icuin*.dll \ # Different name for different Qt releases
+        $$[QT_INSTALL_BINS]/icuuc*.dll \ # Different name for different Qt releases
+        $$[QT_INSTALL_BINS]/Qt5Core.dll \
+        $$[QT_INSTALL_BINS]/Qt5Gui.dll \
+        $$[QT_INSTALL_BINS]/Qt5Network.dll \
+        $$[QT_INSTALL_BINS]/Qt5PrintSupport.dll \
+        $$[QT_INSTALL_BINS]/Qt5Svg.dll \
+        $$[QT_INSTALL_BINS]/Qt5Widgets.dll \
+        $$[QT_INSTALL_BINS]/Qt5Xml.dll \
+        $$[QT_INSTALL_BINS]/Qt5XmlPatterns.dll \
+        $$[QT_INSTALL_BINS]/libgcc_s_dw2-1.dll \
+        $$[QT_INSTALL_BINS]/libstdc++-6.dll \
+        $$[QT_INSTALL_BINS]/libwinpthread-1.dll
+    INSTALLS += package
+
+    package_tables.path = $${OUT_PWD}/package/valentina/tables/standard
+    package_tables.files += $${OUT_PWD}/$${DESTDIR}/tables/standard/GOST_man_ru.vst
+    INSTALLS += package_tables
+
+    package_translations.path = $${OUT_PWD}/package/valentina/translations
+    package_translations.files += \
+        $$INSTALL_TRANSLATIONS \ # Valentina
+        $$[QT_INSTALL_TRANSLATIONS]/qt_ar.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qt_pl.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qt_pt.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qt_ru.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qt_sk.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qt_sl.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qt_sv.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qt_uk.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qt_zh_CN.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qt_zh_TW.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qt_ca.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qt_cs.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qt_da.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qt_de.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qt_es.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qt_fa.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qt_fi.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qt_fr.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qt_gl.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qt_he.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qt_hu.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qt_it.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qt_ja.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qt_ko.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qt_lt.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_uk.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_ca.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_cs.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_de.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_hu.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_it.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_ja.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_ru.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_sk.qm
+    INSTALLS += package_translations
+
+    package_bearer.path = $${OUT_PWD}/package/valentina/bearer
+    package_bearer.files += \
+        $$[QT_INSTALL_PLUGINS]/bearer/qgenericbearer.dll \
+        $$[QT_INSTALL_PLUGINS]/bearer/qnativewifibearer.dll
+    INSTALLS += package_bearer
+
+    package_iconengines.path = $${OUT_PWD}/package/valentina/iconengines
+    package_iconengines.files += $$[QT_INSTALL_PLUGINS]/iconengines/qsvgicon.dll
+    INSTALLS += package_iconengines
+
+    package_imageformats.path = $${OUT_PWD}/package/valentina/imageformats
+    package_imageformats.files += \
+        $$[QT_INSTALL_PLUGINS]/imageformats/qdds.dll \
+        $$[QT_INSTALL_PLUGINS]/imageformats/qgif.dll \
+        $$[QT_INSTALL_PLUGINS]/imageformats/qicns.dll \
+        $$[QT_INSTALL_PLUGINS]/imageformats/qico.dll \
+        $$[QT_INSTALL_PLUGINS]/imageformats/qjp2.dll \
+        $$[QT_INSTALL_PLUGINS]/imageformats/qjpeg.dll \
+        $$[QT_INSTALL_PLUGINS]/imageformats/qmng.dll \
+        $$[QT_INSTALL_PLUGINS]/imageformats/qsvg.dll \
+        $$[QT_INSTALL_PLUGINS]/imageformats/qtga.dll \
+        $$[QT_INSTALL_PLUGINS]/imageformats/qtiff.dll \
+        $$[QT_INSTALL_PLUGINS]/imageformats/qwbmp.dll \
+        $$[QT_INSTALL_PLUGINS]/imageformats/qwebp.dll \
+    INSTALLS += package_imageformats
+
+    package_platforms.path = $${OUT_PWD}/package/valentina/platforms
+    package_platforms.files += $$[QT_INSTALL_PLUGINS]/platforms/qwindows.dll
+    INSTALLS += package_platforms
+
+    package_printsupport.path = $${OUT_PWD}/package/valentina/printsupport
+    package_printsupport.files += $$[QT_INSTALL_PLUGINS]/printsupport/windowsprintersupport.dll
+    INSTALLS += package_printsupport
+
+    package_nsis.path = $${OUT_PWD}/package
+    package_nsis.files += $$PWD/../../dist/win/nsis/valentina.nsi
+    INSTALLS += package_nsis
+
+    package_nsis_headers.path = $${OUT_PWD}/package/headers
+    package_nsis_headers.files += \
+        $$PWD/../../dist/win/nsis/headers/fileassoc.nsh \
+        $$PWD/../../dist/win/nsis/headers/fileversion.nsh
+    INSTALLS += package_nsis_headers
+
+    # Do the packaging
+    # First, mangle all of INSTALLS values. We depend on them.
+    unset(MANGLED_INSTALLS)
+    for(x, INSTALLS):MANGLED_INSTALLS += install_$${x}
+    build_package.path = $${OUT_PWD}/package
+    build_package.commands = \"C:/Program Files/NSIS/makensisw.exe\" \"$${OUT_PWD}/package/valentina.nsi\"
+    build_package.depends = $${MANGLED_INSTALLS}
+    INSTALLS += build_package
+}
+
 # Some systems use special name for lrelease. For example opensuse 13.2 has lrelease-qt5.
 isEmpty(LRELEASE){
     LRELEASE = lrelease

src/app/dialogs/app/dialoglayoutsettings.ui

@@ -17,6 +17,10 @@
    <iconset resource="../../share/resources/icon.qrc">
     <normaloff>:/icon/64x64/icon64x64.png</normaloff>:/icon/64x64/icon64x64.png</iconset>
   </property>
+  <property name="windowIcon">
+   <iconset resource="../../share/resources/icon.qrc">
+    <normaloff>:/icon/64x64/icon64x64.png</normaloff>:/icon/64x64/icon64x64.png</iconset>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout_6">
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_4">
@@ -529,7 +533,7 @@
   </connection>
  </connections>
  <buttongroups>
-  <buttongroup name="buttonGroup"/>
   <buttongroup name="buttonGroupPrinciple"/>
+  <buttongroup name="buttonGroup"/>
  </buttongroups>
 </ui>

src/app/main.cpp

@@ -87,12 +87,20 @@ int main(int argc, char *argv[])
 
     QTranslator qtTranslator;
 #if defined(Q_OS_WIN)
-    qtTranslator.load("qt_" + checkedLocale, QCoreApplication::applicationDirPath());
+    qtTranslator.load("qt_" + checkedLocale, qApp->translationsPath());
 #else
     qtTranslator.load("qt_" + checkedLocale, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
 #endif
     app.installTranslator(&qtTranslator);
 
+    QTranslator qtxmlTranslator;
+#if defined(Q_OS_WIN)
+    qtxmlTranslator.load("qtxmlpatterns_" + checkedLocale, qApp->translationsPath());
+#else
+    qtxmlTranslator.load("qtxmlpatterns_" + checkedLocale, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+#endif
+    app.installTranslator(&qtxmlTranslator);
+
     QTranslator appTranslator;
     appTranslator.load("valentina_" + checkedLocale, qApp->translationsPath());
     app.installTranslator(&appTranslator);

src/app/mainwindow.cpp

@@ -142,6 +142,15 @@ MainWindow::MainWindow(QWidget *parent)
 
     setCurrentFile("");
     WindowsLocale();
+
+#if defined(Q_OS_MAC)
+    // On Mac deafault icon size is 32x32.
+    ui->toolBarArrows->setIconSize(QSize(24, 24));
+    ui->toolBarDraws->setIconSize(QSize(24, 24));
+    ui->toolBarOption->setIconSize(QSize(24, 24));
+    ui->toolBarStages->setIconSize(QSize(24, 24));
+    ui->toolBarTools->setIconSize(QSize(24, 24));
+#endif
 }
 
 //---------------------------------------------------------------------------------------------------------------------

src/app/tablewindow.cpp

@@ -87,6 +87,10 @@ TableWindow::TableWindow(QWidget *parent)
     connect(ui->actionSave_to_p_df, &QAction::triggered, this, &TableWindow::PrintToPdf);
 
     ReadSettings();
+#if defined(Q_OS_MAC)
+    // On Mac deafault icon size is 32x32.
+    ui->toolBar->setIconSize(QSize(24, 24));
+#endif
 }
 
 //---------------------------------------------------------------------------------------------------------------------

src/app/version.cpp

@@ -33,7 +33,7 @@
 
 extern const int MAJOR_VERSION = 0;
 extern const int MINOR_VERSION = 3;
-extern const int DEBUG_VERSION = 0;
+extern const int DEBUG_VERSION = 1;
 
 extern const QString APP_VERSION_STR(QStringLiteral("%1.%2.%3.%4").arg(MAJOR_VERSION).arg(MINOR_VERSION)
                                  .arg(DEBUG_VERSION).arg(LATEST_TAG_DISTANCE));

src/app/version.h

@@ -44,8 +44,8 @@ extern const QString APP_VERSION_STR;
 
 // Change version number in version.cpp too.
 
-#define VER_FILEVERSION             0,3,0,0
+#define VER_FILEVERSION             0,3,1,0
-#define VER_FILEVERSION_STR         "0.3.0.0\0"
+#define VER_FILEVERSION_STR         "0.3.1.0\0"
 
 #define VER_PRODUCTVERSION          VER_FILEVERSION
 #define VER_PRODUCTVERSION_STR      VER_FILEVERSION_STR