merge fixes

ChangeLog

@@ -13,9 +13,13 @@
 
 - support Mac CoreAudio aggregated devices (Ticket #138)
 
+- added translations: french by trebmuh, portuguese by Snayler (Ticket #77)
+
 - bug fix: for mono capture jack audio interface Jamulus complains it cannot make connections (Ticket #137)
 
 
+TODO re-design About dialog
+
 TODO implement panning for channels (Ticket #52, #145)
 
 TODO WIP support internationalization

Jamulus.pro

@@ -15,7 +15,8 @@ QT += widgets \
     xml
 
 TRANSLATIONS = src/res/translation/translation_de_DE.ts \
-    src/res/translation/translation_fr_FR.ts
+    src/res/translation/translation_fr_FR.ts \
+    src/res/translation/translation_pt_PT.ts
 
 INCLUDEPATH += src
 

src/res/translation/translation_fr_FR.ts

@@ -69,7 +69,7 @@
     <message>
         <location filename="../../aboutdlgbase.ui" line="138"/>
         <source>Copyright (C) 2005-2020</source>
-        <translation>Copyright (C) 2005-2020<</translation>
+        <translation>Copyright (C) 2005-2020</translation>
     </message>
     <message>
         <location filename="../../aboutdlgbase.ui" line="208"/>

src/resources.qrc

@@ -5,6 +5,9 @@
     <qresource prefix="/translations" lang="fr">
         <file alias="translation.qm">res/translation/translation_fr_FR.qm</file>
     </qresource>
+    <qresource prefix="/translations" lang="pt">
+        <file alias="translation.qm">res/translation/translation_pt_PT.qm</file>
+    </qresource>
     <qresource prefix="/png/LEDs">
         <file>res/CLEDDisabledSmall.png</file>
         <file>res/CLEDGreenArrow.png</file>