From 87132ad190fba548f4df40d54243c3e92b4e8818 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Thu, 7 May 2020 09:08:23 +0200 Subject: [PATCH] some more removing html code from translation strings --- src/res/translation/translation_de_DE.ts | 63 +++++++++++++++--- src/res/translation/translation_es_ES.ts | 63 +++++++++++++++--- src/res/translation/translation_fr_FR.ts | 63 +++++++++++++++--- src/res/translation/translation_pt_PT.ts | 81 ++++++++++++++++++------ src/serverdlg.cpp | 34 +++++----- 5 files changed, 242 insertions(+), 62 deletions(-) diff --git a/src/res/translation/translation_de_DE.ts b/src/res/translation/translation_de_DE.ts index 1f773ad9..c5a895cb 100644 --- a/src/res/translation/translation_de_DE.ts +++ b/src/res/translation/translation_de_DE.ts @@ -1782,7 +1782,12 @@ What you set here will appear at your fader on the mixer board when you are conn CServerDlg - <b>Client List:</b> The client list shows all clients which are currently connected to this server. Some information about the clients like the IP address and name are given for each connected client. + Client List + + + + + The client list shows all clients which are currently connected to this server. Some information about the clients like the IP address and name are given for each connected client. @@ -1792,7 +1797,12 @@ What you set here will appear at your fader on the mixer board when you are conn - <b>Start Minimized on Operating System Start:</b> If the start minimized on operating system start check box is checked, the + Start Minimized on Operating System Start + + + + + If the start minimized on operating system start check box is checked, the @@ -1802,12 +1812,22 @@ What you set here will appear at your fader on the mixer board when you are conn - <b>Show Creative Commons Licence Dialog:</b> If enabled, a Creative Commons BY-NC-SA 4.0 Licence dialog is shown each time a new user connects the server. + Show Creative Commons Licence Dialog + + + + + If enabled, a Creative Commons BY-NC-SA 4.0 Licence dialog is shown each time a new user connects the server. - <b>Make My Server Public:</b> If the Make My Server Public check box is checked, this server registers itself at the central server so that all + Make My Server Public + + + + + If the Make My Server Public check box is checked, this server registers itself at the central server so that all @@ -1817,12 +1837,22 @@ What you set here will appear at your fader on the mixer board when you are conn - <b>Register Server Status:</b> If the Make My Server Public check box is checked, this will show the success of registration with the central server. + Register Server Status + + + + + If the Make My Server Public check box is checked, this will show the success of registration with the central server. - <b>Central Server Address:</b> 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. + Central Server Address + + + + + 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. @@ -1837,7 +1867,12 @@ What you set here will appear at your fader on the mixer board when you are conn - <b>Server Name:</b> 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 + + + + + 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. @@ -1847,7 +1882,12 @@ What you set here will appear at your fader on the mixer board when you are conn - <b>Location City:</b> 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. + 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. @@ -1857,7 +1897,12 @@ What you set here will appear at your fader on the mixer board when you are conn - <b>Location country:</b> 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. + 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. diff --git a/src/res/translation/translation_es_ES.ts b/src/res/translation/translation_es_ES.ts index e23dfe02..ca1b2d19 100644 --- a/src/res/translation/translation_es_ES.ts +++ b/src/res/translation/translation_es_ES.ts @@ -1782,7 +1782,12 @@ What you set here will appear at your fader on the mixer board when you are conn CServerDlg - <b>Client List:</b> The client list shows all clients which are currently connected to this server. Some information about the clients like the IP address and name are given for each connected client. + Client List + + + + + The client list shows all clients which are currently connected to this server. Some information about the clients like the IP address and name are given for each connected client. @@ -1792,7 +1797,12 @@ What you set here will appear at your fader on the mixer board when you are conn - <b>Start Minimized on Operating System Start:</b> If the start minimized on operating system start check box is checked, the + Start Minimized on Operating System Start + + + + + If the start minimized on operating system start check box is checked, the @@ -1802,12 +1812,22 @@ What you set here will appear at your fader on the mixer board when you are conn - <b>Show Creative Commons Licence Dialog:</b> If enabled, a Creative Commons BY-NC-SA 4.0 Licence dialog is shown each time a new user connects the server. + Show Creative Commons Licence Dialog + + + + + If enabled, a Creative Commons BY-NC-SA 4.0 Licence dialog is shown each time a new user connects the server. - <b>Make My Server Public:</b> If the Make My Server Public check box is checked, this server registers itself at the central server so that all + Make My Server Public + + + + + If the Make My Server Public check box is checked, this server registers itself at the central server so that all @@ -1817,12 +1837,22 @@ What you set here will appear at your fader on the mixer board when you are conn - <b>Register Server Status:</b> If the Make My Server Public check box is checked, this will show the success of registration with the central server. + Register Server Status + + + + + If the Make My Server Public check box is checked, this will show the success of registration with the central server. - <b>Central Server Address:</b> 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. + Central Server Address + + + + + 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. @@ -1837,7 +1867,12 @@ What you set here will appear at your fader on the mixer board when you are conn - <b>Server Name:</b> 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 + + + + + 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. @@ -1847,7 +1882,12 @@ What you set here will appear at your fader on the mixer board when you are conn - <b>Location City:</b> 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. + 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. @@ -1857,7 +1897,12 @@ What you set here will appear at your fader on the mixer board when you are conn - <b>Location country:</b> 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. + 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. diff --git a/src/res/translation/translation_fr_FR.ts b/src/res/translation/translation_fr_FR.ts index fe837f74..b96cd1dd 100644 --- a/src/res/translation/translation_fr_FR.ts +++ b/src/res/translation/translation_fr_FR.ts @@ -1790,7 +1790,12 @@ What you set here will appear at your fader on the mixer board when you are conn CServerDlg - <b>Client List:</b> The client list shows all clients which are currently connected to this server. Some information about the clients like the IP address and name are given for each connected client. + Client List + + + + + The client list shows all clients which are currently connected to this server. Some information about the clients like the IP address and name are given for each connected client. @@ -1800,7 +1805,12 @@ What you set here will appear at your fader on the mixer board when you are conn - <b>Start Minimized on Operating System Start:</b> If the start minimized on operating system start check box is checked, the + Start Minimized on Operating System Start + + + + + If the start minimized on operating system start check box is checked, the @@ -1810,12 +1820,22 @@ What you set here will appear at your fader on the mixer board when you are conn - <b>Show Creative Commons Licence Dialog:</b> If enabled, a Creative Commons BY-NC-SA 4.0 Licence dialog is shown each time a new user connects the server. + Show Creative Commons Licence Dialog + + + + + If enabled, a Creative Commons BY-NC-SA 4.0 Licence dialog is shown each time a new user connects the server. - <b>Make My Server Public:</b> If the Make My Server Public check box is checked, this server registers itself at the central server so that all + Make My Server Public + + + + + If the Make My Server Public check box is checked, this server registers itself at the central server so that all @@ -1825,12 +1845,22 @@ What you set here will appear at your fader on the mixer board when you are conn - <b>Register Server Status:</b> If the Make My Server Public check box is checked, this will show the success of registration with the central server. + Register Server Status + + + + + If the Make My Server Public check box is checked, this will show the success of registration with the central server. - <b>Central Server Address:</b> 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. + Central Server Address + + + + + 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. @@ -1845,7 +1875,12 @@ What you set here will appear at your fader on the mixer board when you are conn - <b>Server Name:</b> 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 + 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. @@ -1855,7 +1890,12 @@ What you set here will appear at your fader on the mixer board when you are conn - <b>Location City:</b> 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. + 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. @@ -1865,7 +1905,12 @@ What you set here will appear at your fader on the mixer board when you are conn - <b>Location country:</b> 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. + 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. diff --git a/src/res/translation/translation_pt_PT.ts b/src/res/translation/translation_pt_PT.ts index d86afa9f..869be841 100644 --- a/src/res/translation/translation_pt_PT.ts +++ b/src/res/translation/translation_pt_PT.ts @@ -1791,8 +1791,13 @@ O que definir aqui aparecerá por baixo do seu fader na secção de mistura quan CServerDlg - <b>Client List:</b> The client list shows all clients which are currently connected to this server. Some information about the clients like the IP address and name are given for each connected client. - <b>Lista de Clientes:</b> A lista de clientes mostra todos os clientes que estão atualmente ligados a este servidor. Algumas informações sobre os clientes, como o endereço IP e o nome, são fornecidas para cada cliente ligado. + Client List + Lista de Clientes + + + + The client list shows all clients which are currently connected to this server. Some information about the clients like the IP address and name are given for each connected client. + A lista de clientes mostra todos os clientes que estão atualmente ligados a este servidor. Algumas informações sobre os clientes, como o endereço IP e o nome, são fornecidas para cada cliente ligado. @@ -1801,8 +1806,13 @@ O que definir aqui aparecerá por baixo do seu fader na secção de mistura quan - <b>Start Minimized on Operating System Start:</b> If the start minimized on operating system start check box is checked, the - <b>Iniciar Minimizado com o Sistema Operativo:</b> Se a caixa de seleção <i>Iniciar Minimizado com o Sistema Operativo</i> estiver marcada, o servidor + Start Minimized on Operating System Start + Iniciar Minimizado com o Sistema Operativo + + + + If the start minimized on operating system start check box is checked, the + Se a caixa de seleção Iniciar Minimizado com o Sistema Operativo estiver marcada, o servidor @@ -1811,13 +1821,23 @@ O que definir aqui aparecerá por baixo do seu fader na secção de mistura quan - <b>Show Creative Commons Licence Dialog:</b> If enabled, a Creative Commons BY-NC-SA 4.0 Licence dialog is shown each time a new user connects the server. - <b>Mostrar Diálogo da Licença Creative Commons:</b> Se ativada, uma caixa de diálogo Creative Commons BY-NC-SA 4.0 será exibida sempre que um novo utilizador se ligar ao servidor. + Show Creative Commons Licence Dialog + Mostrar Diálogo da Licença Creative Commons + + + + If enabled, a Creative Commons BY-NC-SA 4.0 Licence dialog is shown each time a new user connects the server. + Se ativada, uma caixa de diálogo Creative Commons BY-NC-SA 4.0 será exibida sempre que um novo utilizador se ligar ao servidor. - <b>Make My Server Public:</b> If the Make My Server Public check box is checked, this server registers itself at the central server so that all - <b>Tornar Servidor Público:</b> Se a caixa de seleção <i>Tornar Servidor Público</i> estiver marcada, esse servidor irá registar-se no servidor central para que todos os utilizadores do + Make My Server Public + Tornar Servidor Público + + + + If the Make My Server Public check box is checked, this server registers itself at the central server so that all + Se a caixa de seleção Tornar Servidor Público estiver marcada, esse servidor irá registar-se no servidor central para que todos os utilizadores do @@ -1826,13 +1846,23 @@ O que definir aqui aparecerá por baixo do seu fader na secção de mistura quan - <b>Register Server Status:</b> If the Make My Server Public check box is checked, this will show the success of registration with the central server. - <b>Estado de Registo do Servidor:</b> Se a caixa de seleção <i>Tornar Servidor Público</i> estiver marcada, isto mostrará o sucesso ou insucesso do registo no servidor central. + Register Server Status + Estado de Registo do Servidor + + + + If the Make My Server Public check box is checked, this will show the success of registration with the central server. + Se a caixa de seleção Tornar Servidor Público estiver marcada, isto mostrará o sucesso ou insucesso do registo no servidor central. - <b>Central Server Address:</b> 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. - <b>Endereço do Servidor Central:</b> O endereço do servidor central é o endereço IP ou o URL do servidor central no qual esse servidor será registado. Com o menu dos servidores centrais, é possível selecionar um dos servidores centrais padrão ou especificar um endereço manual. + Central Server Address + 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. + O endereço do servidor central é o endereço IP ou o URL do servidor central no qual esse servidor será registado. Com o menu dos servidores centrais, é possível selecionar um dos servidores centrais padrão ou especificar um endereço manual. @@ -1846,8 +1876,13 @@ O que definir aqui aparecerá por baixo do seu fader na secção de mistura quan - <b>Server Name:</b> 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. - <b>Nome do Servidor:</b> 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 + 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. @@ -1856,8 +1891,13 @@ O que definir aqui aparecerá por baixo do seu fader na secção de mistura quan - <b>Location City:</b> 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. - <b>Localização: Cidade</b> 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. + 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. @@ -1866,8 +1906,13 @@ O que definir aqui aparecerá por baixo do seu fader na secção de mistura quan - <b>Location country:</b> 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. - <b>Localização: País</b> 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. + 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. diff --git a/src/serverdlg.cpp b/src/serverdlg.cpp index 48b4931a..7717e023 100755 --- a/src/serverdlg.cpp +++ b/src/serverdlg.cpp @@ -42,28 +42,28 @@ CServerDlg::CServerDlg ( CServer* pNServP, // Add help text to controls ----------------------------------------------- // client list - lvwClients->setWhatsThis ( tr ( "Client List: The client list " - "shows all clients which are currently connected to this server. Some " - "information about the clients like the IP address and name are given " - "for each connected client." ) ); + lvwClients->setWhatsThis ( "" + tr ( "Client List" ) + ": " + tr ( + "The client list shows all clients which are currently connected to this " + "server. Some information about the clients like the IP address and name " + "are given for each connected client." ) ); lvwClients->setAccessibleName ( tr ( "Connected clients list view" ) ); // start minimized on operating system start - chbStartOnOSStart->setWhatsThis ( tr ( "Start Minimized on Operating " - "System Start: If the start minimized on operating system start " + chbStartOnOSStart->setWhatsThis ( "" + tr ( "Start Minimized on Operating " + "System Start" ) + ": " + tr ( "If the start minimized on operating system start " "check box is checked, the " ) + APP_NAME + tr ( " server will be " "started when the operating system starts up and is automatically " "minimized to a system task bar icon." ) ); // CC licence dialog switch - chbUseCCLicence->setWhatsThis ( tr ( "Show Creative Commons Licence " - "Dialog: If enabled, a Creative Commons BY-NC-SA 4.0 Licence " + chbUseCCLicence->setWhatsThis ( "" + tr ( "Show Creative Commons Licence " + "Dialog" ) + ": " + tr ( "If enabled, a Creative Commons BY-NC-SA 4.0 Licence " "dialog is shown each time a new user connects the server." ) ); // Make My Server Public flag - chbRegisterServer->setWhatsThis ( tr ( "Make My Server Public: If " - "the Make My Server Public check box is checked, this server registers " + chbRegisterServer->setWhatsThis ( "" + tr ( "Make My Server Public" ) + ": " + + tr ( "If the Make My Server Public check box is checked, this server registers " "itself at the central server so that all " ) + APP_NAME + tr ( " users can see the server in the connect dialog server list and " "connect to it. The registering of the server is renewed periodically " @@ -71,13 +71,13 @@ CServerDlg::CServerDlg ( CServer* pNServP, "actually available." ) ); // register server status label - lblRegSvrStatus->setWhatsThis ( tr ( "Register Server Status: If " - "the Make My Server Public check box is checked, this will show " + lblRegSvrStatus->setWhatsThis ( "" + tr ( "Register Server Status" ) + ": " + + tr ( "If the Make My Server Public check box is checked, this will show " "the success of registration with the central server." ) ); // central server address - QString strCentrServAddr = tr ( "Central Server Address: The " - "Central server address is the IP address or URL of the central server " + QString strCentrServAddr = "" + tr ( "Central Server Address" ) + ": " + + tr ( "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." ); @@ -90,7 +90,7 @@ CServerDlg::CServerDlg ( CServer* pNServP, edtCentralServerAddress->setAccessibleName ( tr ( "Central server address line edit" ) ); // server name - QString strServName = tr ( "Server Name: The server name identifies " + QString strServName = "" + tr ( "Server Name" ) + ": " + tr ( "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." ); @@ -100,7 +100,7 @@ CServerDlg::CServerDlg ( CServer* pNServP, edtServerName->setAccessibleName ( tr ( "Server name line edit" ) ); // location city - QString strLocCity = tr ( "Location City: The city in which this " + QString strLocCity = "" + tr ( "Location City" ) + ": " + tr ( "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." ); @@ -110,7 +110,7 @@ CServerDlg::CServerDlg ( CServer* pNServP, edtLocationCity->setAccessibleName ( tr ( "City where the server is located line edit" ) ); // location country - QString strLocCountry = tr ( "Location country: The country in " + QString strLocCountry = "" + tr ( "Location country" ) + ": " + tr ( "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." );