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

Translations from Hosted Weblate #5512

Merged
merged 3 commits into from
May 9, 2024
Merged

Translations from Hosted Weblate #5512

merged 3 commits into from
May 9, 2024

Conversation

hedybot
Copy link
Collaborator

@hedybot hedybot commented May 9, 2024

This PR merges pending commits from the Weblate repository that are conflicting with changes on main, while resolving conflicts in favor of the Weblate side.

@hedybot hedybot added the translations Used for Weblate-related PRs, for special automatic processing. Do not set on any other PR. label May 9, 2024
Copy link
Contributor

mergify bot commented May 9, 2024

Thank you for contributing! Your pull request is now going on the merge train (choo choo! Do not click update from main anymore, and be sure to allow changes to be pushed to your fork).

Copy link
Contributor

mergify bot commented May 9, 2024

Thank you for contributing! Your pull request is now going on the merge train (choo choo! Do not click update from main anymore, and be sure to allow changes to be pushed to your fork).

@mergify mergify bot merged commit f87ddff into main May 9, 2024
12 checks passed
@mergify mergify bot deleted the automatic/weblate-conflicts branch May 9, 2024 19:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
translations Used for Weblate-related PRs, for special automatic processing. Do not set on any other PR.
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants