aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGavin Andresen <[email protected]>2012-10-01 16:51:24 -0400
committerGavin Andresen <[email protected]>2012-10-01 16:51:24 -0400
commitd2cc6f489cc8dffdf80e5535795ab37bb642b1bc (patch)
tree290e35be81b2631a232c79c61552f856ade6cda0 /src
parentMerge pull request #1893 from kjj2/issue1884 (diff)
parentWhen encrypting the wallet, warn user that old backups will become useless. (diff)
downloaddiscoin-d2cc6f489cc8dffdf80e5535795ab37bb642b1bc.tar.xz
discoin-d2cc6f489cc8dffdf80e5535795ab37bb642b1bc.zip
Merge branch 'master' of github.com:runeksvendsen/bitcoin
Diffstat (limited to 'src')
-rw-r--r--src/qt/askpassphrasedialog.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/qt/askpassphrasedialog.cpp b/src/qt/askpassphrasedialog.cpp
index 1eccaa9f8..03aa7af0b 100644
--- a/src/qt/askpassphrasedialog.cpp
+++ b/src/qt/askpassphrasedialog.cpp
@@ -108,7 +108,16 @@ void AskPassphraseDialog::accept()
if(model->setWalletEncrypted(true, newpass1))
{
QMessageBox::warning(this, tr("Wallet encrypted"),
- tr("Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer."));
+ "<qt>" +
+ tr("Bitcoin will close now to finish the encryption process. "
+ "Remember that encrypting your wallet cannot fully protect "
+ "your bitcoins from being stolen by malware infecting your computer.") +
+ "<br><br><b>" +
+ tr("IMPORTANT: Any previous backups you have made of your wallet file "
+ "should be replaced with the newly generated, encrypted wallet file. "
+ "For security reasons, previous backups of the unencrypted wallet file "
+ "will become useless as soon as you start using the new, encrypted wallet.") +
+ "</b></qt>");
QApplication::quit();
}
else