Skip to content

Commit 3e3a50a

Browse files
author
MarcoFalke
committed
Merge #13911: doc: Revert translated string change, clarify wallet log messages
c4a884d Trivial: Revert translated string change, clarify wallet log messages (Pierre Rochard) Pull request description: Fixes bitcoin/bitcoin#12992 post-merge nits from @jnewbery Tree-SHA512: 002d8a69b489fd216e15b7d6200d7117c489b32405d5e9f514f120d43113fd97ca2f235452b0093e0760bc03baf714edc4564ae14af8456e1b2a54f83c577bf3
2 parents 8ac7125 + c4a884d commit 3e3a50a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/wallet/wallet.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4021,7 +4021,7 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(const std::string& name,
40214021
}
40224022
}
40234023

4024-
uiInterface.InitMessage(strprintf(_("Loading wallet %s..."), walletFile));
4024+
uiInterface.InitMessage(_("Loading wallet..."));
40254025

40264026
int64_t nStart = GetTimeMillis();
40274027
bool fFirstRun = true;
@@ -4233,7 +4233,7 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(const std::string& name,
42334233
walletInstance->m_spend_zero_conf_change = gArgs.GetBoolArg("-spendzeroconfchange", DEFAULT_SPEND_ZEROCONF_CHANGE);
42344234
walletInstance->m_signal_rbf = gArgs.GetBoolArg("-walletrbf", DEFAULT_WALLET_RBF);
42354235

4236-
walletInstance->WalletLogPrintf("wallet %15dms\n", GetTimeMillis() - nStart);
4236+
walletInstance->WalletLogPrintf("Wallet completed loading in %15dms\n", GetTimeMillis() - nStart);
42374237

42384238
// Try to top up keypool. No-op if the wallet is locked.
42394239
walletInstance->TopUpKeyPool();
@@ -4286,7 +4286,7 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(const std::string& name,
42864286
}
42874287
walletInstance->ScanForWalletTransactions(pindexRescan, nullptr, reserver, true);
42884288
}
4289-
walletInstance->WalletLogPrintf("rescan %15dms\n", GetTimeMillis() - nStart);
4289+
walletInstance->WalletLogPrintf("Rescan completed in %15dms\n", GetTimeMillis() - nStart);
42904290
walletInstance->ChainStateFlushed(chainActive.GetLocator());
42914291
walletInstance->database->IncrementUpdateCounter();
42924292

0 commit comments

Comments
 (0)