From 81b3f0a4881dca3e9b933263c797520cf9c03930 Mon Sep 17 00:00:00 2001
From: dismine <dismine@gmail.com>
Date: Thu, 18 Sep 2014 18:21:53 +0300
Subject: [PATCH] 0.2.8-alpha.

--HG--
branch : develop
---
 src/app/dialogs/app/dialogaboutapp.cpp        |  5 +++-
 .../share/resources/valentina.exe.manifest    | 26 +++++++++----------
 src/app/share/translations/valentina.ts       | 14 +++++++---
 src/app/share/translations/valentina_cs_CZ.ts | 14 +++++++---
 src/app/share/translations/valentina_de_DE.ts | 14 +++++++---
 src/app/share/translations/valentina_fr_FR.ts | 14 +++++++---
 src/app/share/translations/valentina_he_IL.ts | 14 +++++++---
 src/app/share/translations/valentina_it_IT.ts | 14 +++++++---
 src/app/share/translations/valentina_nl_NL.ts | 14 +++++++---
 src/app/share/translations/valentina_ru_RU.ts | 10 ++++++-
 src/app/share/translations/valentina_uk_UA.ts | 14 +++++++---
 src/app/version.cpp                           |  9 +++----
 src/app/version.h                             | 12 ++++-----
 13 files changed, 124 insertions(+), 50 deletions(-)

diff --git a/src/app/dialogs/app/dialogaboutapp.cpp b/src/app/dialogs/app/dialogaboutapp.cpp
index 251ef9eef..b392c9a5f 100644
--- a/src/app/dialogs/app/dialogaboutapp.cpp
+++ b/src/app/dialogs/app/dialogaboutapp.cpp
@@ -46,7 +46,10 @@ DialogAboutApp::DialogAboutApp(QWidget *parent) :
     QDate date = QLocale(QLocale::C).toDate(QString(__DATE__).simplified(), QLatin1String("MMM d yyyy"));
     ui->label_Valentina_Built->setText(tr("Built on %3 at %4").arg(date.toString()).arg(__TIME__));
 
-    ui->label_Legal_Stuff->setText(WARRANTY);
+    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));
     connect(ui->pushButton_Web_Site, &QPushButton::clicked, this, &DialogAboutApp::webButtonClicked );
diff --git a/src/app/share/resources/valentina.exe.manifest b/src/app/share/resources/valentina.exe.manifest
index 5d02da89e..1fc60a46f 100644
--- a/src/app/share/resources/valentina.exe.manifest
+++ b/src/app/share/resources/valentina.exe.manifest
@@ -1,20 +1,20 @@
 <?xml version='1.0' encoding='UTF-8' standalone='yes'?>
 <assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
-	<assemblyIdentity
-		version="0.2.2.0"
-		processorArchitecture="*"
-		name="ValentinaTeam.Valentina.Valentina"
-		type="win32"
-	/>
+        <assemblyIdentity
+                version="0.2.8.0"
+                processorArchitecture="*"
+                name="ValentinaTeam.Valentina.Valentina"
+                type="win32"
+        />
     <dependency>
         <dependentAssembly>
-            <assemblyIdentity 
-				type='win32' 
-				name='Microsoft.Windows.Common-Controls' 
-				version='6.0.0.0' 
-				publicKeyToken='6595b64144ccf1df' 
-				language='*' 
-				processorArchitecture='*' />
+            <assemblyIdentity
+                                type='win32'
+                                name='Microsoft.Windows.Common-Controls'
+                                version='6.0.0.0'
+                                publicKeyToken='6595b64144ccf1df'
+                                language='*'
+                                processorArchitecture='*' />
         </dependentAssembly>
     </dependency>
 </assembly>
diff --git a/src/app/share/translations/valentina.ts b/src/app/share/translations/valentina.ts
index 9e9c953e2..43b78b89c 100644
--- a/src/app/share/translations/valentina.ts
+++ b/src/app/share/translations/valentina.ts
@@ -274,17 +274,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="51"/>
+        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="54"/>
         <source>Web site : %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="70"/>
+        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="73"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="70"/>
+        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="73"/>
         <source>Cannot open your default browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2812,6 +2812,14 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>InternalStrings</name>
+    <message>
+        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="49"/>
+        <source>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainWindow</name>
     <message>
diff --git a/src/app/share/translations/valentina_cs_CZ.ts b/src/app/share/translations/valentina_cs_CZ.ts
index 6d3b90811..7156605ea 100644
--- a/src/app/share/translations/valentina_cs_CZ.ts
+++ b/src/app/share/translations/valentina_cs_CZ.ts
@@ -274,17 +274,17 @@
         <translation type="unfinished">Sestaveno %3 v %4</translation>
     </message>
     <message>
-        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="51"/>
+        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="54"/>
         <source>Web site : %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="70"/>
+        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="73"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="70"/>
+        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="73"/>
         <source>Cannot open your default browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2940,6 +2940,14 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>InternalStrings</name>
+    <message>
+        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="49"/>
+        <source>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainWindow</name>
     <message>
diff --git a/src/app/share/translations/valentina_de_DE.ts b/src/app/share/translations/valentina_de_DE.ts
index 2e29b28d9..c8384ec3f 100644
--- a/src/app/share/translations/valentina_de_DE.ts
+++ b/src/app/share/translations/valentina_de_DE.ts
@@ -274,17 +274,17 @@
         <translation type="unfinished">Built on %3 at %4</translation>
     </message>
     <message>
-        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="51"/>
+        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="54"/>
         <source>Web site : %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="70"/>
+        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="73"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="70"/>
+        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="73"/>
         <source>Cannot open your default browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2948,6 +2948,14 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>InternalStrings</name>
+    <message>
+        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="49"/>
+        <source>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainWindow</name>
     <message>
diff --git a/src/app/share/translations/valentina_fr_FR.ts b/src/app/share/translations/valentina_fr_FR.ts
index 5ae36510a..afd9f18a3 100644
--- a/src/app/share/translations/valentina_fr_FR.ts
+++ b/src/app/share/translations/valentina_fr_FR.ts
@@ -274,17 +274,17 @@
         <translation type="unfinished">Compilé sur %3 à %4</translation>
     </message>
     <message>
-        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="51"/>
+        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="54"/>
         <source>Web site : %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="70"/>
+        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="73"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="70"/>
+        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="73"/>
         <source>Cannot open your default browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3012,6 +3012,14 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>InternalStrings</name>
+    <message>
+        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="49"/>
+        <source>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainWindow</name>
     <message>
diff --git a/src/app/share/translations/valentina_he_IL.ts b/src/app/share/translations/valentina_he_IL.ts
index 7faaa2fe6..6c72e7639 100644
--- a/src/app/share/translations/valentina_he_IL.ts
+++ b/src/app/share/translations/valentina_he_IL.ts
@@ -274,17 +274,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="51"/>
+        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="54"/>
         <source>Web site : %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="70"/>
+        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="73"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="70"/>
+        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="73"/>
         <source>Cannot open your default browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2892,6 +2892,14 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>InternalStrings</name>
+    <message>
+        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="49"/>
+        <source>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainWindow</name>
     <message>
diff --git a/src/app/share/translations/valentina_it_IT.ts b/src/app/share/translations/valentina_it_IT.ts
index 9d0a1fb91..94bb8f332 100644
--- a/src/app/share/translations/valentina_it_IT.ts
+++ b/src/app/share/translations/valentina_it_IT.ts
@@ -274,17 +274,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="51"/>
+        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="54"/>
         <source>Web site : %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="70"/>
+        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="73"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="70"/>
+        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="73"/>
         <source>Cannot open your default browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2888,6 +2888,14 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>InternalStrings</name>
+    <message>
+        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="49"/>
+        <source>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainWindow</name>
     <message>
diff --git a/src/app/share/translations/valentina_nl_NL.ts b/src/app/share/translations/valentina_nl_NL.ts
index 689da8e56..7c4e515cc 100644
--- a/src/app/share/translations/valentina_nl_NL.ts
+++ b/src/app/share/translations/valentina_nl_NL.ts
@@ -274,17 +274,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="51"/>
+        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="54"/>
         <source>Web site : %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="70"/>
+        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="73"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="70"/>
+        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="73"/>
         <source>Cannot open your default browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2812,6 +2812,14 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>InternalStrings</name>
+    <message>
+        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="49"/>
+        <source>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainWindow</name>
     <message>
diff --git a/src/app/share/translations/valentina_ru_RU.ts b/src/app/share/translations/valentina_ru_RU.ts
index d624c63d0..34181e953 100644
--- a/src/app/share/translations/valentina_ru_RU.ts
+++ b/src/app/share/translations/valentina_ru_RU.ts
@@ -282,7 +282,7 @@
         <translation>Создано %3 в %4</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
         <source>Web site : %1</source>
         <translation>Веб сайт : %1</translation>
     </message>
@@ -3284,6 +3284,14 @@
         <translation>avg</translation>
     </message>
 </context>
+<context>
+    <name>InternalStrings</name>
+    <message>
+        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="-24"/>
+        <source>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</source>
+        <translation>Программа предоставляется КАК ЕСТЬ без ГАРАНТИЙ ЛЮБОГО РОДА, ВКЛЮЧАЯ ГАРАНТИЙ ДИЗАЙНА, КОММЕРЧЕСКОЙ ЦЕННОСТИ И ПРИГОДНОСТИ ДЛЯ КОНКРЕТНЫХ ЦЕЛЕЙ.</translation>
+    </message>
+</context>
 <context>
     <name>MainWindow</name>
     <message>
diff --git a/src/app/share/translations/valentina_uk_UA.ts b/src/app/share/translations/valentina_uk_UA.ts
index 38df3e901..63ba215ee 100644
--- a/src/app/share/translations/valentina_uk_UA.ts
+++ b/src/app/share/translations/valentina_uk_UA.ts
@@ -278,17 +278,17 @@
         <translation>Зібрано %3 в %4</translation>
     </message>
     <message>
-        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="51"/>
+        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="54"/>
         <source>Web site : %1</source>
         <translation>Веб сайт : %1</translation>
     </message>
     <message>
-        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="70"/>
+        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="73"/>
         <source>Warning</source>
         <translation>Попердження</translation>
     </message>
     <message>
-        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="70"/>
+        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="73"/>
         <source>Cannot open your default browser</source>
         <translation>Не можу відкрити браузер по замовчуванню</translation>
     </message>
@@ -3064,6 +3064,14 @@
         <translation>avg</translation>
     </message>
 </context>
+<context>
+    <name>InternalStrings</name>
+    <message>
+        <location filename="../../dialogs/app/dialogaboutapp.cpp" line="49"/>
+        <source>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</source>
+        <translation>Програма надається ЯК Є без ГАРАНТІЙ БУДЬ-ЯКОГО РОДУ, ВКЛЮЧАЮЧИ ГАРАНТІЙ ДИЗАЙНУ, КОМЕРЦІЙНОЇ ЦІННОСТІ І ПРИДАТНОСТІ ДЛЯ КОНКРЕТНИХ ЦІЛЕЙ.</translation>
+    </message>
+</context>
 <context>
     <name>MainWindow</name>
     <message>
diff --git a/src/app/version.cpp b/src/app/version.cpp
index 3ea08e6c3..7b7731ed9 100644
--- a/src/app/version.cpp
+++ b/src/app/version.cpp
@@ -28,12 +28,11 @@
 
 #include "version.h"
 #include <QString>
+#include <QApplication>
 
 extern const int MAJOR_VERSION = 0;
 extern const int MINOR_VERSION = 2;
-extern const int DEBUG_VERSION = 2;
+extern const int DEBUG_VERSION = 8;
 
-extern const QString APP_VERSION(QStringLiteral("%1.%2.%3.%4").arg(MAJOR_VERSION).arg(MINOR_VERSION).arg(DEBUG_VERSION)
-                                 .arg(LOC_REV));
-extern const QString WARRANTY("The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE "
-                              "WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.");
+extern const QString APP_VERSION(QStringLiteral("%1.%2.%3.%4-alpha").arg(MAJOR_VERSION).arg(MINOR_VERSION)
+                                 .arg(DEBUG_VERSION).arg(LOC_REV));
diff --git a/src/app/version.h b/src/app/version.h
index 291bf8f1e..49a67f980 100644
--- a/src/app/version.h
+++ b/src/app/version.h
@@ -36,15 +36,15 @@ extern const int MINOR_VERSION;
 extern const int DEBUG_VERSION;
 
 extern const QString APP_VERSION;
-extern const QString WARRANTY;
 
-// Don't forget change version number in manifest file.
+// Don't forget change version number in manifest file /src/app/share/resources/valentina.exe.manifest.
+// Change version number in version.cpp also.
 
-#define VER_FILEVERSION             0,2,2,0
-#define VER_FILEVERSION_STR         "0.2.2.0\0"
+#define VER_FILEVERSION             0,2,8,0
+#define VER_FILEVERSION_STR         "0.2.8.0\0"
 
-#define VER_PRODUCTVERSION          0,2,2,0
-#define VER_PRODUCTVERSION_STR      "0.2\0"
+#define VER_PRODUCTVERSION          VER_FILEVERSION
+#define VER_PRODUCTVERSION_STR      VER_FILEVERSION_STR
 
 #define VER_COMPANYNAME_STR         "ValentinaTeam"
 #define VER_FILEDESCRIPTION_STR     "Patternmaking program."