From 8de1b2bcd26d6462bdc88c4523629ac38bf4b2cd Mon Sep 17 00:00:00 2001
From: Syping <schiedelrafael@keppe.org>
Date: Thu, 2 Mar 2017 06:54:48 +0100
Subject: [PATCH] update to development version 2

---
 .travis.yml        |  10 +++++-----
 SavegameWidget.cpp |   1 -
 config.h           |   2 +-
 main.cpp           |   1 -
 res/app.rc         |   4 ++--
 res/gta5sync_fr.qm | Bin 30633 -> 28625 bytes
 res/gta5sync_fr.ts |  18 ++++++++++--------
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c6bd319..a4bbfb3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ sudo: required
 language: cpp
 
 env:
-- PACKAGE_VERSION="0.1.0"
+- PACKAGE_VERSION="1.4.0"
 
 before_install:
   - test -n $CC  && unset CC
@@ -17,22 +17,22 @@ install:
 before_script:
   - export INSTALL_ROOT=/usr
   - if [ `git name-rev --tags --name-only $(git rev-parse HEAD)` == "undefined" ]; then export APPLICATION_VERSION="$PACKAGE_VERSION.$TRAVIS_BUILD_NUMBER"; else export APPLICATION_VERSION=`git name-rev --tags --name-only $(git rev-parse HEAD)`; fi
-  - echo "gta5view build version is $APPLICATION_VERSION"
+  - echo "gta5view build version is $PACKAGE_VERSION"
   - mkdir build
   - mkdir package
   - cd build
   - echo "Grand Theft Auto V Snapmatic and Savegame viewer" > ./description-pak
 
 script:
-  - qmake -qt=5 "DEFINES+=GTA5SYNC_BUILDTYPE=\\\\\\\"Release\\\\\\\"" "DEFINES+=GTA5SYNC_DAILYB=\\\\\\\"$APPLICATION_VERSION\\\\\\\"" ../gta5view.pro
+  - qmake -qt=5 "DEFINES+=GTA5SYNC_BUILDTYPE=\\\\\\\"Developer\\\\\\\"" "DEFINES+=GTA5SYNC_DAILYB=\\\\\\\"$PACKAGE_VERSION-dev2\\\\\\\"" ../gta5view.pro
   - make -j 4
-  - sudo checkinstall -D --default --nodoc --pkgname=gta5view --pkgversion=$APPLICATION_VERSION --pkgrelease=travis1 --pkggroup=utility --maintainer="Syping on Travis \<travisci@syping.de\>"  --requires=libqt5core5a,libqt5gui5,libqt5network5,libqt5widgets5 --pakdir=../package
+  - sudo checkinstall -D --default --nodoc --pkgname=gta5view --pkgversion=$PACKAGE_VERSION --pkgrelease=dev2 --pkggroup=utility --maintainer="Syping on Travis \<travisci@syping.de\>"  --requires=libqt5core5a,libqt5gui5,libqt5network5,libqt5widgets5 --pakdir=../package
 
 deploy:
   provider: releases
   api_key:
     secure: "o7VneEz1aHfdVwZvOZLfopf6uJWNrFsZaBvunTmXFzpmNFhlNS1qwqgMUkIA2yBRbZ3wIzVs4vfwIHv7W9yE/PqK+AYL+R8+AwKGrwlgT4HqJNuk6VM/LNJ6GwT/qkQuaoOVw29bUjmzzgIRdHmw53SlJv6Hh1VE8HphlTT//aex6nCfcFhUZ0BETdZDWz5FSHwL3NalUoqfKfQrJeky5RXzCyCANQC2tKt0bV46GaWIgWrDo2KCTNqPtRWWf5GDmnkXE5IYRMQ3mXvO9iYh0v5Y2jo4PiXGUiFUU6Z3aAWFAiPdGclrBO697cf3lCTzDMhuCETR153qFYsLShUlFf61ITAmCeHAWETjZDri0lmPONo3GoNB6alGfYEA51qw14kXakrTpICtTJj7gw/gtUYOabW6hrzmieNzMBIy62RikDPjyakFnuwW2qNHRlD65e0jYv+6nCpb6E+OV16Ysh1zhV2vTfpfzVmSuyu2J+ELqXD3OZCXRSPpDIih9UQ8335p8FBji6jHORcgym/TRgdgRmENibh8tLzWp+UjpWHuWfcpvZgOskjfwU0iDMCayMJ7tDpOhXHcAhDRnd6XRIiOJ5YZCzflj2nEwmt3YUd7DwXS/AU+WHOmcNQBjXBxF/FJa35XXcy3HKJM5TTKqtph3medo30us5yXHeG6NNg="
-  file: "../package/gta5view_$APPLICATION_VERSION-travis1_amd64.deb"
+  file: "../package/gta5view_$PACKAGE_VERSION-dev2_amd64.deb"
   skip_cleanup: true
   on:
     tags: true
diff --git a/SavegameWidget.cpp b/SavegameWidget.cpp
index fece230..e7940d3 100755
--- a/SavegameWidget.cpp
+++ b/SavegameWidget.cpp
@@ -149,7 +149,6 @@ void SavegameWidget::on_cmdDelete_clicked()
 void SavegameWidget::on_cmdView_clicked()
 {
     SavegameDialog *savegameDialog = new SavegameDialog(this);
-    savegameDialog->setWindowFlags(savegameDialog->windowFlags()^Qt::WindowContextHelpButtonHint);
     savegameDialog->setSavegameData(sgdata, sgdPath, true);
     savegameDialog->setModal(true);
     savegameDialog->show();
diff --git a/config.h b/config.h
index 8e0020f..4eba476 100755
--- a/config.h
+++ b/config.h
@@ -50,7 +50,7 @@
 
 #ifndef GTA5SYNC_APPVER
 #ifndef GTA5SYNC_DAILYB
-#define GTA5SYNC_APPVER "1.4.0-dev1"
+#define GTA5SYNC_APPVER "1.4.0-dev2"
 #else
 #define GTA5SYNC_APPVER QString("%1").arg(GTA5SYNC_DAILYB)
 #endif
diff --git a/main.cpp b/main.cpp
index eeacd3d..c90f498 100755
--- a/main.cpp
+++ b/main.cpp
@@ -458,7 +458,6 @@ int main(int argc, char *argv[])
         SavegameData savegame;
 
         bool readOk = savegame.readingSavegameFromFile(arg1);
-        savegameDialog.setWindowFlags(savegameDialog.windowFlags()^Qt::WindowContextHelpButtonHint);
         savegameDialog.setWindowIcon(IconLoader::loadingAppIcon());
         savegameDialog.setSavegameData(&savegame, arg1, readOk);
 
diff --git a/res/app.rc b/res/app.rc
index 9195aef..9d25b64 100755
--- a/res/app.rc
+++ b/res/app.rc
@@ -25,12 +25,12 @@ BEGIN
         BEGIN
             VALUE   "CompanyName",      "Syping"
             VALUE   "FileDescription",  "gta5view\0"
-            VALUE   "FileVersion",      "1.4.0-dev1\0"
+            VALUE   "FileVersion",      "1.4.0-dev2\0"
             VALUE   "InternalName",     "gta5view\0"
             VALUE   "LegalCopyright",   "Copyright � 2016-2017 Syping\0"
             VALUE   "OriginalFilename", "gta5view.exe\0"
             VALUE   "ProductName",      "gta5view\0"
-            VALUE   "ProductVersion",   "1.4.0-dev1\0"
+            VALUE   "ProductVersion",   "1.4.0-dev2\0"
         END
     END
 END
diff --git a/res/gta5sync_fr.qm b/res/gta5sync_fr.qm
index 3c7a03a4bb168aa37f70ec0e0dbf0c3a0f054bc2..7b01f37b5d4135ae8ca8e8c3f0f2bdb2f5657e20 100644
GIT binary patch
delta 2498
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

delta 2893
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

diff --git a/res/gta5sync_fr.ts b/res/gta5sync_fr.ts
index bf2ffa2..89f9aab 100644
--- a/res/gta5sync_fr.ts
+++ b/res/gta5sync_fr.ts
@@ -1080,7 +1080,7 @@ Appuyer sur 1 pour le mode par défaut</translation>
         <location filename="../SnapmaticEditor.ui" line="71"/>
         <location filename="../SnapmaticEditor.ui" line="115"/>
         <source>Mugshot</source>
-        <translation>Mugshot</translation>
+        <translation>Photo d&apos;identité</translation>
     </message>
     <message>
         <source>Custom</source>
@@ -1100,20 +1100,20 @@ Appuyer sur 1 pour le mode par défaut</translation>
         <location filename="../SnapmaticEditor.ui" line="125"/>
         <location filename="../SnapmaticEditor.cpp" line="297"/>
         <source>Snapmatic Title</source>
-        <translation type="unfinished"></translation>
+        <translation>Titre Snapmatic</translation>
     </message>
     <message>
         <location filename="../SnapmaticEditor.ui" line="140"/>
         <location filename="../SnapmaticEditor.cpp" line="200"/>
         <source>Title: %1 (%2)</source>
-        <translation type="unfinished"></translation>
+        <translation>Titre : %1 (%2)</translation>
     </message>
     <message>
         <location filename="../SnapmaticEditor.ui" line="156"/>
         <location filename="../SnapmaticEditor.cpp" line="204"/>
         <location filename="../SnapmaticEditor.cpp" line="208"/>
         <source>Appropriate: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Valide : %1</translation>
     </message>
     <message>
         <location filename="../SnapmaticEditor.ui" line="169"/>
@@ -1143,19 +1143,21 @@ Appuyer sur 1 pour le mode par défaut</translation>
     <message>
         <location filename="../SnapmaticEditor.cpp" line="199"/>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Éditer</translation>
     </message>
     <message>
         <location filename="../SnapmaticEditor.cpp" line="204"/>
         <source>Yes</source>
         <comment>Yes, should work fine</comment>
-        <translation type="unfinished"></translation>
+        <translatorcomment>Oui, devrait fonctionner</translatorcomment>
+        <translation>Oui</translation>
     </message>
     <message>
         <location filename="../SnapmaticEditor.cpp" line="208"/>
         <source>No</source>
         <comment>No, could lead to issues</comment>
-        <translation type="unfinished"></translation>
+        <translatorcomment>Non, pourrait causer des erreurs</translatorcomment>
+        <translation>Non</translation>
     </message>
     <message>
         <location filename="../SnapmaticEditor.cpp" line="247"/>
@@ -1165,7 +1167,7 @@ Appuyer sur 1 pour le mode par défaut</translation>
     <message>
         <location filename="../SnapmaticEditor.cpp" line="297"/>
         <source>New Snapmatic title:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nouveau titre Snapmatic :</translation>
     </message>
 </context>
 <context>