From a4d9dc09d8db0ed4d5d29d1df02ee2b16df12f7c Mon Sep 17 00:00:00 2001 From: xmr-eric Date: Wed, 21 Dec 2016 01:26:05 -0500 Subject: [PATCH 1/7] Password page edits --- wizard/WizardPassword.qml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wizard/WizardPassword.qml b/wizard/WizardPassword.qml index 80bd893d..b591a332 100644 --- a/wizard/WizardPassword.qml +++ b/wizard/WizardPassword.qml @@ -50,9 +50,9 @@ Item { handlePassword(); if (wizard.currentPath === "create_wallet") { - passwordPage.titleText = qsTr("Now that your wallet has been created, please set a password for the wallet") + translationManager.emptyString + passwordPage.titleText = qsTr("Give your wallet a password") + translationManager.emptyString } else { - passwordPage.titleText = qsTr("Now that your wallet has been restored, please set a password for the wallet") + translationManager.emptyString + passwordPage.titleText = qsTr("Give your wallet a password") + translationManager.emptyString } passwordItem.focus = true; @@ -148,8 +148,8 @@ Item { //renderType: Text.NativeRendering color: "#4A4646" horizontalAlignment: Text.AlignHCenter - text: qsTr("Note that this password cannot be recovered, and if forgotten you will need to restore your wallet from the mnemonic seed you were just given

- Your password will be used to protect your wallet and to confirm actions, so make sure that your password is sufficiently secure.") + text: qsTr("Note: this password cannot be recovered. If you forget it then the wallet will have to be restored from its 25 word mnemonic seed.

+ Enter a secure password (using letters, numbers, and/or symbols):") + translationManager.emptyString } } From 9bd557c489abba7cefbce5a6c9c4b9d1a0864f9a Mon Sep 17 00:00:00 2001 From: xmr-eric Date: Wed, 21 Dec 2016 01:27:19 -0500 Subject: [PATCH 2/7] Recover Wallet page --- wizard/WizardRecoveryWallet.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wizard/WizardRecoveryWallet.qml b/wizard/WizardRecoveryWallet.qml index e93eddce..71e022c2 100644 --- a/wizard/WizardRecoveryWallet.qml +++ b/wizard/WizardRecoveryWallet.qml @@ -89,8 +89,8 @@ Item { WizardManageWalletUI { id: uiItem accountNameText: defaultAccountName - titleText: qsTr("We're ready to recover your account") + translationManager.emptyString - wordsTextTitle: qsTr("Please enter your 25 word private key") + translationManager.emptyString + titleText: qsTr("Give your restored wallet a name") + translationManager.emptyString + wordsTextTitle: qsTr("Enter your 25 word mnemonic seed:") + translationManager.emptyString wordsTextItem.clipboardButtonVisible: false wordsTextItem.tipTextVisible: false wordsTextItem.memoTextReadOnly: false From 7f824646bc8d67b0c381ae943b6ee2a9438a7e06 Mon Sep 17 00:00:00 2001 From: xmr-eric Date: Wed, 21 Dec 2016 01:29:15 -0500 Subject: [PATCH 3/7] ManageWalletUIpage --- wizard/WizardManageWalletUI.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wizard/WizardManageWalletUI.qml b/wizard/WizardManageWalletUI.qml index f7d454f7..4620ad91 100644 --- a/wizard/WizardManageWalletUI.qml +++ b/wizard/WizardManageWalletUI.qml @@ -104,7 +104,7 @@ Item { horizontalAlignment: Text.AlignHCenter //renderType: Text.NativeRendering color: "#4A4646" - text: qsTr("This is the name of your wallet. You can change it to a different name if you’d like:") + translationManager.emptyString + text: qsTr("or use the name suggested below:") + translationManager.emptyString } } @@ -175,7 +175,7 @@ Item { anchors.top: memoTextItem.bottom width: 250 anchors.topMargin: 20 - placeholderText: qsTr("Restore height") + placeholderText: qsTr("Restore height (optional)") Layout.alignment: Qt.AlignCenter validator: IntValidator { bottom:0 From 638e20746c0c8de614d4e3678cf68b620b1f31ba Mon Sep 17 00:00:00 2001 From: xmr-eric Date: Wed, 21 Dec 2016 01:30:16 -0500 Subject: [PATCH 4/7] End of Wizard page --- wizard/WizardFinish.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wizard/WizardFinish.qml b/wizard/WizardFinish.qml index ff1451ee..6ce800b4 100644 --- a/wizard/WizardFinish.qml +++ b/wizard/WizardFinish.qml @@ -52,8 +52,8 @@ Item { return "" + trStart + qsTr("Language") + trMiddle + wizard.settings["language"] + trEnd - + trStart + qsTr("Account name") + trMiddle + wizard.settings["account_name"] + trEnd - + trStart + qsTr("Seed") + trMiddle + wizard.settings["wallet"].seed + trEnd + + trStart + qsTr("Wallet name") + trMiddle + wizard.settings["account_name"] + trEnd + + trStart + qsTr("Backup seed") + trMiddle + wizard.settings["wallet"].seed + trEnd + trStart + qsTr("Wallet path") + trMiddle + wizard.settings["wallet_path"] + trEnd // + trStart + qsTr("Auto donations") + trMiddle + autoDonationText + trEnd // + (autoDonationEnabled @@ -70,7 +70,7 @@ Item { } function updateSettingsSummary() { - settingsText.text = qsTr("An overview of your Monero configuration is below:") + translationManager.emptyString + settingsText.text = qsTr("New wallet details:") + translationManager.emptyString + "
" + buildSettingsString(); } From 31f9c1d09b12bc54a86e013006ade3a4cd312c9c Mon Sep 17 00:00:00 2001 From: xmr-eric Date: Wed, 21 Dec 2016 01:31:41 -0500 Subject: [PATCH 5/7] CreateWallet page --- wizard/WizardCreateWallet.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wizard/WizardCreateWallet.qml b/wizard/WizardCreateWallet.qml index cf26c7bc..26169307 100644 --- a/wizard/WizardCreateWallet.qml +++ b/wizard/WizardCreateWallet.qml @@ -96,8 +96,8 @@ Item { WizardManageWalletUI { id: uiItem - titleText: qsTr("A new wallet has been created for you") + translationManager.emptyString - wordsTextTitle: qsTr("This is the 25 word mnemonic for your wallet") + translationManager.emptyString + titleText: qsTr("Give your new wallet a name") + translationManager.emptyString + wordsTextTitle: qsTr("Here is your wallet's 25 word mnemonic seed") + translationManager.emptyString wordsTextItem.clipboardButtonVisible: true wordsTextItem.tipTextVisible: true wordsTextItem.memoTextReadOnly: true From 2f4d31a9258957726df8376a93c143904317aed6 Mon Sep 17 00:00:00 2001 From: xmr-eric Date: Wed, 21 Dec 2016 01:32:55 -0500 Subject: [PATCH 6/7] Improve wizard Seed importance/secret statement --- wizard/WizardMemoTextInput.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wizard/WizardMemoTextInput.qml b/wizard/WizardMemoTextInput.qml index 74ed51e9..e46fd09a 100644 --- a/wizard/WizardMemoTextInput.qml +++ b/wizard/WizardMemoTextInput.qml @@ -73,7 +73,7 @@ Column { font.pixelSize: 15 color: "#4A4646" wrapMode: Text.Wrap - text: qsTr("It is very important to write it down as this is the only backup you will need for your wallet.") + text: qsTr("This seed is VERY important to write down and keep secret. It is all you need to backup and restore your wallet.") + translationManager.emptyString } } From e3ef832063db030573b37d37147b9c8f1c26545f Mon Sep 17 00:00:00 2001 From: xmr-eric Date: Wed, 21 Dec 2016 01:34:05 -0500 Subject: [PATCH 7/7] Wizard Option Page: Change "Recover" to "Restore" --- wizard/WizardOptions.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wizard/WizardOptions.qml b/wizard/WizardOptions.qml index 6483f26b..0797fc34 100644 --- a/wizard/WizardOptions.qml +++ b/wizard/WizardOptions.qml @@ -174,7 +174,7 @@ Item { font.pixelSize: 16 color: "#4A4949" horizontalAlignment: Text.AlignHCenter - text: qsTr("Recover wallet from 25 word mnemonic seed") + translationManager.emptyString + text: qsTr("Restore wallet from 25 word mnemonic seed") + translationManager.emptyString width:page.buttonSize wrapMode: Text.WordWrap }