From c38cf1c82512de8955d6175b3ae7f472ac69da6b Mon Sep 17 00:00:00 2001
From: daryl <darylo1@hotmail.com>
Date: Thu, 4 Jun 2020 15:31:19 +0200
Subject: [PATCH] update

---
 src/clientdlg.cpp         |  13 ++--
 src/clientsettingsdlg.cpp | 125 +++++++++++++++++++-------------------
 2 files changed, 68 insertions(+), 70 deletions(-)

diff --git a/src/clientdlg.cpp b/src/clientdlg.cpp
index 111d6591..93e2feec 100755
--- a/src/clientdlg.cpp
+++ b/src/clientdlg.cpp
@@ -83,7 +83,7 @@ CClientDlg::CClientDlg ( CClient*        pNCliP,
 
     // connect/disconnect button
     butConnect->setWhatsThis ( "<b>" + tr ( "Connect/Disconnect Button" ) + ":</b> " +
-        tr ( "Opens a dialog where you can select a server to connect to."
+        tr ( "Opens a dialog where you can select a server to connect to. "
         "If you are connected, pressing this button will end the session." ) );
 
     butConnect->setAccessibleName (
@@ -143,14 +143,13 @@ CClientDlg::CClientDlg ( CClient*        pNCliP,
 
     // delay LED
     QString strLEDDelay = "<b>" + tr ( "Delay Status LED" ) + ":</b> " +
-        tr ( "The " ) + "<b>" + tr ( "Delay Status" ) + ":</b> " + tr ( "LED shows the "
-        "current audio delay status:" ) +
+        tr ( "Shows the current audio delay status:" ) +
         "<ul>"
-        "<li>" "<b>" + tr ( "Green" ) + ":</b> " + tr ( "- The delay is perfect for a jam "
+        "<li>" "<b>" + tr ( "Green" ) + ":</b> " + tr ( "The delay is perfect for a jam "
         "session " ) + "</li>"
-        "<li>" "<b>" + tr ( "Yellow" ) + ":</b> " + tr ( "- A session is still possible "
+        "<li>" "<b>" + tr ( "Yellow" ) + ":</b> " + tr ( "A session is still possible "
         "but it may be harder to play." ) + "</li>"
-        "<li>" "<b>" + tr ( "Red" ) + ":</b> " + tr ( "- The delay is too large for "
+        "<li>" "<b>" + tr ( "Red" ) + ":</b> " + tr ( "The delay is too large for "
         "jamming." ) + "</li>"
         "</ul>";
 
@@ -165,7 +164,7 @@ CClientDlg::CClientDlg ( CClient*        pNCliP,
     // buffers LED
     QString strLEDBuffers = "<b>" + tr ( "Buffers Status LED" ) + ":</b> " +
         tr ( "The buffers status LED shows the current audio/streaming "
-        "status. If the light is red, the audio stream is interrupted."
+        "status. If the light is red, the audio stream is interrupted. "
         "This is caused by one of the following problems:" ) +
         "<ul>"
         "<li>" + tr ( "The network jitter buffer is not large enough for the current "
diff --git a/src/clientsettingsdlg.cpp b/src/clientsettingsdlg.cpp
index 30787043..17fefff2 100755
--- a/src/clientsettingsdlg.cpp
+++ b/src/clientsettingsdlg.cpp
@@ -36,31 +36,30 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent,
     // jitter buffer
     QString strJitterBufferSize = "<b>" + tr ( "Jitter Buffer Size" ) + ":</b> " + tr (
         "The jitter buffer compensates for network and sound card timing jitters. The "
-        "size of this jitter buffer has therefore influence on the quality of "
+        "size of the buffer has therefore influences the quality of "
         "the audio stream (how many dropouts occur) and the overall delay "
         "(the longer the buffer, the higher the delay)." ) + "<br>" + tr (
-        "The jitter buffer size can be manually chosen for the local client "
+        "You can set the jitter buffer size manually for the local client "
         "and the remote server. For the local jitter buffer, dropouts in the "
         "audio stream are indicated by the light below the "
         "jitter buffer size faders. If the light turns to red, a buffer "
-        "overrun/underrun took place and the audio stream is interrupted." ) + "<br>" + tr (
+        "overrun/underrun has taken place and the audio stream is interrupted." ) + "<br>" + tr (
         "The jitter buffer setting is therefore a trade-off between audio "
         "quality and overall delay." ) + "<br>" + tr (
-        "An auto setting of the jitter buffer size setting is available. If "
-        "the check Auto is enabled, the jitter buffers of the local client and "
+        "If the check Auto is enabled, the jitter buffers of the local client and "
         "the remote server are set automatically "
         "based on measurements of the network and sound card timing jitter. If "
         "the Auto check is enabled, the jitter buffer size faders are "
         "disabled (they cannot be moved with the mouse)." );
 
-    QString strJitterBufferSizeTT = tr ( "If the auto setting of the "
-        "jitter buffer is enabled, the network buffers of the local client and "
+    QString strJitterBufferSizeTT = tr ( "If the Auto setting "
+        "is enabled, the network buffers of the local client and "
         "the remote server are set to a conservative "
         "value to minimize the audio dropout probability. To tweak the "
-        "audio delay/latency it is recommended to disable the auto setting "
-        "functionality and to lower the jitter buffer size manually by "
-        "using the sliders until your personal acceptable limit of the amount "
-        "of dropouts is reached. The LED indicator will visualize the audio "
+        "audio delay/latency it is recommended to disable the Auto setting "
+        "and to lower the jitter buffer size manually by "
+        "using the sliders until your personal acceptable amount "
+        "of dropouts is reached. The LED indicator will display the audio "
         "dropouts of the local jitter buffer with a red light." ) +
         TOOLTIP_COM_END_TEXT;
 
@@ -133,28 +132,27 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent,
 
     // sound card buffer delay
     QString strSndCrdBufDelay = "<b>" + tr ( "Sound Card Buffer Delay" ) + ":</b> " +
-        tr ( "The buffer delay setting is a fundamental setting of the " ) +
-        APP_NAME + tr ( " software. This setting has influence on many "
+        tr ( "The buffer delay setting is a fundamental setting of this "
+        "software. This setting has an influence on many "
         "connection properties." ) + "<br>" + tr (
         "Three buffer sizes are supported" ) +
         ":<ul>"
-        "<li>" + tr ( "64 samples: This is the preferred setting since it provides the lowest "
-        "latency but does not work with all sound cards." ) + "</li>"
-        "<li>" + tr ( "128 samples: This setting should work for most available "
-        "sound cards." ) + "</li>"
-        "<li>" + tr ( "256 samples: This setting should only be used if only a very slow "
-        "computer or a slow internet connection is available." ) + "</li>"
+        "<li>" + tr ( "64 samples: The preferred setting. Provides the lowest latency "
+        "but does not work with all sound cards." ) + "</li>"
+        "<li>" + tr ( "128 samples: Should work for most available sound cards." ) +
+        "</li>"
+        "<li>" + tr ( "256 samples: Should only be used on very slow "
+        "computers or with a slow internet connection." ) + "</li>"
         "</ul>" + tr (
         "Some sound card drivers do not allow the buffer delay to be changed "
-        "from within the " ) + APP_NAME +
-        tr ( " software. In this case the buffer delay setting "
-        "is disabled. To change the actual buffer delay, this "
-        "setting has to be changed in the sound card driver. On Windows, press "
-        "the ASIO Setup button to open the driver settings panel. On Linux, "
+        "from within the application. "
+        "In this case the buffer delay setting is disabled and has to be "
+        "changed using the sound card driver. On Windows, press the "
+        "ASIO Setup button to open the driver settings panel. On Linux, "
         "use the Jack configuration tool to change the buffer size." ) + "<br>" + tr (
         "If no buffer size is selected and all settings are disabled, an "
-        "unsupported buffer size is used by the driver. The " ) + APP_NAME +
-        tr ( " software will still work with this setting but with restricted "
+        "unsupported buffer size is used by the driver. The application "
+        "will still work with this setting but with restricted "
         "performance." ) + "<br>" + tr (
         "The actual buffer delay has influence on the connection status, the "
         "current upload rate and the overall delay. The lower the buffer size, "
@@ -166,8 +164,8 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent,
 
     QString strSndCrdBufDelayTT = tr ( "If the buffer delay settings are "
         "disabled, it is prohibited by the audio driver to modify this "
-        "setting from within the " ) + APP_NAME +
-        tr ( " software. On Windows, press the ASIO Setup button to open the "
+        "setting from within the software. "
+        "On Windows, press the ASIO Setup button to open the "
         "driver settings panel. On Linux, use the Jack configuration tool to "
         "change the buffer size." ) + TOOLTIP_COM_END_TEXT;
 
@@ -198,21 +196,26 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent,
 
     // audio channels
     QString strAudioChannels = "<b>" + tr ( "Audio Channels" ) + ":</b> " + tr (
-        "Select the number of audio channels to be used. There are three "
-        "modes available. The mono and stereo modes use one and two "
-        "audio channels respectively. In mono-in/stereo-out mode "
-        "the audio signal which is sent to the server is mono but the "
+        "Selects the number of audio channels to be used for communication between "
+        "client and server. There are three modes available:"
+        "<ul>"
+        "<li>" "<b>" + tr ( "Mono" ) + "</b> " + tr ( "and " ) +
+        "<b>" + tr ( "Stereo" ) + ":</b> " + tr ( "modes use "
+        "one and two audio channels respectively." ) + "</li>"
+        "<li>" "<b>" + tr ( "Mono in/Stereo-out" ) + ":</b> " + tr (
+        "the audio signal sent to the server is mono but the "
         "return signal is stereo. This is useful if the "
         "sound card has the instrument on one input channel and the "
-        "microphone on the other channel. In that case the two input signals "
-        "can be mixed to one mono channel but the server mix can be heard in "
-        "stereo." ) + "<br>" + tr (
-        "Enabling the stereo streaming mode will increase the "
-        "stream data rate. Make sure that the current upload rate does not "
-        "exceed the available bandwidth of your internet connection." ) + "<br>" + tr (
-        "In stereo streaming mode, no audio channel selection "
-        "for the reverberation effect will be available on the main window "
-        "since the effect is applied on both channels in this case." );
+        "microphone on the other. In that case the two input signals "
+        "can be mixed to one mono channel but the server mix is heard in "
+        "stereo." )  + "</li>"
+        "<li>" + tr ("Enabling " ) + "<b>" + tr ( "Stereo" ) + ":</b> " + tr ( "mode "
+        "will increase your stream's data rate. Make sure your upload rate does not "
+        "exceed the available upload speed of your internet connection." )  + "</li>"
+        "<li>" + tr ( "In stereo streaming mode, no audio channel selection "
+        "for the reverb effect will be available on the main window "
+        "since the effect is applied to both channels in this case." ) + "</li>"
+        "</ul>";
 
     lblAudioChannels->setWhatsThis ( strAudioChannels );
     cbxAudioChannels->setWhatsThis ( strAudioChannels );
@@ -220,11 +223,9 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent,
 
     // audio quality
     QString strAudioQuality = "<b>" + tr ( "Audio Quality" ) + ":</b> " + tr (
-        "Select the desired audio quality. A low, normal or high audio "
-        "quality can be selected. The higher the audio quality, the higher "
-        "the audio stream data rate. Make sure that the current "
-        "upload rate does not exceed the available bandwidth of your "
-        "internet connection." );
+        "The higher the audio quality, the higher your audio stream's "
+        "data rate. Make sure your upload rate does not exceed the "
+        "available bandwidth of your internet connection.");
 
     lblAudioQuality->setWhatsThis ( strAudioQuality );
     cbxAudioQuality->setWhatsThis ( strAudioQuality );
@@ -232,10 +233,10 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent,
 
     // new client fader level
     QString strNewClientLevel = "<b>" + tr ( "New Client Level" ) + ":</b> " +
-        tr ( "The new client level setting defines the fader level of a new "
-        "connected client in percent. I.e. if a new client connects "
-        "to the current server, it will get the specified initial "
-        "fader level if no other fader level of a previous connection "
+        tr ( "This setting defines the fader level of a newly "
+        "connected client in percent. If a new client connects "
+        "to the current server, they will get the specified initial "
+        "fader level if no other fader level from a previous connection "
         "of that client was already stored." );
 
     lblNewClientLevel->setWhatsThis ( strNewClientLevel );
@@ -244,10 +245,8 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent,
 
     // custom central server address
     QString strCentrServAddr = "<b>" + tr ( "Custom Central Server Address" ) + ":</b> " +
-        tr ( "The custom central server address is the IP address or URL of the central "
-        "server at which the server list of the connection dialog is managed. This "
-        "address is only used if the custom server list is selected in the connection "
-        "dialog." );
+        tr ( "Leave this blank unless you need to enter the address of a cenrtral "
+        "server other than the default." );
 
     lblCentralServerAddress->setWhatsThis ( strCentrServAddr );
     edtCentralServerAddress->setWhatsThis ( strCentrServAddr );
@@ -255,18 +254,18 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent,
 
     // current connection status parameter
     QString strConnStats = "<b>" + tr (  "Current Connection Status "
-        "Parameter" ) + ":</b> " + tr ( "The ping time is the time required for the audio "
+        "Parameter" ) + ":</b> " + tr ( "The Ping Time is the time required for the audio "
         "stream to travel from the client to the server and back again. This "
-        "delay is introduced by the network. This delay should be as low as "
-        "20-30 ms. If this delay is higher (e.g., 50-60 ms), your distance to "
+        "delay is introduced by the network and should be about "
+        "20-30 ms. If this delay is higher than about 50 ms, your distance to "
         "the server is too large or your internet connection is not "
         "sufficient." ) + "<br>" + tr (
-        "The overall delay is calculated from the current ping time and the "
-        "delay which is introduced by the current buffer settings." ) + "<br>" + tr (
-        "The upstream rate depends on the current audio packet size and the "
-        "audio compression setting. Make sure that the upstream rate is not "
-        "higher than the available rate (check the upstream capabilities of "
-        "your internet connection by, e.g., using speedtest.net)." );
+        "Overall Delay is calculated from the current Ping Time and the "
+        "delay introduced by the current buffer settings." ) + "<br>" + tr (
+        "Audio Upstream Rate depends on the current audio packet size and "
+        "compression setting. Make sure that the upstream rate is not "
+        "higher than your available internet upload speed (check this with a "
+        "service such as speedtest.net." );
 
     lblPingTime->setWhatsThis          ( strConnStats );
     lblPingTimeValue->setWhatsThis     ( strConnStats );