Merge pull request #2873

1c838552 Simplewallet.cpp: Fewer pleases in seed NOTE (xmr-eric)
3f18c642 Fix password capitalization mismatch (xmr-eric)

5 files changed, 6 insertions, 6 deletions

diff --git a/src/common/password.cpp b/src/common/password.cpp
index 98a49eb80..dc0856160 100644
--- a/src/common/password.cpp
+++ b/src/common/password.cpp
@@ -171,7 +171,7 @@ namespace
         return false;
       if (verify)
       {
-        std::cout << "Confirm Password: ";
+        std::cout << "Confirm password: ";
         if (!read_from_tty(pass2))
           return false;
         if(pass1!=pass2)
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 489bbfb4b..bbf794c05 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -1349,8 +1349,8 @@ bool simple_wallet::ask_wallet_create_if_needed()
  */
 void simple_wallet::print_seed(std::string seed)
 {
-  success_msg_writer(true) << "\n" << tr("PLEASE NOTE: the following 25 words can be used to recover access to your wallet. "
-    "Please write them down and store them somewhere safe and secure. Please do not store them in "
+  success_msg_writer(true) << "\n" << tr("NOTE: the following 25 words can be used to recover access to your wallet. "
+    "Write them down and store them somewhere safe and secure. Please do not store them in "
     "your email or on file storage services outside of your immediate control.\n");
   boost::replace_nth(seed, " ", 15, "\n");
   boost::replace_nth(seed, " ", 7, "\n");
diff --git a/translations/monero.ts b/translations/monero.ts
index c65013f12..9c1888ac2 100644
--- a/translations/monero.ts
+++ b/translations/monero.ts
@@ -568,7 +568,7 @@
     </message>
     <message>
         <location filename="../src/simplewallet/simplewallet.cpp" line="912"/>
-        <source>PLEASE NOTE: the following 25 words can be used to recover access to your wallet. Please write them down and store them somewhere safe and secure. Please do not store them in your email or on file storage services outside of your immediate control.
+        <source>NOTE: the following 25 words can be used to recover access to your wallet. Write them down and store them somewhere safe and secure. Please do not store them in your email or on file storage services outside of your immediate control.
 </source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/translations/monero_fr.ts b/translations/monero_fr.ts
index 58fcc17e1..7d07be125 100644
--- a/translations/monero_fr.ts
+++ b/translations/monero_fr.ts
@@ -576,7 +576,7 @@
     </message>
     <message>
         <location filename="../src/simplewallet/simplewallet.cpp" line="912"/>
-        <source>PLEASE NOTE: the following 25 words can be used to recover access to your wallet. Please write them down and store them somewhere safe and secure. Please do not store them in your email or on file storage services outside of your immediate control.
+        <source>NOTE: the following 25 words can be used to recover access to your wallet. Write them down and store them somewhere safe and secure. Please do not store them in your email or on file storage services outside of your immediate control.
 </source>
         <translation>VEUILLEZ NOTER : les 25 mots suivants peuvent être utilisés pour restaurer votre portefeuille. Veuillez les écrire sur papier et les garder dans un endroit sûr. Ne les gardez pas dans un courriel ou dans un service de stockage de fichiers hors de votre contrôle.
 </translation>
diff --git a/translations/monero_it.ts b/translations/monero_it.ts
index 10c1599df..787651da2 100644
--- a/translations/monero_it.ts
+++ b/translations/monero_it.ts
@@ -578,7 +578,7 @@
     </message>
     <message>
         <location filename="../src/simplewallet/simplewallet.cpp" line="912"/>
-        <source>PLEASE NOTE: the following 25 words can be used to recover access to your wallet. Please write them down and store them somewhere safe and secure. Please do not store them in your email or on file storage services outside of your immediate control.
+        <source>NOTE: the following 25 words can be used to recover access to your wallet. Write them down and store them somewhere safe and secure. Please do not store them in your email or on file storage services outside of your immediate control.
 </source>
         <translation>ATTENZIONE: le seguenti 25 parole possono essere usate per ripristinare il tuo portafoglio. Scrivile e conservale da qualche parte al sicuro.</translation>
     </message>