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
firoorg · Jul 20, 2022 · 5be0776 · 5be0776
1 parent 6fdc3a0
commit 5be0776
Show file tree

Hide file tree

Showing 4 changed files with 81 additions and 72 deletions.
diff --git a/src/qt/forms/notifymnemonic.ui b/src/qt/forms/notifymnemonic.ui
@@ -42,7 +42,7 @@
                             </sizepolicy>
                         </property>
                         <property name="text">
-                            <string>Your wallet has been created successfully. Using the following sequence of words, you will be able to recover your wallet at any time.</string>
+                            <string>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.</string>
                         </property>
                         <property name="wordWrap">
                             <bool>true</bool>
@@ -52,7 +52,7 @@
                 <item>
                     <widget class="QLabel" name="textLabel4">
                         <property name="text">
-                            <string>Mnemonic words:</string>
+                            <string>Recovery seed phrase:</string>
                         </property>
                         <property name="wordWrap">
                             <bool>true</bool>
@@ -112,7 +112,7 @@
                 <item>
                     <widget class="QLabel" name="textLabel2">
                         <property name="text">
-                            <string>Please write down these words and keep them in a secure location such as a safe.</string>
+                            <string>Please write down these recovery seed phrase and keep them in a secure location.</string>
                         </property>
                         <property name="wordWrap">
                             <bool>true</bool>
@@ -122,7 +122,7 @@
                 <item>
                     <widget class="QLabel" name="textLabel3">
                         <property name="text">
-                            <string>WARNING: Anyone with access to these words can recover your wallet and will have control over your funds!</string>
+                            <string>WARNING: Anyone with access to the recovery seed phrase can recover your wallet and will have control over your funds!</string>
                         </property>
                         <property name="wordWrap">
                             <bool>true</bool>
@@ -142,7 +142,7 @@
                 <item>
                     <widget class="QLabel" name="textLabel5">
                         <property name="text">
-                            <string>Please re-enter the mnemonic words to ensure that you have written it down correctly.</string>
+                            <string>Please re-enter the recovery seed phrase to ensure you have written it down correctly.</string>
                         </property>
                         <property name="wordWrap">
                             <bool>true</bool>

diff --git a/src/qt/forms/recover.ui b/src/qt/forms/recover.ui
@@ -29,23 +29,18 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>Let's create your Firo wallet!
+      <string>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.
       </string>
      </property>
      <property name="wordWrap">
@@ -143,7 +138,7 @@ Advanced: If you don't wish to generate a wallet with a seed phrase backup (not
      <item>
       <widget class="QLabel" name="textLabel2">
        <property name="text">
-        <string>Input words here:</string>
+        <string>Input recovery seed phrase here:</string>
        </property>
        <property name="wordWrap">
         <bool>true</bool>
@@ -177,7 +172,7 @@ Advanced: If you don't wish to generate a wallet with a seed phrase backup (not
       <item>
        <widget class="QCheckBox" name="usePassphrase">
         <property name="text">
-         <string>Use seed passphrase (optional):</string>
+         <string>Use additional passphrase (optional) [Recommended for advanced users only]</string>
         </property>
        </widget>
       </item>
@@ -192,7 +187,7 @@ Advanced: If you don't wish to generate a wallet with a seed phrase backup (not
      <item row="0" column="0">
       <widget class="QLabel" name="textLabel4">
        <property name="text">
-        <string>Input mnemonic passphrase here:</string>
+        <string>Enter passphrase:</string>
        </property>
        <property name="wordWrap">
         <bool>true</bool>
@@ -215,7 +210,7 @@ Advanced: If you don't wish to generate a wallet with a seed phrase backup (not
      <item row="1" column="0">
       <widget class="QLabel" name="textLabel3">
        <property name="text">
-        <string>Input mnemonic passphrase again:</string>
+        <string>Enter passphrase again:</string>
        </property>
        <property name="wordWrap">
         <bool>true</bool>
@@ -253,12 +248,31 @@ Advanced: If you don't wish to generate a wallet with a seed phrase backup (not
      </property>
     </widget>
    </item>
+   <item>
+    <widget class="QLabel" name="textLabelPcodes">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>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.</string>
+     </property>
+     <property name="wordWrap">
+      <bool>false</bool>
+     </property>
+     <property name="margin">
+      <number>10</number>
+     </property>
+    </widget>
+   </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
       <widget class="QLabel" name="labelPcodes">
        <property name="text">
-        <string>RAP addresses to be created:</string>
+        <string>Number of RAP addresses:</string>
        </property>
       </widget>
      </item>

diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts
@@ -117,41 +117,32 @@
         <translation>创建或恢复钱包</translation>
     </message>
     <message>
-        <source>Let's create your Firo wallet!
+        <source>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.
       </source>
-        <translation>让我们一起创建你的 Firo 钱包吧！
-
-请将这些字保存在纸上（顺序很重要）。这些字将作为你的种子，以便于允许你在计算机故障的情况下恢复你的钱包。
+        <translation>让我们创建或恢复你的Firo钱包!
 
-默认情况下，我们会创建一个 24 个字的种子，但如果你出于兼容性的原因需要，你也可以选择一个 12 个字的种子。
+你会被提示写下一个恢复种子短语，允许你在未来恢复你的钱包。
 
-你也可以选择用密码口令进一步加密你的种子，以增加安全性。
+请确保你安全地存储它，因为任何能够访问恢复种子短语的人都可以访问你的资金!
 
-警告：
-* 切勿透露你的种子
-* 不要在网站上打出来
-* 请不要以电子方式存储
-* 如果你用额外的口令加密种子，也请记录下来。
+默认情况下，我们建议使用24个字的恢复种子短语。
 
-如果你有一个想要恢复的现有种子，请选择“恢复现有钱包”，然后输入你的密码（如果你已经为种子设置了密码）。
+你也可以选择用一个额外的口令进一步加密你的恢复种子短语（只推荐给高级用户）。
+你将需要把这个密码和恢复种子短语一起保存。如果不保存口令，将导致你的资金无法恢复。
 
-高级设置：如果你不希望生成一个带有种子短语备份的钱包（不推荐），你可以在 firo.conf 中设置 usemnemonic=0。
+如果你有一个现有的恢复种子短语，请选择 "恢复现有钱包"。
+如果你用一个额外的口令来保证你的恢复种子短语，也请输入它。
         </translation>
     </message>
     <message>
@@ -171,32 +162,32 @@ Advanced: If you don't wish to generate a wallet with a seed phrase backup (not
         <translation>24 个字</translation>
     </message>
     <message>
-        <source>Input words here:</source>
-        <translation>请在这里输入：</translation>
+        <source>Input recovery seed phrase here:</source>
+        <translation>在这里输入恢复种子短语：</translation>
     </message>
     <message>
-        <source>Use seed passphrase (optional):</source>
-        <translation>使用种子口令（可选）：</translation>
+        <source>Use additional passphrase (optional) [Recommended for advanced users only]</source>
+        <translation>使用额外的口令（可选） [仅推荐给高级用户]  </translation>
     </message>
     <message>
-        <source>Input mnemonic passphrase here:</source>
-        <translation>在这里输入记忆口令：</translation>
+        <source>Enter passphrase:</source>
+        <translation>输入口令：</translation>
     </message>
     <message>
-        <source>Input mnemonic passphrase again:</source>
-        <translation>再次输入记忆口令：</translation>
+        <source>Enter passphrase again:</source>
+        <translation>再次输入口令：</translation>
     </message>
     <message>
         <source>Wrong number of words. Please try again.</source>
         <translation>字数错误。请再试一次。</translation>
     </message>
     <message>
-        <source>Mnemonic can't be empty.</source>
-        <translation>助记词不能是空的。</translation>
+        <source>Recovery seed phrase can't be empty.</source>
+        <translation>恢复助记词不能是空的。</translation>
     </message>
     <message>
-        <source>Something went wrong. Please try again.</source>
-        <translation>出现问题。请再试一次。</translation>
+        <source>You have entered an invalid recovery seed phrase. Please double check the spelling and order.</source>
+        <translation>你输入了一个无效的恢复种子短语。请仔细检查拼写和顺序。</translation>
     </message>
     <message>
         <source>Passphrases don't match.</source>
@@ -207,8 +198,12 @@ Advanced: If you don't wish to generate a wallet with a seed phrase backup (not
         <translation>密码口令不能为空。</translation>
     </message>
     <message>
-        <source>RAP addresses to be created:</source>
-        <translation>将要创建的 RAP 地址数量：</translation>
+        <source>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.</source>
+        <translation>如果你使用RAP地址，并且正在恢复一个钱包，请输入你创建的RAP地址的数量，以恢复使用RAP地址收到的资金。</translation>
+    </message>
+    <message>
+        <source>Number of RAP addresses:</source>
+        <translation>RAP地址的数量：</translation>
     </message>
     <message>
         <source>The number of RAP addresses will be created in the wallet for the initial blockchain scan</source>
@@ -1210,24 +1205,24 @@ After the notification transaction is received by the RAP address issuer, funds
         <translation>注意</translation>
     </message>
     <message>
-        <source>Please write down these words and keep them in a secure location such as a safe.</source>
-        <translation>请写下这些单词，并将其保存在安全的地方，如保险箱。</translation>
+        <source>Please write down the recovery seed phrase and keep them in a secure location.</source>
+        <translation>请写下恢复种子短语，并将它们保存在一个安全的地方。</translation>
     </message>
     <message>
-        <source>Your wallet has been created successfully. Using the following sequence of words, you will be able to recover your wallet at any time.</source>
-        <translation>你的钱包已经创建成功。使用下面的顺序词，你就可以随时找回你的钱包。</translation>
+        <source>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.</source>
+        <translation>你的钱包已经成功创建。使用以下恢复种子短语，你将能够随时恢复你的钱包和余额。</translation>
     </message>
     <message>
-        <source>Mnemonic words:</source>
-        <translation>助记词：</translation>
+        <source>Recovery seed phrase:</source>
+        <translation>恢复种子短语：</translation>
     </message>
     <message>
-        <source>WARNING: Anyone with access to these words can recover your wallet and will have control over your funds!</source>
-        <translation>警告：任何有机会接触到这些词的人都可以找回你的钱包，并将控制你的资金！</translation>
+        <source>WARNING: Anyone with access to the recovery seed phrase can recover your wallet and will have control over your funds!</source>
+        <translation>警告：任何能够接触到恢复种子短语的人都可以恢复你的钱包，并将控制你的资金！</translation>
     </message>
     <message>
-        <source>Please re-enter the mnemonic words to ensure that you have written it down correctly.</source>
-        <translation>请重新输入助记词，以确保你正确地写下了它。</translation>
+        <source>Please re-enter the recovery seed phrase to ensure you have written it down correctly.</source>
+        <translation>请重新输入恢复助记词，以确保你正确地写下了它。</translation>
     </message>
     <message>
         <source>Your entered words do not match, please press back to re-check your mnemonic.</source>

diff --git 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;
                     }