Fix more Weblate merge conflicts #5306
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Jernej Vidmar <nejc.vidmar@gmail.com>
Currently translated at 100.0% (0 of 0 strings) Co-authored-by: Prefill add-on <noreply-addon-prefill@weblate.org> 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 <noreply-addon-languages@weblate.org>
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 <noreply-addon-prefill@weblate.org> 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 <nejc.vidmar@gmail.com> 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 <etienne.charignon@gmail.com> 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/
Felienne
approved these changes
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). |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.