Merge branch 'master' into develop

release-tool

@@ -520,7 +520,7 @@ merge() {
     fi
     git diff-index --quiet HEAD --
     if [ $? -ne 0 ]; then
-        git add ./share/translations/*
+        git add -A ./share/translations/
         logInfo "Committing changes..."
         if [ "" == "$GPG_GIT_KEY" ]; then
             git commit -m "Update translations"

share/translations/update.sh

@@ -53,12 +53,17 @@ if $UPDATE; then
 fi
 
 if $PUSH; then
-    echo "Pushing English source files to Transifex..."
+    echo "Pushing source files to Transifex..."
     tx push -s $@
     echo
 fi
 
 if $PULL; then
+    echo "Removing stale translations..."
+    mv share/translations/keepassx_en.ts share/translations/keepassx_en.ts.bak
+    rm share/translations/*.ts
+    mv share/translations/keepassx_en.ts.bak share/translations/keepassx_en.ts
+
     echo "Pulling translations from Transifex..."
     tx pull -af --minimum-perc=40 $@
     echo

src/main.cpp

@@ -161,8 +161,7 @@ int main(int argc, char** argv)
 
     // Check if restart was requested
     if (exitCode == RESTART_EXITCODE) {
-        QProcess* proc = new QProcess();
+        QProcess::startDetached(QCoreApplication::applicationFilePath(), {});
-        proc->start(QCoreApplication::applicationFilePath());
     }
 
 #if defined(WITH_ASAN) && defined(WITH_LSAN)