From 751dda116590e026f2708c6a699398a4faa389f0 Mon Sep 17 00:00:00 2001 From: agsantos <aline.gondimsantos@savoirfairelinux.com> Date: Tue, 15 Sep 2020 20:59:03 -0400 Subject: [PATCH] strings: correct rendezvous Change-Id: I61f4853ed7439493d694b774c078efcaa828a780 --- src/constant/JamiStrings.qml | 6 +++++- src/wizardview/components/CreateAccountPage.qml | 2 +- src/wizardview/components/ProfilePage.qml | 4 ++-- src/wizardview/components/WelcomePage.qml | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/constant/JamiStrings.qml b/src/constant/JamiStrings.qml index c52ed7320..b58ad865d 100644 --- a/src/constant/JamiStrings.qml +++ b/src/constant/JamiStrings.qml @@ -207,11 +207,12 @@ Item { property string chooseName: qsTr("Choose name") property string chooseUsername: qsTr("Choose username") property string createPassword: qsTr("Create password") - property string createRV: qsTr("Create rendez-vous") + property string createRV: qsTr("Create rendezvous") property string createAccount: qsTr("Create account") property string confirmPassword: qsTr("Confirm password") property string notePasswordRecovery: qsTr("Note that the password cannot be recovered") property string optional: qsTr("Optional") + property string chooseNameRV: qsTr("Choose a name for your rendezvous") // CreateSIPAccountPage property string proxy: qsTr("Proxy") @@ -315,6 +316,8 @@ Item { // ProfilePage property string saveProfile: qsTr("Save profile") + property string enterRVName: qsTr("Enter the rendezvous's name") + property string generatingRV: qsTr("Generating rendezvous…") // RevokeDevicePasswordDialog property string confirmRemovalRequest: qsTr("Enter the account password to confirm the removal of this device") @@ -334,4 +337,5 @@ Item { property string createFromJAMS: qsTr("Create account from Jami Account Manager Server (JAMS)") property string addSIPAccount: qsTr("Add a SIP account") property string errorCreateAccount: qsTr("Error while creating your account. Check your credentials.") + property string createNewRV: qsTr("Create new rendezvous") } diff --git a/src/wizardview/components/CreateAccountPage.qml b/src/wizardview/components/CreateAccountPage.qml index 4468b0989..b10e9177b 100644 --- a/src/wizardview/components/CreateAccountPage.qml +++ b/src/wizardview/components/CreateAccountPage.qml @@ -110,7 +110,7 @@ Rectangle { Layout.preferredWidth: usernameEdit.width Label { - text: isRendezVous ? qsTr("Choose a name for your rendez-vous") : qsTr("Choose a username for your account") + text: isRendezVous ? JamiStrings.chooseNameRV : qsTr("Choose a username for your account") font.pointSize: JamiTheme.textFontSize + 3 } diff --git a/src/wizardview/components/ProfilePage.qml b/src/wizardview/components/ProfilePage.qml index 780964ee4..2f9dc5430 100644 --- a/src/wizardview/components/ProfilePage.qml +++ b/src/wizardview/components/ProfilePage.qml @@ -101,7 +101,7 @@ Rectangle { Layout.alignment: Qt.AlignCenter selectByMouse: true - placeholderText: isRdv ? qsTr("Enter the rendez-vous's name") : qsTr("Enter your name") + placeholderText: isRdv ? JamiStrings.enterRVName : qsTr("Enter your name") font.pointSize: 9 font.kerning: true @@ -119,7 +119,7 @@ Rectangle { enabled: !spinnerTriggered normalText: JamiStrings.saveProfile - spinnerTriggeredtext: root.isRdv ? qsTr("Generating rendez-vous…") : qsTr("Generating account…") + spinnerTriggeredtext: root.isRdv ? JamiStrings.generatingRV : qsTr("Generating account…") onClicked: saveProfile() } diff --git a/src/wizardview/components/WelcomePage.qml b/src/wizardview/components/WelcomePage.qml index 636b86862..d5c202f68 100644 --- a/src/wizardview/components/WelcomePage.qml +++ b/src/wizardview/components/WelcomePage.qml @@ -97,9 +97,9 @@ Rectangle { Layout.preferredWidth: preferredWidth Layout.preferredHeight: preferredHeight - text: qsTr("Create a rendez-vous") + text: JamiStrings.createRV fontCapitalization: Font.AllUppercase - toolTipText: qsTr("Create new rendez-vous") + toolTipText: JamiStrings.createNewRV source: "qrc:/images/icons/groups-24px.svg" color: JamiTheme.buttonTintedBlue hoveredColor: JamiTheme.buttonTintedBlueHovered -- GitLab