Weblate merge conflict #561
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
Currently translated at 87.3% (305 of 349 strings) Translation: Tomb/tomb Translate-URL: https://hosted.weblate.org/projects/tomb/tomb/es/
Currently translated at 71.9% (292 of 406 strings) Translation: Tomb/tomb Translate-URL: https://hosted.weblate.org/projects/tomb/tomb/it/
Currently translated at 84.2% (342 of 406 strings) Translation: Tomb/tomb Translate-URL: https://hosted.weblate.org/projects/tomb/tomb/it/
Currently translated at 37.5% (131 of 349 strings) Translation: Tomb/tomb Translate-URL: https://hosted.weblate.org/projects/tomb/tomb/zh_Hans/
Currently translated at 75.6% (264 of 349 strings) Translation: Tomb/tomb Translate-URL: https://hosted.weblate.org/projects/tomb/tomb/zh_Hans/
Currently translated at 99.4% (347 of 349 strings) Translation: Tomb/tomb Translate-URL: https://hosted.weblate.org/projects/tomb/tomb/zh_Hans/
Currently translated at 100.0% (349 of 349 strings) Translation: Tomb/tomb Translate-URL: https://hosted.weblate.org/projects/tomb/tomb/zh_Hans/
Currently translated at 100.0% (349 of 349 strings) Translation: Tomb/tomb Translate-URL: https://hosted.weblate.org/projects/tomb/tomb/zh_Hans/
Currently translated at 100.0% (349 of 349 strings) Translation: Tomb/tomb Translate-URL: https://hosted.weblate.org/projects/tomb/tomb/es/
Currently translated at 99.4% (348 of 350 strings) Translation: Tomb/tomb Translate-URL: https://hosted.weblate.org/projects/tomb/tomb/fi/
Currently translated at 100.0% (354 of 354 strings) Translation: Tomb/tomb Translate-URL: https://hosted.weblate.org/projects/tomb/tomb/es/
Currently translated at 100.0% (354 of 354 strings) Translation: Tomb/tomb Translate-URL: https://hosted.weblate.org/projects/tomb/tomb/zh_Hans/
Manually resolve merge conflicts
|
If that resolves the situation, #557 should likely be of short term priority to avoid desync of translations. |
jaromil
approved these changes
Mar 12, 2025
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.
Replaces #550
Manual merge with resolved conflicts.
Should resolve the stuck situation with the diverged repos.