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

Resolve Weblate conflicts #5490

Merged
merged 49 commits into from
Apr 30, 2024
Merged

Resolve Weblate conflicts #5490

merged 49 commits into from
Apr 30, 2024

Conversation

rix0rrr
Copy link
Collaborator

@rix0rrr rix0rrr commented Apr 30, 2024

I should have reset Weblate changes yesterday, but forgot.

Another conflict resolution PR to merge the latest changes.

Prefill add-on and others added 30 commits April 26, 2024 13:05
Currently translated at 10.6% (68 of 636 strings)

Translated using Weblate (Interlingua)

Currently translated at 0.9% (6 of 636 strings)

Translated using Weblate (Maori)

Currently translated at 0.9% (6 of 636 strings)

Translated using Weblate (Catalan)

Currently translated at 55.8% (355 of 636 strings)

Translated using Weblate (Papiamento)

Currently translated at 0.9% (6 of 636 strings)

Translated using Weblate (Kurdish (Northern))

Currently translated at 1.2% (8 of 636 strings)

Translated using Weblate (Serbian)

Currently translated at 8.6% (55 of 636 strings)

Translated using Weblate (Danish)

Currently translated at 1.1% (7 of 636 strings)

Translated using Weblate (Romanian)

Currently translated at 2.3% (15 of 636 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 1.5% (10 of 636 strings)

Translated using Weblate (Welsh)

Currently translated at 1.2% (8 of 636 strings)

Translated using Weblate (Telugu)

Currently translated at 1.5% (10 of 636 strings)

Translated using Weblate (Finnish)

Currently translated at 1.4% (9 of 636 strings)

Translated using Weblate (Tagalog)

Currently translated at 1.2% (8 of 636 strings)

Translated using Weblate (Vietnamese)

Currently translated at 2.6% (17 of 636 strings)

Translated using Weblate (Punjabi (Pakistan))

Currently translated at 2.0% (13 of 636 strings)

Translated using Weblate (Ukrainian)

Currently translated at 35.6% (227 of 636 strings)

Translated using Weblate (Albanian)

Currently translated at 1.5% (10 of 636 strings)

Translated using Weblate (Thai)

Currently translated at 6.7% (43 of 636 strings)

Translated using Weblate (Urdu)

Currently translated at 1.8% (12 of 636 strings)

Translated using Weblate (Tswana)

Currently translated at 1.5% (10 of 636 strings)

Translated using Weblate (Korean)

Currently translated at 1.1% (7 of 636 strings)

Translated using Weblate (Swedish)

Currently translated at 79.2% (504 of 636 strings)

Translated using Weblate (Hebrew)

Currently translated at 12.5% (80 of 636 strings)

Translated using Weblate (Japanese)

Currently translated at 6.9% (44 of 636 strings)

Translated using Weblate (Estonian)

Currently translated at 11.1% (71 of 636 strings)

Translated using Weblate (Esperanto)

Currently translated at 46.3% (295 of 636 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 98.8% (629 of 636 strings)

Translated using Weblate (Turkish)

Currently translated at 82.7% (526 of 636 strings)

Translated using Weblate (Swahili)

Currently translated at 13.3% (85 of 636 strings)

Translated using Weblate (Russian)

Currently translated at 76.1% (484 of 636 strings)

Translated using Weblate (Portuguese (Portugal))

Currently translated at 15.5% (99 of 636 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 76.4% (486 of 636 strings)

Translated using Weblate (Polish)

Currently translated at 79.0% (503 of 636 strings)

Translated using Weblate (Dutch)

Currently translated at 93.2% (593 of 636 strings)

Translated using Weblate (Norwegian Bokmål)

Currently translated at 50.3% (320 of 636 strings)

Translated using Weblate (Italian)

Currently translated at 15.8% (101 of 636 strings)

Translated using Weblate (Indonesian)

Currently translated at 84.9% (540 of 636 strings)

Translated using Weblate (Hungarian)

Currently translated at 18.5% (118 of 636 strings)

Translated using Weblate (Hindi)

Currently translated at 39.7% (253 of 636 strings)

Translated using Weblate (Frisian)

Currently translated at 18.7% (119 of 636 strings)

Translated using Weblate (French)

Currently translated at 77.6% (494 of 636 strings)

Translated using Weblate (Persian)

Currently translated at 3.1% (20 of 636 strings)

Translated using Weblate (Spanish)

Currently translated at 99.2% (631 of 636 strings)

Translated using Weblate (Greek)

Currently translated at 45.7% (291 of 636 strings)

Translated using Weblate (German)

Currently translated at 81.2% (517 of 636 strings)

Translated using Weblate (Czech)

Currently translated at 18.2% (116 of 636 strings)

Translated using Weblate (Bengali)

Currently translated at 1.1% (7 of 636 strings)

Translated using Weblate (Bulgarian)

Currently translated at 16.6% (106 of 636 strings)

Translated using Weblate (Arabic)

Currently translated at 59.9% (381 of 636 strings)

Co-authored-by: Prefill add-on <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/ar/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/bg/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/bn/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/ca/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/cs/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/cy/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/da/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/de/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/el/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/eo/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/es/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/et/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/fa/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/fi/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/fr/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/fy/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/he/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/hi/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/hu/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/ia/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/id/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/it/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/ja/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/kmr/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/ko/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/mi/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/nb_NO/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/nl/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/pa_PK/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/pap/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/pl/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/pt_BR/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/pt_PT/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/ro/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/ru/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/sl/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/sq/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/sr/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/sv/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/sw/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/te/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/th/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/tl/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/tn/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/tr/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/uk/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/ur/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/vi/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/zh_Hant/
Translation: Hedy/Texts
Currently translated at 98.6% (727 of 737 strings)

Translated using Weblate (English)

Currently translated at 99.3% (732 of 737 strings)

Co-authored-by: Mark Giesen <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/hedy/adventures/en/
Translate-URL: https://hosted.weblate.org/projects/hedy/adventures/nl/
Translation: Hedy/Adventures
Currently translated at 98.6% (727 of 737 strings)

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

Translation: Hedy/Adventures
Translate-URL: https://hosted.weblate.org/projects/hedy/adventures/iba/
Currently translated at 0.0% (0 of 92 strings)

Translation: Hedy/Achievements
Translate-URL: https://hosted.weblate.org/projects/hedy/achievements/iba/
Currently translated at 0.0% (0 of 189 strings)

Translation: Hedy/Cheatsheets
Translate-URL: https://hosted.weblate.org/projects/hedy/commands/iba/
Currently translated at 0.0% (0 of 24 strings)

Translation: Hedy/client-messages
Translate-URL: https://hosted.weblate.org/projects/hedy/client-messages/iba/
Currently translated at 100.0% (0 of 0 strings)

Translation: Hedy/Keywords
Translate-URL: https://hosted.weblate.org/projects/hedy/keywords/iba/
Currently translated at 100.0% (0 of 0 strings)

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

Translation: Hedy/Parsons
Translate-URL: https://hosted.weblate.org/projects/hedy/parsons/iba/
Currently translated at 0.0% (0 of 92 strings)

Translation: Hedy/Achievements
Translate-URL: https://hosted.weblate.org/projects/hedy/achievements/ms/
Currently translated at 0.0% (0 of 24 strings)

Translation: Hedy/client-messages
Translate-URL: https://hosted.weblate.org/projects/hedy/client-messages/ms/
Currently translated at 0.0% (0 of 64 strings)

Translation: Hedy/Keywords
Translate-URL: https://hosted.weblate.org/projects/hedy/keywords/ms/
Currently translated at 0.0% (0 of 50 strings)

Translation: Hedy/Parsons
Translate-URL: https://hosted.weblate.org/projects/hedy/parsons/ms/
Currently translated at 0.0% (0 of 2185 strings)

Translation: Hedy/Quizzes
Translate-URL: https://hosted.weblate.org/projects/hedy/quizzes/ms/
Languages add-on and others added 17 commits April 29, 2024 16:21
Currently translated at 0.0% (0 of 403 strings)

Translation: Hedy/slides
Translate-URL: https://hosted.weblate.org/projects/hedy/slides/iba/
Currently translated at 0.0% (0 of 44 strings)

Translation: Hedy/Tutorials
Translate-URL: https://hosted.weblate.org/projects/hedy/tutorials/iba/
Currently translated at 0.0% (0 of 636 strings)

Translation: Hedy/Texts
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/ms/
Currently translated at 0.0% (0 of 636 strings)

Translation: Hedy/Texts
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/iba/
Currently translated at 0.0% (0 of 464 strings)

Translation: Hedy/Webpages
Translate-URL: https://hosted.weblate.org/projects/hedy/webpages/iba/
Currently translated at 0.0% (0 of 44 strings)

Translation: Hedy/Tutorials
Translate-URL: https://hosted.weblate.org/projects/hedy/tutorials/ms/
Currently translated at 0.0% (0 of 464 strings)

Translation: Hedy/Webpages
Translate-URL: https://hosted.weblate.org/projects/hedy/webpages/ms/
Currently translated at 100.0% (0 of 0 strings)

Translation: Hedy/Quizzes
Translate-URL: https://hosted.weblate.org/projects/hedy/quizzes/iba/
@rix0rrr rix0rrr added the translations Used for Weblate-related PRs, for special automatic processing. Do not set on any other PR. label Apr 30, 2024
Copy link
Contributor

mergify bot commented Apr 30, 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 5e26f52 into main Apr 30, 2024
12 checks passed
@mergify mergify bot deleted the weblate-hedy-adventures-conflicts branch April 30, 2024 08:34
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