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 #5753

Merged
merged 3 commits into from
Sep 7, 2024
Merged

Translations from Hosted Weblate #5753

merged 3 commits into from
Sep 7, 2024

Conversation

hedybot
Copy link
Collaborator

@hedybot hedybot commented Sep 6, 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 Sep 6, 2024
@Felienne
Copy link
Member

Felienne commented Sep 6, 2024

Ola @boryanagoncharenko! On this PR, you will have to add the empty pages file, and then approve it, to add the new language back in. Let me know if you need help!

@Felienne
Copy link
Member

Felienne commented Sep 6, 2024

This is a PR that was generated by the action

Copy link
Contributor

mergify bot commented Sep 7, 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 3930728 into main Sep 7, 2024
12 checks passed
@mergify mergify bot deleted the automatic/weblate-conflicts branch September 7, 2024 08:00
@boryanagoncharenko
Copy link
Collaborator

@Felienne
I fixed this PR, but it seems that it got even messier than before! Apologies for blocking weblate again. I added a new language to check what was happening and I have not even disabled the pre-fill option.

I ran the resolve-weblate-conflicts action again.

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