aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorlaanwj <126646+laanwj@users.noreply.github.com>2022-02-22 12:38:12 +0100
committerlaanwj <126646+laanwj@users.noreply.github.com>2022-02-22 13:08:08 +0100
commit8add59d77dd621be57059229f378822e4b707318 (patch)
tree488004fc4d8aae842df22ce255addd8f8acad0ba /src
parente200919cbe243133fd3b6db516263592549175ae (diff)
parent48742693acc9de837735674057c9aae2fe90bd1d (diff)
downloadbitcoin-8add59d77dd621be57059229f378822e4b707318.tar.xz
Merge bitcoin/bitcoin#24367: User-facing content and codebase doc fixups from transifex translator feedback
48742693acc9de837735674057c9aae2fe90bd1d Replace "can not" with "cannot" in docs, user messages, and tests (Jon Atack) e670edd43441ecb6e5978d65348501c57d856030 User-facing content fixups from transifex translator feedback (Jon Atack) Pull request description: Closes #24366. ACKs for top commit: laanwj: Code review re-ACK 48742693acc9de837735674057c9aae2fe90bd1d hebasto: re-ACK 48742693acc9de837735674057c9aae2fe90bd1d, only suggested change since my previous [review](https://github.com/bitcoin/bitcoin/pull/24367#pullrequestreview-885938219). Tree-SHA512: 4dcdcb417251a413e65fab6070515e13a1267c8e0dbcf521386b842511391f24c84a0c2168fe13458c977682034466509bf2a3453719d4d94d3c568fd9f4adb4
Diffstat (limited to 'src')
-rw-r--r--src/net.cpp2
-rw-r--r--src/qt/bitcoin.cpp2
-rw-r--r--src/qt/intro.cpp2
-rw-r--r--src/rpc/misc.cpp2
-rw-r--r--src/rpc/rawtransaction.cpp2
-rw-r--r--src/test/util_tests.cpp2
-rw-r--r--src/txdb.cpp2
-rw-r--r--src/validation.cpp2
-rw-r--r--src/wallet/rpc/encrypt.cpp6
-rw-r--r--src/wallet/spend.cpp2
10 files changed, 12 insertions, 12 deletions
diff --git a/src/net.cpp b/src/net.cpp
index bee8710062..d5763ee68b 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -3097,7 +3097,7 @@ void CaptureMessage(const CAddress& addr, const std::string& msg_type, const Spa
// layer (processing) perspective.
auto now = GetTime<std::chrono::microseconds>();
- // Windows folder names can not include a colon
+ // Windows folder names cannot include a colon
std::string clean_addr = addr.ToString();
std::replace(clean_addr.begin(), clean_addr.end(), ':', '_');
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index ac313bdb9d..d6f80e1558 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -519,7 +519,7 @@ int GuiMain(int argc, char* argv[])
InitError(strprintf(Untranslated("Error parsing command line arguments: %s\n"), error));
// Create a message box, because the gui has neither been created nor has subscribed to core signals
QMessageBox::critical(nullptr, PACKAGE_NAME,
- // message can not be translated because translations have not been initialized
+ // message cannot be translated because translations have not been initialized
QString::fromStdString("Error parsing command line arguments: %1.").arg(QString::fromStdString(error)));
return EXIT_FAILURE;
}
diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp
index e9a4034e62..dcde7adec4 100644
--- a/src/qt/intro.cpp
+++ b/src/qt/intro.cpp
@@ -298,7 +298,7 @@ void Intro::setStatus(int status, const QString &message, quint64 bytesAvailable
void Intro::UpdateFreeSpaceLabel()
{
- QString freeString = tr("%1 GB of free space available").arg(m_bytes_available / GB_BYTES);
+ QString freeString = tr("%1 GB of space available").arg(m_bytes_available / GB_BYTES);
if (m_bytes_available < m_required_space_gb * GB_BYTES) {
freeString += " " + tr("(of %1 GB needed)").arg(m_required_space_gb);
ui->freeSpace->setStyleSheet("QLabel { color: #800000 }");
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index 8d574e0359..8d7b48d697 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -426,7 +426,7 @@ static RPCHelpMan setmocktime()
RPCTypeCheck(request.params, {UniValue::VNUM});
const int64_t time{request.params[0].get_int64()};
if (time < 0) {
- throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Mocktime can not be negative: %s.", time));
+ throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Mocktime cannot be negative: %s.", time));
}
SetMockTime(time);
auto node_context = util::AnyPtr<NodeContext>(request.context);
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 023ddbe73e..6272a7c8cf 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -380,7 +380,7 @@ static RPCHelpMan verifytxoutproof()
RPCResult{
RPCResult::Type::ARR, "", "",
{
- {RPCResult::Type::STR_HEX, "txid", "The txid(s) which the proof commits to, or empty array if the proof can not be validated."},
+ {RPCResult::Type::STR_HEX, "txid", "The txid(s) which the proof commits to, or empty array if the proof cannot be validated."},
}
},
RPCExamples{""},
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
index 22ce9b0582..9f78215de2 100644
--- a/src/test/util_tests.cpp
+++ b/src/test/util_tests.cpp
@@ -1286,7 +1286,7 @@ BOOST_AUTO_TEST_CASE(util_ParseMoney)
BOOST_CHECK_EQUAL(ParseMoney("0.00000001 ").value(), COIN/100000000);
BOOST_CHECK_EQUAL(ParseMoney(" 0.00000001").value(), COIN/100000000);
- // Parsing amount that can not be represented should fail
+ // Parsing amount that cannot be represented should fail
BOOST_CHECK(!ParseMoney("100000000.00"));
BOOST_CHECK(!ParseMoney("0.000000001"));
diff --git a/src/txdb.cpp b/src/txdb.cpp
index 5e4379a60a..9a39e90ccd 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -36,7 +36,7 @@ std::optional<bilingual_str> CheckLegacyTxindex(CBlockTreeDB& block_tree_db)
{
CBlockLocator ignored{};
if (block_tree_db.Read(DB_TXINDEX_BLOCK, ignored)) {
- return _("The -txindex upgrade started by a previous version can not be completed. Restart with the previous version or run a full -reindex.");
+ return _("The -txindex upgrade started by a previous version cannot be completed. Restart with the previous version or run a full -reindex.");
}
bool txindex_legacy_flag{false};
block_tree_db.ReadFlag("txindex", txindex_legacy_flag);
diff --git a/src/validation.cpp b/src/validation.cpp
index 86d0022947..035b5783c3 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -2077,7 +2077,7 @@ bool CChainState::ConnectBlock(const CBlock& block, BlockValidationState& state,
fEnforceBIP30 = fEnforceBIP30 && (!pindexBIP34height || !(pindexBIP34height->GetBlockHash() == m_params.GetConsensus().BIP34Hash));
// TODO: Remove BIP30 checking from block height 1,983,702 on, once we have a
- // consensus change that ensures coinbases at those heights can not
+ // consensus change that ensures coinbases at those heights cannot
// duplicate earlier coinbases.
if (fEnforceBIP30 || pindex->nHeight >= BIP34_IMPLIES_BIP30_LIMIT) {
for (const auto& tx : block.vtx) {
diff --git a/src/wallet/rpc/encrypt.cpp b/src/wallet/rpc/encrypt.cpp
index 2b6a2a198d..802cc63d6d 100644
--- a/src/wallet/rpc/encrypt.cpp
+++ b/src/wallet/rpc/encrypt.cpp
@@ -66,7 +66,7 @@ RPCHelpMan walletpassphrase()
}
if (strWalletPass.empty()) {
- throw JSONRPCError(RPC_INVALID_PARAMETER, "passphrase can not be empty");
+ throw JSONRPCError(RPC_INVALID_PARAMETER, "passphrase cannot be empty");
}
if (!pwallet->Unlock(strWalletPass)) {
@@ -139,7 +139,7 @@ RPCHelpMan walletpassphrasechange()
strNewWalletPass = request.params[1].get_str().c_str();
if (strOldWalletPass.empty() || strNewWalletPass.empty()) {
- throw JSONRPCError(RPC_INVALID_PARAMETER, "passphrase can not be empty");
+ throw JSONRPCError(RPC_INVALID_PARAMETER, "passphrase cannot be empty");
}
if (!pwallet->ChangeWalletPassphrase(strOldWalletPass, strNewWalletPass)) {
@@ -236,7 +236,7 @@ RPCHelpMan encryptwallet()
strWalletPass = request.params[0].get_str().c_str();
if (strWalletPass.empty()) {
- throw JSONRPCError(RPC_INVALID_PARAMETER, "passphrase can not be empty");
+ throw JSONRPCError(RPC_INVALID_PARAMETER, "passphrase cannot be empty");
}
if (!pwallet->EncryptWallet(strWalletPass)) {
diff --git a/src/wallet/spend.cpp b/src/wallet/spend.cpp
index 3d8ae2da69..83eaececc1 100644
--- a/src/wallet/spend.cpp
+++ b/src/wallet/spend.cpp
@@ -778,7 +778,7 @@ static bool CreateTransactionInternal(
}
else if ((unsigned int)nChangePosInOut > txNew.vout.size())
{
- error = _("Change index out of range");
+ error = _("Transaction change output index out of range");
return false;
}