update

src/audiomixerboard.cpp

@@ -128,26 +128,26 @@ CChannelFader::CChannelFader ( QWidget*     pNW,
 
     // add help text to controls
     plbrChannelLevel->setWhatsThis ( "<b>" + tr ( "Channel Level" ) + ":</b> " +
-        tr ( "Displays the pre-fader audio level of this channel.  All connected clients at the "
+        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 each client." ) );
+        "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 ( "<b>" + tr ( "Mixer Fader" ) + ":</b> " + tr (
-        "Adjusts the audio level of this channel. All connected clients at the server "
+        "Adjusts the audio level of this channel. All clients connected to the server "
-        "will be assigned an audio fader at each client, adjusting the local mix." ) );
+        "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 ( "<b>" +  tr ( "Status Indicator" ) + ":</b> " + tr (
         "Shows a status indication about the client which is assigned to this channel. "
         "Supported indicators are:" ) + "<ul><li>" + tr (
-        "Speaker with cancellation stroke: Indicates that the other client has muted you." ) +
+        "Speaker with cancellation stroke: Indicates that another client has muted you." ) +
         "</li></ul>" );
     pInfoLabel->setAccessibleName ( tr ( "Status indicator label" ) );
 
     pPan->setWhatsThis ( "<b>" +  tr ( "Panning" ) + ":</b> " + tr (
-        "Sets the panning position from Left to Right of the channel. "
+        "Sets the pan from Left to Right of the channel. "
         "Works only in stereo or preferably mono in/stereo out mode." ) );
     pPan->setAccessibleName ( tr ( "Local panning position of the current audio channel at the server" ) );
 
@@ -157,13 +157,13 @@ CChannelFader::CChannelFader ( QWidget*     pNW,
 
     pcbSolo->setWhatsThis ( "<b>" + tr ( "Solo" ) + ":</b> " + tr ( "With the Solo checkbox, the "
         "audio channel can be set to solo which means that all other channels "
-        "except of the current channel are muted. It is possible to set more than "
+        "except the soloed channel are muted. It is possible to set more than "
         "one channel to solo." ) );
     pcbSolo->setAccessibleName ( tr ( "Solo button" ) );
 
     QString strFaderText = "<b>" + tr ( "Fader Tag" ) + ":</b> " + tr ( "The fader tag "
-        "identifies the connected client. The tag name, the picture of your "
+        "identifies the connected client. The tag name, a picture of your "
-        "instrument and a flag of your country can be set in the main window." );
+        "instrument and the flag of your country can be set in the main window." );
 
     plblInstrument->setWhatsThis ( strFaderText );
     plblInstrument->setAccessibleName ( tr ( "Mixer channel instrument picture" ) );

src/util.cpp

@@ -350,12 +350,10 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : QDialog ( parent )
 
     // general description of software
     txvAbout->setText (
-        "<p>" + tr ( "The " ) + APP_NAME +
+        "<p>" + tr ( "This app enables musicians to perform real-time jam sessions "
-        tr ( " software enables musicians to perform real-time jam sessions "
+        "over the internet." ) + "<br>" + tr ( "There is a server which collects "
-        "over the internet." ) + "<br>" + tr ( "There is a " ) + APP_NAME + tr ( " "
+        " the audio data from each client, mixes the audio data and sends the mix "
-        "server which collects the audio data from each " ) +
+        " back to each client." ) + "</p>"
-        APP_NAME + tr ( " client, mixes the audio data and sends the mix back "
-        "to each client." ) + "</p>"
         "<p><font face=\"courier\">" // 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 )
         "</font></p>" );
 
     // libraries used by this compilation
-    txvLibraries->setText ( APP_NAME +
+    txvLibraries->setText
-        tr ( " uses the following libraries, resources or code snippets:" ) +
+        + tr ( "This app uses the following libraries, resources or code snippets:" ) +
         "<br><p>" + tr ( "Qt cross-platform application framework" ) +
         ", <i><a href=""http://www.qt.io"">http://www.qt.io</a></i></p>"
         "<p>Opus Interactive Audio Codec"
@@ -382,8 +380,8 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : QDialog ( parent )
         "The Synthesis ToolKit in C++ (STK)</a></i></p>"
         "<p>" + tr ( "Some pixmaps are from the" ) + " Open Clip Art Library (OCAL), "
         "<i><a href=""http://openclipart.org"">http://openclipart.org</a></i></p>"
-        "<p>" + tr ( "Country flag icons from Mark James" ) +
+        "<p>" + tr ( "Country flag icons by Mark James" ) +
-        ", <i><a href=""http://www.famfamfam.com"">http://www.famfamfam.com</a></i></p>" );
+        ", <i><a href=""http://www.famfamfam.com"">http://www.famfamfam.com</a></i></p>" ;
 
     // contributors list
     txvContributors->setText (
@@ -396,11 +394,9 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : QDialog ( parent )
         "<p>Tarmo Johannes (<a href=""https://github.com/tarmoj"">tarmoj</a>)</p>"
         "<p>mirabilos (<a href=""https://github.com/mirabilos"">mirabilos</a>)</p>"
         "<p>newlaurent62 (<a href=""https://github.com/newlaurent62"">newlaurent62</a>)</p>"
-        "<p>AronVietti (<a href=""https://github.com/AronVietti"">AronVietti</a>)</p>"
         "<p>Emlyn Bolton (<a href=""https://github.com/emlynmac"">emlynmac</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>Gauthier Fleutot Östervall (<a href=""https://github.com/fleutot"">fleutot</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>"
         "<p>Adam Sampson (<a href=""https://github.com/atsampson"">atsampson</a>)</p>"
@@ -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 = "<b>" + tr ( "Musician Profile" ) + ":</b> " + tr (
+    QString strFaderTag = "<b>" + tr ( "Musician Profile" ) + ":</b> " +
-        "Set your name or an alias here so that the other musicians you want to play with "
+         tr ("Write your name or an alias here so the other musicians you want to "
-        "know who you are. Additionally you may set an instrument picture of "
+        "play with know who you are. You may also add a picture of the instrument "
-        "the instrument you play and a flag of the country you are living in. "
+        "you play and a flag of the country you are located in. "
-        "The city you live in and the skill level playing your instrument "
+        "Your city and skill level playing your instrument may also be added." ) +
-        "may also be added." ) + "<br>" + tr (
+        "<br>" + tr ( "What you set here will appear at your fader on the mixer "
-        "What you set here will appear at your fader on the mixer board when "
+        "board when you are connected to a Jamulus server. This tag will "
-        "you are connected to a " ) + APP_NAME + tr ( " server. This tag will "
+        "also be shown at each client which is connected to the same server as "
-        "also show up at each client which is connected to the same server as "
         "you. If the name is left empty, the IP address is shown instead." );
 
     pedtAlias->setWhatsThis ( strFaderTag );