From 9594347df4694392c1763edf0352e870c351b5bb Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Mon, 24 Oct 2022 09:45:33 +0200 Subject: [PATCH] Fix ldap settings binding loops on texts and replace 'Linphone' texts by the application name. --- linphone-app/assets/languages/da.ts | 8 +++-- linphone-app/assets/languages/de.ts | 8 +++-- linphone-app/assets/languages/en.ts | 22 +++++++------ linphone-app/assets/languages/es.ts | 8 +++-- linphone-app/assets/languages/fr_FR.ts | 8 +++-- linphone-app/assets/languages/hu.ts | 8 +++-- linphone-app/assets/languages/it.ts | 8 +++-- linphone-app/assets/languages/ja.ts | 8 +++-- linphone-app/assets/languages/lt.ts | 8 +++-- linphone-app/assets/languages/pt_BR.ts | 8 +++-- linphone-app/assets/languages/ru.ts | 8 +++-- linphone-app/assets/languages/sv.ts | 8 +++-- linphone-app/assets/languages/tr.ts | 8 +++-- linphone-app/assets/languages/uk.ts | 8 +++-- linphone-app/assets/languages/zh_CN.ts | 8 +++-- .../settings/AccountSettingsModel.cpp | 6 ++-- .../settings/AccountSettingsModel.hpp | 6 ++-- .../ui/views/App/Dialog/NewConference.qml | 4 +-- .../App/Main/Assistant/UseOtherSipAccount.qml | 4 +-- .../App/Settings/Dialogs/SettingsLdapEdit.qml | 33 ++++++++++--------- .../ui/views/App/Settings/SettingsAdvanced.js | 2 +- 21 files changed, 111 insertions(+), 78 deletions(-) diff --git a/linphone-app/assets/languages/da.ts b/linphone-app/assets/languages/da.ts index f9a330464..906a5320c 100644 --- a/linphone-app/assets/languages/da.ts +++ b/linphone-app/assets/languages/da.ts @@ -2059,7 +2059,7 @@ Klik her: <a href="%1">%1</a> newConferenceSendLinphoneInviteLabel - 'Send invite via Linphone' : Label for checkbox for sending invitations with Linphone. + 'Send invite via %1' : Label for checkbox for sending invitations with the application. %1 is the application name. @@ -2628,6 +2628,7 @@ Klik her: <a href="%1">%1</a> useSalTooltip + 'The dns resolution is done by %1 using Sal. It will pass an IP to LDAP. By doing that, the TLS negociation could not check the hostname. You may deactivate the verifications if wanted to force the connection.' @@ -2716,6 +2717,7 @@ Klik her: <a href="%1">%1</a> domainTooltip + 'Add the domain to the sip address(username@domain).' Tooltip to explain that this field is used to complete a result with this domain. @@ -3648,7 +3650,7 @@ Klik her: <a href="%1">%1</a> warningFeatures - 'Some features require a Linphone account, such as group messaging or ephemeral messaging.' : Warning text about features. + 'Some features require a %1 account, such as group messaging or ephemeral messaging.' : Warning text about features. %1 is the application name @@ -3676,7 +3678,7 @@ Klik her: <a href="%1">%1</a> endCallStatus - "Ending call" : status of the call in waiting room when the call end. + "Call ended" : status of the call in waiting room when the call end. diff --git a/linphone-app/assets/languages/de.ts b/linphone-app/assets/languages/de.ts index b9b8c6a23..5c52e5721 100644 --- a/linphone-app/assets/languages/de.ts +++ b/linphone-app/assets/languages/de.ts @@ -2059,7 +2059,7 @@ Klicken Sie hier: <a href="%1">%1</a> newConferenceSendLinphoneInviteLabel - 'Send invite via Linphone' : Label for checkbox for sending invitations with Linphone. + 'Send invite via %1' : Label for checkbox for sending invitations with the application. %1 is the application name. @@ -2628,6 +2628,7 @@ Klicken Sie hier: <a href="%1">%1</a> useSalTooltip + 'The dns resolution is done by %1 using Sal. It will pass an IP to LDAP. By doing that, the TLS negociation could not check the hostname. You may deactivate the verifications if wanted to force the connection.' DNS-Auflösung wird von Linphone via SAL gemacht. Die IP wird an den LDAP-Server übertragen. Dadurch kann bei der TLS-Verhandlung der Hostname nicht geprüft werden. Sie können die Prüfung deaktivieren um die Verbindung zu erzwingen. @@ -2716,6 +2717,7 @@ Klicken Sie hier: <a href="%1">%1</a> domainTooltip + 'Add the domain to the sip address(username@domain).' Tooltip to explain that this field is used to complete a result with this domain. Füge die Domain der SIP-Adresse hinzu (sip:username@domain).<br>Der Standardwert ist sip.linphone.org @@ -3648,7 +3650,7 @@ Klicken Sie hier: <a href="%1">%1</a> warningFeatures - 'Some features require a Linphone account, such as group messaging or ephemeral messaging.' : Warning text about features. + 'Some features require a %1 account, such as group messaging or ephemeral messaging.' : Warning text about features. %1 is the application name @@ -3676,7 +3678,7 @@ Klicken Sie hier: <a href="%1">%1</a> endCallStatus - "Ending call" : status of the call in waiting room when the call end. + "Call ended" : status of the call in waiting room when the call end. diff --git a/linphone-app/assets/languages/en.ts b/linphone-app/assets/languages/en.ts index 15a8f91f6..bfa73b268 100644 --- a/linphone-app/assets/languages/en.ts +++ b/linphone-app/assets/languages/en.ts @@ -2059,8 +2059,8 @@ Click here: <a href="%1">%1</a> newConferenceSendLinphoneInviteLabel - 'Send invite via Linphone' : Label for checkbox for sending invitations with Linphone. - Send invite via Linphone + 'Send invite via %1' : Label for checkbox for sending invitations with the application. %1 is the application name. + Send invite via %1 newConferenceSendEmailInviteLabel @@ -2331,7 +2331,7 @@ Click here: <a href="%1">%1</a> logsMailerFailed - Message when Linphone try to open a mailer to send logs, after uploading them to the server (%1 would be the upload url) + Message when the application try to open a mailer to send logs, after uploading them to the server (%1 would be the upload url) Mailer cannot be found but logs were uploaded to %1 @@ -2643,7 +2643,8 @@ Click here: <a href="%1">%1</a> useSalTooltip - The DNS resolution is done by Linphone using SAL. It will pass an IP to LDAP. By doing that, the TLS negotiation cannot check the hostname. You may deactivate the verifications if wanted to force the connection. + 'The dns resolution is done by %1 using Sal. It will pass an IP to LDAP. By doing that, the TLS negociation could not check the hostname. You may deactivate the verifications if wanted to force the connection.' + The DNS resolution is done by %1 using SAL. It will pass an IP to LDAP. By doing that, the TLS negotiation cannot check the hostname. You may deactivate the verifications if wanted to force the connection. verifyTLSLabel @@ -2730,7 +2731,8 @@ Click here: <a href="%1">%1</a> domainTooltip - Add the domain to the SIP address (sip:username@domain).<br>The default value is sip.linphone.org + 'Add the domain to the sip address(username@domain).' Tooltip to explain that this field is used to complete a result with this domain. + Add the domain to the SIP address (sip:username@domain). miscLabel @@ -2743,7 +2745,7 @@ Click here: <a href="%1">%1</a> debugTooltip - Get verbose logs in Linphone log file when doing transactions (useful to debug TLS connections). + Get verbose logs in log file when doing transactions (useful to debug TLS connections). timeoutLabel @@ -3671,8 +3673,8 @@ Click here: <a href="%1">%1</a> warningFeatures - 'Some features require a Linphone account, such as group messaging or ephemeral messaging.' : Warning text about features. - Some features require a Linphone account, such as group messaging or ephemeral messaging. + 'Some features require a %1 account, such as group messaging or ephemeral messaging.' : Warning text about features. %1 is the application name + Some features require a %1 account, such as group messaging or ephemeral messaging. warningThirdParty @@ -3699,8 +3701,8 @@ Click here: <a href="%1">%1</a> endCallStatus - "Ending call" : status of the call in waiting room when the call end. - Ending call + "Call ended" : status of the call in waiting room when the call end. + Call ended outgoingCallStatus diff --git a/linphone-app/assets/languages/es.ts b/linphone-app/assets/languages/es.ts index 5bb94af49..50ecfe350 100644 --- a/linphone-app/assets/languages/es.ts +++ b/linphone-app/assets/languages/es.ts @@ -2059,7 +2059,7 @@ Haga clic aquí: <a href="%1">%1 </a> newConferenceSendLinphoneInviteLabel - 'Send invite via Linphone' : Label for checkbox for sending invitations with Linphone. + 'Send invite via %1' : Label for checkbox for sending invitations with the application. %1 is the application name. @@ -2628,6 +2628,7 @@ Haga clic aquí: <a href="%1">%1 </a> useSalTooltip + 'The dns resolution is done by %1 using Sal. It will pass an IP to LDAP. By doing that, the TLS negociation could not check the hostname. You may deactivate the verifications if wanted to force the connection.' @@ -2716,6 +2717,7 @@ Haga clic aquí: <a href="%1">%1 </a> domainTooltip + 'Add the domain to the sip address(username@domain).' Tooltip to explain that this field is used to complete a result with this domain. @@ -3648,7 +3650,7 @@ Haga clic aquí: <a href="%1">%1 </a> warningFeatures - 'Some features require a Linphone account, such as group messaging or ephemeral messaging.' : Warning text about features. + 'Some features require a %1 account, such as group messaging or ephemeral messaging.' : Warning text about features. %1 is the application name @@ -3676,7 +3678,7 @@ Haga clic aquí: <a href="%1">%1 </a> endCallStatus - "Ending call" : status of the call in waiting room when the call end. + "Call ended" : status of the call in waiting room when the call end. diff --git a/linphone-app/assets/languages/fr_FR.ts b/linphone-app/assets/languages/fr_FR.ts index 349bd8c2f..3dcdb259a 100644 --- a/linphone-app/assets/languages/fr_FR.ts +++ b/linphone-app/assets/languages/fr_FR.ts @@ -2059,7 +2059,7 @@ Cliquez ici : <a href="%1">%1</a> newConferenceSendLinphoneInviteLabel - 'Send invite via Linphone' : Label for checkbox for sending invitations with Linphone. + 'Send invite via %1' : Label for checkbox for sending invitations with the application. %1 is the application name. Envoyer les invitations avec Linphone @@ -2628,6 +2628,7 @@ Cliquez ici : <a href="%1">%1</a> useSalTooltip + 'The dns resolution is done by %1 using Sal. It will pass an IP to LDAP. By doing that, the TLS negociation could not check the hostname. You may deactivate the verifications if wanted to force the connection.' La résolution DNS est effectuée par Linphone en utilisant SAL. Il fournira une IP à LDAP. Ce faisant, la négociation TLS ne pourra pas vérifier le nom d'hôte. Vous devrez donc désactiver les vérifications si vous voulez forcer la connexion. @@ -2716,6 +2717,7 @@ Cliquez ici : <a href="%1">%1</a> domainTooltip + 'Add the domain to the sip address(username@domain).' Tooltip to explain that this field is used to complete a result with this domain. Ajouter le domaine à l'adresse SIP (sip:nomdutilisateur@domaine). La valeur par défaut est sip.linphone.org @@ -3648,7 +3650,7 @@ Cliquez ici : <a href="%1">%1</a> warningFeatures - 'Some features require a Linphone account, such as group messaging or ephemeral messaging.' : Warning text about features. + 'Some features require a %1 account, such as group messaging or ephemeral messaging.' : Warning text about features. %1 is the application name Certaines fonctionnalités avancées comme les messages de groupe ou les messages éphémères nécessitent un compte Linphone. @@ -3676,7 +3678,7 @@ Cliquez ici : <a href="%1">%1</a> endCallStatus - "Ending call" : status of the call in waiting room when the call end. + "Call ended" : status of the call in waiting room when the call end. Fin d'appel diff --git a/linphone-app/assets/languages/hu.ts b/linphone-app/assets/languages/hu.ts index 3df0e22c0..d3a709610 100644 --- a/linphone-app/assets/languages/hu.ts +++ b/linphone-app/assets/languages/hu.ts @@ -2047,7 +2047,7 @@ Kattintson ide: <a href="%1">%1</a> newConferenceSendLinphoneInviteLabel - 'Send invite via Linphone' : Label for checkbox for sending invitations with Linphone. + 'Send invite via %1' : Label for checkbox for sending invitations with the application. %1 is the application name. @@ -2615,6 +2615,7 @@ Kattintson ide: <a href="%1">%1</a> useSalTooltip + 'The dns resolution is done by %1 using Sal. It will pass an IP to LDAP. By doing that, the TLS negociation could not check the hostname. You may deactivate the verifications if wanted to force the connection.' A DNS feloldását Linphone végzi SAL használatával. Egy IP-címet továbbít az LDAP kiszolgálónak. Ezzel a TLS tárgyalás nem tudta ellenőrizni az állomásnévét. Deaktiválhatja az ellenőrzéseket, ha kényszeríteni szeretné a kapcsolatot. @@ -2703,6 +2704,7 @@ Kattintson ide: <a href="%1">%1</a> domainTooltip + 'Add the domain to the sip address(username@domain).' Tooltip to explain that this field is used to complete a result with this domain. Tartomány hozzáadása a SIP-címhez (sip:felhasználónév@tartomány).<br>Az alapértelmezett érték a sip.linphone.org @@ -3635,7 +3637,7 @@ Kattintson ide: <a href="%1">%1</a> warningFeatures - 'Some features require a Linphone account, such as group messaging or ephemeral messaging.' : Warning text about features. + 'Some features require a %1 account, such as group messaging or ephemeral messaging.' : Warning text about features. %1 is the application name @@ -3663,7 +3665,7 @@ Kattintson ide: <a href="%1">%1</a> endCallStatus - "Ending call" : status of the call in waiting room when the call end. + "Call ended" : status of the call in waiting room when the call end. diff --git a/linphone-app/assets/languages/it.ts b/linphone-app/assets/languages/it.ts index 203a2e411..194d4e30c 100644 --- a/linphone-app/assets/languages/it.ts +++ b/linphone-app/assets/languages/it.ts @@ -2059,7 +2059,7 @@ Clicca: <a href="%1">%1</a> newConferenceSendLinphoneInviteLabel - 'Send invite via Linphone' : Label for checkbox for sending invitations with Linphone. + 'Send invite via %1' : Label for checkbox for sending invitations with the application. %1 is the application name. Invita tramite Linphone @@ -2628,6 +2628,7 @@ Clicca: <a href="%1">%1</a> useSalTooltip + 'The dns resolution is done by %1 using Sal. It will pass an IP to LDAP. By doing that, the TLS negociation could not check the hostname. You may deactivate the verifications if wanted to force the connection.' Linphone usa SAL per la risoluzione DNS. Passerà l'indirizzo IP a LDAP. Facendo cosi la negoziazione TLS non può controllare il nome dell'host. Si possono disattivare le verifiche se si vuole forzare la connessione. @@ -2716,6 +2717,7 @@ Clicca: <a href="%1">%1</a> domainTooltip + 'Add the domain to the sip address(username@domain).' Tooltip to explain that this field is used to complete a result with this domain. Aggiunge il dominio all'indirizzo SIP (sip:nomeutente@dominio).<br>Il valore di default è sip.linphone.org @@ -3648,7 +3650,7 @@ Clicca: <a href="%1">%1</a> warningFeatures - 'Some features require a Linphone account, such as group messaging or ephemeral messaging.' : Warning text about features. + 'Some features require a %1 account, such as group messaging or ephemeral messaging.' : Warning text about features. %1 is the application name @@ -3676,7 +3678,7 @@ Clicca: <a href="%1">%1</a> endCallStatus - "Ending call" : status of the call in waiting room when the call end. + "Call ended" : status of the call in waiting room when the call end. diff --git a/linphone-app/assets/languages/ja.ts b/linphone-app/assets/languages/ja.ts index 9b57f1f13..2c4470b7d 100644 --- a/linphone-app/assets/languages/ja.ts +++ b/linphone-app/assets/languages/ja.ts @@ -2047,7 +2047,7 @@ newConferenceSendLinphoneInviteLabel - 'Send invite via Linphone' : Label for checkbox for sending invitations with Linphone. + 'Send invite via %1' : Label for checkbox for sending invitations with the application. %1 is the application name. @@ -2615,6 +2615,7 @@ useSalTooltip + 'The dns resolution is done by %1 using Sal. It will pass an IP to LDAP. By doing that, the TLS negociation could not check the hostname. You may deactivate the verifications if wanted to force the connection.' @@ -2703,6 +2704,7 @@ domainTooltip + 'Add the domain to the sip address(username@domain).' Tooltip to explain that this field is used to complete a result with this domain. @@ -3635,7 +3637,7 @@ warningFeatures - 'Some features require a Linphone account, such as group messaging or ephemeral messaging.' : Warning text about features. + 'Some features require a %1 account, such as group messaging or ephemeral messaging.' : Warning text about features. %1 is the application name @@ -3663,7 +3665,7 @@ endCallStatus - "Ending call" : status of the call in waiting room when the call end. + "Call ended" : status of the call in waiting room when the call end. diff --git a/linphone-app/assets/languages/lt.ts b/linphone-app/assets/languages/lt.ts index 977bd6910..0efdb74ff 100644 --- a/linphone-app/assets/languages/lt.ts +++ b/linphone-app/assets/languages/lt.ts @@ -2071,7 +2071,7 @@ Spustelėkite čia: <a href="%1">%1</a> newConferenceSendLinphoneInviteLabel - 'Send invite via Linphone' : Label for checkbox for sending invitations with Linphone. + 'Send invite via %1' : Label for checkbox for sending invitations with the application. %1 is the application name. @@ -2641,6 +2641,7 @@ Spustelėkite čia: <a href="%1">%1</a> useSalTooltip + 'The dns resolution is done by %1 using Sal. It will pass an IP to LDAP. By doing that, the TLS negociation could not check the hostname. You may deactivate the verifications if wanted to force the connection.' @@ -2729,6 +2730,7 @@ Spustelėkite čia: <a href="%1">%1</a> domainTooltip + 'Add the domain to the sip address(username@domain).' Tooltip to explain that this field is used to complete a result with this domain. @@ -3661,7 +3663,7 @@ Spustelėkite čia: <a href="%1">%1</a> warningFeatures - 'Some features require a Linphone account, such as group messaging or ephemeral messaging.' : Warning text about features. + 'Some features require a %1 account, such as group messaging or ephemeral messaging.' : Warning text about features. %1 is the application name @@ -3689,7 +3691,7 @@ Spustelėkite čia: <a href="%1">%1</a> endCallStatus - "Ending call" : status of the call in waiting room when the call end. + "Call ended" : status of the call in waiting room when the call end. diff --git a/linphone-app/assets/languages/pt_BR.ts b/linphone-app/assets/languages/pt_BR.ts index a4012b78e..180c4c7a5 100644 --- a/linphone-app/assets/languages/pt_BR.ts +++ b/linphone-app/assets/languages/pt_BR.ts @@ -2059,7 +2059,7 @@ Clique aqui: <a href="%1">%1 </a> newConferenceSendLinphoneInviteLabel - 'Send invite via Linphone' : Label for checkbox for sending invitations with Linphone. + 'Send invite via %1' : Label for checkbox for sending invitations with the application. %1 is the application name. @@ -2628,6 +2628,7 @@ Clique aqui: <a href="%1">%1 </a> useSalTooltip + 'The dns resolution is done by %1 using Sal. It will pass an IP to LDAP. By doing that, the TLS negociation could not check the hostname. You may deactivate the verifications if wanted to force the connection.' A resolução DNS é feita pelo Linphone usando SAL. Ele vai passar um IP para o LDAP. Com isso, a negociação TLS não conseguiu verificar o nome do host. Você pode desativar as verificações se quiser forçar a conexão. @@ -2716,6 +2717,7 @@ Clique aqui: <a href="%1">%1 </a> domainTooltip + 'Add the domain to the sip address(username@domain).' Tooltip to explain that this field is used to complete a result with this domain. Adicione o domínio ao endereço SIP (sip:username@domain). <br>O valor padrão é sip.linphone.org @@ -3648,7 +3650,7 @@ Clique aqui: <a href="%1">%1 </a> warningFeatures - 'Some features require a Linphone account, such as group messaging or ephemeral messaging.' : Warning text about features. + 'Some features require a %1 account, such as group messaging or ephemeral messaging.' : Warning text about features. %1 is the application name @@ -3676,7 +3678,7 @@ Clique aqui: <a href="%1">%1 </a> endCallStatus - "Ending call" : status of the call in waiting room when the call end. + "Call ended" : status of the call in waiting room when the call end. diff --git a/linphone-app/assets/languages/ru.ts b/linphone-app/assets/languages/ru.ts index ae9a04f34..dee0ec5e7 100644 --- a/linphone-app/assets/languages/ru.ts +++ b/linphone-app/assets/languages/ru.ts @@ -2071,7 +2071,7 @@ newConferenceSendLinphoneInviteLabel - 'Send invite via Linphone' : Label for checkbox for sending invitations with Linphone. + 'Send invite via %1' : Label for checkbox for sending invitations with the application. %1 is the application name. Отправить приглашение через Linphone @@ -2641,6 +2641,7 @@ useSalTooltip + 'The dns resolution is done by %1 using Sal. It will pass an IP to LDAP. By doing that, the TLS negociation could not check the hostname. You may deactivate the verifications if wanted to force the connection.' Разрешение DNS выполняется Linphone с использованием SAL. Он передаст IP в LDAP. При этом согласование TLS не может проверить имя хоста. Вы можете деактивировать проверки, если хотите принудительно установить соединение. @@ -2729,6 +2730,7 @@ domainTooltip + 'Add the domain to the sip address(username@domain).' Tooltip to explain that this field is used to complete a result with this domain. Добавьте домен к SIP-адресу (sip:username@domain).<br>Значение по умолчанию: sip.linphone.org @@ -3661,7 +3663,7 @@ warningFeatures - 'Some features require a Linphone account, such as group messaging or ephemeral messaging.' : Warning text about features. + 'Some features require a %1 account, such as group messaging or ephemeral messaging.' : Warning text about features. %1 is the application name Для некоторых функций требуется аккаунт Linphone, например для группового обмена сообщениями или обмена недолговечными сообщениями. @@ -3689,7 +3691,7 @@ endCallStatus - "Ending call" : status of the call in waiting room when the call end. + "Call ended" : status of the call in waiting room when the call end. diff --git a/linphone-app/assets/languages/sv.ts b/linphone-app/assets/languages/sv.ts index f67766c17..f0e325110 100644 --- a/linphone-app/assets/languages/sv.ts +++ b/linphone-app/assets/languages/sv.ts @@ -2059,7 +2059,7 @@ Klicka här: <a href="%1">%1</a> newConferenceSendLinphoneInviteLabel - 'Send invite via Linphone' : Label for checkbox for sending invitations with Linphone. + 'Send invite via %1' : Label for checkbox for sending invitations with the application. %1 is the application name. @@ -2628,6 +2628,7 @@ Klicka här: <a href="%1">%1</a> useSalTooltip + 'The dns resolution is done by %1 using Sal. It will pass an IP to LDAP. By doing that, the TLS negociation could not check the hostname. You may deactivate the verifications if wanted to force the connection.' @@ -2716,6 +2717,7 @@ Klicka här: <a href="%1">%1</a> domainTooltip + 'Add the domain to the sip address(username@domain).' Tooltip to explain that this field is used to complete a result with this domain. @@ -3648,7 +3650,7 @@ Klicka här: <a href="%1">%1</a> warningFeatures - 'Some features require a Linphone account, such as group messaging or ephemeral messaging.' : Warning text about features. + 'Some features require a %1 account, such as group messaging or ephemeral messaging.' : Warning text about features. %1 is the application name @@ -3676,7 +3678,7 @@ Klicka här: <a href="%1">%1</a> endCallStatus - "Ending call" : status of the call in waiting room when the call end. + "Call ended" : status of the call in waiting room when the call end. diff --git a/linphone-app/assets/languages/tr.ts b/linphone-app/assets/languages/tr.ts index 70e628278..5e17d0170 100644 --- a/linphone-app/assets/languages/tr.ts +++ b/linphone-app/assets/languages/tr.ts @@ -2047,7 +2047,7 @@ Buraya tıklayın: <a href="%1">%1</a> newConferenceSendLinphoneInviteLabel - 'Send invite via Linphone' : Label for checkbox for sending invitations with Linphone. + 'Send invite via %1' : Label for checkbox for sending invitations with the application. %1 is the application name. @@ -2615,6 +2615,7 @@ Buraya tıklayın: <a href="%1">%1</a> useSalTooltip + 'The dns resolution is done by %1 using Sal. It will pass an IP to LDAP. By doing that, the TLS negociation could not check the hostname. You may deactivate the verifications if wanted to force the connection.' DNS çözümleme SAL kullanılarak Linphone tarafından yapılır. LDAP'a bir IP gönderir. Bunu yaparak, TLS uzlaşısı ana makine adını denetleyemez. Bağlantıyı dayatmak isteniyorsa doğrulamaları devre dışı bırakmanız gerekebilir. @@ -2703,6 +2704,7 @@ Buraya tıklayın: <a href="%1">%1</a> domainTooltip + 'Add the domain to the sip address(username@domain).' Tooltip to explain that this field is used to complete a result with this domain. SIP adresine etki alanı ekle (sip:kullanici@etkialanı).<br>Öntanımlı değer: sip.linphone.org @@ -3635,7 +3637,7 @@ Buraya tıklayın: <a href="%1">%1</a> warningFeatures - 'Some features require a Linphone account, such as group messaging or ephemeral messaging.' : Warning text about features. + 'Some features require a %1 account, such as group messaging or ephemeral messaging.' : Warning text about features. %1 is the application name Küme iletileri veya kısa ömürlü iletiler gibi bazı özellikler Linphone hesabı gerektirir. @@ -3663,7 +3665,7 @@ Buraya tıklayın: <a href="%1">%1</a> endCallStatus - "Ending call" : status of the call in waiting room when the call end. + "Call ended" : status of the call in waiting room when the call end. diff --git a/linphone-app/assets/languages/uk.ts b/linphone-app/assets/languages/uk.ts index f1672a6f6..aab92854e 100644 --- a/linphone-app/assets/languages/uk.ts +++ b/linphone-app/assets/languages/uk.ts @@ -2071,7 +2071,7 @@ newConferenceSendLinphoneInviteLabel - 'Send invite via Linphone' : Label for checkbox for sending invitations with Linphone. + 'Send invite via %1' : Label for checkbox for sending invitations with the application. %1 is the application name. @@ -2641,6 +2641,7 @@ useSalTooltip + 'The dns resolution is done by %1 using Sal. It will pass an IP to LDAP. By doing that, the TLS negociation could not check the hostname. You may deactivate the verifications if wanted to force the connection.' @@ -2729,6 +2730,7 @@ domainTooltip + 'Add the domain to the sip address(username@domain).' Tooltip to explain that this field is used to complete a result with this domain. @@ -3661,7 +3663,7 @@ warningFeatures - 'Some features require a Linphone account, such as group messaging or ephemeral messaging.' : Warning text about features. + 'Some features require a %1 account, such as group messaging or ephemeral messaging.' : Warning text about features. %1 is the application name @@ -3689,7 +3691,7 @@ endCallStatus - "Ending call" : status of the call in waiting room when the call end. + "Call ended" : status of the call in waiting room when the call end. diff --git a/linphone-app/assets/languages/zh_CN.ts b/linphone-app/assets/languages/zh_CN.ts index 7acc7faee..09ea53613 100644 --- a/linphone-app/assets/languages/zh_CN.ts +++ b/linphone-app/assets/languages/zh_CN.ts @@ -2047,7 +2047,7 @@ newConferenceSendLinphoneInviteLabel - 'Send invite via Linphone' : Label for checkbox for sending invitations with Linphone. + 'Send invite via %1' : Label for checkbox for sending invitations with the application. %1 is the application name. @@ -2615,6 +2615,7 @@ useSalTooltip + 'The dns resolution is done by %1 using Sal. It will pass an IP to LDAP. By doing that, the TLS negociation could not check the hostname. You may deactivate the verifications if wanted to force the connection.' DNS 解析已由 Linphone 使用 SAL 完成。 它会将 IP 传递给 LDAP。 通过这样做，TLS 协商无法检查主机名。 如果想强制连接，您可以停用验证。 @@ -2703,6 +2704,7 @@ domainTooltip + 'Add the domain to the sip address(username@domain).' Tooltip to explain that this field is used to complete a result with this domain. 添加域名到SIP地址（sip:username@domain）。<br>默认值是sip.linphone.org @@ -3635,7 +3637,7 @@ warningFeatures - 'Some features require a Linphone account, such as group messaging or ephemeral messaging.' : Warning text about features. + 'Some features require a %1 account, such as group messaging or ephemeral messaging.' : Warning text about features. %1 is the application name @@ -3663,7 +3665,7 @@ endCallStatus - "Ending call" : status of the call in waiting room when the call end. + "Call ended" : status of the call in waiting room when the call end. diff --git a/linphone-app/src/components/settings/AccountSettingsModel.cpp b/linphone-app/src/components/settings/AccountSettingsModel.cpp index fe117ed53..e0b73b2a0 100644 --- a/linphone-app/src/components/settings/AccountSettingsModel.cpp +++ b/linphone-app/src/components/settings/AccountSettingsModel.cpp @@ -506,10 +506,8 @@ QString AccountSettingsModel::getPrimarySipAddress () const { ); } -QString AccountSettingsModel::getPrimaryDomain() const{ - return Utils::coreStringToAppString( - CoreManager::getInstance()->getCore()->createPrimaryContactParsed()->getDomain() - ); +QString AccountSettingsModel::getDefaultAccountDomain() const{ + return Utils::coreStringToAppString(CoreManager::getInstance()->getCore()->getDefaultAccount()->getParams()->getDomain()); } // ----------------------------------------------------------------------------- diff --git a/linphone-app/src/components/settings/AccountSettingsModel.hpp b/linphone-app/src/components/settings/AccountSettingsModel.hpp index 277b52461..65ef2c1ec 100644 --- a/linphone-app/src/components/settings/AccountSettingsModel.hpp +++ b/linphone-app/src/components/settings/AccountSettingsModel.hpp @@ -47,7 +47,8 @@ class AccountSettingsModel : public QObject { Q_PROPERTY(QString primaryDisplayName READ getPrimaryDisplayName WRITE setPrimaryDisplayName NOTIFY primaryDisplayNameChanged) Q_PROPERTY(QString primaryUsername READ getPrimaryUsername WRITE setPrimaryUsername NOTIFY primaryUsernameChanged) Q_PROPERTY(QString primarySipAddress READ getPrimarySipAddress NOTIFY primarySipAddressChanged) - Q_PROPERTY(QString primaryDomain READ getPrimaryDomain NOTIFY primarySipAddressChanged) + + Q_PROPERTY(QString defaultAccountDomain READ getDefaultAccountDomain NOTIFY defaultAccountChanged) Q_PROPERTY(QVariantList accounts READ getAccounts NOTIFY accountsChanged) @@ -129,7 +130,8 @@ private: void setPrimaryDisplayName (const QString &displayName); QString getPrimarySipAddress () const; - QString getPrimaryDomain () const; + + QString getDefaultAccountDomain () const; // --------------------------------------------------------------------------- diff --git a/linphone-app/ui/views/App/Dialog/NewConference.qml b/linphone-app/ui/views/App/Dialog/NewConference.qml index d03a7c316..d58f8ea5b 100644 --- a/linphone-app/ui/views/App/Dialog/NewConference.qml +++ b/linphone-app/ui/views/App/Dialog/NewConference.qml @@ -431,8 +431,8 @@ DialogPlus { } CheckBoxText { id: inviteAppAccountCheckBox - //: 'Send invite via Linphone' : Label for checkbox for sending invitations with Linphone. - text: qsTr('newConferenceSendLinphoneInviteLabel') + //: 'Send invite via %1' : Label for checkbox for sending invitations with the application. %1 is the application name. + text: qsTr('newConferenceSendLinphoneInviteLabel').arg(applicationName) width: parent.width checked: true } diff --git a/linphone-app/ui/views/App/Main/Assistant/UseOtherSipAccount.qml b/linphone-app/ui/views/App/Main/Assistant/UseOtherSipAccount.qml index 227c5ae92..8266bb0b4 100644 --- a/linphone-app/ui/views/App/Main/Assistant/UseOtherSipAccount.qml +++ b/linphone-app/ui/views/App/Main/Assistant/UseOtherSipAccount.qml @@ -51,8 +51,8 @@ Item{ horizontalAlignment: Text.AlignLeft color: UseAppSipAccountStyle.warningBlock.color wrapMode: Text.WordWrap - //: 'Some features require a Linphone account, such as group messaging or ephemeral messaging.' : Warning text about features. - text: qsTr('warningFeatures') + //: 'Some features require a %1 account, such as group messaging or ephemeral messaging.' : Warning text about features. %1 is the application name + text: qsTr('warningFeatures').arg(applicationName) } Text{ elide: Text.ElideRight diff --git a/linphone-app/ui/views/App/Settings/Dialogs/SettingsLdapEdit.qml b/linphone-app/ui/views/App/Settings/Dialogs/SettingsLdapEdit.qml index eaefb5db9..4ed95282b 100644 --- a/linphone-app/ui/views/App/Settings/Dialogs/SettingsLdapEdit.qml +++ b/linphone-app/ui/views/App/Settings/Dialogs/SettingsLdapEdit.qml @@ -53,7 +53,7 @@ DialogPlus { id:displayName placeholderText : (serverUrl.text?serverUrl.text:serverUrl.placeholderText) text:ldapData.displayName - onTextChanged: ldapData.displayName = text + onTextChanged: Qt.callLater(function(){ldapData.displayName = text}) Keys.onEnterPressed: nextItemInFocusChain().forceActiveFocus() Keys.onReturnPressed: nextItemInFocusChain().forceActiveFocus() TooltipArea{ @@ -76,7 +76,7 @@ DialogPlus { id:serverUrl placeholderText :"Server" text:ldapData.server - onTextChanged: ldapData.server = text + onTextChanged: Qt.callLater(function(){ldapData.server = text}) Keys.onEnterPressed: nextItemInFocusChain().forceActiveFocus() Keys.onReturnPressed: nextItemInFocusChain().forceActiveFocus() error : ldapData.serverFieldError @@ -97,7 +97,7 @@ DialogPlus { placeholderText :"Bind DN" text:ldapData.bindDn error : ldapData.bindDnFieldError - onTextChanged: ldapData.bindDn= text + onTextChanged: Qt.callLater(function(){ldapData.bindDn= text}) TooltipArea{ text : qsTr('bindDNTooltip')//'The bind DN is the credential that is used to authenticate against an LDAP.\n eg: cn=ausername,ou=people,dc=bc,dc=com' //tooltipParent: dialog @@ -114,7 +114,7 @@ DialogPlus { id:password text:ldapData.password error : ldapData.passwordFieldError - onTextChanged: ldapData.password = text + onTextChanged: Qt.callLater(function(){ldapData.password = text}) placeholderText :"Password" } } @@ -148,7 +148,8 @@ DialogPlus { } TooltipArea{ tooltipParent:useRow - text : qsTr('useSalTooltip')//'The dns resolution is done by Linphone using Sal. It will pass an IP to LDAP. By doing that, the TLS negociation could not check the hostname. You may deactivate the verifications if wanted to force the connection.' + //: 'The dns resolution is done by %1 using Sal. It will pass an IP to LDAP. By doing that, the TLS negociation could not check the hostname. You may deactivate the verifications if wanted to force the connection.' + text : qsTr('useSalTooltip').arg(applicationName) } } } @@ -190,7 +191,7 @@ DialogPlus { placeholderText :qsTr('baseObjectPlaceholder')//"Base Object" text:ldapData.baseObject error : ldapData.baseObjectFieldError - onTextChanged: ldapData.baseObject = text + onTextChanged: Qt.callLater(function(){ldapData.baseObject = text}) TooltipArea{ text : qsTr('baseObjectTooltip')//'BaseObject is a specification for LDAP Search Scopes that specifies that the Search Request should only be performed against the entry specified as the search base DN.\n\nNo entries below it will be considered.' //tooltipParent: dialog @@ -209,7 +210,7 @@ DialogPlus { id:filter text:ldapData.filter error : ldapData.filterFieldError - onTextChanged: ldapData.filter = text + onTextChanged: Qt.callLater(function(){ldapData.filter = text}) placeholderText :"(sn=%s)" TooltipArea{ text : qsTr('filterTooltip')//'The search is base on this filter to search friends. Default value : (sn=%s)' @@ -230,7 +231,7 @@ DialogPlus { id:maxResults text:ldapData.maxResults error : ldapData.maxResultsFieldError - onTextChanged: ldapData.maxResults = text + onTextChanged: Qt.callLater(function(){ldapData.maxResults = text}) TooltipArea{ tooltipParent:connectionRow text : qsTr('maxResultsTooltip')//'The max results when requesting searches' @@ -243,7 +244,7 @@ DialogPlus { id:timeout text:ldapData.timeout error : ldapData.timeoutFieldError - onTextChanged: ldapData.timeout = text + onTextChanged: Qt.callLater(function(){ldapData.timeout = text}) TooltipArea{ tooltipParent:connectionRow text : qsTr('timeoutTooltip')//'The connection and search timeout in seconds. Default is 5' @@ -269,7 +270,7 @@ DialogPlus { placeholderText :'sn' text:ldapData.nameAttributes error : ldapData.nameAttributesFieldError - onTextChanged: ldapData.nameAttributes = text + onTextChanged: Qt.callLater(function(){ldapData.nameAttributes = text}) TooltipArea{ text : qsTr('nameAttributesTooltip')//'Check these attributes To build Name Friend, separated by a comma and the first is the highest priority. The default value is: sn' tooltipParent: nameAttributes @@ -285,7 +286,7 @@ DialogPlus { placeholderText :'mobile,telephoneNumber,homePhone,sn' text:ldapData.sipAttributes error : ldapData.sipAttributesFieldError - onTextChanged: ldapData.sipAttributes = text + onTextChanged: Qt.callLater(function(){ldapData.sipAttributes = text}) TooltipArea{ text : qsTr('sipAttributesTooltip')//'Check these attributes to build the SIP username in address of Friend. Attributes are separated by a comma and the first is the highest priority. The default value is: mobile,telephoneNumber,homePhone,sn' tooltipParent: sipAttributes @@ -298,12 +299,13 @@ DialogPlus { label: qsTr('domainLabel')//'Domain' TextField { id:domain - placeholderText : AccountSettingsModel.primaryDomain + placeholderText : AccountSettingsModel.defaultAccountDomain text:ldapData.sipDomain error : ldapData.sipDomainFieldError - onTextChanged: ldapData.sipDomain = text + onTextChanged: Qt.callLater(function(){ldapData.sipDomain = text}) TooltipArea{ - text : qsTr('domainTooltip')//'Add the domain to the sip address(username@domain). The default value is sip.linphone.org' + //: 'Add the domain to the sip address(username@domain).' Tooltip to explain that this field is used to complete a result with this domain. + text : qsTr('domainTooltip')// //tooltipParent: dialog } } @@ -332,7 +334,8 @@ DialogPlus { } TooltipArea{ tooltipParent:miscLine - text : qsTr('debugTooltip')//'Get verbose logs in Linphone log file when doing transactions (useful to debug TLS connections)' + //:'Get verbose logs in log file when doing transactions (useful to debug TLS connections)' + text : qsTr('debugTooltip') } } } diff --git a/linphone-app/ui/views/App/Settings/SettingsAdvanced.js b/linphone-app/ui/views/App/Settings/SettingsAdvanced.js index 280babe5b..dc65fc99b 100644 --- a/linphone-app/ui/views/App/Settings/SettingsAdvanced.js +++ b/linphone-app/ui/views/App/Settings/SettingsAdvanced.js @@ -48,7 +48,7 @@ function handleLogsUploaded (url) { if(Qt.openUrlExternally( 'mailto:' + encodeURIComponent(Linphone.SettingsModel.logsEmail) + - '?subject=' + encodeURIComponent('Desktop Linphone Log') + + '?subject=' + encodeURIComponent( ('Desktop %1 Log').arg(applicationName)) + '&body=' + encodeURIComponent(url) )) sendLogsBlock.stop(qsTr('logsMailerSuccess').replace('%1', url))