Merge pull request #7 from corrados/master

update

ChangeLog

@@ -1,4 +1,5 @@
 
+3.5.4git
 
 TODO server list split on query
 
@@ -12,7 +13,8 @@ TODO show mute state of others
 
 
 
-3.5.3git
+
+3.5.3 (2020-05-15)
 
 - correct unregister of headless server and RPP file creation on
   SIGINT/SIGTERM, coded by pljones (Tickets #130, #168)
@@ -43,13 +45,6 @@ TODO show mute state of others
 - note: Jamulus is no longer compatible to Qt4
 
 
-
-
-
-
-
-
-
 3.5.2 (2020-04-24)
 
 - use audio level meter bars for normal skin

Jamulus.pro

@@ -1,4 +1,4 @@
-VERSION = 3.5.3git
+VERSION = 3.5.3
 
 # use target name which does not use a captital letter at the beginning
 contains(CONFIG, "noupcasename") {

src/main.cpp

@@ -27,6 +27,7 @@
 #include <QDir>
 #include <QTextStream>
 #include <QTranslator>
+#include <QLibraryInfo>
 #include "global.h"
 #include "clientdlg.h"
 #include "serverdlg.h"
@@ -554,7 +555,7 @@ int main ( int argc, char** argv )
     Q_INIT_RESOURCE(resources);
 
     // load translations
-    QTranslator myappTranslator;
+    QTranslator myappTranslator, myqtTranslator;
 
     if ( bUseGUI && bUseTranslation )
     {
@@ -562,6 +563,12 @@ int main ( int argc, char** argv )
         {
             pApp->installTranslator ( &myappTranslator );
         }
+
+        // allows the Qt messages to be translated in the application
+        if ( myqtTranslator.load ( QLocale(), "qt", "_", QLibraryInfo::location ( QLibraryInfo::TranslationsPath ) ) )
+        {
+            pApp->installTranslator ( &myqtTranslator );
+        }
     }
 
 

src/util.cpp

@@ -399,6 +399,7 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : QDialog ( parent )
         "<p>Jos van den Oever (<a href=""https://github.com/vandenoever"">vandenoever</a>)</p>"
         "<p>Tormod Volden (<a href=""https://github.com/tormodvolden"">tormodvolden</a>)</p>"
         "<p>Stanislas Michalak (<a href=""https://github.com/stanislas-m"">stanislas-m</a>)</p>"
+        "<p>JP Cimalando (<a href=""https://github.com/jpcima"">jpcima</a>)</p>"
         "<br>" + tr ( "For details on the contributions check out the " ) +
         "<a href=""https://github.com/corrados/jamulus/graphs/contributors"">" + tr ( "Github Contributors list" ) + "</a>." );