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

Fix more Weblate merge conflicts #5306

Merged
merged 13 commits into from
Mar 25, 2024
Merged

Fix more Weblate merge conflicts #5306

merged 13 commits into from
Mar 25, 2024

Conversation

rix0rrr
Copy link
Collaborator

@rix0rrr rix0rrr commented Mar 25, 2024

New commits have been created in Weblate before it could pull the last set of conflict resolutions, so we need to do it some more.

Nazz78 and others added 13 commits March 24, 2024 11:35
Currently translated at 100.0% (0 of 0 strings)

Co-authored-by: Prefill add-on <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/hedy/keywords/sl/
Translation: Hedy/Keywords
Added translation using Weblate (Slovenian)

Added translation using Weblate (Slovenian)

Added translation using Weblate (Slovenian)

Added translation using Weblate (Slovenian)

Added translation using Weblate (Slovenian)

Added translation using Weblate (Slovenian)

Added translation using Weblate (Slovenian)

Added translation using Weblate (Slovenian)

Added translation using Weblate (Slovenian)

Co-authored-by: Languages add-on <[email protected]>
Currently translated at 0.0% (0 of 391 strings)

Translated using Weblate (Slovenian)

Currently translated at 0.0% (0 of 44 strings)

Translated using Weblate (Slovenian)

Currently translated at 0.0% (0 of 618 strings)

Translated using Weblate (Slovenian)

Currently translated at 0.0% (0 of 2185 strings)

Translated using Weblate (Slovenian)

Currently translated at 0.7% (5 of 692 strings)

Translated using Weblate (Slovenian)

Currently translated at 0.0% (0 of 189 strings)

Translated using Weblate (Slovenian)

Currently translated at 0.0% (0 of 50 strings)

Translated using Weblate (Slovenian)

Currently translated at 0.0% (0 of 24 strings)

Translated using Weblate (Slovenian)

Currently translated at 0.0% (0 of 92 strings)

Translated using Weblate (Slovenian)

Currently translated at 0.2% (1 of 464 strings)

Co-authored-by: Prefill add-on <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/hedy/achievements/sl/
Translate-URL: https://hosted.weblate.org/projects/hedy/adventures/sl/
Translate-URL: https://hosted.weblate.org/projects/hedy/client-messages/sl/
Translate-URL: https://hosted.weblate.org/projects/hedy/commands/sl/
Translate-URL: https://hosted.weblate.org/projects/hedy/parsons/sl/
Translate-URL: https://hosted.weblate.org/projects/hedy/quizzes/sl/
Translate-URL: https://hosted.weblate.org/projects/hedy/slides/sl/
Translate-URL: https://hosted.weblate.org/projects/hedy/tutorials/sl/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/sl/
Translate-URL: https://hosted.weblate.org/projects/hedy/webpages/sl/
Translation: Hedy/Achievements
Translation: Hedy/Adventures
Translation: Hedy/Cheatsheets
Translation: Hedy/Parsons
Translation: Hedy/Quizzes
Translation: Hedy/Texts
Translation: Hedy/Tutorials
Translation: Hedy/Webpages
Translation: Hedy/client-messages
Translation: Hedy/slides
Currently translated at 10.8% (75 of 692 strings)

Translated using Weblate (Slovenian)

Currently translated at 100.0% (64 of 64 strings)

Translated using Weblate (Slovenian)

Currently translated at 24.0% (12 of 50 strings)

Translated using Weblate (Slovenian)

Currently translated at 100.0% (92 of 92 strings)

Translated using Weblate (Slovenian)

Currently translated at 2.3% (16 of 692 strings)

Translated using Weblate (Slovenian)

Currently translated at 100.0% (64 of 64 strings)

Translated using Weblate (Slovenian)

Currently translated at 100.0% (44 of 44 strings)

Translated using Weblate (Slovenian)

Currently translated at 0.1% (3 of 2185 strings)

Translated using Weblate (Slovenian)

Currently translated at 100.0% (24 of 24 strings)

Translated using Weblate (Slovenian)

Currently translated at 1.1% (8 of 692 strings)

Translated using Weblate (Slovenian)

Currently translated at 100.0% (64 of 64 strings)

Translated using Weblate (Slovenian)

Currently translated at 3.1% (2 of 64 strings)

Translated using Weblate (Slovenian)

Currently translated at 1.5% (1 of 64 strings)

Co-authored-by: Jernej Vidmar <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/hedy/achievements/sl/
Translate-URL: https://hosted.weblate.org/projects/hedy/adventures/sl/
Translate-URL: https://hosted.weblate.org/projects/hedy/client-messages/sl/
Translate-URL: https://hosted.weblate.org/projects/hedy/keywords/sl/
Translate-URL: https://hosted.weblate.org/projects/hedy/parsons/sl/
Translate-URL: https://hosted.weblate.org/projects/hedy/quizzes/sl/
Translate-URL: https://hosted.weblate.org/projects/hedy/tutorials/sl/
Translation: Hedy/Achievements
Translation: Hedy/Adventures
Translation: Hedy/Keywords
Translation: Hedy/Parsons
Translation: Hedy/Quizzes
Translation: Hedy/Tutorials
Translation: Hedy/client-messages
Currently translated at 82.6% (572 of 692 strings)

Co-authored-by: Étienne Charignon <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/hedy/adventures/fr/
Translation: Hedy/Adventures
Currently translated at 37.4% (259 of 692 strings)

Translation: Hedy/Adventures
Translate-URL: https://hosted.weblate.org/projects/hedy/adventures/uk/
Currently translated at 10.8% (75 of 692 strings)

Translation: Hedy/Adventures
Translate-URL: https://hosted.weblate.org/projects/hedy/adventures/sl/
Currently translated at 24.0% (12 of 50 strings)

Translation: Hedy/Parsons
Translate-URL: https://hosted.weblate.org/projects/hedy/parsons/sl/
Currently translated at 100.0% (692 of 692 strings)

Translation: Hedy/Adventures
Translate-URL: https://hosted.weblate.org/projects/hedy/adventures/zh_Hans/
Currently translated at 100.0% (618 of 618 strings)

Translation: Hedy/Texts
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/zh_Hans/
Copy link
Contributor

mergify bot commented Mar 25, 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 e28ffb2 into main Mar 25, 2024
12 checks passed
@mergify mergify bot deleted the merge-conflicts-2 branch March 25, 2024 12:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

6 participants