rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-26 09:24:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2873

Browse source 
1c838552 Simplewallet.cpp: Fewer pleases in seed NOTE (xmr-eric)
3f18c642 Fix password capitalization mismatch (xmr-eric)
This commit is contained in:
Riccardo Spagni 2017-12-16 23:25:43 +02:00
commit b88f0879b5
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/password.cpp
View file

@ -171,7 +171,7 @@ namespace
return false; return false;
if (verify) if (verify)
{ {
std::cout << "Confirm Password: "; std::cout << "Confirm password: ";
if (!read_from_tty(pass2)) if (!read_from_tty(pass2))
return false; return false;
if(pass1!=pass2) if(pass1!=pass2)

4
src/simplewallet/simplewallet.cpp
View file

@ -1349,8 +1349,8 @@ bool simple_wallet::ask_wallet_create_if_needed()
*/ */
void simple_wallet::print_seed(std::string seed) 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. " success_msg_writer(true) << "\n" << tr("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 " "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"); "your email or on file storage services outside of your immediate control.\n");
boost::replace_nth(seed, " ", 15, "\n"); boost::replace_nth(seed, " ", 15, "\n");
boost::replace_nth(seed, " ", 7, "\n"); boost::replace_nth(seed, " ", 7, "\n");

2
translations/monero.ts
View file

@ -568,7 +568,7 @@
</message> </message>
<message> <message>
<location filename="../src/simplewallet/simplewallet.cpp" line="912"/> <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> </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

2
translations/monero_fr.ts
View file

@ -576,7 +576,7 @@
</message> </message>
<message> <message>
<location filename="../src/simplewallet/simplewallet.cpp" line="912"/> <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> </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>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> </translation>

2
translations/monero_it.ts
View file

@ -578,7 +578,7 @@
</message> </message>
<message> <message>
<location filename="../src/simplewallet/simplewallet.cpp" line="912"/> <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> </source>
<translation>ATTENZIONE: le seguenti 25 parole possono essere usate per ripristinare il tuo portafoglio. Scrivile e conservale da qualche parte al sicuro.</translation> <translation>ATTENZIONE: le seguenti 25 parole possono essere usate per ripristinare il tuo portafoglio. Scrivile e conservale da qualche parte al sicuro.</translation>
</message> </message>