Unlock weblate translations #3873
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 100.0% (416 of 416 strings) Translation: Flameshot/Flameshot Translate-URL: https://hosted.weblate.org/projects/flameshot/flameshot/pl/
Currently translated at 100.0% (416 of 416 strings) Translation: Flameshot/Flameshot Translate-URL: https://hosted.weblate.org/projects/flameshot/flameshot/pl/
Currently translated at 100.0% (416 of 416 strings) Translation: Flameshot/Flameshot Translate-URL: https://hosted.weblate.org/projects/flameshot/flameshot/es/
Currently translated at 100.0% (416 of 416 strings) Translation: Flameshot/Flameshot Translate-URL: https://hosted.weblate.org/projects/flameshot/flameshot/es/
|
If I try to re-merge and re-rebase with Weblate locally after this PR's changes, I still get the same merging issue. If the issue is still not fixed after merging this PR, we'll have to look into why the issue still exists 👍 |
|
@volovikariel thanks for the efforts. I will merge it now |
mmahmoudian
approved these changes
Mar 17, 2025
|
@mmahmoudian you may have to run the Perhaps a simple |
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.
Unblocks open PRs related to Weblate:
#3078
#3082
#3609 (this one will require a comment, telling them to use Weblate, or alternatively, we could simply do it for them)
#3865
Weblate is blocked because of a merging issue in the spanish translation file.
This is the history of the changes on weblate: https://hosted.weblate.org/translate/flameshot/flameshot/es/?checksum=4f89fd8eec847a31#history
Simply rebasing after accepting the change from the Weblate branch seems to resolve the issue.
I have performed the rebase as instructed here: https://docs.weblate.org/en/latest/faq.html#how-to-fix-merge-conflicts-in-translations
NOTE: The polish changes are a side-effect of merging with Weblate