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

Merge pull request #9 from corrados/master

Browse Source 
update
This commit is contained in:
ignotus 2020-05-18 09:27:53 +02:00 committed by GitHub
commit da9828406f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
39 changed files with 959 additions and 562 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ChangeLog
View File

@ -1,15 +1,32 @@
3.5.4git
TODO server list split on query
- introduce genre-based server lists (Ticket #139)
- support intermediate Reaper RPP file while recording, coded by pljones (Ticket #170)
- duplicate Central Server type dropdown to Connection Setup (#157)
- added vocal bass/tenor/alto/soprano instrument icons created by Alberstein8 (Ticket #131)
TODO implement panning for channels (Ticket #52, #145)
TODO Central Server Address: "Default" results in empty server browser, "Default (North America)" works fine #156
-> made max list smaller from 200 to 150 -> check if that is sufficient to prevent UDP packet fragmentation
TODO Keep lrelease? Does it work as expected?
TODO fix Linux deploy script -> gives errors right now
TODO WIP support internationalization
TODO fix incorrect what's this help texts
TODO implement panning for channels (Ticket #52, #145)
TODO WIP support internationalization
TODO show mute state of others

2
INSTALL.md
View File

@ -2,7 +2,7 @@
Installing Jamulus
============================
[Please see this overview](https://github.com/corrados/jamulus/wiki/Software-Manual) containing instructions for installing and using Jamulus for your platform.
[Please see this overview](https://github.com/corrados/jamulus/wiki/Getting-Started) containing instructions for installing and using Jamulus for your platform.
Compiling Jamulus

4
Jamulus.pro
View File

@ -719,6 +719,10 @@ DISTFILES += ChangeLog \
src/res/instruments/congas.png \
src/res/instruments/bongo.svg \
src/res/instruments/bongo.png \
src/res/instruments/vocalbass.png \
src/res/instruments/vocaltenor.png \
src/res/instruments/vocalalto.png \
src/res/instruments/vocalsoprano.png \
src/res/flags/flagnone.png \
src/res/flags/ad.png \
src/res/flags/ae.png \

9
android/AndroidManifest.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<manifest package="org.qtproject.jamulus" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto">
<manifest package="com.github.corrados.jamulus" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="-- %%INSERT_VERSION_NAME%% --" android:versionCode="-- %%INSERT_VERSION_CODE%% --" android:installLocation="auto">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/>
<!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
@ -18,9 +18,8 @@
<supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="Jamulus" android:extractNativeLibs="true">
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="@string/app_name" android:screenOrientation="landscape" android:launchMode="singleTop">
<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --" android:extractNativeLibs="true" android:icon="@drawable/icon">
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="landscape" android:launchMode="singleTop">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
@ -30,7 +29,7 @@
<!-- meta-data android:name="android.app.arguments" android:value="arg1 arg2 arg3"/ -->
<!-- Application arguments -->
<meta-data android:name="android.app.lib_name" android:value="Jamulus"/>
<meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/>
<meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
<meta-data android:name="android.app.repository" android:value="default"/>
<meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>

BIN
android/res/drawable-hdpi/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
android/res/drawable-ldpi/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
android/res/drawable-mdpi/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
android/res/drawable-xhdpi/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.2 KiB

BIN
android/res/drawable-xxhdpi/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

BIN
android/res/drawable-xxxhdpi/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

3
distributions/debian/control
View File

@ -23,9 +23,6 @@ Depends:
${shlibs:Depends},
${misc:Depends},
adduser,
jackd,
qt5-default,
qtchooser,
Description: Low latency Audio Server/Client
The Jamulus software enables musicians to perform real-time jam sessions over
the internet. There is one server running the Jamulus server software which

4
src/audiomixerboard.cpp
View File

@ -653,9 +653,9 @@ void CAudioMixerBoard::ApplyNewConClientList ( CVector<CChannelInfo>& vecChanInf
{
// we want to set the server name only if the very first faders appear
// in the audio mixer board to show a "try to connect" before
if ( pGroupBox->title().compare ( strServerName ) )
if ( bNoFaderVisible )
{
pGroupBox->setTitle ( strServerName );
pGroupBox->setTitle ( tr ( "Personal Mix at the Server: " ) + strServerName );
}
// get number of connected clients

4
src/clientdlg.cpp
View File

@ -39,7 +39,7 @@ CClientDlg::CClientDlg ( CClient* pNCliP,
bConnectDlgWasShown ( false ),
ClientSettingsDlg ( pNCliP, parent, Qt::Window ),
ChatDlg ( parent, Qt::Window ),
ConnectDlg ( bNewShowComplRegConnList, parent, Qt::Dialog ),
ConnectDlg ( pNCliP, bNewShowComplRegConnList, parent, Qt::Dialog ),
AnalyzerConsole ( pNCliP, parent, Qt::Window ),
MusicianProfileDlg ( pNCliP, parent )
{
@ -700,7 +700,7 @@ void CClientDlg::OnConnectDlgAccepted()
if ( strSelectedAddress.isEmpty() )
{
strSelectedAddress = DEFAULT_SERVER_ADDRESS;
strMixerBoardLabel = DEFAULT_SERVER_NAME;
strMixerBoardLabel = tr ( "Central Server" );
}
}

23
src/clientsettingsdlg.cpp
View File

@ -346,9 +346,11 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent,
// central server address type combo box
cbxCentServAddrType->clear();
cbxCentServAddrType->addItem ( tr ( "Manual" ) ); // AT_MANUAL
cbxCentServAddrType->addItem ( tr ( "Default" ) ); // AT_DEFAULT
cbxCentServAddrType->addItem ( tr ( "Default (North America)" ) ); // AT_NORTH_AMERICA
cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_CUSTOM ) );
cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_DEFAULT ) );
cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENERAL_NORTHAMERICA ) );
cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENRE_ROCK ) );
cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENRE_JAZZ ) );
cbxCentServAddrType->setCurrentIndex ( static_cast<int> ( pClient->GetCentralServerAddressType() ) );
UpdateCentralServerDependency();
@ -443,6 +445,10 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent,
SIGNAL ( buttonClicked ( QAbstractButton* ) ), this,
SLOT ( OnSndCrdBufferDelayButtonGroupClicked ( QAbstractButton* ) ) );
QObject::connect ( pClient,
SIGNAL ( CentralServerAddressTypeChanged() ),
this, SLOT ( OnCentralServerAddressTypeChanged() ) );
// Timers ------------------------------------------------------------------
// start timer for status bar
@ -581,7 +587,14 @@ void CClientSettingsDlg::UpdateSoundChannelSelectionFrame()
void CClientSettingsDlg::UpdateCentralServerDependency()
{
const bool bCurUseDefCentServAddr = ( pClient->GetCentralServerAddressType() != AT_MANUAL );
const bool bCurUseDefCentServAddr = ( pClient->GetCentralServerAddressType() != AT_CUSTOM );
// update server type combo box (because the value may have ben changed
// by a control in another dialog, e.g., the connect dialog),
// since it is just an update, do not fire signals for the update
cbxCentServAddrType->blockSignals ( true );
cbxCentServAddrType->setCurrentIndex ( static_cast<int> ( pClient->GetCentralServerAddressType() ) );
cbxCentServAddrType->blockSignals ( false );
// make sure the line edit does not fire signals when we update the text
edtCentralServerAddress->blockSignals ( true );
@ -590,7 +603,7 @@ void CClientSettingsDlg::UpdateCentralServerDependency()
{
// if the default central server is used, just show a text of the
// server name
edtCentralServerAddress->setText ( DEFAULT_SERVER_NAME );
edtCentralServerAddress->setText ( tr ( "Predefined Address" ) );
}
else
{

1
src/clientsettingsdlg.h
View File

@ -102,6 +102,7 @@ protected:
void OnAudioChannelsActivated ( int iChanIdx );
void OnAudioQualityActivated ( int iQualityIdx );
void OnCentServAddrTypeActivated ( int iTypeIdx );
void OnCentralServerAddressTypeChanged() { UpdateCentralServerDependency(); }
void OnDriverSetupClicked();
signals:

22
src/connectdlg.cpp
View File

@ -26,10 +26,12 @@
/* Implementation *************************************************************/
CConnectDlg::CConnectDlg ( const bool bNewShowCompleteRegList,
QWidget* parent,
CConnectDlg::CConnectDlg ( CClient* pNCliP,
const bool bNewShowCompleteRegList,
QWidget* parent,
Qt::WindowFlags f )
: QDialog ( parent, f ),
pClient ( pNCliP ),
strCentralServerAddress ( "" ),
strSelectedAddress ( "" ),
strSelectedServerName ( "" ),
@ -74,6 +76,14 @@ CConnectDlg::CConnectDlg ( const bool bNewShowCompleteRegList,
cbxServerAddr->setAccessibleDescription ( tr ( "Holds the current server "
"IP address or URL. It also stores old URLs in the combo box list." ) );
// central server address type combo box
cbxCentServAddrType->clear();
cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_CUSTOM ) );
cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_DEFAULT ) );
cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENERAL_NORTHAMERICA ) );
cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENRE_ROCK ) );
cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENRE_JAZZ ) );
// filter
edtFilter->setWhatsThis ( "<b>" + tr ( "Filter" ) + ":</b> " + tr ( "The server "
"list is filtered by the given text. Note that the filter is case insensitive." ) );
@ -162,6 +172,9 @@ CConnectDlg::CConnectDlg ( const bool bNewShowCompleteRegList,
QObject::connect ( cbxServerAddr, SIGNAL ( editTextChanged ( const QString& ) ),
this, SLOT ( OnServerAddrEditTextChanged ( const QString& ) ) );
QObject::connect ( cbxCentServAddrType, SIGNAL ( activated ( int ) ),
this, SLOT ( OnCentServAddrTypeChanged ( int ) ) );
// check boxes
QObject::connect ( chbExpandAll, SIGNAL ( stateChanged ( int ) ),
this, SLOT ( OnExpandAllStateChanged ( int ) ) );
@ -220,6 +233,11 @@ void CConnectDlg::RequestServerList()
// clear filter edit box
edtFilter->setText ( "" );
// update list combo box (disable events to avoid a signal)
cbxCentServAddrType->blockSignals ( true );
cbxCentServAddrType->setCurrentIndex ( static_cast<int> ( pClient->GetCentralServerAddressType() ) );
cbxCentServAddrType->blockSignals ( false );
// get the IP address of the central server (using the ParseNetworAddress
// function) when the connect dialog is opened, this seems to be the correct
// time to do it

8
src/connectdlg.h
View File

@ -47,8 +47,9 @@ class CConnectDlg : public QDialog, private Ui_CConnectDlgBase
Q_OBJECT
public:
CConnectDlg ( const bool bNewShowCompleteRegList,
QWidget* parent = nullptr,
CConnectDlg ( CClient* pNCliP,
const bool bNewShowCompleteRegList,
QWidget* parent = nullptr,
Qt::WindowFlags f = nullptr );
void Init ( const CVector<QString>& vstrIPAddresses );
@ -88,6 +89,8 @@ protected:
void UpdateListFilter();
void ShowAllMusicians ( const bool bState );
CClient* pClient;
QTimer TimerPing;
QTimer TimerReRequestServList;
QString strCentralServerAddress;
@ -104,6 +107,7 @@ public slots:
void OnServerListItemSelectionChanged();
void OnServerListItemDoubleClicked ( QTreeWidgetItem* Item, int );
void OnServerAddrEditTextChanged ( const QString& );
void OnCentServAddrTypeChanged ( int iTypeIdx ) { pClient->SetCentralServerAddressType ( static_cast<ECSAddType> ( iTypeIdx ) ); }
void OnFilterTextEdited ( const QString& ) { UpdateListFilter(); }
void OnExpandAllStateChanged ( int value ) { ShowAllMusicians ( value == Qt::Checked ); }
void OnConnectClicked();

10
src/connectdlgbase.ui
View File

@ -29,6 +29,16 @@
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="lblList">
<property name="text">
<string>List</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="cbxCentServAddrType"/>
</item>
<item>
<widget class="QLabel" name="lblFilter">
<property name="text">

28
src/global.h
View File

@ -101,12 +101,15 @@ LED bar: lbr
#define SYSTEM_FRAME_SIZE_SAMPLES 64
#define DOUBLE_SYSTEM_FRAME_SIZE_SAMPLES ( 2 * SYSTEM_FRAME_SIZE_SAMPLES )
// default server address
// default server address and port numbers
#define DEFAULT_SERVER_ADDRESS "jamulus.fischvolk.de"
#define DEFAULT_SERVER_NAME "Central Server"
#define DEFAULT_PORT_NUMBER 22124
#define CENTSERV_GENERAL_NORTHAMERICA "jamulus.fischvolk.de:22224"
#define CENTSERV_GENRE_ROCK "centralrock.drealm.info:22124"
#define CENTSERV_GENRE_JAZZ "centraljazz.drealm.info:22224"
// getting started and software manual URL
#define CLIENT_GETTING_STARTED_URL "https://github.com/corrados/jamulus/wiki/Software-Manual"
#define CLIENT_GETTING_STARTED_URL "https://github.com/corrados/jamulus/wiki/Getting-Started"
#define SERVER_GETTING_STARTED_URL "https://github.com/corrados/jamulus/wiki/Running-a-Server"
#define SOFTWARE_MANUAL_URL "https://github.com/corrados/jamulus/blob/master/src/res/homepage/manual.md"
@ -116,10 +119,6 @@ LED bar: lbr
#define WELL_KNOWN_PORT 53 // DNS
#define IP_LOOKUP_TIMEOUT 500 // ms
// defined port numbers for client and server
#define DEFAULT_PORT_NUMBER 22124
#define DEFAULT_PORT_NUMBER_NORTHAMERICA 22224
// system sample rate (the sound card and audio coder works on this sample rate)
#define SYSTEM_SAMPLE_RATE_HZ 48000 // Hz
@ -163,10 +162,10 @@ LED bar: lbr
#define MAX_NUM_IN_OUT_CHANNELS 64
// maximum number of elemts in the server address combo box
#define MAX_NUM_SERVER_ADDR_ITEMS 6
#define MAX_NUM_SERVER_ADDR_ITEMS 12
// maximum number of fader settings to be stored (together with the fader tags)
#define MAX_NUM_STORED_FADER_SETTINGS 200
#define MAX_NUM_STORED_FADER_SETTINGS 250
// range for signal level meter
#define LOW_BOUND_SIG_METER ( -50.0 ) // dB
@ -182,21 +181,20 @@ LED bar: lbr
// Maximum number of servers registered in the server list. If you want to
// change this parameter, you most probably have to adjust MAX_SIZE_BYTES_NETW_BUF.
#define MAX_NUM_SERVERS_IN_SERVER_LIST 200
#define MAX_NUM_SERVERS_IN_SERVER_LIST 150 // reduced to 150 because we now have genre-based server lists
// defines the time interval at which the ping time is updated in the GUI
#define PING_UPDATE_TIME_MS 500 // ms
// defines the time interval at which the ping time is updated for the server
// list
#define PING_UPDATE_TIME_SERVER_LIST_MS 2000 // ms
// defines the time interval at which the ping time is updated for the server list
#define PING_UPDATE_TIME_SERVER_LIST_MS 2500 // ms
// defines the interval between Channel Level updates from the server
#define CHANNEL_LEVEL_UPDATE_INTERVAL 200 // number of frames at 64 samples frame size
// time-out until a registered server is deleted from the server list if no
// new registering was made in minutes
#define SERVLIST_TIME_OUT_MINUTES 60 // minutes
#define SERVLIST_TIME_OUT_MINUTES 33 // minutes (should include 3 UDP registration messages)
// poll time for server list (to check if entries are time-out)
#define SERVLIST_POLL_TIME_MINUTES 1 // minute
@ -208,7 +206,7 @@ LED bar: lbr
#define SERVLIST_REGIST_INTERV_MINUTES 15 // minutes
// defines the minimum time a server must run to be a permanent server
#define SERVLIST_TIME_PERMSERV_MINUTES 1440 // minutes, 1440 = 60 min * 24 h
#define SERVLIST_TIME_PERMSERV_MINUTES 4320 // minutes, 4320 = 60 min * 24 h * 3 d
// registration response timeout
#define REGISTER_SERVER_TIME_OUT_MS 500 // ms

BIN
src/res/instruments/vocalalto.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
src/res/instruments/vocalbass.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
src/res/instruments/vocalsoprano.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
src/res/instruments/vocaltenor.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
src/res/translation/translation_de_DE.qm
View File

Binary file not shown.

240
src/res/translation/translation_de_DE.ts
View File

@ -177,6 +177,11 @@
<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="658"/>
<source>Personal Mix at the Server: </source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CChannelFader</name>
@ -633,6 +638,11 @@
<source>The CPU of the client or server is at 100%.</source>
<translation>Die CPU des Computers ist voll ausgelastet.</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="703"/>
<source>Central Server</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="809"/>
<source>user</source>
@ -1135,53 +1145,76 @@
<translation>Hoch</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="349"/>
<source>Manual</source>
<translation>Manuell</translation>
<translation type="vanished">Manuell</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="350"/>
<location filename="../../util.h" line="581"/>
<source>Custom</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.h" line="584"/>
<source>All Genres</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.h" line="587"/>
<source>Genre Rock</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.h" line="590"/>
<source>Genre Jazz</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.h" line="593"/>
<source>Default</source>
<translation>Standard</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="351"/>
<source>Default (North America)</source>
<translation>Standard (Nordamerika)</translation>
<translation type="vanished">Standard (Nordamerika)</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="367"/>
<location filename="../../clientsettingsdlg.cpp" line="369"/>
<source>preferred</source>
<translation>bevorzugt</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="457"/>
<location filename="../../clientsettingsdlg.cpp" line="461"/>
<location filename="../../clientsettingsdlg.cpp" line="463"/>
<location filename="../../clientsettingsdlg.cpp" line="467"/>
<source>Size: </source>
<translation>Größe: </translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="518"/>
<location filename="../../clientsettingsdlg.cpp" line="524"/>
<source>Buffer Delay</source>
<translation>Puffergröße</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="523"/>
<location filename="../../clientsettingsdlg.cpp" line="529"/>
<source>Buffer Delay: </source>
<translation>Puffergröße: </translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="633"/>
<location filename="../../clientsettingsdlg.cpp" line="606"/>
<source>Predefined Address</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="646"/>
<source>The selected audio device could not be used because of the following error: </source>
<translation>Das ausgewählte Audiogerät kann aus folgendem Grund nicht verwendet werden: </translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="635"/>
<location filename="../../clientsettingsdlg.cpp" line="648"/>
<source> The previous driver will be selected.</source>
<translation> Der vorherige Treiber wird wieder ausgewählt.</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="636"/>
<location filename="../../clientsettingsdlg.cpp" line="649"/>
<source>Ok</source>
<translation></translation>
</message>
@ -1347,82 +1380,82 @@
<context>
<name>CConnectDlg</name>
<message>
<location filename="../../connectdlg.cpp" line="47"/>
<location filename="../../connectdlg.cpp" line="49"/>
<source>Server List</source>
<translation>Severliste</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="47"/>
<location filename="../../connectdlg.cpp" line="49"/>
<source>The server list shows a list of available servers which are registered at the central server. Select a server from the list and press the connect button to connect to this server. Alternatively, double click a server from the list to connect to it. If a server is occupied, a list of the connected musicians is available by expanding the list item. Permanent servers are shown in bold font.</source>
<translation>Die Serverliste zeigt eine Liste von verfügbaren Server, die sich am Zentralserver registriert haben. Markiere einen Server von der Liste und drücke den Knopf Verbinden um eine Verbindung zu dem Server aufzubauen. Alternativ kann man auch den Server in der Liste direkt doppelklicken. Wenn ein Server belegt ist, dann wird eine Liste der verbundenen Musikern angezeigt. Server, die länger online sind (permanente Server) werden in Fettschrift dargestellt.</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="53"/>
<location filename="../../connectdlg.cpp" line="55"/>
<source>Note that it may take some time to retrieve the server list from the central server. If no valid central server address is specified in the settings, no server list will be available.</source>
<translation>Es kann einen Moment dauern, bis die Serverliste vom Zentralserver empfangen wird. Falls keine gültige Zentralserveradresse in den Einstellungen angegeben ist, kann keine Liste angezeigt werden.</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="58"/>
<location filename="../../connectdlg.cpp" line="60"/>
<source>Server list view</source>
<translation>Serverliste Anzeige</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="61"/>
<location filename="../../connectdlg.cpp" line="63"/>
<source>Server Address</source>
<translation>Serveradresse</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="61"/>
<location filename="../../connectdlg.cpp" line="63"/>
<source>The IP address or URL of the server running the </source>
<translation>Die IP-Adresse oder URL des Servers, auf der die </translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="62"/>
<location filename="../../connectdlg.cpp" line="64"/>
<source> server software must be set here. An optional port number can be added after the IP address or URL using a colon as a separator, e.g, example.org:</source>
<translation> Serversoftware läuft wird hier angegeben. Optional kann eine Portnummer angefügt werden. Diese wird hinter der IP-Adresse durch ein Doppelpunkt getrennt angegeben. Beispiel: example.org:</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="66"/>
<location filename="../../connectdlg.cpp" line="68"/>
<source>. A list of the most recent used server IP addresses or URLs is available for selection.</source>
<translation> Eine Liste der letzten IP-Adressen oder URLs wird gespeichert und kann nachträglich wieder ausgewählt werden.</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="73"/>
<location filename="../../connectdlg.cpp" line="75"/>
<source>Server address edit box</source>
<translation>Serveradresse Eingabefeld</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="74"/>
<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>Enthält die aktuelle Server-IP-Adresse oder URL. Es speichert auch alte URLs in der Auswahlliste.</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="78"/>
<location filename="../../connectdlg.cpp" line="88"/>
<source>Filter</source>
<translation>Filter</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="78"/>
<location filename="../../connectdlg.cpp" line="88"/>
<source>The server list is filtered by the given text. Note that the filter is case insensitive.</source>
<translation>Die Serverliste kann mit dem eingegebenen Text gefiltert werden, d.h. es werden nur Einträge angezeigt, die dem Filtertext entsprechen. Die Groß- und Kleinschreibung des Filtertexts wird dabei nicht beachtet.</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="80"/>
<location filename="../../connectdlg.cpp" line="90"/>
<source>Filter edit box</source>
<translation>Filtereingabefeld</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="83"/>
<location filename="../../connectdlg.cpp" line="93"/>
<source>Show All Musicians</source>
<translation>Zeige alle Musiker</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="83"/>
<location filename="../../connectdlg.cpp" line="93"/>
<source>If you check this check box, the musicians of all servers are shown. If you uncheck the check box, all list view items are collapsed.</source>
<translation>Ist diese Einstellung angehakt, dann werden alle Musiker auf allen Servern angezeigt. Wird der Haken entfernt, dann werden alle Listeneinträge eingeklappt und die verbundenen Musikernamen werden verborgen.</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="86"/>
<location filename="../../connectdlg.cpp" line="96"/>
<source>Show all musicians check box</source>
<translation>Zeige alle Musiker Schalter</translation>
</message>
@ -1436,46 +1469,51 @@
</message>
<message>
<location filename="../../connectdlgbase.ui" line="35"/>
<source>List</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="45"/>
<source>Filter</source>
<translation>Filter</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="45"/>
<location filename="../../connectdlgbase.ui" line="55"/>
<source>Show All Musicians</source>
<translation>Zeige alle Musiker</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="61"/>
<location filename="../../connectdlgbase.ui" line="71"/>
<source>Server Name</source>
<translation>Servername</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="66"/>
<location filename="../../connectdlgbase.ui" line="76"/>
<source>Ping Time</source>
<translation>Ping-Zeit</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="71"/>
<location filename="../../connectdlgbase.ui" line="81"/>
<source>Musicians</source>
<translation>Musiker</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="76"/>
<location filename="../../connectdlgbase.ui" line="86"/>
<source>Location</source>
<translation>Standort</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="86"/>
<location filename="../../connectdlgbase.ui" line="96"/>
<source>Server Name/Address</source>
<translation>Servername/Adresse</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="120"/>
<location filename="../../connectdlgbase.ui" line="130"/>
<source>C&amp;ancel</source>
<translation>A&amp;bbrechen</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="127"/>
<location filename="../../connectdlgbase.ui" line="137"/>
<source>&amp;Connect</source>
<translation>&amp;Verbinden</translation>
</message>
@ -1647,7 +1685,7 @@
<message>
<location filename="../../util.cpp" line="669"/>
<location filename="../../util.cpp" line="681"/>
<location filename="../../util.cpp" line="973"/>
<location filename="../../util.cpp" line="975"/>
<source>None</source>
<translation>Kein</translation>
</message>
@ -1713,175 +1751,195 @@
<translation>Was man hier sieht wird auch am Fader im Mixer angezeigt, wenn du mit einem </translation>
</message>
<message>
<location filename="../../util.cpp" line="974"/>
<location filename="../../util.cpp" line="976"/>
<source>Drum Set</source>
<translation>Schlagzeug</translation>
</message>
<message>
<location filename="../../util.cpp" line="975"/>
<location filename="../../util.cpp" line="977"/>
<source>Djembe</source>
<translation>Djembe</translation>
</message>
<message>
<location filename="../../util.cpp" line="976"/>
<location filename="../../util.cpp" line="978"/>
<source>Electric Guitar</source>
<translation>E-Gitarre</translation>
</message>
<message>
<location filename="../../util.cpp" line="977"/>
<location filename="../../util.cpp" line="979"/>
<source>Acoustic Guitar</source>
<translation>Akustikgitarre</translation>
</message>
<message>
<location filename="../../util.cpp" line="978"/>
<location filename="../../util.cpp" line="980"/>
<source>Bass Guitar</source>
<translation>E-Bass</translation>
</message>
<message>
<location filename="../../util.cpp" line="979"/>
<location filename="../../util.cpp" line="981"/>
<source>Keyboard</source>
<translation>Keyboard</translation>
</message>
<message>
<location filename="../../util.cpp" line="980"/>
<location filename="../../util.cpp" line="982"/>
<source>Synthesizer</source>
<translation>Synthesizer</translation>
</message>
<message>
<location filename="../../util.cpp" line="981"/>
<location filename="../../util.cpp" line="983"/>
<source>Grand Piano</source>
<translation>Flügel</translation>
</message>
<message>
<location filename="../../util.cpp" line="982"/>
<location filename="../../util.cpp" line="984"/>
<source>Accordion</source>
<translation>Akkordeon</translation>
</message>
<message>
<location filename="../../util.cpp" line="983"/>
<location filename="../../util.cpp" line="985"/>
<source>Vocal</source>
<translation>Gesang</translation>
</message>
<message>
<location filename="../../util.cpp" line="984"/>
<location filename="../../util.cpp" line="986"/>
<source>Microphone</source>
<translation>Mikrofon</translation>
</message>
<message>
<location filename="../../util.cpp" line="985"/>
<location filename="../../util.cpp" line="987"/>
<source>Harmonica</source>
<translation>Mundharmonika</translation>
</message>
<message>
<location filename="../../util.cpp" line="986"/>
<location filename="../../util.cpp" line="988"/>
<source>Trumpet</source>
<translation>Trompete</translation>
</message>
<message>
<location filename="../../util.cpp" line="987"/>
<location filename="../../util.cpp" line="989"/>
<source>Trombone</source>
<translation>Posaune</translation>
</message>
<message>
<location filename="../../util.cpp" line="988"/>
<location filename="../../util.cpp" line="990"/>
<source>French Horn</source>
<translation>Waldhorn</translation>
</message>
<message>
<location filename="../../util.cpp" line="989"/>
<location filename="../../util.cpp" line="991"/>
<source>Tuba</source>
<translation>Tuba</translation>
</message>
<message>
<location filename="../../util.cpp" line="990"/>
<location filename="../../util.cpp" line="992"/>
<source>Saxophone</source>
<translation>Saxophon</translation>
</message>
<message>
<location filename="../../util.cpp" line="991"/>
<location filename="../../util.cpp" line="993"/>
<source>Clarinet</source>
<translation>Klarinette</translation>
</message>
<message>
<location filename="../../util.cpp" line="992"/>
<location filename="../../util.cpp" line="994"/>
<source>Flute</source>
<translation>Flöte</translation>
</message>
<message>
<location filename="../../util.cpp" line="993"/>
<location filename="../../util.cpp" line="995"/>
<source>Violin</source>
<translation>Violine</translation>
</message>
<message>
<location filename="../../util.cpp" line="994"/>
<location filename="../../util.cpp" line="996"/>
<source>Cello</source>
<translation>Cello</translation>
</message>
<message>
<location filename="../../util.cpp" line="995"/>
<location filename="../../util.cpp" line="997"/>
<source>Double Bass</source>
<translation>Kontrabass</translation>
</message>
<message>
<location filename="../../util.cpp" line="996"/>
<location filename="../../util.cpp" line="998"/>
<source>Recorder</source>
<translation>Recorder</translation>
</message>
<message>
<location filename="../../util.cpp" line="997"/>
<location filename="../../util.cpp" line="999"/>
<source>Streamer</source>
<translation></translation>
</message>
<message>
<location filename="../../util.cpp" line="998"/>
<location filename="../../util.cpp" line="1000"/>
<source>Listener</source>
<translation>Zuhörer</translation>
</message>
<message>
<location filename="../../util.cpp" line="999"/>
<location filename="../../util.cpp" line="1001"/>
<source>Guitar+Vocal</source>
<translation>Gitarre+Gesang</translation>
</message>
<message>
<location filename="../../util.cpp" line="1000"/>
<location filename="../../util.cpp" line="1002"/>
<source>Keyboard+Vocal</source>
<translation>Keyboard+Gesang</translation>
</message>
<message>
<location filename="../../util.cpp" line="1001"/>
<location filename="../../util.cpp" line="1003"/>
<source>Bodhran</source>
<translation></translation>
</message>
<message>
<location filename="../../util.cpp" line="1002"/>
<location filename="../../util.cpp" line="1004"/>
<source>Bassoon</source>
<translation>Fagott</translation>
</message>
<message>
<location filename="../../util.cpp" line="1003"/>
<location filename="../../util.cpp" line="1005"/>
<source>Oboe</source>
<translation>Oboe</translation>
</message>
<message>
<location filename="../../util.cpp" line="1004"/>
<location filename="../../util.cpp" line="1006"/>
<source>Harp</source>
<translation>Harfe</translation>
</message>
<message>
<location filename="../../util.cpp" line="1005"/>
<location filename="../../util.cpp" line="1007"/>
<source>Viola</source>
<translation>Viola</translation>
</message>
<message>
<location filename="../../util.cpp" line="1006"/>
<location filename="../../util.cpp" line="1008"/>
<source>Congas</source>
<translation>Congas</translation>
</message>
<message>
<location filename="../../util.cpp" line="1007"/>
<location filename="../../util.cpp" line="1009"/>
<source>Bongo</source>
<translation>Bongos</translation>
</message>
<message>
<location filename="../../util.cpp" line="1010"/>
<source>Vocal Bass</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.cpp" line="1011"/>
<source>Vocal Tenor</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.cpp" line="1012"/>
<source>Vocal Alto</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.cpp" line="1013"/>
<source>Vocal Soprano</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CServerDlg</name>
@ -2017,7 +2075,7 @@
</message>
<message>
<location filename="../../serverdlg.cpp" line="134"/>
<location filename="../../serverdlg.cpp" line="277"/>
<location filename="../../serverdlg.cpp" line="279"/>
<source>E&amp;xit</source>
<translation>&amp;Beenden</translation>
</message>
@ -2044,67 +2102,69 @@
<translation> Server </translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="191"/>
<location filename="../../serverdlg.cpp" line="527"/>
<source>Predefined Address</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Manual</source>
<translation>Manuell</translation>
<translation type="vanished">Manuell</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="192"/>
<source>Default</source>
<translation>Standard</translation>
<translation type="vanished">Standard</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="193"/>
<source>Default (North America)</source>
<translation>Standard (Nordamerika)</translation>
<translation type="vanished">Standard (Nordamerika)</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="271"/>
<location filename="../../serverdlg.cpp" line="273"/>
<source> Server</source>
<translation></translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="275"/>
<location filename="../../serverdlg.cpp" line="277"/>
<source>&amp;Window</source>
<translation>&amp;Fenster</translation>
</message>
<message>
<location filename="../../util.h" line="591"/>
<location filename="../../util.h" line="615"/>
<source>Unregistered</source>
<translation>Nicht registriert</translation>
</message>
<message>
<location filename="../../util.h" line="594"/>
<location filename="../../util.h" line="618"/>
<source>Bad address</source>
<translation>Ungültige Adresse</translation>
</message>
<message>
<location filename="../../util.h" line="597"/>
<location filename="../../util.h" line="621"/>
<source>Registration requested</source>
<translation>Registrierung angefordert</translation>
</message>
<message>
<location filename="../../util.h" line="600"/>
<location filename="../../util.h" line="624"/>
<source>Registration failed</source>
<translation>Registrierung fehlgeschlagen</translation>
</message>
<message>
<location filename="../../util.h" line="603"/>
<location filename="../../util.h" line="627"/>
<source>Check server version</source>
<translation>Überprüfe Version des Servers</translation>
</message>
<message>
<location filename="../../util.h" line="606"/>
<location filename="../../util.h" line="630"/>
<source>Registered</source>
<translation>Registriert</translation>
</message>
<message>
<location filename="../../util.h" line="609"/>
<location filename="../../util.h" line="633"/>
<source>Central Server full</source>
<translation>Zentralserver voll</translation>
</message>
<message>
<location filename="../../util.h" line="612"/>
<location filename="../../util.h" line="636"/>
<source>Unknown value </source>
<translation>Unbekannter Wert </translation>
</message>
@ -2359,7 +2419,7 @@
<context>
<name>global</name>
<message>
<location filename="../../global.h" line="237"/>
<location filename="../../global.h" line="235"/>
<source>For more information use the What&apos;s This help (help menu, right mouse button or Shift+F1)</source>
<translation>Für weitere Informationen verwende die Kontexthilfe (Hilfe-Menü, rechte Maustaste oder Tastenkombination Shift+F1)</translation>
</message>

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

Binary file not shown.

240
src/res/translation/translation_es_ES.ts
View File

@ -181,6 +181,11 @@
<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="658"/>
<source>Personal Mix at the Server: </source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CChannelFader</name>
@ -637,6 +642,11 @@
<source>The CPU of the client or server is at 100%.</source>
<translation>El procesador del cliente o del servidor está al 100%.</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="703"/>
<source>Central Server</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="809"/>
<source>user</source>
@ -1139,53 +1149,76 @@
<translation>Alta</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="349"/>
<source>Manual</source>
<translation>Manual</translation>
<translation type="vanished">Manual</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="350"/>
<location filename="../../util.h" line="581"/>
<source>Custom</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.h" line="584"/>
<source>All Genres</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.h" line="587"/>
<source>Genre Rock</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.h" line="590"/>
<source>Genre Jazz</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.h" line="593"/>
<source>Default</source>
<translation>Por defecto</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="351"/>
<source>Default (North America)</source>
<translation>Por defecto (Norteamérica)</translation>
<translation type="vanished">Por defecto (Norteamérica)</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="367"/>
<location filename="../../clientsettingsdlg.cpp" line="369"/>
<source>preferred</source>
<translation>aconsejado</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="457"/>
<location filename="../../clientsettingsdlg.cpp" line="461"/>
<location filename="../../clientsettingsdlg.cpp" line="463"/>
<location filename="../../clientsettingsdlg.cpp" line="467"/>
<source>Size: </source>
<translation>Tamaño: </translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="518"/>
<location filename="../../clientsettingsdlg.cpp" line="524"/>
<source>Buffer Delay</source>
<translation>Retardo Buffer</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="523"/>
<location filename="../../clientsettingsdlg.cpp" line="529"/>
<source>Buffer Delay: </source>
<translation>Retardo Buffer: </translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="633"/>
<location filename="../../clientsettingsdlg.cpp" line="606"/>
<source>Predefined Address</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="646"/>
<source>The selected audio device could not be used because of the following error: </source>
<translation>El dispositivo de audio seleccionado no puede utilizarse a causa del siguiente error: </translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="635"/>
<location filename="../../clientsettingsdlg.cpp" line="648"/>
<source> The previous driver will be selected.</source>
<translation> Se utilizará el driver anterior.</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="636"/>
<location filename="../../clientsettingsdlg.cpp" line="649"/>
<source>Ok</source>
<translation>Ok</translation>
</message>
@ -1351,32 +1384,32 @@
<context>
<name>CConnectDlg</name>
<message>
<location filename="../../connectdlg.cpp" line="47"/>
<location filename="../../connectdlg.cpp" line="49"/>
<source>Server List</source>
<translation>Lista Servidores</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="47"/>
<location filename="../../connectdlg.cpp" line="49"/>
<source>The server list shows a list of available servers which are registered at the central server. Select a server from the list and press the connect button to connect to this server. Alternatively, double click a server from the list to connect to it. If a server is occupied, a list of the connected musicians is available by expanding the list item. Permanent servers are shown in bold font.</source>
<translation>La lista de servidores muestra una lista de servidores disponibles que se encuentran registrados en el servidor central. Escoge un servidor de la lista y pulsa el botón de conectar para conectarte a este servidor. También es posible realizar la conexión haciendo doble clic en un servidor de la lista. Si un servidor está ocupado, se puede desplegar una lista de los músicos conectados al pulsar el icono al lado del nombre. Los servidores permanentes se muestran en negrita.</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="53"/>
<location filename="../../connectdlg.cpp" line="55"/>
<source>Note that it may take some time to retrieve the server list from the central server. If no valid central server address is specified in the settings, no server list will be available.</source>
<translation>Ten en cuenta que puede llevar un tiempo recuperar la lista de servidores del servidor central. Si no se especifica una dirección válida en la configuración, no habrá ninguna lista de servidores disponible.</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="58"/>
<location filename="../../connectdlg.cpp" line="60"/>
<source>Server list view</source>
<translation>Vista lista de servidores</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="61"/>
<location filename="../../connectdlg.cpp" line="63"/>
<source>Server Address</source>
<translation>Dirección Servidor</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="61"/>
<location filename="../../connectdlg.cpp" line="63"/>
<source>The IP address or URL of the server running the </source>
<translation>La dirección IP o URL del servidor ejecutando el software del servidor </translation>
</message>
@ -1385,52 +1418,52 @@
<translation type="vanished"> debe introducirse aquí. Se puede añadir un número de puerto opcional detrás de la dirección IP o URL utilizando dos puntos como separador, por ej. ejemplo.org:</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="62"/>
<location filename="../../connectdlg.cpp" line="64"/>
<source> server software must be set here. An optional port number can be added after the IP address or URL using a colon as a separator, e.g, example.org:</source>
<translation> debe introducirse aquí. Se puede añadir un número de puerto opcional detrás de la dirección IP o URL utilizando dos puntos como separador, por ej. ejemplo.org:</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="66"/>
<location filename="../../connectdlg.cpp" line="68"/>
<source>. A list of the most recent used server IP addresses or URLs is available for selection.</source>
<translation>. Hay disponible una lista de las direcciones IP o URLs utilizadas más recientemente para su selección.</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="73"/>
<location filename="../../connectdlg.cpp" line="75"/>
<source>Server address edit box</source>
<translation>Selección dirección servidor</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="74"/>
<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>Contiene la dirección IP o URL actual del servidor. También guarda viejas URL en la lista.</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="78"/>
<location filename="../../connectdlg.cpp" line="88"/>
<source>Filter</source>
<translation>Filtro</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="78"/>
<location filename="../../connectdlg.cpp" line="88"/>
<source>The server list is filtered by the given text. Note that the filter is case insensitive.</source>
<translation>La lista de servidores se filtra con el texto introducido. El filtro no es sensible a mayúsculas/minúsculas.</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="80"/>
<location filename="../../connectdlg.cpp" line="90"/>
<source>Filter edit box</source>
<translation>Campo filtro</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="83"/>
<location filename="../../connectdlg.cpp" line="93"/>
<source>Show All Musicians</source>
<translation>Mostrar Todos los Músicos</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="83"/>
<location filename="../../connectdlg.cpp" line="93"/>
<source>If you check this check box, the musicians of all servers are shown. If you uncheck the check box, all list view items are collapsed.</source>
<translation>Si activas esta opción, se mostrarán los músicos de todos los servidores. Si lo desactivas, se colapsan todas las listas.</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="86"/>
<location filename="../../connectdlg.cpp" line="96"/>
<source>Show all musicians check box</source>
<translation>Selección Mostrar todos los músicos</translation>
</message>
@ -1444,46 +1477,51 @@
</message>
<message>
<location filename="../../connectdlgbase.ui" line="35"/>
<source>List</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="45"/>
<source>Filter</source>
<translation>Filtro</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="45"/>
<location filename="../../connectdlgbase.ui" line="55"/>
<source>Show All Musicians</source>
<translation>Mostrar Todos los Músicos</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="61"/>
<location filename="../../connectdlgbase.ui" line="71"/>
<source>Server Name</source>
<translation>Nombre Servidor</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="66"/>
<location filename="../../connectdlgbase.ui" line="76"/>
<source>Ping Time</source>
<translation>Tiempo Ping</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="71"/>
<location filename="../../connectdlgbase.ui" line="81"/>
<source>Musicians</source>
<translation>Músicos</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="76"/>
<location filename="../../connectdlgbase.ui" line="86"/>
<source>Location</source>
<translation>Ubicación</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="86"/>
<location filename="../../connectdlgbase.ui" line="96"/>
<source>Server Name/Address</source>
<translation>Nombre/Dirección Servidor</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="120"/>
<location filename="../../connectdlgbase.ui" line="130"/>
<source>C&amp;ancel</source>
<translation>C&amp;ancelar</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="127"/>
<location filename="../../connectdlgbase.ui" line="137"/>
<source>&amp;Connect</source>
<translation>&amp;Conectar</translation>
</message>
@ -1655,7 +1693,7 @@
<message>
<location filename="../../util.cpp" line="669"/>
<location filename="../../util.cpp" line="681"/>
<location filename="../../util.cpp" line="973"/>
<location filename="../../util.cpp" line="975"/>
<source>None</source>
<translation>Ninguno</translation>
</message>
@ -1721,175 +1759,195 @@
<translation>Lo que introduzcas aquí aparecerá en tu fader del mezclador cuando te conectes a un servidor </translation>
</message>
<message>
<location filename="../../util.cpp" line="974"/>
<location filename="../../util.cpp" line="976"/>
<source>Drum Set</source>
<translation>Batería</translation>
</message>
<message>
<location filename="../../util.cpp" line="975"/>
<location filename="../../util.cpp" line="977"/>
<source>Djembe</source>
<translation>Djembé</translation>
</message>
<message>
<location filename="../../util.cpp" line="976"/>
<location filename="../../util.cpp" line="978"/>
<source>Electric Guitar</source>
<translation>Guitarra Eléctrica</translation>
</message>
<message>
<location filename="../../util.cpp" line="977"/>
<location filename="../../util.cpp" line="979"/>
<source>Acoustic Guitar</source>
<translation>Guitarra Acústica</translation>
</message>
<message>
<location filename="../../util.cpp" line="978"/>
<location filename="../../util.cpp" line="980"/>
<source>Bass Guitar</source>
<translation>Bajo Eléctrico</translation>
</message>
<message>
<location filename="../../util.cpp" line="979"/>
<location filename="../../util.cpp" line="981"/>
<source>Keyboard</source>
<translation>Teclado</translation>
</message>
<message>
<location filename="../../util.cpp" line="980"/>
<location filename="../../util.cpp" line="982"/>
<source>Synthesizer</source>
<translation>Sintetizador</translation>
</message>
<message>
<location filename="../../util.cpp" line="981"/>
<location filename="../../util.cpp" line="983"/>
<source>Grand Piano</source>
<translation>Piano de Cola</translation>
</message>
<message>
<location filename="../../util.cpp" line="982"/>
<location filename="../../util.cpp" line="984"/>
<source>Accordion</source>
<translation>Acordeón</translation>
</message>
<message>
<location filename="../../util.cpp" line="983"/>
<location filename="../../util.cpp" line="985"/>
<source>Vocal</source>
<translation>Voz</translation>
</message>
<message>
<location filename="../../util.cpp" line="984"/>
<location filename="../../util.cpp" line="986"/>
<source>Microphone</source>
<translation>Micrófono</translation>
</message>
<message>
<location filename="../../util.cpp" line="985"/>
<location filename="../../util.cpp" line="987"/>
<source>Harmonica</source>
<translation>Armónica</translation>
</message>
<message>
<location filename="../../util.cpp" line="986"/>
<location filename="../../util.cpp" line="988"/>
<source>Trumpet</source>
<translation>Trompeta</translation>
</message>
<message>
<location filename="../../util.cpp" line="987"/>
<location filename="../../util.cpp" line="989"/>
<source>Trombone</source>
<translation>Trombón</translation>
</message>
<message>
<location filename="../../util.cpp" line="988"/>
<location filename="../../util.cpp" line="990"/>
<source>French Horn</source>
<translation>Trompa</translation>
</message>
<message>
<location filename="../../util.cpp" line="989"/>
<location filename="../../util.cpp" line="991"/>
<source>Tuba</source>
<translation>Tuba</translation>
</message>
<message>
<location filename="../../util.cpp" line="990"/>
<location filename="../../util.cpp" line="992"/>
<source>Saxophone</source>
<translation>Saxofón</translation>
</message>
<message>
<location filename="../../util.cpp" line="991"/>
<location filename="../../util.cpp" line="993"/>
<source>Clarinet</source>
<translation>Clarinete</translation>
</message>
<message>
<location filename="../../util.cpp" line="992"/>
<location filename="../../util.cpp" line="994"/>
<source>Flute</source>
<translation>Flauta</translation>
</message>
<message>
<location filename="../../util.cpp" line="993"/>
<location filename="../../util.cpp" line="995"/>
<source>Violin</source>
<translation>Violín</translation>
</message>
<message>
<location filename="../../util.cpp" line="994"/>
<location filename="../../util.cpp" line="996"/>
<source>Cello</source>
<translation>Violonchelo</translation>
</message>
<message>
<location filename="../../util.cpp" line="995"/>
<location filename="../../util.cpp" line="997"/>
<source>Double Bass</source>
<translation>Contrabajo</translation>
</message>
<message>
<location filename="../../util.cpp" line="996"/>
<location filename="../../util.cpp" line="998"/>
<source>Recorder</source>
<translation>Grabadora</translation>
</message>
<message>
<location filename="../../util.cpp" line="997"/>
<location filename="../../util.cpp" line="999"/>
<source>Streamer</source>
<translation>Streamer</translation>
</message>
<message>
<location filename="../../util.cpp" line="998"/>
<location filename="../../util.cpp" line="1000"/>
<source>Listener</source>
<translation>Oyente</translation>
</message>
<message>
<location filename="../../util.cpp" line="999"/>
<location filename="../../util.cpp" line="1001"/>
<source>Guitar+Vocal</source>
<translation>Guitarra+Voz</translation>
</message>
<message>
<location filename="../../util.cpp" line="1000"/>
<location filename="../../util.cpp" line="1002"/>
<source>Keyboard+Vocal</source>
<translation>Teclado+Voz</translation>
</message>
<message>
<location filename="../../util.cpp" line="1001"/>
<location filename="../../util.cpp" line="1003"/>
<source>Bodhran</source>
<translation>Bodhran</translation>
</message>
<message>
<location filename="../../util.cpp" line="1002"/>
<location filename="../../util.cpp" line="1004"/>
<source>Bassoon</source>
<translation>Fagot</translation>
</message>
<message>
<location filename="../../util.cpp" line="1003"/>
<location filename="../../util.cpp" line="1005"/>
<source>Oboe</source>
<translation>Oboe</translation>
</message>
<message>
<location filename="../../util.cpp" line="1004"/>
<location filename="../../util.cpp" line="1006"/>
<source>Harp</source>
<translation>Arpa</translation>
</message>
<message>
<location filename="../../util.cpp" line="1005"/>
<location filename="../../util.cpp" line="1007"/>
<source>Viola</source>
<translation>Viola</translation>
</message>
<message>
<location filename="../../util.cpp" line="1006"/>
<location filename="../../util.cpp" line="1008"/>
<source>Congas</source>
<translation>Congas</translation>
</message>
<message>
<location filename="../../util.cpp" line="1007"/>
<location filename="../../util.cpp" line="1009"/>
<source>Bongo</source>
<translation>Bongo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1010"/>
<source>Vocal Bass</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.cpp" line="1011"/>
<source>Vocal Tenor</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.cpp" line="1012"/>
<source>Vocal Alto</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.cpp" line="1013"/>
<source>Vocal Soprano</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CServerDlg</name>
@ -2025,7 +2083,7 @@
</message>
<message>
<location filename="../../serverdlg.cpp" line="134"/>
<location filename="../../serverdlg.cpp" line="277"/>
<location filename="../../serverdlg.cpp" line="279"/>
<source>E&amp;xit</source>
<translation>S&amp;alir</translation>
</message>
@ -2052,67 +2110,69 @@
<translation> </translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="191"/>
<location filename="../../serverdlg.cpp" line="527"/>
<source>Predefined Address</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Manual</source>
<translation>Manual</translation>
<translation type="vanished">Manual</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="192"/>
<source>Default</source>
<translation>Por defecto</translation>
<translation type="vanished">Por defecto</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="193"/>
<source>Default (North America)</source>
<translation>Por defecto (Norteamérica)</translation>
<translation type="vanished">Por defecto (Norteamérica)</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="271"/>
<location filename="../../serverdlg.cpp" line="273"/>
<source> Server</source>
<translation> : Servidor</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="275"/>
<location filename="../../serverdlg.cpp" line="277"/>
<source>&amp;Window</source>
<translation>&amp;Ventana</translation>
</message>
<message>
<location filename="../../util.h" line="591"/>
<location filename="../../util.h" line="615"/>
<source>Unregistered</source>
<translation>Sin registrar</translation>
</message>
<message>
<location filename="../../util.h" line="594"/>
<location filename="../../util.h" line="618"/>
<source>Bad address</source>
<translation>Dirección no válida</translation>
</message>
<message>
<location filename="../../util.h" line="597"/>
<location filename="../../util.h" line="621"/>
<source>Registration requested</source>
<translation>Registro solicitado</translation>
</message>
<message>
<location filename="../../util.h" line="600"/>
<location filename="../../util.h" line="624"/>
<source>Registration failed</source>
<translation>Error de registro</translation>
</message>
<message>
<location filename="../../util.h" line="603"/>
<location filename="../../util.h" line="627"/>
<source>Check server version</source>
<translation>Comprueba la versión del servidor</translation>
</message>
<message>
<location filename="../../util.h" line="606"/>
<location filename="../../util.h" line="630"/>
<source>Registered</source>
<translation>Registrado</translation>
</message>
<message>
<location filename="../../util.h" line="609"/>
<location filename="../../util.h" line="633"/>
<source>Central Server full</source>
<translation>Servidor Central lleno</translation>
</message>
<message>
<location filename="../../util.h" line="612"/>
<location filename="../../util.h" line="636"/>
<source>Unknown value </source>
<translation>Valor desconocido </translation>
</message>
@ -2367,7 +2427,7 @@
<context>
<name>global</name>
<message>
<location filename="../../global.h" line="237"/>
<location filename="../../global.h" line="235"/>
<source>For more information use the What&apos;s This help (help menu, right mouse button or Shift+F1)</source>
<translation>Para más información utiliza ¿Qué es Esto? (menú de ayuda, botón derecho del ratón o Shift+F1)</translation>
</message>

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

Binary file not shown.

348
src/res/translation/translation_fr_FR.ts
View File

@ -189,6 +189,11 @@
<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="658"/>
<source>Personal Mix at the Server: </source>
<translation>Mixage personnel au serveur : </translation>
</message>
</context>
<context>
<name>CChannelFader</name>
@ -215,7 +220,7 @@
<message>
<location filename="../../audiomixerboard.cpp" line="116"/>
<source>Adjusts the audio level of this channel. All connected clients at the server will be assigned an audio fader at each client, adjusting the local mix.</source>
<translation>Règle le niveau audio de ce canal. Tous les clients connectés au serveur se verront attribuer un charriot audio à chaque client, ce qui permettra d&apos;ajuster le mixage local.</translation>
<translation>Règle le niveau audio de ce canal. Tous les clients connectés au serveur se verront attribuer un chariot audio à chaque client, ce qui permettra d&apos;ajuster le mixage local.</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="119"/>
@ -245,27 +250,27 @@
<message>
<location filename="../../audiomixerboard.cpp" line="132"/>
<source>Fader Tag</source>
<translation>Étiquette de charriot</translation>
<translation>Étiquette de chariot</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="132"/>
<source>The fader tag identifies the connected client. The tag name, the picture of your instrument and a flag of your country can be set in the main window.</source>
<translation>L&apos;étiquette de charriot identifie le client connecté. Le nom du tag, la photo de votre instrument et un drapeau de votre pays peuvent être définis dans la fenêtre principale.</translation>
<translation>L&apos;étiquette de chariot identifie le client connecté. Le nom du tag, la photo de votre instrument et un drapeau de votre pays peuvent être définis dans la fenêtre principale.</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="137"/>
<source>Mixer channel instrument picture</source>
<translation type="unfinished"></translation>
<translation>Image d&apos;instrument de canal de mixeur</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="139"/>
<source>Mixer channel label (fader tag)</source>
<translation type="unfinished"></translation>
<translation>Label de canal de mixeur (étiquette de chariot)</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="141"/>
<source>Mixer channel country flag</source>
<translation type="unfinished"></translation>
<translation>Drapeau de pays de canal de mixeur</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="175"/>
@ -344,7 +349,7 @@
<message>
<location filename="../../chatdlg.cpp" line="37"/>
<source>The chat window shows a history of all chat messages.</source>
<translation>La fenêtre de tchate affiche un historique de tous les messages de chat.</translation>
<translation>La fenêtre de tchate affiche un historique de tous les messages de tchate.</translation>
</message>
<message>
<location filename="../../chatdlg.cpp" line="40"/>
@ -364,7 +369,7 @@
<message>
<location filename="../../chatdlg.cpp" line="48"/>
<source>New chat text edit box</source>
<translation type="unfinished"></translation>
<translation>Dialogue d&apos;édition de nouveau texte de tchate</translation>
</message>
</context>
<context>
@ -430,12 +435,12 @@
<message>
<location filename="../../clientdlg.cpp" line="71"/>
<source>Input level meter</source>
<translation type="unfinished"></translation>
<translation>Indicateur de niveau d&apos;entrée</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="72"/>
<source>Simulates an analog LED level meter.</source>
<translation type="unfinished"></translation>
<translation>Indicateur de niveau simulant un voyant analogique</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="87"/>
@ -476,17 +481,17 @@
<message>
<location filename="../../clientdlg.cpp" line="134"/>
<source>Reverberation effect level setting</source>
<translation type="unfinished"></translation>
<translation>Paramètre de niveau d&apos;effet de réverbération</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="143"/>
<source>Left channel selection for reverberation</source>
<translation type="unfinished"></translation>
<translation>Sélection de canal gauche pour la réverbération</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="145"/>
<source>Right channel selection for reverberation</source>
<translation type="unfinished"></translation>
<translation>Sélection de canal droit pour la réverbération</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="157"/>
@ -496,12 +501,12 @@
<message>
<location filename="../../clientdlg.cpp" line="161"/>
<source>Delay status LED indicator</source>
<translation type="unfinished"></translation>
<translation>Indicateur LED d&apos;état de délai</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="182"/>
<source>Buffers status LED indicator</source>
<translation type="unfinished"></translation>
<translation>Indicateur LED d&apos;état de tampon</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="204"/>
@ -645,6 +650,11 @@
<source>The CPU of the client or server is at 100%.</source>
<translation>Le processeur du client ou du serveur est à 100%.</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="703"/>
<source>Central Server</source>
<translation>Serveur central</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="809"/>
<source>user</source>
@ -769,22 +779,22 @@
<message>
<location filename="../../clientsettingsdlg.cpp" line="72"/>
<source>Local jitter buffer slider control</source>
<translation type="unfinished"></translation>
<translation>Chariot de contrôle de la mémoire tampon de la gigue locale</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="75"/>
<source>Server jitter buffer slider control</source>
<translation type="unfinished"></translation>
<translation>Chariot de contrôle de la mémoire tampon de la gigue du serveur</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="77"/>
<source>Auto jitter buffer switch</source>
<translation type="unfinished"></translation>
<translation>Commutateur de tampon de gigue automatique</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="79"/>
<source>Jitter buffer status LED indicator</source>
<translation type="unfinished"></translation>
<translation>Indicateur LED de l&apos;état du tampon de gigue</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="83"/>
@ -809,7 +819,7 @@
<message>
<location filename="../../clientsettingsdlg.cpp" line="92"/>
<source>Sound card device selector combo box</source>
<translation type="unfinished"></translation>
<translation>Choix déroulant de sélecteur de périphérique d&apos;interface audio</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="96"/>
@ -824,7 +834,7 @@
<message>
<location filename="../../clientsettingsdlg.cpp" line="105"/>
<source>Sound Card Channel Mapping</source>
<translation type="unfinished"></translation>
<translation>Cartographie des canaux de la carte son</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="106"/>
@ -844,22 +854,22 @@
<message>
<location filename="../../clientsettingsdlg.cpp" line="116"/>
<source>Left input channel selection combo box</source>
<translation type="unfinished"></translation>
<translation>Choix déroulant de sélection de canal d&apos;entrée gauche</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="118"/>
<source>Right input channel selection combo box</source>
<translation type="unfinished"></translation>
<translation>Choix déroulant de sélection de canal d&apos;entrée droite</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="120"/>
<source>Left output channel selection combo box</source>
<translation type="unfinished"></translation>
<translation>Choix déroulant de sélection de canal de sortie gauche</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="122"/>
<source>Right output channel selection combo box</source>
<translation type="unfinished"></translation>
<translation>Choix déroulant de sélection de canal de sortie droite</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="125"/>
@ -879,7 +889,7 @@
<message>
<location filename="../../clientsettingsdlg.cpp" line="132"/>
<source>Enable small network buffers check box</source>
<translation type="unfinished"></translation>
<translation>Case-à-cocher pour activer les petits tampons de réseau</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="135"/>
@ -959,22 +969,22 @@
<message>
<location filename="../../clientsettingsdlg.cpp" line="175"/>
<source>128 samples setting radio button</source>
<translation type="unfinished"></translation>
<translation>Bouton radio de paramétrage à 128 échantillons</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="178"/>
<source>256 samples setting radio button</source>
<translation type="unfinished"></translation>
<translation>Bouton radio de paramétrage à 256 échantillons</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="181"/>
<source>512 samples setting radio button</source>
<translation type="unfinished"></translation>
<translation>Bouton radio de paramétrage à 512 échantillons</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="184"/>
<source>ASIO setup push button</source>
<translation type="unfinished"></translation>
<translation>Bouton-poussoir de paramétrage ASIO</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="188"/>
@ -989,7 +999,7 @@
<message>
<location filename="../../clientsettingsdlg.cpp" line="191"/>
<source>Fancy skin check box</source>
<translation type="unfinished"></translation>
<translation>Case-à-cocher pour l&apos;habillage fantaisie</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="194"/>
@ -1004,7 +1014,7 @@
<message>
<location filename="../../clientsettingsdlg.cpp" line="197"/>
<source>Display channel levels check box</source>
<translation type="unfinished"></translation>
<translation>Case-à-cocher pour l&apos;affichage des niveaux de canaux</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="200"/>
@ -1029,7 +1039,7 @@
<message>
<location filename="../../clientsettingsdlg.cpp" line="219"/>
<source>Audio channels combo box</source>
<translation type="unfinished"></translation>
<translation>Choix déroulant de canaux audio</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="222"/>
@ -1044,7 +1054,7 @@
<message>
<location filename="../../clientsettingsdlg.cpp" line="231"/>
<source>Audio quality combo box</source>
<translation type="unfinished"></translation>
<translation>Choix déroulant de qualité audio</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="234"/>
@ -1059,7 +1069,7 @@
<message>
<location filename="../../clientsettingsdlg.cpp" line="243"/>
<source>New client level edit box</source>
<translation type="unfinished"></translation>
<translation>Dialogue d&apos;édition de niveau de nouveau client</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="246"/>
@ -1074,12 +1084,12 @@
<message>
<location filename="../../clientsettingsdlg.cpp" line="256"/>
<source>Default central server type combo box</source>
<translation type="unfinished"></translation>
<translation>Choix déroulant de type de serveur central par défaut</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="257"/>
<source>Central server address line edit</source>
<translation type="unfinished"></translation>
<translation>Ligne d&apos;édition pour l&apos;adresse du serveur central</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="260"/>
@ -1147,53 +1157,76 @@
<translation>Haute</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="349"/>
<source>Manual</source>
<translation>Manuel</translation>
<translation type="vanished">Manuel</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="350"/>
<location filename="../../util.h" line="581"/>
<source>Custom</source>
<translation>Personnalisé</translation>
</message>
<message>
<location filename="../../util.h" line="584"/>
<source>All Genres</source>
<translation>Tous les genres</translation>
</message>
<message>
<location filename="../../util.h" line="587"/>
<source>Genre Rock</source>
<translation>Genre Rock</translation>
</message>
<message>
<location filename="../../util.h" line="590"/>
<source>Genre Jazz</source>
<translation>Genre Jazz</translation>
</message>
<message>
<location filename="../../util.h" line="593"/>
<source>Default</source>
<translation>Défaut</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="351"/>
<source>Default (North America)</source>
<translation>Défault (Amérique du Nord)</translation>
<translation type="vanished">Défaut (Amérique du Nord)</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="367"/>
<location filename="../../clientsettingsdlg.cpp" line="369"/>
<source>preferred</source>
<translation>préféré</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="457"/>
<location filename="../../clientsettingsdlg.cpp" line="461"/>
<location filename="../../clientsettingsdlg.cpp" line="463"/>
<location filename="../../clientsettingsdlg.cpp" line="467"/>
<source>Size: </source>
<translation>Taille : </translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="518"/>
<location filename="../../clientsettingsdlg.cpp" line="524"/>
<source>Buffer Delay</source>
<translation>Délai de temporisation</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="523"/>
<location filename="../../clientsettingsdlg.cpp" line="529"/>
<source>Buffer Delay: </source>
<translation>Délai de temporisation : </translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="633"/>
<location filename="../../clientsettingsdlg.cpp" line="606"/>
<source>Predefined Address</source>
<translation>Adresse prédéfinie</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="646"/>
<source>The selected audio device could not be used because of the following error: </source>
<translation>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="../../clientsettingsdlg.cpp" line="635"/>
<location filename="../../clientsettingsdlg.cpp" line="648"/>
<source> The previous driver will be selected.</source>
<translation> Le pilote précédent sera sélectionné.</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="636"/>
<location filename="../../clientsettingsdlg.cpp" line="649"/>
<source>Ok</source>
<translation>Ok</translation>
</message>
@ -1359,84 +1392,84 @@
<context>
<name>CConnectDlg</name>
<message>
<location filename="../../connectdlg.cpp" line="47"/>
<location filename="../../connectdlg.cpp" line="49"/>
<source>Server List</source>
<translation>Liste de serveurs</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="47"/>
<location filename="../../connectdlg.cpp" line="49"/>
<source>The server list shows a list of available servers which are registered at the central server. Select a server from the list and press the connect button to connect to this server. Alternatively, double click a server from the list to connect to it. If a server is occupied, a list of the connected musicians is available by expanding the list item. Permanent servers are shown in bold font.</source>
<translation>La liste de serveurs affiche une liste des serveurs disponibles qui sont inscrits sur le serveur central. Sélectionnez un serveur dans la liste et appuyez sur le bouton de connexion pour vous connecter à ce serveur. Vous pouvez également double-cliquer sur un serveur de la liste pour vous y connecter. Si un serveur est occupé, une liste des musiciens connectés est disponible en développant l&apos;élément de la liste. Les serveurs permanents sont indiqués en caractères gras.</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="53"/>
<location filename="../../connectdlg.cpp" line="55"/>
<source>Note that it may take some time to retrieve the server list from the central server. If no valid central server address is specified in the settings, no server list will be available.</source>
<translation>Notez que ça peut prendre un certain temps pour récupérer la liste des serveurs depuis le serveur central. Si aucune adresse de serveur central valide n&apos;est spécifiée dans les paramètres, aucune liste de serveurs ne sera disponible.</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="58"/>
<location filename="../../connectdlg.cpp" line="60"/>
<source>Server list view</source>
<translation>Vue de la liste de serveurs</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="61"/>
<location filename="../../connectdlg.cpp" line="63"/>
<source>Server Address</source>
<translation>Adresse du serveur</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="61"/>
<location filename="../../connectdlg.cpp" line="63"/>
<source>The IP address or URL of the server running the </source>
<translation>L&apos;adresse IP ou l&apos;URL du serveur qui exécute le logiciel serveur </translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="62"/>
<location filename="../../connectdlg.cpp" line="64"/>
<source> server software must be set here. An optional port number can be added after the IP address or URL using a colon as a separator, e.g, example.org:</source>
<translation> doit être paramétré ici. Un numéro optionnel de port peut être ajouté après l&apos;adresse IP ou l&apos;URL en utilisant deux points en tant que séparateur, par exemple, exemple.org :</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="66"/>
<location filename="../../connectdlg.cpp" line="68"/>
<source>. A list of the most recent used server IP addresses or URLs is available for selection.</source>
<translation>. Une liste des adresses IP ou URL de serveur les plus récentes est disponible pour la sélection.</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="73"/>
<location filename="../../connectdlg.cpp" line="75"/>
<source>Server address edit box</source>
<translation type="unfinished"></translation>
<translation>Dialogue d&apos;édition d&apos;addresse de serveur</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="74"/>
<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>
</message>
<message>
<location filename="../../connectdlg.cpp" line="78"/>
<location filename="../../connectdlg.cpp" line="88"/>
<source>Filter</source>
<translation>Filtre</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="78"/>
<location filename="../../connectdlg.cpp" line="88"/>
<source>The server list is filtered by the given text. Note that the filter is case insensitive.</source>
<translation>La liste des serveurs est filtrée par le texte donné. Notez que le filtre n&apos;est pas sensible à la casse.</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="80"/>
<location filename="../../connectdlg.cpp" line="90"/>
<source>Filter edit box</source>
<translation type="unfinished"></translation>
<translation>Dialogue d&apos;édition de filtre</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="83"/>
<location filename="../../connectdlg.cpp" line="93"/>
<source>Show All Musicians</source>
<translation>Afficher tous les musiciens</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="83"/>
<location filename="../../connectdlg.cpp" line="93"/>
<source>If you check this check box, the musicians of all servers are shown. If you uncheck the check box, all list view items are collapsed.</source>
<translation>Si vous cochez cette case, les musiciens de tous les serveurs sont affichés. Si vous décochez la case, tous les éléments de la vue en liste sont regroupés.</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="86"/>
<location filename="../../connectdlg.cpp" line="96"/>
<source>Show all musicians check box</source>
<translation type="unfinished"></translation>
<translation>Case-à-cocher pour afficher tous les musiciens</translation>
</message>
</context>
<context>
@ -1448,46 +1481,51 @@
</message>
<message>
<location filename="../../connectdlgbase.ui" line="35"/>
<source>List</source>
<translation>Liste</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="45"/>
<source>Filter</source>
<translation>Filtre</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="45"/>
<location filename="../../connectdlgbase.ui" line="55"/>
<source>Show All Musicians</source>
<translation>Afficher tous les musiciens</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="61"/>
<location filename="../../connectdlgbase.ui" line="71"/>
<source>Server Name</source>
<translation>Nom du serveur</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="66"/>
<location filename="../../connectdlgbase.ui" line="76"/>
<source>Ping Time</source>
<translation>Temps de réponse</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="71"/>
<location filename="../../connectdlgbase.ui" line="81"/>
<source>Musicians</source>
<translation>Musiciens</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="76"/>
<location filename="../../connectdlgbase.ui" line="86"/>
<source>Location</source>
<translation>Localisation</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="86"/>
<location filename="../../connectdlgbase.ui" line="96"/>
<source>Server Name/Address</source>
<translation>Nom du serveur / adresse</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="120"/>
<location filename="../../connectdlgbase.ui" line="130"/>
<source>C&amp;ancel</source>
<translation>&amp;Annuler</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="127"/>
<location filename="../../connectdlgbase.ui" line="137"/>
<source>&amp;Connect</source>
<translation>Se &amp;connecter</translation>
</message>
@ -1634,7 +1672,7 @@
<message>
<location filename="../../util.cpp" line="716"/>
<source>Alias or name edit box</source>
<translation type="unfinished"></translation>
<translation>Dialogue d&apos;édition de pseudo ou de nom</translation>
</message>
<message>
<location filename="../../util.cpp" line="718"/>
@ -1649,17 +1687,17 @@
<message>
<location filename="../../util.cpp" line="722"/>
<source>City edit box</source>
<translation type="unfinished"></translation>
<translation>Dialogue d&apos;édition de ville</translation>
</message>
<message>
<location filename="../../util.cpp" line="724"/>
<source>Skill level combo box</source>
<translation type="unfinished"></translation>
<translation>Choix déroulant de niveau de compétence</translation>
</message>
<message>
<location filename="../../util.cpp" line="669"/>
<location filename="../../util.cpp" line="681"/>
<location filename="../../util.cpp" line="973"/>
<location filename="../../util.cpp" line="975"/>
<source>None</source>
<translation>Aucune</translation>
</message>
@ -1725,175 +1763,195 @@
<translation>Ce que vous réglez ici apparaîtra au niveau de votre fader sur la table de mixage lorsque vous serez connecté à un serveur </translation>
</message>
<message>
<location filename="../../util.cpp" line="974"/>
<location filename="../../util.cpp" line="976"/>
<source>Drum Set</source>
<translation>Batterie</translation>
</message>
<message>
<location filename="../../util.cpp" line="975"/>
<location filename="../../util.cpp" line="977"/>
<source>Djembe</source>
<translation>Djembé</translation>
</message>
<message>
<location filename="../../util.cpp" line="976"/>
<location filename="../../util.cpp" line="978"/>
<source>Electric Guitar</source>
<translation>Guitare électrique</translation>
</message>
<message>
<location filename="../../util.cpp" line="977"/>
<location filename="../../util.cpp" line="979"/>
<source>Acoustic Guitar</source>
<translation>Guitare accoustique</translation>
</message>
<message>
<location filename="../../util.cpp" line="978"/>
<location filename="../../util.cpp" line="980"/>
<source>Bass Guitar</source>
<translation>Guitare basse</translation>
</message>
<message>
<location filename="../../util.cpp" line="979"/>
<location filename="../../util.cpp" line="981"/>
<source>Keyboard</source>
<translation>Clavier</translation>
</message>
<message>
<location filename="../../util.cpp" line="980"/>
<location filename="../../util.cpp" line="982"/>
<source>Synthesizer</source>
<translation>Synthétiseur</translation>
</message>
<message>
<location filename="../../util.cpp" line="981"/>
<location filename="../../util.cpp" line="983"/>
<source>Grand Piano</source>
<translation>Piano à queue</translation>
</message>
<message>
<location filename="../../util.cpp" line="982"/>
<location filename="../../util.cpp" line="984"/>
<source>Accordion</source>
<translation>Accordéon</translation>
</message>
<message>
<location filename="../../util.cpp" line="983"/>
<location filename="../../util.cpp" line="985"/>
<source>Vocal</source>
<translation>Voix</translation>
</message>
<message>
<location filename="../../util.cpp" line="984"/>
<location filename="../../util.cpp" line="986"/>
<source>Microphone</source>
<translation>Microphone</translation>
</message>
<message>
<location filename="../../util.cpp" line="985"/>
<location filename="../../util.cpp" line="987"/>
<source>Harmonica</source>
<translation>Harmonica</translation>
</message>
<message>
<location filename="../../util.cpp" line="986"/>
<location filename="../../util.cpp" line="988"/>
<source>Trumpet</source>
<translation>Trompette</translation>
</message>
<message>
<location filename="../../util.cpp" line="987"/>
<location filename="../../util.cpp" line="989"/>
<source>Trombone</source>
<translation>Trombone</translation>
</message>
<message>
<location filename="../../util.cpp" line="988"/>
<location filename="../../util.cpp" line="990"/>
<source>French Horn</source>
<translation>Cor d&apos;harmonie</translation>
</message>
<message>
<location filename="../../util.cpp" line="989"/>
<location filename="../../util.cpp" line="991"/>
<source>Tuba</source>
<translation>Tuba</translation>
</message>
<message>
<location filename="../../util.cpp" line="990"/>
<location filename="../../util.cpp" line="992"/>
<source>Saxophone</source>
<translation>Saxophone</translation>
</message>
<message>
<location filename="../../util.cpp" line="991"/>
<location filename="../../util.cpp" line="993"/>
<source>Clarinet</source>
<translation>Clarinette</translation>
</message>
<message>
<location filename="../../util.cpp" line="992"/>
<location filename="../../util.cpp" line="994"/>
<source>Flute</source>
<translation>Flute</translation>
</message>
<message>
<location filename="../../util.cpp" line="993"/>
<location filename="../../util.cpp" line="995"/>
<source>Violin</source>
<translation>Violon</translation>
</message>
<message>
<location filename="../../util.cpp" line="994"/>
<location filename="../../util.cpp" line="996"/>
<source>Cello</source>
<translation>Violoncelle</translation>
</message>
<message>
<location filename="../../util.cpp" line="995"/>
<location filename="../../util.cpp" line="997"/>
<source>Double Bass</source>
<translation>Contrebasse</translation>
</message>
<message>
<location filename="../../util.cpp" line="996"/>
<location filename="../../util.cpp" line="998"/>
<source>Recorder</source>
<translation>Enregistreur</translation>
</message>
<message>
<location filename="../../util.cpp" line="997"/>
<location filename="../../util.cpp" line="999"/>
<source>Streamer</source>
<translation>Diffuseur</translation>
</message>
<message>
<location filename="../../util.cpp" line="998"/>
<location filename="../../util.cpp" line="1000"/>
<source>Listener</source>
<translation>Auditeur</translation>
</message>
<message>
<location filename="../../util.cpp" line="999"/>
<location filename="../../util.cpp" line="1001"/>
<source>Guitar+Vocal</source>
<translation>Guitare+voix</translation>
</message>
<message>
<location filename="../../util.cpp" line="1000"/>
<location filename="../../util.cpp" line="1002"/>
<source>Keyboard+Vocal</source>
<translation>Clavier+voix</translation>
</message>
<message>
<location filename="../../util.cpp" line="1001"/>
<location filename="../../util.cpp" line="1003"/>
<source>Bodhran</source>
<translation>Bodhran</translation>
</message>
<message>
<location filename="../../util.cpp" line="1002"/>
<location filename="../../util.cpp" line="1004"/>
<source>Bassoon</source>
<translation>Basson</translation>
</message>
<message>
<location filename="../../util.cpp" line="1003"/>
<location filename="../../util.cpp" line="1005"/>
<source>Oboe</source>
<translation>Hautbois</translation>
</message>
<message>
<location filename="../../util.cpp" line="1004"/>
<location filename="../../util.cpp" line="1006"/>
<source>Harp</source>
<translation>Harpe</translation>
</message>
<message>
<location filename="../../util.cpp" line="1005"/>
<location filename="../../util.cpp" line="1007"/>
<source>Viola</source>
<translation>Alto</translation>
</message>
<message>
<location filename="../../util.cpp" line="1006"/>
<location filename="../../util.cpp" line="1008"/>
<source>Congas</source>
<translation>Congas</translation>
</message>
<message>
<location filename="../../util.cpp" line="1007"/>
<location filename="../../util.cpp" line="1009"/>
<source>Bongo</source>
<translation>Bongo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1010"/>
<source>Vocal Bass</source>
<translation>Voix basse</translation>
</message>
<message>
<location filename="../../util.cpp" line="1011"/>
<source>Vocal Tenor</source>
<translation>Voix ténor</translation>
</message>
<message>
<location filename="../../util.cpp" line="1012"/>
<source>Vocal Alto</source>
<translation>Voix alto</translation>
</message>
<message>
<location filename="../../util.cpp" line="1013"/>
<source>Vocal Soprano</source>
<translation>Voix soprano</translation>
</message>
</context>
<context>
<name>CServerDlg</name>
@ -1910,7 +1968,7 @@
<message>
<location filename="../../serverdlg.cpp" line="50"/>
<source>Connected clients list view</source>
<translation type="unfinished"></translation>
<translation>Vue de la liste dess clients connectés</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="53"/>
@ -1930,7 +1988,7 @@
<message>
<location filename="../../serverdlg.cpp" line="60"/>
<source>Show Creative Commons Licence Dialog</source>
<translation type="unfinished"></translation>
<translation>Dialogue d&apos;affichage de la licence Creative Commons</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="61"/>
@ -1975,12 +2033,12 @@
<message>
<location filename="../../serverdlg.cpp" line="89"/>
<source>Default central server type combo box</source>
<translation type="unfinished"></translation>
<translation>Choix déroulant de type de serveur central par défaut</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="90"/>
<source>Central server address line edit</source>
<translation type="unfinished"></translation>
<translation>Ligne d&apos;édition pour l&apos;adresse du serveur central</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="93"/>
@ -1995,7 +2053,7 @@
<message>
<location filename="../../serverdlg.cpp" line="100"/>
<source>Server name line edit</source>
<translation type="unfinished"></translation>
<translation>Ligne d&apos;édition pour le nom du serveur</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="103"/>
@ -2010,7 +2068,7 @@
<message>
<location filename="../../serverdlg.cpp" line="110"/>
<source>City where the server is located line edit</source>
<translation type="unfinished"></translation>
<translation>Ligne d&apos;édition pour la ville où est situé le serveur</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="113"/>
@ -2025,11 +2083,11 @@
<message>
<location filename="../../serverdlg.cpp" line="121"/>
<source>Country where the server is located combo box</source>
<translation type="unfinished"></translation>
<translation>Choix déroulant du pays où le serveur est situé</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="134"/>
<location filename="../../serverdlg.cpp" line="277"/>
<location filename="../../serverdlg.cpp" line="279"/>
<source>E&amp;xit</source>
<translation>&amp;Quitter</translation>
</message>
@ -2056,67 +2114,69 @@
<translation> serveur </translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="191"/>
<location filename="../../serverdlg.cpp" line="527"/>
<source>Predefined Address</source>
<translation>Adresse prédéfinie</translation>
</message>
<message>
<source>Manual</source>
<translation>Manuel</translation>
<translation type="vanished">Manuel</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="192"/>
<source>Default</source>
<translation>Défaut</translation>
<translation type="vanished">Défaut</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="193"/>
<source>Default (North America)</source>
<translation>Défaut (Amérique du nord)</translation>
<translation type="vanished">Défaut (Amérique du nord)</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="271"/>
<location filename="../../serverdlg.cpp" line="273"/>
<source> Server</source>
<translation> serveur</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="275"/>
<location filename="../../serverdlg.cpp" line="277"/>
<source>&amp;Window</source>
<translation>&amp;Fenêtre</translation>
</message>
<message>
<location filename="../../util.h" line="591"/>
<location filename="../../util.h" line="615"/>
<source>Unregistered</source>
<translation>Non inscrit</translation>
</message>
<message>
<location filename="../../util.h" line="594"/>
<location filename="../../util.h" line="618"/>
<source>Bad address</source>
<translation>Mauvaise adresse</translation>
</message>
<message>
<location filename="../../util.h" line="597"/>
<location filename="../../util.h" line="621"/>
<source>Registration requested</source>
<translation>Inscription demandée</translation>
</message>
<message>
<location filename="../../util.h" line="600"/>
<location filename="../../util.h" line="624"/>
<source>Registration failed</source>
<translation>Échec de l&apos;inscription</translation>
</message>
<message>
<location filename="../../util.h" line="603"/>
<location filename="../../util.h" line="627"/>
<source>Check server version</source>
<translation>Vérifier la version du serveur</translation>
</message>
<message>
<location filename="../../util.h" line="606"/>
<location filename="../../util.h" line="630"/>
<source>Registered</source>
<translation>Inscrit</translation>
</message>
<message>
<location filename="../../util.h" line="609"/>
<location filename="../../util.h" line="633"/>
<source>Central Server full</source>
<translation>Serveur central rempli</translation>
</message>
<message>
<location filename="../../util.h" line="612"/>
<location filename="../../util.h" line="636"/>
<source>Unknown value </source>
<translation>Valeur inconnue</translation>
</message>
@ -2190,7 +2250,7 @@
<message>
<location filename="../../../linux/sound.cpp" line="40"/>
<source>The Jack server is not running. This software requires a Jack server to run. Normally if the Jack server is not running this software will automatically start the Jack server. It seems that this auto start has not worked. Try to start the Jack server manually.</source>
<translation type="unfinished"></translation>
<translation>Le serveur Jack n&apos;est pas démarré. Ce logiciel nécessite un serveur Jack pour fonctionner. Normalement, si le serveur Jack n&apos;est pas en cours d&apos;exécution, ce logiciel démarrera automatiquement le serveur Jack. Il semble que ce démarrage automatique n&apos;ait pas fonctionné. Essayez de démarrer le serveur Jack manuellement.</translation>
</message>
<message>
<location filename="../../../linux/sound.cpp" line="60"/>
@ -2335,12 +2395,12 @@
<message>
<location filename="../../soundbase.cpp" line="146"/>
<source>Please restart the software.</source>
<translation type="unfinished"></translation>
<translation>Veuillez redémarrer le logiciel</translation>
</message>
<message>
<location filename="../../soundbase.cpp" line="147"/>
<source>Close</source>
<translation type="unfinished"></translation>
<translation>Fermer</translation>
</message>
<message>
<location filename="../../soundbase.cpp" line="189"/>
@ -2371,9 +2431,9 @@
<context>
<name>global</name>
<message>
<location filename="../../global.h" line="237"/>
<location filename="../../global.h" line="235"/>
<source>For more information use the What&apos;s This help (help menu, right mouse button or Shift+F1)</source>
<translation type="unfinished"></translation>
<translation>Pour plus d&apos;informations, utilisez l&apos;aide Qu&apos;est-ce que c&apos;est (menu d&apos;aide, bouton droit de la souris ou Maj+F1)</translation>
</message>
</context>
</TS>

BIN
src/res/translation/translation_nl_NL.qm
View File

Binary file not shown.

240
src/res/translation/translation_nl_NL.ts
View File

@ -177,6 +177,11 @@
<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="658"/>
<source>Personal Mix at the Server: </source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CChannelFader</name>
@ -633,6 +638,11 @@
<source>R</source>
<translation>R</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="703"/>
<source>Central Server</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="809"/>
<source>user</source>
@ -1135,53 +1145,76 @@
<translation>Hoog</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="349"/>
<source>Manual</source>
<translation>Handmatig</translation>
<translation type="vanished">Handmatig</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="350"/>
<location filename="../../util.h" line="581"/>
<source>Custom</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.h" line="584"/>
<source>All Genres</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.h" line="587"/>
<source>Genre Rock</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.h" line="590"/>
<source>Genre Jazz</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.h" line="593"/>
<source>Default</source>
<translation>Standaard</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="351"/>
<source>Default (North America)</source>
<translation>Standaard (Noord-Amerika)</translation>
<translation type="vanished">Standaard (Noord-Amerika)</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="367"/>
<location filename="../../clientsettingsdlg.cpp" line="369"/>
<source>preferred</source>
<translation>gewenst</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="457"/>
<location filename="../../clientsettingsdlg.cpp" line="461"/>
<location filename="../../clientsettingsdlg.cpp" line="463"/>
<location filename="../../clientsettingsdlg.cpp" line="467"/>
<source>Size: </source>
<translation>Size: </translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="518"/>
<location filename="../../clientsettingsdlg.cpp" line="524"/>
<source>Buffer Delay</source>
<translation>Buffervertraging</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="523"/>
<location filename="../../clientsettingsdlg.cpp" line="529"/>
<source>Buffer Delay: </source>
<translation>Buffervertraging: </translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="633"/>
<location filename="../../clientsettingsdlg.cpp" line="606"/>
<source>Predefined Address</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="646"/>
<source>The selected audio device could not be used because of the following error: </source>
<translation>Het geselecteerde audioapparaat kon niet worden gebruikt vanwege de volgende fout: </translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="635"/>
<location filename="../../clientsettingsdlg.cpp" line="648"/>
<source> The previous driver will be selected.</source>
<translation> Het vorige stuurprogramma wordt geselecteerd.</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="636"/>
<location filename="../../clientsettingsdlg.cpp" line="649"/>
<source>Ok</source>
<translation>Ok</translation>
</message>
@ -1347,82 +1380,82 @@
<context>
<name>CConnectDlg</name>
<message>
<location filename="../../connectdlg.cpp" line="47"/>
<location filename="../../connectdlg.cpp" line="49"/>
<source>Server List</source>
<translation>Serverlijst</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="47"/>
<location filename="../../connectdlg.cpp" line="49"/>
<source>The server list shows a list of available servers which are registered at the central server. Select a server from the list and press the connect button to connect to this server. Alternatively, double click a server from the list to connect to it. If a server is occupied, a list of the connected musicians is available by expanding the list item. Permanent servers are shown in bold font.</source>
<translation>De serverlijst toont een lijst van beschikbare servers die op de centrale server zijn geregistreerd. Selecteer een server uit de lijst en druk op de verbindingsknop om verbinding te maken met deze server. U kunt ook dubbelklikken op een server uit de lijst om verbinding te maken met deze server. Als een server bezet is, is een lijst van de verbonden muzikanten beschikbaar door het lijstitem uit te breiden. Permanente servers worden vetgedrukt weergegeven.</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="53"/>
<location filename="../../connectdlg.cpp" line="55"/>
<source>Note that it may take some time to retrieve the server list from the central server. If no valid central server address is specified in the settings, no server list will be available.</source>
<translation>Merk op dat het enige tijd kan duren om de serverlijst op te halen van de centrale server. Als er geen geldig centraal serveradres is opgegeven in de instellingen, zal er geen serverlijst beschikbaar zijn.</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="58"/>
<location filename="../../connectdlg.cpp" line="60"/>
<source>Server list view</source>
<translation>Serverlijstweergave</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="61"/>
<location filename="../../connectdlg.cpp" line="63"/>
<source>Server Address</source>
<translation>Serveradres</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="61"/>
<location filename="../../connectdlg.cpp" line="63"/>
<source>The IP address or URL of the server running the </source>
<translation>Het IP-adres of de URL van de server waarop de </translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="62"/>
<location filename="../../connectdlg.cpp" line="64"/>
<source> server software must be set here. An optional port number can be added after the IP address or URL using a colon as a separator, e.g, example.org:</source>
<translation> serversoftware moet worden ingesteld. Een optioneel poortnummer kan worden toegevoegd na het IP-adres of de URL met een dubbele punt als scheidingsteken, bijvoorbeeld example.org:</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="66"/>
<location filename="../../connectdlg.cpp" line="68"/>
<source>. A list of the most recent used server IP addresses or URLs is available for selection.</source>
<translation>. Een lijst met de meest recent gebruikte server-IP-adressen of URL&apos;s is beschikbaar voor selectie.</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="73"/>
<location filename="../../connectdlg.cpp" line="75"/>
<source>Server address edit box</source>
<translation>Serveradres bewerkingsvak</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="74"/>
<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>Bevat het huidige server-IP-adres of de URL. Het slaat ook oude URL&apos;s op in de comboboxlijst.</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="78"/>
<location filename="../../connectdlg.cpp" line="88"/>
<source>Filter</source>
<translation>Filter</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="78"/>
<location filename="../../connectdlg.cpp" line="88"/>
<source>The server list is filtered by the given text. Note that the filter is case insensitive.</source>
<translation>De serverlijst wordt gefilterd met de gegeven tekst. Merk op dat het filter ongevoelig is voor hoofdletters.</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="80"/>
<location filename="../../connectdlg.cpp" line="90"/>
<source>Filter edit box</source>
<translation>Filter bewerkingsvak</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="83"/>
<location filename="../../connectdlg.cpp" line="93"/>
<source>Show All Musicians</source>
<translation>Toon alle muzikanten</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="83"/>
<location filename="../../connectdlg.cpp" line="93"/>
<source>If you check this check box, the musicians of all servers are shown. If you uncheck the check box, all list view items are collapsed.</source>
<translation>Als u dit selectievakje aanvinkt, worden de muzikanten van alle servers getoond. Als u het selectievakje uitvinkt, worden alle items van de lijstweergave samengevouwen.</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="86"/>
<location filename="../../connectdlg.cpp" line="96"/>
<source>Show all musicians check box</source>
<translation>Toon alle muzikanten checkbox</translation>
</message>
@ -1436,46 +1469,51 @@
</message>
<message>
<location filename="../../connectdlgbase.ui" line="35"/>
<source>List</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="45"/>
<source>Filter</source>
<translation>Filter</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="45"/>
<location filename="../../connectdlgbase.ui" line="55"/>
<source>Show All Musicians</source>
<translation>Toon alle muzikanten</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="61"/>
<location filename="../../connectdlgbase.ui" line="71"/>
<source>Server Name</source>
<translation>Servernaam</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="66"/>
<location filename="../../connectdlgbase.ui" line="76"/>
<source>Ping Time</source>
<translation>Ping-tijd</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="71"/>
<location filename="../../connectdlgbase.ui" line="81"/>
<source>Musicians</source>
<translation>Muzikanten</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="76"/>
<location filename="../../connectdlgbase.ui" line="86"/>
<source>Location</source>
<translation>Locatie</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="86"/>
<location filename="../../connectdlgbase.ui" line="96"/>
<source>Server Name/Address</source>
<translation>Servernaam/Adres</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="120"/>
<location filename="../../connectdlgbase.ui" line="130"/>
<source>C&amp;ancel</source>
<translation>Annuleren</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="127"/>
<location filename="../../connectdlgbase.ui" line="137"/>
<source>&amp;Connect</source>
<translation>Verbinden</translation>
</message>
@ -1653,7 +1691,7 @@
<message>
<location filename="../../util.cpp" line="669"/>
<location filename="../../util.cpp" line="681"/>
<location filename="../../util.cpp" line="973"/>
<location filename="../../util.cpp" line="975"/>
<source>None</source>
<translation>Geen</translation>
</message>
@ -1713,175 +1751,195 @@
<translation>Combo-box voor vaardigheidsniveau</translation>
</message>
<message>
<location filename="../../util.cpp" line="974"/>
<location filename="../../util.cpp" line="976"/>
<source>Drum Set</source>
<translation>Drumstel</translation>
</message>
<message>
<location filename="../../util.cpp" line="975"/>
<location filename="../../util.cpp" line="977"/>
<source>Djembe</source>
<translation>Djembe</translation>
</message>
<message>
<location filename="../../util.cpp" line="976"/>
<location filename="../../util.cpp" line="978"/>
<source>Electric Guitar</source>
<translation>Elektrische Gitaar</translation>
</message>
<message>
<location filename="../../util.cpp" line="977"/>
<location filename="../../util.cpp" line="979"/>
<source>Acoustic Guitar</source>
<translation>Akoestische Gitaar</translation>
</message>
<message>
<location filename="../../util.cpp" line="978"/>
<location filename="../../util.cpp" line="980"/>
<source>Bass Guitar</source>
<translation>Basgitaar</translation>
</message>
<message>
<location filename="../../util.cpp" line="979"/>
<location filename="../../util.cpp" line="981"/>
<source>Keyboard</source>
<translation>Toetsenbord</translation>
</message>
<message>
<location filename="../../util.cpp" line="980"/>
<location filename="../../util.cpp" line="982"/>
<source>Synthesizer</source>
<translation>Synthesizer</translation>
</message>
<message>
<location filename="../../util.cpp" line="981"/>
<location filename="../../util.cpp" line="983"/>
<source>Grand Piano</source>
<translation>Piano</translation>
</message>
<message>
<location filename="../../util.cpp" line="982"/>
<location filename="../../util.cpp" line="984"/>
<source>Accordion</source>
<translation>Accordeon</translation>
</message>
<message>
<location filename="../../util.cpp" line="983"/>
<location filename="../../util.cpp" line="985"/>
<source>Vocal</source>
<translation>Vocaal</translation>
</message>
<message>
<location filename="../../util.cpp" line="984"/>
<location filename="../../util.cpp" line="986"/>
<source>Microphone</source>
<translation>Microfoon</translation>
</message>
<message>
<location filename="../../util.cpp" line="985"/>
<location filename="../../util.cpp" line="987"/>
<source>Harmonica</source>
<translation>Harmonica</translation>
</message>
<message>
<location filename="../../util.cpp" line="986"/>
<location filename="../../util.cpp" line="988"/>
<source>Trumpet</source>
<translation>Trompet</translation>
</message>
<message>
<location filename="../../util.cpp" line="987"/>
<location filename="../../util.cpp" line="989"/>
<source>Trombone</source>
<translation>Trombone</translation>
</message>
<message>
<location filename="../../util.cpp" line="988"/>
<location filename="../../util.cpp" line="990"/>
<source>French Horn</source>
<translation>Hoorn</translation>
</message>
<message>
<location filename="../../util.cpp" line="989"/>
<location filename="../../util.cpp" line="991"/>
<source>Tuba</source>
<translation>Tuba</translation>
</message>
<message>
<location filename="../../util.cpp" line="990"/>
<location filename="../../util.cpp" line="992"/>
<source>Saxophone</source>
<translation>Saxofoon</translation>
</message>
<message>
<location filename="../../util.cpp" line="991"/>
<location filename="../../util.cpp" line="993"/>
<source>Clarinet</source>
<translation>Klarinet</translation>
</message>
<message>
<location filename="../../util.cpp" line="992"/>
<location filename="../../util.cpp" line="994"/>
<source>Flute</source>
<translation>Fluit</translation>
</message>
<message>
<location filename="../../util.cpp" line="993"/>
<location filename="../../util.cpp" line="995"/>
<source>Violin</source>
<translation>Viool</translation>
</message>
<message>
<location filename="../../util.cpp" line="994"/>
<location filename="../../util.cpp" line="996"/>
<source>Cello</source>
<translation>Cello</translation>
</message>
<message>
<location filename="../../util.cpp" line="995"/>
<location filename="../../util.cpp" line="997"/>
<source>Double Bass</source>
<translation>Contrabas</translation>
</message>
<message>
<location filename="../../util.cpp" line="996"/>
<location filename="../../util.cpp" line="998"/>
<source>Recorder</source>
<translation>Opnemer</translation>
</message>
<message>
<location filename="../../util.cpp" line="997"/>
<location filename="../../util.cpp" line="999"/>
<source>Streamer</source>
<translation>Streamer</translation>
</message>
<message>
<location filename="../../util.cpp" line="998"/>
<location filename="../../util.cpp" line="1000"/>
<source>Listener</source>
<translation>Luisteraar</translation>
</message>
<message>
<location filename="../../util.cpp" line="999"/>
<location filename="../../util.cpp" line="1001"/>
<source>Guitar+Vocal</source>
<translation>Gitaar+Vocaal</translation>
</message>
<message>
<location filename="../../util.cpp" line="1000"/>
<location filename="../../util.cpp" line="1002"/>
<source>Keyboard+Vocal</source>
<translation>Toetsenbord+Vocaal</translation>
</message>
<message>
<location filename="../../util.cpp" line="1001"/>
<location filename="../../util.cpp" line="1003"/>
<source>Bodhran</source>
<translation>Bodhran</translation>
</message>
<message>
<location filename="../../util.cpp" line="1002"/>
<location filename="../../util.cpp" line="1004"/>
<source>Bassoon</source>
<translation>Fagot</translation>
</message>
<message>
<location filename="../../util.cpp" line="1003"/>
<location filename="../../util.cpp" line="1005"/>
<source>Oboe</source>
<translation>Hobo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1004"/>
<location filename="../../util.cpp" line="1006"/>
<source>Harp</source>
<translation>Harp</translation>
</message>
<message>
<location filename="../../util.cpp" line="1005"/>
<location filename="../../util.cpp" line="1007"/>
<source>Viola</source>
<translation>Viola</translation>
</message>
<message>
<location filename="../../util.cpp" line="1006"/>
<location filename="../../util.cpp" line="1008"/>
<source>Congas</source>
<translation>Congas</translation>
</message>
<message>
<location filename="../../util.cpp" line="1007"/>
<location filename="../../util.cpp" line="1009"/>
<source>Bongo</source>
<translation>Bongo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1010"/>
<source>Vocal Bass</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.cpp" line="1011"/>
<source>Vocal Tenor</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.cpp" line="1012"/>
<source>Vocal Alto</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.cpp" line="1013"/>
<source>Vocal Soprano</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CServerDlg</name>
@ -2017,7 +2075,7 @@
</message>
<message>
<location filename="../../serverdlg.cpp" line="134"/>
<location filename="../../serverdlg.cpp" line="277"/>
<location filename="../../serverdlg.cpp" line="279"/>
<source>E&amp;xit</source>
<translation>&amp;Sluiten</translation>
</message>
@ -2044,67 +2102,69 @@
<translation> server</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="191"/>
<location filename="../../serverdlg.cpp" line="527"/>
<source>Predefined Address</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Manual</source>
<translation>Handmatig</translation>
<translation type="vanished">Handmatig</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="192"/>
<source>Default</source>
<translation>Standaard</translation>
<translation type="vanished">Standaard</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="193"/>
<source>Default (North America)</source>
<translation>Standaard (Noord-Amerika)</translation>
<translation type="vanished">Standaard (Noord-Amerika)</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="271"/>
<location filename="../../serverdlg.cpp" line="273"/>
<source> Server</source>
<translation> Server</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="275"/>
<location filename="../../serverdlg.cpp" line="277"/>
<source>&amp;Window</source>
<translation>&amp;Window</translation>
</message>
<message>
<location filename="../../util.h" line="591"/>
<location filename="../../util.h" line="615"/>
<source>Unregistered</source>
<translation>Niet geregistreerd</translation>
</message>
<message>
<location filename="../../util.h" line="594"/>
<location filename="../../util.h" line="618"/>
<source>Bad address</source>
<translation>Slecht adres</translation>
</message>
<message>
<location filename="../../util.h" line="597"/>
<location filename="../../util.h" line="621"/>
<source>Registration requested</source>
<translation>Aanmelding gevraagd</translation>
</message>
<message>
<location filename="../../util.h" line="600"/>
<location filename="../../util.h" line="624"/>
<source>Registration failed</source>
<translation>Registratie is mislukt</translation>
</message>
<message>
<location filename="../../util.h" line="603"/>
<location filename="../../util.h" line="627"/>
<source>Check server version</source>
<translation>Controleer de versie van de server</translation>
</message>
<message>
<location filename="../../util.h" line="606"/>
<location filename="../../util.h" line="630"/>
<source>Registered</source>
<translation>Geregistreerd</translation>
</message>
<message>
<location filename="../../util.h" line="609"/>
<location filename="../../util.h" line="633"/>
<source>Central Server full</source>
<translation>Centrale server vol</translation>
</message>
<message>
<location filename="../../util.h" line="612"/>
<location filename="../../util.h" line="636"/>
<source>Unknown value </source>
<translation>Onbekende waarde </translation>
</message>
@ -2359,7 +2419,7 @@
<context>
<name>global</name>
<message>
<location filename="../../global.h" line="237"/>
<location filename="../../global.h" line="235"/>
<source>For more information use the What&apos;s This help (help menu, right mouse button or Shift+F1)</source>
<translation>Voor meer informatie gebruik de Wat Is Dit hulp (helpmenu, rechtermuisklik of Shift+F1)</translation>
</message>

BIN
src/res/translation/translation_pt_PT.qm
View File

Binary file not shown.

240
src/res/translation/translation_pt_PT.ts
View File

@ -189,6 +189,11 @@
<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="658"/>
<source>Personal Mix at the Server: </source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CChannelFader</name>
@ -645,6 +650,11 @@
<source>The CPU of the client or server is at 100%.</source>
<translation>O CPU do cliente ou servidor está a 100%.</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="703"/>
<source>Central Server</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="809"/>
<source>user</source>
@ -1147,53 +1157,76 @@
<translation>Alta</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="349"/>
<source>Manual</source>
<translation>Manual</translation>
<translation type="vanished">Manual</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="350"/>
<location filename="../../util.h" line="581"/>
<source>Custom</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.h" line="584"/>
<source>All Genres</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.h" line="587"/>
<source>Genre Rock</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.h" line="590"/>
<source>Genre Jazz</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.h" line="593"/>
<source>Default</source>
<translation>Servidor Padrão</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="351"/>
<source>Default (North America)</source>
<translation>Servidor Padrão (America do Norte)</translation>
<translation type="vanished">Servidor Padrão (America do Norte)</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="367"/>
<location filename="../../clientsettingsdlg.cpp" line="369"/>
<source>preferred</source>
<translation>preferido</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="457"/>
<location filename="../../clientsettingsdlg.cpp" line="461"/>
<location filename="../../clientsettingsdlg.cpp" line="463"/>
<location filename="../../clientsettingsdlg.cpp" line="467"/>
<source>Size: </source>
<translation>Tamanho: </translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="518"/>
<location filename="../../clientsettingsdlg.cpp" line="524"/>
<source>Buffer Delay</source>
<translation>Atraso do buffer</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="523"/>
<location filename="../../clientsettingsdlg.cpp" line="529"/>
<source>Buffer Delay: </source>
<translation>Atraso do buffer:</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="633"/>
<location filename="../../clientsettingsdlg.cpp" line="606"/>
<source>Predefined Address</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="646"/>
<source>The selected audio device could not be used because of the following error: </source>
<translation>O dispositivo de áudio selecionado não pôde ser usado devido ao seguinte erro: </translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="635"/>
<location filename="../../clientsettingsdlg.cpp" line="648"/>
<source> The previous driver will be selected.</source>
<translation> O driver anterior será selecionado.</translation>
</message>
<message>
<location filename="../../clientsettingsdlg.cpp" line="636"/>
<location filename="../../clientsettingsdlg.cpp" line="649"/>
<source>Ok</source>
<translation>Ok</translation>
</message>
@ -1359,82 +1392,82 @@
<context>
<name>CConnectDlg</name>
<message>
<location filename="../../connectdlg.cpp" line="47"/>
<location filename="../../connectdlg.cpp" line="49"/>
<source>Server List</source>
<translation>Lista de servidores</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="47"/>
<location filename="../../connectdlg.cpp" line="49"/>
<source>The server list shows a list of available servers which are registered at the central server. Select a server from the list and press the connect button to connect to this server. Alternatively, double click a server from the list to connect to it. If a server is occupied, a list of the connected musicians is available by expanding the list item. Permanent servers are shown in bold font.</source>
<translation>A lista de servidores mostra a os servidores disponíveis registados no servidor central. Selecione um servidor da lista e pressione o botão Ligar para se ligar a este servidor. Como alternativa, clique duas vezes num servidor da lista para se ligar ao mesmo. Se um servidor estiver ocupado, uma lista dos músicos ligados estará disponível expandindo o item da lista. Os servidores permanentes são mostrados em negrito.</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="53"/>
<location filename="../../connectdlg.cpp" line="55"/>
<source>Note that it may take some time to retrieve the server list from the central server. If no valid central server address is specified in the settings, no server list will be available.</source>
<translation>Observe que pode demorar algum tempo para obter a lista de servidores do servidor central. Se nenhum endereço de servidor central válido for especificado nas definições, nenhuma lista de servidores estará disponível.</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="58"/>
<location filename="../../connectdlg.cpp" line="60"/>
<source>Server list view</source>
<translation>Vista da lista de servidores</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="61"/>
<location filename="../../connectdlg.cpp" line="63"/>
<source>Server Address</source>
<translation>Endereço do servidor</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="61"/>
<location filename="../../connectdlg.cpp" line="63"/>
<source>The IP address or URL of the server running the </source>
<translation>O endereço IP ou URL do servidor executando o servidor </translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="62"/>
<location filename="../../connectdlg.cpp" line="64"/>
<source> server software must be set here. An optional port number can be added after the IP address or URL using a colon as a separator, e.g, example.org:</source>
<translation> deve ser definido aqui. Um número de porta opcional pode ser adicionado após o endereço IP ou URL usando o caractere dois pontos como separador, por exemplo, example.org:</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="66"/>
<location filename="../../connectdlg.cpp" line="68"/>
<source>. A list of the most recent used server IP addresses or URLs is available for selection.</source>
<translation>. Uma lista dos endereços IP ou URLs dos servidores usados recentemente está disponível para seleção.</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="73"/>
<location filename="../../connectdlg.cpp" line="75"/>
<source>Server address edit box</source>
<translation>Caixa de edição do endereço do servidor</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="74"/>
<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>Contém o endereço IP ou URL do servidor atual. Também armazena URLs antigos na lista do seletor.</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="78"/>
<location filename="../../connectdlg.cpp" line="88"/>
<source>Filter</source>
<translation>Filtro</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="78"/>
<location filename="../../connectdlg.cpp" line="88"/>
<source>The server list is filtered by the given text. Note that the filter is case insensitive.</source>
<translation>A lista de servidores é filtrada pelo texto fornecido. Note que o filtro não diferencia maiúsculas de minúsculas.</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="80"/>
<location filename="../../connectdlg.cpp" line="90"/>
<source>Filter edit box</source>
<translation>Caixa de edição do filtro</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="83"/>
<location filename="../../connectdlg.cpp" line="93"/>
<source>Show All Musicians</source>
<translation>Mostrar Todos os Músicos</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="83"/>
<location filename="../../connectdlg.cpp" line="93"/>
<source>If you check this check box, the musicians of all servers are shown. If you uncheck the check box, all list view items are collapsed.</source>
<translation>Se marcar esta caixa de seleção, os músicos de todos os servidores serão mostrados. Se desmarcar a caixa de seleção, todos os itens em exibição na lista serão recolhidos.</translation>
</message>
<message>
<location filename="../../connectdlg.cpp" line="86"/>
<location filename="../../connectdlg.cpp" line="96"/>
<source>Show all musicians check box</source>
<translation>Caixa de seleção para mostrar músicos</translation>
</message>
@ -1448,46 +1481,51 @@
</message>
<message>
<location filename="../../connectdlgbase.ui" line="35"/>
<source>List</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="45"/>
<source>Filter</source>
<translation>Filtro</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="45"/>
<location filename="../../connectdlgbase.ui" line="55"/>
<source>Show All Musicians</source>
<translation>Mostrar Todos os Músicos</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="61"/>
<location filename="../../connectdlgbase.ui" line="71"/>
<source>Server Name</source>
<translation>Nome do Servidor</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="66"/>
<location filename="../../connectdlgbase.ui" line="76"/>
<source>Ping Time</source>
<translation>Latência</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="71"/>
<location filename="../../connectdlgbase.ui" line="81"/>
<source>Musicians</source>
<translation>Músicos</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="76"/>
<location filename="../../connectdlgbase.ui" line="86"/>
<source>Location</source>
<translation>Localização</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="86"/>
<location filename="../../connectdlgbase.ui" line="96"/>
<source>Server Name/Address</source>
<translation>Nome/Endereço do Servidor</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="120"/>
<location filename="../../connectdlgbase.ui" line="130"/>
<source>C&amp;ancel</source>
<translation>&amp;Cancelar</translation>
</message>
<message>
<location filename="../../connectdlgbase.ui" line="127"/>
<location filename="../../connectdlgbase.ui" line="137"/>
<source>&amp;Connect</source>
<translation>&amp;Ligar</translation>
</message>
@ -1659,7 +1697,7 @@
<message>
<location filename="../../util.cpp" line="669"/>
<location filename="../../util.cpp" line="681"/>
<location filename="../../util.cpp" line="973"/>
<location filename="../../util.cpp" line="975"/>
<source>None</source>
<translation>Nenhum</translation>
</message>
@ -1725,175 +1763,195 @@
<translation>O que definir aqui aparecerá por baixo do seu fader na secção de mistura quando estiver ligado a um servidor </translation>
</message>
<message>
<location filename="../../util.cpp" line="974"/>
<location filename="../../util.cpp" line="976"/>
<source>Drum Set</source>
<translation>Bateria</translation>
</message>
<message>
<location filename="../../util.cpp" line="975"/>
<location filename="../../util.cpp" line="977"/>
<source>Djembe</source>
<translation>Djembe</translation>
</message>
<message>
<location filename="../../util.cpp" line="976"/>
<location filename="../../util.cpp" line="978"/>
<source>Electric Guitar</source>
<translation>Guitarra Elétrica</translation>
</message>
<message>
<location filename="../../util.cpp" line="977"/>
<location filename="../../util.cpp" line="979"/>
<source>Acoustic Guitar</source>
<translation>Guitarra Acústica</translation>
</message>
<message>
<location filename="../../util.cpp" line="978"/>
<location filename="../../util.cpp" line="980"/>
<source>Bass Guitar</source>
<translation>Baixo</translation>
</message>
<message>
<location filename="../../util.cpp" line="979"/>
<location filename="../../util.cpp" line="981"/>
<source>Keyboard</source>
<translation>Teclado</translation>
</message>
<message>
<location filename="../../util.cpp" line="980"/>
<location filename="../../util.cpp" line="982"/>
<source>Synthesizer</source>
<translation>Sintetizador</translation>
</message>
<message>
<location filename="../../util.cpp" line="981"/>
<location filename="../../util.cpp" line="983"/>
<source>Grand Piano</source>
<translation>Piano de Cauda</translation>
</message>
<message>
<location filename="../../util.cpp" line="982"/>
<location filename="../../util.cpp" line="984"/>
<source>Accordion</source>
<translation>Acordeão</translation>
</message>
<message>
<location filename="../../util.cpp" line="983"/>
<location filename="../../util.cpp" line="985"/>
<source>Vocal</source>
<translation>Voz</translation>
</message>
<message>
<location filename="../../util.cpp" line="984"/>
<location filename="../../util.cpp" line="986"/>
<source>Microphone</source>
<translation>Microfone</translation>
</message>
<message>
<location filename="../../util.cpp" line="985"/>
<location filename="../../util.cpp" line="987"/>
<source>Harmonica</source>
<translation>Harmónica</translation>
</message>
<message>
<location filename="../../util.cpp" line="986"/>
<location filename="../../util.cpp" line="988"/>
<source>Trumpet</source>
<translation>Trompete</translation>
</message>
<message>
<location filename="../../util.cpp" line="987"/>
<location filename="../../util.cpp" line="989"/>
<source>Trombone</source>
<translation>Trombone</translation>
</message>
<message>
<location filename="../../util.cpp" line="988"/>
<location filename="../../util.cpp" line="990"/>
<source>French Horn</source>
<translation>Trompa Francesa</translation>
</message>
<message>
<location filename="../../util.cpp" line="989"/>
<location filename="../../util.cpp" line="991"/>
<source>Tuba</source>
<translation>Tuba</translation>
</message>
<message>
<location filename="../../util.cpp" line="990"/>
<location filename="../../util.cpp" line="992"/>
<source>Saxophone</source>
<translation>Saxofone</translation>
</message>
<message>
<location filename="../../util.cpp" line="991"/>
<location filename="../../util.cpp" line="993"/>
<source>Clarinet</source>
<translation>Clarinete</translation>
</message>
<message>
<location filename="../../util.cpp" line="992"/>
<location filename="../../util.cpp" line="994"/>
<source>Flute</source>
<translation>Flauta</translation>
</message>
<message>
<location filename="../../util.cpp" line="993"/>
<location filename="../../util.cpp" line="995"/>
<source>Violin</source>
<translation>Violino</translation>
</message>
<message>
<location filename="../../util.cpp" line="994"/>
<location filename="../../util.cpp" line="996"/>
<source>Cello</source>
<translation>Violoncelo</translation>
</message>
<message>
<location filename="../../util.cpp" line="995"/>
<location filename="../../util.cpp" line="997"/>
<source>Double Bass</source>
<translation>Contrabaixo</translation>
</message>
<message>
<location filename="../../util.cpp" line="996"/>
<location filename="../../util.cpp" line="998"/>
<source>Recorder</source>
<translation>Gravador</translation>
</message>
<message>
<location filename="../../util.cpp" line="997"/>
<location filename="../../util.cpp" line="999"/>
<source>Streamer</source>
<translation>Streamer</translation>
</message>
<message>
<location filename="../../util.cpp" line="998"/>
<location filename="../../util.cpp" line="1000"/>
<source>Listener</source>
<translation>Ouvinte</translation>
</message>
<message>
<location filename="../../util.cpp" line="999"/>
<location filename="../../util.cpp" line="1001"/>
<source>Guitar+Vocal</source>
<translation>Guitarra+Voz</translation>
</message>
<message>
<location filename="../../util.cpp" line="1000"/>
<location filename="../../util.cpp" line="1002"/>
<source>Keyboard+Vocal</source>
<translation>Teclado+Voz</translation>
</message>
<message>
<location filename="../../util.cpp" line="1001"/>
<location filename="../../util.cpp" line="1003"/>
<source>Bodhran</source>
<translation>Bodhrán</translation>
</message>
<message>
<location filename="../../util.cpp" line="1002"/>
<location filename="../../util.cpp" line="1004"/>
<source>Bassoon</source>
<translation>Fagote</translation>
</message>
<message>
<location filename="../../util.cpp" line="1003"/>
<location filename="../../util.cpp" line="1005"/>
<source>Oboe</source>
<translation>Oboé</translation>
</message>
<message>
<location filename="../../util.cpp" line="1004"/>
<location filename="../../util.cpp" line="1006"/>
<source>Harp</source>
<translation>Harpa</translation>
</message>
<message>
<location filename="../../util.cpp" line="1005"/>
<location filename="../../util.cpp" line="1007"/>
<source>Viola</source>
<translation>Viola de Arco</translation>
</message>
<message>
<location filename="../../util.cpp" line="1006"/>
<location filename="../../util.cpp" line="1008"/>
<source>Congas</source>
<translation>Congas</translation>
</message>
<message>
<location filename="../../util.cpp" line="1007"/>
<location filename="../../util.cpp" line="1009"/>
<source>Bongo</source>
<translation>Bongo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1010"/>
<source>Vocal Bass</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.cpp" line="1011"/>
<source>Vocal Tenor</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.cpp" line="1012"/>
<source>Vocal Alto</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.cpp" line="1013"/>
<source>Vocal Soprano</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CServerDlg</name>
@ -2029,7 +2087,7 @@
</message>
<message>
<location filename="../../serverdlg.cpp" line="134"/>
<location filename="../../serverdlg.cpp" line="277"/>
<location filename="../../serverdlg.cpp" line="279"/>
<source>E&amp;xit</source>
<translation>&amp;Sair</translation>
</message>
@ -2056,67 +2114,69 @@
<translation> </translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="191"/>
<location filename="../../serverdlg.cpp" line="527"/>
<source>Predefined Address</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Manual</source>
<translation>Manual</translation>
<translation type="vanished">Manual</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="192"/>
<source>Default</source>
<translation>Servidor Padrão</translation>
<translation type="vanished">Servidor Padrão</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="193"/>
<source>Default (North America)</source>
<translation>Servidor Padrão (America do Norte)</translation>
<translation type="vanished">Servidor Padrão (America do Norte)</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="271"/>
<location filename="../../serverdlg.cpp" line="273"/>
<source> Server</source>
<translation> - Servidor</translation>
</message>
<message>
<location filename="../../serverdlg.cpp" line="275"/>
<location filename="../../serverdlg.cpp" line="277"/>
<source>&amp;Window</source>
<translation>&amp;Janela</translation>
</message>
<message>
<location filename="../../util.h" line="591"/>
<location filename="../../util.h" line="615"/>
<source>Unregistered</source>
<translation>Não Registado</translation>
</message>
<message>
<location filename="../../util.h" line="594"/>
<location filename="../../util.h" line="618"/>
<source>Bad address</source>
<translation>Endereço incorrecto</translation>
</message>
<message>
<location filename="../../util.h" line="597"/>
<location filename="../../util.h" line="621"/>
<source>Registration requested</source>
<translation>Registo solicitado</translation>
</message>
<message>
<location filename="../../util.h" line="600"/>
<location filename="../../util.h" line="624"/>
<source>Registration failed</source>
<translation>Falha no registo</translation>
</message>
<message>
<location filename="../../util.h" line="603"/>
<location filename="../../util.h" line="627"/>
<source>Check server version</source>
<translation>Verifique versão do servidor</translation>
</message>
<message>
<location filename="../../util.h" line="606"/>
<location filename="../../util.h" line="630"/>
<source>Registered</source>
<translation>Registado</translation>
</message>
<message>
<location filename="../../util.h" line="609"/>
<location filename="../../util.h" line="633"/>
<source>Central Server full</source>
<translation>Servidor Central Cheio</translation>
</message>
<message>
<location filename="../../util.h" line="612"/>
<location filename="../../util.h" line="636"/>
<source>Unknown value </source>
<translation>Valor desconhecido </translation>
</message>
@ -2371,7 +2431,7 @@
<context>
<name>global</name>
<message>
<location filename="../../global.h" line="237"/>
<location filename="../../global.h" line="235"/>
<source>For more information use the What&apos;s This help (help menu, right mouse button or Shift+F1)</source>
<translation>Para mais informações, use O que é isto (menu Ajuda, botão direito do rato ou Shift + F1)</translation>
</message>

4
src/resources.qrc
View File

@ -71,6 +71,10 @@
<file>res/instruments/viola.png</file>
<file>res/instruments/congas.png</file>
<file>res/instruments/bongo.png</file>
<file>res/instruments/vocalbass.png</file>
<file>res/instruments/vocaltenor.png</file>
<file>res/instruments/vocalalto.png</file>
<file>res/instruments/vocalsoprano.png</file>
</qresource>
<qresource prefix="/png/main">
<file>res/fronticon.png</file>

12
src/serverdlg.cpp
View File

@ -188,9 +188,11 @@ lvwClients->setMinimumHeight ( 140 );
// central server address type combo box
cbxCentServAddrType->clear();
cbxCentServAddrType->addItem ( tr ( "Manual" ) ); // AT_MANUAL
cbxCentServAddrType->addItem ( tr ( "Default" ) ); // AT_DEFAULT
cbxCentServAddrType->addItem ( tr ( "Default (North America)" ) ); // AT_NORTH_AMERICA
cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_CUSTOM ) );
cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_DEFAULT ) );
cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENERAL_NORTHAMERICA ) );
cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENRE_ROCK ) );
cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENRE_JAZZ ) );
cbxCentServAddrType->setCurrentIndex ( static_cast<int> ( pServer->GetCentralServerAddressType() ) );
// update server name line edit
@ -506,7 +508,7 @@ void CServerDlg::UpdateGUIDependencies()
// get the states which define the GUI dependencies from the server
const bool bCurSerListEnabled = pServer->GetServerListEnabled();
const bool bCurUseDefCentServAddr = ( pServer->GetCentralServerAddressType() != AT_MANUAL );
const bool bCurUseDefCentServAddr = ( pServer->GetCentralServerAddressType() != AT_CUSTOM );
const ESvrRegStatus eSvrRegStatus = pServer->GetSvrRegStatus();
@ -522,7 +524,7 @@ void CServerDlg::UpdateGUIDependencies()
{
// if the default central server is used, just show a text of the
// server name
edtCentralServerAddress->setText ( DEFAULT_SERVER_NAME );
edtCentralServerAddress->setText ( tr ( "Predefined Address" ) );
}
else
{

4
src/serverlist.cpp
View File

@ -33,7 +33,7 @@ CServerListManager::CServerListManager ( const quint16 iNPortNum,
CProtocol* pNConLProt )
: tsConsoleStream ( *( ( new ConsoleWriterFactory() )->get() ) ),
iNumPredefinedServers ( 0 ),
eCentralServerAddressType ( AT_MANUAL ), // must be AT_MANUAL for the "no GUI" case
eCentralServerAddressType ( AT_CUSTOM ), // must be AT_CUSTOM for the "no GUI" case
bCentServPingServerInList ( bNCentServPingServerInList ),
pConnLessProtocol ( pNConLProt ),
eSvrRegStatus ( SRS_UNREGISTERED ),
@ -206,7 +206,7 @@ void CServerListManager::SetCentralServerAddress ( const QString sNCentServAddr
(
( !strCentralServerAddress.toLower().compare ( "localhost" ) ||
!strCentralServerAddress.compare ( "127.0.0.1" ) ) &&
( eCentralServerAddressType == AT_MANUAL )
( eCentralServerAddressType == AT_CUSTOM )
);
bEnabled = true;

8
src/settings.cpp
View File

@ -288,7 +288,7 @@ void CSettings::Load()
// central server address type
if ( GetNumericIniSet ( IniXMLDocument, "client", "centservaddrtype",
0, 2 /* AT_NORTH_AMERICA */, iValue ) )
0, 4 /* AT_GENRE_JAZZ */, iValue ) )
{
pClient->SetCentralServerAddressType ( static_cast<ECSAddType> ( iValue ) );
}
@ -304,7 +304,7 @@ if ( GetFlagIniSet ( IniXMLDocument, "client", "defcentservaddr", bValue ) )
// only the case that manual was set in old ini must be considered
if ( !bValue )
{
pClient->SetCentralServerAddressType ( AT_MANUAL );
pClient->SetCentralServerAddressType ( AT_CUSTOM );
}
}
@ -359,7 +359,7 @@ if ( GetFlagIniSet ( IniXMLDocument, "client", "defcentservaddr", bValue ) )
// central server address type (note that it is important
// to set this setting prior to the "central server address")
if ( GetNumericIniSet ( IniXMLDocument, "server", "centservaddrtype",
0, 2 /* AT_NORTH_AMERICA */, iValue ) )
0, 4 /* AT_GENRE_JAZZ */, iValue ) )
{
pServer->SetCentralServerAddressType ( static_cast<ECSAddType> ( iValue ) );
}
@ -375,7 +375,7 @@ if ( GetFlagIniSet ( IniXMLDocument, "server", "defcentservaddr", bValue ) )
// only the case that manual was set in old ini must be considered
if ( !bValue )
{
pServer->SetCentralServerAddressType ( AT_MANUAL );
pServer->SetCentralServerAddressType ( AT_CUSTOM );
}
}

14
src/util.cpp
View File

@ -950,9 +950,11 @@ QString NetworkUtil::GetCentralServerAddress ( const ECSAddType eCentralServerAd
{
switch ( eCentralServerAddressType )
{
case AT_MANUAL: return strCentralServerAddress;
case AT_NORTH_AMERICA: return QString ( "%1:%2" ).arg ( DEFAULT_SERVER_ADDRESS ).arg ( DEFAULT_PORT_NUMBER_NORTHAMERICA );
default: return DEFAULT_SERVER_ADDRESS; // AT_DEFAULT
case AT_CUSTOM: return strCentralServerAddress;
case AT_GENERAL_NORTHAMERICA: return CENTSERV_GENERAL_NORTHAMERICA;
case AT_GENRE_ROCK: return CENTSERV_GENRE_ROCK;
case AT_GENRE_JAZZ: return CENTSERV_GENRE_JAZZ;
default: return DEFAULT_SERVER_ADDRESS; // AT_DEFAULT
}
}
@ -1005,6 +1007,10 @@ CVector<CInstPictures::CInstPictProps>& CInstPictures::GetTable()
vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Viola" ), ":/png/instr/res/instruments/viola.png", IC_STRING_INSTRUMENT ) );
vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Congas" ), ":/png/instr/res/instruments/congas.png", IC_PERCUSSION_INSTRUMENT ) );
vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Bongo" ), ":/png/instr/res/instruments/bongo.png", IC_PERCUSSION_INSTRUMENT ) );
vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Vocal Bass" ), ":/png/instr/res/instruments/vocalbass.png", IC_OTHER_INSTRUMENT ) );
vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Vocal Tenor" ), ":/png/instr/res/instruments/vocaltenor.png", IC_OTHER_INSTRUMENT ) );
vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Vocal Alto" ), ":/png/instr/res/instruments/vocalalto.png", IC_OTHER_INSTRUMENT ) );
vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Vocal Soprano" ), ":/png/instr/res/instruments/vocalsoprano.png", IC_OTHER_INSTRUMENT ) );
// now the table is initialized
TableIsInitialized = true;
@ -1328,7 +1334,7 @@ ECSAddType CLocale::GetCentralServerAddressType ( const QLocale::Country eCountr
case QLocale::Canada:
case QLocale::Mexico:
case QLocale::Greenland:
return AT_NORTH_AMERICA;
return AT_GENERAL_NORTHAMERICA;
default:
return AT_DEFAULT;

30
src/util.h
View File

@ -565,11 +565,35 @@ enum ELicenceType
// Central server address type -------------------------------------------------
enum ECSAddType
{
AT_MANUAL = 0,
AT_DEFAULT = 1, // Europe and others
AT_NORTH_AMERICA = 2
// used for settings -> enum values must be fixed!
AT_CUSTOM = 0,
AT_DEFAULT = 1,
AT_GENERAL_NORTHAMERICA = 2,
AT_GENRE_ROCK = 3,
AT_GENRE_JAZZ = 4
};
inline QString csCentServAddrTypeToString ( ECSAddType eAddrType )
{
switch ( eAddrType )
{
case AT_CUSTOM:
return QCoreApplication::translate ( "CClientSettingsDlg", "Custom" );
case AT_GENERAL_NORTHAMERICA:
return QCoreApplication::translate ( "CClientSettingsDlg", "All Genres" );
case AT_GENRE_ROCK:
return QCoreApplication::translate ( "CClientSettingsDlg", "Genre Rock" );
case AT_GENRE_JAZZ:
return QCoreApplication::translate ( "CClientSettingsDlg", "Genre Jazz" );
default: // AT_DEFAULT
return QCoreApplication::translate ( "CClientSettingsDlg", "Default" );
}
}
// Slave server registration state ---------------------------------------------
enum ESvrRegStatus