(partial) Merge bitcoin#24367: User-facing content and codebase doc fixups from transifex translator feedback

laanwj · vijaydasmp · commit c36eff704fff · 2025-01-04T19:10:17.000+05:30
4874269 Replace "can not" with "cannot" in docs, user messages, and tests (Jon Atack) e670edd User-facing content fixups from transifex translator feedback (Jon Atack) Pull request description: Closes bitcoin#24366. ACKs for top commit: laanwj: Code review re-ACK 4874269 hebasto: re-ACK 4874269, only suggested change since my previous [review](bitcoin#24367 (review)). Tree-SHA512: 4dcdcb417251a413e65fab6070515e13a1267c8e0dbcf521386b842511391f24c84a0c2168fe13458c977682034466509bf2a3453719d4d94d3c568fd9f4adb4
diff --git a/contrib/guix/guix-build b/contrib/guix/guix-build
@@ -194,7 +194,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
diff --git a/doc/developer-notes.md b/doc/developer-notes.md
@@ -445,7 +445,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
@@ -1352,7 +1352,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`.
 
diff --git a/src/net.cpp b/src/net.cpp
@@ -5189,7 +5189,7 @@ void CaptureMessageToFile(const CAddress& addr,
     // 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.ToStringAddrPort();
     std::replace(clean_addr.begin(), clean_addr.end(), ':', '_');
 
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
@@ -510,7 +510,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
@@ -304,7 +304,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(GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_ERROR));
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
@@ -499,7 +499,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);
     if (auto* node_context = GetContext<NodeContext>(request.context)) {
diff --git a/src/rpc/txoutproof.cpp b/src/rpc/txoutproof.cpp
@@ -133,7 +133,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
@@ -1375,7 +1375,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
@@ -40,7 +40,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/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
@@ -2015,7 +2015,7 @@ static 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, fForMixingOnly)) {
@@ -2087,7 +2087,7 @@ static 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)) {
@@ -2184,7 +2184,7 @@ static 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/wallet.cpp b/src/wallet/wallet.cpp
@@ -3783,7 +3783,7 @@ bool CWallet::CreateTransactionInternal(
                             }
                             else if ((unsigned int)nChangePosRequest > txNew.vout.size())
                             {
-                                error = _("Change index out of range");
+                                error = _("Transaction change output index out of range");
                                 return false;
                             } else {
                                 nChangePosInOut = nChangePosRequest;
diff --git a/test/functional/feature_txindex_compatibility.py b/test/functional/feature_txindex_compatibility.py
@@ -83,7 +83,7 @@ def run_test(self):
 
         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)
diff --git a/test/functional/rpc_decodescript.py b/test/functional/rpc_decodescript.py
@@ -48,7 +48,7 @@ def decodescript_script_sig(self):
         rpc_result = self.nodes[0].decodescript('5100')
         assert_equal('1 0', rpc_result['asm'])
 
-        # 5) null data scriptSig - no such thing because null data scripts can not be spent.
+        # 5) 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):
diff --git a/test/functional/rpc_uptime.py b/test/functional/rpc_uptime.py
@@ -23,7 +23,7 @@ def run_test(self):
         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
diff --git a/test/functional/wallet_encryption.py b/test/functional/wallet_encryption.py
@@ -35,14 +35,14 @@ def run_test(self):
         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)
diff --git a/test/util/test_runner.py b/test/util/test_runner.py
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -510,7 +510,7 @@ int GuiMain(int argc, char* argv[])`
`510`	`510`	`InitError(strprintf(Untranslated("Error parsing command line arguments: %s\n"), error));`
`511`	`511`	`// Create a message box, because the gui has neither been created nor has subscribed to core signals`
`512`	`512`	`QMessageBox::critical(nullptr, PACKAGE_NAME,`
`513`		`- // message can not be translated because translations have not been initialized`
	`513`	`+ // message cannot be translated because translations have not been initialized`
`514`	`514`	`QString::fromStdString("Error parsing command line arguments: %1.").arg(QString::fromStdString(error)));`
`515`	`515`	`return EXIT_FAILURE;`
`516`	`516`	`}`
Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ void Intro::setStatus(int status, const QString &message, quint64 bytesAvailable`
`304`	`304`
`305`	`305`	`void Intro::UpdateFreeSpaceLabel()`
`306`	`306`	`{`
`307`		`- QString freeString = tr("%1 GB of free space available").arg(m_bytes_available / GB_BYTES);`
	`307`	`+ QString freeString = tr("%1 GB of space available").arg(m_bytes_available / GB_BYTES);`
`308`	`308`	`if (m_bytes_available < m_required_space_gb * GB_BYTES) {`
`309`	`309`	`freeString += " " + tr("(of %1 GB needed)").arg(m_required_space_gb);`
`310`	`310`	`ui->freeSpace->setStyleSheet(GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_ERROR));`
Original file line number	Diff line number	Diff line change
`@@ -499,7 +499,7 @@ static RPCHelpMan setmocktime()`
`499`	`499`	`RPCTypeCheck(request.params, {UniValue::VNUM});`
`500`	`500`	`const int64_t time{request.params[0].get_int64()};`
`501`	`501`	`if (time < 0) {`
`502`		`- throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Mocktime can not be negative: %s.", time));`
	`502`	`+ throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Mocktime cannot be negative: %s.", time));`
`503`	`503`	`}`
`504`	`504`	`SetMockTime(time);`
`505`	`505`	`if (auto* node_context = GetContext<NodeContext>(request.context)) {`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ static RPCHelpMan verifytxoutproof()`
`133`	`133`	`RPCResult{`
`134`	`134`	`RPCResult::Type::ARR, "", "",`
`135`	`135`	`{`
`136`		`- {RPCResult::Type::STR_HEX, "txid", "The txid(s) which the proof commits to, or empty array if the proof can not be validated."},`
	`136`	`+ {RPCResult::Type::STR_HEX, "txid", "The txid(s) which the proof commits to, or empty array if the proof cannot be validated."},`
`137`	`137`	`}`
`138`	`138`	`},`
`139`	`139`	`RPCExamples{`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ std::optional<bilingual_str> CheckLegacyTxindex(CBlockTreeDB& block_tree_db)`
`40`	`40`	`{`
`41`	`41`	`CBlockLocator ignored{};`
`42`	`42`	`if (block_tree_db.Read(DB_TXINDEX_BLOCK, ignored)) {`
`43`		`- return _("The -txindex upgrade started by a previous version can not be completed. Restart with the previous version or run a full -reindex.");`
	`43`	`+ return _("The -txindex upgrade started by a previous version cannot be completed. Restart with the previous version or run a full -reindex.");`
`44`	`44`	`}`
`45`	`45`	`bool txindex_legacy_flag{false};`
`46`	`46`	`block_tree_db.ReadFlag("txindex", txindex_legacy_flag);`
Original file line number	Diff line number	Diff line change
`@@ -2015,7 +2015,7 @@ static RPCHelpMan walletpassphrase()`
`2015`	`2015`	`}`
`2016`	`2016`
`2017`	`2017`	`if (strWalletPass.empty()) {`
`2018`		`- throw JSONRPCError(RPC_INVALID_PARAMETER, "passphrase can not be empty");`
	`2018`	`+ throw JSONRPCError(RPC_INVALID_PARAMETER, "passphrase cannot be empty");`
`2019`	`2019`	`}`
`2020`	`2020`
`2021`	`2021`	`if (!pwallet->Unlock(strWalletPass, fForMixingOnly)) {`
`@@ -2087,7 +2087,7 @@ static RPCHelpMan walletpassphrasechange()`
`2087`	`2087`	`strNewWalletPass = request.params[1].get_str().c_str();`
`2088`	`2088`
`2089`	`2089`	`if (strOldWalletPass.empty() \|\| strNewWalletPass.empty()) {`
`2090`		`- throw JSONRPCError(RPC_INVALID_PARAMETER, "passphrase can not be empty");`
	`2090`	`+ throw JSONRPCError(RPC_INVALID_PARAMETER, "passphrase cannot be empty");`
`2091`	`2091`	`}`
`2092`	`2092`
`2093`	`2093`	`if (!pwallet->ChangeWalletPassphrase(strOldWalletPass, strNewWalletPass)) {`
`@@ -2184,7 +2184,7 @@ static RPCHelpMan encryptwallet()`
`2184`	`2184`	`strWalletPass = request.params[0].get_str().c_str();`
`2185`	`2185`
`2186`	`2186`	`if (strWalletPass.empty()) {`
`2187`		`- throw JSONRPCError(RPC_INVALID_PARAMETER, "passphrase can not be empty");`
	`2187`	`+ throw JSONRPCError(RPC_INVALID_PARAMETER, "passphrase cannot be empty");`
`2188`	`2188`	`}`
`2189`	`2189`
`2190`	`2190`	`if (!pwallet->EncryptWallet(strWalletPass)) {`