r3_5_8

Author: corrados

ChangeLog

@@ -2,16 +2,14 @@
 
 
 
-3.5.8git
 
-TODO add new register message which contains version and, e.g., max number of clients
 
-TODO https://github.com/corrados/jamulus/issues/341#issuecomment-647172946
-     - generate .qm on compile time with lrelease
 
 
 
+3.5.8 (2020-06-30)
 
+- bug fix: incorrect selection of UI language (#408)
 
 
 3.5.7 (2020-06-28)

Jamulus.pro

@@ -1,4 +1,4 @@
-VERSION = 3.5.7
+VERSION = 3.5.8
 
 # use target name which does not use a captital letter at the beginning
 contains(CONFIG, "noupcasename") {
@@ -648,9 +648,12 @@ DISTFILES += ChangeLog \
     src/res/translation/translation_de_DE.qm \
     src/res/translation/translation_fr_FR.qm \
     src/res/translation/translation_pt_PT.qm \
+    src/res/translation/translation_pt_BR.ts \
     src/res/translation/translation_es_ES.qm \
     src/res/translation/translation_nl_NL.qm \
+    src/res/translation/translation_pl_PL.ts \
     src/res/translation/translation_it_IT.qm \
+    src/res/translation/translation_sv_SE.ts \
     src/res/CLEDBlack.png \
     src/res/CLEDBlackSmall.png \
     src/res/CLEDDisabledSmall.png \

src/main.cpp

@@ -587,7 +587,7 @@ int main ( int argc, char** argv )
 
     if ( bUseGUI && bUseTranslation )
     {
-        if ( myappTranslator.load ( QLocale(), "translation", "_", ":/translations" ) )
+        if ( myappTranslator.load ( ":/translations/translation.qm" ) )
         {
             pApp->installTranslator ( &myappTranslator );
         }

src/res/translation/translation_fr_FR.qm

@@ -1,54 +1,27 @@
 <RCC>
-    <qresource prefix="/translations">
-        <file alias="translation_de_DE.qm">res/translation/translation_de_DE.qm</file>
+    <qresource prefix="/translations" lang="de">
+        <file alias="translation.qm">res/translation/translation_de_DE.qm</file>
     </qresource>
-    <qresource prefix="/translations">
-        <file alias="translation_de.qm">res/translation/translation_de_DE.qm</file>
+    <qresource prefix="/translations" lang="fr">
+        <file alias="translation.qm">res/translation/translation_fr_FR.qm</file>
     </qresource>
-    <qresource prefix="/translations">
-        <file alias="translation_fr_FR.qm">res/translation/translation_fr_FR.qm</file>
+    <qresource prefix="/translations" lang="pt">
+        <file alias="translation.qm">res/translation/translation_pt_PT.qm</file>
     </qresource>
-    <qresource prefix="/translations">
-        <file alias="translation_fr.qm">res/translation/translation_fr_FR.qm</file>
+    <qresource prefix="/translations" lang="es">
+        <file alias="translation.qm">res/translation/translation_es_ES.qm</file>
     </qresource>
-    <qresource prefix="/translations">
-        <file alias="translation_pt_PT.qm">res/translation/translation_pt_PT.qm</file>
+    <qresource prefix="/translations" lang="nl">
+        <file alias="translation.qm">res/translation/translation_nl_NL.qm</file>
     </qresource>
-    <qresource prefix="/translations">
-        <file alias="translation_pt_BR.qm">res/translation/translation_pt_BR.qm</file>
+    <qresource prefix="/translations" lang="it">
+        <file alias="translation.qm">res/translation/translation_it_IT.qm</file>
     </qresource>
-    <qresource prefix="/translations">
-        <file alias="translation_pt.qm">res/translation/translation_pt_PT.qm</file>
+    <qresource prefix="/translations" lang="pl">
+        <file alias="translation.qm">res/translation/translation_pl_PL.qm</file>
     </qresource>
-    <qresource prefix="/translations">
-        <file alias="translation_es_ES.qm">res/translation/translation_es_ES.qm</file>
-    </qresource>
-    <qresource prefix="/translations">
-        <file alias="translation_es.qm">res/translation/translation_es_ES.qm</file>
-    </qresource>
-    <qresource prefix="/translations">
-        <file alias="translation_nl_NL.qm">res/translation/translation_nl_NL.qm</file>
-    </qresource>
-    <qresource prefix="/translations">
-        <file alias="translation_nl.qm">res/translation/translation_nl_NL.qm</file>
-    </qresource>
-    <qresource prefix="/translations">
-        <file alias="translation_it_IT.qm">res/translation/translation_it_IT.qm</file>
-    </qresource>
-    <qresource prefix="/translations">
-        <file alias="translation_it.qm">res/translation/translation_it_IT.qm</file>
-    </qresource>
-    <qresource prefix="/translations">
-        <file alias="translation_pl_PL.qm">res/translation/translation_pl_PL.qm</file>
-    </qresource>
-    <qresource prefix="/translations">
-        <file alias="translation_pl.qm">res/translation/translation_pl_PL.qm</file>
-    </qresource>
-    <qresource prefix="/translations">
-        <file alias="translation_sv_SE.qm">res/translation/translation_sv_SE.qm</file>
-    </qresource>
-    <qresource prefix="/translations">
-        <file alias="translation_sv.qm">res/translation/translation_sv_SE.qm</file>
+    <qresource prefix="/translations" lang="sv">
+        <file alias="translation.qm">res/translation/translation_sv_SE.qm</file>
     </qresource>
 
     <qresource prefix="/png/LEDs">