From d392fadb6da564a70161ef36b80472be4c1cc737 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 18 Jul 2018 17:20:23 +0200 Subject: [PATCH] chore(assets/languages): remove linphone word of traductions, use app name instead --- assets/languages/ar.ts | 2 +- assets/languages/az.ts | 2 +- assets/languages/az@latin.ts | 2 +- assets/languages/cs.ts | 2 +- assets/languages/de.ts | 38 ++++++++-------- assets/languages/de_DE.ts | 2 +- assets/languages/el.ts | 6 +-- assets/languages/en.ts | 42 +++++++++--------- assets/languages/es.ts | 16 +++---- assets/languages/es_AR.ts | 2 +- assets/languages/fi.ts | 2 +- assets/languages/fr.ts | 2 +- assets/languages/fr_FR.ts | 42 +++++++++--------- assets/languages/he.ts | 2 +- assets/languages/hu.ts | 2 +- assets/languages/it.ts | 8 ++-- assets/languages/ja.ts | 30 ++++++------- assets/languages/ka.ts | 2 +- assets/languages/ko_KR.ts | 2 +- assets/languages/lt.ts | 34 +++++++------- assets/languages/mk_MK.ts | 2 +- assets/languages/nb_NO.ts | 2 +- assets/languages/nl.ts | 2 +- assets/languages/pl.ts | 2 +- assets/languages/pl_PL.ts | 2 +- assets/languages/pt_BR.ts | 44 +++++++++---------- assets/languages/ru.ts | 42 +++++++++--------- assets/languages/ru_RU.ts | 2 +- assets/languages/sr.ts | 2 +- assets/languages/sv.ts | 42 +++++++++--------- assets/languages/tr.ts | 42 +++++++++--------- assets/languages/uk.ts | 2 +- assets/languages/zh-Hant.ts | 2 +- assets/languages/zh.ts | 2 +- assets/languages/zh_CN.GB2312.ts | 2 +- assets/languages/zh_CN.ts | 2 +- assets/languages/zh_TW.ts | 2 +- src/app/App.cpp | 6 +-- src/app/cli/Cli.cpp | 8 ++-- .../ActivateLinphoneSipAccountWithEmail.qml | 2 +- ...ivateLinphoneSipAccountWithPhoneNumber.qml | 2 +- ui/views/App/Main/Assistant/AssistantHome.qml | 2 +- .../Assistant/CreateLinphoneSipAccount.qml | 2 +- .../CreateLinphoneSipAccountWithEmail.qml | 2 +- ...reateLinphoneSipAccountWithPhoneNumber.qml | 2 +- .../Main/Assistant/UseLinphoneSipAccount.qml | 4 +- ui/views/App/Main/Home.qml | 4 +- ui/views/App/Main/InviteFriends.qml | 10 +++-- 48 files changed, 242 insertions(+), 238 deletions(-) diff --git a/assets/languages/ar.ts b/assets/languages/ar.ts index 043809402..af1fe9a37 100644 --- a/assets/languages/ar.ts +++ b/assets/languages/ar.ts @@ -1718,4 +1718,4 @@ - \ No newline at end of file + diff --git a/assets/languages/az.ts b/assets/languages/az.ts index 2ce9b84cf..93e4c3b66 100644 --- a/assets/languages/az.ts +++ b/assets/languages/az.ts @@ -1718,4 +1718,4 @@ - \ No newline at end of file + diff --git a/assets/languages/az@latin.ts b/assets/languages/az@latin.ts index 59d82c49e..d324707cf 100644 --- a/assets/languages/az@latin.ts +++ b/assets/languages/az@latin.ts @@ -1718,4 +1718,4 @@ - \ No newline at end of file + diff --git a/assets/languages/cs.ts b/assets/languages/cs.ts index dd2a2c271..ea738f6f5 100644 --- a/assets/languages/cs.ts +++ b/assets/languages/cs.ts @@ -1718,4 +1718,4 @@ - \ No newline at end of file + diff --git a/assets/languages/de.ts b/assets/languages/de.ts index 405893e0e..86fc73291 100644 --- a/assets/languages/de.ts +++ b/assets/languages/de.ts @@ -12,7 +12,7 @@ ActivateLinphoneSipAccountWithEmail activateLinphoneSipAccount - AKTIVIEREN SIE IHR LINPHONE-KONTO + AKTIVIEREN SIE IHR %1-KONTO confirmAction @@ -27,7 +27,7 @@ ActivateLinphoneSipAccountWithPhoneNumber activateLinphoneSipAccount - AKTIVIEREN SIE IHR LINPHONE-KONTO + AKTIVIEREN SIE IHR %1-KONTO confirmAction @@ -70,7 +70,7 @@ commandLineOptionCliHelp - zeigt das Hilfe-Menü zur Kommandozeilen-Schnittstelle von Linphone + zeigt das Hilfe-Menü zur Kommandozeilen-Schnittstelle von %1 commandLineDescription @@ -104,7 +104,7 @@ AssistantHome useLinphoneSipAccount - LINPHONE-KONTO VERWENDEN + %1-KONTO VERWENDEN useOtherSipAccount @@ -120,11 +120,11 @@ homeDescription - Der Assistent hilft Ihnen das Linphone Konto zu konfigurieren und zu nutzen + Der Assistent hilft Ihnen das %1 Konto zu konfigurieren und zu nutzen createLinphoneSipAccount - LINPHONE-KONTO ERSTELLEN + %1-KONTO ERSTELLEN @@ -435,15 +435,15 @@ Server URL ist nicht konfiguriert. Cli linphoneCliDescription - Methode um die Linphone Anwendung per Kommandozeile zu steuern. + Methode um die %1 Anwendung per Kommandozeile zu steuern. uriCommandLineSyntax - linphone sip:<sip-address>?method=<method>([&<argument>=<base64-value>]*) + %1 sip:<sip-address>?method=<method>([&<argument>=<base64-value>]*) cliCommandLineSyntax - Linphone "<method> ([<argument>=<value>]*)" + %1 "<method> ([<argument>=<value>]*)" commandsName @@ -662,7 +662,7 @@ Server URL ist nicht konfiguriert. createLinphoneSipAccountTitle - ERSTELLE EIN LINPHONE KONTO + ERSTELLE EIN %1 KONTO withPhoneNumber @@ -677,7 +677,7 @@ Server URL ist nicht konfiguriert. CreateLinphoneSipAccountWithEmail createLinphoneSipAccountTitle - LINPHONE-KONTO ERSTELLEN + %1-KONTO ERSTELLEN confirmAction @@ -716,7 +716,7 @@ Server URL ist nicht konfiguriert. CreateLinphoneSipAccountWithPhoneNumber createLinphoneSipAccountTitle - LINPHONE-KONTO ERSTELLEN + %1-KONTO ERSTELLEN countryLabel @@ -820,11 +820,11 @@ Server URL ist nicht konfiguriert. howToTitle - WIE MAN LINPHONE NUTZT + WIE MAN %1 NUTZT inviteDescription - Laden Sie Ihre Freunde bei Linphone ein. + Laden Sie Ihre Freunde bei %1 ein. inviteTitle @@ -832,7 +832,7 @@ Server URL ist nicht konfiguriert. accountAssistantDescription - Erstellen oder verwalten Sie ihr Linphone Konto. + Erstellen oder verwalten Sie ihr %1 Konto. accountAssistantTitle @@ -921,11 +921,11 @@ Server URL ist nicht konfiguriert. defaultMessage - %1 möchte Sie bei Linphone einladen ! + %1 möchte Sie bei %2 einladen ! defaultSubject - Linphone-Einladung + %1-Einladung forcedMessage @@ -1010,7 +1010,7 @@ Klicken Sie hier: <a href="%1">%1</a> Notifier newVersionAvailable - Eine neue Version (%1) von Linphone ist verfügbar! + Eine neue Version (%1) ist verfügbar! newFileMessage @@ -1662,7 +1662,7 @@ Klicken Sie hier: <a href="%1">%1</a> useLinphoneSipAccountTitle - LINPHONE-KONTO VERWENDEN + %1-KONTO VERWENDEN useUsernameToLogin diff --git a/assets/languages/de_DE.ts b/assets/languages/de_DE.ts index ecd9cb00c..83e0cf6c4 100644 --- a/assets/languages/de_DE.ts +++ b/assets/languages/de_DE.ts @@ -1718,4 +1718,4 @@ - \ No newline at end of file + diff --git a/assets/languages/el.ts b/assets/languages/el.ts index 6fcde2fca..2f59e1b9a 100644 --- a/assets/languages/el.ts +++ b/assets/languages/el.ts @@ -10,7 +10,7 @@ ActivateLinphoneSipAccountWithEmail activateLinphoneSipAccount - ΕΝΕΡΓΟΠΟΙΗΣΤΕ ΤΟΝ LINPHONE ΛΟΓΑΡΙΑΣΜΟ ΣΑΣ + ΕΝΕΡΓΟΠΟΙΗΣΤΕ ΤΟΝ %1 ΛΟΓΑΡΙΑΣΜΟ ΣΑΣ confirmAction @@ -25,7 +25,7 @@ ActivateLinphoneSipAccountWithPhoneNumber activateLinphoneSipAccount - ΕΝΕΡΓΟΠΟΙΗΣΤΕ ΤΟΝ LINPHONE ΛΟΓΑΡΙΑΣΜΟ ΣΑΣ + ΕΝΕΡΓΟΠΟΙΗΣΤΕ ΤΟΝ %1 ΛΟΓΑΡΙΑΣΜΟ ΣΑΣ confirmAction @@ -1718,4 +1718,4 @@ - \ No newline at end of file + diff --git a/assets/languages/en.ts b/assets/languages/en.ts index 31d7a4eae..6ce85c01f 100644 --- a/assets/languages/en.ts +++ b/assets/languages/en.ts @@ -12,7 +12,7 @@ ActivateLinphoneSipAccountWithEmail activateLinphoneSipAccount - ACTIVATE YOUR LINPHONE ACCOUNT + ACTIVATE YOUR %1 ACCOUNT confirmAction @@ -27,7 +27,7 @@ ActivateLinphoneSipAccountWithPhoneNumber activateLinphoneSipAccount - ACTIVATE YOUR LINPHONE ACCOUNT + ACTIVATE YOUR %1 ACCOUNT confirmAction @@ -46,7 +46,7 @@ commandLineOptionConfig - specify the linphone configuration file to be used + specify the %1 configuration file to be used applicationDescription @@ -70,7 +70,7 @@ commandLineOptionCliHelp - displays the help menu to use Linphone with the CLI + displays the help menu to use %1 with the CLI commandLineDescription @@ -104,7 +104,7 @@ AssistantHome useLinphoneSipAccount - USE A LINPHONE ACCOUNT + USE A %1 ACCOUNT useOtherSipAccount @@ -120,11 +120,11 @@ homeDescription - This assistant will help you configure and use your linphone account. + This assistant will help you configure and use your sip account. createLinphoneSipAccount - CREATE A LINPHONE ACCOUNT + CREATE A %1 ACCOUNT @@ -435,15 +435,15 @@ Server url not configured. Cli linphoneCliDescription - Way to control the Linphone application through command lines. + Way to control the %1 application through command lines. uriCommandLineSyntax - linphone sip:<sip-address>?method=<method>([&<argument>=<base64-value>]*) + %1 sip:<sip-address>?method=<method>([&<argument>=<base64-value>]*) cliCommandLineSyntax - linphone "<method> ([<argument>=<value>]*)" + %1 "<method> ([<argument>=<value>]*)" commandsName @@ -662,7 +662,7 @@ Server url not configured. createLinphoneSipAccountTitle - CREATE A LINPHONE ACCOUNT + CREATE A %1 ACCOUNT withPhoneNumber @@ -677,7 +677,7 @@ Server url not configured. CreateLinphoneSipAccountWithEmail createLinphoneSipAccountTitle - CREATE A LINPHONE ACCOUNT + CREATE A %1 ACCOUNT confirmAction @@ -716,7 +716,7 @@ Server url not configured. CreateLinphoneSipAccountWithPhoneNumber createLinphoneSipAccountTitle - CREATE A LINPHONE ACCOUNT + CREATE A %1 ACCOUNT countryLabel @@ -816,15 +816,15 @@ Server url not configured. Home howToDescription - Need help on how to use Linphone? + Need help on how to use %1? howToTitle - HOW TO USE LINPHONE + HOW TO USE %1 inviteDescription - Invite your friends on Linphone. + Invite your friends on %1. inviteTitle @@ -832,7 +832,7 @@ Server url not configured. accountAssistantDescription - Create or manage your Linphone account. + Create or manage your %1 account. accountAssistantTitle @@ -921,11 +921,11 @@ Server url not configured. defaultMessage - %1 wants to invite you on Linphone ! + %1 wants to invite you on %2! defaultSubject - Linphone invitation + %1 invitation forcedMessage @@ -1012,7 +1012,7 @@ your friend's SIP address or username. Notifier newVersionAvailable - A new version (%1) of Linphone is available! + A new version (%1) is available! newFileMessage @@ -1664,7 +1664,7 @@ your friend's SIP address or username. useLinphoneSipAccountTitle - USE A LINPHONE ACCOUNT + USE A %1 ACCOUNT useUsernameToLogin diff --git a/assets/languages/es.ts b/assets/languages/es.ts index 601f240c8..20df707a7 100644 --- a/assets/languages/es.ts +++ b/assets/languages/es.ts @@ -10,7 +10,7 @@ ActivateLinphoneSipAccountWithEmail activateLinphoneSipAccount - Activa tu cuenta Linphone + Activa tu cuenta %1 confirmAction @@ -25,7 +25,7 @@ ActivateLinphoneSipAccountWithPhoneNumber activateLinphoneSipAccount - Activa tu cuenta Linphone + Activa tu cuenta %1 confirmAction @@ -44,7 +44,7 @@ commandLineOptionConfig - Especificar el fichero de configuración de linphone para ser usado + Especificar el fichero de configuración de %1 para ser usado applicationDescription @@ -68,7 +68,7 @@ commandLineOptionCliHelp - mostrar el menú de ayuda para usar Linphone desde la línea de comandos + mostrar el menú de ayuda para usar %1 desde la línea de comandos commandLineDescription @@ -86,7 +86,7 @@ AssistantHome useLinphoneSipAccount - USAR UNA CUENTA DE LINPHONE + USAR UNA CUENTA DE %1 useOtherSipAccount @@ -102,11 +102,11 @@ homeDescription - Este asistente le ayudará a configurar y usar su cuenta linphone. + Este asistente le ayudará a configurar y usar su cuenta %1. createLinphoneSipAccount - CREAR UNA CUENTA LINPHONE + CREAR UNA CUENTA %1 @@ -1718,4 +1718,4 @@ - \ No newline at end of file + diff --git a/assets/languages/es_AR.ts b/assets/languages/es_AR.ts index 452fea709..56f55010b 100644 --- a/assets/languages/es_AR.ts +++ b/assets/languages/es_AR.ts @@ -1718,4 +1718,4 @@ - \ No newline at end of file + diff --git a/assets/languages/fi.ts b/assets/languages/fi.ts index 13f2726fe..ab344f9bb 100644 --- a/assets/languages/fi.ts +++ b/assets/languages/fi.ts @@ -1718,4 +1718,4 @@ - \ No newline at end of file + diff --git a/assets/languages/fr.ts b/assets/languages/fr.ts index 96c00121f..d4b555eda 100644 --- a/assets/languages/fr.ts +++ b/assets/languages/fr.ts @@ -1718,4 +1718,4 @@ - \ No newline at end of file + diff --git a/assets/languages/fr_FR.ts b/assets/languages/fr_FR.ts index a99af9805..f8b50e224 100644 --- a/assets/languages/fr_FR.ts +++ b/assets/languages/fr_FR.ts @@ -12,7 +12,7 @@ ActivateLinphoneSipAccountWithEmail activateLinphoneSipAccount - ACTIVER VOTRE COMPTE LINPHONE + ACTIVER VOTRE COMPTE %1 confirmAction @@ -27,7 +27,7 @@ ActivateLinphoneSipAccountWithPhoneNumber activateLinphoneSipAccount - ACTIVER VOTRE COMPTE LINPHONE + ACTIVER VOTRE COMPTE %1 confirmAction @@ -70,11 +70,11 @@ commandLineOptionCliHelp - affiche le menu d'aide pour l'utilisation de Linphone en CLI + affiche le menu d'aide pour l'utilisation de %1 en CLI commandLineDescription - envoie un ordre à l'application Linphone, voir --cli-help pour plus de détails + envoie un ordre à l'application %1, voir --cli-help pour plus de détails settings @@ -104,7 +104,7 @@ AssistantHome useLinphoneSipAccount - UTILISER UN COMPTE LINPHONE + UTILISER UN COMPTE %1 useOtherSipAccount @@ -124,7 +124,7 @@ createLinphoneSipAccount - CRÉER UN COMPTE LINPHONE + CRÉER UN COMPTE %1 @@ -435,15 +435,15 @@ Url du serveur non configurée. Cli linphoneCliDescription - Moyen d'effectuer des actions sur l'application Linphone en ligne de commande. + Moyen d'effectuer des actions sur l'application %1 en ligne de commande. uriCommandLineSyntax - linphone sip:<sip-address>?method=<method>([&<argument>=<valeur-en-base64>]*) + %1 sip:<sip-address>?method=<method>([&<argument>=<valeur-en-base64>]*) cliCommandLineSyntax - linphone "<method> ([<argument>=<valeur>]*)" + %1 "<method> ([<argument>=<valeur>]*)" commandsName @@ -662,7 +662,7 @@ Url du serveur non configurée. createLinphoneSipAccountTitle - CRÉER UN COMPTE LINPHONE + CRÉER UN COMPTE %1 withPhoneNumber @@ -677,7 +677,7 @@ Url du serveur non configurée. CreateLinphoneSipAccountWithEmail createLinphoneSipAccountTitle - CRÉER UN COMPTE LINPHONE + CRÉER UN COMPTE %1 confirmAction @@ -716,7 +716,7 @@ Url du serveur non configurée. CreateLinphoneSipAccountWithPhoneNumber createLinphoneSipAccountTitle - CRÉER UN COMPTE LINPHONE + CRÉER UN COMPTE %1 countryLabel @@ -816,15 +816,15 @@ Url du serveur non configurée. Home howToDescription - Besoin d'aide sur l'utilisation de Linphone ? + Besoin d'aide sur l'utilisation de %1 ? howToTitle - COMMENT UTILISER LINPHONE + COMMENT UTILISER %1 inviteDescription - Inviter vos amis à utiliser Linphone. + Inviter vos amis à utiliser %1. inviteTitle @@ -832,7 +832,7 @@ Url du serveur non configurée. accountAssistantDescription - Créer ou gérer votre compte Linphone. + Créer ou gérer votre compte %1. accountAssistantTitle @@ -921,15 +921,15 @@ Url du serveur non configurée. defaultMessage - %1 souhaite vous inviter sur Linphone ! + %1 souhaite vous inviter sur %2 ! defaultSubject - Invitation Linphone + Invitation %1 forcedMessage - Téléchargez l’application sur votre ordinateur et appelez vos amis ou envoyez-leur un message sur Linphone gratuitement. + Téléchargez l’application sur votre ordinateur et appelez vos amis ou envoyez-leur un message gratuitement. Cliquez ici : <a href="%1">%1</a> @@ -1010,7 +1010,7 @@ Cliquez ici : <a href="%1">%1</a> Notifier newVersionAvailable - Une nouvelle version (%1) de Linphone est disponible ! + Une nouvelle version (%1) est disponible ! newFileMessage @@ -1662,7 +1662,7 @@ Cliquez ici : <a href="%1">%1</a> useLinphoneSipAccountTitle - UTILISER UN COMPTE LINPHONE + UTILISER UN COMPTE %1 useUsernameToLogin diff --git a/assets/languages/he.ts b/assets/languages/he.ts index 35552a7db..16aef5437 100644 --- a/assets/languages/he.ts +++ b/assets/languages/he.ts @@ -1718,4 +1718,4 @@ - \ No newline at end of file + diff --git a/assets/languages/hu.ts b/assets/languages/hu.ts index 948c026a7..9c9318769 100644 --- a/assets/languages/hu.ts +++ b/assets/languages/hu.ts @@ -1718,4 +1718,4 @@ - \ No newline at end of file + diff --git a/assets/languages/it.ts b/assets/languages/it.ts index ec0dd63d6..8102f7a94 100644 --- a/assets/languages/it.ts +++ b/assets/languages/it.ts @@ -10,7 +10,7 @@ ActivateLinphoneSipAccountWithEmail activateLinphoneSipAccount - ATTIVA IL TUO ACCOUNT LINPHONE + ATTIVA IL TUO ACCOUNT %1 confirmAction @@ -25,7 +25,7 @@ ActivateLinphoneSipAccountWithPhoneNumber activateLinphoneSipAccount - ATTIVA IL TUO ACCOUNT LINPHONE + ATTIVA IL TUO ACCOUNT %1 confirmAction @@ -44,7 +44,7 @@ commandLineOptionConfig - specifica il file di configurazione di linphone da utilizzare + specifica il file di configurazione di %1 da utilizzare applicationDescription @@ -1718,4 +1718,4 @@ - \ No newline at end of file + diff --git a/assets/languages/ja.ts b/assets/languages/ja.ts index 80287cbc4..6186949d8 100644 --- a/assets/languages/ja.ts +++ b/assets/languages/ja.ts @@ -12,7 +12,7 @@ ActivateLinphoneSipAccountWithEmail activateLinphoneSipAccount - LINPHONEアカウントを有効にする + %1アカウントを有効にする confirmAction @@ -27,7 +27,7 @@ ActivateLinphoneSipAccountWithPhoneNumber activateLinphoneSipAccount - LINPHONEアカウントを有効にする + %1アカウントを有効にする confirmAction @@ -104,7 +104,7 @@ AssistantHome useLinphoneSipAccount - LINPHONEアカウントを使用する + %1アカウントを使用する useOtherSipAccount @@ -120,11 +120,11 @@ homeDescription - このアシスタントはあなたのLINPHONEアカウントの設定を助けます。 + このアシスタントはあなたの%1アカウントの設定を助けます。 createLinphoneSipAccount - LINPHONEアカウントを作成する + %1アカウントを作成する @@ -662,7 +662,7 @@ createLinphoneSipAccountTitle - LINPHONEアカウントを作成する + %1アカウントを作成する withPhoneNumber @@ -677,7 +677,7 @@ CreateLinphoneSipAccountWithEmail createLinphoneSipAccountTitle - LINPHONEアカウントを作成 + %1アカウントを作成 confirmAction @@ -716,7 +716,7 @@ CreateLinphoneSipAccountWithPhoneNumber createLinphoneSipAccountTitle - LINPHONEアカウントを作成する + %1アカウントを作成する countryLabel @@ -816,7 +816,7 @@ Home howToDescription - Linphoneの使い方にヘルプが必要ですか？ + %1の使い方にヘルプが必要ですか？ howToTitle @@ -824,7 +824,7 @@ inviteDescription - あなたの友達にLINPHONEを紹介 + あなたの友達に%1を紹介 inviteTitle @@ -832,7 +832,7 @@ accountAssistantDescription - LINPHONEアカウントを作成/管理する + %1アカウントを作成/管理する accountAssistantTitle @@ -921,11 +921,11 @@ defaultMessage - %1 があなたをLinphoneに招待しています。 + %1 があなたを%2に招待しています。 defaultSubject - LINPHONEへの招待 + %1への招待 forcedMessage @@ -1007,7 +1007,7 @@ Notifier newVersionAvailable - 新しいバージョン(%1)のLINPHONEが利用出来ます。 + newFileMessage @@ -1659,7 +1659,7 @@ useLinphoneSipAccountTitle - LINPHONEアカウントを使用する + %1アカウントを使用する useUsernameToLogin diff --git a/assets/languages/ka.ts b/assets/languages/ka.ts index fe367ef5e..73ce01f0a 100644 --- a/assets/languages/ka.ts +++ b/assets/languages/ka.ts @@ -1718,4 +1718,4 @@ - \ No newline at end of file + diff --git a/assets/languages/ko_KR.ts b/assets/languages/ko_KR.ts index e7fcc0a92..c757d33db 100644 --- a/assets/languages/ko_KR.ts +++ b/assets/languages/ko_KR.ts @@ -1718,4 +1718,4 @@ - \ No newline at end of file + diff --git a/assets/languages/lt.ts b/assets/languages/lt.ts index e6131977d..d43960f41 100644 --- a/assets/languages/lt.ts +++ b/assets/languages/lt.ts @@ -46,7 +46,7 @@ commandLineOptionConfig - nurodyti norimą naudoti linphone konfigūracijos failą + nurodyti norimą naudoti %1 konfigūracijos failą applicationDescription @@ -70,7 +70,7 @@ commandLineOptionCliHelp - rodo pagalbos meniu, skirtą naudoti Linphone su komandų eilute + rodo pagalbos meniu, skirtą naudoti %1 su komandų eilute commandLineDescription @@ -104,7 +104,7 @@ AssistantHome useLinphoneSipAccount - NAUDOTI LINPHONE PASKYRĄ + NAUDOTI %1 PASKYRĄ useOtherSipAccount @@ -120,11 +120,11 @@ homeDescription - Šis pagelbiklis padės jums sukonfigūruoti ir naudoti savo linphone paskyrą. + Šis pagelbiklis padės jums sukonfigūruoti ir naudoti savo %1 paskyrą. createLinphoneSipAccount - SUSIKURTI LINPHONE PASKYRĄ + SUSIKURTI %1 PASKYRĄ @@ -435,7 +435,7 @@ Nesukonfigūruotas serverio url. Cli linphoneCliDescription - Būdai valdyti Linphone programą per komandų eilutę. + Būdai valdyti %1 programą per komandų eilutę. uriCommandLineSyntax @@ -443,7 +443,7 @@ Nesukonfigūruotas serverio url. cliCommandLineSyntax - linphone "<method> ([<argument>=<value>]*)" + %1 "<method> ([<argument>=<value>]*)" commandsName @@ -662,7 +662,7 @@ Nesukonfigūruotas serverio url. createLinphoneSipAccountTitle - SUSIKURTI LINPHONE PASKYRĄ + SUSIKURTI %1 PASKYRĄ withPhoneNumber @@ -677,7 +677,7 @@ Nesukonfigūruotas serverio url. CreateLinphoneSipAccountWithEmail createLinphoneSipAccountTitle - SUSIKURTI LINPHONE PASKYRĄ + SUSIKURTI %1 PASKYRĄ confirmAction @@ -716,7 +716,7 @@ Nesukonfigūruotas serverio url. CreateLinphoneSipAccountWithPhoneNumber createLinphoneSipAccountTitle - SUSIKURTI LINPHONE PASKYRĄ + SUSIKURTI %1 PASKYRĄ countryLabel @@ -816,15 +816,15 @@ Nesukonfigūruotas serverio url. Home howToDescription - Reikia pagalbos kaip naudotis Linphone? + Reikia pagalbos kaip naudotis %1? howToTitle - KAIP NAUDOTIS LINPHONE + KAIP NAUDOTIS %1 inviteDescription - Pakvieskite savo draugus į Linphone. + Pakvieskite savo draugus į %1. inviteTitle @@ -832,7 +832,7 @@ Nesukonfigūruotas serverio url. accountAssistantDescription - Susikurkite ar tvarkykite savo Linphone paskyrą. + Susikurkite ar tvarkykite savo %1 paskyrą. accountAssistantTitle @@ -921,11 +921,11 @@ Nesukonfigūruotas serverio url. defaultMessage - %1 nori pakviesti jus į Linphone! + %1 nori pakviesti jus į %2! defaultSubject - Linphone pakvietimas + %1 pakvietimas forcedMessage @@ -1012,7 +1012,7 @@ Tiesiog, įveskite savo draugo SIP adresą ar naudotojo vardą. Notifier newVersionAvailable - Yra prieinama nauja Linphone versija (%1)! + newFileMessage diff --git a/assets/languages/mk_MK.ts b/assets/languages/mk_MK.ts index ef11ae2f6..bb4a53cc9 100644 --- a/assets/languages/mk_MK.ts +++ b/assets/languages/mk_MK.ts @@ -1718,4 +1718,4 @@ - \ No newline at end of file + diff --git a/assets/languages/nb_NO.ts b/assets/languages/nb_NO.ts index d3c41e5b3..ad1c7791c 100644 --- a/assets/languages/nb_NO.ts +++ b/assets/languages/nb_NO.ts @@ -1718,4 +1718,4 @@ - \ No newline at end of file + diff --git a/assets/languages/nl.ts b/assets/languages/nl.ts index 39f4f7fdc..364570471 100644 --- a/assets/languages/nl.ts +++ b/assets/languages/nl.ts @@ -1718,4 +1718,4 @@ - \ No newline at end of file + diff --git a/assets/languages/pl.ts b/assets/languages/pl.ts index 00ec0fbac..67003511e 100644 --- a/assets/languages/pl.ts +++ b/assets/languages/pl.ts @@ -1718,4 +1718,4 @@ - \ No newline at end of file + diff --git a/assets/languages/pl_PL.ts b/assets/languages/pl_PL.ts index 321de0fdf..91b2d0fc0 100644 --- a/assets/languages/pl_PL.ts +++ b/assets/languages/pl_PL.ts @@ -1718,4 +1718,4 @@ - \ No newline at end of file + diff --git a/assets/languages/pt_BR.ts b/assets/languages/pt_BR.ts index fccfe3bf3..d0e4ab335 100644 --- a/assets/languages/pt_BR.ts +++ b/assets/languages/pt_BR.ts @@ -12,7 +12,7 @@ ActivateLinphoneSipAccountWithEmail activateLinphoneSipAccount - ATIVE SUA CONTA LINPHONE + ATIVE SUA CONTA %1 confirmAction @@ -27,7 +27,7 @@ ActivateLinphoneSipAccountWithPhoneNumber activateLinphoneSipAccount - ATIVAR SUA CONTA LINPHONE + ATIVAR SUA CONTA %1 confirmAction @@ -46,7 +46,7 @@ commandLineOptionConfig - especifique o arquivo de configuração do linphone a ser usado + especifique o arquivo de configuração do %1 a ser usado applicationDescription @@ -70,7 +70,7 @@ commandLineOptionCliHelp - exibe o menu de ajuda para usar o Linphone com o CLI + exibe o menu de ajuda para usar o %1 com o CLI commandLineDescription @@ -104,7 +104,7 @@ AssistantHome useLinphoneSipAccount - USE UMA CONTA LINPHONE + USE UMA CONTA %1 useOtherSipAccount @@ -120,11 +120,11 @@ homeDescription - Este assistente ajudará você a configurar e usar sua conta do linphone. + Este assistente ajudará você a configurar e usar sua conta do %1. createLinphoneSipAccount - CRIAR UMA CONTA LINPHONE + CRIAR UMA CONTA %1 @@ -435,15 +435,15 @@ URL do servidor não configurado. Cli linphoneCliDescription - Maneira de controlar o aplicativo Linphone através de linhas de comando. + Maneira de controlar o aplicativo %1 através de linhas de comando. uriCommandLineSyntax - linphone sip:<sip-address>?metodo=<method>([&<argument>=<base64-value>]*) + %1 sip:<sip-address>?metodo=<method>([&<argument>=<base64-value>]*) cliCommandLineSyntax - linphone "<method> ([<argument>=<value>]*)" + %1 "<method> ([<argument>=<value>]*)" commandsName @@ -662,7 +662,7 @@ URL do servidor não configurado. createLinphoneSipAccountTitle - CRIAR UMA CONTA LINPHONE + CRIAR UMA CONTA %1 withPhoneNumber @@ -677,7 +677,7 @@ URL do servidor não configurado. CreateLinphoneSipAccountWithEmail createLinphoneSipAccountTitle - CRIAR UMA CONTA LINPHONE + CRIAR UMA CONTA %1 confirmAction @@ -716,7 +716,7 @@ URL do servidor não configurado. CreateLinphoneSipAccountWithPhoneNumber createLinphoneSipAccountTitle - CRIAR UMA CONTA LINPHONE + CRIAR UMA CONTA %1 countryLabel @@ -816,15 +816,15 @@ URL do servidor não configurado. Home howToDescription - Precisa de ajuda sobre como usar o Linphone? + Precisa de ajuda sobre como usar o %1? howToTitle - COMO USAR O LINPHONE + COMO USAR O %1 inviteDescription - Convide seus amigos para usar Linphone. + Convide seus amigos para usar %1. inviteTitle @@ -832,7 +832,7 @@ URL do servidor não configurado. accountAssistantDescription - Crie ou gerencie sua conta do Linphone. + Crie ou gerencie sua conta do %1. accountAssistantTitle @@ -921,15 +921,15 @@ URL do servidor não configurado. defaultMessage - %1 quer convidar você no Linphone! + %1 quer convidar você no %2! defaultSubject - Convite Linphone + Convite %1 forcedMessage - Baixe o aplicativo em seu computador e comece a ligar e conversar com os usuários do Linphone gratuitamente. + Baixe o aplicativo em seu computador e comece a ligar e conversar com os usuários do %1 gratuitamente. Click aqui: <a href="%1">%1</a> @@ -1012,7 +1012,7 @@ o endereço SIP ou nome de usuário do seu amigo. Notifier newVersionAvailable - Uma nova versão (%1) do Linphone está disponível! + newFileMessage @@ -1664,7 +1664,7 @@ o endereço SIP ou nome de usuário do seu amigo. useLinphoneSipAccountTitle - USAR UMA CONTA LINPHONE + USAR UMA CONTA %1 useUsernameToLogin diff --git a/assets/languages/ru.ts b/assets/languages/ru.ts index 5b2560f6b..0052d7b05 100644 --- a/assets/languages/ru.ts +++ b/assets/languages/ru.ts @@ -12,7 +12,7 @@ ActivateLinphoneSipAccountWithEmail activateLinphoneSipAccount - АКТИВИРУЙТЕ ВАШ АККАУНТ LINPHONE + АКТИВИРУЙТЕ ВАШ АККАУНТ %1 confirmAction @@ -27,7 +27,7 @@ ActivateLinphoneSipAccountWithPhoneNumber activateLinphoneSipAccount - АКТИВИРУЙТЕ ВАШ АККАУНТ LINPHONE + АКТИВИРУЙТЕ ВАШ АККАУНТ %1 confirmAction @@ -46,7 +46,7 @@ commandLineOptionConfig - укажите конфигурационный файл Linphone + укажите конфигурационный файл %1 applicationDescription @@ -70,7 +70,7 @@ commandLineOptionCliHelp - показывает меню помощи в использовании Linphone из командной строки + показывает меню помощи в использовании %1 из командной строки commandLineDescription @@ -104,7 +104,7 @@ AssistantHome useLinphoneSipAccount - ИСПОЛЬЗОВАТЬ АККАУНТ LINPHONE + ИСПОЛЬЗОВАТЬ АККАУНТ %1 useOtherSipAccount @@ -120,11 +120,11 @@ homeDescription - Этот ассистент поможет вам настроить и использовать ваш аккаунт Linphone. + Этот ассистент поможет вам настроить и использовать ваш аккаунт %1. createLinphoneSipAccount - СОЗДАТЬ АККАУНТ LINPHONE + СОЗДАТЬ АККАУНТ %1 @@ -435,15 +435,15 @@ Cli linphoneCliDescription - Способ управлять Linphone через командную строку. + Способ управлять %1 через командную строку. uriCommandLineSyntax - linphone sip:<адрес-sip>?method=<метод>([&<аргумент>=<base64-значение>]*) + %1 sip:<адрес-sip>?method=<метод>([&<аргумент>=<base64-значение>]*) cliCommandLineSyntax - linphone "<метод> ([<аргумент>=<значение>]*)" + %1 "<метод> ([<аргумент>=<значение>]*)" commandsName @@ -662,7 +662,7 @@ createLinphoneSipAccountTitle - СОЗДАТЬ АККАУНТ LINPHONE + СОЗДАТЬ АККАУНТ %1 withPhoneNumber @@ -677,7 +677,7 @@ CreateLinphoneSipAccountWithEmail createLinphoneSipAccountTitle - СОЗДАТЬ АККАУНТ LINPHONE + СОЗДАТЬ АККАУНТ %1 confirmAction @@ -716,7 +716,7 @@ CreateLinphoneSipAccountWithPhoneNumber createLinphoneSipAccountTitle - СОЗДАТЬ АККАУНТ LINPHONE + СОЗДАТЬ АККАУНТ %1 countryLabel @@ -816,15 +816,15 @@ Home howToDescription - Нужна помощь в использовании Linphone? + Нужна помощь в использовании %1? howToTitle - КАК ПОЛЬЗОВАТЬСЯ LINPHONE + КАК ПОЛЬЗОВАТЬСЯ %1 inviteDescription - Пригласите друзей использовать Linphone. + Пригласите друзей использовать %1. inviteTitle @@ -832,7 +832,7 @@ accountAssistantDescription - Создание и управление аккаунтом Linphone. + Создание и управление аккаунтом %1. accountAssistantTitle @@ -921,11 +921,11 @@ defaultMessage - %1 приглашает вас использовать Linphone ! + %1 приглашает вас использовать %2 ! defaultSubject - Приглащение Linphone + Приглащение %1 forcedMessage @@ -1010,7 +1010,7 @@ Notifier newVersionAvailable - Доступна новая версия Linphone (%1)! + newFileMessage @@ -1662,7 +1662,7 @@ useLinphoneSipAccountTitle - ИСПОЛЬЗОВАТЬ АККАУНТ LINPHONE + ИСПОЛЬЗОВАТЬ АККАУНТ %1 useUsernameToLogin diff --git a/assets/languages/ru_RU.ts b/assets/languages/ru_RU.ts index dc768389c..ebb2ff15d 100644 --- a/assets/languages/ru_RU.ts +++ b/assets/languages/ru_RU.ts @@ -1718,4 +1718,4 @@ - \ No newline at end of file + diff --git a/assets/languages/sr.ts b/assets/languages/sr.ts index ff7ebf609..0c93fe4a8 100644 --- a/assets/languages/sr.ts +++ b/assets/languages/sr.ts @@ -1718,4 +1718,4 @@ - \ No newline at end of file + diff --git a/assets/languages/sv.ts b/assets/languages/sv.ts index 7b1d9b169..71f9db4d5 100644 --- a/assets/languages/sv.ts +++ b/assets/languages/sv.ts @@ -12,7 +12,7 @@ ActivateLinphoneSipAccountWithEmail activateLinphoneSipAccount - AKTIVERA DITT LINPHONE-KONTO + AKTIVERA DITT %1-KONTO confirmAction @@ -27,7 +27,7 @@ ActivateLinphoneSipAccountWithPhoneNumber activateLinphoneSipAccount - AKTIVERA DITT LINPHONE-KONTO + AKTIVERA DITT %1-KONTO confirmAction @@ -46,7 +46,7 @@ commandLineOptionConfig - specificera linphone konfigurationsfilen som skall användas + specificera %1 konfigurationsfilen som skall användas applicationDescription @@ -104,7 +104,7 @@ AssistantHome useLinphoneSipAccount - ANVÄND ETT LINPHONE-KONTO + ANVÄND ETT %1-KONTO useOtherSipAccount @@ -120,11 +120,11 @@ homeDescription - Denna assistent hjälper dig att konfigurera och använda ditt linphone-konto. + Denna assistent hjälper dig att konfigurera och använda ditt %1-konto. createLinphoneSipAccount - SKAPA ETT LINPHONE-KONTO + SKAPA ETT %1-KONTO @@ -434,15 +434,15 @@ Cli linphoneCliDescription - Sätt att styra Linphone-programmet via kommandoraden. + Sätt att styra %1-programmet via kommandoraden. uriCommandLineSyntax - linphone-sip:<sip-address>?method=<method>([&<argument>=<base64-value>]*) + %1-sip:<sip-address>?method=<method>([&<argument>=<base64-value>]*) cliCommandLineSyntax - linphone "<method> ([<argument>=<value>]*)" + %1 "<method> ([<argument>=<value>]*)" commandsName @@ -661,7 +661,7 @@ createLinphoneSipAccountTitle - SKAPA ETT LINPHONE-KONTO + SKAPA ETT %1-KONTO withPhoneNumber @@ -676,7 +676,7 @@ CreateLinphoneSipAccountWithEmail createLinphoneSipAccountTitle - SKAPA ETT LINPHONE-KONTO + SKAPA ETT %1-KONTO confirmAction @@ -715,7 +715,7 @@ CreateLinphoneSipAccountWithPhoneNumber createLinphoneSipAccountTitle - SKAPA ETT LINPHONE-KONTO + SKAPA ETT %1-KONTO countryLabel @@ -815,15 +815,15 @@ Home howToDescription - Behöver du hjälp med hur du använder Linphone? + Behöver du hjälp med hur du använder %1? howToTitle - HUR DU ANVÄNDER LINPHONE + HUR DU ANVÄNDER %1 inviteDescription - Bjud in dina vänner på Linphone. + Bjud in dina vänner på %1. inviteTitle @@ -831,7 +831,7 @@ accountAssistantDescription - Skapa eller hantera ditt Linphone-konto. + Skapa eller hantera ditt %1-konto. accountAssistantTitle @@ -920,15 +920,15 @@ defaultMessage - %1 vill bjuda in dig på linphone! + %1 vill bjuda in dig på %2! defaultSubject - Linphone inbjudan + %1 inbjudan forcedMessage - Hämta programmet på din dator och börja ringa och chatta med Linphone-användare gratis. + Hämta programmet på din dator och börja ringa och chatta med %1-användare gratis. Klicka här: <a href="%1">%1</a> @@ -1009,7 +1009,7 @@ Klicka här: <a href="%1">%1</a> Notifier newVersionAvailable - En ny version (%1) av Linphone är tillgänglig! + newFileMessage @@ -1661,7 +1661,7 @@ Klicka här: <a href="%1">%1</a> useLinphoneSipAccountTitle - ANVÄND ETT LINPHONE-KONTO + ANVÄND ETT %1-KONTO useUsernameToLogin diff --git a/assets/languages/tr.ts b/assets/languages/tr.ts index 75f80d6e6..d801347e5 100644 --- a/assets/languages/tr.ts +++ b/assets/languages/tr.ts @@ -12,7 +12,7 @@ ActivateLinphoneSipAccountWithEmail activateLinphoneSipAccount - LINPHONE HESABINIZI ETKİNLEŞTİRİN + %1 HESABINIZI ETKİNLEŞTİRİN confirmAction @@ -27,7 +27,7 @@ ActivateLinphoneSipAccountWithPhoneNumber activateLinphoneSipAccount - LINPHONE HESABINIZI ETKİNLEŞTİRİN + %1 HESABINIZI ETKİNLEŞTİRİN confirmAction @@ -46,7 +46,7 @@ commandLineOptionConfig - kullanılacak linphone yapılandırma dosyasını belirt + kullanılacak %1 yapılandırma dosyasını belirt applicationDescription @@ -70,7 +70,7 @@ commandLineOptionCliHelp - Linphone'u komut satırı arayüzüyle kullanmak için yardım menüsünü gösterir + %1'u komut satırı arayüzüyle kullanmak için yardım menüsünü gösterir commandLineDescription @@ -104,7 +104,7 @@ AssistantHome useLinphoneSipAccount - LINPHONE HESABI KULLAN + %1 HESABI KULLAN useOtherSipAccount @@ -120,11 +120,11 @@ homeDescription - Bu yardımcı, linphone hesabınızı yapıldırmanız ve kullanmanız için size yardım edecek. + Bu yardımcı, %1 hesabınızı yapıldırmanız ve kullanmanız için size yardım edecek. createLinphoneSipAccount - LINPHONE HESABI OLUŞTUR + %1 HESABI OLUŞTUR @@ -435,15 +435,15 @@ Sunucu url'si yapılandırılmadı. Cli linphoneCliDescription - Linphone uygulamasını komut satırlarıyla denetleme yolu. + %1 uygulamasını komut satırlarıyla denetleme yolu. uriCommandLineSyntax - linphone sip:<sip-address>?method=<method>([&<argument>=<base64-value>]*) + %1 sip:<sip-address>?method=<method>([&<argument>=<base64-value>]*) cliCommandLineSyntax - linphone "<method> ([<argument>=<value>]*)" + %1 "<method> ([<argument>=<value>]*)" commandsName @@ -662,7 +662,7 @@ Sunucu url'si yapılandırılmadı. createLinphoneSipAccountTitle - LINPHONE HESABI OLUŞTUR + %1 HESABI OLUŞTUR withPhoneNumber @@ -677,7 +677,7 @@ Sunucu url'si yapılandırılmadı. CreateLinphoneSipAccountWithEmail createLinphoneSipAccountTitle - LINPHONE HESABI OLUŞTUR + %1 HESABI OLUŞTUR confirmAction @@ -716,7 +716,7 @@ Sunucu url'si yapılandırılmadı. CreateLinphoneSipAccountWithPhoneNumber createLinphoneSipAccountTitle - LINPHONE HESABI OLUŞTUR + %1 HESABI OLUŞTUR countryLabel @@ -816,15 +816,15 @@ Sunucu url'si yapılandırılmadı. Home howToDescription - Linphone'un nasıl kullanılacağıyla ilgili yardıma mı gereksiniyorsunuz? + %1'un nasıl kullanılacağıyla ilgili yardıma mı gereksiniyorsunuz? howToTitle - LINPHONE NASIL KULLANILIR + %1 NASIL KULLANILIR inviteDescription - Linphone'daki arkadaşlarınızı davet edin. + %1'daki arkadaşlarınızı davet edin. inviteTitle @@ -832,7 +832,7 @@ Sunucu url'si yapılandırılmadı. accountAssistantDescription - Linphone hesabı oluştur veya yönet. + %1 hesabı oluştur veya yönet. accountAssistantTitle @@ -921,11 +921,11 @@ Sunucu url'si yapılandırılmadı. defaultMessage - %1 sizi Linphone'da davet ediyor ! + %1 sizi %2'da davet ediyor ! defaultSubject - Linphone daveti + %1 daveti forcedMessage @@ -1012,7 +1012,7 @@ arkadaşınızın SIP adresini veya kullanıcı adını girin. Notifier newVersionAvailable - Linphone'un yeni sürümü (%1) var! + newFileMessage @@ -1664,7 +1664,7 @@ arkadaşınızın SIP adresini veya kullanıcı adını girin. useLinphoneSipAccountTitle - LINPHONE HESABI KULLAN + %1 HESABI KULLAN useUsernameToLogin diff --git a/assets/languages/uk.ts b/assets/languages/uk.ts index c247def45..3d3cc340f 100644 --- a/assets/languages/uk.ts +++ b/assets/languages/uk.ts @@ -1718,4 +1718,4 @@ - \ No newline at end of file + diff --git a/assets/languages/zh-Hant.ts b/assets/languages/zh-Hant.ts index 8d67badf9..4ecfb89d4 100644 --- a/assets/languages/zh-Hant.ts +++ b/assets/languages/zh-Hant.ts @@ -1718,4 +1718,4 @@ - \ No newline at end of file + diff --git a/assets/languages/zh.ts b/assets/languages/zh.ts index a6bfeb6f5..017685651 100644 --- a/assets/languages/zh.ts +++ b/assets/languages/zh.ts @@ -1718,4 +1718,4 @@ - \ No newline at end of file + diff --git a/assets/languages/zh_CN.GB2312.ts b/assets/languages/zh_CN.GB2312.ts index 78dd20c9b..1cad03360 100644 --- a/assets/languages/zh_CN.GB2312.ts +++ b/assets/languages/zh_CN.GB2312.ts @@ -1718,4 +1718,4 @@ - \ No newline at end of file + diff --git a/assets/languages/zh_CN.ts b/assets/languages/zh_CN.ts index 144714935..611fcb3bf 100644 --- a/assets/languages/zh_CN.ts +++ b/assets/languages/zh_CN.ts @@ -1718,4 +1718,4 @@ - \ No newline at end of file + diff --git a/assets/languages/zh_TW.ts b/assets/languages/zh_TW.ts index 4bb65bfe2..c204bf378 100644 --- a/assets/languages/zh_TW.ts +++ b/assets/languages/zh_TW.ts @@ -1718,4 +1718,4 @@ - \ No newline at end of file + diff --git a/src/app/App.cpp b/src/app/App.cpp index ec08191cd..4e1c4e658 100644 --- a/src/app/App.cpp +++ b/src/app/App.cpp @@ -329,12 +329,12 @@ void App::createParser () { mParser = new QCommandLineParser(); mParser->setApplicationDescription(tr("applicationDescription")); - mParser->addPositionalArgument("command", tr("commandLineDescription"), "[command]"); + mParser->addPositionalArgument("command", tr("commandLineDescription").replace("%1", APPLICATION_NAME), "[command]"); mParser->addOptions({ { { "h", "help" }, tr("commandLineOptionHelp") }, - { "cli-help", tr("commandLineOptionCliHelp") }, + { "cli-help", tr("commandLineOptionCliHelp").replace("%1", APPLICATION_NAME) }, { { "v", "version" }, tr("commandLineOptionVersion") }, - { "config", tr("commandLineOptionConfig"), tr("commandLineOptionConfigArg") }, + { "config", tr("commandLineOptionConfig").replace("%1", EXECUTABLE_NAME), tr("commandLineOptionConfigArg") }, #ifndef Q_OS_MACOS { "iconified", tr("commandLineOptionIconified") }, #endif // ifndef Q_OS_MACOS diff --git a/src/app/cli/Cli.cpp b/src/app/cli/Cli.cpp index efb269c86..2a2df2770 100644 --- a/src/app/cli/Cli.cpp +++ b/src/app/cli/Cli.cpp @@ -22,6 +22,8 @@ #include +#include "config.h" + #include "app/App.hpp" #include "components/calls/CallsListModel.hpp" #include "components/core/CoreHandlers.hpp" @@ -383,12 +385,12 @@ success: } void Cli::showHelp () { - cout << multilineIndent(tr("linphoneCliDescription"), 0) << + cout << multilineIndent(tr("linphoneCliDescription").arg(APPLICATION_NAME), 0) << endl << "Usage: " << endl << - multilineIndent(tr("uriCommandLineSyntax"), 0) << - multilineIndent(tr("cliCommandLineSyntax"), 0) << + multilineIndent(tr("uriCommandLineSyntax").arg(EXECUTABLE_NAME), 0) << + multilineIndent(tr("cliCommandLineSyntax").arg(EXECUTABLE_NAME), 0) << endl << multilineIndent(tr("commandsName")) << endl; diff --git a/ui/views/App/Main/Assistant/ActivateLinphoneSipAccountWithEmail.qml b/ui/views/App/Main/Assistant/ActivateLinphoneSipAccountWithEmail.qml index 4d7b8520d..fcb682c4b 100644 --- a/ui/views/App/Main/Assistant/ActivateLinphoneSipAccountWithEmail.qml +++ b/ui/views/App/Main/Assistant/ActivateLinphoneSipAccountWithEmail.qml @@ -13,7 +13,7 @@ AssistantAbstractView { backEnabled: false - title: qsTr('activateLinphoneSipAccount') + title: qsTr('activateLinphoneSipAccount').replace('%1', Qt.application.name.toUpperCase()) mainAction: requestBlock.execute mainActionEnabled: !requestBlock.loading diff --git a/ui/views/App/Main/Assistant/ActivateLinphoneSipAccountWithPhoneNumber.qml b/ui/views/App/Main/Assistant/ActivateLinphoneSipAccountWithPhoneNumber.qml index c53757355..ab83675c2 100644 --- a/ui/views/App/Main/Assistant/ActivateLinphoneSipAccountWithPhoneNumber.qml +++ b/ui/views/App/Main/Assistant/ActivateLinphoneSipAccountWithPhoneNumber.qml @@ -13,7 +13,7 @@ AssistantAbstractView { backEnabled: false - title: qsTr('activateLinphoneSipAccount') + title: qsTr('activateLinphoneSipAccount').replace('%1', Qt.application.name.toUpperCase()) mainAction: requestBlock.execute mainActionEnabled: activationCode.length === 4 && !requestBlock.loading diff --git a/ui/views/App/Main/Assistant/AssistantHome.qml b/ui/views/App/Main/Assistant/AssistantHome.qml index ece1ad713..ad69a216f 100644 --- a/ui/views/App/Main/Assistant/AssistantHome.qml +++ b/ui/views/App/Main/Assistant/AssistantHome.qml @@ -89,7 +89,7 @@ ColumnLayout { margins: AssistantHomeStyle.buttons.spacing } - text: $text + text: $text.replace('%1', Qt.application.name.toUpperCase()) onClicked: assistant.pushView($view) } diff --git a/ui/views/App/Main/Assistant/CreateLinphoneSipAccount.qml b/ui/views/App/Main/Assistant/CreateLinphoneSipAccount.qml index bed168271..80d8d87b3 100644 --- a/ui/views/App/Main/Assistant/CreateLinphoneSipAccount.qml +++ b/ui/views/App/Main/Assistant/CreateLinphoneSipAccount.qml @@ -8,7 +8,7 @@ import App.Styles 1.0 AssistantAbstractView { description: qsTr('createLinphoneSipAccountDescription') - title: qsTr('createLinphoneSipAccountTitle') + title: qsTr('createLinphoneSipAccountTitle').replace('%1', Qt.application.name.toUpperCase()) // --------------------------------------------------------------------------- // Menu. diff --git a/ui/views/App/Main/Assistant/CreateLinphoneSipAccountWithEmail.qml b/ui/views/App/Main/Assistant/CreateLinphoneSipAccountWithEmail.qml index fc6f00574..36fad8530 100644 --- a/ui/views/App/Main/Assistant/CreateLinphoneSipAccountWithEmail.qml +++ b/ui/views/App/Main/Assistant/CreateLinphoneSipAccountWithEmail.qml @@ -14,7 +14,7 @@ AssistantAbstractView { property alias passwordError: password.error property alias usernameError: username.error - title: qsTr('createLinphoneSipAccountTitle') + title: qsTr('createLinphoneSipAccountTitle').replace('%1', Qt.application.name.toUpperCase()) mainAction: requestBlock.execute mainActionEnabled: email.text.length diff --git a/ui/views/App/Main/Assistant/CreateLinphoneSipAccountWithPhoneNumber.qml b/ui/views/App/Main/Assistant/CreateLinphoneSipAccountWithPhoneNumber.qml index a87d11818..1a594248b 100644 --- a/ui/views/App/Main/Assistant/CreateLinphoneSipAccountWithPhoneNumber.qml +++ b/ui/views/App/Main/Assistant/CreateLinphoneSipAccountWithPhoneNumber.qml @@ -16,7 +16,7 @@ AssistantAbstractView { assistantModel.countryCode = model.data(model.index(index, 0)).countryCode } - title: qsTr('createLinphoneSipAccountTitle') + title: qsTr('createLinphoneSipAccountTitle').replace('%1', Qt.application.name.toUpperCase()) mainAction: requestBlock.execute mainActionEnabled: phoneNumber.text.length diff --git a/ui/views/App/Main/Assistant/UseLinphoneSipAccount.qml b/ui/views/App/Main/Assistant/UseLinphoneSipAccount.qml index 2b74d8db8..1525eb1b0 100644 --- a/ui/views/App/Main/Assistant/UseLinphoneSipAccount.qml +++ b/ui/views/App/Main/Assistant/UseLinphoneSipAccount.qml @@ -16,9 +16,7 @@ AssistantAbstractView { } mainActionLabel: qsTr('confirmAction') - title: qsTr('useLinphoneSipAccountTitle') - - + title: qsTr('useLinphoneSipAccountTitle').replace('%1', Qt.application.name.toUpperCase()) // --------------------------------------------------------------------------- diff --git a/ui/views/App/Main/Home.qml b/ui/views/App/Main/Home.qml index 3702b8ab5..31d2487d2 100644 --- a/ui/views/App/Main/Home.qml +++ b/ui/views/App/Main/Home.qml @@ -68,9 +68,9 @@ Rectangle { delegate: CardBlock { anchors.verticalCenter: parent.verticalCenter - description: $description + description: $description.replace('%1', Utils.capitalizeFirstLetter(Qt.application.name)) icon: $icon - title: $title + title: $title.replace('%1', Qt.application.name.toUpperCase()) Loader { Component { diff --git a/ui/views/App/Main/InviteFriends.qml b/ui/views/App/Main/InviteFriends.qml index 892bfe4c1..95b71fb03 100644 --- a/ui/views/App/Main/InviteFriends.qml +++ b/ui/views/App/Main/InviteFriends.qml @@ -3,6 +3,7 @@ import QtQuick.Layouts 1.3 import Common 1.0 import Linphone 1.0 +import Utils 1.0 import App.Styles 1.0 @@ -48,7 +49,9 @@ Rectangle { id: message height: InviteFriendsStyle.message.height - text: qsTr('defaultMessage').replace('%1', AccountSettingsModel.username) + text: qsTr('defaultMessage') + .replace('%1', AccountSettingsModel.username) + .replace('%2', Utils.capitalizeFirstLetter(Qt.application.name)) } } } @@ -80,8 +83,9 @@ Rectangle { onClicked: { Qt.openUrlExternally( 'mailto:' + encodeURIComponent(email.text) + - '?subject=' + encodeURIComponent(qsTr('defaultSubject')) + - '&body=' + encodeURIComponent( + '?subject=' + encodeURIComponent( + qsTr('defaultSubject').replace('%1', Utils.capitalizeFirstLetter(Qt.application.name)) + ) + '&body=' + encodeURIComponent( message.text + '\n\n' + qsTr('forcedMessage').replace(/%1/g, CoreManager.downloadUrl) ) )