diff --git a/src/connectdlg.cpp b/src/connectdlg.cpp index 96e5288d..fc448dc3 100755 --- a/src/connectdlg.cpp +++ b/src/connectdlg.cpp @@ -80,8 +80,8 @@ CConnectDlg::CConnectDlg ( CClient* pNCliP, cbxCentServAddrType->clear(); cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_DEFAULT ) ); cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_ALL_GENRES ) ); - cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENRE_ROCK ) ); - cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENRE_JAZZ ) ); + cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENRE_ROCK_JAZZ ) ); + cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENRE_CLASSICAL_FOLK ) ); cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_CUSTOM ) ); cbxCentServAddrType->setWhatsThis ( "" + tr ( "Server List Selection" ) + ": " + tr ( diff --git a/src/global.h b/src/global.h index 3e1ac500..62df5c87 100755 --- a/src/global.h +++ b/src/global.h @@ -105,8 +105,8 @@ LED bar: lbr #define DEFAULT_SERVER_ADDRESS "jamulus.fischvolk.de" #define DEFAULT_PORT_NUMBER 22124 #define CENTSERV_ALL_GENRES "jamulus.fischvolk.de:22224" -#define CENTSERV_GENRE_ROCK "centralrock.drealm.info:22124" -#define CENTSERV_GENRE_JAZZ "centraljazz.drealm.info:22224" +#define CENTSERV_GENRE_ROCK_JAZZ "centralrock.drealm.info:22124" +#define CENTSERV_GENRE_CLASSICAL_FOLK "centraljazz.drealm.info:22224" // getting started and software manual URL #define CLIENT_GETTING_STARTED_URL "https://github.com/corrados/jamulus/wiki/Getting-Started" diff --git a/src/res/translation/translation_de_DE.qm b/src/res/translation/translation_de_DE.qm index a5d8fd39..8358df29 100644 Binary files a/src/res/translation/translation_de_DE.qm and b/src/res/translation/translation_de_DE.qm differ diff --git a/src/res/translation/translation_de_DE.ts b/src/res/translation/translation_de_DE.ts index 7c2a2135..1fb2a5aa 100644 --- a/src/res/translation/translation_de_DE.ts +++ b/src/res/translation/translation_de_DE.ts @@ -1213,13 +1213,13 @@ - Genre Rock - + Genre Rock/Jazz + Genre Rock/Jazz - Genre Jazz - + Genre Classical/Folk/Choir + Genre Klassik/Volksmusik/Chor @@ -2079,9 +2079,8 @@ Wenn der eigene Server veröffentlicht wurde, dann zeigt der Registrierungsstatus and, ob die Registrierung erfolgreich war oder nicht. - Central Server Address - Zentralserveradresse + Zentralserveradresse The Central server address is the IP address or URL of the central server at which this server is registered. With the central server address type either the local region can be selected of the default central servers or a manual address can be specified. @@ -2093,95 +2092,118 @@ Wenn der eigene Server veröffentlicht wurde, dann zeigt der Registrierungsstatus and, ob die Registrierung erfolgreich war oder nicht. Wenn die Registrierung fehlgeschlagen ist, dann wähle eine andere Serverliste aus. - The Central server address is the IP address or URL of the central server at which this server is registered. Pre-defined server addresses are available - Die Zentralserveradresse ist die IP-Adresse oder URL des Zentralservers bei dem man sich registrieren möchte. Vordefinierte Serveradressen sind verfügbar. + Die Zentralserveradresse ist die IP-Adresse oder URL des Zentralservers bei dem man sich registrieren möchte. Vordefinierte Serveradressen sind verfügbar. - Default central server type combo box - Voreingestellter Zentralservertyp Auswahlbox + Voreingestellter Zentralservertyp Auswahlbox - + + Custom Central Server Address + Benutzerdefinierte Zentralserveradresse + + + + The custom central server address is the IP address or URL of the central server at which the server list of the connection dialog is managed. + Die benutzerdefinierte Zentralserveradresse ist die IP-Adresse oder URL des Zentralservers, der die Serverliste für den Verbindungsdialog bereitstellt. + + + Central server address line edit Zentralserveradresse Eingabefeld - + + Server List Selection + Serverlistenauswahl + + + + Selects the server list (i.e. central server address) in which your server will be added. + Wählt die Serverliste (d.h. die Zentralserveradresse) aus, in welche dein Server registriert werden soll. + + + + Server list selection combo box + Severlistenauswahl Selektion + + + Server Name Servername - + The server name identifies your server in the connect dialog server list at the clients. If no name is given, the IP address is shown instead. Der Servername identifiziert deinen Server in der Serverliste. Falls kein Name angegeben wurde, dann wird die IP-Adresse stattdessen angezeigt. - + Server name line edit Servername Eingabefeld - + Location City Standort Stadt - + The city in which this server is located can be set here. If a city name is entered, it will be shown in the connect dialog server list at the clients. Hier kann man die Stadt angeben, in der sich der Server befindet. Falls eine Stadt angegeben wurde, dann wird die in der Serverliste angezeigt. - + City where the server is located line edit Stadt in der sich der Server befindet Eingabefeld - + Location country Standort Land - + The country in which this server is located can be set here. If a country is entered, it will be shown in the connect dialog server list at the clients. Hier kann man das Land eingeben, in dem sich der Server befindet. Falls ein Land angegeben wurde, dann wird das in der Serverliste angezeigt. - + Country where the server is located combo box Land in dem sich der Server befindet Auswahlbox - - + + E&xit &Beenden - + &Hide &Ausblenden vom - - - + + + server - -Server + Server - + &Open Ö&ffne den - + server Server - + Predefined Address Vordefinierte Adresse @@ -2198,12 +2220,12 @@ Standard (Nordamerika) - + Server - + &Window &Fenster @@ -2336,7 +2358,7 @@ Make sure to set the Frames/Period to a low value like - Versichere dich, dass die Frames/Perioden auf einen niedrigen Wert wie z.B. + Versichere dich, dass die Frames/Perioden auf einen niedrigen Wert wie zum Beispiel diff --git a/src/res/translation/translation_es_ES.qm b/src/res/translation/translation_es_ES.qm index f001d13f..90caefd4 100644 Binary files a/src/res/translation/translation_es_ES.qm and b/src/res/translation/translation_es_ES.qm differ diff --git a/src/res/translation/translation_es_ES.ts b/src/res/translation/translation_es_ES.ts index 3c0564b4..337f9ed4 100644 --- a/src/res/translation/translation_es_ES.ts +++ b/src/res/translation/translation_es_ES.ts @@ -1217,13 +1217,21 @@ - Genre Rock - Género Rock + Genre Rock/Jazz + + Genre Classical/Folk/Choir + + + + Genre Rock + Género Rock + + Genre Jazz - Género Jazz + Género Jazz @@ -2087,9 +2095,8 @@ Si se ha activado Mi Servidor es Público, esto mostrará si se ha registrado en el servidor central con éxito. - Central Server Address - Dirección Servidor Central + Dirección Servidor Central The Central server address is the IP address or URL of the central server at which this server is registered. With the central server address type either the local region can be selected of the default central servers or a manual address can be specified. @@ -2101,95 +2108,114 @@ - - The Central server address is the IP address or URL of the central server at which this server is registered. Pre-defined server addresses are available + Default central server type combo box + Selección servidor central + + + + Custom Central Server Address - - Default central server type combo box - Selección servidor central + + The custom central server address is the IP address or URL of the central server at which the server list of the connection dialog is managed. + - + Central server address line edit Dirección servidor central - + + Server List Selection + + + + + Selects the server list (i.e. central server address) in which your server will be added. + + + + + Server list selection combo box + + + + Server Name Nombre Servidor - + The server name identifies your server in the connect dialog server list at the clients. If no name is given, the IP address is shown instead. El nombre del servidor identifica a tu servidor en la lista de conexión de servidores de los clientes. Si no se especifica un nombre, se muestra la dirección IP en su lugar. - + Server name line edit Nombre del servidor - + Location City Ubicación Ciudad - + The city in which this server is located can be set here. If a city name is entered, it will be shown in the connect dialog server list at the clients. Aquí se puede especificar la ciudad en donde se ubica el servidor. Si se introduce una ciudad, se mostrará en la lista de conexión de servidores de los clientes. - + City where the server is located line edit Ciudad en donde se encuentra en servidor - + Location country Ubicación país - + The country in which this server is located can be set here. If a country is entered, it will be shown in the connect dialog server list at the clients. Aquí se puede especificar el país en donde se ubica el servidor. Si se introduce un país, se mostrará en la lista de conexión de servidores de los clientes. - + Country where the server is located combo box País en donde se encuentra el servidor - - + + E&xit S&alir - + &Hide &Ocultar servidor - - - + + + server - + &Open &Abrir servidor - + server - + Predefined Address Dirección Preestablecida @@ -2206,12 +2232,12 @@ Por defecto (Norteamérica) - + Server : Servidor - + &Window &Ventana diff --git a/src/res/translation/translation_fr_FR.qm b/src/res/translation/translation_fr_FR.qm index cfbfb3ed..f639421f 100644 Binary files a/src/res/translation/translation_fr_FR.qm and b/src/res/translation/translation_fr_FR.qm differ diff --git a/src/res/translation/translation_fr_FR.ts b/src/res/translation/translation_fr_FR.ts index 11683af0..979e4902 100644 --- a/src/res/translation/translation_fr_FR.ts +++ b/src/res/translation/translation_fr_FR.ts @@ -1225,13 +1225,21 @@ - Genre Rock - Genre Rock + Genre Rock/Jazz + + Genre Classical/Folk/Choir + + + + Genre Rock + Genre Rock + + Genre Jazz - Genre Jazz + Genre Jazz @@ -2091,9 +2099,8 @@ Si la case Rendre mon serveur public est cochée, cela indiquera le succès de l'enregistrement auprès du serveur central. - Central Server Address - Adresse du serveur central + Adresse du serveur central The Central server address is the IP address or URL of the central server at which this server is registered. With the central server address type either the local region can be selected of the default central servers or a manual address can be specified. @@ -2105,95 +2112,114 @@ - - The Central server address is the IP address or URL of the central server at which this server is registered. Pre-defined server addresses are available + Default central server type combo box + Choix déroulant de type de serveur central par défaut + + + + Custom Central Server Address - - Default central server type combo box - Choix déroulant de type de serveur central par défaut + + The custom central server address is the IP address or URL of the central server at which the server list of the connection dialog is managed. + - + Central server address line edit Ligne d'édition pour l'adresse du serveur central - + + Server List Selection + + + + + Selects the server list (i.e. central server address) in which your server will be added. + + + + + Server list selection combo box + + + + Server Name Nom du serveur - + The server name identifies your server in the connect dialog server list at the clients. If no name is given, the IP address is shown instead. Le nom du serveur identifie votre serveur dans la liste des serveurs du dialogue de connexion chez les clients. Si aucun nom n'est donné, l'adresse IP est affichée à la place. - + Server name line edit Ligne d'édition pour le nom du serveur - + Location City Ville de localisation - + The city in which this server is located can be set here. If a city name is entered, it will be shown in the connect dialog server list at the clients. La ville dans laquelle ce serveur est situé peut être définie ici. Si un nom de ville est saisi, il sera affiché dans la liste des serveurs du dialogue de connexion chez les clients. - + City where the server is located line edit Ligne d'édition pour la ville où est situé le serveur - + Location country Pays de localisation - + The country in which this server is located can be set here. If a country is entered, it will be shown in the connect dialog server list at the clients. Le pays dans lequel ce serveur est situé peut être défini ici. Si un pays est saisi, il sera affiché dans la liste des serveurs du dialogue de connexion chez les clients. - + Country where the server is located combo box Choix déroulant du pays où le serveur est situé - - + + E&xit &Quitter - + &Hide Cac&hé - - - + + + server serveur - + &Open &Ouvrir - + server serveur - + Predefined Address Adresse prédéfinie @@ -2210,12 +2236,12 @@ Défaut (Amérique du nord) - + Server serveur - + &Window &Fenêtre diff --git a/src/res/translation/translation_it_IT.ts b/src/res/translation/translation_it_IT.ts index 66f20053..444c51c3 100644 --- a/src/res/translation/translation_it_IT.ts +++ b/src/res/translation/translation_it_IT.ts @@ -1233,12 +1233,12 @@ - Genre Rock + Genre Rock/Jazz - Genre Jazz + Genre Classical/Folk/Choir @@ -2046,116 +2046,126 @@ Register Server Status - - - Central Server Address - - If the Make My Server Public check box is checked, this will show whether registration with the central server is successful. If the registration failed, please choose another server list. + + + Custom Central Server Address + + - The Central server address is the IP address or URL of the central server at which this server is registered. Pre-defined server addresses are available + The custom central server address is the IP address or URL of the central server at which the server list of the connection dialog is managed. - - Default central server type combo box - - - - + Central server address line edit - + + Server List Selection + + + + + Selects the server list (i.e. central server address) in which your server will be added. + + + + + Server list selection combo box + + + + Server Name - + The server name identifies your server in the connect dialog server list at the clients. If no name is given, the IP address is shown instead. - + Server name line edit - + Location City - + The city in which this server is located can be set here. If a city name is entered, it will be shown in the connect dialog server list at the clients. - + City where the server is located line edit - + Location country - + The country in which this server is located can be set here. If a country is entered, it will be shown in the connect dialog server list at the clients. - + Country where the server is located combo box - - + + E&xit - + &Hide - - - + + + server - + &Open - + server - + Server - + &Window - + Predefined Address diff --git a/src/res/translation/translation_nl_NL.qm b/src/res/translation/translation_nl_NL.qm index e8547e63..e7da68c0 100644 Binary files a/src/res/translation/translation_nl_NL.qm and b/src/res/translation/translation_nl_NL.qm differ diff --git a/src/res/translation/translation_nl_NL.ts b/src/res/translation/translation_nl_NL.ts index 6aa23d17..ee902af5 100644 --- a/src/res/translation/translation_nl_NL.ts +++ b/src/res/translation/translation_nl_NL.ts @@ -1213,12 +1213,12 @@ - Genre Rock + Genre Rock/Jazz - Genre Jazz + Genre Classical/Folk/Choir @@ -2075,9 +2075,8 @@ Als het selectievakje Maak Mijn Server Openbaar is aangevinkt, zal dit het succes van de registratie bij de centrale server laten zien. - Central Server Address - Centrale Serveradres + Centrale Serveradres The Central server address is the IP address or URL of the central server at which this server is registered. With the central server address type either the local region can be selected of the default central servers or a manual address can be specified. @@ -2089,95 +2088,114 @@ - - The Central server address is the IP address or URL of the central server at which this server is registered. Pre-defined server addresses are available + Default central server type combo box + Standaard centrale server type combo box + + + + Custom Central Server Address - - Default central server type combo box - Standaard centrale server type combo box + + The custom central server address is the IP address or URL of the central server at which the server list of the connection dialog is managed. + - + Central server address line edit Centrale server adresbewerking van de lijn - + + Server List Selection + + + + + Selects the server list (i.e. central server address) in which your server will be added. + + + + + Server list selection combo box + + + + Server Name Servernaam - + The server name identifies your server in the connect dialog server list at the clients. If no name is given, the IP address is shown instead. De naam van de server identificeert uw server in de lijst van de connect-dialoog-server bij de clients. Als er geen naam wordt gegeven, wordt in plaats daarvan het IP-adres getoond. - + Server name line edit Servernaam lijnbewerking - + Location City Locatie Stad - + The city in which this server is located can be set here. If a city name is entered, it will be shown in the connect dialog server list at the clients. De stad waar deze server zich bevindt kan hier worden ingesteld. Als er een plaatsnaam wordt ingevoerd, wordt deze getoond in de lijst van de connect-dialoog-server bij de clients. - + City where the server is located line edit Stad waar de server zich bevindt lijnbewerking - + Location country Land van locatie - + The country in which this server is located can be set here. If a country is entered, it will be shown in the connect dialog server list at the clients. Het land waarin deze server zich bevindt kan hier worden ingesteld. Als er een land is ingevoerd, wordt dit getoond in de lijst van de verbindingsserver bij de clients. - + Country where the server is located combo box Land waar de server zich bevindt combo box - - + + E&xit &Sluiten - + &Hide Verbergen - - - + + + server server - + &Open &Open - + server server - + Predefined Address @@ -2194,12 +2212,12 @@ Standaard (Noord-Amerika) - + Server Server - + &Window &Window diff --git a/src/res/translation/translation_pt_PT.qm b/src/res/translation/translation_pt_PT.qm index 87219355..68da3c9c 100644 Binary files a/src/res/translation/translation_pt_PT.qm and b/src/res/translation/translation_pt_PT.qm differ diff --git a/src/res/translation/translation_pt_PT.ts b/src/res/translation/translation_pt_PT.ts index 4d28d06d..7d33254d 100644 --- a/src/res/translation/translation_pt_PT.ts +++ b/src/res/translation/translation_pt_PT.ts @@ -1225,12 +1225,12 @@ - Genre Rock + Genre Rock/Jazz - Genre Jazz + Genre Classical/Folk/Choir @@ -2087,9 +2087,8 @@ Se a caixa de seleção Tornar Servidor Público estiver marcada, isto mostrará o sucesso ou insucesso do registo no servidor central. - Central Server Address - Endereço do servidor central + Endereço do servidor central The Central server address is the IP address or URL of the central server at which this server is registered. With the central server address type either the local region can be selected of the default central servers or a manual address can be specified. @@ -2101,95 +2100,114 @@ - - The Central server address is the IP address or URL of the central server at which this server is registered. Pre-defined server addresses are available + Default central server type combo box + Seletor do servidor central padrão + + + + Custom Central Server Address - - Default central server type combo box - Seletor do servidor central padrão + + The custom central server address is the IP address or URL of the central server at which the server list of the connection dialog is managed. + - + Central server address line edit Caixa de edição do endereço do servidor central - + + Server List Selection + + + + + Selects the server list (i.e. central server address) in which your server will be added. + + + + + Server list selection combo box + + + + Server Name Nome do Servidor - + The server name identifies your server in the connect dialog server list at the clients. If no name is given, the IP address is shown instead. O nome do servidor identifica o servidor na lista do diálogo de ligação exibido nos clientes. Se nenhum nome for fornecido, o endereço IP será mostrado. - + Server name line edit Caixa de edição do nome do servidor - + Location City ;Localização: Cidade - + The city in which this server is located can be set here. If a city name is entered, it will be shown in the connect dialog server list at the clients. A cidade onde este servidor está localizado pode ser definida aqui. Se um nome de cidade for inserido, este será mostrado na lista do diálogo de ligação dos clientes. - + City where the server is located line edit Caixa de edição da cidade onde o servidor se encontra - + Location country Localização: País - + The country in which this server is located can be set here. If a country is entered, it will be shown in the connect dialog server list at the clients. O país em que este servidor está localizado pode ser definido aqui. Se um país for inserido, ele será mostrado na lista do diálogo de logação dos clientes. - + Country where the server is located combo box Seletor do país onde o servidor de encontra - - + + E&xit &Sair - + &Hide &Esconder servidor - - - + + + server - + &Open &Abrir servidor - + server - + Predefined Address @@ -2206,12 +2224,12 @@ Servidor Padrão (America do Norte) - + Server - Servidor - + &Window &Janela diff --git a/src/serverdlg.cpp b/src/serverdlg.cpp index 87a1131d..fa1fd644 100755 --- a/src/serverdlg.cpp +++ b/src/serverdlg.cpp @@ -190,8 +190,8 @@ lvwClients->setMinimumHeight ( 140 ); cbxCentServAddrType->clear(); cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_DEFAULT ) ); cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_ALL_GENRES ) ); - cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENRE_ROCK ) ); - cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENRE_JAZZ ) ); + cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENRE_ROCK_JAZZ ) ); + cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENRE_CLASSICAL_FOLK ) ); cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_CUSTOM ) ); cbxCentServAddrType->setCurrentIndex ( static_cast ( pServer->GetCentralServerAddressType() ) ); diff --git a/src/settings.cpp b/src/settings.cpp index 8277a943..223b1321 100755 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -299,7 +299,7 @@ void CSettings::Load() // central server address type if ( GetNumericIniSet ( IniXMLDocument, "client", "centservaddrtype", - 0, 4 /* AT_GENRE_JAZZ */, iValue ) ) + 0, 4 /* AT_CUSTOM */, iValue ) ) { pClient->SetCentralServerAddressType ( static_cast ( iValue ) ); } @@ -370,7 +370,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, 4 /* AT_GENRE_JAZZ */, iValue ) ) + 0, 4 /* AT_CUSTOM */, iValue ) ) { pServer->SetCentralServerAddressType ( static_cast ( iValue ) ); } diff --git a/src/util.cpp b/src/util.cpp index 67c80c20..8befc68a 100755 --- a/src/util.cpp +++ b/src/util.cpp @@ -951,11 +951,11 @@ QString NetworkUtil::GetCentralServerAddress ( const ECSAddType eCentralServerAd { switch ( eCentralServerAddressType ) { - case AT_CUSTOM: return strCentralServerAddress; - case AT_ALL_GENRES: return CENTSERV_ALL_GENRES; - case AT_GENRE_ROCK: return CENTSERV_GENRE_ROCK; - case AT_GENRE_JAZZ: return CENTSERV_GENRE_JAZZ; - default: return DEFAULT_SERVER_ADDRESS; // AT_DEFAULT + case AT_CUSTOM: return strCentralServerAddress; + case AT_ALL_GENRES: return CENTSERV_ALL_GENRES; + case AT_GENRE_ROCK_JAZZ: return CENTSERV_GENRE_ROCK_JAZZ; + case AT_GENRE_CLASSICAL_FOLK: return CENTSERV_GENRE_CLASSICAL_FOLK; + default: return DEFAULT_SERVER_ADDRESS; // AT_DEFAULT } } diff --git a/src/util.h b/src/util.h index 0c711785..cb4b1b6d 100755 --- a/src/util.h +++ b/src/util.h @@ -568,8 +568,8 @@ enum ECSAddType // used for settings -> enum values should be fixed AT_DEFAULT = 0, AT_ALL_GENRES = 1, - AT_GENRE_ROCK = 2, - AT_GENRE_JAZZ = 3, + AT_GENRE_ROCK_JAZZ = 2, + AT_GENRE_CLASSICAL_FOLK = 3, AT_CUSTOM = 4 }; @@ -583,11 +583,11 @@ inline QString csCentServAddrTypeToString ( ECSAddType eAddrType ) case AT_ALL_GENRES: return QCoreApplication::translate ( "CClientSettingsDlg", "All Genres" ); - case AT_GENRE_ROCK: - return QCoreApplication::translate ( "CClientSettingsDlg", "Genre Rock" ); + case AT_GENRE_ROCK_JAZZ: + return QCoreApplication::translate ( "CClientSettingsDlg", "Genre Rock/Jazz" ); - case AT_GENRE_JAZZ: - return QCoreApplication::translate ( "CClientSettingsDlg", "Genre Jazz" ); + case AT_GENRE_CLASSICAL_FOLK: + return QCoreApplication::translate ( "CClientSettingsDlg", "Genre Classical/Folk/Choir" ); default: // AT_DEFAULT return QCoreApplication::translate ( "CClientSettingsDlg", "Default" );