merge fixes
This commit is contained in:
parent
54433a59d1
commit
c8e07d75f2
2 changed files with 7 additions and 2 deletions
|
@ -21,13 +21,16 @@
|
||||||
|
|
||||||
- the local pan middle position is no longer attenuated in Mono-in/Stereo-out mode (#353)
|
- 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 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)
|
- bug fix: server window stop updating after minimized, coded by AronVietti (#355, #383)
|
||||||
|
|
||||||
|
|
||||||
|
TODO support clip indicator for bar meter as well
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -443,6 +443,7 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : QDialog ( parent )
|
||||||
"<p>Olivier Humbert (<a href=""https://github.com/trebmuh"">trebmuh</a>)</p>"
|
"<p>Olivier Humbert (<a href=""https://github.com/trebmuh"">trebmuh</a>)</p>"
|
||||||
"<p><b>" + tr ( "Portuguese" ) + "</b></p>"
|
"<p><b>" + tr ( "Portuguese" ) + "</b></p>"
|
||||||
"<p>Miguel de Matos (<a href=""https://github.com/Snayler"">Snayler</a>)</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><b>" + tr ( "Dutch" ) + "</b></p>"
|
||||||
"<p>Jeroen Geertzen (<a href=""https://github.com/jerogee"">jerogee</a>)</p>"
|
"<p>Jeroen Geertzen (<a href=""https://github.com/jerogee"">jerogee</a>)</p>"
|
||||||
"<p><b>" + tr ( "Italian" ) + "</b></p>"
|
"<p><b>" + tr ( "Italian" ) + "</b></p>"
|
||||||
|
@ -457,6 +458,7 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : QDialog ( parent )
|
||||||
setWindowTitle ( tr ( "About " ) + APP_NAME );
|
setWindowTitle ( tr ( "About " ) + APP_NAME );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Licence dialog --------------------------------------------------------------
|
// Licence dialog --------------------------------------------------------------
|
||||||
CLicenceDlg::CLicenceDlg ( QWidget* parent ) : QDialog ( parent )
|
CLicenceDlg::CLicenceDlg ( QWidget* parent ) : QDialog ( parent )
|
||||||
{
|
{
|
||||||
|
@ -850,9 +852,9 @@ CHelpMenu::CHelpMenu ( const bool bIsClient, QWidget* parent ) : QMenu ( tr ( "&
|
||||||
addSeparator();
|
addSeparator();
|
||||||
addAction ( tr ( "&About..." ), this, SLOT ( OnHelpAbout() ) );
|
addAction ( tr ( "&About..." ), this, SLOT ( OnHelpAbout() ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/******************************************************************************\
|
/******************************************************************************\
|
||||||
* Other Classes *
|
* Other Classes *
|
||||||
\******************************************************************************/
|
\******************************************************************************/
|
||||||
|
|
Loading…
Reference in a new issue