diff --git a/Jamulus.pro b/Jamulus.pro index 2b1d668f..739fb72b 100755 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -16,7 +16,8 @@ QT += widgets \ TRANSLATIONS = src/res/translation/translation_de_DE.ts \ src/res/translation/translation_fr_FR.ts \ - src/res/translation/translation_pt_PT.ts + src/res/translation/translation_pt_PT.ts \ + src/res/translation/translation_es_ES.ts INCLUDEPATH += src diff --git a/src/aboutdlgbase.ui b/src/aboutdlgbase.ui index 870a1ebf..98e1e39b 100755 --- a/src/aboutdlgbase.ui +++ b/src/aboutdlgbase.ui @@ -122,20 +122,10 @@ 0 - - - - Author: Volker Fischer - - - false - - - - Copyright (C) 2005-2020 + Copyright (C) 2005-2020 Volker Fischer and others false diff --git a/src/audiomixerboard.cpp b/src/audiomixerboard.cpp index 4bc949f6..3dccb3fe 100755 --- a/src/audiomixerboard.cpp +++ b/src/audiomixerboard.cpp @@ -41,11 +41,11 @@ CChannelFader::CChannelFader ( QWidget* pNW, pFader = new QSlider ( Qt::Vertical, pLevelsBox ); pMuteSoloBox = new QWidget ( pFrame ); - pcbMute = new QCheckBox ( "Mute", pMuteSoloBox ); - pcbSolo = new QCheckBox ( "Solo", pMuteSoloBox ); + pcbMute = new QCheckBox ( tr ( "Mute" ), pMuteSoloBox ); + pcbSolo = new QCheckBox ( tr ( "Solo" ), pMuteSoloBox ); pLabelInstBox = new QGroupBox ( pFrame ); - plblLabel = new QLabel ( "", pFrame ); + plblLabel = new QLabel ( "", pFrame ); plblInstrument = new QLabel ( pFrame ); plblCountryFlag = new QLabel ( pFrame ); @@ -439,13 +439,13 @@ void CChannelFader::SetChannelInfos ( const CChannelInfo& cChanInfo ) // alias/name if ( !strReceivedName.isEmpty() ) { - strToolTip += "

Alias/Name

" + strReceivedName; + strToolTip += "

" + tr ( "Alias/Name" ) + "

" + strReceivedName; } // instrument if ( !CInstPictures::IsNotUsedInstrument ( iTTInstrument ) ) { - strToolTip += "

Instrument

" + + strToolTip += "

" + tr ( "Instrument" ) + "

" + CInstPictures::GetName ( iTTInstrument ); } @@ -453,7 +453,7 @@ void CChannelFader::SetChannelInfos ( const CChannelInfo& cChanInfo ) if ( ( eTTCountry != QLocale::AnyCountry ) || ( !cChanInfo.strCity.isEmpty() ) ) { - strToolTip += "

Location

"; + strToolTip += "

" + tr ( "Location" ) + "

"; if ( !cChanInfo.strCity.isEmpty() ) { @@ -475,15 +475,15 @@ void CChannelFader::SetChannelInfos ( const CChannelInfo& cChanInfo ) switch ( cChanInfo.eSkillLevel ) { case SL_BEGINNER: - strToolTip += "

Skill Level

Beginner"; + strToolTip += "

" + tr ( "Skill Level" ) + "

" + tr ( "Beginner" ); break; case SL_INTERMEDIATE: - strToolTip += "

Skill Level

Intermediate"; + strToolTip += "

" + tr ( "Skill Level" ) + "

" + tr ( "Intermediate" ); break; case SL_PROFESSIONAL: - strToolTip += "

Skill Level

Expert"; + strToolTip += "

" + tr ( "Skill Level" ) + "

" + tr ( "Expert" ); break; case SL_NOT_SET: @@ -494,7 +494,7 @@ void CChannelFader::SetChannelInfos ( const CChannelInfo& cChanInfo ) // if no information is given, leave the tool tip empty, otherwise add header if ( !strToolTip.isEmpty() ) { - strToolTip.prepend ( "

Musician Profile

" ); + strToolTip.prepend ( "

" + tr ( "Musician Profile" ) + "

" ); } plblCountryFlag->setToolTip ( strToolTip ); @@ -704,7 +704,7 @@ void CAudioMixerBoard::SetServerName ( const QString& strNewServerName ) if ( strServerName.isEmpty() ) { // no connection or connection was reset: show default title - pGroupBox->setTitle ( "Server" ); + pGroupBox->setTitle ( tr ( "Server" ) ); } else { @@ -713,7 +713,7 @@ void CAudioMixerBoard::SetServerName ( const QString& strNewServerName ) // list was received, the connection was successful and the title is updated // with the correct server name. Make sure to choose a "try to connect" title // which is most striking (we use filled blocks and upper case letters). - pGroupBox->setTitle ( u8"\u2588\u2588\u2588\u2588\u2588 T R Y I N G T O C O N N E C T \u2588\u2588\u2588\u2588\u2588" ); + pGroupBox->setTitle ( u8"\u2588\u2588\u2588\u2588\u2588 " + tr ( "T R Y I N G T O C O N N E C T" ) + u8" \u2588\u2588\u2588\u2588\u2588" ); } } diff --git a/src/clientdlg.cpp b/src/clientdlg.cpp index e1dc415c..a68aad99 100755 --- a/src/clientdlg.cpp +++ b/src/clientdlg.cpp @@ -200,7 +200,7 @@ CClientDlg::CClientDlg ( CClient* pNCliP, OnTimerStatus(); // init connection button text - butConnect->setText ( CON_BUT_CONNECTTEXT ); + butConnect->setText ( tr ( "C&onnect" ) ); // init input level meter bars lbrInputLevelL->setValue ( 0 ); @@ -252,7 +252,7 @@ CClientDlg::CClientDlg ( CClient* pNCliP, // View menu -------------------------------------------------------------- - pViewMenu = new QMenu ( "&View", this ); + pViewMenu = new QMenu ( tr ( "&View" ), this ); pViewMenu->addAction ( tr ( "&Connection Setup..." ), this, SLOT ( OnOpenConnectionSetupDialog() ) ); @@ -323,7 +323,7 @@ CClientDlg::CClientDlg ( CClient* pNCliP, { // default icon and name for no flag selected CurFlagIcon.addFile ( ":/png/flags/res/flags/flagnone.png" ); - sCurCountryName = "None"; + sCurCountryName = tr ( "None" ); } else { @@ -603,20 +603,20 @@ void CClientDlg::UpdateAudioFaderSlider() // attenuated if ( iCurAudInFader == AUD_FADER_IN_MIDDLE ) { - lblAudioPanValue->setText ( "Center" ); + lblAudioPanValue->setText ( tr ( "Center" ) ); } else { if ( iCurAudInFader > AUD_FADER_IN_MIDDLE ) { // attenuation on right channel - lblAudioPanValue->setText ( "R -" + + lblAudioPanValue->setText ( tr ( "R" ) + " -" + QString().setNum ( iCurAudInFader - AUD_FADER_IN_MIDDLE ) ); } else { // attenuation on left channel - lblAudioPanValue->setText ( "L -" + + lblAudioPanValue->setText ( tr ( "L" ) + " -" + QString().setNum ( AUD_FADER_IN_MIDDLE - iCurAudInFader ) ); } } @@ -815,12 +815,12 @@ void CClientDlg::SetMyWindowTitle ( const int iNumClients ) { if ( iNumClients == 1 ) { - setWindowTitle ( QString ( pClient->strClientName ) + " (1 user)" ); + setWindowTitle ( QString ( pClient->strClientName ) + " (1 " + tr ( "user" ) + ")" ); } else { setWindowTitle ( QString ( pClient->strClientName ) + - QString ( " (%1 users)" ).arg ( iNumClients ) ); + QString ( " (%1 " + tr ( "users" ) + ")" ).arg ( iNumClients ) ); } } @@ -1057,7 +1057,7 @@ void CClientDlg::Connect ( const QString& strSelectedAddress, } // change connect button text to "disconnect" - butConnect->setText ( CON_BUT_DISCONNECTTEXT ); + butConnect->setText ( tr ( "D&isconnect" ) ); // set server name in audio mixer group box title MainMixerBoard->SetServerName ( strMixerBoardLabel ); @@ -1081,7 +1081,7 @@ void CClientDlg::Disconnect() } // change connect button text to "connect" - butConnect->setText ( CON_BUT_CONNECTTEXT ); + butConnect->setText ( tr ( "C&onnect" ) ); // reset server name in audio mixer group box title MainMixerBoard->SetServerName ( "" ); diff --git a/src/clientdlg.h b/src/clientdlg.h index ddd284fd..b87a925f 100755 --- a/src/clientdlg.h +++ b/src/clientdlg.h @@ -51,10 +51,6 @@ /* Definitions ****************************************************************/ -// text strings for connection button for connect and disconnect -#define CON_BUT_CONNECTTEXT "C&onnect" -#define CON_BUT_DISCONNECTTEXT "D&isconnect" - // update time for GUI controls #define LEVELMETER_UPDATE_TIME_MS 100 // ms #define BUFFER_LED_UPDATE_TIME_MS 300 // ms diff --git a/src/clientsettingsdlg.cpp b/src/clientsettingsdlg.cpp index c3263123..31cda175 100755 --- a/src/clientsettingsdlg.cpp +++ b/src/clientsettingsdlg.cpp @@ -285,7 +285,7 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent, // init driver button #ifdef _WIN32 - butDriverSetup->setText ( "ASIO Setup" ); + butDriverSetup->setText ( tr ( "ASIO Setup" ) ); #else // no use for this button for MacOS/Linux right now -> hide it butDriverSetup->hide(); @@ -332,23 +332,23 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent, // "Audio Channels" combo box cbxAudioChannels->clear(); - cbxAudioChannels->addItem ( "Mono" ); // CC_MONO - cbxAudioChannels->addItem ( "Mono-in/Stereo-out" ); // CC_MONO_IN_STEREO_OUT - cbxAudioChannels->addItem ( "Stereo" ); // CC_STEREO + cbxAudioChannels->addItem ( tr ( "Mono" ) ); // CC_MONO + cbxAudioChannels->addItem ( tr ( "Mono-in/Stereo-out" ) ); // CC_MONO_IN_STEREO_OUT + cbxAudioChannels->addItem ( tr ( "Stereo" ) ); // CC_STEREO cbxAudioChannels->setCurrentIndex ( static_cast ( pClient->GetAudioChannels() ) ); // "Audio Quality" combo box cbxAudioQuality->clear(); - cbxAudioQuality->addItem ( "Low" ); // AQ_LOW - cbxAudioQuality->addItem ( "Normal" ); // AQ_NORMAL - cbxAudioQuality->addItem ( "High" ); // AQ_HIGH + cbxAudioQuality->addItem ( tr ( "Low" ) ); // AQ_LOW + cbxAudioQuality->addItem ( tr ( "Normal" ) ); // AQ_NORMAL + cbxAudioQuality->addItem ( tr ( "High" ) ); // AQ_HIGH cbxAudioQuality->setCurrentIndex ( static_cast ( pClient->GetAudioQuality() ) ); // central server address type combo box cbxCentServAddrType->clear(); - cbxCentServAddrType->addItem ( "Manual" ); // AT_MANUAL - cbxCentServAddrType->addItem ( "Default" ); // AT_DEFAULT - cbxCentServAddrType->addItem ( "Default (North America)" ); // AT_NORTH_AMERICA + cbxCentServAddrType->addItem ( tr ( "Manual" ) ); // AT_MANUAL + cbxCentServAddrType->addItem ( tr ( "Default" ) ); // AT_DEFAULT + cbxCentServAddrType->addItem ( tr ( "Default (North America)" ) ); // AT_NORTH_AMERICA cbxCentServAddrType->setCurrentIndex ( static_cast ( pClient->GetCentralServerAddressType() ) ); UpdateCentralServerDependency(); @@ -454,11 +454,11 @@ void CClientSettingsDlg::UpdateJitterBufferFrame() // update slider value and text const int iCurNumNetBuf = pClient->GetSockBufNumFrames(); sldNetBuf->setValue ( iCurNumNetBuf ); - lblNetBuf->setText ( "Size: " + QString().setNum ( iCurNumNetBuf ) ); + lblNetBuf->setText ( tr ( "Size: " ) + QString().setNum ( iCurNumNetBuf ) ); const int iCurNumNetBufServer = pClient->GetServerSockBufNumFrames(); sldNetBufServer->setValue ( iCurNumNetBufServer ); - lblNetBufServer->setText ( "Size: " + QString().setNum ( iCurNumNetBufServer ) ); + lblNetBufServer->setText ( tr ( "Size: " ) + QString().setNum ( iCurNumNetBufServer ) ); // if auto setting is enabled, disable slider control const bool bIsAutoSockBufSize = pClient->GetDoAutoSockBufSize(); @@ -515,12 +515,12 @@ void CClientSettingsDlg::UpdateSoundCardFrame() if ( bPreferredChecked || bDefaultChecked || bSafeChecked ) { // default title text - grbSoundCrdBufDelay->setTitle ( "Buffer Delay" ); + grbSoundCrdBufDelay->setTitle ( tr ( "Buffer Delay" ) ); } else { // special title text with buffer size information added - grbSoundCrdBufDelay->setTitle ( "Buffer Delay: " + + grbSoundCrdBufDelay->setTitle ( tr ( "Buffer Delay: " ) + GenSndCrdBufferDelayString ( iCurActualBufSize ) ); } } @@ -633,7 +633,7 @@ void CClientSettingsDlg::OnSoundcardActivated ( int iSndDevIdx ) QString ( tr ( "The selected audio device could not be used " "because of the following error: " ) ) + strError + QString ( tr ( " The previous driver will be selected." ) ), - "Ok", nullptr ); + tr ( "Ok" ), nullptr ); // recover old selection cbxSoundcard->setCurrentIndex ( pClient->GetSndCrdDev() ); diff --git a/src/res/translation/translation_de_DE.ts b/src/res/translation/translation_de_DE.ts index 4b1d4655..7545870a 100644 --- a/src/res/translation/translation_de_DE.ts +++ b/src/res/translation/translation_de_DE.ts @@ -63,16 +63,11 @@ - Author: Volker Fischer + Copyright (C) 2005-2020 Volker Fischer and others - - Copyright (C) 2005-2020 - - - - + &OK @@ -90,6 +85,19 @@ + + CAudioMixerBoard + + + Server + + + + + T R Y I N G T O C O N N E C T + + + CChannelFader @@ -163,11 +171,55 @@ + + Alias/Name + + + + + Instrument + + + + + Location + + + + + + + Skill Level + + + + + Beginner + + + + + Intermediate + + + + + Expert + + + + + Musician Profile + + + + Mute + Solo @@ -332,6 +384,17 @@ Buffers status LED indicator + + + + C&onnect + + + + + &View + + &Connection Setup... @@ -362,6 +425,41 @@ E&xit + + + None + + + + + Center + + + + + R + + + + + L + + + + + user + + + + + users + + + + + D&isconnect + + CClientDlgBase @@ -663,6 +761,72 @@ software. + + + ASIO Setup + + + + + Mono + + + + + Mono-in/Stereo-out + + + + + Stereo + + + + + Low + + + + + Normal + + + + + High + + + + + Manual + + + + + Default + + + + + Default (North America) + + + + + + Size: + + + + + Buffer Delay + + + + + Buffer Delay: + + The selected audio device could not be used because of the following error: @@ -673,6 +837,11 @@ The previous driver will be selected. + + + Ok + + CClientSettingsDlgBase @@ -946,29 +1115,44 @@ CHelpMenu - - + + Getting &Started... - + Software &Manual... - + What's &This - + &About... Über... CLicenceDlg + + + I &agree to the above licence terms + + + + + Accept + + + + + Decline + + By connecting to this server and agreeing to this notice, you agree to the following: @@ -1058,203 +1242,255 @@ CMusProfDlg - + <b>Musician Profile:</b> 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. The city you live in and the skill level of playing your instrument may also be added. What you set here will appear at your fader on the mixer board when you are connected to a - + server. This tag will 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. - + Alias or name edit box - + Instrument picture button - + Country flag button - + City edit box - + Skill level combo box - + + + None - + + Musician Profile + + + + + Alias/Name + + + + + Instrument + + + + + Country + + + + + City + + + + + Skill + + + + + &Close + + + + + Beginner + + + + + Intermediate + + + + + Expert + + + + Drum Set - + Djembe - + Electric Guitar - + Acoustic Guitar - + Bass Guitar - + Keyboard - + Synthesizer - + Grand Piano - + Accordion - + Vocal - + Microphone - + Harmonica - + Trumpet - + Trombone - + French Horn - + Tuba - + Saxophone - + Clarinet - + Flute - + Violin - + Cello - + Double Bass - + Recorder - + Streamer - + Listener - + Guitar+Vocal - + Keyboard+Vocal - + Bodhran - + Bassoon - + Oboe - + Harp - + Viola @@ -1337,48 +1573,108 @@ What you set here will appear at your fader on the mixer board when you are conn - + <b>Location country:</b> The country in which this server is located can be set here. If a country is entered, it will be shown in the connect dialog server list at the clients. - + Country where the server is located combo box - - + + E&xit - + &Hide - - - + + + server - + &Open - + server - + + Manual + + + + + Default + + + + + Default (North America) + + + + Server + + + &Window + + + + + Unregistered + + + + + Bad address + + + + + Registration requested + + + + + Registration failed + + + + + Check server version + + + + + Registered + + + + + Central Server full + + + + + Unknown value + + CServerDlgBase diff --git a/src/res/translation/translation_es_ES.qm b/src/res/translation/translation_es_ES.qm new file mode 100644 index 00000000..9dad8dff Binary files /dev/null and b/src/res/translation/translation_es_ES.qm differ diff --git a/src/res/translation/translation_es_ES.ts b/src/res/translation/translation_es_ES.ts new file mode 100644 index 00000000..7c0fc889 --- /dev/null +++ b/src/res/translation/translation_es_ES.ts @@ -0,0 +1,1901 @@ + + + + + CAboutDlg + + + The + + + + + software enables musicians to perform real-time jam sessions over the internet. There is a + + + + + server which collects the audio data from each + + + + + client, mixes the audio data and sends the mix back to each client. + + + + + uses the following libraries, resources or code snippets: + + + + + About + + + + + , Version + + + + + Internet Jam Session Software + + + + + Under the GNU General Public License (GPL) + + + + + CAboutDlgBase + + + About + + + + + TextLabelVersion + + + + + Copyright (C) 2005-2020 Volker Fischer and others + + + + + &OK + + + + + CAnalyzerConsole + + + Analyzer Console + + + + + Error Rate of Each Buffer Size + + + + + CAudioMixerBoard + + + Server + + + + + T R Y I N G T O C O N N E C T + + + + + CChannelFader + + + <b>Channel Level:</b> 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. + + + + + Input level of the current audio channel at the server + + + + + <b>Mixer Fader:</b> 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. + + + + + Local mix level setting of the current audio channel at the server + + + + + <b>Mute:</b> With the Mute checkbox, the audio channel can be muted. + + + + + Mute button + + + + + <b>Solo:</b> 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 one channel to solo. + + + + + Solo button + + + + + <b>Fader Tag:</b> 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. + + + + + Mixer channel instrument picture + + + + + Mixer channel label (fader tag) + + + + + Mixer channel country flag + + + + + MUTE + + + + + SOLO + + + + + Alias/Name + + + + + Instrument + + + + + Location + + + + + + + Skill Level + + + + + Beginner + + + + + Intermediate + + + + + Expert + + + + + Musician Profile + + + + + + Mute + + + + + + Solo + + + + + CChatDlg + + + <b>Chat Window:</b> The chat window shows a history of all chat messages. + + + + + Chat history + + + + + <b>Input Message Text:</b> Enter the chat message text in the edit box and press enter to send the message to the server which distributes the message to all connected clients. Your message will then show up in the chat window. + + + + + New chat text edit box + + + + + CChatDlgBase + + + Chat + + + + + Cl&ear + + + + + &Close + + + + + CClientDlg + + + <b>Input Level Meter:</b> The input level indicators show the input level of the two stereo channels of the current selected audio input.<br>Make sure not to clip the input signal to avoid distortions of the audio signal. + + + + + If the + + + + + software is connected and you play your instrument/sing in the microphone, the LED level meter should flicker. If this is not the case, you have probably selected the wrong input channel (e.g. line in instead of the microphone input) or set the input gain too low in the (Windows) audio mixer.<br>For a proper usage of the + + + + + software, you should not hear your singing/instrument in the loudspeaker or your headphone when the + + + + + software is not connected. This can be achieved by muting your input audio channel in the Playback mixer (<b>not</b> the Recording mixer!). + + + + + Input level meter + + + + + Simulates an analog LED level meter. + + + + + <b>Connect / Disconnect Button:</b> Push this button to connect a server. A dialog where you can select a server will open. If you are connected, pressing this button will end the session. + + + + + Connect and disconnect toggle button + + + + + Clicking on this button changes the caption of the button from Connect to Disconnect, i.e., it implements a toggle functionality for connecting and disconnecting the + + + + + + software. + + + + + <b>Local Audio Input Fader:</b> With the audio fader, the relative levels of the left and right local audio channels can be changed. For a mono signal it acts like a panning between the two channels. If, e.g., a microphone is connected to the right input channel and an instrument is connected to the left input channel which is much louder than the microphone, move the audio fader in a direction where the label above the fader shows <i>L -x</i>, where <i>x</i> is the current attenuation indicator. + + + + + Local audio input fader (left/right) + + + + + <b>Reverberation Level:</b> A reverberation effect can be applied to one local mono audio channel or to both channels in stereo mode. The mone channel selection and the reverberation level can be modified. If, e.g., the microphone signal is fed into the right audio channel of the sound card and a reverberation effect shall be applied, set the channel selector to right and move the fader upwards until the desired reverberation level is reached.<br>The reverberation effect requires significant CPU so that it should only be used on fast PCs. If the reverberation level fader is set to minimum (which is the default setting), the reverberation effect is switched off and does not cause any additional CPU usage. + + + + + Reverberation effect level setting + + + + + <b>Reverberation Channel Selection:</b> With these radio buttons the audio input channel on which the reverberation effect is applied can be chosen. Either the left or right input channel can be selected. + + + + + Left channel selection for reverberation + + + + + Right channel selection for reverberation + + + + + <b>Delay Status LED:</b> The delay status LED indicator shows the current audio delay status. If the light is green, the delay is perfect for a jam session. If the light is yellow, a session is still possible but it may be harder to play. If the light is red, the delay is too large for jamming. + + + + + If this LED indicator turns red, you will not have much fun using the + + + + + Delay status LED indicator + + + + + <b>Buffers Status LED:</b> The buffers status LED indicator shows the current audio/streaming status. If the light is green, there are no buffer overruns/underruns and the audio stream is not interrupted. If the light is red, the audio stream is interrupted caused by one of the following problems:<ul><li>The network jitter buffer is not large enough for the current network/audio interface jitter.</li><li>The sound card buffer delay (buffer size) is set to a too small value.</li><li>The upload or download stream rate is too high for the current available internet bandwidth.</li><li>The CPU of the client or server is at 100%.</li></ul> + + + + + Buffers status LED indicator + + + + + + C&onnect + + + + + &View + + + + + &Connection Setup... + + + + + My &Profile... + + + + + C&hat... + + + + + &Settings... + + + + + &Analyzer Console... + + + + + E&xit + + + + + None + + + + + Center + + + + + R + + + + + L + + + + + user + + + + + users + + + + + D&isconnect + + + + + CClientDlgBase + + + Delay + + + + + Buffers + + + + + Input + + + + + L + + + + + R + + + + + Settings + + + + + Chat + + + + + Mute Myself + + + + + C&onnect + + + + + Pan + + + + + Center + + + + + Reverb + + + + + Left + + + + + Right + + + + + CClientSettingsDlg + + + <b>Jitter Buffer Size:</b> The jitter buffer compensates for network and sound card timing jitters. The size of this jitter buffer has therefore influence on the quality of the audio stream (how many dropouts occur) and the overall delay (the longer the buffer, the higher the delay).<br>The jitter buffer size can be manually chosen for the local client and the remote server. For the local jitter buffer, dropouts in the audio stream are indicated by the light on the bottom of the jitter buffer size faders. If the light turns to red, a buffer overrun/underrun took place and the audio stream is interrupted.<br>The jitter buffer setting is therefore a trade-off between audio quality and overall delay.<br>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 the remote server are set automatically based on measurements of the network and sound card timing jitter. If the <i>Auto</i> check is enabled, the jitter buffer size faders are disabled (they cannot be moved with the mouse). + + + + + In case the auto setting of the jitter buffer 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 <b>tweak the audio delay/latency</b> it is recommended to disable the auto setting functionality and to <b>lower the jitter buffer size manually</b> by using the sliders until your personal acceptable limit of the amount of dropouts is reached. The LED indicator will visualize the audio dropouts of the local jitter buffer by a red light + + + + + Local jitter buffer slider control + + + + + Server jitter buffer slider control + + + + + Auto jitter buffer switch + + + + + Jitter buffer status LED indicator + + + + + <b>Sound Card Device:</b> The ASIO driver (sound card) can be selected using + + + + + under the Windows operating system. Under MacOS/Linux, no sound card selection is possible. If the selected ASIO driver is not valid an error message is shown and the previous valid driver is selected.<br>If the driver is selected during an active connection, the connection is stopped, the driver is changed and the connection is started again automatically. + + + + + Sound card device selector combo box + + + + + In case the <b>ASIO4ALL</b> driver is used, please note that this driver usually introduces approx. 10-30 ms of additional audio delay. Using a sound card with a native ASIO driver is therefore recommended.<br>If you are using the <b>kX ASIO</b> driver, make sure to connect the ASIO inputs in the kX DSP settings panel. + + + + + <b>Sound Card Channel Mapping:</b> In case the selected sound card device offers more than one input or output channel, the Input Channel Mapping and Output Channel Mapping settings are visible.<br>For each + + + + + input/output channel (Left and Right channel) a different actual sound card channel can be selected. + + + + + Left input channel selection combo box + + + + + Right input channel selection combo box + + + + + Left output channel selection combo box + + + + + Right output channel selection combo box + + + + + <b>Enable Small Network Buffers:</b> If enabled, the support for very small network audio packets is activated. Very small network packets are only actually used if the sound card buffer delay is smaller than + + + + + samples. The smaller the network buffers, the smaller the audio latency. But at the same time the network load increases and the probability of audio dropouts also increases. + + + + + Enable small network buffers check box + + + + + <b>Sound Card Buffer Delay:</b> The buffer delay setting is a fundamental setting of the + + + + + software. This setting has influence on many connection properties.<br>Three buffer sizes are supported:<ul><li>64 samples: This is the preferred setting since it gives lowest latency but does not work with all sound cards.</li><li>128 samples: This setting should work on most of the available sound cards.</li><li>256 samples: This setting should only be used if only a very slow computer or a slow internet connection is available.</li></ul>Some sound card driver do not allow the buffer delay to be changed from within the + + + + + 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, use the Jack configuration tool to change the buffer size.<br>If no buffer size is selected and all settings are disabled, an unsupported buffer size is used by the driver. The + + + + + software will still work with this setting but with restricted performannce.<br>The actual buffer delay has influence on the connection status, the current upload rate and the overall delay. The lower the buffer size, the higher the probability of red light in the status indicator (drop outs) and the higher the upload rate and the lower the overall delay.<br>The buffer setting is therefore a trade-off between audio quality and overall delay. + + + + + If the buffer delay settings are disabled, it is prohibited by the audio driver to modify this 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. + + + + + 128 samples setting radio button + + + + + 256 samples setting radio button + + + + + 512 samples setting radio button + + + + + ASIO setup push button + + + + + <b>Fancy Skin:</b> If enabled, a fancy skin will be applied to the main window. + + + + + Fancy skin check box + + + + + <b>Display Channel Levels:</b> If enabled, each client channel will display a pre-fader level bar. + + + + + Display channel levels check box + + + + + <b>Audio Channels:</b> 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 the mono-in/stereo-out mode the audio signal which is sent to the server is mono but the return signal is stereo. This is useful for the case that the sound card puts 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>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>In case of the 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. + + + + + Audio channels combo box + + + + + <b>Audio Quality:</b> 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. + + + + + Audio quality combo box + + + + + <b>New Client Level:</b> 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 of that client was already stored. + + + + + New client level edit box + + + + + <b>Central Server Address:</b> The central server address is the IP address or URL of the central server at which the server list of the connection dialog is managed. With the central server address type either the local region can be selected of the default central servers or a manual address can be specified. + + + + + Default central server type combo box + + + + + Central server address line edit + + + + + <b>Current Connection Status Parameter:</b> The ping time is the time required for the audio stream to travel from the client to the server and backwards. 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 the server is too large or your internet connection is not sufficient.<br>The overall delay is calculated from the current ping time and the delay which is introduced by the current buffer settings.<br>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). + + + + + If this LED indicator turns red, you will not have much fun using the + + + + + software. + + + + + ASIO Setup + + + + + Mono + + + + + Mono-in/Stereo-out + + + + + Stereo + + + + + Low + + + + + Normal + + + + + High + + + + + Manual + + + + + Default + + + + + Default (North America) + + + + + + Size: + + + + + Buffer Delay + + + + + Buffer Delay: + + + + + The selected audio device could not be used because of the following error: + + + + + The previous driver will be selected. + + + + + Ok + + + + + CClientSettingsDlgBase + + + Settings + + + + + Soundcard + + + + + Device + + + + + Input Channel Mapping + + + + + + L + + + + + + R + + + + + Output Channel Mapping + + + + + Enable Small Network Buffers + + + + + Buffer Delay + + + + + (preferred) + + + + + (default) + + + + + (safe) + + + + + Driver Setup + + + + + Jitter Buffer + + + + + Auto + + + + + Local + + + + + Server + + + + + + Size + + + + + Misc + + + + + Audio Channels + + + + + Audio Quality + + + + + New Client Level + + + + + % + + + + + Fancy Skin + + + + + Display Channel Levels + + + + + Central Server Address: + + + + + Audio Stream Rate + + + + + + + val + + + + + Ping Time + + + + + Overall Delay + + + + + CConnectDlg + + + <b>Server List:</b> The server list shows a list of available servers which are registered at the central server. Select a server from the list and press the connect button to connect to this server. Alternatively, double click a server from the list to connect to it. If a server is occupied, a list of the connected musicians is available by expanding the list item. Permanent servers are shown in bold font.<br>Note that it may take some time to retrieve the server list from the central server. If no valid central server address is specified in the settings, no server list will be available. + + + + + Server list view + + + + + <b>Server Address:</b> The IP address or URL of the server running the + + + + + server software must be set here. An optional port number can be added after the IP address or URL using a comma as a separator, e.g, <i>example.org: + + + + + </i>. A list of the most recent used server IP addresses or URLs is available for selection. + + + + + Server address edit box + + + + + Holds the current server IP address or URL. It also stores old URLs in the combo box list. + + + + + <b>Filter:</b> The server list is filered by the given text. Note that the filter is case insensitive. + + + + + Filter edit box + + + + + <b>Show All Musicians:</b> If you check this check box, the musicians of all servers are shown. If you uncheck the check box, all list view items are collapsed. + + + + + Show all musicians check box + + + + + CConnectDlgBase + + + Connection Setup + + + + + Filter + + + + + Show All Musicians + + + + + Server Name + + + + + Ping Time + + + + + Musicians + + + + + Location + + + + + Server Name/Address + + + + + C&ancel + + + + + &Connect + + + + + CHelpMenu + + + + Getting &Started... + + + + + Software &Manual... + + + + + What's &This + + + + + &About... + + + + + CLicenceDlg + + + I &agree to the above licence terms + + + + + Accept + + + + + Decline + + + + + By connecting to this server and agreeing to this notice, you agree to the following: + + + + + You agree that all data, sounds, or other works transmitted to this server are owned and created by you or your licensors, and that you are making these data, sounds or other works available via the following Creative Commons License (for more information on this license, see <i><a href=http://creativecommons.org/licenses/by-nc-sa/4.0>http://creativecommons.org/licenses/by-nc-sa/4.0</a></i>): + + + + + You are free to: + + + + + Share + + + + + copy and redistribute the material in any medium or format + + + + + Adapt + + + + + remix, transform, and build upon the material + + + + + The licensor cannot revoke these freedoms as long as you follow the license terms. + + + + + Under the following terms: + + + + + Attribution + + + + + You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use. + + + + + NonCommercial + + + + + You may not use the material for commercial purposes. + + + + + ShareAlike + + + + + If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original. + + + + + No additional restrictions + + + + + You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. + + + + + CMusProfDlg + + + <b>Musician Profile:</b> 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. The city you live in and the skill level of playing your instrument may also be added. +What you set here will appear at your fader on the mixer board when you are connected to a + + + + + server. This tag will 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. + + + + + Alias or name edit box + + + + + Instrument picture button + + + + + Country flag button + + + + + City edit box + + + + + Skill level combo box + + + + + + + None + + + + + Musician Profile + + + + + Alias/Name + + + + + Instrument + + + + + Country + + + + + City + + + + + Skill + + + + + &Close + + + + + Beginner + + + + + Intermediate + + + + + Expert + + + + + Drum Set + + + + + Djembe + + + + + Electric Guitar + + + + + Acoustic Guitar + + + + + Bass Guitar + + + + + Keyboard + + + + + Synthesizer + + + + + Grand Piano + + + + + Accordion + + + + + Vocal + + + + + Microphone + + + + + Harmonica + + + + + Trumpet + + + + + Trombone + + + + + French Horn + + + + + Tuba + + + + + Saxophone + + + + + Clarinet + + + + + Flute + + + + + Violin + + + + + Cello + + + + + Double Bass + + + + + Recorder + + + + + Streamer + + + + + Listener + + + + + Guitar+Vocal + + + + + Keyboard+Vocal + + + + + Bodhran + + + + + Bassoon + + + + + Oboe + + + + + Harp + + + + + Viola + + + + + CServerDlg + + + <b>Client List:</b> The client list shows all clients which are currently connected to this server. Some information about the clients like the IP address and name are given for each connected client. + + + + + Connected clients list view + + + + + <b>Start Minimized on Operating System Start:</b> If the start minimized on operating system start check box is checked, the + + + + + server will be started when the operating system starts up and is automatically minimized to a system task bar icon. + + + + + <b>Show Creative Commons Licence Dialog:</b> If enabled, a Creative Commons BY-NC-SA 4.0 Licence dialog is shown each time a new user connects the server. + + + + + <b>Make My Server Public:</b> If the Make My Server Public check box is checked, this server registers itself at the central server so that all + + + + + users can see the server in the connect dialog server list and connect to it. The registering of the server is renewed periodically to make sure that all servers in the connect dialog server list are actually available. + + + + + <b>Register Server Status:</b> If the Make My Server Public check box is checked, this will show the success of registration with the central server. + + + + + <b>Central Server Address:</b> The Central server address is the IP address or URL of the central server at which this server is registered. With the central server address type either the local region can be selected of the default central servers or a manual address can be specified. + + + + + Default central server type combo box + + + + + Central server address line edit + + + + + <b>Server Name:</b> The server name identifies your server in the connect dialog server list at the clients. If no name is given, the IP address is shown instead. + + + + + Server name line edit + + + + + <b>Location City:</b> The city in which this server is located can be set here. If a city name is entered, it will be shown in the connect dialog server list at the clients. + + + + + City where the server is located line edit + + + + + <b>Location country:</b> The country in which this server is located can be set here. If a country is entered, it will be shown in the connect dialog server list at the clients. + + + + + Country where the server is located combo box + + + + + + E&xit + + + + + &Hide + + + + + + + server + + + + + &Open + + + + + server + + + + + Manual + + + + + Default + + + + + Default (North America) + + + + + Server + + + + + &Window + + + + + Unregistered + + + + + Bad address + + + + + Registration requested + + + + + Registration failed + + + + + Check server version + + + + + Registered + + + + + Central Server full + + + + + Unknown value + + + + + CServerDlgBase + + + Client IP:Port + + + + + + Name + + + + + Jitter Buffer Size + + + + + Start Minimized on Windows Start + + + + + Show Creative Commons BY-NC-SA 4.0 Licence Dialog + + + + + Make My Server Public (Register My Server in the Server List) + + + + + STATUS + + + + + Central Server Address: + + + + + My Server Info + + + + + Location: City + + + + + Location: Country + + + + + TextLabelNameVersion + + + + + CSound + + + The Jack server is not running. This software requires a Jack server to run. Normally if the Jack server is not running this software will automatically start the Jack server. It seems that this auto start has not worked. Try to start the Jack server manually. + + + + + The Jack server sample rate is different from the required one. The required sample rate is: <b> + + + + + Hz</b>. You can use a tool like <i><a href=http://qjackctl.sourceforge.net>QJackCtl</a></i> to adjust the Jack server sample rate.<br>Make sure to set the <b>Frames/Period</b> to a low value like <b> + + + + + </b> to achieve a low delay. + + + + + + The Jack port registering failed. + + + + + Cannot activate the Jack client. + + + + + The Jack server was shut down. This software requires a Jack server to run. Try to restart the software to solve the issue. + + + + + CoreAudio input AudioHardwareGetProperty call failed. It seems that no sound card is available in the system. + + + + + CoreAudio output AudioHardwareGetProperty call failed. It seems that no sound card is available in the system. + + + + + Current system audio input device sample rate of %1 Hz is not supported. Please open the Audio-MIDI-Setup in Applications->Utilities and try to set a sample rate of %2 Hz. + + + + + Current system audio output device sample rate of %1 Hz is not supported. Please open the Audio-MIDI-Setup in Applications->Utilities and try to set a sample rate of %2 Hz. + + + + + The audio input stream format for this audio device is not compatible with this software. + + + + + The audio output stream format for this audio device is not compatible with this software. + + + + + The buffer sizes of the current input and output audio device cannot be set to a common value. Please choose other input/output audio devices in your system settings. + + + + + The audio driver could not be initialized. + + + + + The audio device does not support the required sample rate. The required sample rate is: + + + + + The audio device does not support to set the required sampling rate. This error can happen if you have an audio interface like the Roland UA-25EX where you set the sample rate with a hardware switch on the audio device. If this is the case, please change the sample rate to + + + + + Hz on the device and restart the + + + + + software. + + + + + The audio device does not support the required number of channels. The required number of channels for input and output is: + + + + + + Required audio sample format not available. + + + + + <b>No ASIO audio device (driver) found.</b><br><br>The + + + + + software requires the low latency audio interface <b>ASIO</b> to work properly. This is no standard Windows audio interface and therefore a special audio driver is required. Either your sound card has a native ASIO driver (which is recommended) or you might want to use alternative drivers like the ASIO4All driver. + + + + + CSoundBase + + + Invalid device selection. + + + + + The audio driver properties have changed to a state which is incompatible to this software. The selected audio device could not be used because of the following error: <b> + + + + + </b><br><br>Please restart the software. + + + + + <b>No usable + + + + + audio device (driver) found.</b><br><br>In the following there is a list of all available drivers with the associated error message:<ul> + + + + + <br/>Do you want to open the ASIO driver setups? + + + + + could not be started because of audio interface issues. + + + + diff --git a/src/res/translation/translation_fr_FR.qm b/src/res/translation/translation_fr_FR.qm index 9cfed230..94938b73 100644 Binary files a/src/res/translation/translation_fr_FR.qm and b/src/res/translation/translation_fr_FR.qm differ diff --git a/src/res/translation/translation_fr_FR.ts b/src/res/translation/translation_fr_FR.ts index f864619a..03906304 100644 --- a/src/res/translation/translation_fr_FR.ts +++ b/src/res/translation/translation_fr_FR.ts @@ -63,16 +63,19 @@ + Copyright (C) 2005-2020 Volker Fischer and others + + + Author: Volker Fischer - Auteur : Volker Fisher + Auteur : Volker Fisher - Copyright (C) 2005-2020 - Copyright (C) 2005-2020 + Copyright (C) 2005-2020 - + &OK &OK @@ -90,6 +93,19 @@ + + CAudioMixerBoard + + + Server + Serveur + + + + T R Y I N G T O C O N N E C T + + + CChannelFader @@ -163,11 +179,55 @@ + + Alias/Name + + + + + Instrument + + + + + Location + + + + + + + Skill Level + + + + + Beginner + + + + + Intermediate + + + + + Expert + + + + + Musician Profile + + + + Mute + Solo @@ -332,6 +392,17 @@ Buffers status LED indicator + + + + C&onnect + Se c&onnecter + + + + &View + + &Connection Setup... @@ -362,6 +433,41 @@ E&xit + + + None + + + + + Center + Centre + + + + R + D + + + + L + G + + + + user + + + + + users + + + + + D&isconnect + + CClientDlgBase @@ -398,7 +504,7 @@ Chat - Tchate> + Tchate @@ -663,6 +769,72 @@ software. + + + ASIO Setup + + + + + Mono + + + + + Mono-in/Stereo-out + + + + + Stereo + + + + + Low + + + + + Normal + + + + + High + + + + + Manual + + + + + Default + + + + + Default (North America) + + + + + + Size: + + + + + Buffer Delay + + + + + Buffer Delay: + + The selected audio device could not be used because of the following error: @@ -673,13 +845,18 @@ The previous driver will be selected. + + + Ok + + CClientSettingsDlgBase Settings - + Paramètres @@ -700,13 +877,13 @@ L - + G R - + D @@ -946,29 +1123,44 @@ CHelpMenu - - + + Getting &Started... - + Software &Manual... - + What's &This - + &About... CLicenceDlg + + + I &agree to the above licence terms + + + + + Accept + + + + + Decline + + By connecting to this server and agreeing to this notice, you agree to the following: @@ -1058,203 +1250,255 @@ CMusProfDlg - + <b>Musician Profile:</b> 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. The city you live in and the skill level of playing your instrument may also be added. What you set here will appear at your fader on the mixer board when you are connected to a - + server. This tag will 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. - + Alias or name edit box - + Instrument picture button - + Country flag button - + City edit box - + Skill level combo box - + + + None - + + Musician Profile + + + + + Alias/Name + + + + + Instrument + + + + + Country + + + + + City + + + + + Skill + + + + + &Close + &Fermer + + + + Beginner + + + + + Intermediate + + + + + Expert + + + + Drum Set - + Djembe - + Electric Guitar - + Acoustic Guitar - + Bass Guitar - + Keyboard - + Synthesizer - + Grand Piano - + Accordion - + Vocal - + Microphone - + Harmonica - + Trumpet - + Trombone - + French Horn - + Tuba - + Saxophone - + Clarinet - + Flute - + Violin - + Cello - + Double Bass - + Recorder - + Streamer - + Listener - + Guitar+Vocal - + Keyboard+Vocal - + Bodhran - + Bassoon - + Oboe - + Harp - + Viola @@ -1337,48 +1581,108 @@ What you set here will appear at your fader on the mixer board when you are conn - + <b>Location country:</b> The country in which this server is located can be set here. If a country is entered, it will be shown in the connect dialog server list at the clients. - + Country where the server is located combo box - - + + E&xit - + &Hide - - - + + + server - + &Open - + server - + + Manual + + + + + Default + + + + + Default (North America) + + + + Server + + + &Window + + + + + Unregistered + + + + + Bad address + + + + + Registration requested + + + + + Registration failed + + + + + Check server version + + + + + Registered + + + + + Central Server full + + + + + Unknown value + + CServerDlgBase diff --git a/src/res/translation/translation_pt_PT.qm b/src/res/translation/translation_pt_PT.qm index 93b4207c..8dadf065 100644 Binary files a/src/res/translation/translation_pt_PT.qm and b/src/res/translation/translation_pt_PT.qm differ diff --git a/src/res/translation/translation_pt_PT.ts b/src/res/translation/translation_pt_PT.ts index 01fe7ed5..e5a533a1 100644 --- a/src/res/translation/translation_pt_PT.ts +++ b/src/res/translation/translation_pt_PT.ts @@ -63,16 +63,19 @@ + Copyright (C) 2005-2020 Volker Fischer and others + + + Author: Volker Fischer - Autor: Volker Fischer + Autor: Volker Fischer - Copyright (C) 2005-2020 - Copyright (C) 2005-2020 + Copyright (C) 2005-2020 - + &OK &OK @@ -90,6 +93,19 @@ Taxa de Erros de Cada Tamanho de Buffer + + CAudioMixerBoard + + + Server + Servidor + + + + T R Y I N G T O C O N N E C T + + + CChannelFader @@ -163,11 +179,55 @@ SOLO + + Alias/Name + + + + + Instrument + + + + + Location + Localização + + + + + + Skill Level + + + + + Beginner + + + + + Intermediate + + + + + Expert + + + + + Musician Profile + + + + Mute Mute + Solo Solo @@ -332,6 +392,17 @@ Buffers status LED indicator Indicador LED do estado dos buffers + + + + C&onnect + &Ligar + + + + &View + + &Connection Setup... @@ -362,6 +433,41 @@ E&xit &Sair + + + None + Nenhum + + + + Center + Centro + + + + R + R + + + + L + L + + + + user + + + + + users + + + + + D&isconnect + + CClientDlgBase @@ -663,6 +769,72 @@ software. . + + + ASIO Setup + + + + + Mono + + + + + Mono-in/Stereo-out + + + + + Stereo + + + + + Low + + + + + Normal + + + + + High + + + + + Manual + + + + + Default + + + + + Default (North America) + + + + + + Size: + + + + + Buffer Delay + Atraso do buffer + + + + Buffer Delay: + + The selected audio device could not be used because of the following error: @@ -673,6 +845,11 @@ The previous driver will be selected. O driver anterior será selecionado. + + + Ok + + CClientSettingsDlgBase @@ -946,29 +1123,44 @@ CHelpMenu - - + + Getting &Started... Como Começa&r... - + Software &Manual... &Manual do Programa... - + What's &This O que é &isto - + &About... &Sobre... CLicenceDlg + + + I &agree to the above licence terms + + + + + Accept + + + + + Decline + + By connecting to this server and agreeing to this notice, you agree to the following: @@ -1058,204 +1250,256 @@ CMusProfDlg - + <b>Musician Profile:</b> 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. The city you live in and the skill level of playing your instrument may also be added. What you set here will appear at your fader on the mixer board when you are connected to a <b>Perfil do músico:</b> Defina o seu nome ou um pseudônimo aqui para que os outros músicos com quem quer tocar saibam quem você é. Além disso, pode definir uma imagem do instrumento que toca e uma bandeira do país em que vive. A cidade em que vive e o nível de habilidade com o seu instrumento também podem ser adicionados. O que definir aqui aparecerá por baixo do seu fader na secção de mistura quando estiver ligado a um servidor - + server. This tag will 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. . Esta identificação também será exibida em cada cliente ligado ao mesmo servidor que você. Se o nome estiver vazio, o endereço IP será mostrado. - + Alias or name edit box Caixa de edição do nome ou pseudônimo - + Instrument picture button Botão da imagem do instrumento - + Country flag button Botão da bandeira do país - + City edit box Caixa de edição da cidade - + Skill level combo box Caixa do nível de habilidade - + + + None Nenhum - + + Musician Profile + + + + + Alias/Name + + + + + Instrument + + + + + Country + + + + + City + + + + + Skill + + + + + &Close + &Fechar + + + + Beginner + + + + + Intermediate + + + + + Expert + + + + Drum Set Bateria - + Djembe Djembe - + Electric Guitar Guitarra Elétrica - + Acoustic Guitar Guitarra Acústica - + Bass Guitar Baixo - + Keyboard Teclado - + Synthesizer Sintetizador - + Grand Piano Piano de Cauda - + Accordion Acordeão - + Vocal Voz - + Microphone Microfone - + Harmonica Harmónica - + Trumpet Trompete - + Trombone Trombone - + French Horn Trompa Francesa - + Tuba Tuba - + Saxophone Saxofone - + Clarinet Clarinete - + Flute Flauta - + Violin Violino - + Cello Violoncelo - + Double Bass Contrabaixo - + Recorder Gravador - + Streamer Streamer - + Listener Ouvinte - + Guitar+Vocal Guitarra+Voz - + Keyboard+Vocal Teclado+Voz - + Bodhran Bodhrán - + Bassoon Fagote - + Oboe Oboé - + Harp Harpa - + Viola Viola de Arco @@ -1338,48 +1582,108 @@ O que definir aqui aparecerá por baixo do seu fader na secção de mistura quan Caixa de edição da cidade onde o servidor se encontra - + <b>Location country:</b> The country in which this server is located can be set here. If a country is entered, it will be shown in the connect dialog server list at the clients. <b>Localização: País</b> O país em que este servidor está localizado pode ser definido aqui. Se um país for inserido, ele será mostrado na lista do diálogo de logação dos clientes. - + Country where the server is located combo box Seletor do país onde o servidor de encontra - - + + E&xit &Sair - + &Hide &Esconder servidor - - - + + + server - + &Open &Abrir servidor - + server - + + Manual + + + + + Default + + + + + Default (North America) + + + + Server - Servidor + + + &Window + + + + + Unregistered + + + + + Bad address + + + + + Registration requested + + + + + Registration failed + + + + + Check server version + + + + + Registered + + + + + Central Server full + + + + + Unknown value + + CServerDlgBase diff --git a/src/resources.qrc b/src/resources.qrc index 6b0fc83f..ab3535f1 100755 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -8,6 +8,9 @@ res/translation/translation_pt_PT.qm + + res/translation/translation_es_ES.qm + res/CLEDDisabledSmall.png res/CLEDGreenArrow.png diff --git a/src/serverdlg.cpp b/src/serverdlg.cpp index 9091b061..48b4931a 100755 --- a/src/serverdlg.cpp +++ b/src/serverdlg.cpp @@ -107,8 +107,7 @@ CServerDlg::CServerDlg ( CServer* pNServP, lblLocationCity->setWhatsThis ( strLocCity ); edtLocationCity->setWhatsThis ( strLocCity ); - edtLocationCity->setAccessibleName ( tr ( - "City where the server is located line edit" ) ); + edtLocationCity->setAccessibleName ( tr ( "City where the server is located line edit" ) ); // location country QString strLocCountry = tr ( "Location country: The country in " @@ -189,9 +188,9 @@ lvwClients->setMinimumHeight ( 140 ); // central server address type combo box cbxCentServAddrType->clear(); - cbxCentServAddrType->addItem ( "Manual" ); // AT_MANUAL - cbxCentServAddrType->addItem ( "Default" ); // AT_DEFAULT - cbxCentServAddrType->addItem ( "Default (North America)" ); // AT_NORTH_AMERICA + cbxCentServAddrType->addItem ( tr ( "Manual" ) ); // AT_MANUAL + cbxCentServAddrType->addItem ( tr ( "Default" ) ); // AT_DEFAULT + cbxCentServAddrType->addItem ( tr ( "Default (North America)" ) ); // AT_NORTH_AMERICA cbxCentServAddrType->setCurrentIndex ( static_cast ( pServer->GetCentralServerAddressType() ) ); // update server name line edit @@ -273,7 +272,7 @@ lvwClients->setMinimumHeight ( 140 ); // View menu -------------------------------------------------------------- - QMenu* pViewMenu = new QMenu ( "&Window", this ); + QMenu* pViewMenu = new QMenu ( tr ( "&Window" ), this ); pViewMenu->addAction ( tr ( "E&xit" ), this, SLOT ( close() ), QKeySequence ( Qt::CTRL + Qt::Key_Q ) ); diff --git a/src/util.cpp b/src/util.cpp index 8839c288..dd845c02 100755 --- a/src/util.cpp +++ b/src/util.cpp @@ -462,9 +462,9 @@ CLicenceDlg::CLicenceDlg ( QWidget* parent ) : QDialog ( parent ) QVBoxLayout* pLayout = new QVBoxLayout ( this ); QHBoxLayout* pSubLayout = new QHBoxLayout; QTextBrowser* txvLicence = new QTextBrowser ( this ); - QCheckBox* chbAgree = new QCheckBox ( "I &agree to the above licence terms", this ); - butAccept = new QPushButton ( "Accept", this ); - QPushButton* butDecline = new QPushButton ( "Decline", this ); + QCheckBox* chbAgree = new QCheckBox ( tr ( "I &agree to the above licence terms" ), this ); + butAccept = new QPushButton ( tr ( "Accept" ), this ); + QPushButton* butDecline = new QPushButton ( tr ( "Decline" ), this ); pSubLayout->addStretch(); pSubLayout->addWidget ( chbAgree ); @@ -539,22 +539,22 @@ CMusProfDlg::CMusProfDlg ( CClient* pNCliP, - label with combo box for skill level - OK button */ - setWindowTitle ( "Musician Profile" ); + setWindowTitle ( tr ( "Musician Profile" ) ); setWindowIcon ( QIcon ( QString::fromUtf8 ( ":/png/main/res/fronticon.png" ) ) ); QVBoxLayout* pLayout = new QVBoxLayout ( this ); QHBoxLayout* pButSubLayout = new QHBoxLayout; - QLabel* plblAlias = new QLabel ( "Alias/Name", this ); + QLabel* plblAlias = new QLabel ( tr ( "Alias/Name" ), this ); pedtAlias = new QLineEdit ( this ); - QLabel* plblInstrument = new QLabel ( "Instrument", this ); + QLabel* plblInstrument = new QLabel ( tr ( "Instrument" ), this ); pcbxInstrument = new QComboBox ( this ); - QLabel* plblCountry = new QLabel ( "Country", this ); + QLabel* plblCountry = new QLabel ( tr ( "Country" ), this ); pcbxCountry = new QComboBox ( this ); - QLabel* plblCity = new QLabel ( "City", this ); + QLabel* plblCity = new QLabel ( tr ( "City" ), this ); pedtCity = new QLineEdit ( this ); - QLabel* plblSkill = new QLabel ( "Skill", this ); + QLabel* plblSkill = new QLabel ( tr ( "Skill" ), this ); pcbxSkill = new QComboBox ( this ); - QPushButton* butClose = new QPushButton ( "&Close", this ); + QPushButton* butClose = new QPushButton ( tr ( "&Close" ), this ); QGridLayout* pGridLayout = new QGridLayout; plblAlias->setSizePolicy ( QSizePolicy::Minimum, QSizePolicy::Expanding ); @@ -627,8 +627,7 @@ CMusProfDlg::CMusProfDlg ( CClient* pNCliP, if ( static_cast ( iCurCntry ) != QLocale::AnyCountry ) { // get current country enum - QLocale::Country eCountry = - static_cast ( iCurCntry ); + QLocale::Country eCountry = static_cast ( iCurCntry ); // try to load icon from resource file name QIcon CurFlagIcon; @@ -653,7 +652,7 @@ CMusProfDlg::CMusProfDlg ( CClient* pNCliP, FlagNoneIcon.addFile ( ":/png/flags/res/flags/flagnone.png" ); pcbxCountry->insertItem ( 0, FlagNoneIcon, - "None", + tr ( "None" ), static_cast ( QLocale::AnyCountry ) ); @@ -665,25 +664,25 @@ CMusProfDlg::CMusProfDlg ( CClient* pNCliP, RGBCOL_G_SL_NOT_SET, RGBCOL_B_SL_NOT_SET ) ); - pcbxSkill->addItem ( QIcon ( SLPixmap ), "None", SL_NOT_SET ); + pcbxSkill->addItem ( QIcon ( SLPixmap ), tr ( "None" ), SL_NOT_SET ); SLPixmap.fill ( QColor::fromRgb ( RGBCOL_R_SL_BEGINNER, RGBCOL_G_SL_BEGINNER, RGBCOL_B_SL_BEGINNER ) ); - pcbxSkill->addItem ( QIcon ( SLPixmap ), "Beginner", SL_BEGINNER ); + pcbxSkill->addItem ( QIcon ( SLPixmap ), tr ( "Beginner" ), SL_BEGINNER ); SLPixmap.fill ( QColor::fromRgb ( RGBCOL_R_SL_INTERMEDIATE, RGBCOL_G_SL_INTERMEDIATE, RGBCOL_B_SL_INTERMEDIATE ) ); - pcbxSkill->addItem ( QIcon ( SLPixmap ), "Intermediate", SL_INTERMEDIATE ); + pcbxSkill->addItem ( QIcon ( SLPixmap ), tr ( "Intermediate" ), SL_INTERMEDIATE ); SLPixmap.fill ( QColor::fromRgb ( RGBCOL_R_SL_SL_PROFESSIONAL, RGBCOL_G_SL_SL_PROFESSIONAL, RGBCOL_B_SL_SL_PROFESSIONAL ) ); - pcbxSkill->addItem ( QIcon ( SLPixmap ), "Expert", SL_PROFESSIONAL ); + pcbxSkill->addItem ( QIcon ( SLPixmap ), tr ( "Expert" ), SL_PROFESSIONAL ); // Add help text to controls ----------------------------------------------- diff --git a/src/util.h b/src/util.h index 6a790f3f..3c688f59 100755 --- a/src/util.h +++ b/src/util.h @@ -590,28 +590,28 @@ inline QString svrRegStatusToString ( ESvrRegStatus eSvrRegStatus ) switch ( eSvrRegStatus ) { case SRS_UNREGISTERED: - return "Unregistered"; + return QCoreApplication::translate ( "CServerDlg", "Unregistered" ); case SRS_BAD_ADDRESS: - return "Bad address"; + return QCoreApplication::translate ( "CServerDlg", "Bad address" ); case SRS_REQUESTED: - return "Registration requested"; + return QCoreApplication::translate ( "CServerDlg", "Registration requested" ); case SRS_TIME_OUT: - return "Registration failed"; + return QCoreApplication::translate ( "CServerDlg", "Registration failed" ); case SRS_UNKNOWN_RESP: - return "Check server version"; + return QCoreApplication::translate ( "CServerDlg", "Check server version" ); case SRS_REGISTERED: - return "Registered"; + return QCoreApplication::translate ( "CServerDlg", "Registered" ); case SRS_CENTRAL_SVR_FULL: - return "Central Server full"; + return QCoreApplication::translate ( "CServerDlg", "Central Server full" ); } - return QString ( "Unknown value " ).append ( eSvrRegStatus ); + return QString ( QCoreApplication::translate ( "CServerDlg", "Unknown value " ) ).append ( eSvrRegStatus ); }