diff --git a/src/audiomixerboard.cpp b/src/audiomixerboard.cpp index da65f852..b54db3ec 100644 --- a/src/audiomixerboard.cpp +++ b/src/audiomixerboard.cpp @@ -128,26 +128,26 @@ CChannelFader::CChannelFader ( QWidget* pNW, // add help text to controls plbrChannelLevel->setWhatsThis ( "" + tr ( "Channel Level" ) + ": " + - tr ( "Displays the pre-fader audio level of this channel. All connected clients at the " - "server will be assigned an audio level, the same value for each client." ) ); + tr ( "Displays the pre-fader audio level of this channel. All clients connected to the " + "server will be assigned an audio level, the same value for every client." ) ); plbrChannelLevel->setAccessibleName ( tr ( "Input level of the current audio " "channel at the server" ) ); pFader->setWhatsThis ( "" + tr ( "Mixer Fader" ) + ": " + tr ( - "Adjusts the audio level of this channel. All connected clients at the server " - "will be assigned an audio fader at each client, adjusting the local mix." ) ); + "Adjusts the audio level of this channel. All clients connected to the server " + "will be assigned an audio fader, displayed at each client, to adjust the local mix." ) ); pFader->setAccessibleName ( tr ( "Local mix level setting of the current audio " "channel at the server" ) ); pInfoLabel->setWhatsThis ( "" + tr ( "Status Indicator" ) + ": " + tr ( "Shows a status indication about the client which is assigned to this channel. " "Supported indicators are:" ) + "
" + tr ( "The " ) + APP_NAME +
- tr ( " software enables musicians to perform real-time jam sessions "
- "over the internet." ) + "
" + tr ( "There is a " ) + APP_NAME + tr ( " "
- "server which collects the audio data from each " ) +
- APP_NAME + tr ( " client, mixes the audio data and sends the mix back "
- "to each client." ) + "
" + tr ( "This app enables musicians to perform real-time jam sessions "
+ "over the internet." ) + "
" + tr ( "There is a server which collects "
+ " the audio data from each client, mixes the audio data and sends the mix "
+ " back to each client." ) + "
" // GPL header text "This program is free software; you can redistribute it and/or modify " "it under the terms of the GNU General Public License as published by " @@ -371,8 +369,8 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : QDialog ( parent ) "
" ); // libraries used by this compilation - txvLibraries->setText ( APP_NAME + - tr ( " uses the following libraries, resources or code snippets:" ) + + txvLibraries->setText + + tr ( "This app uses the following libraries, resources or code snippets:" ) + "" + tr ( "Qt cross-platform application framework" ) + ", http://www.qt.io
" "Opus Interactive Audio Codec" @@ -382,8 +380,8 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : QDialog ( parent ) "The Synthesis ToolKit in C++ (STK)
" "" + tr ( "Some pixmaps are from the" ) + " Open Clip Art Library (OCAL), " "http://openclipart.org
" - "" + tr ( "Country flag icons from Mark James" ) + - ", http://www.famfamfam.com
" ); + "" + tr ( "Country flag icons by Mark James" ) + + ", http://www.famfamfam.com
" ; // contributors list txvContributors->setText ( @@ -396,11 +394,9 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : QDialog ( parent ) "Tarmo Johannes (tarmoj)
" "mirabilos (mirabilos)
" "newlaurent62 (newlaurent62)
" - "AronVietti (AronVietti)
" "Emlyn Bolton (emlynmac)
" "Jos van den Oever (vandenoever)
" "Tormod Volden (tormodvolden)
" - "Gauthier Fleutot Östervall (fleutot)
" "Stanislas Michalak (stanislas-m)
" "JP Cimalando (jpcima)
" "Adam Sampson (atsampson)
" @@ -460,7 +456,7 @@ QString CAboutDlg::GetVersionAndNameStr ( const bool bWithHtml ) strVersionText += "\n *** "; } - strVersionText += tr ( "Under the GNU General Public License (GPL)" ); + strVersionText += tr ( "Released under the GNU General Public License (GPL)" ); return strVersionText; } @@ -707,15 +703,14 @@ CMusProfDlg::CMusProfDlg ( CClient* pNCliP, // Add help text to controls ----------------------------------------------- // fader tag - QString strFaderTag = "" + tr ( "Musician Profile" ) + ": " + tr ( - "Set your name or an alias here so that the other musicians you want to play with " - "know who you are. Additionally you may set an instrument picture of " - "the instrument you play and a flag of the country you are living in. " - "The city you live in and the skill level playing your instrument " - "may also be added." ) + "