From e38e8d6f082ce6e61494bdf1c44bf585bc7c951d Mon Sep 17 00:00:00 2001 From: daryl Date: Thu, 4 Jun 2020 11:53:04 +0200 Subject: [PATCH] update --- src/audiomixerboard.cpp | 18 +++++++++--------- src/util.cpp | 39 +++++++++++++++++---------------------- 2 files changed, 26 insertions(+), 31 deletions(-) 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:" ) + "" ); pInfoLabel->setAccessibleName ( tr ( "Status indicator label" ) ); pPan->setWhatsThis ( "" + tr ( "Panning" ) + ": " + 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 ( "" + tr ( "Solo" ) + ": " + 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 = "" + tr ( "Fader Tag" ) + ": " + tr ( "The fader tag " - "identifies the connected client. The tag name, the picture of your " - "instrument and a flag of your country can be set in the main window." ); + "identifies the connected client. The tag name, a picture of your " + "instrument and the flag of your country can be set in the main window." ); plblInstrument->setWhatsThis ( strFaderText ); plblInstrument->setAccessibleName ( tr ( "Mixer channel instrument picture" ) ); diff --git a/src/util.cpp b/src/util.cpp index e2eda381..2a2c70b9 100755 --- a/src/util.cpp +++ b/src/util.cpp @@ -350,12 +350,10 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : QDialog ( parent ) // general description of software txvAbout->setText ( - "

" + 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." ) + "
" + tr ( - "What you set here will appear at your fader on the mixer board when " - "you are connected to a " ) + APP_NAME + tr ( " server. This tag will " - "also show up at each client which is connected to the same server as " + QString strFaderTag = "" + tr ( "Musician Profile" ) + ": " + + tr ("Write your name or an alias here so the other musicians you want to " + "play with know who you are. You may also add a picture of the instrument " + "you play and a flag of the country you are located in. " + "Your city and skill level playing your instrument may also be added." ) + + "
" + tr ( "What you set here will appear at your fader on the mixer " + "board when you are connected to a Jamulus server. This tag will " + "also be shown 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 );