From c8e07d75f21564ec97a0655578804842efe519ae Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Mon, 22 Jun 2020 16:47:54 +0200
Subject: [PATCH] merge fixes

---
 ChangeLog    | 5 ++++-
 src/util.cpp | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f2ba22a3..ed956937 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,13 +21,16 @@
 
 - the local pan middle position is no longer attenuated in Mono-in/Stereo-out mode (#353)
 
-- add some protections to the code, coded by atsampson (#380, #381, #382)
+- added translation: Brazilian Portuguese by melcon (#372)
 
 - add send button to chat window (#384)
 
+- add some protections to the code, coded by atsampson (#380, #381, #382)
+
 - bug fix: server window stop updating after minimized, coded by AronVietti (#355, #383)
 
 
+TODO support clip indicator for bar meter as well
 
 
 
diff --git a/src/util.cpp b/src/util.cpp
index d039d802..0ce55073 100755
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -443,6 +443,7 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : QDialog ( parent )
         "<p>Olivier Humbert (<a href=""https://github.com/trebmuh"">trebmuh</a>)</p>"
         "<p><b>" + tr ( "Portuguese" ) + "</b></p>"
         "<p>Miguel de Matos (<a href=""https://github.com/Snayler"">Snayler</a>)</p>"
+        "<p>Melcon Moraes (<a href=""https://github.com/melcon"">melcon</a>)</p>"
         "<p><b>" + tr ( "Dutch" ) + "</b></p>"
         "<p>Jeroen Geertzen (<a href=""https://github.com/jerogee"">jerogee</a>)</p>"
         "<p><b>" + tr ( "Italian" ) + "</b></p>"
@@ -457,6 +458,7 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : QDialog ( parent )
     setWindowTitle ( tr ( "About " ) + APP_NAME );
 }
 
+
 // Licence dialog --------------------------------------------------------------
 CLicenceDlg::CLicenceDlg ( QWidget* parent ) : QDialog ( parent )
 {
@@ -850,9 +852,9 @@ CHelpMenu::CHelpMenu ( const bool bIsClient, QWidget* parent ) : QMenu ( tr ( "&
     addSeparator();
     addAction ( tr ( "&About..." ), this, SLOT ( OnHelpAbout() ) );
 }
-
 #endif
 
+
 /******************************************************************************\
 * Other Classes                                                                *
 \******************************************************************************/