eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge fixes

Browse source
This commit is contained in:
Volker Fischer 2020-05-15 15:55:40 +02:00
parent 9e8e501927
commit d1a3dd9c22
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main.cpp
View file

@ -555,8 +555,7 @@ int main ( int argc, char** argv )
Q_INIT_RESOURCE(resources); Q_INIT_RESOURCE(resources);
// load translations // load translations
QTranslator myappTranslator; QTranslator myappTranslator, myqtTranslator;
QTranslator myqtTranslator;
if ( bUseGUI && bUseTranslation ) if ( bUseGUI && bUseTranslation )
{ {
@ -565,8 +564,8 @@ int main ( int argc, char** argv )
pApp->installTranslator ( &myappTranslator ); pApp->installTranslator ( &myappTranslator );
} }
QString myqtLocation = QLibraryInfo::location( QLibraryInfo::TranslationsPath ); // allows the Qt messages to be translated in the application
if ( myqtTranslator.load ( QLocale(), "qt", "_", myqtLocation ) ) if ( myqtTranslator.load ( QLocale(), "qt", "_", QLibraryInfo::location ( QLibraryInfo::TranslationsPath ) ) )
{ {
pApp->installTranslator ( &myqtTranslator ); pApp->installTranslator ( &myqtTranslator );
} }

1
src/util.cpp
View file

@ -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>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>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>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 " ) + "<br>" + tr ( "For details on the contributions check out the " ) +
"<a href=""https://github.com/corrados/jamulus/graphs/contributors"">" + tr ( "Github Contributors list" ) + "</a>." ); "<a href=""https://github.com/corrados/jamulus/graphs/contributors"">" + tr ( "Github Contributors list" ) + "</a>." );