mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-02-20 14:05:23 +01:00
Merge bitcoin/bitcoin#24367: User-facing content and codebase doc fixups from transifex translator feedback
48742693ac
Replace "can not" with "cannot" in docs, user messages, and tests (Jon Atack)e670edd434
User-facing content fixups from transifex translator feedback (Jon Atack) Pull request description: Closes #24366. ACKs for top commit: laanwj: Code review re-ACK48742693ac
hebasto: re-ACK48742693ac
, only suggested change since my previous [review](https://github.com/bitcoin/bitcoin/pull/24367#pullrequestreview-885938219). Tree-SHA512: 4dcdcb417251a413e65fab6070515e13a1267c8e0dbcf521386b842511391f24c84a0c2168fe13458c977682034466509bf2a3453719d4d94d3c568fd9f4adb4
This commit is contained in:
commit
8add59d77d
18 changed files with 23 additions and 23 deletions
|
@ -192,7 +192,7 @@ fi
|
|||
|
||||
if ! getent services http https ftp > /dev/null 2>&1; then
|
||||
cat << EOF
|
||||
ERR: Your system's C library can not find service database entries for at least
|
||||
ERR: Your system's C library cannot find service database entries for at least
|
||||
one of the following services: http, https, ftp.
|
||||
|
||||
Hint: Most likely, /etc/services does not exist yet (common for docker images
|
||||
|
|
|
@ -331,7 +331,7 @@ other input.
|
|||
failure, it will throw an exception, which can be caught to recover from the
|
||||
error.
|
||||
- For example, a nullptr dereference or any other logic bug in RPC code
|
||||
means that the RPC code is faulty and can not be executed. However, the
|
||||
means that the RPC code is faulty and cannot be executed. However, the
|
||||
logic bug can be shown to the user and the program can continue to run.
|
||||
* `Assume` should be used to document assumptions when program execution can
|
||||
safely continue even if the assumption is violated. In debug builds it
|
||||
|
@ -1199,7 +1199,7 @@ A few guidelines for introducing and reviewing new RPC interfaces:
|
|||
|
||||
- Don't forget to fill in the argument names correctly in the RPC command table.
|
||||
|
||||
- *Rationale*: If not, the call can not be used with name-based arguments.
|
||||
- *Rationale*: If not, the call cannot be used with name-based arguments.
|
||||
|
||||
- Add every non-string RPC argument `(method, idx, name)` to the table `vRPCConvertParams` in `rpc/client.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(), ':', '_');
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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 }");
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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{""},
|
||||
|
|
|
@ -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"));
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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)) {
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -78,7 +78,7 @@ class MempoolCompatibilityTest(BitcoinTestFramework):
|
|||
|
||||
self.stop_nodes()
|
||||
|
||||
self.log.info("Check migrated txindex can not be read by legacy node")
|
||||
self.log.info("Check migrated txindex cannot be read by legacy node")
|
||||
err_msg = f": You need to rebuild the database using -reindex to change -txindex.{os.linesep}Please restart with -reindex or -reindex-chainstate to recover."
|
||||
shutil.rmtree(legacy_chain_dir)
|
||||
shutil.copytree(migrate_chain_dir, legacy_chain_dir)
|
||||
|
|
|
@ -52,7 +52,7 @@ class DecodeScriptTest(BitcoinTestFramework):
|
|||
rpc_result = self.nodes[0].decodescript('5100')
|
||||
assert_equal('1 0', rpc_result['asm'])
|
||||
|
||||
# null data scriptSig - no such thing because null data scripts can not be spent.
|
||||
# null data scriptSig - no such thing because null data scripts cannot be spent.
|
||||
# thus, no test case for that standard transaction type is here.
|
||||
|
||||
def decodescript_script_pub_key(self):
|
||||
|
|
|
@ -23,7 +23,7 @@ class UptimeTest(BitcoinTestFramework):
|
|||
self._test_uptime()
|
||||
|
||||
def _test_negative_time(self):
|
||||
assert_raises_rpc_error(-8, "Mocktime can not be negative: -1.", self.nodes[0].setmocktime, -1)
|
||||
assert_raises_rpc_error(-8, "Mocktime cannot be negative: -1.", self.nodes[0].setmocktime, -1)
|
||||
|
||||
def _test_uptime(self):
|
||||
wait_time = 10
|
||||
|
|
|
@ -35,14 +35,14 @@ class WalletEncryptionTest(BitcoinTestFramework):
|
|||
assert_raises_rpc_error(-15, "Error: running with an unencrypted wallet, but walletpassphrasechange was called.", self.nodes[0].walletpassphrasechange, 'ff', 'ff')
|
||||
|
||||
# Encrypt the wallet
|
||||
assert_raises_rpc_error(-8, "passphrase can not be empty", self.nodes[0].encryptwallet, '')
|
||||
assert_raises_rpc_error(-8, "passphrase cannot be empty", self.nodes[0].encryptwallet, '')
|
||||
self.nodes[0].encryptwallet(passphrase)
|
||||
|
||||
# Test that the wallet is encrypted
|
||||
assert_raises_rpc_error(-13, "Please enter the wallet passphrase with walletpassphrase first", self.nodes[0].signmessage, address, msg)
|
||||
assert_raises_rpc_error(-15, "Error: running with an encrypted wallet, but encryptwallet was called.", self.nodes[0].encryptwallet, 'ff')
|
||||
assert_raises_rpc_error(-8, "passphrase can not be empty", self.nodes[0].walletpassphrase, '', 1)
|
||||
assert_raises_rpc_error(-8, "passphrase can not be empty", self.nodes[0].walletpassphrasechange, '', 'ff')
|
||||
assert_raises_rpc_error(-8, "passphrase cannot be empty", self.nodes[0].walletpassphrase, '', 1)
|
||||
assert_raises_rpc_error(-8, "passphrase cannot be empty", self.nodes[0].walletpassphrasechange, '', 'ff')
|
||||
|
||||
# Check that walletpassphrase works
|
||||
self.nodes[0].walletpassphrase(passphrase, 2)
|
||||
|
|
|
@ -30,7 +30,7 @@ class WalletLocktimeTest(BitcoinTestFramework):
|
|||
)
|
||||
self.generate(node, 1)
|
||||
|
||||
self.log.info("Check that clock can not change finality of confirmed txs")
|
||||
self.log.info("Check that clock cannot change finality of confirmed txs")
|
||||
amount_before_ad = node.getreceivedbyaddress(address)
|
||||
amount_before_lb = node.getreceivedbylabel(label)
|
||||
list_before_ad = node.listreceivedbyaddress(address_filter=address)
|
||||
|
|
|
@ -93,7 +93,7 @@ def bctest(testDir, testObj, buildenv):
|
|||
try:
|
||||
outputData = open(os.path.join(testDir, outputFn), encoding="utf8").read()
|
||||
except:
|
||||
logging.error("Output file " + outputFn + " can not be opened")
|
||||
logging.error("Output file " + outputFn + " cannot be opened")
|
||||
raise
|
||||
if not outputData:
|
||||
logging.error("Output data missing for " + outputFn)
|
||||
|
|
Loading…
Add table
Reference in a new issue