diff options
| author | Luke Dashjr <[email protected]> | 2012-10-09 23:17:43 +0000 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2012-10-09 23:17:43 +0000 |
| commit | 4cf9b4c6fad8e2ead715c5fbbfb023e05826a94d (patch) | |
| tree | cf8d0b8d7abef0be531d4788b0653b1286136971 /src/bitcoinrpc.cpp | |
| parent | When datadir missing, show messagebox instead of printing error to stderr (diff) | |
| parent | Merge branch '0.4.x' into 0.5.x (diff) | |
| download | discoin-4cf9b4c6fad8e2ead715c5fbbfb023e05826a94d.tar.xz discoin-4cf9b4c6fad8e2ead715c5fbbfb023e05826a94d.zip | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/qt/transactiondesc.cpp
Diffstat (limited to 'src/bitcoinrpc.cpp')
| -rw-r--r-- | src/bitcoinrpc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index 93d4d8fd6..6510377fd 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -1715,7 +1715,7 @@ Value encryptwallet(const Array& params, bool fHelp) // slack space in .dat files; that is bad if the old data is // unencrypted private keys. So: StartShutdown(); - return "wallet encrypted; bitcoin server stopping, restart to run with encrypted wallet"; + return "wallet encrypted; bitcoin server stopping, restart to run with encrypted wallet. The keypool has been flushed, you need to make a new backup."; } |