diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-08-09 08:11:15 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-08-09 08:11:17 -0400 |
| commit | 3e3a50aeb8ad81cbbbcc200683e1adeb2dad19de (patch) | |
| tree | 08f623c3390d0be564c152c57cf9f84b95a3a304 | |
| parent | 8ac7125d59ce874d2bc37f5a8dddcc42fc2b5780 (diff) | |
| parent | c4a884d555e75cf43c695517f3f8344be177e5eb (diff) | |
Merge #13911: doc: Revert translated string change, clarify wallet log messages
c4a884d555 Trivial: Revert translated string change, clarify wallet log messages (Pierre Rochard)
Pull request description:
Fixes https://github.com/bitcoin/bitcoin/pull/12992 post-merge nits from @jnewbery
Tree-SHA512: 002d8a69b489fd216e15b7d6200d7117c489b32405d5e9f514f120d43113fd97ca2f235452b0093e0760bc03baf714edc4564ae14af8456e1b2a54f83c577bf3
| -rw-r--r-- | src/wallet/wallet.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index b0c5200c77..597d108aef 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -4021,7 +4021,7 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(const std::string& name, } } - uiInterface.InitMessage(strprintf(_("Loading wallet %s..."), walletFile)); + uiInterface.InitMessage(_("Loading wallet...")); int64_t nStart = GetTimeMillis(); bool fFirstRun = true; @@ -4233,7 +4233,7 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(const std::string& name, walletInstance->m_spend_zero_conf_change = gArgs.GetBoolArg("-spendzeroconfchange", DEFAULT_SPEND_ZEROCONF_CHANGE); walletInstance->m_signal_rbf = gArgs.GetBoolArg("-walletrbf", DEFAULT_WALLET_RBF); - walletInstance->WalletLogPrintf("wallet %15dms\n", GetTimeMillis() - nStart); + walletInstance->WalletLogPrintf("Wallet completed loading in %15dms\n", GetTimeMillis() - nStart); // Try to top up keypool. No-op if the wallet is locked. walletInstance->TopUpKeyPool(); @@ -4286,7 +4286,7 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(const std::string& name, } walletInstance->ScanForWalletTransactions(pindexRescan, nullptr, reserver, true); } - walletInstance->WalletLogPrintf("rescan %15dms\n", GetTimeMillis() - nStart); + walletInstance->WalletLogPrintf("Rescan completed in %15dms\n", GetTimeMillis() - nStart); walletInstance->ChainStateFlushed(chainActive.GetLocator()); walletInstance->database->IncrementUpdateCounter(); |