Skip to content

Conversation

@glozow
Copy link
Member

@glozow glozow commented Jun 10, 2024

Backports + release notes for:

And final changes for 26.2rc1:

  • build changes
  • manpages
  • non-removal translations updates

@DrahtBot
Copy link
Contributor

DrahtBot commented Jun 10, 2024

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Code Coverage

For detailed information about the code coverage, see the test coverage report.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK stickies-v, fanquake

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

@hebasto
Copy link
Member

hebasto commented Jun 10, 2024

@glozow

Feel free to pick up the hebasto@a586d70 commit from the https://github.com/hebasto/bitcoin/commits/pr30260/0610 branch to pull the recent translations from the Transifex website.

Unfortunately, more translations have been vandalized (

hebasto and others added 3 commits June 10, 2024 14:50
This change is a result if pulling the recent translations
from the Transifex website using the
bitcoin-maintainer-tools/update-translations.py tool.

A few manual adjustments were made:
- skipped removing of `bitcoin_af.ts`
- skipped removing of `bitcoin_ar.ts`
- skipped removing of `bitcoin_fa.ts`
- skipped removing of `bitcoin_la.ts`
- skipped removing of `bitcoin_ru.ts`
- skipped removing of `bitcoin_th.ts`
- skipped removing of `bitcoin_uk.ts`
present)
@glozow glozow force-pushed the 2024-06-26.2rc1 branch from 5444aea to 03a91a0 Compare June 10, 2024 13:50
@glozow
Copy link
Member Author

glozow commented Jun 10, 2024

Feel free to pick up the hebasto@a586d70 commit from the https://github.com/hebasto/bitcoin/commits/pr30260/0610 branch to pull the recent translations from the Transifex website.

Thanks @hebasto! I've cherry-picked that with a minor change to the commit message

@hebasto
Copy link
Member

hebasto commented Jun 10, 2024

The native Windows CI fails due to a broken Windows image.

Copy link
Contributor

@stickies-v stickies-v left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 7ca424f

I checked that:

  • backport is clean
  • manpages are identical to mine
  • translations are identical to mine, except for the removal of the languages mentioned in the commit message, which appears to be vandalism
  • release notes are correct

Copy link
Member

@fanquake fanquake left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 7ca424f

@glozow glozow merged commit d10cf12 into bitcoin:26.x Jun 12, 2024
@glozow glozow deleted the 2024-06-26.2rc1 branch June 12, 2024 12:07
@bitcoin bitcoin locked and limited conversation to collaborators Jun 12, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants