Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Merge master 22.0.0 back into develop #6484

Merged
merged 30 commits into from
Dec 14, 2024
Merged
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
7ca5663
Merge #6397: ci: add powerpc64 to GH Guix job matrix
PastaPastaPasta Nov 18, 2024
66f6787
Merge #6401: ci: deduplicate depends building
PastaPastaPasta Nov 18, 2024
90a3807
Merge #6402: ci: cache built
PastaPastaPasta Nov 18, 2024
a1f7e96
Merge #6406: ci: use `actions/cache` to manage depends cache
PastaPastaPasta Nov 19, 2024
86105da
Merge #6408: refactor: removed pre-MN_RR logic of validation of CL
PastaPastaPasta Nov 20, 2024
9fed456
Merge #6407: fix: dataraces
PastaPastaPasta Nov 21, 2024
18f636f
Merge #6426: fix: respect SENDDSQUEUE message, move DSQ relay into ne…
PastaPastaPasta Nov 26, 2024
3bbcd3d
Merge #6393: docs: mention building for some HOSTs only in `release-p…
PastaPastaPasta Nov 26, 2024
02ad523
Merge #6411: chore: update nMinimumChainWork, defaultAssumeValid, che…
PastaPastaPasta Nov 21, 2024
8b88ff7
Merge #6414: chore: bump seeds for v22
PastaPastaPasta Nov 20, 2024
a6ee725
Merge #6432: [v22.0.x] backport: release v22.0.0-rc2
PastaPastaPasta Nov 26, 2024
db5b53a
Merge #6434: fix: early EHF and buried EHF are indistinguish
PastaPastaPasta Dec 3, 2024
cb04114
Merge #6442: fix: coin selection with `include_unsafe` option should …
PastaPastaPasta Dec 3, 2024
c074e09
Merge #6444: fix: add platform transfer to "most common" filter
PastaPastaPasta Dec 3, 2024
c7b0d80
Merge #6441: fix: hold wallet shared pointer in CJ Manager/Sessions t…
PastaPastaPasta Dec 3, 2024
e0151e3
Merge #6447: [v22.0.x] backport: v22.0.0 rc.3
PastaPastaPasta Dec 3, 2024
395447b
Merge #6451: depends: update 'src/dashbls' to dashpay/bls-signatures@…
PastaPastaPasta Dec 4, 2024
758cd64
Merge #6452: fix: store ready queues on the mixing masternode
PastaPastaPasta Dec 6, 2024
fa29ed5
Merge #6456: fix(qt): allow refreshing wallet data without crashing
PastaPastaPasta Dec 6, 2024
9d3f22a
Merge #6454: [v22.0.x] backport: 22.0.0 rc.4 backports
PastaPastaPasta Dec 6, 2024
2f71f4d
Merge #6458: chore: bump MIN_MASTERNODE_PROTO_VERSION to latest proto
PastaPastaPasta Dec 7, 2024
9a8b685
Merge #6460: chore: Translations 2024-12
PastaPastaPasta Dec 10, 2024
212f91c
Merge #6461: docs: update supported versions in SECURITY.md
PastaPastaPasta Dec 7, 2024
d7cd9f1
Merge #6464: chore: update man pages for v22
PastaPastaPasta Dec 10, 2024
a6f1fc5
Merge #6475: chore: bumped chain assumed sizes based on latest usage
PastaPastaPasta Dec 10, 2024
c90339e
Merge #6459: docs: add release notes for v22.0.0
PastaPastaPasta Dec 10, 2024
b602413
Merge #6476: [v22.0.x] backport: final backports for v22.0.0
PastaPastaPasta Dec 10, 2024
1c7bfcb
chore: set release true
PastaPastaPasta Nov 20, 2024
7f28292
Merge #6413: [v22.0.x] chore: set release true
PastaPastaPasta Dec 10, 2024
d108579
Merge branch 'master' into merge_master_22.0.0
UdjinM6 Dec 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge #6460: chore: Translations 2024-12
1d36a40 80%+: it, pl, th, zh_CN (UdjinM6)
adfdb59 90%+: fr (UdjinM6)
bfff3c9 100%: ru (UdjinM6)
ed5f02d en (UdjinM6)
d373f85 dashstrings.cpp (UdjinM6)

Pull request description:

  ## Issue being fixed or feature implemented

  ## What was done?

  ## How Has This Been Tested?

  ## Breaking Changes

  ## Checklist:
  - [ ] I have performed a self-review of my own code
  - [ ] I have commented my code, particularly in hard-to-understand areas
  - [ ] I have added or updated relevant unit/integration/functional/e2e tests
  - [ ] I have made corresponding changes to the documentation
  - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  knst:
    utACK 1d36a40

Tree-SHA512: 5d860d2d78e354eeae2157e5d40e8ff659963a258b9eb216d15ec72c1c589e254c2f246173be9e3d1892f9c18acae6cfecc1f18956460be5ff13c5c84d6d0ba6
PastaPastaPasta committed Dec 10, 2024

Verified

This commit was signed with the committer’s verified signature.
knst Konstantin Akimov
commit 9a8b68515d3a60ce5884b2396f2b558fbde9aa45
46 changes: 41 additions & 5 deletions src/qt/dashstrings.cpp
Original file line number Diff line number Diff line change
@@ -23,6 +23,18 @@ QT_TRANSLATE_NOOP("dash-core", ""
"-maxtxfee is set very high! Fees this large could be paid on a single "
"transaction."),
QT_TRANSLATE_NOOP("dash-core", ""
"-reindex-chainstate option is not compatible with -blockfilterindex. Please "
"temporarily disable blockfilterindex while using -reindex-chainstate, or "
"replace -reindex-chainstate with -reindex to fully rebuild all indexes."),
QT_TRANSLATE_NOOP("dash-core", ""
"-reindex-chainstate option is not compatible with -coinstatsindex. Please "
"temporarily disable coinstatsindex while using -reindex-chainstate, or "
"replace -reindex-chainstate with -reindex to fully rebuild all indexes."),
QT_TRANSLATE_NOOP("dash-core", ""
"-reindex-chainstate option is not compatible with -txindex. Please "
"temporarily disable txindex while using -reindex-chainstate, or replace -"
"reindex-chainstate with -reindex to fully rebuild all indexes."),
QT_TRANSLATE_NOOP("dash-core", ""
"Cannot downgrade wallet from version %i to version %i. Wallet version "
"unchanged."),
QT_TRANSLATE_NOOP("dash-core", ""
@@ -39,6 +51,11 @@ QT_TRANSLATE_NOOP("dash-core", ""
QT_TRANSLATE_NOOP("dash-core", ""
"Error loading %s: You can't enable HD on an already existing non-HD wallet"),
QT_TRANSLATE_NOOP("dash-core", ""
"Error loading wallet. Wallet requires blocks to be downloaded, and software "
"does not currently support loading wallets while blocks are being downloaded "
"out of order when using assumeutxo snapshots. Wallet should be able to load "
"successfully after node sync reaches height %s"),
QT_TRANSLATE_NOOP("dash-core", ""
"Error reading %s! All keys read correctly, but transaction data or address "
"book entries might be missing or incorrect."),
QT_TRANSLATE_NOOP("dash-core", ""
@@ -55,6 +72,9 @@ QT_TRANSLATE_NOOP("dash-core", ""
"restarted wallet in less than 60 seconds. You can continue if you are ok "
"with this."),
QT_TRANSLATE_NOOP("dash-core", ""
"Failed to rename invalid peers.dat file. Please move or delete it and try "
"again."),
QT_TRANSLATE_NOOP("dash-core", ""
"Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -"
"fallbackfee."),
QT_TRANSLATE_NOOP("dash-core", ""
@@ -64,6 +84,9 @@ QT_TRANSLATE_NOOP("dash-core", ""
"Found unconfirmed denominated outputs, will wait till they confirm to "
"continue."),
QT_TRANSLATE_NOOP("dash-core", ""
"Incompatible options: -dnsseed=1 was explicitly specified, but -onlynet "
"forbids connections to IPv4/IPv6"),
QT_TRANSLATE_NOOP("dash-core", ""
"Incorrect or no devnet genesis block found. Wrong datadir for devnet "
"specified?"),
QT_TRANSLATE_NOOP("dash-core", ""
@@ -105,17 +128,27 @@ QT_TRANSLATE_NOOP("dash-core", ""
QT_TRANSLATE_NOOP("dash-core", ""
"Prune configured below the minimum of %d MiB. Please use a higher number."),
QT_TRANSLATE_NOOP("dash-core", ""
"Prune mode is incompatible with -reindex-chainstate. Use full -reindex "
"instead."),
QT_TRANSLATE_NOOP("dash-core", ""
"Prune: last wallet synchronisation goes beyond pruned data. You need to -"
"reindex (download the whole blockchain again in case of pruned node)"),
QT_TRANSLATE_NOOP("dash-core", ""
"SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is "
"supported"),
QT_TRANSLATE_NOOP("dash-core", ""
"The -txindex upgrade started by a previous version can not be completed. "
"Restart with the previous version or run a full -reindex."),
QT_TRANSLATE_NOOP("dash-core", ""
"The block database contains a block which appears to be from the future. "
"This may be due to your computer's date and time being set incorrectly. Only "
"rebuild the block database if you are sure that your computer's date and "
"time are correct"),
QT_TRANSLATE_NOOP("dash-core", ""
"The block index db contains a legacy 'txindex'. To clear the occupied disk "
"space, run a full -reindex, otherwise ignore this error. This error message "
"will not be displayed again."),
QT_TRANSLATE_NOOP("dash-core", ""
"The transaction amount is too small to send after the fee has been deducted"),
QT_TRANSLATE_NOOP("dash-core", ""
"This error could occur if this wallet was not shutdown cleanly and was last "
@@ -162,7 +195,7 @@ QT_TRANSLATE_NOOP("dash-core", ""
"Warning: We do not appear to fully agree with our peers! You may need to "
"upgrade, or other nodes may need to upgrade."),
QT_TRANSLATE_NOOP("dash-core", ""
"You need to rebuild the database using -reindex to change -timestampindex"),
"You need to rebuild the database using -reindex to enable -timestampindex"),
QT_TRANSLATE_NOOP("dash-core", ""
"You need to rebuild the database using -reindex to go back to unpruned "
"mode. This will redownload the entire blockchain"),
@@ -221,6 +254,7 @@ QT_TRANSLATE_NOOP("dash-core", "Error: Got key that was not hex: %s"),
QT_TRANSLATE_NOOP("dash-core", "Error: Got value that was not hex: %s"),
QT_TRANSLATE_NOOP("dash-core", "Error: Keypool ran out, please call keypoolrefill first"),
QT_TRANSLATE_NOOP("dash-core", "Error: Missing checksum"),
QT_TRANSLATE_NOOP("dash-core", "Error: No addresses available."),
QT_TRANSLATE_NOOP("dash-core", "Error: Unable to parse version %u as a uint32_t"),
QT_TRANSLATE_NOOP("dash-core", "Error: Unable to write record to new wallet"),
QT_TRANSLATE_NOOP("dash-core", "Exceeded max tries."),
@@ -240,6 +274,7 @@ QT_TRANSLATE_NOOP("dash-core", "Failed to load sporks cache from %s"),
QT_TRANSLATE_NOOP("dash-core", "Failed to rescan the wallet during initialization"),
QT_TRANSLATE_NOOP("dash-core", "Failed to start a new mixing queue"),
QT_TRANSLATE_NOOP("dash-core", "Failed to verify database"),
QT_TRANSLATE_NOOP("dash-core", "Fee rate (%s) is lower than the minimum fee rate setting (%s)"),
QT_TRANSLATE_NOOP("dash-core", "Found enough users, signing ( waiting %s )"),
QT_TRANSLATE_NOOP("dash-core", "Found enough users, signing…"),
QT_TRANSLATE_NOOP("dash-core", "Ignoring duplicate -wallet %s."),
@@ -250,6 +285,7 @@ QT_TRANSLATE_NOOP("dash-core", "Incorrect -rescan mode, falling back to default
QT_TRANSLATE_NOOP("dash-core", "Incorrect or no genesis block found. Wrong datadir for network?"),
QT_TRANSLATE_NOOP("dash-core", "Initialization sanity check failed. %s is shutting down."),
QT_TRANSLATE_NOOP("dash-core", "Input is not valid."),
QT_TRANSLATE_NOOP("dash-core", "Input not found or already spent"),
QT_TRANSLATE_NOOP("dash-core", "Inputs vs outputs size mismatch."),
QT_TRANSLATE_NOOP("dash-core", "Insufficient funds."),
QT_TRANSLATE_NOOP("dash-core", "Invalid '%s'. Allowed values: 128, 160, 192, 224, 256."),
@@ -279,6 +315,7 @@ QT_TRANSLATE_NOOP("dash-core", "Missing input transaction information."),
QT_TRANSLATE_NOOP("dash-core", "Mixing in progress…"),
QT_TRANSLATE_NOOP("dash-core", "Need to specify a port with -whitebind: '%s'"),
QT_TRANSLATE_NOOP("dash-core", "No Masternodes detected."),
QT_TRANSLATE_NOOP("dash-core", "No addresses available"),
QT_TRANSLATE_NOOP("dash-core", "No compatible Masternode found."),
QT_TRANSLATE_NOOP("dash-core", "No errors detected."),
QT_TRANSLATE_NOOP("dash-core", "No matching denominations found for mixing."),
@@ -288,7 +325,6 @@ QT_TRANSLATE_NOOP("dash-core", "Not enough file descriptors available."),
QT_TRANSLATE_NOOP("dash-core", "Not enough funds to mix."),
QT_TRANSLATE_NOOP("dash-core", "Not in the Masternode list."),
QT_TRANSLATE_NOOP("dash-core", "Prune cannot be configured with a negative value."),
QT_TRANSLATE_NOOP("dash-core", "Prune mode is incompatible with -coinstatsindex."),
QT_TRANSLATE_NOOP("dash-core", "Prune mode is incompatible with -disablegovernance=false."),
QT_TRANSLATE_NOOP("dash-core", "Prune mode is incompatible with -txindex."),
QT_TRANSLATE_NOOP("dash-core", "Pruning blockstore…"),
@@ -337,6 +373,7 @@ QT_TRANSLATE_NOOP("dash-core", "Unable to generate initial keys"),
QT_TRANSLATE_NOOP("dash-core", "Unable to locate enough mixed funds for this transaction."),
QT_TRANSLATE_NOOP("dash-core", "Unable to locate enough non-denominated funds for this transaction."),
QT_TRANSLATE_NOOP("dash-core", "Unable to open %s for writing"),
QT_TRANSLATE_NOOP("dash-core", "Unable to parse -maxuploadtarget: '%s' (possible integer overflow?)"),
QT_TRANSLATE_NOOP("dash-core", "Unable to sign spork message, wrong key?"),
QT_TRANSLATE_NOOP("dash-core", "Unable to start HTTP server. See debug log for details."),
QT_TRANSLATE_NOOP("dash-core", "Unknown -blockfilterindex value %s."),
@@ -346,7 +383,6 @@ QT_TRANSLATE_NOOP("dash-core", "Unknown response."),
QT_TRANSLATE_NOOP("dash-core", "Unknown state: id = %u"),
QT_TRANSLATE_NOOP("dash-core", "Unsupported logging category %s=%s."),
QT_TRANSLATE_NOOP("dash-core", "Upgrading UTXO database"),
QT_TRANSLATE_NOOP("dash-core", "Upgrading txindex database"),
QT_TRANSLATE_NOOP("dash-core", "User Agent comment (%s) contains unsafe characters."),
QT_TRANSLATE_NOOP("dash-core", "Verifying blocks…"),
QT_TRANSLATE_NOOP("dash-core", "Verifying wallet(s)…"),
@@ -361,8 +397,8 @@ QT_TRANSLATE_NOOP("dash-core", "Wiping wallet transactions…"),
QT_TRANSLATE_NOOP("dash-core", "You are starting with governance validation disabled."),
QT_TRANSLATE_NOOP("dash-core", "You can not disable governance validation on a masternode."),
QT_TRANSLATE_NOOP("dash-core", "You can not start a masternode with wallet enabled."),
QT_TRANSLATE_NOOP("dash-core", "You need to rebuild the database using -reindex to change -addressindex"),
QT_TRANSLATE_NOOP("dash-core", "You need to rebuild the database using -reindex to change -spentindex"),
QT_TRANSLATE_NOOP("dash-core", "You need to rebuild the database using -reindex to enable -addressindex"),
QT_TRANSLATE_NOOP("dash-core", "You need to rebuild the database using -reindex to enable -spentindex"),
QT_TRANSLATE_NOOP("dash-core", "Your entries added successfully."),
QT_TRANSLATE_NOOP("dash-core", "no mixing available."),
QT_TRANSLATE_NOOP("dash-core", "see debug.log for details."),
Loading