diff --git a/.gitignore b/.gitignore index 1b84bcee..7f034c10 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ distributions/opus* distributions/jack2 distributions/claudio_piano.sf2 distributions/fluidsynth* +distributions/jamulus.desktop diff --git a/ChangeLog b/ChangeLog index 3bde676a..bae06e92 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,8 @@ - enable/disable recording from command line, coded by pljones (#228) +- add Audacity "list of files" writer to jam recorder, by pljones (#315) + - make level meter LED black when off, by fleutot (#318) - added ukulele/bass ukulele instrument icons created by dos1 (#319) @@ -16,14 +18,14 @@ - avoid showing IP address if no name in the musician profile is given (#316) +- show channel numbers if --ctrlmidich is used (#241, #95) + - bug fix: on MacOS declare an activity to ensure the process doesn't get throttled by OS level Nap, Sleep, and Thread Priority systems, coded by AronVietti (#23) - - 3.5.5 (2020-05-26) - added banjo/mandolin instrument icons created by atsampson (#283) diff --git a/Jamulus.pro b/Jamulus.pro index d626af4e..27568b72 100755 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -19,6 +19,7 @@ TRANSLATIONS = src/res/translation/translation_de_DE.ts \ src/res/translation/translation_pt_PT.ts \ src/res/translation/translation_es_ES.ts \ src/res/translation/translation_nl_NL.ts \ + src/res/translation/translation_pl_PL.ts\ src/res/translation/translation_it_IT.ts INCLUDEPATH += src @@ -301,18 +302,23 @@ win32 { } BINDIR = $$absolute_path($$BINDIR, $$PREFIX) target.path = $$BINDIR - INSTALLS += target isEmpty(APPSDIR) { APPSDIR = share/applications } APPSDIR = $$absolute_path($$APPSDIR, $$PREFIX) desktop.path = $$APPSDIR + QMAKE_SUBSTITUTES += distributions/jamulus.desktop.in desktop.files = distributions/jamulus.desktop - # the .desktop file assumes the binary is called jamulus - contains(CONFIG, "noupcasename") { - INSTALLS += desktop + + isEmpty(ICONSDIR) { + ICONSDIR = share/icons/hicolor/512x512/apps } + ICONSDIR = $$absolute_path($$ICONSDIR, $$PREFIX) + icons.path = $$ICONSDIR + icons.files = distributions/jamulus.png + + INSTALLS += target desktop icons } RCC_DIR = src/res @@ -617,6 +623,8 @@ DISTFILES += ChangeLog \ COPYING \ INSTALL.md \ README.md \ + distributions/jamulus.desktop.in \ + distributions/jamulus.png \ src/res/translation/translation_de_DE.qm \ src/res/translation/translation_fr_FR.qm \ src/res/translation/translation_pt_PT.qm \ diff --git a/distributions/jamulus.desktop b/distributions/jamulus.desktop.in similarity index 95% rename from distributions/jamulus.desktop rename to distributions/jamulus.desktop.in index e12447c6..2acd1025 100644 --- a/distributions/jamulus.desktop +++ b/distributions/jamulus.desktop.in @@ -4,7 +4,7 @@ Comment=Jam Session Comment[fr]=Séance de bœuf GenericName=Internet Jam Session Software GenericName[fr]=Logiciel de séance de bœuf sur Internet -Exec=jamulus +Exec=$$TARGET Icon=jamulus Terminal=false Type=Application diff --git a/src/audiomixerboard.cpp b/src/audiomixerboard.cpp index d3c30bd4..215c2fe1 100644 --- a/src/audiomixerboard.cpp +++ b/src/audiomixerboard.cpp @@ -40,7 +40,7 @@ CChannelFader::CChannelFader ( QWidget* pNW, plbrChannelLevel = new CMultiColorLEDBar ( pLevelsBox ); pFader = new QSlider ( Qt::Vertical, pLevelsBox ); pPan = new QDial ( pLevelsBox ); - pPanLabel = new QLabel ( tr ( "Pan" ) , pLevelsBox ); + pPanLabel = new QLabel ( tr ( "Pan" ), pLevelsBox ); pInfoLabel = new QLabel ( "", pLevelsBox ); pMuteSoloBox = new QWidget ( pFrame ); @@ -174,18 +174,17 @@ CChannelFader::CChannelFader ( QWidget* pNW, // Connections ------------------------------------------------------------- - QObject::connect ( pFader, SIGNAL ( valueChanged ( int ) ), - this, SLOT ( OnLevelValueChanged ( int ) ) ); + QObject::connect ( pFader, &QSlider::valueChanged, + this, &CChannelFader::OnLevelValueChanged ); - QObject::connect ( pPan, SIGNAL ( valueChanged ( int ) ), - this, SLOT ( OnPanValueChanged ( int ) ) ); + QObject::connect ( pPan, &QDial::valueChanged, + this, &CChannelFader::OnPanValueChanged ); - QObject::connect ( pcbMute, SIGNAL ( stateChanged ( int ) ), - this, SLOT ( OnMuteStateChanged ( int ) ) ); + QObject::connect ( pcbMute, &QCheckBox::stateChanged, + this, &CChannelFader::OnMuteStateChanged ); - QObject::connect ( pcbSolo, - SIGNAL ( stateChanged ( int ) ), - SIGNAL ( soloStateChanged ( int ) ) ); + QObject::connect ( pcbSolo, &QCheckBox::stateChanged, + this, &CChannelFader::soloStateChanged ); } void CChannelFader::SetGUIDesign ( const EGUIDesign eNewDesign ) @@ -674,10 +673,10 @@ inline void CAudioMixerBoard::connectFaderSignalsToMixerBoardSlots() this, pPanValueChanged ); connectFaderSignalsToMixerBoardSlots(); -}; +} template<> -inline void CAudioMixerBoard::connectFaderSignalsToMixerBoardSlots<0>() {}; +inline void CAudioMixerBoard::connectFaderSignalsToMixerBoardSlots<0>() {} void CAudioMixerBoard::SetServerName ( const QString& strNewServerName ) { diff --git a/src/channel.cpp b/src/channel.cpp index 4e6aa136..b1b38241 100755 --- a/src/channel.cpp +++ b/src/channel.cpp @@ -60,70 +60,56 @@ CChannel::CChannel ( const bool bNIsServer ) : qRegisterMetaType > ( "CVector" ); qRegisterMetaType ( "CHostAddress" ); - QObject::connect ( &Protocol, - SIGNAL ( MessReadyForSending ( CVector ) ), - this, SLOT ( OnSendProtMessage ( CVector ) ) ); + QObject::connect ( &Protocol, &CProtocol::MessReadyForSending, + this, &CChannel::OnSendProtMessage ); - QObject::connect ( &Protocol, - SIGNAL ( ChangeJittBufSize ( int ) ), - this, SLOT ( OnJittBufSizeChange ( int ) ) ); + QObject::connect ( &Protocol, &CProtocol::ChangeJittBufSize, + this, &CChannel::OnJittBufSizeChange ); - QObject::connect ( &Protocol, - SIGNAL ( ReqJittBufSize() ), - SIGNAL ( ReqJittBufSize() ) ); + QObject::connect ( &Protocol, &CProtocol::ReqJittBufSize, + this, &CChannel::ReqJittBufSize ); - QObject::connect ( &Protocol, - SIGNAL ( ReqChanInfo() ), - SIGNAL ( ReqChanInfo() ) ); + QObject::connect ( &Protocol, &CProtocol::ReqChanInfo, + this, &CChannel::ReqChanInfo ); - QObject::connect ( &Protocol, - SIGNAL ( ReqConnClientsList() ), - SIGNAL ( ReqConnClientsList() ) ); + QObject::connect ( &Protocol, &CProtocol::ReqConnClientsList, + this, &CChannel::ReqConnClientsList ); - QObject::connect ( &Protocol, - SIGNAL ( ConClientListMesReceived ( CVector ) ), - SIGNAL ( ConClientListMesReceived ( CVector ) ) ); + QObject::connect ( &Protocol, &CProtocol::ConClientListMesReceived, + this, &CChannel::ConClientListMesReceived ); - QObject::connect ( &Protocol, SIGNAL ( ChangeChanGain ( int, double ) ), - this, SLOT ( OnChangeChanGain ( int, double ) ) ); + QObject::connect ( &Protocol, &CProtocol::ChangeChanGain, + this, &CChannel::OnChangeChanGain ); - QObject::connect ( &Protocol, SIGNAL ( ChangeChanPan ( int, double ) ), - this, SLOT ( OnChangeChanPan ( int, double ) ) ); + QObject::connect ( &Protocol, &CProtocol::ChangeChanPan, + this, &CChannel::OnChangeChanPan ); - QObject::connect ( &Protocol, - SIGNAL ( ClientIDReceived ( int ) ), - SIGNAL ( ClientIDReceived ( int ) ) ); + QObject::connect ( &Protocol, &CProtocol::ClientIDReceived, + this, &CChannel::ClientIDReceived ); - QObject::connect ( &Protocol, - SIGNAL ( MuteStateHasChangedReceived ( int, bool ) ), - SIGNAL ( MuteStateHasChangedReceived ( int, bool ) ) ); + QObject::connect ( &Protocol, &CProtocol::MuteStateHasChangedReceived, + this, &CChannel::MuteStateHasChangedReceived ); - QObject::connect ( &Protocol, SIGNAL ( ChangeChanInfo ( CChannelCoreInfo ) ), - this, SLOT ( OnChangeChanInfo ( CChannelCoreInfo ) ) ); + QObject::connect ( &Protocol, &CProtocol::ChangeChanInfo, + this, &CChannel::OnChangeChanInfo ); - QObject::connect ( &Protocol, - SIGNAL ( ChatTextReceived ( QString ) ), - SIGNAL ( ChatTextReceived ( QString ) ) ); + QObject::connect ( &Protocol, &CProtocol::ChatTextReceived, + this, &CChannel::ChatTextReceived ); - QObject::connect ( &Protocol, - SIGNAL ( NetTranspPropsReceived ( CNetworkTransportProps ) ), - this, SLOT ( OnNetTranspPropsReceived ( CNetworkTransportProps ) ) ); + QObject::connect ( &Protocol, &CProtocol::NetTranspPropsReceived, + this, &CChannel::OnNetTranspPropsReceived ); - QObject::connect ( &Protocol, - SIGNAL ( ReqNetTranspProps() ), - this, SLOT ( OnReqNetTranspProps() ) ); + QObject::connect ( &Protocol, &CProtocol::ReqNetTranspProps, + this, &CChannel::OnReqNetTranspProps ); - QObject::connect ( &Protocol, - SIGNAL ( LicenceRequired ( ELicenceType ) ), - SIGNAL ( LicenceRequired ( ELicenceType ) ) ); + QObject::connect ( &Protocol, &CProtocol::LicenceRequired, + this, &CChannel::LicenceRequired ); - QObject::connect ( &Protocol, - SIGNAL ( VersionAndOSReceived ( COSUtil::EOpSystemType, QString ) ), - SIGNAL ( VersionAndOSReceived ( COSUtil::EOpSystemType, QString ) ) ); + QObject::connect ( &Protocol, &CProtocol::VersionAndOSReceived, + this, &CChannel::VersionAndOSReceived ); - QObject::connect ( &Protocol, - SIGNAL ( ReqChannelLevelList ( bool ) ), - this, SLOT ( OnReqChannelLevelList ( bool ) ) ); + QObject::connect ( &Protocol, &CProtocol::ReqChannelLevelList, + this, &CChannel::OnReqChannelLevelList ); } bool CChannel::ProtocolIsEnabled() diff --git a/src/chatdlg.cpp b/src/chatdlg.cpp index 0a1554f3..754c2ed9 100755 --- a/src/chatdlg.cpp +++ b/src/chatdlg.cpp @@ -54,15 +54,14 @@ CChatDlg::CChatDlg ( QWidget* parent, Qt::WindowFlags f ) : // Connections ------------------------------------------------------------- - QObject::connect ( edtLocalInputText, - SIGNAL ( textChanged ( const QString& ) ), - this, SLOT ( OnLocalInputTextTextChanged ( const QString& ) ) ); + QObject::connect ( edtLocalInputText, &QLineEdit::textChanged, + this, &CChatDlg::OnLocalInputTextTextChanged ); - QObject::connect ( edtLocalInputText, SIGNAL ( returnPressed() ), - this, SLOT ( OnLocalInputTextReturnPressed() ) ); + QObject::connect ( edtLocalInputText, &QLineEdit::returnPressed, + this, &CChatDlg::OnLocalInputTextReturnPressed ); - QObject::connect ( butClear, SIGNAL ( pressed() ), - this, SLOT ( OnClearPressed() ) ); + QObject::connect ( butClear, &QPushButton::pressed, + this, &CChatDlg::OnClearPressed ); } void CChatDlg::OnLocalInputTextTextChanged ( const QString& strNewText ) diff --git a/src/client.cpp b/src/client.cpp index a6dd8e7a..d0e3c58a 100755 --- a/src/client.cpp +++ b/src/client.cpp @@ -126,102 +126,83 @@ CClient::CClient ( const quint16 iPortNumber, // Connections ------------------------------------------------------------- // connections for the protocol mechanism - QObject::connect ( &Channel, - SIGNAL ( MessReadyForSending ( CVector ) ), - this, SLOT ( OnSendProtMessage ( CVector ) ) ); + QObject::connect ( &Channel, &CChannel::MessReadyForSending, + this, &CClient::OnSendProtMessage ); - QObject::connect ( &Channel, - SIGNAL ( DetectedCLMessage ( CVector, int, CHostAddress ) ), - this, SLOT ( OnDetectedCLMessage ( CVector, int, CHostAddress ) ) ); + QObject::connect ( &Channel, &CChannel::DetectedCLMessage, + this, &CClient::OnDetectedCLMessage ); - QObject::connect ( &Channel, SIGNAL ( ReqJittBufSize() ), - this, SLOT ( OnReqJittBufSize() ) ); + QObject::connect ( &Channel, &CChannel::ReqJittBufSize, + this, &CClient::OnReqJittBufSize ); - QObject::connect ( &Channel, SIGNAL ( JittBufSizeChanged ( int ) ), - this, SLOT ( OnJittBufSizeChanged ( int ) ) ); + QObject::connect ( &Channel, &CChannel::JittBufSizeChanged, + this, &CClient::OnJittBufSizeChanged ); - QObject::connect ( &Channel, SIGNAL ( ReqChanInfo() ), - this, SLOT ( OnReqChanInfo() ) ); + QObject::connect ( &Channel, &CChannel::ReqChanInfo, + this, &CClient::OnReqChanInfo ); - QObject::connect ( &Channel, - SIGNAL ( ConClientListMesReceived ( CVector ) ), - SIGNAL ( ConClientListMesReceived ( CVector ) ) ); + QObject::connect ( &Channel, &CChannel::ConClientListMesReceived, + this, &CClient::ConClientListMesReceived ); - QObject::connect ( &Channel, - SIGNAL ( Disconnected() ), - SIGNAL ( Disconnected() ) ); + QObject::connect ( &Channel, &CChannel::Disconnected, + this, &CClient::Disconnected ); - QObject::connect ( &Channel, SIGNAL ( NewConnection() ), - this, SLOT ( OnNewConnection() ) ); + QObject::connect ( &Channel, &CChannel::NewConnection, + this, &CClient::OnNewConnection ); - QObject::connect ( &Channel, - SIGNAL ( ChatTextReceived ( QString ) ), - SIGNAL ( ChatTextReceived ( QString ) ) ); + QObject::connect ( &Channel, &CChannel::ChatTextReceived, + this, &CClient::ChatTextReceived ); - QObject::connect ( &Channel, - SIGNAL ( ClientIDReceived ( int ) ), - SIGNAL ( ClientIDReceived ( int ) ) ); + QObject::connect ( &Channel, &CChannel::ClientIDReceived, + this, &CClient::ClientIDReceived ); - QObject::connect ( &Channel, - SIGNAL ( MuteStateHasChangedReceived ( int, bool ) ), - SIGNAL ( MuteStateHasChangedReceived ( int, bool ) ) ); + QObject::connect ( &Channel, &CChannel::MuteStateHasChangedReceived, + this, &CClient::MuteStateHasChangedReceived ); - QObject::connect ( &Channel, - SIGNAL ( LicenceRequired ( ELicenceType ) ), - SIGNAL ( LicenceRequired ( ELicenceType ) ) ); + QObject::connect ( &Channel, &CChannel::LicenceRequired, + this, &CClient::LicenceRequired ); - QObject::connect ( &Channel, - SIGNAL ( VersionAndOSReceived ( COSUtil::EOpSystemType, QString ) ), - SIGNAL ( VersionAndOSReceived ( COSUtil::EOpSystemType, QString ) ) ); + QObject::connect ( &Channel, &CChannel::VersionAndOSReceived, + this, &CClient::VersionAndOSReceived ); - QObject::connect ( &ConnLessProtocol, - SIGNAL ( CLMessReadyForSending ( CHostAddress, CVector ) ), - this, SLOT ( OnSendCLProtMessage ( CHostAddress, CVector ) ) ); + QObject::connect ( &ConnLessProtocol, &CProtocol::CLMessReadyForSending, + this, &CClient::OnSendCLProtMessage ); - QObject::connect ( &ConnLessProtocol, - SIGNAL ( CLServerListReceived ( CHostAddress, CVector ) ), - SIGNAL ( CLServerListReceived ( CHostAddress, CVector ) ) ); + QObject::connect ( &ConnLessProtocol, &CProtocol::CLServerListReceived, + this, &CClient::CLServerListReceived ); - QObject::connect ( &ConnLessProtocol, - SIGNAL ( CLConnClientsListMesReceived ( CHostAddress, CVector ) ), - SIGNAL ( CLConnClientsListMesReceived ( CHostAddress, CVector ) ) ); + QObject::connect ( &ConnLessProtocol, &CProtocol::CLConnClientsListMesReceived, + this, &CClient::CLConnClientsListMesReceived ); - QObject::connect ( &ConnLessProtocol, - SIGNAL ( CLPingReceived ( CHostAddress, int ) ), - this, SLOT ( OnCLPingReceived ( CHostAddress, int ) ) ); + QObject::connect ( &ConnLessProtocol, &CProtocol::CLPingReceived, + this, &CClient::OnCLPingReceived ); - QObject::connect ( &ConnLessProtocol, - SIGNAL ( CLPingWithNumClientsReceived ( CHostAddress, int, int ) ), - this, SLOT ( OnCLPingWithNumClientsReceived ( CHostAddress, int, int ) ) ); + QObject::connect ( &ConnLessProtocol, &CProtocol::CLPingWithNumClientsReceived, + this, &CClient::OnCLPingWithNumClientsReceived ); - QObject::connect ( &ConnLessProtocol, - SIGNAL ( CLDisconnection ( CHostAddress ) ), - this, SLOT ( OnCLDisconnection ( CHostAddress ) ) ); + QObject::connect ( &ConnLessProtocol, &CProtocol::CLDisconnection , + this, &CClient::OnCLDisconnection ); #ifdef ENABLE_CLIENT_VERSION_AND_OS_DEBUGGING - QObject::connect ( &ConnLessProtocol, - SIGNAL ( CLVersionAndOSReceived ( CHostAddress, COSUtil::EOpSystemType, QString ) ), - SIGNAL ( CLVersionAndOSReceived ( CHostAddress, COSUtil::EOpSystemType, QString ) ) ); + QObject::connect ( &ConnLessProtocol, &CProtocol::CLVersionAndOSReceived, + this, &CClient::CLVersionAndOSReceived ); #endif - QObject::connect ( &ConnLessProtocol, - SIGNAL ( CLChannelLevelListReceived ( CHostAddress, CVector ) ), - this, SLOT ( OnCLChannelLevelListReceived ( CHostAddress, CVector ) ) ); + QObject::connect ( &ConnLessProtocol, &CProtocol::CLChannelLevelListReceived, + this, &CClient::CLChannelLevelListReceived ); // other - QObject::connect ( &Sound, SIGNAL ( ReinitRequest ( int ) ), - this, SLOT ( OnSndCrdReinitRequest ( int ) ) ); + QObject::connect ( &Sound, &CSound::ReinitRequest, + this, &CClient::OnSndCrdReinitRequest ); - QObject::connect ( &Sound, - SIGNAL ( ControllerInFaderLevel ( int, int ) ), - SIGNAL ( ControllerInFaderLevel ( int, int ) ) ); + QObject::connect ( &Sound, &CSound::ControllerInFaderLevel, + this, &CClient::ControllerInFaderLevel ); - QObject::connect ( &Socket, SIGNAL ( InvalidPacketReceived ( CHostAddress ) ), - this, SLOT ( OnInvalidPacketReceived ( CHostAddress ) ) ); + QObject::connect ( &Socket, &CHighPrioSocket::InvalidPacketReceived, + this, &CClient::OnInvalidPacketReceived ); - QObject::connect ( pSignalHandler, - SIGNAL ( HandledSignal ( int ) ), - this, SLOT ( OnHandledSignal ( int ) ) ); + QObject::connect ( pSignalHandler, &CSignalHandler::HandledSignal, + this, &CClient::OnHandledSignal ); // start the socket (it is important to start the socket after all @@ -673,12 +654,6 @@ void CClient::OnSndCrdReinitRequest ( int iSndCrdResetType ) } } -void CClient::OnCLChannelLevelListReceived ( CHostAddress InetAddr, - CVector vecLevelList ) -{ - emit CLChannelLevelListReceived ( InetAddr, vecLevelList ); -} - void CClient::OnHandledSignal ( int sigNum ) { #ifdef _WIN32 @@ -690,7 +665,7 @@ void CClient::OnHandledSignal ( int sigNum ) { case SIGINT: case SIGTERM: - // This should trigger OnAboutToQuit + // this should trigger OnAboutToQuit QCoreApplication::instance()->exit(); break; diff --git a/src/client.h b/src/client.h index bc6a1da4..1852d77b 100755 --- a/src/client.h +++ b/src/client.h @@ -418,9 +418,6 @@ public slots: void OnSndCrdReinitRequest ( int iSndCrdResetType ); - void OnCLChannelLevelListReceived ( CHostAddress InetAddr, - CVector vecLevelList ); - signals: void ConClientListMesReceived ( CVector vecChanInfo ); void ChatTextReceived ( QString strChatText ); diff --git a/src/clientdlg.cpp b/src/clientdlg.cpp index e99e7c59..0aa4059f 100755 --- a/src/clientdlg.cpp +++ b/src/clientdlg.cpp @@ -29,6 +29,7 @@ CClientDlg::CClientDlg ( CClient* pNCliP, CSettings* pNSetP, const QString& strConnOnStartupAddress, + const int iCtrlMIDIChannel, const bool bNewShowComplRegConnList, const bool bShowAnalyzerConsole, QWidget* parent, @@ -37,6 +38,7 @@ CClientDlg::CClientDlg ( CClient* pNCliP, pClient ( pNCliP ), pSettings ( pNSetP ), bConnectDlgWasShown ( false ), + bMIDICtrlUsed ( iCtrlMIDIChannel != INVALID_MIDI_CH ), ClientSettingsDlg ( pNCliP, parent, Qt::Window ), ChatDlg ( parent, Qt::Window ), ConnectDlg ( pNCliP, bNewShowComplRegConnList, parent, Qt::Dialog ), @@ -142,7 +144,7 @@ CClientDlg::CClientDlg ( CClient* pNCliP, tr ( "Shows the current audio delay status:" ) + "
    " "
  • " "" + tr ( "Green" ) + ": " + tr ( "The delay is perfect for a jam " - "session " ) + "
    • " + "session." ) + "" "
  • " "" + tr ( "Yellow" ) + ": " + tr ( "A session is still possible " "but it may be harder to play." ) + "
    • " "
  • " "" + tr ( "Red" ) + ": " + tr ( "The delay is too large for " @@ -400,158 +402,143 @@ CClientDlg::CClientDlg ( CClient* pNCliP, // Connections ------------------------------------------------------------- // push buttons - QObject::connect ( butConnect, SIGNAL ( clicked() ), - this, SLOT ( OnConnectDisconBut() ) ); + QObject::connect ( butConnect, &QPushButton::clicked, + this, &CClientDlg::OnConnectDisconBut ); // check boxes - QObject::connect ( chbSettings, SIGNAL ( stateChanged ( int ) ), - this, SLOT ( OnSettingsStateChanged ( int ) ) ); + QObject::connect ( chbSettings, &QCheckBox::stateChanged, + this, &CClientDlg::OnSettingsStateChanged ); - QObject::connect ( chbChat, SIGNAL ( stateChanged ( int ) ), - this, SLOT ( OnChatStateChanged ( int ) ) ); + QObject::connect ( chbChat, &QCheckBox::stateChanged, + this, &CClientDlg::OnChatStateChanged ); - QObject::connect ( chbLocalMute, SIGNAL ( stateChanged ( int ) ), - this, SLOT ( OnLocalMuteStateChanged ( int ) ) ); + QObject::connect ( chbLocalMute, &QCheckBox::stateChanged, + this, &CClientDlg::OnLocalMuteStateChanged ); // timers - QObject::connect ( &TimerSigMet, SIGNAL ( timeout() ), - this, SLOT ( OnTimerSigMet() ) ); + QObject::connect ( &TimerSigMet, &QTimer::timeout, + this, &CClientDlg::OnTimerSigMet ); - QObject::connect ( &TimerBuffersLED, SIGNAL ( timeout() ), - this, SLOT ( OnTimerBuffersLED() ) ); + QObject::connect ( &TimerBuffersLED, &QTimer::timeout, + this, &CClientDlg::OnTimerBuffersLED ); - QObject::connect ( &TimerStatus, SIGNAL ( timeout() ), - this, SLOT ( OnTimerStatus() ) ); + QObject::connect ( &TimerStatus, &QTimer::timeout, + this, &CClientDlg::OnTimerStatus ); - QObject::connect ( &TimerPing, SIGNAL ( timeout() ), - this, SLOT ( OnTimerPing() ) ); + QObject::connect ( &TimerPing, &QTimer::timeout, + this, &CClientDlg::OnTimerPing ); // sliders - QObject::connect ( sldAudioPan, SIGNAL ( valueChanged ( int ) ), - this, SLOT ( OnAudioPanValueChanged ( int ) ) ); + QObject::connect ( sldAudioPan, &QSlider::valueChanged, + this, &CClientDlg::OnAudioPanValueChanged ); - QObject::connect ( sldAudioReverb, SIGNAL ( valueChanged ( int ) ), - this, SLOT ( OnAudioReverbValueChanged ( int ) ) ); + QObject::connect ( sldAudioReverb, &QSlider::valueChanged, + this, &CClientDlg::OnAudioReverbValueChanged ); // radio buttons - QObject::connect ( rbtReverbSelL, SIGNAL ( clicked() ), - this, SLOT ( OnReverbSelLClicked() ) ); + QObject::connect ( rbtReverbSelL, &QRadioButton::clicked, + this, &CClientDlg::OnReverbSelLClicked ); - QObject::connect ( rbtReverbSelR, SIGNAL ( clicked() ), - this, SLOT ( OnReverbSelRClicked() ) ); + QObject::connect ( rbtReverbSelR, &QRadioButton::clicked, + this, &CClientDlg::OnReverbSelRClicked ); // other - QObject::connect ( pClient, - SIGNAL ( ConClientListMesReceived ( CVector ) ), - this, SLOT ( OnConClientListMesReceived ( CVector ) ) ); + QObject::connect ( pClient, &CClient::ConClientListMesReceived, + this, &CClientDlg::OnConClientListMesReceived ); - QObject::connect ( pClient, - SIGNAL ( Disconnected() ), - this, SLOT ( OnDisconnected() ) ); + QObject::connect ( pClient, &CClient::Disconnected, + this, &CClientDlg::OnDisconnected ); - QObject::connect ( pClient, - SIGNAL ( CentralServerAddressTypeChanged() ), - this, SLOT ( OnCentralServerAddressTypeChanged() ) ); + QObject::connect ( pClient, &CClient::CentralServerAddressTypeChanged, + this, &CClientDlg::OnCentralServerAddressTypeChanged ); - QObject::connect ( pClient, - SIGNAL ( ChatTextReceived ( QString ) ), - this, SLOT ( OnChatTextReceived ( QString ) ) ); + QObject::connect ( pClient, &CClient::ChatTextReceived, + this, &CClientDlg::OnChatTextReceived ); - QObject::connect ( pClient, - SIGNAL ( ClientIDReceived ( int ) ), - this, SLOT ( OnClientIDReceived ( int ) ) ); + QObject::connect ( pClient, &CClient::ClientIDReceived, + this, &CClientDlg::OnClientIDReceived ); - QObject::connect ( pClient, - SIGNAL ( MuteStateHasChangedReceived ( int, bool ) ), - this, SLOT ( OnMuteStateHasChangedReceived ( int, bool ) ) ); + QObject::connect ( pClient, &CClient::MuteStateHasChangedReceived, + this, &CClientDlg::OnMuteStateHasChangedReceived ); // This connection is a special case. On receiving a licence required message via the // protocol, a modal licence dialog is opened. Since this blocks the thread, we need // a queued connection to make sure the core protocol mechanism is not blocked, too. qRegisterMetaType ( "ELicenceType" ); - QObject::connect ( pClient, - SIGNAL ( LicenceRequired ( ELicenceType ) ), - this, SLOT ( OnLicenceRequired ( ELicenceType ) ), Qt::QueuedConnection ); + QObject::connect ( pClient, &CClient::LicenceRequired, + this, &CClientDlg::OnLicenceRequired, Qt::QueuedConnection ); - QObject::connect ( pClient, - SIGNAL ( PingTimeReceived ( int ) ), - this, SLOT ( OnPingTimeResult ( int ) ) ); + QObject::connect ( pClient, &CClient::PingTimeReceived, + this, &CClientDlg::OnPingTimeResult ); - QObject::connect ( pClient, - SIGNAL ( CLServerListReceived ( CHostAddress, CVector ) ), - this, SLOT ( OnCLServerListReceived ( CHostAddress, CVector ) ) ); + QObject::connect ( pClient, &CClient::CLServerListReceived, + this, &CClientDlg::OnCLServerListReceived ); - QObject::connect ( pClient, - SIGNAL ( CLConnClientsListMesReceived ( CHostAddress, CVector ) ), - this, SLOT ( OnCLConnClientsListMesReceived ( CHostAddress, CVector ) ) ); + QObject::connect ( pClient, &CClient::CLConnClientsListMesReceived, + this, &CClientDlg::OnCLConnClientsListMesReceived ); - QObject::connect ( pClient, - SIGNAL ( CLPingTimeWithNumClientsReceived ( CHostAddress, int, int ) ), - this, SLOT ( OnCLPingTimeWithNumClientsReceived ( CHostAddress, int, int ) ) ); + QObject::connect ( pClient, &CClient::CLPingTimeWithNumClientsReceived, + this, &CClientDlg::OnCLPingTimeWithNumClientsReceived ); - QObject::connect ( pClient, - SIGNAL ( ControllerInFaderLevel ( int, int ) ), - this, SLOT ( OnControllerInFaderLevel ( int, int ) ) ); + QObject::connect ( pClient, &CClient::ControllerInFaderLevel, + this, &CClientDlg::OnControllerInFaderLevel ); - QObject::connect ( pClient, - SIGNAL ( CLChannelLevelListReceived ( CHostAddress, CVector ) ), - this, SLOT ( OnCLChannelLevelListReceived ( CHostAddress, CVector ) ) ); + QObject::connect ( pClient, &CClient::CLChannelLevelListReceived, + this, &CClientDlg::OnCLChannelLevelListReceived ); - QObject::connect ( pClient, - SIGNAL ( VersionAndOSReceived ( COSUtil::EOpSystemType, QString ) ), - this, SLOT ( OnVersionAndOSReceived ( COSUtil::EOpSystemType, QString ) ) ); + QObject::connect ( pClient, &CClient::VersionAndOSReceived, + this, &CClientDlg::OnVersionAndOSReceived ); #ifdef ENABLE_CLIENT_VERSION_AND_OS_DEBUGGING - QObject::connect ( pClient, - SIGNAL ( CLVersionAndOSReceived ( CHostAddress, COSUtil::EOpSystemType, QString ) ), - this, SLOT ( OnCLVersionAndOSReceived ( CHostAddress, COSUtil::EOpSystemType, QString ) ) ); + QObject::connect ( pClient, &CClient::CLVersionAndOSReceived, + this, &CClientDlg::OnCLVersionAndOSReceived ); #endif - QObject::connect ( QCoreApplication::instance(), SIGNAL ( aboutToQuit() ), - this, SLOT ( OnAboutToQuit() ) ); + QObject::connect ( QCoreApplication::instance(), &QCoreApplication::aboutToQuit, + this, &CClientDlg::OnAboutToQuit ); - QObject::connect ( &ClientSettingsDlg, SIGNAL ( GUIDesignChanged() ), - this, SLOT ( OnGUIDesignChanged() ) ); + QObject::connect ( &ClientSettingsDlg, &CClientSettingsDlg::GUIDesignChanged, + this, &CClientDlg::OnGUIDesignChanged ); - QObject::connect ( &ClientSettingsDlg, SIGNAL ( DisplayChannelLevelsChanged() ), - this, SLOT ( OnDisplayChannelLevelsChanged() ) ); + QObject::connect ( &ClientSettingsDlg, &CClientSettingsDlg::DisplayChannelLevelsChanged, + this, &CClientDlg::OnDisplayChannelLevelsChanged ); - QObject::connect ( &ClientSettingsDlg, SIGNAL ( AudioChannelsChanged() ), - this, SLOT ( OnAudioChannelsChanged() ) ); + QObject::connect ( &ClientSettingsDlg, &CClientSettingsDlg::AudioChannelsChanged, + this, &CClientDlg::OnAudioChannelsChanged ); - QObject::connect ( &ClientSettingsDlg, SIGNAL ( NewClientLevelChanged() ), - this, SLOT ( OnNewClientLevelChanged() ) ); + QObject::connect ( &ClientSettingsDlg, &CClientSettingsDlg::NewClientLevelChanged, + this, &CClientDlg::OnNewClientLevelChanged ); - QObject::connect ( MainMixerBoard, SIGNAL ( ChangeChanGain ( int, double, bool ) ), - this, SLOT ( OnChangeChanGain ( int, double, bool ) ) ); + QObject::connect ( MainMixerBoard, &CAudioMixerBoard::ChangeChanGain, + this, &CClientDlg::OnChangeChanGain ); - QObject::connect ( MainMixerBoard, SIGNAL ( ChangeChanPan ( int, double ) ), - this, SLOT ( OnChangeChanPan ( int, double ) ) ); + QObject::connect ( MainMixerBoard, &CAudioMixerBoard::ChangeChanPan, + this, &CClientDlg::OnChangeChanPan ); - QObject::connect ( MainMixerBoard, SIGNAL ( NumClientsChanged ( int ) ), - this, SLOT ( OnNumClientsChanged ( int ) ) ); + QObject::connect ( MainMixerBoard, &CAudioMixerBoard::NumClientsChanged, + this, &CClientDlg::OnNumClientsChanged ); - QObject::connect ( &ChatDlg, SIGNAL ( NewLocalInputText ( QString ) ), - this, SLOT ( OnNewLocalInputText ( QString ) ) ); + QObject::connect ( &ChatDlg, &CChatDlg::NewLocalInputText, + this, &CClientDlg::OnNewLocalInputText ); - QObject::connect ( &ConnectDlg, SIGNAL ( ReqServerListQuery ( CHostAddress ) ), - this, SLOT ( OnReqServerListQuery ( CHostAddress ) ) ); + QObject::connect ( &ConnectDlg, &CConnectDlg::ReqServerListQuery, + this, &CClientDlg::OnReqServerListQuery ); // note that this connection must be a queued connection, otherwise the server list ping // times are not accurate and the client list may not be retrieved for all servers listed // (it seems the sendto() function needs to be called from different threads to fire the // packet immediately and do not collect packets before transmitting) - QObject::connect ( &ConnectDlg, SIGNAL ( CreateCLServerListPingMes ( CHostAddress ) ), - this, SLOT ( OnCreateCLServerListPingMes ( CHostAddress ) ), Qt::QueuedConnection ); + QObject::connect ( &ConnectDlg, &CConnectDlg::CreateCLServerListPingMes, + this, &CClientDlg::OnCreateCLServerListPingMes, Qt::QueuedConnection ); - QObject::connect ( &ConnectDlg, SIGNAL ( CreateCLServerListReqVerAndOSMes ( CHostAddress ) ), - this, SLOT ( OnCreateCLServerListReqVerAndOSMes ( CHostAddress ) ) ); + QObject::connect ( &ConnectDlg, &CConnectDlg::CreateCLServerListReqVerAndOSMes, + this, &CClientDlg::OnCreateCLServerListReqVerAndOSMes ); - QObject::connect ( &ConnectDlg, SIGNAL ( CreateCLServerListReqConnClientsListMes ( CHostAddress ) ), - this, SLOT ( OnCreateCLServerListReqConnClientsListMes ( CHostAddress ) ) ); + QObject::connect ( &ConnectDlg, &CConnectDlg::CreateCLServerListReqConnClientsListMes, + this, &CClientDlg::OnCreateCLServerListReqConnClientsListMes ); - QObject::connect ( &ConnectDlg, SIGNAL ( accepted() ), - this, SLOT ( OnConnectDlgAccepted() ) ); + QObject::connect ( &ConnectDlg, &CConnectDlg::accepted, + this, &CClientDlg::OnConnectDlgAccepted ); // Initializations which have to be done after the signals are connected --- @@ -812,6 +799,15 @@ void CClientDlg::OnLicenceRequired ( ELicenceType eLicenceType ) void CClientDlg::OnConClientListMesReceived ( CVector vecChanInfo ) { + // show channel numbers if --ctrlmidich is used (#241, #95) + if ( bMIDICtrlUsed ) + { + for ( int i = 0; i < vecChanInfo.Size(); i++ ) + { + vecChanInfo[i].strName.prepend ( QString().setNum ( vecChanInfo[i].iChanID ) + ":" ); + } + } + // update mixer board with the additional client infos MainMixerBoard->ApplyNewConClientList ( vecChanInfo ); } diff --git a/src/clientdlg.h b/src/clientdlg.h index a54d22f5..0040db8a 100755 --- a/src/clientdlg.h +++ b/src/clientdlg.h @@ -72,6 +72,7 @@ public: CClientDlg ( CClient* pNCliP, CSettings* pNSetP, const QString& strConnOnStartupAddress, + const int iCtrlMIDIChannel, const bool bNewShowComplRegConnList, const bool bShowAnalyzerConsole, QWidget* parent = nullptr, @@ -96,6 +97,7 @@ protected: bool bConnected; bool bConnectDlgWasShown; + bool bMIDICtrlUsed; QTimer TimerSigMet; QTimer TimerBuffersLED; QTimer TimerStatus; diff --git a/src/clientsettingsdlg.cpp b/src/clientsettingsdlg.cpp index 9e9b737d..51b95b3e 100755 --- a/src/clientsettingsdlg.cpp +++ b/src/clientsettingsdlg.cpp @@ -209,11 +209,10 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent, "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." ) + "
    • " - "
  • " + tr ( "Enabling " ) + "" + tr ( "Stereo" ) + " " + tr ( "mode " + "
  • " + tr ( "Enabling " ) + "" + tr ( "Stereo" ) + " " + 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." ) + "
    • " - "
" - + "
" + tr ( "In stereo streaming mode, no audio channel selection " + "" + "
" + 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." ); diff --git a/src/main.cpp b/src/main.cpp index 62d90d02..0fdaa607 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -608,6 +608,7 @@ int main ( int argc, char** argv ) CClientDlg ClientDlg ( &Client, &Settings, strConnOnStartupAddress, + iCtrlMIDIChannel, bShowComplRegConnList, bShowAnalyzerConsole, nullptr, diff --git a/src/recorder/creaperproject.h b/src/recorder/creaperproject.h index be6f190a..1fbb57ea 100755 --- a/src/recorder/creaperproject.h +++ b/src/recorder/creaperproject.h @@ -32,21 +32,6 @@ namespace recorder { -struct STrackItem -{ - STrackItem(int numAudioChannels, qint64 startFrame, qint64 frameCount, QString fileName) : - numAudioChannels(numAudioChannels), - startFrame(startFrame), - frameCount(frameCount), - fileName(fileName) - { - } - int numAudioChannels; - qint64 startFrame; - qint64 frameCount; - QString fileName; -}; - class CReaperItem : public QObject { Q_OBJECT @@ -59,12 +44,6 @@ private: const QUuid iguid = QUuid::createUuid(); const QUuid guid = QUuid::createUuid(); QString out; - - inline QString secondsAt48K( const qint64 frames, - const int frameSize ) - { - return QString::number( static_cast( frames * frameSize ) / 48000, 'f', 14 ); - } }; class CReaperTrack : public QObject diff --git a/src/recorder/cwavestream.h b/src/recorder/cwavestream.h index f3ceab66..6d8f1ec8 100755 --- a/src/recorder/cwavestream.h +++ b/src/recorder/cwavestream.h @@ -27,6 +27,31 @@ namespace recorder { +inline QString secondsAt48K( const qint64 frames, + const int frameSize ) +{ + return QString::number( static_cast( frames * frameSize ) / 48000, 'f', 14 ); +} + +struct STrackItem +{ + STrackItem ( int numAudioChannels, + qint64 startFrame, + qint64 frameCount, + QString fileName ) : + numAudioChannels ( numAudioChannels ), + startFrame ( startFrame ), + frameCount ( frameCount ), + fileName ( fileName ) + { + } + + int numAudioChannels; + qint64 startFrame; + qint64 frameCount; + QString fileName; +}; + class HdrRiff { public: diff --git a/src/recorder/jamrecorder.cpp b/src/recorder/jamrecorder.cpp index d8dc9833..40e10321 100755 --- a/src/recorder/jamrecorder.cpp +++ b/src/recorder/jamrecorder.cpp @@ -381,35 +381,15 @@ void CJamRecorder::OnEnd() isRecording = false; currentSession->End(); - QString reaperProjectFileName = currentSession->SessionDir().filePath(currentSession->Name().append(".rpp")); - const QFileInfo fi(reaperProjectFileName); - - if (fi.exists()) - { - qWarning() << "CJamRecorder::OnEnd():" << fi.absolutePath() << "exists and will not be overwritten."; - reaperProjectFileName = QString::Null(); - } - else - { - QFile outf (reaperProjectFileName); - if ( outf.open(QFile::WriteOnly) ) - { - QTextStream out(&outf); - out << CReaperProject( currentSession->Tracks(), iServerFrameSizeSamples ).toString() << endl; - qDebug() << "Session RPP:" << reaperProjectFileName; - } - else - { - qWarning() << "CJamRecorder::OnEnd():" << fi.absolutePath() << "could not be created, no RPP written."; - reaperProjectFileName = QString::Null(); - } - } + ReaperProjectFromCurrentSession(); + AudacityLofFromCurrentSession(); delete currentSession; currentSession = nullptr; } } + /** * @brief CJamRecorder::OnTriggerSession End one session and start a new one */ @@ -432,6 +412,66 @@ void CJamRecorder::OnAboutToQuit() thisThread->exit(); } +void CJamRecorder::ReaperProjectFromCurrentSession() +{ + QString reaperProjectFileName = currentSession->SessionDir().filePath(currentSession->Name().append(".rpp")); + const QFileInfo fi(reaperProjectFileName); + + if (fi.exists()) + { + qWarning() << "CJamRecorder::ReaperProjectFromCurrentSession():" << fi.absolutePath() << "exists and will not be overwritten."; + } + else + { + QFile outf (reaperProjectFileName); + if ( outf.open(QFile::WriteOnly) ) + { + QTextStream out(&outf); + out << CReaperProject( currentSession->Tracks(), iServerFrameSizeSamples ).toString() << endl; + qDebug() << "Session RPP:" << reaperProjectFileName; + } + else + { + qWarning() << "CJamRecorder::ReaperProjectFromCurrentSession():" << fi.absolutePath() << "could not be created, no RPP written."; + } + } +} + +void CJamRecorder::AudacityLofFromCurrentSession() +{ + QString audacityLofFileName = currentSession->SessionDir().filePath(currentSession->Name().append(".lof")); + const QFileInfo fi(audacityLofFileName); + + if (fi.exists()) + { + qWarning() << "CJamRecorder::AudacityLofFromCurrentSession():" << fi.absolutePath() << "exists and will not be overwritten."; + } + else + { + QFile outf (audacityLofFileName); + if ( outf.open(QFile::WriteOnly) ) + { + QTextStream sOut(&outf); + + foreach ( auto trackName, currentSession->Tracks().keys() ) + { + foreach ( auto item, currentSession->Tracks()[trackName] ) { + QFileInfo fi ( item.fileName ); + sOut << "file " << '"' << fi.fileName() << '"'; + sOut << " offset " << secondsAt48K( item.startFrame, iServerFrameSizeSamples ) << endl; + } + } + + sOut.flush(); + qDebug() << "Session LOF:" << audacityLofFileName; + } + else + { + qWarning() << "CJamRecorder::AudacityLofFromCurrentSession():" << fi.absolutePath() << "could not be created, no LOF written."; + } + } +} + /** * @brief CJamRecorder::SessionDirToReaper Replica of CJamRecorder::OnEnd() but using the directory contents to construct the CReaperProject object * @param strSessionDirName diff --git a/src/recorder/jamrecorder.h b/src/recorder/jamrecorder.h index 0dec305f..b0e2651c 100755 --- a/src/recorder/jamrecorder.h +++ b/src/recorder/jamrecorder.h @@ -159,6 +159,8 @@ public: private: void Start(); + void ReaperProjectFromCurrentSession(); + void AudacityLofFromCurrentSession(); QDir recordBaseDir; diff --git a/src/res/homepage/faders.png b/src/res/homepage/faders.png index ed04579d..7d54fce9 100644 Binary files a/src/res/homepage/faders.png and b/src/res/homepage/faders.png differ diff --git a/src/res/homepage/manual.md b/src/res/homepage/manual.md index ac76c0d6..2f33314a 100644 --- a/src/res/homepage/manual.md +++ b/src/res/homepage/manual.md @@ -94,11 +94,18 @@ In the audio mixer frame, a fader is shown for each connected client at the serv The faders allow you to adjust the level of what you hear without affecting what others hear. The VU meter shows the input level at the server - that is, the sound you are sending. -If you have set your Audio Channel to Stereo or Stereo Out in your Settings, you will also see a pan control. -Using the Mute button prevents the indicated channel being heard in your local mix. Be aware that when you mute a musician, they will see a "muted" icon above your fader to indicate that you cannot hear them. Note also that you will continue to see their VU meters moving if sound from the muted musician is reaching the server. Your fader position for them is also unaffected. +If you have set your Audio Channel to Stereo or Stereo Out in your Settings, you will also see a pan control. + +If you see a "mute" icon above a channel, it means that musician cannot hear you. Either they have muted you, soloed one or more channels not including yours, or have set your fader in their mix to zero. + +Using the **Mute button** prevents the indicated channel being heard in your local mix. Be aware that when you mute a musician, they will see a "muted" icon above your fader to indicate that you cannot hear them. Note also that you will continue to see their VU meters moving if sound from the muted musician is reaching the server. Your fader position for them is also unaffected. + +The **Solo button** allows you to hear one or more musicians on their own. Those not soloed will be muted. Note also that those musicians who are not soloed will see a "muted" icon above your fader. + + + -The Solo button allows you to hear one or more musicians on their own. Those not soloed will be muted. Note also that those musicians who are not soloed will see a "muted" icon above your fader. Settings Window diff --git a/src/res/translation/translation_de_DE.qm b/src/res/translation/translation_de_DE.qm index 9d2de822..72b40090 100644 Binary files a/src/res/translation/translation_de_DE.qm and b/src/res/translation/translation_de_DE.qm differ diff --git a/src/res/translation/translation_de_DE.ts b/src/res/translation/translation_de_DE.ts index 18a1e4ca..3b3509dd 100644 --- a/src/res/translation/translation_de_DE.ts +++ b/src/res/translation/translation_de_DE.ts @@ -587,42 +587,42 @@ Controls the relative levels of the left and right local audio channels. For a mono signal it acts as a pan between the two channels.For example, if 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 - + Mit diesem Einstellregler kann der relative Pegel vom linken und rechten Eingangskanal verändert werden. Für ein Mono-Signal verhält sich der Regler wie ein Pan-Regler. Wenn, z.B., ein Mikrofon am rechten Kanal angeschlossen ist und das Instrument am linken Eingangskanal ist viel lauter als das Mikrofon, dann kann man den Lautstärkeunterschied mit diesem Regler kompensieren indem man den Regler in eine Richtung verschiebt, so dass über dem Regler Reverb effect - + Halleffektregler Reverb can be applied to one local mono audio channel or to both channels in stereo mode. The mono channel selection and the reverb level can be modified. For example, if a microphone signal is fed in to the right audio channel of the sound card and a reverb effect needs to be applied, set the channel selector to right and move the fader upwards until the desired reverb level is reached. - + Der Halleffekt kann auf einen selektierten Mono-Audiokanal oder auf beide Stereoaudiokanäle angewendet werden. Die Mono-Kanalselektion und die Hallstärke können eingestellt werden. Wenn z.B. ein Mikrofonsignal auf dem rechten Kanal anliegt und ein Halleffekt soll auf das Mikrofonsignal angewendet werden, dann muss die Hallkanalselektion auf rechts eingestellt werden und der Hallregler muss erhöht werden, bis die gewünschte Stärke des Halleffekts erreicht ist. Reverb effect level setting - + Halleffekt Pegelregler Reverb Channel Selection - + Halleffekt Kanalselektion With these radio buttons the audio input channel on which the reverb effect is applied can be chosen. Either the left or right input channel can be selected. - + Mit diesen Knöpfen kann ausgewählt werden, auf welches Eingangssignal der Halleffekt angewendet werden soll. Entweder der rechte oder linke Eingangskanal kann ausgewählt werden. Left channel selection for reverb - + Auswahl linker Kanal für Halleffekt Right channel selection for reverb - + Auswahl rechter Kanal für Halleffekt The @@ -631,17 +631,22 @@ Green - + Grün + + + + The delay is perfect for a jam session. + Die Verzögerung it gering genug für das Jammen. Yellow - + Gelb Red - + Rot @@ -651,47 +656,46 @@ Opens a dialog where you can select a server to connect to. If you are connected, pressing this button will end the session. - + Wenn man diesen Knopf drückt, dann wird die Beschriftung des Knopfes von Verbinden zu Trennen geändert, das heißt, dass er eine Umschaltfunktion hat zum Verbinden und Trennen der Software. Shows the current audio delay status: - + Die Status-LED für die Verzögerung zeigt eine Bewertung der Gesamtverzögerung des Audiosignals: - The delay is perfect for a jam session - + Die Verzögerung ist gering genug für das Jammen. A session is still possible but it may be harder to play. - + Man kann noch spielen aber es wird schwieriger Lieder mit hohem Tempo zu spielen. The delay is too large for jamming. - + Die Verzögerung ist zu hoch zum Jammen. If this LED indicator turns red, you will not have much fun using the application. - + Wenn diese LED rot leuchtet, dann wirst du keinen Spaß haben mit der Software. The buffers status LED shows the current audio/streaming status. If the light is red, the audio stream is interrupted. This is caused by one of the following problems: - + Die Status-LED für den Netzwerkpuffer zeigt den aktuellen Status des Netzwerkstroms. Wenn die LED grün ist, dann gibt es keine Pufferprobleme. Wenn die LED rot anzeigt, dann ist der Netzwerkstrom kurz unterbrochen. Dies kann folgende Ursachen haben: The sound card's buffer delay (buffer size) is too small (see Settings window). - + Der Soundkartenpuffer ist zu klein eingestellt. The upload or download stream rate is too high for your internet bandwidth. - + Die Upload-Rate der Internetverbindung ist zu klein für den Netzwerkdatenstrom. @@ -1199,12 +1203,12 @@ Wenn der Stereo-Modus ausgewählt wurde, dann verschwindet die Kanalselektion für den Halleffekt im Hauptfenster, da der Effekt auf beide Stereokanäle angewendet wird. - + Audio channels combo box Audiokanal Auswahlbox - + Audio Quality Audioqualität @@ -1213,12 +1217,12 @@ Wählt die gewünschte Audioqualität aus. Es wird eine niedrige, mittlere und hohe Audioqualität angeboten. Je höher die Audioqualität, desto höher ist die Netzwerkübertragungsrate. Man muss sicherstellen, dass die Internetverbindung die höhere Rate übertragen kann. - + Audio quality combo box Audioqualität Auswahlbox - + New Client Level Pegel für neuen Teilnehmer @@ -1227,12 +1231,12 @@ Der Pegel für neue Teilnehmer definiert die Fadereinstellung, wenn sich ein Teilnehmer neu mit dem Server verbindet. D.h. wenn ein neuer Fader erscheint, dann wird er auf den voreingestellten Pegel gesetzt. Eine Ausnahme bildet der Fall, dass der Teilnehmer vorher schon mal mit dem Server verbunden war und der Pegel gespeichert war. - + New client level edit box Neuer Teilnehmer Pegel Einstellbox - + Custom Central Server Address Benutzerdefinierte Zentralserveradresse @@ -1253,12 +1257,12 @@ Voreingestellter Zentralservertyp Auswahlbox - + Central server address line edit Zentralserveradresse Eingabefeld - + Current Connection Status Parameter Verbindungsstatus Parameter @@ -1275,175 +1279,179 @@ Die Upload-Rate hängt von der Soundkartenpuffergröße und die Audiokomprimierung ab. Man muss sicher stellen, dass die Upload-Rate immer kleiner ist als die Rate, die die Internetverbindung zur Verfügung stellt (man kann die Upload-Rate des Internetproviders z.B. mit speedtest.net überprüfen). - + If this LED indicator turns red, you will not have much fun using the Wenn diese LED rot leuchtet, dann wirst du keinen Spaß haben mit der - + software. Software. - + ASIO Setup ASIO-Einstellung - + Mono - + + mode will increase your stream's data rate. Make sure your upload rate does not exceed the available upload speed of your internet connection. + Modus ist die Übertragungsrate etwas höher. Man muss sicher stellen, dass die Internetverbindung die höhere Rate übertragen kann. + + + Mono-in/Stereo-out Mono-In/Stereo-Out - + Stereo The jitter buffer compensates for network and sound card timing jitters. The size of the buffer therefore influences the quality of the audio stream (how many dropouts occur) and the overall delay (the longer the buffer, the higher the delay). - + Der Netzwerkpuffer kompensiert die Netzwerk- und Soundkarten-Timing-Schwankungen. Die Größe des Netzwerkpuffers hat Auswirkungen auf die Qualität des Audiosignals (wie viele Aussetzer auftreten) und die Gesamtverzögerung (je länger der Puffer, desto größer ist die Verzögerung). 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 has taken place and the audio stream is interrupted. - + Die Netzwerkpuffergröße kann manuell verstellt werden, jeweils getrennt für die Applikation und den Server. Für den lokalen Netzwerkpuffer werden die Aussetzer durch die LED-Anzeige unter den Reglern angezeigt. Wenn die Lampe rot anzeigt, dann hat ein Pufferüberlauf oder ein Leerlauf des Puffers stattgefunden und der Audiodatenstrom wurde kurz unterbrochen. If the Auto setting 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 Auto is enabled, the jitter buffer size faders are disabled (they cannot be moved with the mouse). - + Die Netzwerkpuffergröße kann automatisch eingestellt werden. Wenn die Automatik aktiviert ist, dann werden die Netzwerkpuffer der Applikation und des Servers getrennt basierend auf Messungen der Netzwerkschwankungen eingestellt. Wenn die Automatik aktiviert ist, dann sind die beiden Regler gesperrt für die manuelle Verstellung (sie können nicht mit der Maus verändert werden). 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 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. - + Wenn die Automatik zum Einstellen der Netzwerkpuffer aktiviert ist, dann werden die Netzwerkpuffer der Applikation und des entfernten Servers auf einen konservativen Wert eingestellt, um eine möglichst gute Audioqualität zu garantieren. Um die Gesamtverzögerung zu optimieren, bietet es sich an, die Automatik zu deaktivieren und die Netzwerkpuffer etwas kleiner einzustellen. Die Werte sollte man so weit reduzieren, bis die Audioqualität gerade noch der persönlichen Akzeptanz entspricht. Die LED-Anzeige hilft dabei die Audioaussetzer verursacht durch den lokalen Netzwerkpuffer zu visualisieren (wenn die LED rot leuchtet). The buffer delay setting is a fundamental setting of this software. This setting has an influence on many connection properties. - + Die Soundkartenpuffergröße ist eine fundamentale Einstellung der Software. Diese Einstellung hat Einfluss auf viele andere Verbindungseigenschaften. 64 samples: The preferred setting. Provides the lowest latency but does not work with all sound cards. - + 64 Samples: Dies ist die bevorzugte Einstellung weil es die geringste Verzögerung hat. Diese Puffergröße funktioniert allerdings nicht mit allen Soundkarten. 128 samples: Should work for most available sound cards. - + 128 Samples: Diese Puffergröße sollte mit den meisten Soundkarten funktionieren. 256 samples: Should only be used on very slow computers or with a slow internet connection. - + 256 Samples: Diese Einstellung sollte nur dann verwendet werden, wenn man einen langsamen Computer oder eine langsame Internetverbindung hat. Some sound card drivers do not allow the buffer delay to be changed 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. - + Manche Soundkartentreiber unterstützen nicht das Verändern der Puffergröße innerhalb der Software. In diesem Fall ist die Einstellungsmöglichkeit für die Puffergröße deaktiviert. Die Puffergröße muss man stattdessen direkt im Soundkartentreiber durchführen. Unter Windows kann man den ASIO-Einstellungen Knopf drücken um die Treibereinstellungen zu öffnen. Unter Linux benutzt man das Jack-Konfigurationsprogramm um die Puffergröße einzustellen. If no buffer size is selected and all settings are disabled, an unsupported buffer size is used by the driver. The application will still work with this setting but with restricted performance. - + Falls keiner der vorgegebenen Puffergrößen ausgeählt ist und alle Einstellungen deaktiviert sind, dann wird eine nicht unterstützte Puffergröße im Soundkartentreiber verwendet. Die Software funktioniert trotzdem aber es könnte eine größere Verzögerung resultieren. 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. - + Falls keiner der vorgegebenen Puffergrößen ausgeählt ist und alle Einstellungen deaktiviert sind, dann wird eine nicht unterstützte Puffergröße im Soundkartentreiber verwendet. Unter Windows kann man den ASIO-Einstellungen Knopf drücken, um die Treibereinstellungen zu öffnen. Unter Linux kann man ein Jack-Konfigurationswerkzeug verwenden, um die Puffergröße zu verändern. Selects the number of audio channels to be used for communication between client and server. There are three modes available: - + Hiermit kann man die Anzahl an Audiokanälen auswählen. Es gibt drei Modi: and - + und These modes use one and two audio channels respectively. - + Diese Modi verwenden jeweils einen oder zwei Audiokanäle. Mono in/Stereo-out - + 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. In that case the two input signals can be mixed to one mono channel but the server mix is heard in stereo. - + Ein Monosignal wird zum Server geschickt aber es kommt ein Stereo-Signal zurück vom Server. Dies ist nützlich für den Fall, dass man an die Soundkarte ein Instrument an den einen Eingangskanal und ein Mikrofon an den anderen Eingangskanal angeschlossen hat. In diesem Fall können die beiden Signale zusammen gemischt werden und an den Server geschickt werden aber man kann das Stereo-Signal von den anderen Musikern hören. Enabling - + Im - mode will increase your stream's data rate. Make sure your upload rate does not exceed the available upload speed of your internet connection. - + Modus ist die Übertragungsrate etwas höher. Man muss sicher stellen, dass die Internetverbindung die höhere Rate übertragen kann. - + 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. - + Wenn der Stereo-Modus ausgewählt wurde, dann verschwindet die Kanalselektion für den Halleffekt im Hauptfenster, da der Effekt auf beide Stereokanäle angewendet wird. - + 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. - + Je höher die Audioqualität, desto höher ist die Netzwerkübertragungsrate. Man muss sicherstellen, dass die Internetverbindung die höhere Rate übertragen kann. - + 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. - + Der Pegel für neue Teilnehmer definiert die Fadereinstellung, wenn sich ein Teilnehmer neu mit dem Server verbindet. D.h. wenn ein neuer Fader erscheint, dann wird er auf den voreingestellten Pegel gesetzt. Eine Ausnahme bildet der Fall, dass der Teilnehmer vorher schon mal mit dem Server verbunden war und der Pegel gespeichert war. - + Leave this blank unless you need to enter the address of a central server other than the default. - + Die Zentralserveradresse ist die IP-Adresse oder URL des Zentralservers, der die Serverliste organisiert und bereitstellt. Diese Adresse wird nur benutzt, wenn die benutzerdefinierte Serverliste im Verbindungsdialog ausgewählt wird. - + 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 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. - + Die Ping-Zeit ist die Zeit, die der Audiodatenstrom benötigt, um von der Applikation zum Server und zurück zu kommen. Diese Verzögerung wird vom Netzwerk hervorgerufen. Diese Verzögerung sollte so um die 20-30 ms sein. Falls die Verzögerung größer ist (z.B. 50-60 ms), der Abstand zum Server ist zu groß oder die Internetverbindung ist nicht ausreichend. - + Overall Delay is calculated from the current Ping Time and the delay introduced by the current buffer settings. - + Die Gesamtverzögerung setzt sich zusammen aus der Ping-Zeit und die Verzögerung, die durch die Puffergrößen verursacht wird. - + 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. - + Die Upload-Rate hängt von der Soundkartenpuffergröße und die Audiokomprimierung ab. Man muss sicher stellen, dass die Upload-Rate immer kleiner ist als die Rate, die die Internetverbindung zur Verfügung stellt (man kann die Upload-Rate des Internetproviders z.B. mit speedtest.net überprüfen). - + Low Niedrig - + Normal Normal - + High Hoch @@ -1490,23 +1498,23 @@ Standard (Nordamerika) - + preferred bevorzugt - - + + Size: Größe: - + Buffer Delay Puffergröße - + Buffer Delay: Puffergröße: @@ -1515,17 +1523,17 @@ Vordefinierte Adresse - + The selected audio device could not be used because of the following error: Das ausgewählte Audiogerät kann aus folgendem Grund nicht verwendet werden: - + The previous driver will be selected. Der vorherige Treiber wird wieder ausgewählt. - + Ok @@ -1732,17 +1740,17 @@ The Connection Setup window shows a list of available servers. Server operators can optionally list their servers by music genre. Use the List dropdown to select a genre, click on the server you want to join and press the Connect button to connect to it. Alternatively, double click on on the server name. Permanent servers (those that have been listed for longer than 48 hours) are shown in bold. - + Die Serverliste zeigt eine Liste von verfügbaren Server, die sich am Zentralserver registriert haben. Markiere einen Server von der Liste und drücke den Knopf Verbinden um eine Verbindung zu dem Server aufzubauen. Alternativ kann man auch den Server in der Liste direkt doppelklicken. Wenn ein Server belegt ist, dann wird eine Liste der verbundenen Musikern angezeigt. Server, die länger online sind (permanente Server) werden in Fettschrift dargestellt. If you know the IP address or URL of a server, you can connect to it using the Server name/Address field. An optional port number can be added after the IP address or URL using a colon as a separator, e.g, example.org: - + Die IP-Adresse oder URL des Servers, auf der die Serversoftware läuft wird hier angegeben. Optional kann eine Portnummer angefügt werden. Diese wird hinter der IP-Adresse durch ein Doppelpunkt getrennt angegeben. Beispiel: example.org: . The field will also show a list of the most recently used server addresses. - + . Eine Liste der letzten IP-Adressen oder URLs wird gespeichert und kann nachträglich wieder ausgewählt werden. @@ -2093,8 +2101,12 @@ Schreibe den Namen oder Alias hier rein so dass die anderen Musikern mit denen du spielst wissen wer du bist. Zusätzlich kannst du dein Instrument auswählen und eine Flagge des Landes auswählen in dem du dich befindest. Deine Stadt und deine Spielstärke des Instruments kannst du ebenso angeben. - 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. + Was man hier sieht wird auch am Fader im Mixer angezeigt, wenn du mit einem Server verbunden bist. Dieses Schild wird auch bei allen anderen Musikern, die mit dem gleichen Server verbunden sind, angezeigt. + + + + 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. Was man hier sieht wird auch am Fader im Mixer angezeigt, wenn du mit einem Server verbunden bist. Dieses Schild wird auch bei allen anderen Musikern, die mit dem gleichen Server verbunden sind, angezeigt. @@ -2307,6 +2319,11 @@ Bass Ukulele + + + No Name + Kein Name + CServerDlg @@ -2394,12 +2411,12 @@ 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. - + Wenn diese Funktion angehakt ist, dann wird der Server automatisch mit dem Betriebssystemstart geladen und erscheint minimiert in der Systemleiste als Icon. If the Make My Server Public check box is checked, this server registers itself at the central server so that all users of the application can see the server in the connect dialog server list and connect to it. The registration of the server is renewed periodically to make sure that all servers in the connect dialog server list are actually available. - + Mit dieser Funktion wird der eigene Server in der Serverliste des Zentralservers registriert so dass alle anderen Applikationsnutzer den Server in der Liste sehen können und sich mit ihm verbinden können. Die Registrierung mit dem Zentralserver wird periodisch erneuert um sicherzugehen, dass alle registrierten Server auch wirklich erreichbar sind. @@ -2437,152 +2454,156 @@ Servername - 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. - Der Servername identifiziert deinen Server in der Serverliste. Falls kein Name angegeben wurde, dann wird die IP-Adresse stattdessen angezeigt. + Der Servername identifiziert deinen Server in der Serverliste. Falls kein Name angegeben wurde, dann wird die IP-Adresse stattdessen angezeigt. - + + The server name identifies your server in the connect dialog server list at the clients. + Der Servername identifiziert deinen Server in der Serverliste. + + + Server name line edit Servername Eingabefeld - + Location City Standort Stadt - + 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. Hier kann man die Stadt angeben, in der sich der Server befindet. Falls eine Stadt angegeben wurde, dann wird die in der Serverliste angezeigt. - + City where the server is located line edit Stadt in der sich der Server befindet Eingabefeld - + Location country Standort Land - + 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. Hier kann man das Land eingeben, in dem sich der Server befindet. Falls ein Land angegeben wurde, dann wird das in der Serverliste angezeigt. - + Country where the server is located combo box Land in dem sich der Server befindet Auswahlbox - + Checkbox to turn on or off server recording - + Schalter zum aktivieren oder deaktivieren der Aufnahmefunktion + + + + Enable Recorder + Aktiviere die Aufnahmefunktion - Enable Recorder - + Checked when the recorder is enabled, otherwise unchecked. The recorder will run when a session is in progress, if (set up correctly and) enabled. + Angehakt, wenn die Aufnahmefunktion aktiviert ist. Die Aufnahme wird automatisch gestartet, wenn eine Jam-Session läuft. - - Checked when the recorder is enabled, otherwise unchecked. The recorder will run when a session is in progress, if (set up correctly and) enabled. - + + Current session directory text box (read-only) + Aktuelle Session Checkbox - Current session directory text box (read-only) - + Current Session Directory + Verzeichnisname für das Speichern der Aufnahmen - Current Session Directory - + Enabled during recording and holds the current recording session directory. Disabled after recording or when the recorder is not enabled. + Wenn die Aufnahmefunktion aktiviert ist, dann kann das Verzeichnis ausgewählt werden, in dem die Aufnahmen gespeichert werden. - - Enabled during recording and holds the current recording session directory. Disabled after recording or when the recorder is not enabled. - + + Recorder status label + Recorder Statusanzeige - Recorder status label - + Recorder Status + Aufnahmestatus - Recorder Status - + Displays the current status of the recorder. + Zeigt den Aufnahmestatus an. - - Displays the current status of the recorder. - + + Request new recording button + Anfordern einer neuen Aufnahme - Request new recording button - + New Recording + Neue Aufnahme - New Recording - - - - During a recording session, the button can be used to start a new recording. - + Mit diesem Knopf kann man die Aufnahme neu starten (d.h. es wird eine neue Aufnahmedatei angelegt). - - + + E&xit &Beenden - + &Hide &Ausblenden vom - - - + + + server Server - + &Open Ö&ffne den - + server Server - + Predefined Address Vordefinierte Adresse - + Recording - + Aufnahme - + Not recording - + Keine Aufnahme - + Not enabled - + Nicht aktiviert Manual @@ -2597,12 +2618,12 @@ Standard (Nordamerika) - + Server - + &Window &Fenster @@ -2713,17 +2734,17 @@ Enable jam recorder - + Aktivere die Aufnahme New recording - + Neue Aufnahme Recordings folder - + Verzeichnis für die Aufnahmen diff --git a/src/res/translation/translation_es_ES.qm b/src/res/translation/translation_es_ES.qm index c0529b97..d418ab75 100644 Binary files a/src/res/translation/translation_es_ES.qm 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 index b40d798e..715f335e 100644 --- a/src/res/translation/translation_es_ES.ts +++ b/src/res/translation/translation_es_ES.ts @@ -641,6 +641,11 @@ Green Verde + + + The delay is perfect for a jam session. + + Yellow @@ -671,9 +676,8 @@ Muestra el estado actual del retardo de audio: - The delay is perfect for a jam session - El retardo es perfecto para una jam session + El retardo es perfecto para una jam session @@ -1211,12 +1215,12 @@ En el caso del modo estéreo, no estará disponible la selección de canal para el efecto de reverberación en la ventana principal puesto que en este caso el efecto se aplicará a ambos canales. - + Audio channels combo box Selección canales audio - + Audio Quality Calidad Audio @@ -1225,12 +1229,12 @@ Selecciona la calidad de audio deseada. Se puede seleccionar una calidad baja, normal o alta. Cuanto mayor la calidad del audio, mayor la tasa de transferencia de datos de audio. Asegúrate de que la tasa de subida no excede el ancho de banda disponible en tu conexión a internet. - + Audio quality combo box Selección calidad audio - + New Client Level Nivel Cliente Nuevo @@ -1239,12 +1243,12 @@ La configuración del nivel de clientes nuevos define el nivel del fader para una nueva conexión expresado en un porcentaje. Esto es, si un cliente nuevo se conecta al servidor actual, su fader tomará el valor especificado si no se ha guardado ningún valor de una conexión anterior de ese cliente. - + New client level edit box Campo para nivel nuevo cliente - + Custom Central Server Address Dirección Personalizada Servidor Central @@ -1265,12 +1269,12 @@ Selección servidor central - + Central server address line edit Dirección servidor central - + Current Connection Status Parameter Parámetro Estado Conexión Actual @@ -1287,35 +1291,40 @@ La tasa de subida depende del tamaño actual de paquetes de audio y la configuración de compresión de audio. Asegúrate de que la tasa de subida no es mayor que la tasa disponible (comprueba la tasa de subida de tu conexión a internet, por ej. con speedtest.net). - + If this LED indicator turns red, you will not have much fun using the Si este indicador LED se vuelve rojo, no te divertirás demasiado utilizando el software - + software. . - + ASIO Setup Configuración ASIO - + Mono Mono - + + mode will increase your stream's data rate. Make sure your upload rate does not exceed the available upload speed of your internet connection. + + + + Mono-in/Stereo-out Entrada mono/Salida estéreo - + Stereo Estéreo @@ -1405,57 +1414,56 @@ Habilitar el modo - mode will increase your stream's data rate. Make sure your upload rate does not exceed the available upload speed of your internet connection. - aumentará la tasa de datos. Asegúrate de que tu tasa de subida no excede el valor de subida disponible con tu ancho de banda de Internet. + aumentará la tasa de datos. Asegúrate de que tu tasa de subida no excede el valor de subida disponible con tu ancho de banda de Internet. - + 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. En modo estéreo, no habrá ninguna selección de canal para el efecto de reverb en la ventana principal porque el efecto se aplica a ambos canales en este caso. - + 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. Cuanto mayor la calidad del audio, mayor la tasa de subida del audio. Asegúrate de que tu tasa de subida no excede el ancho de banda de tu conexión a Internet. - + 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. Este ajuste define el nivel del fader de una nueva conexión de cliente, en porcentaje. Si se conecta un nuevo cliente al servidor actual, el nivel inicial de su fader tomará este valor si no se ha especificado anteriormente un valor para ese cliente de una conexión anterior. - + Leave this blank unless you need to enter the address of a central server other than the default. Deja esto en blanco a menos que necesites escribir la dirección de un servidor distinto a los que hay por defecto. - + 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 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. El Ping es el tiempo que requiere el flujo de audio para viajar desde el cliente al servidor y volver. Este retardo lo determina la red y debería ser de unos 20-30 ms. Si este retardo es de unos 50 ms, la distancia al servidor es demasiado grande o tu conexión a internet no es óptima. - + Overall Delay is calculated from the current Ping Time and the delay introduced by the current buffer settings. El Retardo Total se calcula con el Ping actual y el retardo ocasionado por la configuración de buffers. - + 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. La Tasa de Subida de Audio depende del tamaño actual de paquetes de audio y la configuración de compresión de audio. Asegúrate de que la tasa de subida no es mayor que la velocidad de subida disponible (comprueba la tasa de subida de tu conexión a internet, por ej. con speedtest.net). - + Low Baja - + Normal Normal - + High Alta @@ -1502,23 +1510,23 @@ Por defecto (Norteamérica) - + preferred aconsejado - - + + Size: Tamaño: - + Buffer Delay Retardo Buffer - + Buffer Delay: Retardo Buffer: @@ -1527,17 +1535,17 @@ Dirección Preestablecida - + The selected audio device could not be used because of the following error: El dispositivo de audio seleccionado no puede utilizarse a causa del siguiente error: - + The previous driver will be selected. Se utilizará el driver anterior. - + Ok Ok @@ -2113,9 +2121,13 @@ Escribe tu nombre o alias aquí para que otros músicos con quien quieras tocar te reconozcan. Puedes además añadir una imagen del instrumento que tocas y la bandera del país donde vives. La ciudad donde vives y tu nivel de habilidad con el instrumento también pueden añadirse. - 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. - Lo que introduzcas aquí aparecerá en tu fader del mezclador cuando te conectes a un servidor. Esta etiqueta también se mostrará en cada cliente conectado al mismo servidor que tú. Si se deja el nombre vacío, se muestra la dirección IP en su lugar. + Lo que introduzcas aquí aparecerá en tu fader del mezclador cuando te conectes a un servidor. Esta etiqueta también se mostrará en cada cliente conectado al mismo servidor que tú. Si se deja el nombre vacío, se muestra la dirección IP en su lugar. + + + + 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. + @@ -2327,6 +2339,11 @@ Bass Ukulele Ukulele Barítono + + + No Name + + CServerDlg @@ -2453,150 +2470,154 @@ Nombre Servidor - 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. - El nombre del servidor identifica a tu servidor en la lista de conexión de servidores de los clientes. Si no se especifica un nombre, se muestra la dirección IP en su lugar. + El nombre del servidor identifica a tu servidor en la lista de conexión de servidores de los clientes. Si no se especifica un nombre, se muestra la dirección IP en su lugar. - + + The server name identifies your server in the connect dialog server list at the clients. + + + + Server name line edit Nombre del servidor - + Location City Ubicación Ciudad - + 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. Aquí se puede especificar la ciudad en donde se ubica el servidor. Si se introduce una ciudad, se mostrará en la lista de conexión de servidores de los clientes. - + City where the server is located line edit Ciudad en donde se encuentra en servidor - + Location country Ubicación país - + 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. Aquí se puede especificar el país en donde se ubica el servidor. Si se introduce un país, se mostrará en la lista de conexión de servidores de los clientes. - + Country where the server is located combo box País en donde se encuentra el servidor - + Checkbox to turn on or off server recording Campo para activar/desactivar la grabación desde el servidor - + Enable Recorder Habilitar Grabación - + Checked when the recorder is enabled, otherwise unchecked. The recorder will run when a session is in progress, if (set up correctly and) enabled. Activado cuando la grabación está habilitada. La grabación se ejecutará cuando una sesión esté en marcha, si está habilitada (y correctamente configurada). - + Current session directory text box (read-only) Campo para directorio sesión actual (solo lectura) - + Current Session Directory Directorio Sesión Actual - + Enabled during recording and holds the current recording session directory. Disabled after recording or when the recorder is not enabled. Habilitado durante la grabación y guarda el directorio actual de grabación, Deshabilitado tras la grabación o cuando la grabación no está habilitada. - + Recorder status label Etiqueta estado grabación - + Recorder Status Estado Grabación - + Displays the current status of the recorder. Muestra el estado actual de la grabación. - + Request new recording button Botón Solicitar nueva grabación - + New Recording Nueva Grabación - + During a recording session, the button can be used to start a new recording. Durante una sesión de grabación, el botón puede utilizarse para comenzar una nueva grabación. - - + + E&xit S&alir - + &Hide &Ocultar servidor - - - + + + server - + &Open &Abrir servidor - + server - + Predefined Address Dirección Preestablecida - + Recording Grabando - + Not recording No grabando - + Not enabled No habilitado @@ -2613,12 +2634,12 @@ Por defecto (Norteamérica) - + Server : Servidor - + &Window &Ventana diff --git a/src/res/translation/translation_fr_FR.qm b/src/res/translation/translation_fr_FR.qm index 04215a18..96748789 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 b782bb76..97dd67c7 100644 --- a/src/res/translation/translation_fr_FR.ts +++ b/src/res/translation/translation_fr_FR.ts @@ -645,6 +645,11 @@ Green + + + The delay is perfect for a jam session. + + Yellow @@ -670,11 +675,6 @@ Shows the current audio delay status: - - - The delay is perfect for a jam session - - A session is still possible but it may be harder to play. @@ -1219,12 +1219,12 @@ Dans le cas du mode de streaming stéréo, aucune sélection de canal audio pour l'effet de réverbération ne sera disponible dans la fenêtre principale puisque l'effet est appliqué sur les deux canaux dans ce cas. - + Audio channels combo box Choix déroulant de canaux audio - + Audio Quality Qualité audio @@ -1233,12 +1233,12 @@ Sélectionnez la qualité audio souhaitée. Une qualité audio faible, normale ou élevée peut être sélectionnée. Plus la qualité audio est élevée, plus le débit de données du flux audio est élevé. Assurez-vous que le débit montant actuel ne dépasse pas la bande passante disponible de votre connexion internet. - + Audio quality combo box Choix déroulant de qualité audio - + New Client Level Niveau de nouveau client @@ -1247,12 +1247,12 @@ Le paramètre de niveau de nouveau client définit le niveau de chariot d'un client nouvellement connecté en pourcentage. C'est-à-dire que si un nouveau client se connecte au serveur actuel, il aura le niveau de chariot initial spécifié si aucun autre niveau de chariot d'une connexion précédente de ce client n'était déjà stocké. - + New client level edit box Dialogue d'édition de niveau de nouveau client - + Custom Central Server Address Adresse personnalisée du serveur central @@ -1273,12 +1273,12 @@ Choix déroulant de type de serveur central par défaut - + Central server address line edit Ligne d'édition pour l'adresse du serveur central - + Current Connection Status Parameter Paramètre de l'état de la connexion actuelle @@ -1295,35 +1295,40 @@ Le débit montant dépend de la taille actuelle du paquet audio et du réglage de la compression audio. Assurez-vous que le débit montant n'est pas supérieur au débit disponible (vérifiez les capacités montant de votre connexion internet en utilisant, par exemple, speedtest.net). - + If this LED indicator turns red, you will not have much fun using the Si ce voyant devient rouge, vous n'aurez pas beaucoup de plaisir à utiliser le logiciel - + software. . - + ASIO Setup Paramètres ASIO - + Mono Mono - + + mode will increase your stream's data rate. Make sure your upload rate does not exceed the available upload speed of your internet connection. + + + + Mono-in/Stereo-out Mono-entrée/stéréo-sortie - + Stereo Stéréo @@ -1413,57 +1418,52 @@ - - mode will increase your stream's data rate. Make sure your upload rate does not exceed the available upload speed of your internet connection. - - - - + 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. - + 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. - + 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. - + Leave this blank unless you need to enter the address of a central server other than the default. - + 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 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. - + Overall Delay is calculated from the current Ping Time and the delay introduced by the current buffer settings. - + 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. - + Low Basse - + Normal Normale - + High Haute @@ -1510,23 +1510,23 @@ Défaut (Amérique du Nord) - + preferred préféré - - + + Size: Taille : - + Buffer Delay Délai de temporisation - + Buffer Delay: Délai de temporisation : @@ -1535,17 +1535,17 @@ Adresse prédéfinie - + The selected audio device could not be used because of the following error: Le périphérique audio sélectionné n'a pas pu être utilisé en raison de l'erreur suivante : - + The previous driver will be selected. Le pilote précédent sera sélectionné. - + Ok Ok @@ -2114,7 +2114,7 @@ - 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. + 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. @@ -2327,6 +2327,11 @@ Bass Ukulele + + + No Name + + CServerDlg @@ -2453,150 +2458,154 @@ Nom du serveur - 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. - Le nom du serveur identifie votre serveur dans la liste des serveurs du dialogue de connexion chez les clients. Si aucun nom n'est donné, l'adresse IP est affichée à la place. + Le nom du serveur identifie votre serveur dans la liste des serveurs du dialogue de connexion chez les clients. Si aucun nom n'est donné, l'adresse IP est affichée à la place. - + + The server name identifies your server in the connect dialog server list at the clients. + + + + Server name line edit Ligne d'édition pour le nom du serveur - + Location City Ville de localisation - + 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. La ville dans laquelle ce serveur est situé peut être définie ici. Si un nom de ville est saisi, il sera affiché dans la liste des serveurs du dialogue de connexion chez les clients. - + City where the server is located line edit Ligne d'édition pour la ville où est situé le serveur - + Location country Pays de localisation - + 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. Le pays dans lequel ce serveur est situé peut être défini ici. Si un pays est saisi, il sera affiché dans la liste des serveurs du dialogue de connexion chez les clients. - + Country where the server is located combo box Choix déroulant du pays où le serveur est situé - + Checkbox to turn on or off server recording - + Enable Recorder - + Checked when the recorder is enabled, otherwise unchecked. The recorder will run when a session is in progress, if (set up correctly and) enabled. - + Current session directory text box (read-only) - + Current Session Directory - + Enabled during recording and holds the current recording session directory. Disabled after recording or when the recorder is not enabled. - + Recorder status label - + Recorder Status - + Displays the current status of the recorder. - + Request new recording button - + New Recording - + During a recording session, the button can be used to start a new recording. - - + + E&xit &Quitter - + &Hide Cac&hé - - - + + + server serveur - + &Open &Ouvrir - + server serveur - + Predefined Address Adresse prédéfinie - + Recording - + Not recording - + Not enabled @@ -2613,12 +2622,12 @@ Défaut (Amérique du nord) - + Server serveur - + &Window &Fenêtre diff --git a/src/res/translation/translation_it_IT.qm b/src/res/translation/translation_it_IT.qm index 58b2a56c..4c02deca 100644 Binary files a/src/res/translation/translation_it_IT.qm and b/src/res/translation/translation_it_IT.qm differ diff --git a/src/res/translation/translation_it_IT.ts b/src/res/translation/translation_it_IT.ts index 7134bdd7..51905b57 100644 --- a/src/res/translation/translation_it_IT.ts +++ b/src/res/translation/translation_it_IT.ts @@ -705,6 +705,11 @@ Green + + + The delay is perfect for a jam session. + + Yellow @@ -725,11 +730,6 @@ Shows the current audio delay status: - - - The delay is perfect for a jam session - - A session is still possible but it may be harder to play. @@ -1195,12 +1195,12 @@ Nel caso in cui si una lo streaming stereo, non sarà possibile selezionare su quale canale far intervenire il riverbero inquanto sarà applicato ad entrambi i canali Left e Right. - + Audio channels combo box Combo Box Canali Audio - + Audio Quality Qualità Audio @@ -1209,12 +1209,12 @@ Selezionare la qualità audio desiderata. Si può scegliere tra Low (Bassa), normal (standard), high (Alta). Maggiore è la qualità settata più alto sarà il valore di streaming audio. Accertarsi di avere sufficiente banda in upload. - + Audio quality combo box Combo Box Qualità Audio - + New Client Level Livello Volume Nuovo Client @@ -1223,12 +1223,12 @@ Settare il livello per il nuovo client definisce il livello, in percentuale, di ingresso per un nuovo utente che si connette. Un nuovo client che si connette alla sessione assume un volume uguale a quello settato se non ci sono livelli memorizzati per questo client in precedenti connessioni con lo stesso. - + New client level edit box Box per modificare il livello di ingresso di un nuovo client - + Custom Central Server Address Indirizzo personalizzato del Server Centrale @@ -1249,12 +1249,12 @@ Box per l'indirizzo del Server Centrale - + Central server address line edit Modifica indirizzo Server Centrale - + Current Connection Status Parameter Parametri attuali di connessione @@ -1271,35 +1271,40 @@ La velocità di trasferimento dati in upload dipende dalla dimensione dei pacchetti audio e dai settaggi di compressione dell'audio. Assicurarsi di non usare valori di upstream non adeguati alla propria connessione (è possibile verificare tali valori mediante un test sulla propria connessione, usando per esempio il sito speedtest.net). - + If this LED indicator turns red, you will not have much fun using the Se questo indicatore a LED diventa rosso non si godrà di un esperienza ottimale del programma - + software. . - + ASIO Setup ASIO Setup - + Mono Mono - + + mode will increase your stream's data rate. Make sure your upload rate does not exceed the available upload speed of your internet connection. + + + + Mono-in/Stereo-out Mono-in/Stereo-out - + Stereo Stereo @@ -1389,78 +1394,73 @@ - - mode will increase your stream's data rate. Make sure your upload rate does not exceed the available upload speed of your internet connection. - - - - + 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. - + 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. - + 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. - + Leave this blank unless you need to enter the address of a central server other than the default. - + 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 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. - + Overall Delay is calculated from the current Ping Time and the delay introduced by the current buffer settings. - + 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. - + Low Low - + Normal Normal - + High High - + preferred consigliato - - + + Size: Livello: - + Buffer Delay Buffer Delay - + Buffer Delay: Buffer Delay: @@ -1469,17 +1469,17 @@ Indirizzo Preferito - + The selected audio device could not be used because of the following error: La scheda audio selezionata non può essere usata per i seguenti motivi: - + The previous driver will be selected. Sarà ripristinato il driver precedentemente usato. - + Ok Ok @@ -2053,7 +2053,7 @@ - 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. + 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. @@ -2291,6 +2291,11 @@ Bass Ukulele + + + No Name + + CServerDlg @@ -2417,160 +2422,164 @@ Nome del server - 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. - Il nome del server identifica il tuo server nell'elenco dei server sul client. Se non viene specificato un nome, viene invece visualizzato l'indirizzo IP. + Il nome del server identifica il tuo server nell'elenco dei server sul client. Se non viene specificato un nome, viene invece visualizzato l'indirizzo IP. - + + The server name identifies your server in the connect dialog server list at the clients. + + + + Server name line edit Nome del server - + Location City Ubicazione Città - + 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. Qui è possibile specificare la città in cui si trova il server. Se viene inserita una città, verrà visualizzata nell'elenco dei server sul client. - + City where the server is located line edit Citta del Server - + Location country Ubicazione Paese - + 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. Qui è possibile specificare il paese in cui si trova il server. Se viene inserito un paese, verrà visualizzato nell'elenco dei server sul client. - + Country where the server is located combo box Box del Paese dove si trova il server - + Checkbox to turn on or off server recording - + Enable Recorder - + Checked when the recorder is enabled, otherwise unchecked. The recorder will run when a session is in progress, if (set up correctly and) enabled. - + Current session directory text box (read-only) - + Current Session Directory - + Enabled during recording and holds the current recording session directory. Disabled after recording or when the recorder is not enabled. - + Recorder status label - + Recorder Status - + Displays the current status of the recorder. - + Request new recording button - + New Recording - + During a recording session, the button can be used to start a new recording. - - + + E&xit &Esci - + &Hide &Nascondi - - - + + + server server - + &Open &Apri - + server server - + Server Server - + &Window &Finestra - + Predefined Address Indirizzo Predefinito - + Recording - + Not recording - + Not enabled diff --git a/src/res/translation/translation_nl_NL.qm b/src/res/translation/translation_nl_NL.qm index de32b094..947037da 100644 Binary files a/src/res/translation/translation_nl_NL.qm and b/src/res/translation/translation_nl_NL.qm differ diff --git a/src/res/translation/translation_nl_NL.ts b/src/res/translation/translation_nl_NL.ts index 68e3ecb6..fc317978 100644 --- a/src/res/translation/translation_nl_NL.ts +++ b/src/res/translation/translation_nl_NL.ts @@ -697,6 +697,11 @@ Green + + + The delay is perfect for a jam session. + + Yellow @@ -717,11 +722,6 @@ Shows the current audio delay status: - - - The delay is perfect for a jam session - - A session is still possible but it may be harder to play. @@ -1187,12 +1187,12 @@ In het geval van de stereo streaming-mode is er geen audiokanaalselectie voor het galmeffect beschikbaar op het hoofdvenster, aangezien het effect in dit geval op beide kanalen wordt toegepast. - + Audio channels combo box Audiokanalen combo-box - + Audio Quality Audiokwaliteit @@ -1201,12 +1201,12 @@ Selecteer de gewenste audiokwaliteit. Er kan een lage, normale of hoge audiokwaliteit worden geselecteerd. Hoe hoger de audiokwaliteit, hoe meer audiodata moet worden verstuurd. Zorg ervoor dat de vereiste bandbreedte niet hoger is dan de beschikbare bandbreedte van uw internetverbinding. - + Audio quality combo box Audiokwaliteit combo-box - + New Client Level Nieuw clientniveau @@ -1215,12 +1215,12 @@ De nieuwe instelling van het clientniveau definieert het faderniveau van een nieuwe verbonden client in procenten. D.w.z. als een nieuwe client verbinding maakt met de server, krijgt hij het opgegeven initiële faderniveau als er in de vorige verbinding niets is opgeslagen. - + New client level edit box Nieuw bewerkingsvak op clientniveau - + Custom Central Server Address @@ -1237,12 +1237,12 @@ Centraal serveradrestype combo box - + Central server address line edit Centraal serveradres bewerking van de lijn - + Current Connection Status Parameter Huidige verbindingsstatus-parameter @@ -1259,35 +1259,40 @@ De upstreamsnelheid is afhankelijk van de huidige grootte van het audiopakket en de instelling van de audiocompressie. Zorg ervoor dat de upstreamsnelheid niet hoger is dan de beschikbare snelheid (controleer de upstreammogelijkheden van uw internetverbinding door bijvoorbeeld speedtest.net te gebruiken). - + If this LED indicator turns red, you will not have much fun using the Als deze LED-indicator rood wordt, zult u niet veel plezier beleven aan het gebruik van de - + software. software. - + ASIO Setup ASIO-instelling - + Mono Mono - + + mode will increase your stream's data rate. Make sure your upload rate does not exceed the available upload speed of your internet connection. + + + + Mono-in/Stereo-out Mono-in/Stereo-out - + Stereo Stereo @@ -1377,57 +1382,52 @@ - - mode will increase your stream's data rate. Make sure your upload rate does not exceed the available upload speed of your internet connection. - - - - + 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. - + 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. - + 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. - + Leave this blank unless you need to enter the address of a central server other than the default. - + 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 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. - + Overall Delay is calculated from the current Ping Time and the delay introduced by the current buffer settings. - + 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. - + Low Laag - + Normal Normaal - + High Hoog @@ -1470,38 +1470,38 @@ Standaard (Noord-Amerika) - + preferred gewenst - - + + Size: Size: - + Buffer Delay Buffervertraging - + Buffer Delay: Buffervertraging: - + The selected audio device could not be used because of the following error: Het geselecteerde audioapparaat kon niet worden gebruikt vanwege de volgende fout: - + The previous driver will be selected. Het vorige stuurprogramma wordt geselecteerd. - + Ok Ok @@ -2045,7 +2045,7 @@ - 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. + 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. @@ -2283,6 +2283,11 @@ Bass Ukulele + + + No Name + + CServerDlg @@ -2409,150 +2414,154 @@ Servernaam - 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. - De naam van de server identificeert uw server in de lijst van de connect-dialoog-server bij de clients. Als er geen naam wordt gegeven, wordt in plaats daarvan het IP-adres getoond. + De naam van de server identificeert uw server in de lijst van de connect-dialoog-server bij de clients. Als er geen naam wordt gegeven, wordt in plaats daarvan het IP-adres getoond. - + + The server name identifies your server in the connect dialog server list at the clients. + + + + Server name line edit Servernaam lijnbewerking - + Location City Locatie Stad - + 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. De stad waar deze server zich bevindt kan hier worden ingesteld. Als er een plaatsnaam wordt ingevoerd, wordt deze getoond in de lijst van de connect-dialoog-server bij de clients. - + City where the server is located line edit Stad waar de server zich bevindt lijnbewerking - + Location country Land van locatie - + 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. Het land waarin deze server zich bevindt kan hier worden ingesteld. Als er een land is ingevoerd, wordt dit getoond in de lijst van de verbindingsserver bij de clients. - + Country where the server is located combo box Land waar de server zich bevindt combo box - + Checkbox to turn on or off server recording - + Enable Recorder - + Checked when the recorder is enabled, otherwise unchecked. The recorder will run when a session is in progress, if (set up correctly and) enabled. - + Current session directory text box (read-only) - + Current Session Directory - + Enabled during recording and holds the current recording session directory. Disabled after recording or when the recorder is not enabled. - + Recorder status label - + Recorder Status - + Displays the current status of the recorder. - + Request new recording button - + New Recording - + During a recording session, the button can be used to start a new recording. - - + + E&xit &Sluiten - + &Hide Verbergen - - - + + + server server - + &Open &Open - + server server - + Predefined Address - + Recording - + Not recording - + Not enabled @@ -2569,12 +2578,12 @@ Standaard (Noord-Amerika) - + Server Server - + &Window &Window diff --git a/src/res/translation/translation_pl_PL.qm b/src/res/translation/translation_pl_PL.qm new file mode 100755 index 00000000..384db547 Binary files /dev/null and b/src/res/translation/translation_pl_PL.qm differ diff --git a/src/res/translation/translation_pl_PL.ts b/src/res/translation/translation_pl_PL.ts new file mode 100644 index 00000000..9521afb6 --- /dev/null +++ b/src/res/translation/translation_pl_PL.ts @@ -0,0 +1,2566 @@ + + + + + CAboutDlg + + + Qt cross-platform application framework + + + + + Audio reverberation code by Perry R. Cook and Gary P. Scavone + + + + + Some pixmaps are from the + + + + + This app 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. + + + + + This app uses the following libraries, resources or code snippets: + + + + + Country flag icons by Mark James + + + + + For details on the contributions check out the + + + + + Github Contributors list + + + + + Spanish + + + + + French + + + + + Portuguese + + + + + Dutch + + + + + Italian + + + + + German + + + + + About + + + + + , Version + + + + + Internet Jam Session Software + + + + + Released under the GNU General Public License (GPL) + + + + + CAboutDlgBase + + + About + + + + + TextLabelVersion + + + + + Copyright (C) 2005-2020 Volker Fischer and others + + + + + A&bout + + + + + &Libraries + + + + + &Contributors + + + + + &Translation + + + + + &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 + + + + + Personal Mix at the Server: + + + + + CChannelFader + + + + Pan + + + + + + + Mute + + + + + + + Solo + + + + + Channel Level + + + + + Input level of the current audio channel at the server + + + + + Mixer Fader + + + + + Local mix level setting of the current audio channel at the server + + + + + Status Indicator + + + + + Shows a status indication about the client which is assigned to this channel. Supported indicators are: + + + + + Status indicator label + + + + + Panning + + + + + Local panning position of the current audio channel at the server + + + + + With the Mute checkbox, the audio channel can be muted. + + + + + Mute button + + + + + Solo button + + + + + Fader Tag + + + + + 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. + + + + + 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. + + + + + Speaker with cancellation stroke: Indicates that another client has muted you. + + + + + Sets the pan from Left to Right of the channel. Works only in stereo or preferably mono in/stereo out mode. + + + + + With the Solo checkbox, the audio channel can be set to solo which means that all other channels except the soloed channel are muted. It is possible to set more than one channel to solo. + + + + + The fader tag 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. + + + + + Mixer channel instrument picture + + + + + Mixer channel label (fader tag) + + + + + Mixer channel country flag + + + + + PAN + + + + + MUTE + + + + + SOLO + + + + + Alias/Name + + + + + Instrument + + + + + Location + + + + + + + Skill Level + + + + + Beginner + + + + + Intermediate + + + + + Expert + + + + + Musician Profile + + + + + CChatDlg + + + Chat Window + + + + + The chat window shows a history of all chat messages. + + + + + Chat history + + + + + Input Message Text + + + + + 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 + + + Input Level Meter + + + + + Make sure not to clip the input signal to avoid distortions of the audio signal. + + + + + Input level meter + + + + + Simulates an analog LED level meter. + + + + + Connect/Disconnect Button + + + + + Connect and disconnect toggle button + + + + + Local Audio Input Fader + + + + + + L + + + + + , where + + + + + is the current attenuation indicator. + + + + + Local audio input fader (left/right) + + + + + Delay Status LED + + + + + Delay status LED indicator + + + + + Buffers Status LED + + + + + The network jitter buffer is not large enough for the current network/audio interface jitter. + + + + + This shows the level of the two stereo channels for your audio input. + + + + + If the application is connected to a server and you play your instrument/sing into the microphone, the VU 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. + + + + + For proper usage of the application, you should not hear your singing/instrument through 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 (not the Recording mixer!). + + + + + Opens a dialog where you can select a server to connect to. If you are connected, pressing this button will end the session. + + + + + 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 application. + + + + + Controls the relative levels of the left and right local audio channels. For a mono signal it acts as a pan between the two channels.For example, if 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 + + + + + Reverb effect + + + + + Reverb can be applied to one local mono audio channel or to both channels in stereo mode. The mono channel selection and the reverb level can be modified. For example, if a microphone signal is fed in to the right audio channel of the sound card and a reverb effect needs to be applied, set the channel selector to right and move the fader upwards until the desired reverb level is reached. + + + + + Reverb effect level setting + + + + + Reverb Channel Selection + + + + + With these radio buttons the audio input channel on which the reverb effect is applied can be chosen. Either the left or right input channel can be selected. + + + + + Left channel selection for reverb + + + + + Right channel selection for reverb + + + + + Shows the current audio delay status: + + + + + Green + + + + + The delay is perfect for a jam session. + + + + + Yellow + + + + + A session is still possible but it may be harder to play. + + + + + Red + + + + + The delay is too large for jamming. + + + + + If this LED indicator turns red, you will not have much fun using the application. + + + + + The buffers status LED shows the current audio/streaming status. If the light is red, the audio stream is interrupted. This is caused by one of the following problems: + + + + + The sound card's buffer delay (buffer size) is too small (see Settings window). + + + + + The upload or download stream rate is too high for your internet bandwidth. + + + + + The CPU of the client or server is at 100%. + + + + + Buffers status LED indicator + + + + + + C&onnect + + + + + &View + + + + + &Connection Setup... + + + + + My &Profile... + + + + + C&hat... + + + + + &Settings... + + + + + &Analyzer Console... + + + + + E&xit + + + + + None + + + + + Center + + + + + R + + + + + Central Server + + + + + user + + + + + users + + + + + D&isconnect + + + + + CClientDlgBase + + + Delay + + + + + Buffers + + + + + Input + + + + + L + + + + + R + + + + + Settings + + + + + Chat + + + + + Mute Myself + + + + + C&onnect + + + + + Pan + + + + + Center + + + + + Reverb + + + + + Left + + + + + Right + + + + + CClientSettingsDlg + + + Jitter Buffer Size + + + + + The jitter buffer setting is therefore a trade-off between audio quality and overall delay. + + + + + Local jitter buffer slider control + + + + + Server jitter buffer slider control + + + + + Auto jitter buffer switch + + + + + Jitter buffer status LED indicator + + + + + Sound Card Device + + + + + 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. + + + + + 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 + + + + + If you are using the kX ASIO driver, make sure to connect the ASIO inputs in the kX DSP settings panel. + + + + + Sound Card Channel Mapping + + + + + 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 + + + + + Enable Small Network Buffers + + + + + 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 + + + + + Enable small network buffers check box + + + + + Sound Card Buffer Delay + + + + + Three buffer sizes are supported + + + + + The buffer setting is therefore a trade-off between audio quality and overall delay. + + + + + 128 samples setting radio button + + + + + 256 samples setting radio button + + + + + ASIO setup push button + + + + + Fancy Skin + + + + + If enabled, a fancy skin will be applied to the main window. + + + + + Fancy skin check box + + + + + Display Channel Levels + + + + + If enabled, each client channel will display a pre-fader level bar. + + + + + Display channel levels check box + + + + + Audio Channels + + + + + mode will increase your stream's data rate. Make sure your upload rate does not exceed the available upload speed of your internet connection. + + + + + Audio channels combo box + + + + + Audio Quality + + + + + Audio quality combo box + + + + + New Client Level + + + + + New client level edit box + + + + + Central server address line edit + + + + + Current Connection Status Parameter + + + + + If the ASIO4ALL 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. + + + + + If the selected sound card device offers more than one input or output channel, the Input Channel Mapping and Output Channel Mapping settings are visible. + + + + + samples. The smaller the network buffers, the lower the audio latency. But at the same time the network load increases and the probability of audio dropouts also increases. + + + + + 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 a red light in the status indicator (drop outs) and the higher the upload rate and the lower the overall delay. + + + + + 64 samples setting radio button + + + + + Custom Central Server Address + + + + + If this LED indicator turns red, you will not have much fun using the + + + + + software. + + + + + ASIO Setup + + + + + + Mono + + + + + Mono-in/Stereo-out + + + + + + + Stereo + + + + + The jitter buffer compensates for network and sound card timing jitters. The size of the buffer therefore influences the quality of the audio stream (how many dropouts occur) and the overall delay (the longer the buffer, the higher the delay). + + + + + 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 has taken place and the audio stream is interrupted. + + + + + If the Auto setting 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 Auto is enabled, the jitter buffer size faders are disabled (they cannot be moved with the mouse). + + + + + 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 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. + + + + + The buffer delay setting is a fundamental setting of this software. This setting has an influence on many connection properties. + + + + + 64 samples: The preferred setting. Provides the lowest latency but does not work with all sound cards. + + + + + 128 samples: Should work for most available sound cards. + + + + + 256 samples: Should only be used on very slow computers or with a slow internet connection. + + + + + Some sound card drivers do not allow the buffer delay to be changed 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. + + + + + If no buffer size is selected and all settings are disabled, an unsupported buffer size is used by the driver. The application will still work with this setting but with restricted performance. + + + + + 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. + + + + + Selects the number of audio channels to be used for communication between client and server. There are three modes available: + + + + + and + + + + + These modes use one and two audio channels respectively. + + + + + Mono in/Stereo-out + + + + + 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. In that case the two input signals can be mixed to one mono channel but the server mix is heard in stereo. + + + + + Enabling + + + + + 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. + + + + + 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. + + + + + 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. + + + + + Leave this blank unless you need to enter the address of a central server other than the default. + + + + + 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 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. + + + + + Overall Delay is calculated from the current Ping Time and the delay introduced by the current buffer settings. + + + + + 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. + + + + + Low + + + + + Normal + + + + + High + + + + + Custom + + + + + All Genres + + + + + Genre Rock + + + + + Genre Jazz + + + + + Genre Classical/Folk/Choir + + + + + Default + + + + + preferred + + + + + + 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 + + + + + Custom Central Server Address: + + + + + Audio Stream Rate + + + + + + + val + + + + + Ping Time + + + + + Overall Delay + + + + + CConnectDlg + + + Server List + + + + + Server list view + + + + + Server Address + + + + + The Connection Setup window shows a list of available servers. Server operators can optionally list their servers by music genre. Use the List dropdown to select a genre, click on the server you want to join and press the Connect button to connect to it. Alternatively, double click on on the server name. Permanent servers (those that have been listed for longer than 48 hours) are shown in bold. + + + + + If you know the IP address or URL of a server, you can connect to it using the Server name/Address field. An optional port number can be added after the IP address or URL using a colon as a separator, e.g, example.org: + + + + + . The field will also show a list of the most recently used server addresses. + + + + + Server address edit box + + + + + Holds the current server IP address or URL. It also stores old URLs in the combo box list. + + + + + Server List Selection + + + + + Selects the server list to be shown. + + + + + Server list selection combo box + + + + + Filter + + + + + The server list is filtered by the given text. Note that the filter is case insensitive. + + + + + Filter edit box + + + + + Show All Musicians + + + + + 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 + + + + + List + + + + + Filter + + + + + Show All Musicians + + + + + Server Name + + + + + Ping Time + + + + + Musicians + + + + + Location + + + + + Server Name/Address + + + + + C&ancel + + + + + &Connect + + + + + CHelpMenu + + + &Help + &Pomoc + + + + + 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 + + + + + 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 + + + + Musician Profile + + + + + Alias/Name + + + + + Instrument + + + + + Country + Kraj + + + + City + + + + + Skill + + + + + &Close + + + + + + + None + + + + + Beginner + + + + + Intermediate + + + + + Expert + + + + + 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. + + + + + 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. + + + + + Alias or name edit box + + + + + Instrument picture button + + + + + Country flag button + + + + + City edit box + + + + + Skill level combo box + + + + + 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 + + + + + Congas + + + + + Bongo + + + + + Vocal Bass + + + + + Vocal Tenor + + + + + Vocal Alto + + + + + Vocal Soprano + + + + + Banjo + + + + + Mandolin + + + + + Ukulele + + + + + Bass Ukulele + + + + + No Name + + + + + CServerDlg + + + Client List + + + + + 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 + + + + + Start Minimized on Operating System Start + + + + + Show Creative Commons Licence Dialog + + + + + If enabled, a Creative Commons BY-NC-SA 4.0 Licence dialog is shown each time a new user connects the server. + + + + + Make My Server Public + + + + + Register Server Status + + + + + If the Make My Server Public check box is checked, this will show whether registration with the central server is successful. If the registration failed, please choose another server list. + + + + + Custom Central Server Address + + + + + 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. + + + + + Central server address line edit + + + + + Server List Selection + + + + + Selects the server list (i.e. central server address) in which your server will be added. + + + + + Server list selection combo box + + + + + Server Name + + + + + Server name line edit + + + + + Location City + + + + + 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 + + + + + Location country + + + + + 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 + + + + + Checkbox to turn on or off server recording + + + + + Enable Recorder + + + + + Checked when the recorder is enabled, otherwise unchecked. The recorder will run when a session is in progress, if (set up correctly and) enabled. + + + + + Current session directory text box (read-only) + + + + + Current Session Directory + + + + + Enabled during recording and holds the current recording session directory. Disabled after recording or when the recorder is not enabled. + + + + + Recorder status label + + + + + Recorder Status + + + + + Displays the current status of the recorder. + + + + + Request new recording button + + + + + New Recording + + + + + During a recording session, the button can be used to start a new recording. + + + + + + E&xit + + + + + &Hide + + + + + + + server + + + + + &Open + + + + + server + + + + + Predefined Address + + + + + Recording + + + + + Not recording + + + + + Not enabled + + + + + Server + + + + + 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. + + + + + If the Make My Server Public check box is checked, this server registers itself at the central server so that all users of the application can see the server in the connect dialog server list and connect to it. The registration of the server is renewed periodically to make sure that all servers in the connect dialog server list are actually available. + + + + + The server name identifies your server in the connect dialog server list at the clients. + + + + + &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 + + + + + Custom Central Server Address: + + + + + My Server Info + + + + + Location: City + + + + + Location: Country + + + + + Enable jam recorder + + + + + New recording + + + + + Recordings folder + + + + + TextLabelNameVersion + + + + + CSound + + + Error closing stream: $s + + + + + 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: + + + + + You can use a tool like <i><a href=http://qjackctl.sourceforge.net>QJackCtl</a></i> to adjust the Jack server sample rate. + + + + + Make sure to set the Frames/Period to a low value like + + + + + 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 setting 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. + + + + + No ASIO audio device (driver) found. + + + + + The + + + + + software requires the low latency audio interface ASIO to work properly. This is not a 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 with this software. The selected audio device could not be used because of the following error: + + + + + Please restart the software. + + + + + Close + zamknij + + + + No usable + + + + + audio device (driver) found. + + + + + In the following there is a list of all available drivers with the associated error message: + + + + + Do you want to open the ASIO driver setups? + + + + + could not be started because of audio interface issues. + + + + + global + + + For more information use the What's This help (help menu, right mouse button or Shift+F1) + + + + diff --git a/src/res/translation/translation_pt_PT.qm b/src/res/translation/translation_pt_PT.qm index 2bc97eb8..ee0b9636 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 63c9c5aa..837767bb 100644 --- a/src/res/translation/translation_pt_PT.ts +++ b/src/res/translation/translation_pt_PT.ts @@ -641,6 +641,11 @@ Green + + + The delay is perfect for a jam session. + + Yellow @@ -666,11 +671,6 @@ Shows the current audio delay status: - - - The delay is perfect for a jam session - - A session is still possible but it may be harder to play. @@ -1207,12 +1207,12 @@ No modo de transmissão estéreo, nenhuma seleção de canal de áudio para o efeito de reverberação estará disponível na janela principal, pois o efeito é aplicado em ambos os canais. - + Audio channels combo box Seletor de canais áudio - + Audio Quality Qualidade de Áudio @@ -1221,12 +1221,12 @@ Selecione a qualidade de áudio desejada. Pode ser selecionada uma qualidade de áudio baixa, normal ou alta. Quanto maior a qualidade do áudio, maior a taxa de dados do fluxo de áudio. Verifique que a taxa de transmissão não excede a largura de banda disponível da sua ligação à Internet. - + Audio quality combo box Seletor de qualidade áudio - + New Client Level Nível de Novo Cliente @@ -1235,12 +1235,12 @@ A configuração de nível de novo cliente define, em percentagem, o nível do fader de um novo cliente ligado. Por exemplo, se um cliente novo se ligar ao servidor atual, o seu canal terá o nível inicial do fader especificado, excepto quando um diferente nível do fader de uma ligação anterior desse mesmo cliente já tenha sido definido. - + New client level edit box Caixa de edição no nível de novo cliente - + Custom Central Server Address Endereço do Servidor Central Personalizado @@ -1261,12 +1261,12 @@ Seletor de servidor central padrão - + Central server address line edit Caixa de edição do endereço do servidor central - + Current Connection Status Parameter Parâmetros do Estado da Ligação @@ -1283,35 +1283,40 @@ A taxa de transmissão depende do tamanho do pacote de áudio e da configuração de compactação de áudio. Verifique se a taxa de transmissão não é maior que a taxa disponível (verifique a taxa de upload da sua ligação à Internet usando, por exemplo, o speedtest.net). - + If this LED indicator turns red, you will not have much fun using the Se este indicador LED ficar vermelho, não se irá divertir muito ao usar o - + software. . - + ASIO Setup Configuração ASIO - + Mono Mono - + + mode will increase your stream's data rate. Make sure your upload rate does not exceed the available upload speed of your internet connection. + + + + Mono-in/Stereo-out Entrada Mono/Saída Estéreo - + Stereo Estéreo @@ -1401,57 +1406,52 @@ - - mode will increase your stream's data rate. Make sure your upload rate does not exceed the available upload speed of your internet connection. - - - - + 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. - + 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. - + 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. - + Leave this blank unless you need to enter the address of a central server other than the default. - + 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 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. - + Overall Delay is calculated from the current Ping Time and the delay introduced by the current buffer settings. - + 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. - + Low Baixa - + Normal Normal - + High Alta @@ -1498,38 +1498,38 @@ Servidor Padrão (America do Norte) - + preferred preferido - - + + Size: Tamanho: - + Buffer Delay Atraso do buffer - + Buffer Delay: Atraso do buffer: - + The selected audio device could not be used because of the following error: O dispositivo de áudio selecionado não pôde ser usado devido ao seguinte erro: - + The previous driver will be selected. O driver anterior será selecionado. - + Ok Ok @@ -2098,7 +2098,7 @@ - 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. + 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. @@ -2311,6 +2311,11 @@ Bass Ukulele + + + No Name + + CServerDlg @@ -2437,150 +2442,154 @@ Nome do Servidor - 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. - O nome do servidor identifica o servidor na lista do diálogo de ligação exibido nos clientes. Se nenhum nome for fornecido, o endereço IP será mostrado. + O nome do servidor identifica o servidor na lista do diálogo de ligação exibido nos clientes. Se nenhum nome for fornecido, o endereço IP será mostrado. - + + The server name identifies your server in the connect dialog server list at the clients. + + + + Server name line edit Caixa de edição do nome do servidor - + Location City ;Localização: Cidade - + 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. A cidade onde este servidor está localizado pode ser definida aqui. Se um nome de cidade for inserido, este será mostrado na lista do diálogo de ligação dos clientes. - + City where the server is located line edit Caixa de edição da cidade onde o servidor se encontra - + Location country Localização: País - + 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. 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 - + Checkbox to turn on or off server recording - + Enable Recorder - + Checked when the recorder is enabled, otherwise unchecked. The recorder will run when a session is in progress, if (set up correctly and) enabled. - + Current session directory text box (read-only) - + Current Session Directory - + Enabled during recording and holds the current recording session directory. Disabled after recording or when the recorder is not enabled. - + Recorder status label - + Recorder Status - + Displays the current status of the recorder. - + Request new recording button - + New Recording - + During a recording session, the button can be used to start a new recording. - - + + E&xit &Sair - + &Hide &Esconder servidor - - - + + + server - + &Open &Abrir servidor - + server - + Predefined Address Endereço Predefinido - + Recording - + Not recording - + Not enabled @@ -2597,12 +2606,12 @@ Servidor Padrão (America do Norte) - + Server - Servidor - + &Window &Janela diff --git a/src/resources.qrc b/src/resources.qrc index 15370a8a..bc735b5b 100755 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -17,6 +17,10 @@ res/translation/translation_it_IT.qm + + res/translation/translation_pl_PL.qm + + res/CLEDDisabledSmall.png res/CLEDGreenArrow.png