merge fixes

This commit is contained in:
Volker Fischer 2020-06-15 21:48:30 +02:00
parent ac9f054ee3
commit 8d3cdb7a4b
16 changed files with 402 additions and 225 deletions

View file

@ -9,6 +9,8 @@
- support sorting faders by channel instrument, coded by Alberstein8 (#356) - support sorting faders by channel instrument, coded by Alberstein8 (#356)
- add server recording indicator, coded by pljones (#295)
- support for storing/recovering the server window positions (#357) - support for storing/recovering the server window positions (#357)
@ -17,6 +19,7 @@
3.5.6 (2020-06-09) 3.5.6 (2020-06-09)
- support sorting faders by channel name (#178) - support sorting faders by channel name (#178)

View file

@ -816,23 +816,23 @@ void CAudioMixerBoard::ChangeFaderOrder ( const bool bDoSort,
} }
} }
QString CAudioMixerBoard::GetTitle() void CAudioMixerBoard::UpdateTitle()
{ {
QString myTitle = ""; QString strTitlePrefix = "";
if ( eRecorderState == RS_RECORDING ) if ( eRecorderState == RS_RECORDING )
{ {
myTitle = "[" + tr ( "RECORDING ACTIVE" ) + "] "; strTitlePrefix = "[" + tr ( "RECORDING ACTIVE" ) + "] ";
} }
return myTitle + tr ( "Personal Mix at: " ) + strServerName;
setTitle ( strTitlePrefix + tr ( "Personal Mix at: " ) + strServerName );
} }
void CAudioMixerBoard::SetRecorderState ( const ERecorderState newRecorderState ) void CAudioMixerBoard::SetRecorderState ( const ERecorderState newRecorderState )
{ {
// store the new recorder state and update the title
eRecorderState = newRecorderState; eRecorderState = newRecorderState;
if ( !strServerName.isEmpty() && !bNoFaderVisible ) UpdateTitle();
{
setTitle ( GetTitle() );
}
} }
void CAudioMixerBoard::ApplyNewConClientList ( CVector<CChannelInfo>& vecChanInfo ) void CAudioMixerBoard::ApplyNewConClientList ( CVector<CChannelInfo>& vecChanInfo )
@ -841,7 +841,7 @@ void CAudioMixerBoard::ApplyNewConClientList ( CVector<CChannelInfo>& vecChanInf
// in the audio mixer board to show a "try to connect" before // in the audio mixer board to show a "try to connect" before
if ( bNoFaderVisible ) if ( bNoFaderVisible )
{ {
setTitle ( GetTitle() ); UpdateTitle();
} }
// get number of connected clients // get number of connected clients

View file

@ -190,8 +190,6 @@ protected:
} }
}; };
QString GetTitle();
bool GetStoredFaderSettings ( const CChannelInfo& ChanInfo, bool GetStoredFaderSettings ( const CChannelInfo& ChanInfo,
int& iStoredFaderLevel, int& iStoredFaderLevel,
int& iStoredPanValue, int& iStoredPanValue,
@ -200,6 +198,7 @@ protected:
void StoreFaderSettings ( CChannelFader* pChanFader ); void StoreFaderSettings ( CChannelFader* pChanFader );
void UpdateSoloStates(); void UpdateSoloStates();
void UpdateTitle();
void OnGainValueChanged ( const int iChannelIdx, void OnGainValueChanged ( const int iChannelIdx,
const double dValue ); const double dValue );

View file

@ -1585,8 +1585,8 @@ bool CProtocol::EvaluateRecorderStateMes(const CVector<uint8_t>& vecData)
const int iRecorderState = const int iRecorderState =
static_cast<int> ( GetValFromStream ( vecData, iPos, 1 ) ); static_cast<int> ( GetValFromStream ( vecData, iPos, 1 ) );
if ( ( iRecorderState != RS_UNDEFINED ) && // note that RS_UNDEFINED is only internally used
( iRecorderState != RS_NOT_INITIALISED ) && if ( ( iRecorderState != RS_NOT_INITIALISED ) &&
( iRecorderState != RS_NOT_ENABLED ) && ( iRecorderState != RS_NOT_ENABLED ) &&
( iRecorderState != RS_RECORDING ) ) ( iRecorderState != RS_RECORDING ) )
{ {

View file

@ -190,18 +190,43 @@
<context> <context>
<name>CAudioMixerBoard</name> <name>CAudioMixerBoard</name>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="697"/> <location filename="../../audiomixerboard.cpp" line="633"/>
<source>Personal Mix at the Server</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="634"/>
<source>When connected to a server, the controls here allow you to set </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="635"/>
<source>your local mix without affecting what others hear from you.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="636"/>
<source>The title shows the server name and, when known, whether it is actively recording.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="706"/>
<source>Server</source> <source>Server</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="706"/> <location filename="../../audiomixerboard.cpp" line="715"/>
<source>T R Y I N G T O C O N N E C T</source> <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> <translation>V E R B I N D U N G S A U F B A U</translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="819"/> <location filename="../../audiomixerboard.cpp" line="825"/>
<source>Personal Mix at the Server: </source> <source>RECORDING ACTIVE</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="828"/>
<source>Personal Mix at: </source>
<translation>Eigener Mix am Server: </translation> <translation>Eigener Mix am Server: </translation>
</message> </message>
</context> </context>
@ -715,7 +740,7 @@
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="203"/> <location filename="../../clientdlg.cpp" line="203"/>
<location filename="../../clientdlg.cpp" line="1111"/> <location filename="../../clientdlg.cpp" line="1114"/>
<source>C&amp;onnect</source> <source>C&amp;onnect</source>
<translation>&amp;Verbinden</translation> <translation>&amp;Verbinden</translation>
</message> </message>
@ -769,18 +794,18 @@
<translation>Keine</translation> <translation>Keine</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="619"/> <location filename="../../clientdlg.cpp" line="622"/>
<source>Center</source> <source>Center</source>
<translation>Mitte</translation> <translation>Mitte</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="626"/> <location filename="../../clientdlg.cpp" line="629"/>
<source>R</source> <source>R</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="107"/> <location filename="../../clientdlg.cpp" line="107"/>
<location filename="../../clientdlg.cpp" line="632"/> <location filename="../../clientdlg.cpp" line="635"/>
<source>L</source> <source>L</source>
<translation></translation> <translation></translation>
</message> </message>
@ -865,22 +890,22 @@
<translation>Sortiere Kanäle nach &amp;Instrument</translation> <translation>Sortiere Kanäle nach &amp;Instrument</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="718"/> <location filename="../../clientdlg.cpp" line="721"/>
<source>Central Server</source> <source>Central Server</source>
<translation>Zentralserver</translation> <translation>Zentralserver</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="845"/> <location filename="../../clientdlg.cpp" line="848"/>
<source>user</source> <source>user</source>
<translation>Musiker</translation> <translation>Musiker</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="850"/> <location filename="../../clientdlg.cpp" line="853"/>
<source>users</source> <source>users</source>
<translation>Musiker</translation> <translation>Musiker</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="1087"/> <location filename="../../clientdlg.cpp" line="1090"/>
<source>D&amp;isconnect</source> <source>D&amp;isconnect</source>
<translation>&amp;Trennen</translation> <translation>&amp;Trennen</translation>
</message> </message>
@ -1513,22 +1538,22 @@
<translation type="vanished">Manuell</translation> <translation type="vanished">Manuell</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="591"/> <location filename="../../util.h" line="601"/>
<source>Custom</source> <source>Custom</source>
<translation>Benutzerdefiniert</translation> <translation>Benutzerdefiniert</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="594"/> <location filename="../../util.h" line="604"/>
<source>All Genres</source> <source>All Genres</source>
<translation>Alle Genres</translation> <translation>Alle Genres</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="597"/> <location filename="../../util.h" line="607"/>
<source>Genre Rock</source> <source>Genre Rock</source>
<translation>Genre Rock</translation> <translation>Genre Rock</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="600"/> <location filename="../../util.h" line="610"/>
<source>Genre Jazz</source> <source>Genre Jazz</source>
<translation>Genre Jazz</translation> <translation>Genre Jazz</translation>
</message> </message>
@ -1537,12 +1562,12 @@
<translation type="vanished">Genre Rock/Jazz</translation> <translation type="vanished">Genre Rock/Jazz</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="603"/> <location filename="../../util.h" line="613"/>
<source>Genre Classical/Folk/Choir</source> <source>Genre Classical/Folk/Choir</source>
<translation>Genre Klassik/Volksmusik/Chor</translation> <translation>Genre Klassik/Volksmusik/Chor</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="606"/> <location filename="../../util.h" line="616"/>
<source>Default</source> <source>Default</source>
<translation>Standard</translation> <translation>Standard</translation>
</message> </message>
@ -2643,22 +2668,22 @@
<translation> Server </translation> <translation> Server </translation>
</message> </message>
<message> <message>
<location filename="../../serverdlg.cpp" line="599"/> <location filename="../../serverdlg.cpp" line="616"/>
<source>Predefined Address</source> <source>Predefined Address</source>
<translation>Vordefinierte Adresse</translation> <translation>Vordefinierte Adresse</translation>
</message> </message>
<message> <message>
<location filename="../../serverdlg.cpp" line="711"/> <location filename="../../serverdlg.cpp" line="728"/>
<source>Recording</source> <source>Recording</source>
<translation>Aufnahme</translation> <translation>Aufnahme</translation>
</message> </message>
<message> <message>
<location filename="../../serverdlg.cpp" line="716"/> <location filename="../../serverdlg.cpp" line="733"/>
<source>Not recording</source> <source>Not recording</source>
<translation>Keine Aufnahme</translation> <translation>Keine Aufnahme</translation>
</message> </message>
<message> <message>
<location filename="../../serverdlg.cpp" line="722"/> <location filename="../../serverdlg.cpp" line="739"/>
<source>Not enabled</source> <source>Not enabled</source>
<translation>Nicht aktiviert</translation> <translation>Nicht aktiviert</translation>
</message> </message>
@ -2685,42 +2710,42 @@
<translation>&amp;Fenster</translation> <translation>&amp;Fenster</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="628"/> <location filename="../../util.h" line="638"/>
<source>Unregistered</source> <source>Unregistered</source>
<translation>Nicht registriert</translation> <translation>Nicht registriert</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="631"/> <location filename="../../util.h" line="641"/>
<source>Bad address</source> <source>Bad address</source>
<translation>Ungültige Adresse</translation> <translation>Ungültige Adresse</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="634"/> <location filename="../../util.h" line="644"/>
<source>Registration requested</source> <source>Registration requested</source>
<translation>Registrierung angefordert</translation> <translation>Registrierung angefordert</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="637"/> <location filename="../../util.h" line="647"/>
<source>Registration failed</source> <source>Registration failed</source>
<translation>Registrierung fehlgeschlagen</translation> <translation>Registrierung fehlgeschlagen</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="640"/> <location filename="../../util.h" line="650"/>
<source>Check server version</source> <source>Check server version</source>
<translation>Überprüfe Version des Servers</translation> <translation>Überprüfe Version des Servers</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="643"/> <location filename="../../util.h" line="653"/>
<source>Registered</source> <source>Registered</source>
<translation>Registriert</translation> <translation>Registriert</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="646"/> <location filename="../../util.h" line="656"/>
<source>Central Server full</source> <source>Central Server full</source>
<translation>Zentralserver voll</translation> <translation>Zentralserver voll</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="649"/> <location filename="../../util.h" line="659"/>
<source>Unknown value </source> <source>Unknown value </source>
<translation>Unbekannter Wert </translation> <translation>Unbekannter Wert </translation>
</message> </message>

View file

@ -194,18 +194,43 @@
<context> <context>
<name>CAudioMixerBoard</name> <name>CAudioMixerBoard</name>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="697"/> <location filename="../../audiomixerboard.cpp" line="633"/>
<source>Personal Mix at the Server</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="634"/>
<source>When connected to a server, the controls here allow you to set </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="635"/>
<source>your local mix without affecting what others hear from you.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="636"/>
<source>The title shows the server name and, when known, whether it is actively recording.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="706"/>
<source>Server</source> <source>Server</source>
<translation>Servidor</translation> <translation>Servidor</translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="706"/> <location filename="../../audiomixerboard.cpp" line="715"/>
<source>T R Y I N G T O C O N N E C T</source> <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> <translation>I N T E N T A N D O C O N E C T A R</translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="819"/> <location filename="../../audiomixerboard.cpp" line="825"/>
<source>Personal Mix at the Server: </source> <source>RECORDING ACTIVE</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="828"/>
<source>Personal Mix at: </source>
<translation>Mezcla Personal en el Servidor: </translation> <translation>Mezcla Personal en el Servidor: </translation>
</message> </message>
</context> </context>
@ -727,7 +752,7 @@
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="203"/> <location filename="../../clientdlg.cpp" line="203"/>
<location filename="../../clientdlg.cpp" line="1111"/> <location filename="../../clientdlg.cpp" line="1114"/>
<source>C&amp;onnect</source> <source>C&amp;onnect</source>
<translation>C&amp;onectar</translation> <translation>C&amp;onectar</translation>
</message> </message>
@ -777,18 +802,18 @@
<translation>Ninguno</translation> <translation>Ninguno</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="619"/> <location filename="../../clientdlg.cpp" line="622"/>
<source>Center</source> <source>Center</source>
<translation>Centro</translation> <translation>Centro</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="626"/> <location filename="../../clientdlg.cpp" line="629"/>
<source>R</source> <source>R</source>
<translation>R</translation> <translation>R</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="107"/> <location filename="../../clientdlg.cpp" line="107"/>
<location filename="../../clientdlg.cpp" line="632"/> <location filename="../../clientdlg.cpp" line="635"/>
<source>L</source> <source>L</source>
<translation>L</translation> <translation>L</translation>
</message> </message>
@ -873,22 +898,22 @@
<translation>Ordenar Canales por &amp;Instrumento</translation> <translation>Ordenar Canales por &amp;Instrumento</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="718"/> <location filename="../../clientdlg.cpp" line="721"/>
<source>Central Server</source> <source>Central Server</source>
<translation>Servidor Central</translation> <translation>Servidor Central</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="845"/> <location filename="../../clientdlg.cpp" line="848"/>
<source>user</source> <source>user</source>
<translation>usuario</translation> <translation>usuario</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="850"/> <location filename="../../clientdlg.cpp" line="853"/>
<source>users</source> <source>users</source>
<translation>usuarios</translation> <translation>usuarios</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="1087"/> <location filename="../../clientdlg.cpp" line="1090"/>
<source>D&amp;isconnect</source> <source>D&amp;isconnect</source>
<translation>D&amp;esconectar</translation> <translation>D&amp;esconectar</translation>
</message> </message>
@ -1521,12 +1546,12 @@
<translation type="vanished">Manual</translation> <translation type="vanished">Manual</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="591"/> <location filename="../../util.h" line="601"/>
<source>Custom</source> <source>Custom</source>
<translation>Personalizado</translation> <translation>Personalizado</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="594"/> <location filename="../../util.h" line="604"/>
<source>All Genres</source> <source>All Genres</source>
<translation>Todos los Géneros</translation> <translation>Todos los Géneros</translation>
</message> </message>
@ -1535,22 +1560,22 @@
<translation type="vanished">Género Rock/Jazz</translation> <translation type="vanished">Género Rock/Jazz</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="603"/> <location filename="../../util.h" line="613"/>
<source>Genre Classical/Folk/Choir</source> <source>Genre Classical/Folk/Choir</source>
<translation>Género Clásica/Folk/Coro</translation> <translation>Género Clásica/Folk/Coro</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="597"/> <location filename="../../util.h" line="607"/>
<source>Genre Rock</source> <source>Genre Rock</source>
<translation>Género Rock</translation> <translation>Género Rock</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="600"/> <location filename="../../util.h" line="610"/>
<source>Genre Jazz</source> <source>Genre Jazz</source>
<translation>Género Jazz</translation> <translation>Género Jazz</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="606"/> <location filename="../../util.h" line="616"/>
<source>Default</source> <source>Default</source>
<translation>Por defecto</translation> <translation>Por defecto</translation>
</message> </message>
@ -2655,22 +2680,22 @@
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../../serverdlg.cpp" line="599"/> <location filename="../../serverdlg.cpp" line="616"/>
<source>Predefined Address</source> <source>Predefined Address</source>
<translation>Dirección Preestablecida</translation> <translation>Dirección Preestablecida</translation>
</message> </message>
<message> <message>
<location filename="../../serverdlg.cpp" line="711"/> <location filename="../../serverdlg.cpp" line="728"/>
<source>Recording</source> <source>Recording</source>
<translation>Grabando</translation> <translation>Grabando</translation>
</message> </message>
<message> <message>
<location filename="../../serverdlg.cpp" line="716"/> <location filename="../../serverdlg.cpp" line="733"/>
<source>Not recording</source> <source>Not recording</source>
<translation>No grabando</translation> <translation>No grabando</translation>
</message> </message>
<message> <message>
<location filename="../../serverdlg.cpp" line="722"/> <location filename="../../serverdlg.cpp" line="739"/>
<source>Not enabled</source> <source>Not enabled</source>
<translation>No habilitado</translation> <translation>No habilitado</translation>
</message> </message>
@ -2697,42 +2722,42 @@
<translation>&amp;Ventana</translation> <translation>&amp;Ventana</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="628"/> <location filename="../../util.h" line="638"/>
<source>Unregistered</source> <source>Unregistered</source>
<translation>Sin registrar</translation> <translation>Sin registrar</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="631"/> <location filename="../../util.h" line="641"/>
<source>Bad address</source> <source>Bad address</source>
<translation>Dirección no válida</translation> <translation>Dirección no válida</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="634"/> <location filename="../../util.h" line="644"/>
<source>Registration requested</source> <source>Registration requested</source>
<translation>Registro solicitado</translation> <translation>Registro solicitado</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="637"/> <location filename="../../util.h" line="647"/>
<source>Registration failed</source> <source>Registration failed</source>
<translation>Error de registro</translation> <translation>Error de registro</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="640"/> <location filename="../../util.h" line="650"/>
<source>Check server version</source> <source>Check server version</source>
<translation>Comprueba la versión del servidor</translation> <translation>Comprueba la versión del servidor</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="643"/> <location filename="../../util.h" line="653"/>
<source>Registered</source> <source>Registered</source>
<translation>Registrado</translation> <translation>Registrado</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="646"/> <location filename="../../util.h" line="656"/>
<source>Central Server full</source> <source>Central Server full</source>
<translation>Servidor Central lleno</translation> <translation>Servidor Central lleno</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="649"/> <location filename="../../util.h" line="659"/>
<source>Unknown value </source> <source>Unknown value </source>
<translation>Valor desconocido </translation> <translation>Valor desconocido </translation>
</message> </message>

View file

@ -202,18 +202,43 @@
<context> <context>
<name>CAudioMixerBoard</name> <name>CAudioMixerBoard</name>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="697"/> <location filename="../../audiomixerboard.cpp" line="633"/>
<source>Personal Mix at the Server</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="634"/>
<source>When connected to a server, the controls here allow you to set </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="635"/>
<source>your local mix without affecting what others hear from you.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="636"/>
<source>The title shows the server name and, when known, whether it is actively recording.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="706"/>
<source>Server</source> <source>Server</source>
<translation>Serveur</translation> <translation>Serveur</translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="706"/> <location filename="../../audiomixerboard.cpp" line="715"/>
<source>T R Y I N G T O C O N N E C T</source> <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> <translation>T E N T A T I V E D E C O N N E X I O N</translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="819"/> <location filename="../../audiomixerboard.cpp" line="825"/>
<source>Personal Mix at the Server: </source> <source>RECORDING ACTIVE</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="828"/>
<source>Personal Mix at: </source>
<translation>Mixage personnel du serveur : </translation> <translation>Mixage personnel du serveur : </translation>
</message> </message>
</context> </context>
@ -723,7 +748,7 @@
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="203"/> <location filename="../../clientdlg.cpp" line="203"/>
<location filename="../../clientdlg.cpp" line="1111"/> <location filename="../../clientdlg.cpp" line="1114"/>
<source>C&amp;onnect</source> <source>C&amp;onnect</source>
<translation>Se c&amp;onnecter</translation> <translation>Se c&amp;onnecter</translation>
</message> </message>
@ -777,18 +802,18 @@
<translation>Aucun</translation> <translation>Aucun</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="619"/> <location filename="../../clientdlg.cpp" line="622"/>
<source>Center</source> <source>Center</source>
<translation>Centre</translation> <translation>Centre</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="626"/> <location filename="../../clientdlg.cpp" line="629"/>
<source>R</source> <source>R</source>
<translation>D</translation> <translation>D</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="107"/> <location filename="../../clientdlg.cpp" line="107"/>
<location filename="../../clientdlg.cpp" line="632"/> <location filename="../../clientdlg.cpp" line="635"/>
<source>L</source> <source>L</source>
<translation>G</translation> <translation>G</translation>
</message> </message>
@ -873,22 +898,22 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="718"/> <location filename="../../clientdlg.cpp" line="721"/>
<source>Central Server</source> <source>Central Server</source>
<translation>Serveur central</translation> <translation>Serveur central</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="845"/> <location filename="../../clientdlg.cpp" line="848"/>
<source>user</source> <source>user</source>
<translation>utilisateur</translation> <translation>utilisateur</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="850"/> <location filename="../../clientdlg.cpp" line="853"/>
<source>users</source> <source>users</source>
<translation>utilisateurs</translation> <translation>utilisateurs</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="1087"/> <location filename="../../clientdlg.cpp" line="1090"/>
<source>D&amp;isconnect</source> <source>D&amp;isconnect</source>
<translation>&amp;connecter</translation> <translation>&amp;connecter</translation>
</message> </message>
@ -1525,12 +1550,12 @@
<translation type="vanished">Manuel</translation> <translation type="vanished">Manuel</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="591"/> <location filename="../../util.h" line="601"/>
<source>Custom</source> <source>Custom</source>
<translation>Personnalisé</translation> <translation>Personnalisé</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="594"/> <location filename="../../util.h" line="604"/>
<source>All Genres</source> <source>All Genres</source>
<translation>Tous les genres</translation> <translation>Tous les genres</translation>
</message> </message>
@ -1539,22 +1564,22 @@
<translation type="vanished">Genre rock/jazz</translation> <translation type="vanished">Genre rock/jazz</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="603"/> <location filename="../../util.h" line="613"/>
<source>Genre Classical/Folk/Choir</source> <source>Genre Classical/Folk/Choir</source>
<translation>Genre classique/folk/choeur</translation> <translation>Genre classique/folk/choeur</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="597"/> <location filename="../../util.h" line="607"/>
<source>Genre Rock</source> <source>Genre Rock</source>
<translation>Genre Rock</translation> <translation>Genre Rock</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="600"/> <location filename="../../util.h" line="610"/>
<source>Genre Jazz</source> <source>Genre Jazz</source>
<translation>Genre Jazz</translation> <translation>Genre Jazz</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="606"/> <location filename="../../util.h" line="616"/>
<source>Default</source> <source>Default</source>
<translation>Défaut</translation> <translation>Défaut</translation>
</message> </message>
@ -2647,22 +2672,22 @@
<translation> serveur </translation> <translation> serveur </translation>
</message> </message>
<message> <message>
<location filename="../../serverdlg.cpp" line="599"/> <location filename="../../serverdlg.cpp" line="616"/>
<source>Predefined Address</source> <source>Predefined Address</source>
<translation>Adresse prédéfinie</translation> <translation>Adresse prédéfinie</translation>
</message> </message>
<message> <message>
<location filename="../../serverdlg.cpp" line="711"/> <location filename="../../serverdlg.cpp" line="728"/>
<source>Recording</source> <source>Recording</source>
<translation>Enregistrement</translation> <translation>Enregistrement</translation>
</message> </message>
<message> <message>
<location filename="../../serverdlg.cpp" line="716"/> <location filename="../../serverdlg.cpp" line="733"/>
<source>Not recording</source> <source>Not recording</source>
<translation>Ne pas enregistrer</translation> <translation>Ne pas enregistrer</translation>
</message> </message>
<message> <message>
<location filename="../../serverdlg.cpp" line="722"/> <location filename="../../serverdlg.cpp" line="739"/>
<source>Not enabled</source> <source>Not enabled</source>
<translation>Non activé</translation> <translation>Non activé</translation>
</message> </message>
@ -2689,42 +2714,42 @@
<translation>&amp;Fenêtre</translation> <translation>&amp;Fenêtre</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="628"/> <location filename="../../util.h" line="638"/>
<source>Unregistered</source> <source>Unregistered</source>
<translation>Non inscrit</translation> <translation>Non inscrit</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="631"/> <location filename="../../util.h" line="641"/>
<source>Bad address</source> <source>Bad address</source>
<translation>Mauvaise adresse</translation> <translation>Mauvaise adresse</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="634"/> <location filename="../../util.h" line="644"/>
<source>Registration requested</source> <source>Registration requested</source>
<translation>Inscription demandée</translation> <translation>Inscription demandée</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="637"/> <location filename="../../util.h" line="647"/>
<source>Registration failed</source> <source>Registration failed</source>
<translation>Échec de l&apos;inscription</translation> <translation>Échec de l&apos;inscription</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="640"/> <location filename="../../util.h" line="650"/>
<source>Check server version</source> <source>Check server version</source>
<translation>Vérifier la version du serveur</translation> <translation>Vérifier la version du serveur</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="643"/> <location filename="../../util.h" line="653"/>
<source>Registered</source> <source>Registered</source>
<translation>Inscrit</translation> <translation>Inscrit</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="646"/> <location filename="../../util.h" line="656"/>
<source>Central Server full</source> <source>Central Server full</source>
<translation>Serveur central rempli</translation> <translation>Serveur central rempli</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="649"/> <location filename="../../util.h" line="659"/>
<source>Unknown value </source> <source>Unknown value </source>
<translation>Valeur inconnue</translation> <translation>Valeur inconnue</translation>
</message> </message>

View file

@ -190,18 +190,43 @@
<context> <context>
<name>CAudioMixerBoard</name> <name>CAudioMixerBoard</name>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="697"/> <location filename="../../audiomixerboard.cpp" line="633"/>
<source>Personal Mix at the Server</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="634"/>
<source>When connected to a server, the controls here allow you to set </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="635"/>
<source>your local mix without affecting what others hear from you.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="636"/>
<source>The title shows the server name and, when known, whether it is actively recording.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="706"/>
<source>Server</source> <source>Server</source>
<translation>Server</translation> <translation>Server</translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="706"/> <location filename="../../audiomixerboard.cpp" line="715"/>
<source>T R Y I N G T O C O N N E C T</source> <source>T R Y I N G T O C O N N E C T</source>
<translation>I N A T T E S A D I C O N N E S S I O N E</translation> <translation>I N A T T E S A D I C O N N E S S I O N E</translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="819"/> <location filename="../../audiomixerboard.cpp" line="825"/>
<source>Personal Mix at the Server: </source> <source>RECORDING ACTIVE</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="828"/>
<source>Personal Mix at: </source>
<translation>Mixer personale sul Server: </translation> <translation>Mixer personale sul Server: </translation>
</message> </message>
</context> </context>
@ -560,7 +585,7 @@
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="107"/> <location filename="../../clientdlg.cpp" line="107"/>
<location filename="../../clientdlg.cpp" line="632"/> <location filename="../../clientdlg.cpp" line="635"/>
<source>L</source> <source>L</source>
<translation>L</translation> <translation>L</translation>
</message> </message>
@ -783,7 +808,7 @@
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="203"/> <location filename="../../clientdlg.cpp" line="203"/>
<location filename="../../clientdlg.cpp" line="1111"/> <location filename="../../clientdlg.cpp" line="1114"/>
<source>C&amp;onnect</source> <source>C&amp;onnect</source>
<translation>C&amp;onnetti</translation> <translation>C&amp;onnetti</translation>
</message> </message>
@ -847,32 +872,32 @@
<translation>Nullo</translation> <translation>Nullo</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="619"/> <location filename="../../clientdlg.cpp" line="622"/>
<source>Center</source> <source>Center</source>
<translation>Centro</translation> <translation>Centro</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="626"/> <location filename="../../clientdlg.cpp" line="629"/>
<source>R</source> <source>R</source>
<translation>R</translation> <translation>R</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="718"/> <location filename="../../clientdlg.cpp" line="721"/>
<source>Central Server</source> <source>Central Server</source>
<translation>Server Centrale</translation> <translation>Server Centrale</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="845"/> <location filename="../../clientdlg.cpp" line="848"/>
<source>user</source> <source>user</source>
<translation>utente</translation> <translation>utente</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="850"/> <location filename="../../clientdlg.cpp" line="853"/>
<source>users</source> <source>users</source>
<translation>utenti</translation> <translation>utenti</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="1087"/> <location filename="../../clientdlg.cpp" line="1090"/>
<source>D&amp;isconnect</source> <source>D&amp;isconnect</source>
<translation>D&amp;isconnetti</translation> <translation>D&amp;isconnetti</translation>
</message> </message>
@ -1537,32 +1562,32 @@
<translation>Ok</translation> <translation>Ok</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="591"/> <location filename="../../util.h" line="601"/>
<source>Custom</source> <source>Custom</source>
<translation>Personalizzato</translation> <translation>Personalizzato</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="594"/> <location filename="../../util.h" line="604"/>
<source>All Genres</source> <source>All Genres</source>
<translation>Tutti i Generi</translation> <translation>Tutti i Generi</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="597"/> <location filename="../../util.h" line="607"/>
<source>Genre Rock</source> <source>Genre Rock</source>
<translation>Genere Rock</translation> <translation>Genere Rock</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="600"/> <location filename="../../util.h" line="610"/>
<source>Genre Jazz</source> <source>Genre Jazz</source>
<translation>Genere Jazz</translation> <translation>Genere Jazz</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="603"/> <location filename="../../util.h" line="613"/>
<source>Genre Classical/Folk/Choir</source> <source>Genre Classical/Folk/Choir</source>
<translation>Genere Classica/Folk/Corale</translation> <translation>Genere Classica/Folk/Corale</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="606"/> <location filename="../../util.h" line="616"/>
<source>Default</source> <source>Default</source>
<translation>Default</translation> <translation>Default</translation>
</message> </message>
@ -2621,62 +2646,62 @@
<translation>&amp;Finestra</translation> <translation>&amp;Finestra</translation>
</message> </message>
<message> <message>
<location filename="../../serverdlg.cpp" line="599"/> <location filename="../../serverdlg.cpp" line="616"/>
<source>Predefined Address</source> <source>Predefined Address</source>
<translation>Indirizzo Predefinito</translation> <translation>Indirizzo Predefinito</translation>
</message> </message>
<message> <message>
<location filename="../../serverdlg.cpp" line="711"/> <location filename="../../serverdlg.cpp" line="728"/>
<source>Recording</source> <source>Recording</source>
<translation>Registrazione</translation> <translation>Registrazione</translation>
</message> </message>
<message> <message>
<location filename="../../serverdlg.cpp" line="716"/> <location filename="../../serverdlg.cpp" line="733"/>
<source>Not recording</source> <source>Not recording</source>
<translation>Registrazione Ferma</translation> <translation>Registrazione Ferma</translation>
</message> </message>
<message> <message>
<location filename="../../serverdlg.cpp" line="722"/> <location filename="../../serverdlg.cpp" line="739"/>
<source>Not enabled</source> <source>Not enabled</source>
<translation>Non Abilitata</translation> <translation>Non Abilitata</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="628"/> <location filename="../../util.h" line="638"/>
<source>Unregistered</source> <source>Unregistered</source>
<translation>Non registrato</translation> <translation>Non registrato</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="631"/> <location filename="../../util.h" line="641"/>
<source>Bad address</source> <source>Bad address</source>
<translation>Indirizzo Errato</translation> <translation>Indirizzo Errato</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="634"/> <location filename="../../util.h" line="644"/>
<source>Registration requested</source> <source>Registration requested</source>
<translation>Registrazione richiesta</translation> <translation>Registrazione richiesta</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="637"/> <location filename="../../util.h" line="647"/>
<source>Registration failed</source> <source>Registration failed</source>
<translation>Registrazione fallita</translation> <translation>Registrazione fallita</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="640"/> <location filename="../../util.h" line="650"/>
<source>Check server version</source> <source>Check server version</source>
<translation>Controlla Versione server</translation> <translation>Controlla Versione server</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="643"/> <location filename="../../util.h" line="653"/>
<source>Registered</source> <source>Registered</source>
<translation>Registrato</translation> <translation>Registrato</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="646"/> <location filename="../../util.h" line="656"/>
<source>Central Server full</source> <source>Central Server full</source>
<translation>Server Centrale Pieno</translation> <translation>Server Centrale Pieno</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="649"/> <location filename="../../util.h" line="659"/>
<source>Unknown value </source> <source>Unknown value </source>
<translation>Valore sconosciuto </translation> <translation>Valore sconosciuto </translation>
</message> </message>

View file

@ -190,18 +190,43 @@
<context> <context>
<name>CAudioMixerBoard</name> <name>CAudioMixerBoard</name>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="697"/> <location filename="../../audiomixerboard.cpp" line="633"/>
<source>Personal Mix at the Server</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="634"/>
<source>When connected to a server, the controls here allow you to set </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="635"/>
<source>your local mix without affecting what others hear from you.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="636"/>
<source>The title shows the server name and, when known, whether it is actively recording.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="706"/>
<source>Server</source> <source>Server</source>
<translation>Server</translation> <translation>Server</translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="706"/> <location filename="../../audiomixerboard.cpp" line="715"/>
<source>T R Y I N G T O C O N N E C T</source> <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> <translation>A A N H E T V E R B I N D E N</translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="819"/> <location filename="../../audiomixerboard.cpp" line="825"/>
<source>Personal Mix at the Server: </source> <source>RECORDING ACTIVE</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="828"/>
<source>Personal Mix at: </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
@ -552,7 +577,7 @@
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="107"/> <location filename="../../clientdlg.cpp" line="107"/>
<location filename="../../clientdlg.cpp" line="632"/> <location filename="../../clientdlg.cpp" line="635"/>
<source>L</source> <source>L</source>
<translation>L</translation> <translation>L</translation>
</message> </message>
@ -775,7 +800,7 @@
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="203"/> <location filename="../../clientdlg.cpp" line="203"/>
<location filename="../../clientdlg.cpp" line="1111"/> <location filename="../../clientdlg.cpp" line="1114"/>
<source>C&amp;onnect</source> <source>C&amp;onnect</source>
<translation>C&amp;onnect</translation> <translation>C&amp;onnect</translation>
</message> </message>
@ -835,32 +860,32 @@
<translation>Geen</translation> <translation>Geen</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="619"/> <location filename="../../clientdlg.cpp" line="622"/>
<source>Center</source> <source>Center</source>
<translation>Centrum</translation> <translation>Centrum</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="626"/> <location filename="../../clientdlg.cpp" line="629"/>
<source>R</source> <source>R</source>
<translation>R</translation> <translation>R</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="718"/> <location filename="../../clientdlg.cpp" line="721"/>
<source>Central Server</source> <source>Central Server</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="845"/> <location filename="../../clientdlg.cpp" line="848"/>
<source>user</source> <source>user</source>
<translation>gebruiker</translation> <translation>gebruiker</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="850"/> <location filename="../../clientdlg.cpp" line="853"/>
<source>users</source> <source>users</source>
<translation>gebruikers</translation> <translation>gebruikers</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="1087"/> <location filename="../../clientdlg.cpp" line="1090"/>
<source>D&amp;isconnect</source> <source>D&amp;isconnect</source>
<translation>&amp;Afmelden</translation> <translation>&amp;Afmelden</translation>
</message> </message>
@ -1485,32 +1510,32 @@
<translation type="vanished">Handmatig</translation> <translation type="vanished">Handmatig</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="591"/> <location filename="../../util.h" line="601"/>
<source>Custom</source> <source>Custom</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="594"/> <location filename="../../util.h" line="604"/>
<source>All Genres</source> <source>All Genres</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="597"/> <location filename="../../util.h" line="607"/>
<source>Genre Rock</source> <source>Genre Rock</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="600"/> <location filename="../../util.h" line="610"/>
<source>Genre Jazz</source> <source>Genre Jazz</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="603"/> <location filename="../../util.h" line="613"/>
<source>Genre Classical/Folk/Choir</source> <source>Genre Classical/Folk/Choir</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="606"/> <location filename="../../util.h" line="616"/>
<source>Default</source> <source>Default</source>
<translation>Standaard</translation> <translation>Standaard</translation>
</message> </message>
@ -2599,22 +2624,22 @@
<translation> server</translation> <translation> server</translation>
</message> </message>
<message> <message>
<location filename="../../serverdlg.cpp" line="599"/> <location filename="../../serverdlg.cpp" line="616"/>
<source>Predefined Address</source> <source>Predefined Address</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../serverdlg.cpp" line="711"/> <location filename="../../serverdlg.cpp" line="728"/>
<source>Recording</source> <source>Recording</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../serverdlg.cpp" line="716"/> <location filename="../../serverdlg.cpp" line="733"/>
<source>Not recording</source> <source>Not recording</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../serverdlg.cpp" line="722"/> <location filename="../../serverdlg.cpp" line="739"/>
<source>Not enabled</source> <source>Not enabled</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2641,42 +2666,42 @@
<translation>&amp;Window</translation> <translation>&amp;Window</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="628"/> <location filename="../../util.h" line="638"/>
<source>Unregistered</source> <source>Unregistered</source>
<translation>Niet geregistreerd</translation> <translation>Niet geregistreerd</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="631"/> <location filename="../../util.h" line="641"/>
<source>Bad address</source> <source>Bad address</source>
<translation>Slecht adres</translation> <translation>Slecht adres</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="634"/> <location filename="../../util.h" line="644"/>
<source>Registration requested</source> <source>Registration requested</source>
<translation>Aanmelding gevraagd</translation> <translation>Aanmelding gevraagd</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="637"/> <location filename="../../util.h" line="647"/>
<source>Registration failed</source> <source>Registration failed</source>
<translation>Registratie is mislukt</translation> <translation>Registratie is mislukt</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="640"/> <location filename="../../util.h" line="650"/>
<source>Check server version</source> <source>Check server version</source>
<translation>Controleer de versie van de server</translation> <translation>Controleer de versie van de server</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="643"/> <location filename="../../util.h" line="653"/>
<source>Registered</source> <source>Registered</source>
<translation>Geregistreerd</translation> <translation>Geregistreerd</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="646"/> <location filename="../../util.h" line="656"/>
<source>Central Server full</source> <source>Central Server full</source>
<translation>Centrale server vol</translation> <translation>Centrale server vol</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="649"/> <location filename="../../util.h" line="659"/>
<source>Unknown value </source> <source>Unknown value </source>
<translation>Onbekende waarde </translation> <translation>Onbekende waarde </translation>
</message> </message>

View file

@ -158,18 +158,43 @@
<context> <context>
<name>CAudioMixerBoard</name> <name>CAudioMixerBoard</name>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="697"/> <location filename="../../audiomixerboard.cpp" line="633"/>
<source>Server</source> <source>Personal Mix at the Server</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="634"/>
<source>When connected to a server, the controls here allow you to set </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="635"/>
<source>your local mix without affecting what others hear from you.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="636"/>
<source>The title shows the server name and, when known, whether it is actively recording.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="706"/> <location filename="../../audiomixerboard.cpp" line="706"/>
<source>Server</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="715"/>
<source>T R Y I N G T O C O N N E C T</source> <source>T R Y I N G T O C O N N E C T</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="819"/> <location filename="../../audiomixerboard.cpp" line="825"/>
<source>Personal Mix at the Server: </source> <source>RECORDING ACTIVE</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="828"/>
<source>Personal Mix at: </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
@ -464,7 +489,7 @@
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="107"/> <location filename="../../clientdlg.cpp" line="107"/>
<location filename="../../clientdlg.cpp" line="632"/> <location filename="../../clientdlg.cpp" line="635"/>
<source>L</source> <source>L</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -635,7 +660,7 @@
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="203"/> <location filename="../../clientdlg.cpp" line="203"/>
<location filename="../../clientdlg.cpp" line="1111"/> <location filename="../../clientdlg.cpp" line="1114"/>
<source>C&amp;onnect</source> <source>C&amp;onnect</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -695,32 +720,32 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="619"/> <location filename="../../clientdlg.cpp" line="622"/>
<source>Center</source> <source>Center</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="626"/> <location filename="../../clientdlg.cpp" line="629"/>
<source>R</source> <source>R</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="718"/> <location filename="../../clientdlg.cpp" line="721"/>
<source>Central Server</source> <source>Central Server</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="845"/> <location filename="../../clientdlg.cpp" line="848"/>
<source>user</source> <source>user</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="850"/> <location filename="../../clientdlg.cpp" line="853"/>
<source>users</source> <source>users</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="1087"/> <location filename="../../clientdlg.cpp" line="1090"/>
<source>D&amp;isconnect</source> <source>D&amp;isconnect</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1225,32 +1250,32 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="591"/> <location filename="../../util.h" line="601"/>
<source>Custom</source> <source>Custom</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="594"/> <location filename="../../util.h" line="604"/>
<source>All Genres</source> <source>All Genres</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="597"/> <location filename="../../util.h" line="607"/>
<source>Genre Rock</source> <source>Genre Rock</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="600"/> <location filename="../../util.h" line="610"/>
<source>Genre Jazz</source> <source>Genre Jazz</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="603"/> <location filename="../../util.h" line="613"/>
<source>Genre Classical/Folk/Choir</source> <source>Genre Classical/Folk/Choir</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="606"/> <location filename="../../util.h" line="616"/>
<source>Default</source> <source>Default</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2244,22 +2269,22 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../serverdlg.cpp" line="599"/> <location filename="../../serverdlg.cpp" line="616"/>
<source>Predefined Address</source> <source>Predefined Address</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../serverdlg.cpp" line="711"/> <location filename="../../serverdlg.cpp" line="728"/>
<source>Recording</source> <source>Recording</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../serverdlg.cpp" line="716"/> <location filename="../../serverdlg.cpp" line="733"/>
<source>Not recording</source> <source>Not recording</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../serverdlg.cpp" line="722"/> <location filename="../../serverdlg.cpp" line="739"/>
<source>Not enabled</source> <source>Not enabled</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2289,42 +2314,42 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="628"/> <location filename="../../util.h" line="638"/>
<source>Unregistered</source> <source>Unregistered</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="631"/> <location filename="../../util.h" line="641"/>
<source>Bad address</source> <source>Bad address</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="634"/> <location filename="../../util.h" line="644"/>
<source>Registration requested</source> <source>Registration requested</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="637"/> <location filename="../../util.h" line="647"/>
<source>Registration failed</source> <source>Registration failed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="640"/> <location filename="../../util.h" line="650"/>
<source>Check server version</source> <source>Check server version</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="643"/> <location filename="../../util.h" line="653"/>
<source>Registered</source> <source>Registered</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="646"/> <location filename="../../util.h" line="656"/>
<source>Central Server full</source> <source>Central Server full</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="649"/> <location filename="../../util.h" line="659"/>
<source>Unknown value </source> <source>Unknown value </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

View file

@ -202,18 +202,43 @@
<context> <context>
<name>CAudioMixerBoard</name> <name>CAudioMixerBoard</name>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="697"/> <location filename="../../audiomixerboard.cpp" line="633"/>
<source>Personal Mix at the Server</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="634"/>
<source>When connected to a server, the controls here allow you to set </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="635"/>
<source>your local mix without affecting what others hear from you.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="636"/>
<source>The title shows the server name and, when known, whether it is actively recording.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="706"/>
<source>Server</source> <source>Server</source>
<translation>Servidor</translation> <translation>Servidor</translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="706"/> <location filename="../../audiomixerboard.cpp" line="715"/>
<source>T R Y I N G T O C O N N E C T</source> <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> <translation>T E N T A N D O L I G A R</translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="819"/> <location filename="../../audiomixerboard.cpp" line="825"/>
<source>Personal Mix at the Server: </source> <source>RECORDING ACTIVE</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="828"/>
<source>Personal Mix at: </source>
<translation>Mistura Pessoal no Servidor: </translation> <translation>Mistura Pessoal no Servidor: </translation>
</message> </message>
</context> </context>
@ -719,7 +744,7 @@
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="203"/> <location filename="../../clientdlg.cpp" line="203"/>
<location filename="../../clientdlg.cpp" line="1111"/> <location filename="../../clientdlg.cpp" line="1114"/>
<source>C&amp;onnect</source> <source>C&amp;onnect</source>
<translation>&amp;Ligar</translation> <translation>&amp;Ligar</translation>
</message> </message>
@ -773,18 +798,18 @@
<translation>Nenhum</translation> <translation>Nenhum</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="619"/> <location filename="../../clientdlg.cpp" line="622"/>
<source>Center</source> <source>Center</source>
<translation>Centro</translation> <translation>Centro</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="626"/> <location filename="../../clientdlg.cpp" line="629"/>
<source>R</source> <source>R</source>
<translation>R</translation> <translation>R</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="107"/> <location filename="../../clientdlg.cpp" line="107"/>
<location filename="../../clientdlg.cpp" line="632"/> <location filename="../../clientdlg.cpp" line="635"/>
<source>L</source> <source>L</source>
<translation>L</translation> <translation>L</translation>
</message> </message>
@ -869,22 +894,22 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="718"/> <location filename="../../clientdlg.cpp" line="721"/>
<source>Central Server</source> <source>Central Server</source>
<translation>Servidor Central</translation> <translation>Servidor Central</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="845"/> <location filename="../../clientdlg.cpp" line="848"/>
<source>user</source> <source>user</source>
<translation>utilizador</translation> <translation>utilizador</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="850"/> <location filename="../../clientdlg.cpp" line="853"/>
<source>users</source> <source>users</source>
<translation>utilizadores</translation> <translation>utilizadores</translation>
</message> </message>
<message> <message>
<location filename="../../clientdlg.cpp" line="1087"/> <location filename="../../clientdlg.cpp" line="1090"/>
<source>D&amp;isconnect</source> <source>D&amp;isconnect</source>
<translation>Desl&amp;igar</translation> <translation>Desl&amp;igar</translation>
</message> </message>
@ -1513,22 +1538,22 @@
<translation type="vanished">Manual</translation> <translation type="vanished">Manual</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="591"/> <location filename="../../util.h" line="601"/>
<source>Custom</source> <source>Custom</source>
<translation>Personalizado</translation> <translation>Personalizado</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="594"/> <location filename="../../util.h" line="604"/>
<source>All Genres</source> <source>All Genres</source>
<translation>Servidor Geral</translation> <translation>Servidor Geral</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="597"/> <location filename="../../util.h" line="607"/>
<source>Genre Rock</source> <source>Genre Rock</source>
<translation>Servidor Rock</translation> <translation>Servidor Rock</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="600"/> <location filename="../../util.h" line="610"/>
<source>Genre Jazz</source> <source>Genre Jazz</source>
<translation>Servidor Jazz</translation> <translation>Servidor Jazz</translation>
</message> </message>
@ -1537,12 +1562,12 @@
<translation type="vanished">Servidor Rock/Jazz</translation> <translation type="vanished">Servidor Rock/Jazz</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="603"/> <location filename="../../util.h" line="613"/>
<source>Genre Classical/Folk/Choir</source> <source>Genre Classical/Folk/Choir</source>
<translation>Serv. Clássica/Folclore/Coro</translation> <translation>Serv. Clássica/Folclore/Coro</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="606"/> <location filename="../../util.h" line="616"/>
<source>Default</source> <source>Default</source>
<translation>Servidor Padrão</translation> <translation>Servidor Padrão</translation>
</message> </message>
@ -2631,22 +2656,22 @@
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../../serverdlg.cpp" line="599"/> <location filename="../../serverdlg.cpp" line="616"/>
<source>Predefined Address</source> <source>Predefined Address</source>
<translation>Endereço Predefinido</translation> <translation>Endereço Predefinido</translation>
</message> </message>
<message> <message>
<location filename="../../serverdlg.cpp" line="711"/> <location filename="../../serverdlg.cpp" line="728"/>
<source>Recording</source> <source>Recording</source>
<translation>A gravar</translation> <translation>A gravar</translation>
</message> </message>
<message> <message>
<location filename="../../serverdlg.cpp" line="716"/> <location filename="../../serverdlg.cpp" line="733"/>
<source>Not recording</source> <source>Not recording</source>
<translation>Não está a gravar</translation> <translation>Não está a gravar</translation>
</message> </message>
<message> <message>
<location filename="../../serverdlg.cpp" line="722"/> <location filename="../../serverdlg.cpp" line="739"/>
<source>Not enabled</source> <source>Not enabled</source>
<translation>Desactivado</translation> <translation>Desactivado</translation>
</message> </message>
@ -2673,42 +2698,42 @@
<translation>&amp;Janela</translation> <translation>&amp;Janela</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="628"/> <location filename="../../util.h" line="638"/>
<source>Unregistered</source> <source>Unregistered</source>
<translation>Não Registado</translation> <translation>Não Registado</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="631"/> <location filename="../../util.h" line="641"/>
<source>Bad address</source> <source>Bad address</source>
<translation>Endereço incorrecto</translation> <translation>Endereço incorrecto</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="634"/> <location filename="../../util.h" line="644"/>
<source>Registration requested</source> <source>Registration requested</source>
<translation>Registo solicitado</translation> <translation>Registo solicitado</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="637"/> <location filename="../../util.h" line="647"/>
<source>Registration failed</source> <source>Registration failed</source>
<translation>Falha no registo</translation> <translation>Falha no registo</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="640"/> <location filename="../../util.h" line="650"/>
<source>Check server version</source> <source>Check server version</source>
<translation>Verifique versão do servidor</translation> <translation>Verifique versão do servidor</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="643"/> <location filename="../../util.h" line="653"/>
<source>Registered</source> <source>Registered</source>
<translation>Registado</translation> <translation>Registado</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="646"/> <location filename="../../util.h" line="656"/>
<source>Central Server full</source> <source>Central Server full</source>
<translation>Servidor Central Cheio</translation> <translation>Servidor Central Cheio</translation>
</message> </message>
<message> <message>
<location filename="../../util.h" line="649"/> <location filename="../../util.h" line="659"/>
<source>Unknown value </source> <source>Unknown value </source>
<translation>Valor desconhecido </translation> <translation>Valor desconhecido </translation>
</message> </message>