From 290ee9f76aa7649dc78dc882981028884e468467 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Fri, 22 May 2020 08:50:03 +0200 Subject: [PATCH 1/5] attempt to fix Linux deployment issue --- Jamulus.pro | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Jamulus.pro b/Jamulus.pro index f817b1aa..3128ae21 100755 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -626,6 +626,12 @@ DISTFILES += ChangeLog \ COPYING \ INSTALL.md \ README.md \ + src/res/translation/translation_de_DE.qm \ + src/res/translation/translation_fr_FR.qm \ + src/res/translation/translation_pt_PT.qm \ + src/res/translation/translation_es_ES.qm \ + src/res/translation/translation_nl_NL.qm \ + src/res/translation/translation_it_IT.qm \ src/res/CLEDBlack.png \ src/res/CLEDBlackSmall.png \ src/res/CLEDDisabledSmall.png \ From 10a49c0be9752ff4220491c8fe353157aa24d7e4 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Fri, 22 May 2020 09:03:41 +0200 Subject: [PATCH 2/5] update German translation --- ChangeLog | 3 --- src/res/translation/translation_de_DE.ts | 34 ++++++++++++------------ 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 652ce12a..a0e65ab2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,9 +19,6 @@ - save client settings on Linux cmdline termination signal, coded by pljones (#70) -TODO fix .tar.gz Linux release 3.5.3 on Sourceforge (gives compile errors) - - diff --git a/src/res/translation/translation_de_DE.ts b/src/res/translation/translation_de_DE.ts index 287c6bc9..7c2a2135 100644 --- a/src/res/translation/translation_de_DE.ts +++ b/src/res/translation/translation_de_DE.ts @@ -218,22 +218,22 @@ Status Indicator - + Statusanzeige Shows a status indication about the client which is assigned to this channel. Supported indicators are: - + Zeigt den Status über den Musiker, der dem Kanal zugewiesen ist. Unterstützte Indikatoren sind: Speaker with cancellation stroke: Indicates that the other client has muted you. - + Durchgestrichener Lautsprecher: Zeigt an, dass der andere Musiker dich stummgeschaltet hat. Status indicator label - + Statusanzeige @@ -1108,12 +1108,12 @@ 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. This address is only used if the custom server list is selected in the connection dialog. - + Die Zentralserveradresse ist die IP-Adresse oder URL des Zentralservers, der die Serverliste organisiert und bereitstellt. Diese Adresse wird nur benutzt, wenn die benutzerdefinierte Serverliste im Verbindungsdialog ausgewählt wird. Central Server Address @@ -1404,7 +1404,7 @@ Custom Central Server Address: - + Benutzerdefinierte Zentralserveradresse: Central Server Address: @@ -1473,7 +1473,7 @@ . A list of the most recent used server IP addresses or URLs is available for selection. - Eine Liste der letzten IP-Adressen oder URLs wird gespeichert und kann nachträglich wieder ausgewählt werden. + . Eine Liste der letzten IP-Adressen oder URLs wird gespeichert und kann nachträglich wieder ausgewählt werden. @@ -1488,17 +1488,17 @@ Server List Selection - + Serverlistenauswahl Selects the server list to be shown. - + Wählt die Serverliste aus, die angezeigt werden soll. Server list selection combo box - + Severlistenauswahl Selektion @@ -1726,7 +1726,7 @@ server. This tag will also show up at each client which is connected to the same server as you. If the name is left empty, the IP address is shown instead. - -Server. Dieses Schild wird auch bei allen anderen Musikern, die mit dem gleichen Server verbunden sind, angezeigt. Wenn der Name leer gelassen wurde, dann wird die IP-Adresse stattdessen angezeigt. + Server. Dieses Schild wird auch bei allen anderen Musikern, die mit dem gleichen Server verbunden sind, angezeigt. Wenn der Name leer gelassen wurde, dann wird die IP-Adresse stattdessen angezeigt. @@ -2042,7 +2042,7 @@ server will be started when the operating system starts up and is automatically minimized to a system task bar icon. - -Server automatisch mit dem Betriebssystemstart geladen und erscheint minimiert in der Systemleiste als Icon. + Server automatisch mit dem Betriebssystemstart geladen und erscheint minimiert in der Systemleiste als Icon. @@ -2067,7 +2067,7 @@ users can see the server in the connect dialog server list and connect to it. The registration of the server is renewed periodically to make sure that all servers in the connect dialog server list are actually available. - -Server in der Liste sehen können und sich mit ihm verbinden können. Die Registrierung mit dem Zentralserver wird periodisch erneuert um sicherzugehen, dass alle registrierten Server auch wirklich erreichbar sind. + Server in der Liste sehen können und sich mit ihm verbinden können. Die Registrierung mit dem Zentralserver wird periodisch erneuert um sicherzugehen, dass alle registrierten Server auch wirklich erreichbar sind. @@ -2090,12 +2090,12 @@ 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. - + 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. @@ -2289,7 +2289,7 @@ Custom Central Server Address: - + Benutzerdefinierte Zentralserveradresse: Central Server Address: From 92548290cdea7bc07c95c521638714de15b1f8b4 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Fri, 22 May 2020 09:48:58 +0200 Subject: [PATCH 3/5] change server list genres, fix German translations --- src/connectdlg.cpp | 4 +- src/global.h | 4 +- src/res/translation/translation_de_DE.qm | Bin 93346 -> 94720 bytes src/res/translation/translation_de_DE.ts | 88 ++++++++++++++--------- src/res/translation/translation_es_ES.qm | Bin 95892 -> 92791 bytes src/res/translation/translation_es_ES.ts | 88 +++++++++++++++-------- src/res/translation/translation_fr_FR.qm | Bin 86127 -> 82826 bytes src/res/translation/translation_fr_FR.ts | 88 +++++++++++++++-------- src/res/translation/translation_it_IT.ts | 78 +++++++++++--------- src/res/translation/translation_nl_NL.qm | Bin 96899 -> 93933 bytes src/res/translation/translation_nl_NL.ts | 78 ++++++++++++-------- src/res/translation/translation_pt_PT.qm | Bin 96765 -> 93869 bytes src/res/translation/translation_pt_PT.ts | 78 ++++++++++++-------- src/serverdlg.cpp | 4 +- src/settings.cpp | 4 +- src/util.cpp | 10 +-- src/util.h | 12 ++-- 17 files changed, 328 insertions(+), 208 deletions(-) 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 a5d8fd394f560470932e8d367a0b08635be4119c..8358df290cc76b00d504e26437ad0db6623cae3e 100644 GIT binary patch delta 5925 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 delta 5030 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 - 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 f001d13fce18985d624ac7bd9a2c6d72c26e1f39..90caefd4e56733cb8cff8b81d0b0b2624c215ca6 100644 GIT binary patch delta 3455 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 SEJny1+K-hhf88*Y_4q$By%|ve delta 4993 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 - 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 cfbfb3ed6fef9bdb6eefbb3cc5007274860bbdf3..f639421f4b0a4ddb2db70233e6f48d536d8fc5b5 100644 GIT binary patch delta 3177 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 H9?1R%X7hiQ 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 e8547e637327dabfe9eecd6e8ab2768d397ed046..e7da68c04831cd0ef90aedcb53dc9477d5058cdb 100644 GIT binary patch delta 3413 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

Q+F6m=e=GAFw3Ei_Vp+%1{b1~{tj7=J zcZyjS-JCeTMkM=WN+pn1E=xLg6wu7KB9q6+CR*PMlx5W|1hh+KpGPzRSC7c%ZX^fg zmu2%~DS)rCWx~$oW|HKB6!IWvihPVo-j_9^UOHUf&#)JGktC1iV*$f6`N&s6G^B#%2}|n19Ph~!9^a!` zF;#9Hl}%GmFQ0y&9Qc6A=XN(+L~&8R*v$kcE|4#IT}4eUQ2vjrMS$Bq`Ho9ds0&Y) z@BFDXSo;9^_orz1j8MwUVrakWTltC8zQpux@`qDT)70A}e{zHzIO!~JSTB%TpC~l% zD4=&86s=Zurry<8;qmXcRLVR>*gwfm)pA9c+4AsAq8PTCQrst9p|7Xf=$|MI;WU41 z*C>((meZWqE0P}40kQ;zanu#6@jn%5zsw@ecTuE=jU(0GR?MA85jVf9*f@m7#+ucN z68&XrD`ONpk}1-hY#Uw@ zMRDPrmaai96c2rifSz9{9?9j@hZZYkcKxVrBq{A%`w(fTD4o_)X~MNi|77aQ;vLE^ z{WF03gOnkS$59{jwIU06tPBmF0XEuK8RgWTZa`g>i5&yMxM^nP#7^Ylt;foFpT|?J zjLHQMb1Bv5mCJmIG}>@wVc%uc6j~}*Z={2g{grEaydc$@t;qN?<;F$5NR(rgTf6aK zLmia+PEur2ALUX1ARwuWvV7|ax+9)cp2{VT&1$1ORZFEfAFI5&`8uh?{7`wbUno5| zDsK+#MJzsLMW&D|Uy7fAX`U!wRiptOom7tAYXOfhRV}AeMm!g&w2SJAoJK3M_RCe; z20cZ-T-C0oG2r`B)uqX4pv4JQK=fN`Bkxo}bRT6-yeh1Z4459Fia2za=G66}s&RLG zfZ%qj^h;;KM($9V4pM)6U{Ec+LoXz?RS6zE-FSMcR=H6hvzx5i$0)_4w%G96dDY?G zM8Ehz6s{hV1 zLMorC8e%BLno_mByB2tqpmzC+Qds0{Mb>St+W&DWSj;$ezj+IZtmW!~Srk#+GIjLk zD2k-YhX2~7j-R(5_})Wph@=wvmD+Gbh&nTb9EjDbSFLzXcaH$|rV!fKxl&#B%!l;f zuHN!M1|zM=diPKtK5!b?S*t!)Ob7ORt3IBXKzEKy>N8HQh_!FkcMsBfWJh(?V+Mm{2{mWyX`ovD2bFBf6{KB^wODYNK!n?>yfY&9w$CE-TMKJH{pal!d;kzo$ zbZdEA!3XEgrn|x&zE2+IeA+D=UaH^+-M+qa0>nIRjf(;@hGWdg(fGS9BeT|Gpp2>W@oi# z$sC#`Z7MY`E1SiF#i}*u7j7ci&2A?(Aq#0R zxvJp^tae1w5*zh_0?W2-n&R^<0;S-!c-(8lYTb}_A{Hw)9Gm}l94L-jd2i0 zmpO8iE&BxTQ7!V<`7j;zzV?57=?{i12U`p#SqE+U(?K*4@oizr)ydW<|;?w$2zI|pHdfR(q$$kCnV`iNd}!Qol9Rebxlr9(dm=p zjHzRF$r-u{aVc?Q4SFA4bh631lPo%!Em_wYXoae0dE1zpK;=v~jJ3R+5SOBhw^%e9 z5=;iYE;Z4*NB_44%+RH#>*6fOOd<<$HYWULBF&JHoS00<)2u<`kPu@sRX@tGEA^R{uF`cc1lQ1$HvVBbX$TA>=&%AYbgm26vcB=14PC+Z3#7`|8FQs5n}7Sy^Z;2y_sb9$ - 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 87219355bf5e41749c376f95bf66c47f4547710d..68da3c9c343466827640496e9e6cf81c21544be6 100644 GIT binary patch delta 3417 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 delta 5002 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 - 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" ); From 8ce42636182d611dea609ae51e88e3d6494f2af1 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Fri, 22 May 2020 10:31:58 +0200 Subject: [PATCH 4/5] added some test code (not enabled) --- src/audiomixerboard.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/audiomixerboard.cpp b/src/audiomixerboard.cpp index 4e5d0ba3..bb51b71f 100644 --- a/src/audiomixerboard.cpp +++ b/src/audiomixerboard.cpp @@ -360,10 +360,13 @@ void CChannelFader::SetRemoteFaderIsMute ( const bool bIsMute ) { // show orange utf8 SPEAKER WITH CANCELLATION STROKE (U+1F507) pInfoLabel->setText ( "🔇" ); +//QPixmap CancelledSpeakerPixmap ( QString::fromUtf8 ( ":/png/main/res/speakerwithcancellationstroke.png" ) ); +//pInfoLabel->setPixmap ( CancelledSpeakerPixmap.scaled ( 15, 15, Qt::KeepAspectRatio ) ); } else { pInfoLabel->setText ( "" ); +//pInfoLabel->setPixmap ( QPixmap() ); } } From 6d4d7e4284a3e074eb1d194379cfa4f802906d3d Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Fri, 22 May 2020 13:46:57 +0200 Subject: [PATCH 5/5] use subdomains from fischvolk instead of direct links --- src/global.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/global.h b/src/global.h index 62df5c87..fc5c575f 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_JAZZ "centralrock.drealm.info:22124" -#define CENTSERV_GENRE_CLASSICAL_FOLK "centraljazz.drealm.info:22224" +#define CENTSERV_GENRE_ROCK_JAZZ "jamulusrock.fischvolk.de:22124" +#define CENTSERV_GENRE_CLASSICAL_FOLK "jamulusclassical.fischvolk.de:22224" // getting started and software manual URL #define CLIENT_GETTING_STARTED_URL "https://github.com/corrados/jamulus/wiki/Getting-Started"