From 76ae7a41fffbd1552c1466619bb9beeebed5de4f Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Thu, 7 May 2020 09:16:28 +0200 Subject: [PATCH] some more removing html code from translation strings --- src/res/translation/translation_de_DE.ts | 18 ++++++++++++---- src/res/translation/translation_es_ES.ts | 18 ++++++++++++---- src/res/translation/translation_fr_FR.ts | 18 ++++++++++++---- src/res/translation/translation_pt_PT.ts | 26 ++++++++++++++++-------- src/soundbase.cpp | 6 +++--- windows/sound.cpp | 6 +++--- 6 files changed, 66 insertions(+), 26 deletions(-) diff --git a/src/res/translation/translation_de_DE.ts b/src/res/translation/translation_de_DE.ts index c5a895cb..511d8c19 100644 --- a/src/res/translation/translation_de_DE.ts +++ b/src/res/translation/translation_de_DE.ts @@ -2179,12 +2179,17 @@ What you set here will appear at your fader on the mixer board when you are conn - <b>No ASIO audio device (driver) found.</b><br><br>The + No ASIO audio device (driver) found. - software requires the low latency audio interface <b>ASIO</b> to work properly. This is no standard Windows audio interface and therefore a special audio driver is required. Either your sound card has a native ASIO driver (which is recommended) or you might want to use alternative drivers like the ASIO4All driver. + The + + + + + software requires the low latency audio interface ASIO to work properly. This is no standard Windows audio interface and therefore a special audio driver is required. Either your sound card has a native ASIO driver (which is recommended) or you might want to use alternative drivers like the ASIO4All driver. @@ -2197,12 +2202,17 @@ What you set here will appear at your fader on the mixer board when you are conn - The audio driver properties have changed to a state which is incompatible to this software. The selected audio device could not be used because of the following error: <b> + The audio driver properties have changed to a state which is incompatible to this software. The selected audio device could not be used because of the following error: - </b><br><br>Please restart the software. + Please restart the software. + + + + + Close diff --git a/src/res/translation/translation_es_ES.ts b/src/res/translation/translation_es_ES.ts index ca1b2d19..ebdada87 100644 --- a/src/res/translation/translation_es_ES.ts +++ b/src/res/translation/translation_es_ES.ts @@ -2179,12 +2179,17 @@ What you set here will appear at your fader on the mixer board when you are conn - <b>No ASIO audio device (driver) found.</b><br><br>The + No ASIO audio device (driver) found. - software requires the low latency audio interface <b>ASIO</b> to work properly. This is no standard Windows audio interface and therefore a special audio driver is required. Either your sound card has a native ASIO driver (which is recommended) or you might want to use alternative drivers like the ASIO4All driver. + The + + + + + software requires the low latency audio interface ASIO to work properly. This is no standard Windows audio interface and therefore a special audio driver is required. Either your sound card has a native ASIO driver (which is recommended) or you might want to use alternative drivers like the ASIO4All driver. @@ -2197,12 +2202,17 @@ What you set here will appear at your fader on the mixer board when you are conn - The audio driver properties have changed to a state which is incompatible to this software. The selected audio device could not be used because of the following error: <b> + The audio driver properties have changed to a state which is incompatible to this software. The selected audio device could not be used because of the following error: - </b><br><br>Please restart the software. + Please restart the software. + + + + + Close diff --git a/src/res/translation/translation_fr_FR.ts b/src/res/translation/translation_fr_FR.ts index b96cd1dd..f7931bfd 100644 --- a/src/res/translation/translation_fr_FR.ts +++ b/src/res/translation/translation_fr_FR.ts @@ -2187,12 +2187,17 @@ What you set here will appear at your fader on the mixer board when you are conn - <b>No ASIO audio device (driver) found.</b><br><br>The + No ASIO audio device (driver) found. - software requires the low latency audio interface <b>ASIO</b> to work properly. This is no standard Windows audio interface and therefore a special audio driver is required. Either your sound card has a native ASIO driver (which is recommended) or you might want to use alternative drivers like the ASIO4All driver. + The + Le logiciel + + + + software requires the low latency audio interface ASIO to work properly. This is no standard Windows audio interface and therefore a special audio driver is required. Either your sound card has a native ASIO driver (which is recommended) or you might want to use alternative drivers like the ASIO4All driver. @@ -2205,12 +2210,17 @@ What you set here will appear at your fader on the mixer board when you are conn - The audio driver properties have changed to a state which is incompatible to this software. The selected audio device could not be used because of the following error: <b> + The audio driver properties have changed to a state which is incompatible to this software. The selected audio device could not be used because of the following error: - </b><br><br>Please restart the software. + Please restart the software. + + + + + Close diff --git a/src/res/translation/translation_pt_PT.ts b/src/res/translation/translation_pt_PT.ts index 869be841..ef624170 100644 --- a/src/res/translation/translation_pt_PT.ts +++ b/src/res/translation/translation_pt_PT.ts @@ -2188,13 +2188,18 @@ O que definir aqui aparecerá por baixo do seu fader na secção de mistura quan - <b>No ASIO audio device (driver) found.</b><br><br>The - <b>Nenhum dispositivo de áudio ASIO (driver) encontrado.</b><br><br>O programa + No ASIO audio device (driver) found. + Nenhum dispositivo de áudio ASIO (driver) encontrado - software requires the low latency audio interface <b>ASIO</b> to work properly. This is no standard Windows audio interface and therefore a special audio driver is required. Either your sound card has a native ASIO driver (which is recommended) or you might want to use alternative drivers like the ASIO4All driver. - requer que a interface de áudio de baixa latência <b>ASIO</b> funcione corretamente. Esta não é uma interface de áudio padrão do Windows e, portanto, é necessário um driver de áudio especial. Ou a sua placa de som possui um driver ASIO nativo (recomendado), ou pode usar drivers alternativos, como o driver ASIO4All. + The + O programa + + + + software requires the low latency audio interface ASIO to work properly. This is no standard Windows audio interface and therefore a special audio driver is required. Either your sound card has a native ASIO driver (which is recommended) or you might want to use alternative drivers like the ASIO4All driver. + requer que a interface de áudio de baixa latência ASIO funcione corretamente. Esta não é uma interface de áudio padrão do Windows e, portanto, é necessário um driver de áudio especial. Ou a sua placa de som possui um driver ASIO nativo (recomendado), ou pode usar drivers alternativos, como o driver ASIO4All. @@ -2206,13 +2211,18 @@ O que definir aqui aparecerá por baixo do seu fader na secção de mistura quan - The audio driver properties have changed to a state which is incompatible to this software. The selected audio device could not be used because of the following error: <b> - As propriedades do driver de áudio foram alteradas para um estado incompatível com este programa. O dispositivo de áudio selecionado não pôde ser usado devido ao seguinte erro: <b> + The audio driver properties have changed to a state which is incompatible to this software. The selected audio device could not be used because of the following error: + As propriedades do driver de áudio foram alteradas para um estado incompatível com este programa. O dispositivo de áudio selecionado não pôde ser usado devido ao seguinte erro: - </b><br><br>Please restart the software. - </b><br><br>Por favor reinicie o programa. + Please restart the software. + Por favor reinicie o programa. + + + + Close + diff --git a/src/soundbase.cpp b/src/soundbase.cpp index 6169e0d2..2d417639 100755 --- a/src/soundbase.cpp +++ b/src/soundbase.cpp @@ -141,10 +141,10 @@ QString CSoundBase::SetDev ( const int iNewDev ) nullptr, APP_NAME, QString ( tr ( "The audio driver properties " "have changed to a state which is incompatible to this " "software. The selected audio device could not be used " - "because of the following error: " ) ) + + "because of the following error:" ) + " " ) + strErrorMessage + - QString ( tr ( "

Please restart the software." ) ), - "Close", nullptr ); + QString ( "

" + tr ( "Please restart the software." ) ), + tr ( "Close" ), nullptr ); _exit ( 0 ); } diff --git a/windows/sound.cpp b/windows/sound.cpp index e5674b8b..19b44360 100755 --- a/windows/sound.cpp +++ b/windows/sound.cpp @@ -515,9 +515,9 @@ CSound::CSound ( void (*fpNewCallback) ( CVector& psData, voi // in case we do not have a driver available, throw error if ( lNumDevs == 0 ) { - throw CGenErr ( tr ( "No ASIO audio device (driver) found.

" - "The " ) + APP_NAME + tr ( " software requires the low latency audio " - "interface ASIO to work properly. This is no standard " + throw CGenErr ( "" + tr ( "No ASIO audio device (driver) found." ) + "

" + + tr ( "The " ) + APP_NAME + tr ( " software requires the low latency audio " + "interface ASIO to work properly. This is no standard " "Windows audio interface and therefore a special audio driver is " "required. Either your sound card has a native ASIO driver (which " "is recommended) or you might want to use alternative drivers like "