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 @@ - + - + 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 @@ - + Web site : %1 - + Warning - + Cannot open your default browser @@ -2812,6 +2812,14 @@ + + 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. + + + MainWindow 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 @@ Sestaveno %3 v %4 - + Web site : %1 - + Warning - + Cannot open your default browser @@ -2940,6 +2940,14 @@ + + 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. + + + MainWindow 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 @@ Built on %3 at %4 - + Web site : %1 - + Warning - + Cannot open your default browser @@ -2948,6 +2948,14 @@ + + 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. + + + MainWindow 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 @@ Compilé sur %3 à %4 - + Web site : %1 - + Warning - + Cannot open your default browser @@ -3012,6 +3012,14 @@ + + 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. + + + MainWindow 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 @@ - + Web site : %1 - + Warning - + Cannot open your default browser @@ -2892,6 +2892,14 @@ + + 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. + + + MainWindow 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 @@ - + Web site : %1 - + Warning - + Cannot open your default browser @@ -2888,6 +2888,14 @@ + + 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. + + + MainWindow 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 @@ - + Web site : %1 - + Warning - + Cannot open your default browser @@ -2812,6 +2812,14 @@ + + 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. + + + MainWindow 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 @@ Создано %3 в %4 - + Web site : %1 Веб сайт : %1 @@ -3284,6 +3284,14 @@ avg + + 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. + Программа предоставляется КАК ЕСТЬ без ГАРАНТИЙ ЛЮБОГО РОДА, ВКЛЮЧАЯ ГАРАНТИЙ ДИЗАЙНА, КОММЕРЧЕСКОЙ ЦЕННОСТИ И ПРИГОДНОСТИ ДЛЯ КОНКРЕТНЫХ ЦЕЛЕЙ. + + MainWindow 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 @@ Зібрано %3 в %4 - + Web site : %1 Веб сайт : %1 - + Warning Попердження - + Cannot open your default browser Не можу відкрити браузер по замовчуванню @@ -3064,6 +3064,14 @@ avg + + 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. + Програма надається ЯК Є без ГАРАНТІЙ БУДЬ-ЯКОГО РОДУ, ВКЛЮЧАЮЧИ ГАРАНТІЙ ДИЗАЙНУ, КОМЕРЦІЙНОЇ ЦІННОСТІ І ПРИДАТНОСТІ ДЛЯ КОНКРЕТНИХ ЦІЛЕЙ. + + MainWindow 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 +#include 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."