diff --git a/linphone-desktop/assets/languages/en.ts b/linphone-desktop/assets/languages/en.ts index 0e5d5f52d..16b10589f 100644 --- a/linphone-desktop/assets/languages/en.ts +++ b/linphone-desktop/assets/languages/en.ts @@ -35,90 +35,6 @@ BACK - - AssistantCreateLinphoneSipAccount - - createLinphoneSipAccountDescription - How would you like to create your account? - - - createLinphoneSipAccountTitle - CREATE A LINPHONE ACCOUNT - - - withPhoneNumber - WITH A PHONE NUMBER - - - withEmailAddress - WITH AN EMAIL ADDRESS - - - - AssistantCreateLinphoneSipAccountWithEmail - - createLinphoneSipAccountTitle - CREATE A LINPHONE ACCOUNT - - - confirmAction - CREATE - - - usernameLabel - Username - - - emailLabel - Email - - - passwordLabel - Password - - - passwordConfirmationLabel - Password confirmation - - - passwordConfirmationError - The passwords you entered do not match. - - - - AssistantCreateLinphoneSipAccountWithPhoneNumber - - createLinphoneSipAccountTitle - CREATE A LINPHONE ACCOUNT - - - countryLabel - Your country - - - phoneNumberLabel - Phone number - - - usernameLabel - Username - - - - AssistantFetchRemoteConfiguration - - fetchRemoteConfigurationTitle - FETCH REMOTE CONFIGURATION - - - urlLabel - URL - - - confirmAction - DOWNLOAD - - AssistantHome @@ -205,74 +121,6 @@ Account already exists. - - AssistantUseLinphoneSipAccount - - confirmAction - LOGIN - - - useLinphoneSipAccountTitle - USE A LINPHONE ACCOUNT - - - useUsernameToLogin - Use username and password rather than your phone number. - - - - AssistantUseLinphoneSipAccountWithPhoneNumber - - countryLabel - Your country - - - phoneNumberLabel - Phone number - - - - AssistantUseLinphoneSipAccountWithUsername - - usernameLabel - Username - - - passwordLabel - Password - - - - AssistantUseOtherSipAccount - - confirmAction - LOGIN - - - useOtherSipAccountTitle - USE A SIP ACCOUNT - - - usernameLabel - Username - - - displayNameLabel - Display name (optional) - - - sipDomainLabel - SIP Domain - - - passwordLabel - Password - - - transportLabel - Transport - - Calls @@ -478,6 +326,75 @@ Server url not configured. Are you sure you want to clean history? + + CreateLinphoneSipAccount + + createLinphoneSipAccountDescription + How would you like to create your account? + + + createLinphoneSipAccountTitle + CREATE A LINPHONE ACCOUNT + + + withPhoneNumber + WITH A PHONE NUMBER + + + withEmailAddress + WITH AN EMAIL ADDRESS + + + + CreateLinphoneSipAccountWithEmail + + createLinphoneSipAccountTitle + CREATE A LINPHONE ACCOUNT + + + confirmAction + CREATE + + + usernameLabel + Username + + + emailLabel + Email + + + passwordLabel + Password + + + passwordConfirmationLabel + Password confirmation + + + passwordConfirmationError + The passwords you entered do not match. + + + + CreateLinphoneSipAccountWithPhoneNumber + + createLinphoneSipAccountTitle + CREATE A LINPHONE ACCOUNT + + + countryLabel + Your country + + + phoneNumberLabel + Phone number + + + usernameLabel + Username + + DroppableTextArea @@ -524,6 +441,21 @@ Server url not configured. Missed outgoing call + + FetchRemoteConfiguration + + confirmAction + FETCH + + + fetchRemoteConfigurationTitle + FETCH REMOTE CONFIGURATION + + + urlLabel + URL + + FileMessage @@ -1106,4 +1038,72 @@ Server url not configured. Previously + + UseLinphoneSipAccount + + confirmAction + USE + + + useLinphoneSipAccountTitle + USE A LINPHONE ACCOUNT + + + useUsernameToLogin + Use username and password rather than your phone number. + + + + UseLinphoneSipAccountWithPhoneNumber + + countryLabel + Your country + + + phoneNumberLabel + Phone number + + + + UseLinphoneSipAccountWithUsername + + usernameLabel + Username + + + passwordLabel + Password + + + + UseOtherSipAccount + + confirmAction + USE + + + useOtherSipAccountTitle + USE A SIP ACCOUNT + + + usernameLabel + Username + + + displayNameLabel + Display name (optional) + + + sipDomainLabel + SIP Domain + + + passwordLabel + Password + + + transportLabel + Transport + + diff --git a/linphone-desktop/assets/languages/fr.ts b/linphone-desktop/assets/languages/fr.ts index 7fcdfcd50..9c6408d7b 100644 --- a/linphone-desktop/assets/languages/fr.ts +++ b/linphone-desktop/assets/languages/fr.ts @@ -35,90 +35,6 @@ RETOUR - - AssistantCreateLinphoneSipAccount - - createLinphoneSipAccountDescription - Comment souhaitez-vous créer votre compte ? - - - createLinphoneSipAccountTitle - CRÉER UN COMPTE LINPHONE - - - withPhoneNumber - AVEC UN NUMÉRO DE TÉLÉPHONE - - - withEmailAddress - AVER UNE ADRESSE E-MAIL - - - - AssistantCreateLinphoneSipAccountWithEmail - - createLinphoneSipAccountTitle - CRÉER UN COMPTE LINPHONE - - - confirmAction - CRÉER - - - usernameLabel - Nom d'utilisateur - - - emailLabel - E-mail - - - passwordLabel - Mot de passe - - - passwordConfirmationLabel - Confirmation du mot de passe - - - passwordConfirmationError - Les mots de passe ne correspondent pas. - - - - AssistantCreateLinphoneSipAccountWithPhoneNumber - - createLinphoneSipAccountTitle - CRÉER UN COMPTE LINPHONE - - - countryLabel - Votre pays - - - phoneNumberLabel - Numéro de téléphone - - - usernameLabel - Nom d'utilisateur - - - - AssistantFetchRemoteConfiguration - - fetchRemoteConfigurationTitle - TÉLÉCHARGER UNE CONFIGURATION - - - urlLabel - URL - - - confirmAction - TÉLÉCHARGER - - AssistantHome @@ -205,74 +121,6 @@ Le compte existe déjà. - - AssistantUseLinphoneSipAccount - - confirmAction - CONNEXION - - - useLinphoneSipAccountTitle - UTILISER UN COMPTE LINPHONE - - - useUsernameToLogin - Utiliser un nom et mot de passe plutôt que votre numéro de téléphone. - - - - AssistantUseLinphoneSipAccountWithPhoneNumber - - countryLabel - Votre pays - - - phoneNumberLabel - Numéro de téléphone - - - - AssistantUseLinphoneSipAccountWithUsername - - usernameLabel - Nom d'utilisateur - - - passwordLabel - Mot de passe - - - - AssistantUseOtherSipAccount - - confirmAction - CONNEXION - - - useOtherSipAccountTitle - UTILISER UN COMPTE SIP - - - usernameLabel - Nom d'utilisateur - - - displayNameLabel - Nom d'affichage (optionnel) - - - sipDomainLabel - Domaine SIP - - - passwordLabel - Mot de passe - - - transportLabel - Transport - - Calls @@ -478,6 +326,75 @@ Url du serveur non configurée. Êtes-vous sûr de vouloir supprimer cet historique ? + + CreateLinphoneSipAccount + + createLinphoneSipAccountDescription + Comment souhaitez-vous créer votre compte ? + + + createLinphoneSipAccountTitle + CRÉER UN COMPTE LINPHONE + + + withPhoneNumber + AVEC UN NUMÉRO DE TÉLÉPHONE + + + withEmailAddress + AVER UNE ADRESSE E-MAIL + + + + CreateLinphoneSipAccountWithEmail + + createLinphoneSipAccountTitle + CRÉER UN COMPTE LINPHONE + + + confirmAction + CRÉER + + + usernameLabel + Nom d'utilisateur + + + emailLabel + E-mail + + + passwordLabel + Mot de passe + + + passwordConfirmationLabel + Confirmation du mot de passe + + + passwordConfirmationError + Les mots de passe ne correspondent pas. + + + + CreateLinphoneSipAccountWithPhoneNumber + + createLinphoneSipAccountTitle + CRÉER UN COMPTE LINPHONE + + + countryLabel + Votre pays + + + phoneNumberLabel + Numéro de téléphone + + + usernameLabel + Nom d'utilisateur + + DroppableTextArea @@ -524,6 +441,21 @@ Url du serveur non configurée. Appel sortant sans réponse + + FetchRemoteConfiguration + + confirmAction + TÉLÉCHARGER + + + fetchRemoteConfigurationTitle + TÉLÉCHARGER UNE CONFIGURATION + + + urlLabel + URL + + FileMessage @@ -1106,4 +1038,72 @@ Url du serveur non configurée. Précédemment + + UseLinphoneSipAccount + + confirmAction + UTILISER + + + useLinphoneSipAccountTitle + UTILISER UN COMPTE LINPHONE + + + useUsernameToLogin + Utiliser un nom et mot de passe plutôt que votre numéro de téléphone. + + + + UseLinphoneSipAccountWithPhoneNumber + + countryLabel + Votre pays + + + phoneNumberLabel + Numéro de téléphone + + + + UseLinphoneSipAccountWithUsername + + usernameLabel + Nom d'utilisateur + + + passwordLabel + Mot de passe + + + + UseOtherSipAccount + + confirmAction + UTILISER + + + useOtherSipAccountTitle + UTILISER UN COMPTE SIP + + + usernameLabel + Nom d'utilisateur + + + displayNameLabel + Nom d'affichage (optionnel) + + + sipDomainLabel + Domaine SIP + + + passwordLabel + Mot de passe + + + transportLabel + Transport + + diff --git a/linphone-desktop/resources.qrc b/linphone-desktop/resources.qrc index b8b670824..75247aabd 100644 --- a/linphone-desktop/resources.qrc +++ b/linphone-desktop/resources.qrc @@ -334,16 +334,16 @@ ui/views/App/Calls/IncomingCall.qml ui/views/App/Calls/OutgoingCall.qml ui/views/App/Main/Assistant/AssistantAbstractView.qml - ui/views/App/Main/Assistant/AssistantCreateLinphoneSipAccount.qml - ui/views/App/Main/Assistant/AssistantCreateLinphoneSipAccountWithEmail.qml - ui/views/App/Main/Assistant/AssistantCreateLinphoneSipAccountWithPhoneNumber.qml - ui/views/App/Main/Assistant/AssistantFetchRemoteConfiguration.qml ui/views/App/Main/Assistant/AssistantHome.qml - ui/views/App/Main/Assistant/AssistantUseLinphoneSipAccount.qml - ui/views/App/Main/Assistant/AssistantUseLinphoneSipAccountWithPhoneNumber.qml - ui/views/App/Main/Assistant/AssistantUseLinphoneSipAccountWithUsername.qml - ui/views/App/Main/Assistant/AssistantUseOtherSipAccount.qml + ui/views/App/Main/Assistant/CreateLinphoneSipAccount.qml + ui/views/App/Main/Assistant/CreateLinphoneSipAccountWithEmail.qml + ui/views/App/Main/Assistant/CreateLinphoneSipAccountWithPhoneNumber.qml + ui/views/App/Main/Assistant/FetchRemoteConfiguration.qml ui/views/App/Main/Assistant.qml + ui/views/App/Main/Assistant/UseLinphoneSipAccount.qml + ui/views/App/Main/Assistant/UseLinphoneSipAccountWithPhoneNumber.qml + ui/views/App/Main/Assistant/UseLinphoneSipAccountWithUsername.qml + ui/views/App/Main/Assistant/UseOtherSipAccount.qml ui/views/App/Main/ContactEdit.js ui/views/App/Main/ContactEdit.qml ui/views/App/Main/Contacts.qml @@ -369,10 +369,10 @@ ui/views/App/Styles/Calls/CallStyle.qml ui/views/App/Styles/Calls/CallsWindowStyle.qml ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml - ui/views/App/Styles/Main/Assistant/AssistantCreateLinphoneSipAccountStyle.qml ui/views/App/Styles/Main/Assistant/AssistantHomeStyle.qml - ui/views/App/Styles/Main/Assistant/AssistantUseLinphoneSipAccountStyle.qml + ui/views/App/Styles/Main/Assistant/CreateLinphoneSipAccountStyle.qml ui/views/App/Styles/Main/AssistantStyle.qml + ui/views/App/Styles/Main/Assistant/UseLinphoneSipAccountStyle.qml ui/views/App/Styles/Main/ContactEditStyle.qml ui/views/App/Styles/Main/ContactsStyle.qml ui/views/App/Styles/Main/ConversationStyle.qml diff --git a/linphone-desktop/ui/views/App/Main/Assistant/AssistantHome.qml b/linphone-desktop/ui/views/App/Main/Assistant/AssistantHome.qml index 6d659d7af..dec89a20f 100644 --- a/linphone-desktop/ui/views/App/Main/Assistant/AssistantHome.qml +++ b/linphone-desktop/ui/views/App/Main/Assistant/AssistantHome.qml @@ -98,22 +98,22 @@ ColumnLayout { model: ListModel { ListElement { $text: qsTr('createLinphoneSipAccount') - $view: 'AssistantCreateLinphoneSipAccount' + $view: 'CreateLinphoneSipAccount' } ListElement { $text: qsTr('useLinphoneSipAccount') - $view: 'AssistantUseLinphoneSipAccount' + $view: 'UseLinphoneSipAccount' } ListElement { $text: qsTr('useOtherSipAccount') - $view: 'AssistantUseOtherSipAccount' + $view: 'UseOtherSipAccount' } ListElement { $text: qsTr('fetchRemoteConfiguration') - $view: 'AssistantFetchRemoteConfiguration' + $view: 'FetchRemoteConfiguration' } } diff --git a/linphone-desktop/ui/views/App/Main/Assistant/AssistantCreateLinphoneSipAccount.qml b/linphone-desktop/ui/views/App/Main/Assistant/CreateLinphoneSipAccount.qml similarity index 59% rename from linphone-desktop/ui/views/App/Main/Assistant/AssistantCreateLinphoneSipAccount.qml rename to linphone-desktop/ui/views/App/Main/Assistant/CreateLinphoneSipAccount.qml index d7d780470..bed168271 100644 --- a/linphone-desktop/ui/views/App/Main/Assistant/AssistantCreateLinphoneSipAccount.qml +++ b/linphone-desktop/ui/views/App/Main/Assistant/CreateLinphoneSipAccount.qml @@ -16,25 +16,25 @@ AssistantAbstractView { Column { anchors.centerIn: parent - spacing: AssistantCreateLinphoneSipAccountStyle.buttons.spacing - width: AssistantCreateLinphoneSipAccountStyle.buttons.button.width + spacing: CreateLinphoneSipAccountStyle.buttons.spacing + width: CreateLinphoneSipAccountStyle.buttons.button.width TextButtonA { text: qsTr('withPhoneNumber') - height: AssistantCreateLinphoneSipAccountStyle.buttons.button.height + height: CreateLinphoneSipAccountStyle.buttons.button.height width: parent.width - onClicked: assistant.pushView('AssistantCreateLinphoneSipAccountWithPhoneNumber') + onClicked: assistant.pushView('CreateLinphoneSipAccountWithPhoneNumber') } TextButtonA { text: qsTr('withEmailAddress') - height: AssistantCreateLinphoneSipAccountStyle.buttons.button.height + height: CreateLinphoneSipAccountStyle.buttons.button.height width: parent.width - onClicked: assistant.pushView('AssistantCreateLinphoneSipAccountWithEmail') + onClicked: assistant.pushView('CreateLinphoneSipAccountWithEmail') } } } diff --git a/linphone-desktop/ui/views/App/Main/Assistant/AssistantCreateLinphoneSipAccountWithEmail.qml b/linphone-desktop/ui/views/App/Main/Assistant/CreateLinphoneSipAccountWithEmail.qml similarity index 100% rename from linphone-desktop/ui/views/App/Main/Assistant/AssistantCreateLinphoneSipAccountWithEmail.qml rename to linphone-desktop/ui/views/App/Main/Assistant/CreateLinphoneSipAccountWithEmail.qml diff --git a/linphone-desktop/ui/views/App/Main/Assistant/AssistantCreateLinphoneSipAccountWithPhoneNumber.qml b/linphone-desktop/ui/views/App/Main/Assistant/CreateLinphoneSipAccountWithPhoneNumber.qml similarity index 98% rename from linphone-desktop/ui/views/App/Main/Assistant/AssistantCreateLinphoneSipAccountWithPhoneNumber.qml rename to linphone-desktop/ui/views/App/Main/Assistant/CreateLinphoneSipAccountWithPhoneNumber.qml index 2931ec9b2..1cb54eb78 100644 --- a/linphone-desktop/ui/views/App/Main/Assistant/AssistantCreateLinphoneSipAccountWithPhoneNumber.qml +++ b/linphone-desktop/ui/views/App/Main/Assistant/CreateLinphoneSipAccountWithPhoneNumber.qml @@ -3,8 +3,6 @@ import QtQuick 2.7 import Common 1.0 import Linphone 1.0 -import App.Styles 1.0 - // ============================================================================= AssistantAbstractView { diff --git a/linphone-desktop/ui/views/App/Main/Assistant/AssistantFetchRemoteConfiguration.qml b/linphone-desktop/ui/views/App/Main/Assistant/FetchRemoteConfiguration.qml similarity index 100% rename from linphone-desktop/ui/views/App/Main/Assistant/AssistantFetchRemoteConfiguration.qml rename to linphone-desktop/ui/views/App/Main/Assistant/FetchRemoteConfiguration.qml diff --git a/linphone-desktop/ui/views/App/Main/Assistant/AssistantUseLinphoneSipAccount.qml b/linphone-desktop/ui/views/App/Main/Assistant/UseLinphoneSipAccount.qml similarity index 92% rename from linphone-desktop/ui/views/App/Main/Assistant/AssistantUseLinphoneSipAccount.qml rename to linphone-desktop/ui/views/App/Main/Assistant/UseLinphoneSipAccount.qml index 2cf90775b..b0e17f90c 100644 --- a/linphone-desktop/ui/views/App/Main/Assistant/AssistantUseLinphoneSipAccount.qml +++ b/linphone-desktop/ui/views/App/Main/Assistant/UseLinphoneSipAccount.qml @@ -25,7 +25,7 @@ AssistantAbstractView { Loader { id: loader - source: 'AssistantUseLinphoneSipAccountWith' + ( + source: 'UseLinphoneSipAccountWith' + ( checkBox.checked ? 'Username' : 'PhoneNumber' ) + '.qml' width: parent.width @@ -35,7 +35,7 @@ AssistantAbstractView { id: checkBox text: qsTr('useUsernameToLogin') - width: AssistantUseLinphoneSipAccountStyle.checkBox.width + width: UseLinphoneSipAccountStyle.checkBox.width onClicked: { assistantModel.reset() diff --git a/linphone-desktop/ui/views/App/Main/Assistant/AssistantUseLinphoneSipAccountWithPhoneNumber.qml b/linphone-desktop/ui/views/App/Main/Assistant/UseLinphoneSipAccountWithPhoneNumber.qml similarity index 100% rename from linphone-desktop/ui/views/App/Main/Assistant/AssistantUseLinphoneSipAccountWithPhoneNumber.qml rename to linphone-desktop/ui/views/App/Main/Assistant/UseLinphoneSipAccountWithPhoneNumber.qml diff --git a/linphone-desktop/ui/views/App/Main/Assistant/AssistantUseLinphoneSipAccountWithUsername.qml b/linphone-desktop/ui/views/App/Main/Assistant/UseLinphoneSipAccountWithUsername.qml similarity index 100% rename from linphone-desktop/ui/views/App/Main/Assistant/AssistantUseLinphoneSipAccountWithUsername.qml rename to linphone-desktop/ui/views/App/Main/Assistant/UseLinphoneSipAccountWithUsername.qml diff --git a/linphone-desktop/ui/views/App/Main/Assistant/AssistantUseOtherSipAccount.qml b/linphone-desktop/ui/views/App/Main/Assistant/UseOtherSipAccount.qml similarity index 100% rename from linphone-desktop/ui/views/App/Main/Assistant/AssistantUseOtherSipAccount.qml rename to linphone-desktop/ui/views/App/Main/Assistant/UseOtherSipAccount.qml diff --git a/linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantCreateLinphoneSipAccountStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/Assistant/CreateLinphoneSipAccountStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantCreateLinphoneSipAccountStyle.qml rename to linphone-desktop/ui/views/App/Styles/Main/Assistant/CreateLinphoneSipAccountStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantUseLinphoneSipAccountStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/Assistant/UseLinphoneSipAccountStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantUseLinphoneSipAccountStyle.qml rename to linphone-desktop/ui/views/App/Styles/Main/Assistant/UseLinphoneSipAccountStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/qmldir b/linphone-desktop/ui/views/App/Styles/qmldir index 48de49ed6..c84f82f75 100644 --- a/linphone-desktop/ui/views/App/Styles/qmldir +++ b/linphone-desktop/ui/views/App/Styles/qmldir @@ -8,9 +8,9 @@ singleton CallStyle 1.0 Calls/CallStyle.qml singleton CallsWindowStyle 1.0 Calls/CallsWindowStyle.qml singleton AssistantAbstractViewStyle 1.0 Main/Assistant/AssistantAbstractViewStyle.qml -singleton AssistantCreateLinphoneSipAccountStyle 1.0 Main/Assistant/AssistantCreateLinphoneSipAccountStyle.qml singleton AssistantHomeStyle 1.0 Main/Assistant/AssistantHomeStyle.qml -singleton AssistantUseLinphoneSipAccountStyle 1.0 Main/Assistant/AssistantUseLinphoneSipAccountStyle.qml +singleton CreateLinphoneSipAccountStyle 1.0 Main/Assistant/CreateLinphoneSipAccountStyle.qml +singleton UseLinphoneSipAccountStyle 1.0 Main/Assistant/UseLinphoneSipAccountStyle.qml singleton AssistantStyle 1.0 Main/AssistantStyle.qml singleton ContactEditStyle 1.0 Main/ContactEditStyle.qml