This PR follows our Release Process.
It is required to open Transifex translations for v30.0, as scheduled in #32275.
For reference, see the previous similar PR: #31809.
Note for reviewers:
To reproduce the diff in the last commit, run:
cmake --preset dev-mode
cmake --build build_dev_mode --target translate
Update the Transifex slug to match the new resource created for the
upcoming 30.x branch.
<!--e57a25ab6845829454e8d69fc972939a-->
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
<!--006a51241073e994b41acfe9ec718e94-->
For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/33152.
<!--021abf342d371248e50ceaed478a90ca-->
See the guideline for information on the review process.
| Type | Reviewers |
|---|---|
| ACK | laanwj, stickies-v |
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.
<!--174a7506f384e20aa4161008e828411d-->
Reviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
<!--5faf32d7da4f0f540f40219e4f7537a3-->
cc @stickies-v @pablomartin4btc @johnny9 @jarolrod as regular reviewers of similar previous PRs.
Could fix the typo in the source string (found by the llm)?
diff --git a/src/wallet/feebumper.cpp b/src/wallet/feebumper.cpp
index 82ea8ee1c9..0b56a23251 100644
--- a/src/wallet/feebumper.cpp
+++ b/src/wallet/feebumper.cpp
@@ -84,7 +84,7 @@ static feebumper::Result CheckFeeRate(const CWallet& wallet, const CMutableTrans
std::optional<CAmount> combined_bump_fee = wallet.chain().calculateCombinedBumpFee(reused_inputs, newFeerate);
if (!combined_bump_fee.has_value()) {
- errors.push_back(Untranslated(strprintf("Failed to calculate bump fees, because unconfirmed UTXOs depend on enormous cluster of unconfirmed transactions.")));
+ errors.push_back(Untranslated(strprintf("Failed to calculate bump fees, because unconfirmed UTXOs depend on an enormous cluster of unconfirmed transactions.")));
}
CAmount new_total_fee = newFeerate.GetFee(maxTxSize) + combined_bump_fee.value();
diff --git a/src/wallet/spend.cpp b/src/wallet/spend.cpp
index 250377afcf..53a224b46b 100644
--- a/src/wallet/spend.cpp
+++ b/src/wallet/spend.cpp
@@ -762,7 +762,7 @@ util::Result<SelectionResult> ChooseSelectionResult(interfaces::Chain& chain, co
}
std::optional<CAmount> combined_bump_fee = chain.calculateCombinedBumpFee(outpoints, coin_selection_params.m_effective_feerate);
if (!combined_bump_fee.has_value()) {
- return util::Error{_("Failed to calculate bump fees, because unconfirmed UTXOs depend on enormous cluster of unconfirmed transactions.")};
+ return util::Error{_("Failed to calculate bump fees, because unconfirmed UTXOs depend on an enormous cluster of unconfirmed transactions.")};
}
CAmount bump_fee_overestimate = summed_bump_fees - combined_bump_fee.value();
if (bump_fee_overestimate) {
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 91a494c379..f86a28c52e 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2847,7 +2847,7 @@ std::shared_ptr<CWallet> CWallet::Create(WalletContext& context, const std::stri
rescan_required = true;
} else if (nLoadWalletRet == DBErrors::UNKNOWN_DESCRIPTOR) {
error = strprintf(_("Unrecognized descriptor found. Loading wallet %s\n\n"
- "The wallet might had been created on a newer version.\n"
+ "The wallet might have been created on a newer version.\n"
"Please try running the latest software version.\n"), walletFile);
return nullptr;
} else if (nLoadWalletRet == DBErrors::UNEXPECTED_LEGACY_ENTRY) {
@@ -3149,7 +3149,7 @@ bool CWallet::AttachChain(const std::shared_ptr<CWallet>& walletInstance, interf
// but fail the rescan with a generic error.
error = chain.havePruned() ?
- _("Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)") :
+ _("Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of a pruned node)") :
strprintf(_(
"Error loading wallet. Wallet requires blocks to be downloaded, "
"and software does not currently support loading wallets while "
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index 2c0073f356..bc5bb0fa0b 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -791,7 +791,7 @@ static DBErrors LoadDescriptorWalletRecords(CWallet* pwallet, DatabaseBatch& bat
value >> desc;
} catch (const std::ios_base::failure& e) {
strErr = strprintf("Error: Unrecognized descriptor found in wallet %s. ", pwallet->GetName());
- strErr += (last_client > CLIENT_VERSION) ? "The wallet might had been created on a newer version. " :
+ strErr += (last_client > CLIENT_VERSION) ? "The wallet might have been created on a newer version. " :
"The database might be corrupted or the software version is not compatible with one of your wallet descriptors. ";
strErr += "Please try running the latest software version";
// Also include error details
Could fix the typo in the source string (found by the llm)?
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 91a494c379..5aeb39283b 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3149,7 +3149,7 @@ bool CWallet::AttachChain(const std::shared_ptr<CWallet>& walletInstance, interf // but fail the rescan with a generic error. error = chain.havePruned() ? - _("Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)") : + _("Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of a pruned node)") : strprintf(_( "Error loading wallet. Wallet requires blocks to be downloaded, " "and software does not currently support loading wallets while "
Thanks! Fixed.
Steps to reproduce the diff on Ubuntu 25.04:
```
cmake --preset dev-mode
cmake --build build_dev_mode --target translate
```
Could fix the typo in the source string (found by the llm)?
Should be done now.
Code review ACK 656e16aa5e65731a61b77444ac3ab874f7635c50
Last commit reproduces also on Ubuntu 24.04, with only harmless differences in C string splitting like
"Outbound connections restricted to CJDNS (-onlynet=cjdns) but "
"-cjdnsreachable is not provided"),
"Outbound connections restricted to CJDNS (-onlynet=cjdns) but -"
"cjdnsreachable is not provided"),
ACK 656e16aa5e65731a61b77444ac3ab874f7635c50 , was able to reproduce
Last commit reproduces also on Ubuntu 24.04, with only harmless differences in C string splitting like
"Outbound connections restricted to CJDNS (-onlynet=cjdns) but " "-cjdnsreachable is not provided"), "Outbound connections restricted to CJDNS (-onlynet=cjdns) but -" "cjdnsreachable is not provided"),
This difference is caused by changes in xgettext behaviour across versions. It has been resolved by concatenating strings. See #33209#pullrequestreview-3131093710.