diff --git a/ChangeLog b/ChangeLog index a388588c..d9fa2a7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,15 +15,15 @@ - added translations: french by trebmuh, portuguese by Snayler, spanish by ignotus666 (Ticket #77) +- new design for the About dialog (Ticket #189) + - bug fix: for mono capture jack audio interface Jamulus complains it cannot make connections (Ticket #137) -TODO re-design About dialog +TODO WIP support internationalization TODO implement panning for channels (Ticket #52, #145) -TODO WIP support internationalization - TODO show mute state of others diff --git a/src/res/translation/translation_de_DE.ts b/src/res/translation/translation_de_DE.ts index da5e7bf8..3cc6f26f 100644 --- a/src/res/translation/translation_de_DE.ts +++ b/src/res/translation/translation_de_DE.ts @@ -4,22 +4,27 @@ CAboutDlg - + The - - software enables musicians to perform real-time jam sessions over the internet. There is a + + software enables musicians to perform real-time jam sessions over the internet. - + server which collects the audio data from each - + + There is a + + + + client, mixes the audio data and sends the mix back to each client. @@ -29,22 +34,52 @@ - + + Qt cross-platform application framework + + + + + Audio reverberation code by Perry R. Cook and Gary P. Scavone + + + + + Some pixmaps are from the + + + + + Country flag icons from Mark James + + + + + For details on the contributions check out the + + + + + Github Contributors list + + + + About - + , Version - + Internet Jam Session Software - + Under the GNU General Public License (GPL) @@ -57,15 +92,35 @@ - + TextLabelVersion - + Copyright (C) 2005-2020 Volker Fischer and others + + + A&bout + + + + + &Libraries + + + + + &Contributors + + + + + &Translation + + &OK @@ -1398,23 +1453,23 @@ CHelpMenu - - + + Getting &Started... - + Software &Manual... - + What's &This - + &About... Über... @@ -1422,102 +1477,102 @@ CLicenceDlg - + I &agree to the above licence terms - + Accept - + Decline - + By connecting to this server and agreeing to this notice, you agree to the following: - + You agree that all data, sounds, or other works transmitted to this server are owned and created by you or your licensors, and that you are making these data, sounds or other works available via the following Creative Commons License (for more information on this license, see - + You are free to: - + Share - + copy and redistribute the material in any medium or format - + Adapt - + remix, transform, and build upon the material - + The licensor cannot revoke these freedoms as long as you follow the license terms. - + Under the following terms: - + Attribution - + You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use. - + NonCommercial - + You may not use the material for commercial purposes. - + ShareAlike - + If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original. - + No additional restrictions - + You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. @@ -1525,263 +1580,268 @@ CMusProfDlg - + 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. - + Alias or name edit box - + Instrument picture button - + Country flag button - + City edit box - + Skill level combo box - - - + + + None - - + + Musician Profile - + Alias/Name - + Instrument - + Country - + City - + Skill - + &Close - + Beginner - + Intermediate - + Expert - + Set your name or an alias here so that the other musicians you want to play with know who you are. Additionally you may set an instrument picture of the instrument you play and a flag of the country you are living. The city you live in and the skill level of playing your instrument may also be added. - + What you set here will appear at your fader on the mixer board when you are connected to a - + Drum Set - + Djembe - + Electric Guitar - + Acoustic Guitar - + Bass Guitar - + Keyboard - + Synthesizer - + Grand Piano - + Accordion - + Vocal - + Microphone - + Harmonica - + Trumpet - + Trombone - + French Horn - + Tuba - + Saxophone - + Clarinet - + Flute - + Violin - + Cello - + Double Bass - + Recorder - + Streamer - + Listener - + Guitar+Vocal - + Keyboard+Vocal - + Bodhran - + Bassoon - + Oboe - + Harp - + Viola + + + Congas + + CServerDlg diff --git a/src/res/translation/translation_es_ES.qm b/src/res/translation/translation_es_ES.qm index 9dad8dff..bb28fb89 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 e34fdf73..cfe79157 100644 --- a/src/res/translation/translation_es_ES.ts +++ b/src/res/translation/translation_es_ES.ts @@ -4,22 +4,31 @@ CAboutDlg - + The Este - software enables musicians to perform real-time jam sessions over the internet. There is a - software permite a músicos realizar jam sessions en tiempo real por internet. Hay un + software permite a músicos realizar jam sessions en tiempo real por internet. Hay un - + + software enables musicians to perform real-time jam sessions over the internet. + + + + server which collects the audio data from each servidor que recoge el audio de cada - + + There is a + + + + client, mixes the audio data and sends the mix back to each client. cliente, mezcla el audio y lo envía de vuelta a cada cliente. @@ -29,22 +38,52 @@ utiliza las siguientes librerías, recursos o fragmentos de código: - + + Qt cross-platform application framework + + + + + Audio reverberation code by Perry R. Cook and Gary P. Scavone + + + + + Some pixmaps are from the + + + + + Country flag icons from Mark James + + + + + For details on the contributions check out the + + + + + Github Contributors list + + + + About Acerca de - + , Version , Versión - + Internet Jam Session Software Internet Jam Session Software - + Under the GNU General Public License (GPL) Bajo la GNU General Public License (GPL) @@ -57,15 +96,35 @@ Acerca de - + TextLabelVersion TextLabelVersion - + Copyright (C) 2005-2020 Volker Fischer and others Copyright (C) 2005-2020 Volker Fischer y otros + + + A&bout + + + + + &Libraries + + + + + &Contributors + + + + + &Translation + + &OK @@ -1398,23 +1457,23 @@ CHelpMenu - - + + Getting &Started... Cómo &Empezar... - + Software &Manual... Manual del &Software... - + What's &This Qué es &Esto - + &About... &Acerca de... @@ -1422,102 +1481,102 @@ CLicenceDlg - + I &agree to the above licence terms &Acepto los términos de la licencia arriba expuestos - + Accept Acepto - + Decline No Acepto - + By connecting to this server and agreeing to this notice, you agree to the following: Al conectarte a este servidor y aceptar esta notificación, aceptas lo siguiente: - + You agree that all data, sounds, or other works transmitted to this server are owned and created by you or your licensors, and that you are making these data, sounds or other works available via the following Creative Commons License (for more information on this license, see Ud declara que todos los datos, audios u otras obras transmitidas a este servidor son la propiedad de Ud y creadas por Ud o sus licenciatarios, y que pone a disposición de terceras partes estos datos, audios u otras obras mediante la siguiente Licencia Creative Commons (para más información sobre esta licencia, ver - + You are free to: Ud es libre de: - + Share Compartir - + copy and redistribute the material in any medium or format copiar y redistribuir el material en cualquier medio o formato - + Adapt Adaptar - + remix, transform, and build upon the material remezclar, transformar y construir a partir del material - + The licensor cannot revoke these freedoms as long as you follow the license terms. El licenciante no puede revocar estas libertades en tanto Ud siga los términos de la licencia. - + Under the following terms: Bajo los siguientes términos: - + Attribution Atribución - + You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use. Usted debe dar crédito de manera adecuada, brindar un enlace a la licencia, e indicar si se han realizado cambios. Puede hacerlo en cualquier forma razonable, pero no de forma tal que sugiera que usted o su uso tienen el apoyo de la licenciante. - + NonCommercial No-Comercial - + You may not use the material for commercial purposes. No puede utilizar el material con fines comerciales. - + ShareAlike ShareAlike - + If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original. Si remezcla, transforma o construye sobre el material, debe distribuir sus contribuciones bajo la misma licencia que el original. - + No additional restrictions Sin restricciones adicionales - + You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No puede aplicar términos legales o medidas tecnológicas que restringan legalmente a otras personas de hacer cualquier cosa permitida por la licencia. @@ -1525,263 +1584,268 @@ CMusProfDlg - + 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. Esta etiqueta también se mostrará a cada cliente conectado al mismo servidor que tú. Se se deja vacío, se muestra la dirección IP en su lugar. - + Alias or name edit box Campo para alias o nombre - + Instrument picture button Botón imagen instrumento - + Country flag button Botón bandera país - + City edit box Ciudad - + Skill level combo box Nivel de habilidad - - - + + + None Ninguno - - + + Musician Profile Perfil Músico - + Alias/Name Alias/Nombre - + Instrument Instrumento - + Country País - + City Ciudad - + Skill Habilidad - + &Close &Cerrar - + Beginner Principiante - + Intermediate Intermedio - + Expert Experto - + Set your name or an alias here so that the other musicians you want to play with know who you are. Additionally you may set an instrument picture of the instrument you play and a flag of the country you are living. The city you live in and the skill level of playing your instrument may also be added. Escribe tu nombre o alias aquí para que los demás músicos con quien quieras tocar te reconozcan. Puedes además añadir una imagen del instrumento que tocas y la bandera del país donde vives. La ciudad donde vives y tu nivel de habilidad con el instrumento también pueden añadirse. - + What you set here will appear at your fader on the mixer board when you are connected to a Lo que introduzcas aquí aparecerá en tu fader del mezclador cuando te conectes a un servidor - + Drum Set Batería - + Djembe Djembé - + Electric Guitar Guitarra Eléctrica - + Acoustic Guitar Guitarra Acústica - + Bass Guitar Bajo Eléctrico - + Keyboard Teclado - + Synthesizer Sintetizador - + Grand Piano Piano de Cola - + Accordion Acordeón - + Vocal Voz - + Microphone Micrófono - + Harmonica Armónica - + Trumpet Trompeta - + Trombone Trombón - + French Horn Trompa - + Tuba Tuba - + Saxophone Saxofón - + Clarinet Clarinete - + Flute Flauta - + Violin Violín - + Cello Violonchelo - + Double Bass Contrabajo - + Recorder Grabadora - + Streamer Streamer - + Listener Oyente - + Guitar+Vocal Guitarra+Voz - + Keyboard+Vocal Teclado+Voz - + Bodhran Bodhran - + Bassoon Fagot - + Oboe Oboe - + Harp Arpa - + Viola Viola + + + Congas + + CServerDlg diff --git a/src/res/translation/translation_fr_FR.qm b/src/res/translation/translation_fr_FR.qm index b12e86d1..8f6aee26 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 7d0c7c2a..afdc67d1 100644 --- a/src/res/translation/translation_fr_FR.ts +++ b/src/res/translation/translation_fr_FR.ts @@ -4,22 +4,31 @@ CAboutDlg - + The Le logiciel - software enables musicians to perform real-time jam sessions over the internet. There is a - permet aux musiciens de faire des bœufs en temps réel sur internet. Il existe un + permet aux musiciens de faire des bœufs en temps réel sur internet. Il existe un - + + software enables musicians to perform real-time jam sessions over the internet. + + + + server which collects the audio data from each serveur qui collecte les données audio de chaque - + + There is a + + + + client, mixes the audio data and sends the mix back to each client. client, mixe les données audio et renvoie le mixage à chaque client. @@ -29,22 +38,52 @@ utilise les bibliothèques, ressources ou extraits de code suivants : - + + Qt cross-platform application framework + + + + + Audio reverberation code by Perry R. Cook and Gary P. Scavone + + + + + Some pixmaps are from the + + + + + Country flag icons from Mark James + + + + + For details on the contributions check out the + + + + + Github Contributors list + + + + About À propos - + , Version , version - + Internet Jam Session Software Logiciels de bœuf sur Internet - + Under the GNU General Public License (GPL) Sous la licence public général GNU (GPL) @@ -57,15 +96,35 @@ À propos - + TextLabelVersion - + Copyright (C) 2005-2020 Volker Fischer and others Copyright (C) 2005-2020 Volker Fischer et autres + + + A&bout + + + + + &Libraries + + + + + &Contributors + + + + + &Translation + + Author: Volker Fischer Auteur : Volker Fisher @@ -1406,23 +1465,23 @@ CHelpMenu - - + + Getting &Started... Premier pa&s... - + Software &Manual... &Manuel du logiciel... - + What's &This C'es&t quoi ça - + &About... À &propos @@ -1430,102 +1489,102 @@ CLicenceDlg - + I &agree to the above licence terms J'&accepte les conditions de licence ci-dessus - + Accept Accepter - + Decline Décliner - + By connecting to this server and agreeing to this notice, you agree to the following: En vous connectant à ce serveur et en acceptant le présent avis, vous acceptez ce qui suit : - + You agree that all data, sounds, or other works transmitted to this server are owned and created by you or your licensors, and that you are making these data, sounds or other works available via the following Creative Commons License (for more information on this license, see Vous acceptez que toutes les données, sons ou autres œuvres transmises à ce serveur soient détenus et créés par vous ou vos ayant-droits, et que vous rendiez ces données, sons ou autres œuvres disponibles via la licence Creative Commons suivante (pour plus d'informations sur cette licence, voir - + You are free to: Vous êtes libres de : - + Share Partager - + copy and redistribute the material in any medium or format copier et redistribuer le matériel sur tout support ou format - + Adapt Adapter - + remix, transform, and build upon the material remixer, transformer et développer à partir du matériel - + The licensor cannot revoke these freedoms as long as you follow the license terms. Le donneur de licence ne peut pas révoquer ces libertés tant que vous respectez les conditions de la licence. - + Under the following terms: Dans les conditions suivantes : - + Attribution Attribution - + You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use. Vous devez donner un crédit approprié, fournir un lien vers la licence et indiquer si des modifications ont été apportées. Vous pouvez le faire de toute manière raisonnable, mais pas d'une manière qui suggère que le donneur de licence vous cautionne ou cautionne votre utilisation. - + NonCommercial Non commercial - + You may not use the material for commercial purposes. Vous ne pouvez pas utiliser le matériel à des fins commerciales. - + ShareAlike Partager à l'identique - + If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original. Si vous remixez, transformez ou développez à partir du matériel, vous devez distribuer vos contributions sous la même licence que l'original. - + No additional restrictions Aucune restriction supplémentaire - + You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. Vous ne pouvez pas appliquer des termes juridiques ou des mesures technologiques qui empêchent légalement d'autres personnes de faire ce que la licence autorise. @@ -1533,263 +1592,268 @@ CMusProfDlg - + 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. - + Alias or name edit box - + Instrument picture button - + Country flag button - + City edit box - + Skill level combo box - - - + + + None Aucun - - + + Musician Profile - + Alias/Name - + Instrument - + Country - + City - + Skill - + &Close &Fermer - + Beginner - + Intermediate - + Expert - + Set your name or an alias here so that the other musicians you want to play with know who you are. Additionally you may set an instrument picture of the instrument you play and a flag of the country you are living. The city you live in and the skill level of playing your instrument may also be added. - + What you set here will appear at your fader on the mixer board when you are connected to a - + Drum Set - + Djembe - + Electric Guitar - + Acoustic Guitar - + Bass Guitar - + Keyboard - + Synthesizer - + Grand Piano - + Accordion - + Vocal - + Microphone - + Harmonica - + Trumpet - + Trombone - + French Horn - + Tuba - + Saxophone - + Clarinet - + Flute - + Violin - + Cello - + Double Bass - + Recorder - + Streamer - + Listener - + Guitar+Vocal - + Keyboard+Vocal - + Bodhran - + Bassoon - + Oboe - + Harp - + Viola + + + Congas + + CServerDlg diff --git a/src/res/translation/translation_pt_PT.qm b/src/res/translation/translation_pt_PT.qm index 50012de9..8f7b9c79 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 e7b96caa..d84f5d08 100644 --- a/src/res/translation/translation_pt_PT.ts +++ b/src/res/translation/translation_pt_PT.ts @@ -4,22 +4,31 @@ CAboutDlg - + The O - software enables musicians to perform real-time jam sessions over the internet. There is a - permite aos músicos realizar jam sessions em tempo real pela Internet. Existe um servidor + permite aos músicos realizar jam sessions em tempo real pela Internet. Existe um servidor - + + software enables musicians to perform real-time jam sessions over the internet. + + + + server which collects the audio data from each que reúne os dados de áudio de cada cliente - + + There is a + + + + client, mixes the audio data and sends the mix back to each client. , que mistura os dados de áudio e envia a mistura de volta para cada cliente. @@ -29,22 +38,52 @@ utiliza as seguintes bibliotecas, recursos ou partes de código: - + + Qt cross-platform application framework + + + + + Audio reverberation code by Perry R. Cook and Gary P. Scavone + + + + + Some pixmaps are from the + + + + + Country flag icons from Mark James + + + + + For details on the contributions check out the + + + + + Github Contributors list + + + + About Sobre o - + , Version , Versão - + Internet Jam Session Software Programa de Jam Sessions pela Internet - + Under the GNU General Public License (GPL) Sob a Licença Pública Geral GNU (GPL) @@ -57,15 +96,35 @@ Sobre - + TextLabelVersion TextLabelVersion - + Copyright (C) 2005-2020 Volker Fischer and others Copyright (C) 2005-2020 Volker Fischer e outros + + + A&bout + + + + + &Libraries + + + + + &Contributors + + + + + &Translation + + Author: Volker Fischer Autor: Volker Fischer @@ -1406,23 +1465,23 @@ CHelpMenu - - + + Getting &Started... Como Começa&r... - + Software &Manual... &Manual do Programa... - + What's &This O que é &isto - + &About... &Sobre... @@ -1430,102 +1489,102 @@ CLicenceDlg - + I &agree to the above licence terms Eu &aceito os termos da licença acima - + Accept Aceitar - + Decline Rejeitar - + By connecting to this server and agreeing to this notice, you agree to the following: Ao ligar-se a este servidor e concordar com este aviso, está a concordar com o seguinte: - + You agree that all data, sounds, or other works transmitted to this server are owned and created by you or your licensors, and that you are making these data, sounds or other works available via the following Creative Commons License (for more information on this license, see Você concorda que todos os dados, sons ou outros trabalhos transmitidos para este servidor pertencem e são criados por você ou por seus licenciadores, e que você está disponibilizando esses dados, sons ou outros trabalhos através da seguinte licença Creative Commons (para obter mais informações sobre esta licença, consulte - + You are free to: Você tem o direito de: - + Share Compartilhar - + copy and redistribute the material in any medium or format copiar e redistribuir o material em qualquer suporte ou formato - + Adapt Adaptar - + remix, transform, and build upon the material remisturar, transformar, e criar a partir do material - + The licensor cannot revoke these freedoms as long as you follow the license terms. O licenciante não pode revogar estes direitos desde que você respeite os termos da licença. - + Under the following terms: De acordo com os termos seguintes: - + Attribution Atribuição - + You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use. Você deve atribuir o devido crédito, fornecer um link para a licença, e indicar se foram feitas alterações. Você pode fazê-lo de qualquer forma razoável, mas não de uma forma que sugira que o licenciante o apoia ou aprova o seu uso. - + NonCommercial NãoComercial - + You may not use the material for commercial purposes. Você não pode usar o material para fins comerciais. - + ShareAlike CompartilhaIgual - + If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original. Se você remisturar, transformar, ou criar a partir do material, tem de distribuir as suas contribuições ao abrigo da mesma licença que o original. - + No additional restrictions Sem restrições adicionais - + You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. Você não pode aplicar termos jurídicos ou medidas de caráter tecnológico que restrinjam legalmente outros de fazerem algo que a licença permita. @@ -1533,263 +1592,268 @@ CMusProfDlg - + 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. . Esta identificação também será exibida em cada cliente ligado ao mesmo servidor que você. Se o nome estiver vazio, o endereço IP será mostrado. - + Alias or name edit box Caixa de edição do nome ou pseudônimo - + Instrument picture button Botão da imagem do instrumento - + Country flag button Botão da bandeira do país - + City edit box Caixa de edição da cidade - + Skill level combo box Caixa do nível de habilidade - - - + + + None Nenhum - - + + Musician Profile Perfil do músico - + Alias/Name Nome/Alcunha - + Instrument Instrumento - + Country País - + City Cidade - + Skill Habilidade - + &Close &Fechar - + Beginner Principiante - + Intermediate Intermediário - + Expert Avançado - + Set your name or an alias here so that the other musicians you want to play with know who you are. Additionally you may set an instrument picture of the instrument you play and a flag of the country you are living. The city you live in and the skill level of playing your instrument may also be added. Defina o seu nome ou um pseudônimo aqui para que os outros músicos com quem quer tocar saibam quem você é. Além disso, pode definir uma imagem do instrumento que toca e uma bandeira do país em que vive. A cidade em que vive e o nível de habilidade com o seu instrumento também podem ser adicionados. - + What you set here will appear at your fader on the mixer board when you are connected to a O que definir aqui aparecerá por baixo do seu fader na secção de mistura quando estiver ligado a um servidor - + Drum Set Bateria - + Djembe Djembe - + Electric Guitar Guitarra Elétrica - + Acoustic Guitar Guitarra Acústica - + Bass Guitar Baixo - + Keyboard Teclado - + Synthesizer Sintetizador - + Grand Piano Piano de Cauda - + Accordion Acordeão - + Vocal Voz - + Microphone Microfone - + Harmonica Harmónica - + Trumpet Trompete - + Trombone Trombone - + French Horn Trompa Francesa - + Tuba Tuba - + Saxophone Saxofone - + Clarinet Clarinete - + Flute Flauta - + Violin Violino - + Cello Violoncelo - + Double Bass Contrabaixo - + Recorder Gravador - + Streamer Streamer - + Listener Ouvinte - + Guitar+Vocal Guitarra+Voz - + Keyboard+Vocal Teclado+Voz - + Bodhran Bodhrán - + Bassoon Fagote - + Oboe Oboé - + Harp Harpa - + Viola Viola de Arco + + + Congas + + CServerDlg