diff options
| author | Jonas Schnelli <[email protected]> | 2013-04-02 21:53:41 +0200 |
|---|---|---|
| committer | Jonas Schnelli <[email protected]> | 2013-04-02 21:53:41 +0200 |
| commit | 6f21d15375c0ca264a4bc3470685e0f364fa8ffe (patch) | |
| tree | 04c59f05614eb95490625c8d1b9ca3e1b91b25d1 /src/bitcoinrpc.cpp | |
| parent | change new mac icon license to public domain (diff) | |
| parent | Merge pull request #2420 from sipa/globclean (diff) | |
| download | discoin-6f21d15375c0ca264a4bc3470685e0f364fa8ffe.tar.xz discoin-6f21d15375c0ca264a4bc3470685e0f364fa8ffe.zip | |
Merge branch 'master' of git://github.com/bitcoin/bitcoin
Diffstat (limited to 'src/bitcoinrpc.cpp')
| -rw-r--r-- | src/bitcoinrpc.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index b6d8de4a1..84478398c 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -763,7 +763,8 @@ void ThreadRPCServer2(void* parg) else if (mapArgs.count("-daemon")) strWhatAmI = strprintf(_("To use the %s option"), "\"-daemon\""); uiInterface.ThreadSafeMessageBox(strprintf( - _("%s, you must set a rpcpassword in the configuration file:\n %s\n" + _("%s, you must set a rpcpassword in the configuration file:\n" + "%s\n" "It is recommended you use the following random password:\n" "rpcuser=bitcoinrpc\n" "rpcpassword=%s\n" |