From a1d4071d55bcff3ad5810c4474056d7596829eeb Mon Sep 17 00:00:00 2001
From: Syping <schiedelrafael@keppe.org>
Date: Thu, 18 Jan 2018 00:31:21 +0100
Subject: [PATCH] fix string, improve build scripts

---
 .travis/debian_build.sh  |   8 ++++----
 .travis/osx_build.sh     |   6 +++---
 .travis/windows_build.sh |   4 ++--
 OptionsDialog.ui         |   4 ++--
 lang/gta5sync_no.ts      |  10 +++++-----
 res/gta5sync_de.qm       | Bin 45245 -> 45246 bytes
 res/gta5sync_de.ts       |   8 ++++++--
 res/gta5sync_en_US.ts    |  10 +++++-----
 res/gta5sync_fr.ts       |   2 +-
 res/gta5sync_ru.ts       |   2 +-
 10 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/.travis/debian_build.sh b/.travis/debian_build.sh
index d4e126f..6cb19aa 100755
--- a/.travis/debian_build.sh
+++ b/.travis/debian_build.sh
@@ -3,15 +3,15 @@
 # Creating folders
 cd ${PROJECT_DIR} && \
 echo "gta5view build version is ${APPLICATION_VERSION}" && \
-mkdir build && \
-mkdir assets && \
+mkdir -p build && \
+mkdir -p assets && \
 chmod -x res/gta5sync_*.qm res/gta5view.desktop res/gta5view.png && \
 cd build && \
-mkdir qt4 && \
+mkdir -p qt4 && \
 cd qt4 && \
 echo "Grand Theft Auto V Snapmatic and Savegame viewer/manager" > ./description-pak && \
 cd .. && \
-mkdir qt5 && \
+mkdir -p qt5 && \
 cd qt5 && \
 echo "Grand Theft Auto V Snapmatic and Savegame viewer/manager" > ./description-pak && \
 cd .. && \
diff --git a/.travis/osx_build.sh b/.travis/osx_build.sh
index dc17559..f44e891 100755
--- a/.travis/osx_build.sh
+++ b/.travis/osx_build.sh
@@ -3,11 +3,11 @@
 # Creating folders
 cd ${PROJECT_DIR} && \
 echo "gta5view build version is ${APPLICATION_VERSION}" && \
-mkdir build && \
-mkdir assets && \
+mkdir -p build && \
+mkdir -p assets && \
 cd build && \
 
 /usr/local/opt/qt/bin/qmake ${QMAKE_FLAGS_QT5} DEFINES+=GTA5SYNC_BUILDTYPE_RC "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"${APPLICATION_VERSION}\\\\\\\"" DEFINES+=GTA5SYNC_TELEMETRY "DEFINES+=GTA5SYNC_TELEMETRY_WEBURL=\\\\\\\"https://dev.syping.de/gta5view-userstats/\\\\\\\"" ../gta5view.pro && \
 make -j 4 && \
 /usr/local/opt/qt/bin/macdeployqt gta5view.app -dmg && \
-cp -Rf gta5view.dmg ../assets/gta5view.dmg
+cp -Rf gta5view.dmg ../assets/gta5view-${EXECUTABLE_VERSION}.dmg
diff --git a/.travis/windows_build.sh b/.travis/windows_build.sh
index 49b6b38..1f61d16 100755
--- a/.travis/windows_build.sh
+++ b/.travis/windows_build.sh
@@ -6,8 +6,8 @@ export GTA5VIEW_EXECUTABLE=gta5view-${EXECUTABLE_VERSION}${EXECUTABLE_ARCH}.exe
 cd ${PROJECT_DIR} && \
 echo "gta5view build version is ${APPLICATION_VERSION}" && \
 echo "gta5view executable is ${GTA5VIEW_EXECUTABLE}" && \
-mkdir build && \
-mkdir assets && \
+mkdir -p build && \
+mkdir -p assets && \
 
 # Starting build
 cd build && \
diff --git a/OptionsDialog.ui b/OptionsDialog.ui
index 2e8d394..40d8caa 100644
--- a/OptionsDialog.ui
+++ b/OptionsDialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>435</width>
-    <height>464</height>
+    <height>474</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -422,7 +422,7 @@
        <item>
         <widget class="QGroupBox" name="gbCategorys">
          <property name="title">
-          <string>Categorys</string>
+          <string>Categories</string>
          </property>
          <layout class="QVBoxLayout" name="vlCategorys">
           <item>
diff --git a/lang/gta5sync_no.ts b/lang/gta5sync_no.ts
index fab80f3..9fcbaa7 100644
--- a/lang/gta5sync_no.ts
+++ b/lang/gta5sync_no.ts
@@ -552,11 +552,6 @@ Y: %2</source>
         <source>Participate in %1 User Statistics</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../OptionsDialog.ui" line="425"/>
-        <source>Categorys</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../OptionsDialog.ui" line="434"/>
         <source>Hardware, Application and OS Specification</source>
@@ -630,6 +625,11 @@ Y: %2</source>
         <source>Participation</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../OptionsDialog.ui" line="425"/>
+        <source>Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../OptionsDialog.ui" line="447"/>
         <source>System Language Configuration</source>
diff --git a/res/gta5sync_de.qm b/res/gta5sync_de.qm
index 4818c6b8363d6b432fa4bf0376425d59295a683b..c1f29a1869c5d2c9675fb1a91a7d3d1756ac571f 100644
GIT binary patch
delta 2817
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
TAT~ZS!uV?VmlYOH1?&C+n|M&J

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

diff --git a/res/gta5sync_de.ts b/res/gta5sync_de.ts
index 8f53bfd..e882bc7 100644
--- a/res/gta5sync_de.ts
+++ b/res/gta5sync_de.ts
@@ -838,6 +838,11 @@ Y: %2</translation>
         <source>Participation</source>
         <translation>Teilnahme</translation>
     </message>
+    <message>
+        <location filename="../OptionsDialog.ui" line="425"/>
+        <source>Categories</source>
+        <translation>Kategorien</translation>
+    </message>
     <message>
         <location filename="../OptionsDialog.ui" line="536"/>
         <source>&amp;Send</source>
@@ -854,9 +859,8 @@ Y: %2</translation>
         <translation>An %1 Benutzerstatistik teilnehmen</translation>
     </message>
     <message>
-        <location filename="../OptionsDialog.ui" line="425"/>
         <source>Categorys</source>
-        <translation>Kategorien</translation>
+        <translation type="vanished">Kategorien</translation>
     </message>
     <message>
         <location filename="../OptionsDialog.ui" line="434"/>
diff --git a/res/gta5sync_en_US.ts b/res/gta5sync_en_US.ts
index 87276f9..9f05f75 100644
--- a/res/gta5sync_en_US.ts
+++ b/res/gta5sync_en_US.ts
@@ -562,11 +562,6 @@ Y: %2</source>
         <source>Participate in %1 User Statistics</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../OptionsDialog.ui" line="425"/>
-        <source>Categorys</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../OptionsDialog.ui" line="434"/>
         <source>Hardware, Application and OS Specification</source>
@@ -640,6 +635,11 @@ Y: %2</source>
         <source>Participation</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../OptionsDialog.ui" line="425"/>
+        <source>Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../OptionsDialog.ui" line="447"/>
         <source>System Language Configuration</source>
diff --git a/res/gta5sync_fr.ts b/res/gta5sync_fr.ts
index 129df1a..ac00a96 100644
--- a/res/gta5sync_fr.ts
+++ b/res/gta5sync_fr.ts
@@ -714,7 +714,7 @@ Y: %2</source>
     </message>
     <message>
         <location filename="../OptionsDialog.ui" line="425"/>
-        <source>Categorys</source>
+        <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/res/gta5sync_ru.ts b/res/gta5sync_ru.ts
index 79358d7..a4b62a2 100644
--- a/res/gta5sync_ru.ts
+++ b/res/gta5sync_ru.ts
@@ -682,7 +682,7 @@ Y: %2</translation>
     </message>
     <message>
         <location filename="../OptionsDialog.ui" line="425"/>
-        <source>Categorys</source>
+        <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>