eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2 from corrados/master

Browse source 
update
This commit is contained in:
ignotus 2020-05-22 23:43:31 +02:00 committed by GitHub
commit 3cf5507863
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 245 additions and 212 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -10,7 +10,7 @@
- added an indicator that another client has muted me (#257)
- duplicate Central Server type dropdown to Connection Setup (#157)
- move central server type dropdown to connection setup (#157)
- added vocal bass/tenor/alto/soprano instrument icons created by Alberstein8 (#131)
@ -22,6 +22,7 @@
3.5.3 (2020-05-15)
- correct unregister of headless server and RPP file creation on

25
Jamulus.pro
View file

@ -422,24 +422,6 @@ HEADERS_OPUS_X86 = libs/opus/celt/x86/celt_lpc_sse.h \
libs/opus/celt/x86/vq_sse.h \
libs/opus/celt/x86/x86cpu.h
android {
contains(ANDROID_ARCHITECTURE, arm) | contains(ANDROID_ARCHITECTURE, arm64) {
HEADERS_OPUS += $$HEADERS_OPUS_ARM
} else:contains(ANDROID_ARCHITECTURE, x86) | contains(ANDROID_ARCHITECTURE, x86_64) {
HEADERS_OPUS += $$HEADERS_OPUS_X86
}
} else:win32 | unix | macx {
contains(QT_ARCH, arm) | contains(QT_ARCH, arm64) {
HEADERS_OPUS += $$HEADERS_OPUS_ARM
} else:contains(QT_ARCH, x86) | contains(QT_ARCH, x86_64) {
HEADERS_OPUS += $$HEADERS_OPUS_X86
}
win32 {
HEADERS_OPUS += libs/opus/win32/config.h
}
}
SOURCES += src/audiomixerboard.cpp \
src/buffer.cpp \
src/channel.cpp \
@ -610,16 +592,23 @@ SOURCES_OPUS_X86 = libs/opus/celt/x86/celt_lpc_sse4_1.c \
android {
contains(ANDROID_ARCHITECTURE, arm) | contains(ANDROID_ARCHITECTURE, arm64) {
HEADERS_OPUS += $$HEADERS_OPUS_ARM
SOURCE_OPUS += $$SOURCES_OPUS_ARM
} else:contains(ANDROID_ARCHITECTURE, x86) | contains(ANDROID_ARCHITECTURE, x86_64) {
HEADERS_OPUS += $$HEADERS_OPUS_X86
SOURCE_OPUS += $$SOURCES_OPUS_X86
}
} else:win32 | unix | macx {
contains(QT_ARCH, arm) | contains(QT_ARCH, arm64) {
HEADERS_OPUS += $$HEADERS_OPUS_ARM
SOURCE_OPUS += $$SOURCES_OPUS_ARM
} else:contains(QT_ARCH, x86) | contains(QT_ARCH, x86_64) {
HEADERS_OPUS += $$HEADERS_OPUS_X86
SOURCE_OPUS += $$SOURCES_OPUS_X86
}
win32 {
HEADERS_OPUS += libs/opus/win32/config.h
}
}
DISTFILES += ChangeLog \

10
distributions/raspijamulus.sh
View file

@ -1,6 +1,16 @@
#!/bin/bash
# This script is intended to setup a clean Raspberry Pi system for running Jamulus
# Regarding the old OPUS version (#252): I just tried out the following:
# * Do not use OPUS in shared library but use the version which is included in the jamulus source code:
# instead of 80 % load I get 90 % load on my Raspberry Pi Zero
# * Do not use OPUS in shared libaray but use the version which is included in the Jamulus source code
# but try to compile in fixed-point: I get compilation errors so this is not possible right now
# * I replaced the opus-1.1 with OPUS="opus-1.3.1" in the raspijamulus.sh -> OPUS version 1.3.1 has a
# known bug with the custom interface. If I use that version as a shared libaray, I get a runtime error
# on starting Jamulus. So this is also not possible. We have to wait for the next official OPUS version.
# Therefore it is the best to keep the opus-1.1 version.
OPUS="opus-1.1"
NCORES=$(nproc)

19
src/audiomixerboard.cpp
View file

@ -73,7 +73,7 @@ CChannelFader::CChannelFader ( QWidget* pNW,
// setup panning control
pPan->setRange ( 0, AUD_MIX_PAN_MAX );
pPan->setValue ( AUD_MIX_PAN_MAX / 2 );
pPan->setFixedSize ( 55, 55 );
pPan->setFixedSize ( 50, 50 );
pPan->setNotchesVisible ( true );
pPanInfoGrid->addWidget ( pPanLabel, 0, Qt::AlignLeft );
pPanInfoGrid->addWidget ( pInfoLabel );
@ -610,6 +610,8 @@ CAudioMixerBoard::CAudioMixerBoard ( QWidget* parent, Qt::WindowFlags ) :
vecStoredFaderIsSolo ( MAX_NUM_STORED_FADER_SETTINGS, false ),
vecStoredFaderIsMute ( MAX_NUM_STORED_FADER_SETTINGS, false ),
iNewClientFaderLevel ( 100 ),
bDisplayPans ( false ),
bIsPanSupported ( false ),
bNoFaderVisible ( true ),
strServerName ( "" )
{
@ -721,14 +723,22 @@ void CAudioMixerBoard::SetDisplayChannelLevels ( const bool eNDCL )
}
}
void CAudioMixerBoard::SetPanIsSupported()
void CAudioMixerBoard::SetDisplayPans ( const bool eNDP )
{
bDisplayPans = eNDP;
for ( int i = 0; i < MAX_NUM_CHANNELS; i++ )
{
vecpChanFader[i]->SetDisplayPans ( true );
vecpChanFader[i]->SetDisplayPans ( eNDP && bIsPanSupported );
}
}
void CAudioMixerBoard::SetPanIsSupported()
{
bIsPanSupported = true;
SetDisplayPans ( bDisplayPans );
}
void CAudioMixerBoard::HideAll()
{
// make all controls invisible
@ -743,7 +753,8 @@ void CAudioMixerBoard::HideAll()
vecpChanFader[i]->Hide();
}
// set flag
// set flags
bIsPanSupported = false;
bNoFaderVisible = true;
// emit status of connected clients

3
src/audiomixerboard.h
View file

@ -144,6 +144,7 @@ public:
void SetServerName ( const QString& strNewServerName );
void SetGUIDesign ( const EGUIDesign eNewDesign );
void SetDisplayChannelLevels ( const bool eNDCL );
void SetDisplayPans ( const bool eNDP );
void SetPanIsSupported();
void SetRemoteFaderIsMute ( const int iChannelIdx, const bool bIsMute );
@ -192,6 +193,8 @@ protected:
CMixerBoardScrollArea* pScrollArea;
QHBoxLayout* pMainLayout;
bool bDisplayChannelLevels;
bool bDisplayPans;
bool bIsPanSupported;
bool bNoFaderVisible;
QString strServerName;

3
src/clientdlg.cpp
View file

@ -661,6 +661,9 @@ void CClientDlg::UpdateRevSelection()
rbtReverbSelR->setChecked ( true );
}
}
// update visibility of the pan controls in the audio mixer board (pan is not supported for mono)
MainMixerBoard->SetDisplayPans ( pClient->GetAudioChannels() != CC_MONO );
}
void CClientDlg::OnAudioPanValueChanged ( int value )

2
src/global.h
View file

@ -104,7 +104,7 @@ LED bar: lbr
// default server address and port numbers
#define DEFAULT_SERVER_ADDRESS "jamulus.fischvolk.de"
#define DEFAULT_PORT_NUMBER 22124
#define CENTSERV_ALL_GENRES "jamulus.fischvolk.de:22224"
#define CENTSERV_ALL_GENRES "jamulusallgenres.fischvolk.de:22224"
#define CENTSERV_GENRE_ROCK_JAZZ "jamulusrock.fischvolk.de:22124"
#define CENTSERV_GENRE_CLASSICAL_FOLK "jamulusclassical.fischvolk.de:22224"

11
src/recorder/jamrecorder.cpp
View file

@ -109,6 +109,7 @@ void CJamClient::Disconnect()
CJamSession::CJamSession(QDir recordBaseDir) :
sessionDir (QDir(recordBaseDir.absoluteFilePath("Jam-" + QDateTime().currentDateTimeUtc().toString("yyyyMMdd-HHmmsszzz")))),
currentFrame (0),
chIdDisconnected (-1),
vecptrJamClients (MAX_NUM_CHANNELS),
jamClientConnections()
{
@ -130,8 +131,6 @@ CJamSession::CJamSession(QDir recordBaseDir) :
// Explicitly set all the pointers to "empty"
vecptrJamClients.fill(nullptr);
currentFrame = 0;
}
/**
@ -150,6 +149,7 @@ void CJamSession::DisconnectClient(int iChID)
delete vecptrJamClients[iChID];
vecptrJamClients[iChID] = nullptr;
chIdDisconnected = iChID;
}
/**
@ -167,6 +167,13 @@ void CJamSession::DisconnectClient(int iChID)
*/
void CJamSession::Frame(const int iChID, const QString name, const CHostAddress address, const int numAudioChannels, const CVector<int16_t> data, int iServerFrameSizeSamples)
{
if ( iChID == chIdDisconnected )
{
// DisconnectClient has just been called for this channel - this frame is "too late"
chIdDisconnected = -1;
return;
}
if (vecptrJamClients[iChID] == nullptr)
{
// then we have not seen this client this session

1
src/recorder/jamrecorder.h
View file

@ -128,6 +128,7 @@ private:
const QDir sessionDir;
qint64 currentFrame;
int chIdDisconnected;
QVector<CJamClient*> vecptrJamClients;
QList<CJamClientConnection*> jamClientConnections;
};

36
src/res/translation/translation_de_DE.ts
View file

@ -168,17 +168,17 @@
<context>
<name>CAudioMixerBoard</name>
<message>
<location filename="../../audiomixerboard.cpp" line="683"/>
<location filename="../../audiomixerboard.cpp" line="688"/>
<source>Server</source>
<translation></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="692"/>
<location filename="../../audiomixerboard.cpp" line="697"/>
<source>T R Y I N G T O C O N N E C T</source>
<translation>V E R B I N D U N G S A U F B A U</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="756"/>
<location filename="../../audiomixerboard.cpp" line="770"/>
<source>Personal Mix at the Server: </source>
<translation>Eigener Mix am Server: </translation>
</message>
@ -311,44 +311,44 @@
<translation></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="518"/>
<location filename="../../audiomixerboard.cpp" line="521"/>
<source>Alias/Name</source>
<translation></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="524"/>
<location filename="../../audiomixerboard.cpp" line="527"/>
<source>Instrument</source>
<translation></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="532"/>
<location filename="../../audiomixerboard.cpp" line="535"/>
<source>Location</source>
<translation>Standort</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="554"/>
<location filename="../../audiomixerboard.cpp" line="558"/>
<location filename="../../audiomixerboard.cpp" line="562"/>
<location filename="../../audiomixerboard.cpp" line="557"/>
<location filename="../../audiomixerboard.cpp" line="561"/>
<location filename="../../audiomixerboard.cpp" line="565"/>
<source>Skill Level</source>
<translation>Spielstärke</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="554"/>
<location filename="../../audiomixerboard.cpp" line="557"/>
<source>Beginner</source>
<translation>Anfänger</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="558"/>
<location filename="../../audiomixerboard.cpp" line="561"/>
<source>Intermediate</source>
<translation>Mittlere Spielstärke</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="562"/>
<location filename="../../audiomixerboard.cpp" line="565"/>
<source>Expert</source>
<translation>Experte</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="573"/>
<location filename="../../audiomixerboard.cpp" line="576"/>
<source>Musician Profile</source>
<translation>Profil des Musikers</translation>
</message>
@ -544,7 +544,7 @@
</message>
<message>
<location filename="../../clientdlg.cpp" line="205"/>
<location filename="../../clientdlg.cpp" line="1100"/>
<location filename="../../clientdlg.cpp" line="1103"/>
<source>C&amp;onnect</source>
<translation>&amp;Verbinden</translation>
</message>
@ -685,22 +685,22 @@
<translation>Die CPU des Computers ist voll ausgelastet.</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="716"/>
<location filename="../../clientdlg.cpp" line="719"/>
<source>Central Server</source>
<translation>Zentralserver</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="834"/>
<location filename="../../clientdlg.cpp" line="837"/>
<source>user</source>
<translation>Musiker</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="839"/>
<location filename="../../clientdlg.cpp" line="842"/>
<source>users</source>
<translation>Musiker</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="1076"/>
<location filename="../../clientdlg.cpp" line="1079"/>
<source>D&amp;isconnect</source>
<translation>&amp;Trennen</translation>
</message>

BIN
src/res/translation/translation_es_ES.qm
View file

Binary file not shown.

36
src/res/translation/translation_es_ES.ts
View file

@ -172,17 +172,17 @@
<context>
<name>CAudioMixerBoard</name>
<message>
<location filename="../../audiomixerboard.cpp" line="683"/>
<location filename="../../audiomixerboard.cpp" line="688"/>
<source>Server</source>
<translation>Servidor</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="692"/>
<location filename="../../audiomixerboard.cpp" line="697"/>
<source>T R Y I N G T O C O N N E C T</source>
<translation>I N T E N T A N D O C O N E C T A R</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="756"/>
<location filename="../../audiomixerboard.cpp" line="770"/>
<source>Personal Mix at the Server: </source>
<translation>Mezcla Personal en el Servidor: </translation>
</message>
@ -315,44 +315,44 @@
<translation>SOLO</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="518"/>
<location filename="../../audiomixerboard.cpp" line="521"/>
<source>Alias/Name</source>
<translation>Alias/Nombre</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="524"/>
<location filename="../../audiomixerboard.cpp" line="527"/>
<source>Instrument</source>
<translation>Instrumento</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="532"/>
<location filename="../../audiomixerboard.cpp" line="535"/>
<source>Location</source>
<translation>Ubicación</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="554"/>
<location filename="../../audiomixerboard.cpp" line="558"/>
<location filename="../../audiomixerboard.cpp" line="562"/>
<location filename="../../audiomixerboard.cpp" line="557"/>
<location filename="../../audiomixerboard.cpp" line="561"/>
<location filename="../../audiomixerboard.cpp" line="565"/>
<source>Skill Level</source>
<translation>Nivel Habilidad</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="554"/>
<location filename="../../audiomixerboard.cpp" line="557"/>
<source>Beginner</source>
<translation>Principiante</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="558"/>
<location filename="../../audiomixerboard.cpp" line="561"/>
<source>Intermediate</source>
<translation>Intermedio</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="562"/>
<location filename="../../audiomixerboard.cpp" line="565"/>
<source>Expert</source>
<translation>Experto</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="573"/>
<location filename="../../audiomixerboard.cpp" line="576"/>
<source>Musician Profile</source>
<translation>Perfil Músico</translation>
</message>
@ -548,7 +548,7 @@
</message>
<message>
<location filename="../../clientdlg.cpp" line="205"/>
<location filename="../../clientdlg.cpp" line="1100"/>
<location filename="../../clientdlg.cpp" line="1103"/>
<source>C&amp;onnect</source>
<translation>C&amp;onectar</translation>
</message>
@ -689,22 +689,22 @@
<translation>El procesador del cliente o del servidor está al 100%.</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="716"/>
<location filename="../../clientdlg.cpp" line="719"/>
<source>Central Server</source>
<translation>Servidor Central</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="834"/>
<location filename="../../clientdlg.cpp" line="837"/>
<source>user</source>
<translation>usuario</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="839"/>
<location filename="../../clientdlg.cpp" line="842"/>
<source>users</source>
<translation>usuarios</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="1076"/>
<location filename="../../clientdlg.cpp" line="1079"/>
<source>D&amp;isconnect</source>
<translation>D&amp;esconectar</translation>
</message>

BIN
src/res/translation/translation_fr_FR.qm
View file

Binary file not shown.

188
src/res/translation/translation_fr_FR.ts
View file

@ -180,19 +180,19 @@
<context>
<name>CAudioMixerBoard</name>
<message>
<location filename="../../audiomixerboard.cpp" line="683"/>
<location filename="../../audiomixerboard.cpp" line="688"/>
<source>Server</source>
<translation>Serveur</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="692"/>
<location filename="../../audiomixerboard.cpp" line="697"/>
<source>T R Y I N G T O C O N N E C T</source>
<translation>T E N T A T I V E D E C O N N E X I O N</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="756"/>
<location filename="../../audiomixerboard.cpp" line="770"/>
<source>Personal Mix at the Server: </source>
<translation>Mixage personnel au serveur : </translation>
<translation>Mixage personnel du serveur : </translation>
</message>
</context>
<context>
@ -230,37 +230,37 @@
<message>
<location filename="../../audiomixerboard.cpp" line="142"/>
<source>Status Indicator</source>
<translation type="unfinished"></translation>
<translation>Indicateur d&apos;état</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="142"/>
<source>Shows a status indication about the client which is assigned to this channel. Supported indicators are:</source>
<translation type="unfinished"></translation>
<translation>Affiche une indication sur l&apos;état du client qui est affecté à ce canal. Les indicateurs pris en charge sont : </translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="144"/>
<source>Speaker with cancellation stroke: Indicates that the other client has muted you.</source>
<translation type="unfinished"></translation>
<translation>Haut-parleur avec barre d&apos;annulation : indique que l&apos;autre client vous a mis en sourdine.</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="147"/>
<source>Status indicator label</source>
<translation type="unfinished"></translation>
<translation>Étiquette d&apos;indicateur d&apos;état</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="149"/>
<source>Panning</source>
<translation type="unfinished"></translation>
<translation>Panoramique</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="149"/>
<source>Sets the panning position from Left to Right of the channel. Works only in stereo or preferably mono in/stereo out mode.</source>
<translation type="unfinished"></translation>
<translation>Règle la position panoramique du canal de gauche à droite. Fonctionne uniquement en mode stéréo ou de préférence en mode entrée mono/sortie stéréo.</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="152"/>
<source>Local panning position of the current audio channel at the server</source>
<translation type="unfinished"></translation>
<translation>Position panoramique locale du canal audio actuel sur le serveur</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="154"/>
@ -310,7 +310,7 @@
<message>
<location filename="../../audiomixerboard.cpp" line="210"/>
<source>PAN</source>
<translation type="unfinished"></translation>
<translation>PAN</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="211"/>
@ -323,44 +323,44 @@
<translation>SOLO</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="518"/>
<location filename="../../audiomixerboard.cpp" line="521"/>
<source>Alias/Name</source>
<translation>Pseudo/nom</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="524"/>
<location filename="../../audiomixerboard.cpp" line="527"/>
<source>Instrument</source>
<translation>Instrument</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="532"/>
<location filename="../../audiomixerboard.cpp" line="535"/>
<source>Location</source>
<translation>Localisation</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="554"/>
<location filename="../../audiomixerboard.cpp" line="558"/>
<location filename="../../audiomixerboard.cpp" line="562"/>
<location filename="../../audiomixerboard.cpp" line="557"/>
<location filename="../../audiomixerboard.cpp" line="561"/>
<location filename="../../audiomixerboard.cpp" line="565"/>
<source>Skill Level</source>
<translation>Niveau de compétence</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="554"/>
<location filename="../../audiomixerboard.cpp" line="557"/>
<source>Beginner</source>
<translation>Débutant</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="558"/>
<location filename="../../audiomixerboard.cpp" line="561"/>
<source>Intermediate</source>
<translation>Intermédiaire</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="562"/>
<location filename="../../audiomixerboard.cpp" line="565"/>
<source>Expert</source>
<translation>Expert</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="573"/>
<location filename="../../audiomixerboard.cpp" line="576"/>
<source>Musician Profile</source>
<translation>Profil de musicien</translation>
</message>
@ -375,7 +375,7 @@
<location filename="../../audiomixerboard.cpp" line="43"/>
<location filename="../../audiomixerboard.cpp" line="219"/>
<source>Pan</source>
<translation type="unfinished">Pan</translation>
<translation>Pan</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="48"/>
@ -400,7 +400,7 @@
<message>
<location filename="../../chatdlg.cpp" line="40"/>
<source>Chat history</source>
<translation type="unfinished"></translation>
<translation>Historique du tchate</translation>
</message>
<message>
<location filename="../../chatdlg.cpp" line="43"/>
@ -556,7 +556,7 @@
</message>
<message>
<location filename="../../clientdlg.cpp" line="205"/>
<location filename="../../clientdlg.cpp" line="1100"/>
<location filename="../../clientdlg.cpp" line="1103"/>
<source>C&amp;onnect</source>
<translation>Se c&amp;onnecter</translation>
</message>
@ -697,22 +697,22 @@
<translation>Le processeur du client ou du serveur est à 100%.</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="716"/>
<location filename="../../clientdlg.cpp" line="719"/>
<source>Central Server</source>
<translation>Serveur central</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="834"/>
<location filename="../../clientdlg.cpp" line="837"/>
<source>user</source>
<translation>utilisateur</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="839"/>
<location filename="../../clientdlg.cpp" line="842"/>
<source>users</source>
<translation>utilisateurs</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="1076"/>
<location filename="../../clientdlg.cpp" line="1079"/>
<source>D&amp;isconnect</source>
<translation>Dé&amp;connecter</translation>
</message>
@ -870,12 +870,12 @@
<message>
<location filename="../../clientsettingsdlg.cpp" line="96"/>
<source>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.</source>
<translation type="unfinished"></translation>
<translation>Si le pilote ASIO4ALL est utilisé, veuillez noter que ce pilote introduit généralement environ 10 à 30 ms de latence audio supplémentaire. Il est donc recommandé d&apos;utiliser une carte son avec un pilote ASIO natif.</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="99"/>
<source>If you are using the kX ASIO driver, make sure to connect the ASIO inputs in the kX DSP settings panel.</source>
<translation type="unfinished"></translation>
<translation>Si vous utilisez le pilote ASIO kX, assurez-vous de connecter les entrées ASIO dans le panneau de configuration DSP kX.</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="105"/>
@ -885,17 +885,16 @@
<message>
<location filename="../../clientsettingsdlg.cpp" line="106"/>
<source>In case the selected sound card device offers more than one input or output channel, the Input Channel Mapping and Output Channel Mapping settings are visible.</source>
<translation type="unfinished"></translation>
<translation>Si la carte son sélectionnée offre plus d&apos;un canal d&apos;entrée ou de sortie, les paramètres de mappage des canaux d&apos;entrée et de sortie sont visibles.</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="108"/>
<source>For each </source>
<translation type="unfinished"></translation>
<translation>Pour chaque canal d&apos;entrée/sortie (canal gauche et droite) de </translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="109"/>
<source> input/output channel (Left and Right channel) a different actual sound card channel can be selected.</source>
<translation type="unfinished"></translation>
<source> , a different actual sound card channel can be selected.</source>
<translation type="vanished"> , un canal différent de la carte son réelle peut être sélectionné.</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="116"/>
@ -1005,12 +1004,21 @@
<message>
<location filename="../../clientsettingsdlg.cpp" line="167"/>
<source>If the buffer delay settings are disabled, it is prohibited by the audio driver to modify this setting from within the </source>
<translation type="unfinished"></translation>
<translation>Si les paramètres de délai de la mémoire tampon sont désactivés, il est interdit par le pilote audio de modifier ce paramètre à partir du logiciel </translation>
</message>
<message>
<source> . 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.</source>
<translation type="vanished"> . Sous Windows, appuyez sur le bouton ASIO Setup pour ouvrir le panneau des paramètres du pilote. Sous Linux, utilisez l&apos;outil de configuration Jack pour modifier la taille de la mémoire tampon.</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="109"/>
<source> input/output channel (Left and Right channel) a different actual sound card channel can be selected.</source>
<translation> un canal différent de la carte son réelle peut être sélectionné.</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="170"/>
<source> 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.</source>
<translation type="unfinished"></translation>
<translation>. 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.</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="175"/>
@ -1120,12 +1128,12 @@
<message>
<location filename="../../clientsettingsdlg.cpp" line="246"/>
<source>Custom Central Server Address</source>
<translation type="unfinished"></translation>
<translation>Adresse personnalisée du serveur central</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="247"/>
<source>The custom central server address is the IP address or URL of the central server at which the server list of the connection dialog is managed. This address is only used if the custom server list is selected in the connection dialog.</source>
<translation type="unfinished"></translation>
<translation>L&apos;adresse personnalisée du serveur central est l&apos;adresse IP ou l&apos;URL du serveur central sur lequel la liste des serveurs du dialogue de connexion est gérée. Cette adresse n&apos;est utilisée que si la liste de serveurs personnalisée est sélectionnée dans le dialogue de connexion.</translation>
</message>
<message>
<source>Central Server Address</source>
@ -1226,12 +1234,12 @@
<message>
<location filename="../../util.h" line="587"/>
<source>Genre Rock/Jazz</source>
<translation type="unfinished"></translation>
<translation>Genre rock/jazz</translation>
</message>
<message>
<location filename="../../util.h" line="590"/>
<source>Genre Classical/Folk/Choir</source>
<translation type="unfinished"></translation>
<translation>Genre classique/folk/coeur</translation>
</message>
<message>
<source>Genre Rock</source>
@ -1424,7 +1432,7 @@
<message>
<location filename="../../clientsettingsdlgbase.ui" line="560"/>
<source>Custom Central Server Address:</source>
<translation type="unfinished"></translation>
<translation>Adresse personnalisée du serveur central : </translation>
</message>
<message>
<source>Central Server Address:</source>
@ -1503,22 +1511,22 @@
<message>
<location filename="../../connectdlg.cpp" line="76"/>
<source>Holds the current server IP address or URL. It also stores old URLs in the combo box list.</source>
<translation type="unfinished"></translation>
<translation>Contient l&apos;adresse IP ou l&apos;URL du serveur actuel. Il stocke également les anciennes URL dans la liste déroulante.</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="87"/>
<source>Server List Selection</source>
<translation type="unfinished"></translation>
<translation>Sélection de la liste des serveurs</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="87"/>
<source>Selects the server list to be shown.</source>
<translation type="unfinished"></translation>
<translation>Sélectionne la liste de serveurs à afficher.</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="89"/>
<source>Server list selection combo box</source>
<translation type="unfinished"></translation>
<translation>Liste déroulante de sélection de la liste des serveurs</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="92"/>
@ -2052,17 +2060,17 @@
<message>
<location filename="../../serverdlg.cpp" line="53"/>
<source>Start Minimized on Operating System Start</source>
<translation type="unfinished"></translation>
<translation>Démarrage minimisé au lancement du système d&apos;exploitation</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="54"/>
<source>If the start minimized on operating system start check box is checked, the </source>
<translation type="unfinished"></translation>
<translation>Si la case à cocher &quot;Démarrage minimisé au lancement du système d&apos;exploitation&quot; est cochée, le serveur </translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="55"/>
<source> server will be started when the operating system starts up and is automatically minimized to a system task bar icon.</source>
<translation type="unfinished"></translation>
<translation> sera lancé au démarrage du système d&apos;exploitation et est automatiquement minimisé dans une icône de la barre des tâches du système.</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="60"/>
@ -2109,7 +2117,7 @@
<message>
<location filename="../../serverdlg.cpp" line="75"/>
<source>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.</source>
<translation type="unfinished"></translation>
<translation>Si la case Rendre mon serveur public est cochée, cela indiquera si l&apos;enregistrement auprès du serveur central est réussi. Si l&apos;enregistrement a échoué, veuillez choisir une autre liste de serveurs.</translation>
</message>
<message>
<source>Default central server type combo box</source>
@ -2118,12 +2126,12 @@
<message>
<location filename="../../serverdlg.cpp" line="80"/>
<source>Custom Central Server Address</source>
<translation type="unfinished"></translation>
<translation>Adresse personnalisée du serveur central</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="81"/>
<source>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.</source>
<translation type="unfinished"></translation>
<translation>L&apos;adresse personnalisée du serveur central est l&apos;adresse IP ou l&apos;URL du serveur central sur lequel la liste des serveurs du dialogue de connexion est gérée.</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="86"/>
@ -2133,17 +2141,17 @@
<message>
<location filename="../../serverdlg.cpp" line="88"/>
<source>Server List Selection</source>
<translation type="unfinished"></translation>
<translation>Sélection de la liste des serveurs</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="88"/>
<source>Selects the server list (i.e. central server address) in which your server will be added.</source>
<translation type="unfinished"></translation>
<translation>Sélectionne la liste de serveurs (c-à-d l&apos;adresse du serveur central) dans laquelle votre serveur sera ajouté.</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="90"/>
<source>Server list selection combo box</source>
<translation type="unfinished"></translation>
<translation>Liste déroulante de sélection de la liste des serveurs</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="93"/>
@ -2307,7 +2315,7 @@
<message>
<location filename="../../serverdlgbase.ui" line="52"/>
<source>Start Minimized on Windows Start</source>
<translation type="unfinished"></translation>
<translation>Démarrage minimisé au lancement de Windows</translation>
</message>
<message>
<location filename="../../serverdlgbase.ui" line="59"/>
@ -2327,7 +2335,7 @@
<message>
<location filename="../../serverdlgbase.ui" line="105"/>
<source>Custom Central Server Address:</source>
<translation type="unfinished"></translation>
<translation>Adresse personnalisée du serveur central :</translation>
</message>
<message>
<source>Central Server Address:</source>
@ -2364,129 +2372,129 @@
<message>
<location filename="../../../linux/sound.cpp" line="60"/>
<source>The Jack server sample rate is different from the required one. The required sample rate is:</source>
<translation type="unfinished"></translation>
<translation>Le taux d&apos;échantillonnage du serveur Jack est différent de celui requis. Le taux d&apos;échantillonnage requis est le suivant :</translation>
</message>
<message>
<location filename="../../../linux/sound.cpp" line="62"/>
<source>You can use a tool like &lt;i&gt;&lt;a href=http://qjackctl.sourceforge.net&gt;QJackCtl&lt;/a&gt;&lt;/i&gt; to adjust the Jack server sample rate.</source>
<translation type="unfinished"></translation>
<translation>Vous pouvez utiliser un outil comme &lt;i&gt;&lt;a href=http://qjackctl.sourceforge.net&gt;QJackCtl&lt;/a&gt;&lt;/i&gt; pour ajuster le taux d&apos;échantillonnage du serveur Jack.</translation>
</message>
<message>
<location filename="../../../linux/sound.cpp" line="64"/>
<source>Make sure to set the Frames/Period to a low value like </source>
<translation type="unfinished"></translation>
<translation>Veillez à définir les trames/périodes à une valeur faible comme </translation>
</message>
<message>
<location filename="../../../linux/sound.cpp" line="67"/>
<source> to achieve a low delay.</source>
<translation type="unfinished"></translation>
<translation> pour obtenir une latence faible.</translation>
</message>
<message>
<location filename="../../../linux/sound.cpp" line="88"/>
<location filename="../../../linux/sound.cpp" line="99"/>
<source>The Jack port registering failed.</source>
<translation type="unfinished"></translation>
<translation>L&apos;enregistrement du port Jack a échoué.</translation>
</message>
<message>
<location filename="../../../linux/sound.cpp" line="110"/>
<source>Cannot activate the Jack client.</source>
<translation type="unfinished"></translation>
<translation>Impossible d&apos;activer le client Jack.</translation>
</message>
<message>
<location filename="../../../linux/sound.cpp" line="197"/>
<source>The Jack server was shut down. This software requires a Jack server to run. Try to restart the software to solve the issue.</source>
<translation type="unfinished"></translation>
<translation>Le serveur Jack a été fermé. Ce logiciel nécessite un serveur Jack pour fonctionner. Essayez de redémarrer le logiciel pour résoudre le problème.</translation>
</message>
<message>
<location filename="../../../mac/sound.cpp" line="101"/>
<source>CoreAudio input AudioHardwareGetProperty call failed. It seems that no sound card is available in the system.</source>
<translation type="unfinished"></translation>
<translation>L&apos;appel d&apos;entrée AudioHardwareGetProperty CoreAudio a échoué failed. Il semble qu&apos;aucune carte son ne soit disponible dans le système.</translation>
</message>
<message>
<location filename="../../../mac/sound.cpp" line="115"/>
<source>CoreAudio output AudioHardwareGetProperty call failed. It seems that no sound card is available in the system.</source>
<translation type="unfinished"></translation>
<translation>L&apos;appel de sortie AudioHardwareGetProperty CoreAudio a échoué failed. Il semble qu&apos;aucune carte son ne soit disponible dans le système.</translation>
</message>
<message>
<location filename="../../../mac/sound.cpp" line="370"/>
<source>Current system audio input device sample rate of %1 Hz is not supported. Please open the Audio-MIDI-Setup in Applications-&gt;Utilities and try to set a sample rate of %2 Hz.</source>
<translation type="unfinished"></translation>
<translation>Le taux d&apos;échantillonnage de %1 Hz du périphérique d&apos;entrée audio du système actuel n&apos;est pas pris en charge. Veuillez ouvrir la configuration Audio-MIDI dans Applications-&gt;Utilitaires et essayer de définir un taux d&apos;échantillonnage de %2 Hz.</translation>
</message>
<message>
<location filename="../../../mac/sound.cpp" line="397"/>
<source>Current system audio output device sample rate of %1 Hz is not supported. Please open the Audio-MIDI-Setup in Applications-&gt;Utilities and try to set a sample rate of %2 Hz.</source>
<translation type="unfinished"></translation>
<translation>Le taux d&apos;échantillonnage de %1 Hz du périphérique de sortie audio du système actuel n&apos;est pas pris en charge. Veuillez ouvrir la configuration Audio-MIDI dans Applications-&gt;Utilitaires et essayer de définir un taux d&apos;échantillonnage de %2 Hz.</translation>
</message>
<message>
<location filename="../../../mac/sound.cpp" line="470"/>
<source>The audio input stream format for this audio device is not compatible with this software.</source>
<translation type="unfinished"></translation>
<translation>Le format du flux d&apos;entrée audio pour ce périphérique audio n&apos;est pas compatible avec ce logiciel.</translation>
</message>
<message>
<location filename="../../../mac/sound.cpp" line="488"/>
<source>The audio output stream format for this audio device is not compatible with this software.</source>
<translation type="unfinished"></translation>
<translation>Le format du flux de sortie audio pour ce périphérique audio n&apos;est pas compatible avec ce logiciel.</translation>
</message>
<message>
<location filename="../../../mac/sound.cpp" line="813"/>
<source>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.</source>
<translation type="unfinished"></translation>
<translation>Les tailles de tampon du périphérique audio d&apos;entrée et de sortie actuel ne peuvent pas être réglées à une valeur commune. Veuillez choisir d&apos;autres périphériques audio d&apos;entrée/sortie dans les paramètres de votre système.</translation>
</message>
<message>
<location filename="../../../windows/sound.cpp" line="53"/>
<source>The audio driver could not be initialized.</source>
<translation type="unfinished"></translation>
<translation>Le pilote audio n&apos;a pas pu être initialisé.</translation>
</message>
<message>
<location filename="../../../windows/sound.cpp" line="108"/>
<source>The audio device does not support the required sample rate. The required sample rate is: </source>
<translation type="unfinished"></translation>
<translation>Le périphérique audio ne prend pas en charge la fréquence d&apos;échantillonnage requise. La fréquence d&apos;échantillonnage requise est : </translation>
</message>
<message>
<location filename="../../../windows/sound.cpp" line="121"/>
<source>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 </source>
<translation type="unfinished"></translation>
<translation>Le périphérique audio ne permet pas de régler la fréquence d&apos;échantillonnage requise. Cette erreur peut se produire si vous avez une interface audio comme le Roland UA-25EX où vous réglez la fréquence d&apos;échantillonnage avec un commutateur matériel sur le périphérique audio. Si c&apos;est le cas, veuillez changer la fréquence d&apos;échantillonnage à </translation>
</message>
<message>
<location filename="../../../windows/sound.cpp" line="125"/>
<source> Hz on the device and restart the </source>
<translation type="unfinished"></translation>
<translation> Hz sur le péripéhrique et redémarrer le logiciel</translation>
</message>
<message>
<location filename="../../../windows/sound.cpp" line="126"/>
<source> software.</source>
<translation type="unfinished"> .</translation>
<translation> .</translation>
</message>
<message>
<location filename="../../../windows/sound.cpp" line="136"/>
<source>The audio device does not support the required number of channels. The required number of channels for input and output is: </source>
<translation type="unfinished"></translation>
<translation>Le périphérique audio ne prend pas en charge le nombre de canaux requis. Le nombre de canaux requis pour l&apos;entrée et la sortie est : </translation>
</message>
<message>
<location filename="../../../windows/sound.cpp" line="172"/>
<location filename="../../../windows/sound.cpp" line="202"/>
<source>Required audio sample format not available.</source>
<translation type="unfinished"></translation>
<translation>Le format de l&apos;échantillon audio requis n&apos;est pas disponible.</translation>
</message>
<message>
<location filename="../../../windows/sound.cpp" line="518"/>
<source>No ASIO audio device (driver) found.</source>
<translation type="unfinished"></translation>
<translation>Aucun périphérique audio ASIO (pilote) trouvé.</translation>
</message>
<message>
<location filename="../../../windows/sound.cpp" line="519"/>
<source>The </source>
<translation type="unfinished">Le logiciel </translation>
<translation>Le logiciel </translation>
</message>
<message>
<location filename="../../../windows/sound.cpp" line="519"/>
<source> 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.</source>
<translation type="unfinished"></translation>
<translation> nécessite l&apos;interface audio à faible latence ASIO pour fonctionner correctement. Il ne s&apos;agit pas d&apos;une interface audio Windows standard et un pilote audio spécial est donc nécessaire. Soit votre carte son dispose d&apos;un pilote ASIO natif (ce qui est recommandé), soit vous pouvez utiliser d&apos;autres pilotes comme le pilote ASIO4All.</translation>
</message>
<message>
<location filename="../../../android/sound.cpp" line="137"/>
<source>Error closing stream: $s</source>
<translation type="unfinished"></translation>
<translation>Erreur de fermeture du flux : $s</translation>
</message>
</context>
<context>
@ -2494,12 +2502,12 @@
<message>
<location filename="../../soundbase.cpp" line="115"/>
<source>Invalid device selection.</source>
<translation type="unfinished"></translation>
<translation>Sélection de périphérique invalide.</translation>
</message>
<message>
<location filename="../../soundbase.cpp" line="141"/>
<source>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:</source>
<translation type="unfinished"></translation>
<translation>Les propriétés du pilote audio ont changé et sont devenues incompatibles avec ce logiciel. Le périphérique audio sélectionné n&apos;a pas pu être utilisé en raison de l&apos;erreur suivante :</translation>
</message>
<message>
<location filename="../../soundbase.cpp" line="146"/>
@ -2514,27 +2522,27 @@
<message>
<location filename="../../soundbase.cpp" line="189"/>
<source>No usable </source>
<translation type="unfinished"></translation>
<translation>Pas de périphérique audio (pilote) </translation>
</message>
<message>
<location filename="../../soundbase.cpp" line="190"/>
<source> audio device (driver) found.</source>
<translation type="unfinished"></translation>
<translation> utilisable trouvé</translation>
</message>
<message>
<location filename="../../soundbase.cpp" line="191"/>
<source>In the following there is a list of all available drivers with the associated error message:</source>
<translation type="unfinished"></translation>
<translation>Vous trouverez ci-dessous une liste de tous les pilotes disponibles avec le message d&apos;erreur associé :</translation>
</message>
<message>
<location filename="../../soundbase.cpp" line="205"/>
<source>Do you want to open the ASIO driver setups?</source>
<translation type="unfinished"></translation>
<translation>Voulez-vous ouvrir les configurations des pilotes ASIO ?</translation>
</message>
<message>
<location filename="../../soundbase.cpp" line="212"/>
<source> could not be started because of audio interface issues.</source>
<translation type="unfinished"></translation>
<translation> n&apos;a pas pu être lancé en raison de problèmes d&apos;interface audio.</translation>
</message>
</context>
<context>

36
src/res/translation/translation_it_IT.ts
View file

@ -168,17 +168,17 @@
<context>
<name>CAudioMixerBoard</name>
<message>
<location filename="../../audiomixerboard.cpp" line="683"/>
<location filename="../../audiomixerboard.cpp" line="688"/>
<source>Server</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="692"/>
<location filename="../../audiomixerboard.cpp" line="697"/>
<source>T R Y I N G T O C O N N E C T</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="756"/>
<location filename="../../audiomixerboard.cpp" line="770"/>
<source>Personal Mix at the Server: </source>
<translation type="unfinished"></translation>
</message>
@ -331,44 +331,44 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="518"/>
<location filename="../../audiomixerboard.cpp" line="521"/>
<source>Alias/Name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="524"/>
<location filename="../../audiomixerboard.cpp" line="527"/>
<source>Instrument</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="532"/>
<location filename="../../audiomixerboard.cpp" line="535"/>
<source>Location</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="554"/>
<location filename="../../audiomixerboard.cpp" line="558"/>
<location filename="../../audiomixerboard.cpp" line="562"/>
<location filename="../../audiomixerboard.cpp" line="557"/>
<location filename="../../audiomixerboard.cpp" line="561"/>
<location filename="../../audiomixerboard.cpp" line="565"/>
<source>Skill Level</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="554"/>
<location filename="../../audiomixerboard.cpp" line="557"/>
<source>Beginner</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="558"/>
<location filename="../../audiomixerboard.cpp" line="561"/>
<source>Intermediate</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="562"/>
<location filename="../../audiomixerboard.cpp" line="565"/>
<source>Expert</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="573"/>
<location filename="../../audiomixerboard.cpp" line="576"/>
<source>Musician Profile</source>
<translation type="unfinished"></translation>
</message>
@ -630,7 +630,7 @@
</message>
<message>
<location filename="../../clientdlg.cpp" line="205"/>
<location filename="../../clientdlg.cpp" line="1100"/>
<location filename="../../clientdlg.cpp" line="1103"/>
<source>C&amp;onnect</source>
<translation type="unfinished"></translation>
</message>
@ -685,22 +685,22 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="716"/>
<location filename="../../clientdlg.cpp" line="719"/>
<source>Central Server</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="834"/>
<location filename="../../clientdlg.cpp" line="837"/>
<source>user</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="839"/>
<location filename="../../clientdlg.cpp" line="842"/>
<source>users</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="1076"/>
<location filename="../../clientdlg.cpp" line="1079"/>
<source>D&amp;isconnect</source>
<translation type="unfinished"></translation>
</message>

36
src/res/translation/translation_nl_NL.ts
View file

@ -168,17 +168,17 @@
<context>
<name>CAudioMixerBoard</name>
<message>
<location filename="../../audiomixerboard.cpp" line="683"/>
<location filename="../../audiomixerboard.cpp" line="688"/>
<source>Server</source>
<translation>Server</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="692"/>
<location filename="../../audiomixerboard.cpp" line="697"/>
<source>T R Y I N G T O C O N N E C T</source>
<translation>A A N H E T V E R B I N D E N</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="756"/>
<location filename="../../audiomixerboard.cpp" line="770"/>
<source>Personal Mix at the Server: </source>
<translation type="unfinished"></translation>
</message>
@ -331,44 +331,44 @@
<translation>SOLO</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="518"/>
<location filename="../../audiomixerboard.cpp" line="521"/>
<source>Alias/Name</source>
<translation>Alias/Naam</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="524"/>
<location filename="../../audiomixerboard.cpp" line="527"/>
<source>Instrument</source>
<translation>Instrument</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="532"/>
<location filename="../../audiomixerboard.cpp" line="535"/>
<source>Location</source>
<translation>Locatie</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="554"/>
<location filename="../../audiomixerboard.cpp" line="558"/>
<location filename="../../audiomixerboard.cpp" line="562"/>
<location filename="../../audiomixerboard.cpp" line="557"/>
<location filename="../../audiomixerboard.cpp" line="561"/>
<location filename="../../audiomixerboard.cpp" line="565"/>
<source>Skill Level</source>
<translation>Vaardigheidssniveau</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="554"/>
<location filename="../../audiomixerboard.cpp" line="557"/>
<source>Beginner</source>
<translation>Beginner</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="558"/>
<location filename="../../audiomixerboard.cpp" line="561"/>
<source>Intermediate</source>
<translation>Gemiddeld</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="562"/>
<location filename="../../audiomixerboard.cpp" line="565"/>
<source>Expert</source>
<translation>Gevorderd</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="573"/>
<location filename="../../audiomixerboard.cpp" line="576"/>
<source>Musician Profile</source>
<translation>Muzikantenprofiel</translation>
</message>
@ -630,7 +630,7 @@
</message>
<message>
<location filename="../../clientdlg.cpp" line="205"/>
<location filename="../../clientdlg.cpp" line="1100"/>
<location filename="../../clientdlg.cpp" line="1103"/>
<source>C&amp;onnect</source>
<translation>C&amp;onnect</translation>
</message>
@ -685,22 +685,22 @@
<translation>R</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="716"/>
<location filename="../../clientdlg.cpp" line="719"/>
<source>Central Server</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="834"/>
<location filename="../../clientdlg.cpp" line="837"/>
<source>user</source>
<translation>gebruiker</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="839"/>
<location filename="../../clientdlg.cpp" line="842"/>
<source>users</source>
<translation>gebruikers</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="1076"/>
<location filename="../../clientdlg.cpp" line="1079"/>
<source>D&amp;isconnect</source>
<translation>&amp;Afmelden</translation>
</message>

36
src/res/translation/translation_pt_PT.ts
View file

@ -180,17 +180,17 @@
<context>
<name>CAudioMixerBoard</name>
<message>
<location filename="../../audiomixerboard.cpp" line="683"/>
<location filename="../../audiomixerboard.cpp" line="688"/>
<source>Server</source>
<translation>Servidor</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="692"/>
<location filename="../../audiomixerboard.cpp" line="697"/>
<source>T R Y I N G T O C O N N E C T</source>
<translation>T E N T A N D O L I G A R</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="756"/>
<location filename="../../audiomixerboard.cpp" line="770"/>
<source>Personal Mix at the Server: </source>
<translation type="unfinished"></translation>
</message>
@ -323,44 +323,44 @@
<translation>SOLO</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="518"/>
<location filename="../../audiomixerboard.cpp" line="521"/>
<source>Alias/Name</source>
<translation>Nome/Alcunha</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="524"/>
<location filename="../../audiomixerboard.cpp" line="527"/>
<source>Instrument</source>
<translation>Instrumento</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="532"/>
<location filename="../../audiomixerboard.cpp" line="535"/>
<source>Location</source>
<translation>Localização</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="554"/>
<location filename="../../audiomixerboard.cpp" line="558"/>
<location filename="../../audiomixerboard.cpp" line="562"/>
<location filename="../../audiomixerboard.cpp" line="557"/>
<location filename="../../audiomixerboard.cpp" line="561"/>
<location filename="../../audiomixerboard.cpp" line="565"/>
<source>Skill Level</source>
<translation>Nível de Habilidade</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="554"/>
<location filename="../../audiomixerboard.cpp" line="557"/>
<source>Beginner</source>
<translation>Principiante</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="558"/>
<location filename="../../audiomixerboard.cpp" line="561"/>
<source>Intermediate</source>
<translation>Intermediário</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="562"/>
<location filename="../../audiomixerboard.cpp" line="565"/>
<source>Expert</source>
<translation>Avançado</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="573"/>
<location filename="../../audiomixerboard.cpp" line="576"/>
<source>Musician Profile</source>
<translation>Perfil do músico</translation>
</message>
@ -556,7 +556,7 @@
</message>
<message>
<location filename="../../clientdlg.cpp" line="205"/>
<location filename="../../clientdlg.cpp" line="1100"/>
<location filename="../../clientdlg.cpp" line="1103"/>
<source>C&amp;onnect</source>
<translation>&amp;Ligar</translation>
</message>
@ -697,22 +697,22 @@
<translation>O CPU do cliente ou servidor está a 100%.</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="716"/>
<location filename="../../clientdlg.cpp" line="719"/>
<source>Central Server</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="834"/>
<location filename="../../clientdlg.cpp" line="837"/>
<source>user</source>
<translation>utilizador</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="839"/>
<location filename="../../clientdlg.cpp" line="842"/>
<source>users</source>
<translation>utilizadores</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="1076"/>
<location filename="../../clientdlg.cpp" line="1079"/>
<source>D&amp;isconnect</source>
<translation>Desl&amp;igar</translation>
</message>

2
src/settings.cpp
View file

@ -82,7 +82,7 @@ void CSettings::Load()
{
if ( GetNumericIniSet ( IniXMLDocument, "client",
QString ( "storedpanvalue%1" ).arg ( iIdx ),
0, AUD_MIX_PAN_MAX/2, iValue ) )
0, AUD_MIX_PAN_MAX, iValue ) )
{
pClient->vecStoredPanValues[iIdx] = iValue;
}