From 6e165de9e2b150520d82483bb260fcaed2128261 Mon Sep 17 00:00:00 2001
From: Rafael <Syping@users.noreply.github.com>
Date: Sun, 27 Mar 2016 12:22:21 +0200
Subject: [PATCH] strings updated, german translation updated

---
 ProfileInterface.cpp |   4 ++--
 ProfileInterface.h   |   2 +-
 ProfileInterface.ui  |   4 ++--
 ProfileLoader.cpp    |  16 +++++++++-------
 UserInterface.ui     |   2 +-
 gta5sync_de.qm       | Bin 4077 -> 4286 bytes
 gta5sync_de.ts       |  27 ++++++++++++++++++---------
 7 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/ProfileInterface.cpp b/ProfileInterface.cpp
index 5bc268b..e944dd5 100755
--- a/ProfileInterface.cpp
+++ b/ProfileInterface.cpp
@@ -34,7 +34,7 @@ ProfileInterface::ProfileInterface(ProfileDatabase *profileDB, CrewDatabase *cre
 {
     ui->setupUi(this);
     ui->saProfile->setVisible(false);
-    contentStr = ui->labProfileContent->text();
+    loadingStr = ui->labProfileLoading->text();
     profileFolder = "";
 }
 
@@ -77,7 +77,7 @@ void ProfileInterface::on_loadingProgress(int value, int maximum)
 {
     ui->pbPictureLoading->setMaximum(maximum);
     ui->pbPictureLoading->setValue(value);
-    ui->labProfileContent->setText(contentStr.arg(QString::number(value), QString::number(maximum)));
+    ui->labProfileLoading->setText(loadingStr.arg(QString::number(value), QString::number(maximum)));
 }
 
 void ProfileInterface::on_profileLoaded()
diff --git a/ProfileInterface.h b/ProfileInterface.h
index b851882..68b1ee4 100755
--- a/ProfileInterface.h
+++ b/ProfileInterface.h
@@ -51,7 +51,7 @@ private:
     Ui::ProfileInterface *ui;
     QString profileFolder;
     QString profileName;
-    QString contentStr;
+    QString loadingStr;
 };
 
 #endif // PROFILEINTERFACE_H
diff --git a/ProfileInterface.ui b/ProfileInterface.ui
index 489c01c..1ee8dd1 100755
--- a/ProfileInterface.ui
+++ b/ProfileInterface.ui
@@ -58,9 +58,9 @@
        </spacer>
       </item>
       <item>
-       <widget class="QLabel" name="labProfileContent">
+       <widget class="QLabel" name="labProfileLoading">
         <property name="text">
-         <string>Loading %1 files of %2 files</string>
+         <string>Loading file %1 of %2 files</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignCenter</set>
diff --git a/ProfileLoader.cpp b/ProfileLoader.cpp
index 92cf0df..43dbdc7 100755
--- a/ProfileLoader.cpp
+++ b/ProfileLoader.cpp
@@ -32,12 +32,12 @@ ProfileLoader::ProfileLoader(QString profileFolder, CrewDatabase *crewDB, QObjec
 
 void ProfileLoader::run()
 {
-    int loadedV = 0;
+    int curFile = 1;
     QDir profileDir;
+    QList<int> crewList;
     profileDir.setPath(profileFolder);
 
-    QList<int> crewList;
-
+    // Seek pictures and savegames
     profileDir.setNameFilters(QStringList("SGTA*"));
     QStringList SavegameFiles = profileDir.entryList(QDir::Files | QDir::NoDot, QDir::NoSort);
     QStringList BackupFiles = SavegameFiles.filter(".bak", Qt::CaseInsensitive);
@@ -53,6 +53,8 @@ void ProfileLoader::run()
 
     int maximumV = SavegameFiles.length() + SnapmaticPics.length();
 
+    // Loading pictures and savegames
+    emit loadingProgress(curFile, maximumV);
     foreach(const QString &SavegameFile, SavegameFiles)
     {
         QString sgdPath = profileFolder + "/" + SavegameFile;
@@ -61,8 +63,8 @@ void ProfileLoader::run()
         {
             emit savegameLoaded(savegame, sgdPath);
         }
-        loadedV++;
-        emit loadingProgress(loadedV, maximumV);
+        curFile++;
+        emit loadingProgress(curFile, maximumV);
     }
     foreach(const QString &SnapmaticPic, SnapmaticPics)
     {
@@ -77,8 +79,8 @@ void ProfileLoader::run()
                 crewList.append(crewNumber);
             }
         }
-        loadedV++;
-        emit loadingProgress(loadedV, maximumV);
+        curFile++;
+        emit loadingProgress(curFile, maximumV);
     }
 
     // adding found crews
diff --git a/UserInterface.ui b/UserInterface.ui
index ba61eda..7f03a70 100755
--- a/UserInterface.ui
+++ b/UserInterface.ui
@@ -17,7 +17,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>GTA V Sync</string>
+   <string>gta5sync - %1</string>
   </property>
   <widget class="QWidget" name="cwUI">
    <layout class="QVBoxLayout" name="vlUI">
diff --git a/gta5sync_de.qm b/gta5sync_de.qm
index 5ed0b3aeb700de47066a33d2adfa570c84cf1b99..09e4b1958c2123a542250dee2c4427e1f95b1f9a 100755
GIT binary patch
delta 447
zcmaDWzfW<3h@}Gq%d$!a1};tpmh&tO47}A0EEiOP^kxQ@HwFw0d{Y=$&mU)C;E8AO
zGMmc4z|;$&ITa@Qif2A%T99DKz`z^=p*f?N9xW3AD&}TZICmLHPi0<i2Q-|;f@O8z
zM<D+`%j$jxpy9$mnh{95v#ils3bfn-LUX6FoG+UKwB#78*ox^ueLq<nGm3$Z2$^_R
z-E$si(sUD`;&RTS??wy^oSQjYoi_mar#XA{Oo5JI;o2c1%D}+>gX^pl&~Oevu5T8K
z3=I4t-1~Bm0u4FBqpk57DBmzymr<IDKX$VhV+(tn1%nSmB0~y8DuV)p3y@U;WMu-`
zstkrevWy|0ArH(mLXl5p$m0Ndgn<o+rG4@fQ!?|?71A<uQWaDU74p**RE@yA;>lc`
zQk&0lNU#Sm164{fqyx=QWH4nYW~c<3n+!Bl7i_vA+%(?wl0?(u%DiL+U7%U)KwZ3{
X#i>P}c_pbuX^F|Hj2%EBCPqd8pweP`

delta 259
zcmdm|_*Q;`h@}Ao%d$!a2F{5LEazDm7<ic(ST3jnX=?_SHwFw0d@>BI=Z`Zma6f18
zGMmc4z|;$&IaW;c70=9OT99DKz`z^=p*bEgJz6FLR6Lnk;oM~g1|C`F<#s^BSu9vq
z_k9HN(^*#cGXUw?K$;OqpJ!R4vlM9g2?)*gj^%vW6rd%?SjARM2kQID+L%!cbj+QJ
zXVop$IFqKE02Tk|Ec$K)q^&tyoi{Kra0PSr=$Qf?!NRpeMwEepy@Bhj6VPz>Yux*C
ij{<$*Guf6=nu%}D<|xJ%_RV3O671|9Ku0h!G6DdCQa`5v

diff --git a/gta5sync_de.ts b/gta5sync_de.ts
index 41c182c..e517783 100755
--- a/gta5sync_de.ts
+++ b/gta5sync_de.ts
@@ -82,7 +82,12 @@
         <translation>Profil Interface</translation>
     </message>
     <message>
-        <location filename="ProfileInterface.ui" line="32"/>
+        <location filename="ProfileInterface.ui" line="63"/>
+        <source>Loading file %1 of %2 files</source>
+        <oldsource>Loading %1 files of %2 files</oldsource>
+        <translation>Lade Datei %1 von %2 Dateien</translation>
+    </message>
+    <message>
         <source>Content of Profile %1</source>
         <translation>Inhalt vom Profil %1</translation>
     </message>
@@ -91,7 +96,7 @@
         <translation type="obsolete">Ansehen</translation>
     </message>
     <message>
-        <location filename="ProfileInterface.ui" line="113"/>
+        <location filename="ProfileInterface.ui" line="173"/>
         <source>Close Profile</source>
         <translation>Profil schließen</translation>
     </message>
@@ -128,17 +133,17 @@
         <translation>Spielstand Widget</translation>
     </message>
     <message>
-        <location filename="SavegameWidget.ui" line="20"/>
+        <location filename="SavegameWidget.ui" line="36"/>
         <source>The Third Way (100%) - 00/00/00 00:00:00</source>
         <translation>The Third Way (100%) - 00/00/00 00:00:00</translation>
     </message>
     <message>
-        <location filename="SavegameWidget.ui" line="43"/>
+        <location filename="SavegameWidget.ui" line="46"/>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
     <message>
-        <location filename="SavegameWidget.ui" line="50"/>
+        <location filename="SavegameWidget.ui" line="53"/>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
@@ -151,17 +156,17 @@
         <translation>Snapmatic Widget</translation>
     </message>
     <message>
-        <location filename="SnapmaticWidget.ui" line="45"/>
+        <location filename="SnapmaticWidget.ui" line="51"/>
         <source>PHOTO - 00/00/00 00:00:00</source>
         <translation>FOTO - 00/00/00 00:00:00</translation>
     </message>
     <message>
-        <location filename="SnapmaticWidget.ui" line="68"/>
+        <location filename="SnapmaticWidget.ui" line="61"/>
         <source>View</source>
         <translation>Ansehen</translation>
     </message>
     <message>
-        <location filename="SnapmaticWidget.ui" line="75"/>
+        <location filename="SnapmaticWidget.ui" line="68"/>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
@@ -173,11 +178,15 @@
         <translation type="obsolete">Grand Theft Auto V Sync</translation>
     </message>
     <message>
-        <location filename="UserInterface.ui" line="20"/>
         <location filename="UserInterface.cpp" line="69"/>
         <source>GTA V Sync</source>
         <translation>GTA V Sync</translation>
     </message>
+    <message>
+        <location filename="UserInterface.ui" line="20"/>
+        <source>gta5sync - %1</source>
+        <translation>gta5sync - %1</translation>
+    </message>
     <message>
         <location filename="UserInterface.ui" line="57"/>
         <source>File</source>