From 5be07763b838f6396fb0487ede553e821c733af0 Mon Sep 17 00:00:00 2001
From: firstcryptoman <86235719+firstcryptoman@users.noreply.github.com>
Date: Wed, 20 Jul 2022 20:14:50 +0400
Subject: [PATCH] New description for Wallet creation and successful creation
screens (#1188)
* New description for Wallet creation and succesful creation screens and some other minor changes
* Adding chinese translate for changed text
---
src/qt/forms/notifymnemonic.ui | 10 ++--
src/qt/forms/recover.ui | 48 +++++++++++-------
src/qt/locale/bitcoin_zh_CN.ts | 91 ++++++++++++++++------------------
src/qt/recover.cpp | 4 +-
4 files changed, 81 insertions(+), 72 deletions(-)
diff --git a/src/qt/forms/notifymnemonic.ui b/src/qt/forms/notifymnemonic.ui
index 729b63b5df..7a47de8f6f 100644
--- a/src/qt/forms/notifymnemonic.ui
+++ b/src/qt/forms/notifymnemonic.ui
@@ -42,7 +42,7 @@
- Your wallet has been created successfully. Using the following sequence of words, you will be able to recover your wallet at any time.
+ Your wallet has been created successfully. Using the following recovery seed phrase, you will be able to recover your wallet and balances at any time.true
@@ -52,7 +52,7 @@
- Mnemonic words:
+ Recovery seed phrase:true
@@ -112,7 +112,7 @@
- Please write down these words and keep them in a secure location such as a safe.
+ Please write down these recovery seed phrase and keep them in a secure location.true
@@ -122,7 +122,7 @@
- WARNING: Anyone with access to these words can recover your wallet and will have control over your funds!
+ WARNING: Anyone with access to the recovery seed phrase can recover your wallet and will have control over your funds!true
@@ -142,7 +142,7 @@
- Please re-enter the mnemonic words to ensure that you have written it down correctly.
+ Please re-enter the recovery seed phrase to ensure you have written it down correctly.true
diff --git a/src/qt/forms/recover.ui b/src/qt/forms/recover.ui
index c64101f3d2..f8a3db384b 100644
--- a/src/qt/forms/recover.ui
+++ b/src/qt/forms/recover.ui
@@ -29,23 +29,18 @@
- Let's create your Firo wallet!
+ Let's create or restore your Firo wallet!
-Please save these words on paper (order is important). These words serve as your seed and will allow you to recover your wallet in case of a computer failure.
+You will be prompted to write down a recovery seed phrase that allows you to restore your wallet in the future.
-By default we create a 24 word seed but you may choose a 12 word seed should you require it for compatibility reasons.
+Please ensure that you store this securely as anyone with access to the recovery seed phrase can access your funds!
-You can also choose to further encrypt your seed with a passphrase for added security.
+By default, we recommend a 24 word recovery seed phrase.
-Warning:
-* Never disclose your seed
-* Never type it on a website
-* Do not store it electronically.
-* If you encrypt your seed with an additional passphrase, please also record this.
+You can also choose to further encrypt your recovery seed phrase with an additional passphrase (only recommended for advanced users).
+You will need to save this passphrase as well with the recovery seed phrase. Failing to save the passphrase will lead to your funds being irrecoverable.
-If you have an existing seed that you wish to restore, please select "Recover existing wallet" and enter your passphrase (if you have set one for your seed).
-
-Advanced: If you don't wish to generate a wallet with a seed phrase backup (not recommended), you can set usemnemonic=0 in firo.conf.
+If you have an existing recovery seed phrase, please select "Recover existing wallet". If you have secured your recovery seed phrase with an additional passphrase, enter it too.
@@ -143,7 +138,7 @@ Advanced: If you don't wish to generate a wallet with a seed phrase backup (not
- Input words here:
+ Input recovery seed phrase here:true
@@ -177,7 +172,7 @@ Advanced: If you don't wish to generate a wallet with a seed phrase backup (not
- Use seed passphrase (optional):
+ Use additional passphrase (optional) [Recommended for advanced users only]
@@ -192,7 +187,7 @@ Advanced: If you don't wish to generate a wallet with a seed phrase backup (not
- Input mnemonic passphrase here:
+ Enter passphrase:true
@@ -215,7 +210,7 @@ Advanced: If you don't wish to generate a wallet with a seed phrase backup (not
- Input mnemonic passphrase again:
+ Enter passphrase again:true
@@ -253,12 +248,31 @@ Advanced: If you don't wish to generate a wallet with a seed phrase backup (not
+
+
+
+
+ 0
+ 0
+
+
+
+ If you use RAP addresses, and are restoring a wallet, enter the number of RAP addresses you have created to recover funds received using RAP addresses.
+
+
+ false
+
+
+ 10
+
+
+
- RAP addresses to be created:
+ Number of RAP addresses:
diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts
index 64efd53955..8eb35134fd 100644
--- a/src/qt/locale/bitcoin_zh_CN.ts
+++ b/src/qt/locale/bitcoin_zh_CN.ts
@@ -117,41 +117,32 @@
创建或恢复钱包
- Let's create your Firo wallet!
+ Let's create or restore your Firo wallet!
-Please save these words on paper (order is important). These words serve as your seed and will allow you to recover your wallet in case of a computer failure.
+You will be prompted to write down a recovery seed phrase that allows you to restore your wallet in the future.
-By default we create a 24 word seed but you may choose a 12 word seed should you require it for compatibility reasons.
+Please ensure that you store this securely as anyone with access to the recovery seed phrase can access your funds!
-You can also choose to further encrypt your seed with a passphrase for added security.
+By default, we recommend a 24 word recovery seed phrase.
-Warning:
-* Never disclose your seed
-* Never type it on a website
-* Do not store it electronically.
-* If you encrypt your seed with an additional passphrase, please also record this.
+You can also choose to further encrypt your recovery seed phrase with an additional passphrase (only recommended for advanced users).
+You will need to save this passphrase as well with the recovery seed phrase. Failing to save the passphrase will lead to your funds being irrecoverable.
-If you have an existing seed that you wish to restore, please select "Recover existing wallet" and enter your passphrase (if you have set one for your seed).
-
-Advanced: If you don't wish to generate a wallet with a seed phrase backup (not recommended), you can set usemnemonic=0 in firo.conf.
+If you have an existing recovery seed phrase, please select "Recover existing wallet". If you have secured your recovery seed phrase with an additional passphrase, enter it too.
- 让我们一起创建你的 Firo 钱包吧！
-
-请将这些字保存在纸上（顺序很重要）。这些字将作为你的种子，以便于允许你在计算机故障的情况下恢复你的钱包。
+ 让我们创建或恢复你的Firo钱包!
-默认情况下，我们会创建一个 24 个字的种子，但如果你出于兼容性的原因需要，你也可以选择一个 12 个字的种子。
+你会被提示写下一个恢复种子短语，允许你在未来恢复你的钱包。
-你也可以选择用密码口令进一步加密你的种子，以增加安全性。
+请确保你安全地存储它，因为任何能够访问恢复种子短语的人都可以访问你的资金!
-警告：
-* 切勿透露你的种子
-* 不要在网站上打出来
-* 请不要以电子方式存储
-* 如果你用额外的口令加密种子，也请记录下来。
+默认情况下，我们建议使用24个字的恢复种子短语。
-如果你有一个想要恢复的现有种子，请选择“恢复现有钱包”，然后输入你的密码（如果你已经为种子设置了密码）。
+你也可以选择用一个额外的口令进一步加密你的恢复种子短语（只推荐给高级用户）。
+你将需要把这个密码和恢复种子短语一起保存。如果不保存口令，将导致你的资金无法恢复。
-高级设置：如果你不希望生成一个带有种子短语备份的钱包（不推荐），你可以在 firo.conf 中设置 usemnemonic=0。
+如果你有一个现有的恢复种子短语，请选择 "恢复现有钱包"。
+如果你用一个额外的口令来保证你的恢复种子短语，也请输入它。
@@ -171,32 +162,32 @@ Advanced: If you don't wish to generate a wallet with a seed phrase backup (not
24 个字
- Input words here:
- 请在这里输入：
+ Input recovery seed phrase here:
+ 在这里输入恢复种子短语：
- Use seed passphrase (optional):
- 使用种子口令（可选）：
+ Use additional passphrase (optional) [Recommended for advanced users only]
+ 使用额外的口令（可选） [仅推荐给高级用户]
- Input mnemonic passphrase here:
- 在这里输入记忆口令：
+ Enter passphrase:
+ 输入口令：
- Input mnemonic passphrase again:
- 再次输入记忆口令：
+ Enter passphrase again:
+ 再次输入口令：Wrong number of words. Please try again.字数错误。请再试一次。
- Mnemonic can't be empty.
- 助记词不能是空的。
+ Recovery seed phrase can't be empty.
+ 恢复助记词不能是空的。
- Something went wrong. Please try again.
- 出现问题。请再试一次。
+ You have entered an invalid recovery seed phrase. Please double check the spelling and order.
+ 你输入了一个无效的恢复种子短语。请仔细检查拼写和顺序。Passphrases don't match.
@@ -207,8 +198,12 @@ Advanced: If you don't wish to generate a wallet with a seed phrase backup (not
密码口令不能为空。
- RAP addresses to be created:
- 将要创建的 RAP 地址数量：
+ If you use RAP addresses, and are restoring a wallet, enter the number of RAP addresses you have created to recover funds received using RAP addresses.
+ 如果你使用RAP地址，并且正在恢复一个钱包，请输入你创建的RAP地址的数量，以恢复使用RAP地址收到的资金。
+
+
+ Number of RAP addresses:
+ RAP地址的数量：The number of RAP addresses will be created in the wallet for the initial blockchain scan
@@ -1210,24 +1205,24 @@ After the notification transaction is received by the RAP address issuer, funds
注意
- Please write down these words and keep them in a secure location such as a safe.
- 请写下这些单词，并将其保存在安全的地方，如保险箱。
+ Please write down the recovery seed phrase and keep them in a secure location.
+ 请写下恢复种子短语，并将它们保存在一个安全的地方。
- Your wallet has been created successfully. Using the following sequence of words, you will be able to recover your wallet at any time.
- 你的钱包已经创建成功。使用下面的顺序词，你就可以随时找回你的钱包。
+ Your wallet has been created successfully. Using the following recovery seed phrase, you will be able to recover your wallet and balances at any time.
+ 你的钱包已经成功创建。使用以下恢复种子短语，你将能够随时恢复你的钱包和余额。
- Mnemonic words:
- 助记词：
+ Recovery seed phrase:
+ 恢复种子短语：
- WARNING: Anyone with access to these words can recover your wallet and will have control over your funds!
- 警告：任何有机会接触到这些词的人都可以找回你的钱包，并将控制你的资金！
+ WARNING: Anyone with access to the recovery seed phrase can recover your wallet and will have control over your funds!
+ 警告：任何能够接触到恢复种子短语的人都可以恢复你的钱包，并将控制你的资金！
- Please re-enter the mnemonic words to ensure that you have written it down correctly.
- 请重新输入助记词，以确保你正确地写下了它。
+ Please re-enter the recovery seed phrase to ensure you have written it down correctly.
+ 请重新输入恢复助记词，以确保你正确地写下了它。Your entered words do not match, please press back to re-check your mnemonic.
diff --git a/src/qt/recover.cpp b/src/qt/recover.cpp
index 313e69360f..d939190be2 100644
--- a/src/qt/recover.cpp
+++ b/src/qt/recover.cpp
@@ -127,13 +127,13 @@ bool Recover::askRecover(bool& newWallet)
}
if(mnemonic.empty()) {
- recover.ui->errorMessage->setText("Mnemonic can't be empty.");
+ recover.ui->errorMessage->setText("Recovery seed phrase can't be empty.");
continue;
}
SecureString secmnemonic(mnemonic.begin(), mnemonic.end());
if(!Mnemonic::mnemonic_check(secmnemonic)){
- recover.ui->errorMessage->setText(tr("Something went wrong. Please try again."));
+ recover.ui->errorMessage->setText(tr("You have entered an invalid recovery seed phrase. Please double check the spelling and order."));
continue;
}