Skip to content

Commit 63d604a

Browse files
committed
Merge bitcoin/bitcoin#33152: Release: Prepare "Open Transifex translations for v30.0" step
656e16a qt: Update the `src/qt/locale/bitcoin_en.xlf` translation source file (Hennadii Stepanov) a0eaa44 Fix typos (Hennadii Stepanov) 8d4aaae Update Transifex slug for 30.x (Hennadii Stepanov) Pull request description: This PR follows our [Release Process](https://github.com/bitcoin/bitcoin/blob/53a996f122663e271efa52c45b173613b8ac635e/doc/release-process.md). It is required to open Transifex translations for v30.0, as scheduled in bitcoin/bitcoin#32275. For reference, see the previous similar PR: bitcoin/bitcoin#31809. **Note for reviewers:** To reproduce the diff in the last commit, run: ``` cmake --preset dev-mode cmake --build build_dev_mode --target translate ``` ACKs for top commit: laanwj: Code review ACK 656e16a stickies-v: ACK 656e16a , was able to reproduce Tree-SHA512: 403b534329755079584fcdf98b696e3e75952dfc8d069f305843dbfa85de95f6816ee1d5dfc9b553c7c7f52cc296cb8d3cb03207051d26e0e76ff30d377f49e4
2 parents 26e9db2 + 656e16a commit 63d604a

File tree

8 files changed

+2067
-2219
lines changed

8 files changed

+2067
-2219
lines changed

.tx/config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[main]
22
host = https://www.transifex.com
33

4-
[o:bitcoin:p:bitcoin:r:qt-translation-029x]
4+
[o:bitcoin:p:bitcoin:r:qt-translation-030x]
55
file_filter = src/qt/locale/bitcoin_<lang>.xlf
66
source_file = src/qt/locale/bitcoin_en.xlf
77
source_lang = en

src/qt/bitcoinstrings.cpp

Lines changed: 38 additions & 56 deletions
Large diffs are not rendered by default.

src/qt/locale/bitcoin_en.ts

Lines changed: 210 additions & 285 deletions
Large diffs are not rendered by default.

src/qt/locale/bitcoin_en.xlf

Lines changed: 1813 additions & 1872 deletions
Large diffs are not rendered by default.

src/wallet/feebumper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ static feebumper::Result CheckFeeRate(const CWallet& wallet, const CMutableTrans
8484

8585
std::optional<CAmount> combined_bump_fee = wallet.chain().calculateCombinedBumpFee(reused_inputs, newFeerate);
8686
if (!combined_bump_fee.has_value()) {
87-
errors.push_back(Untranslated(strprintf("Failed to calculate bump fees, because unconfirmed UTXOs depend on enormous cluster of unconfirmed transactions.")));
87+
errors.push_back(Untranslated(strprintf("Failed to calculate bump fees, because unconfirmed UTXOs depend on an enormous cluster of unconfirmed transactions.")));
8888
}
8989
CAmount new_total_fee = newFeerate.GetFee(maxTxSize) + combined_bump_fee.value();
9090

src/wallet/spend.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -762,7 +762,7 @@ util::Result<SelectionResult> ChooseSelectionResult(interfaces::Chain& chain, co
762762
}
763763
std::optional<CAmount> combined_bump_fee = chain.calculateCombinedBumpFee(outpoints, coin_selection_params.m_effective_feerate);
764764
if (!combined_bump_fee.has_value()) {
765-
return util::Error{_("Failed to calculate bump fees, because unconfirmed UTXOs depend on enormous cluster of unconfirmed transactions.")};
765+
return util::Error{_("Failed to calculate bump fees, because unconfirmed UTXOs depend on an enormous cluster of unconfirmed transactions.")};
766766
}
767767
CAmount bump_fee_overestimate = summed_bump_fees - combined_bump_fee.value();
768768
if (bump_fee_overestimate) {

src/wallet/wallet.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2847,7 +2847,7 @@ std::shared_ptr<CWallet> CWallet::Create(WalletContext& context, const std::stri
28472847
rescan_required = true;
28482848
} else if (nLoadWalletRet == DBErrors::UNKNOWN_DESCRIPTOR) {
28492849
error = strprintf(_("Unrecognized descriptor found. Loading wallet %s\n\n"
2850-
"The wallet might had been created on a newer version.\n"
2850+
"The wallet might have been created on a newer version.\n"
28512851
"Please try running the latest software version.\n"), walletFile);
28522852
return nullptr;
28532853
} else if (nLoadWalletRet == DBErrors::UNEXPECTED_LEGACY_ENTRY) {
@@ -3149,7 +3149,7 @@ bool CWallet::AttachChain(const std::shared_ptr<CWallet>& walletInstance, interf
31493149
// but fail the rescan with a generic error.
31503150

31513151
error = chain.havePruned() ?
3152-
_("Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)") :
3152+
_("Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of a pruned node)") :
31533153
strprintf(_(
31543154
"Error loading wallet. Wallet requires blocks to be downloaded, "
31553155
"and software does not currently support loading wallets while "

src/wallet/walletdb.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -791,7 +791,7 @@ static DBErrors LoadDescriptorWalletRecords(CWallet* pwallet, DatabaseBatch& bat
791791
value >> desc;
792792
} catch (const std::ios_base::failure& e) {
793793
strErr = strprintf("Error: Unrecognized descriptor found in wallet %s. ", pwallet->GetName());
794-
strErr += (last_client > CLIENT_VERSION) ? "The wallet might had been created on a newer version. " :
794+
strErr += (last_client > CLIENT_VERSION) ? "The wallet might have been created on a newer version. " :
795795
"The database might be corrupted or the software version is not compatible with one of your wallet descriptors. ";
796796
strErr += "Please try running the latest software version";
797797
// Also include error details

0 commit comments

Comments
 (0)