Fix weblate merge conflicts #81
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 92.3% (24 of 26 strings) Translation: PianOli/Android strings Translate-URL: https://hosted.weblate.org/projects/pianoli/android-strings/nl/
Currently translated at 100.0% (17 of 17 strings) Translation: PianOli/App Metadata Translate-URL: https://hosted.weblate.org/projects/pianoli/app-metadata/nl/
Currently translated at 94.1% (16 of 17 strings) Translation: PianOli/App Metadata Translate-URL: https://hosted.weblate.org/projects/pianoli/app-metadata/nb_NO/
Currently translated at 100.0% (17 of 17 strings) Translation: PianOli/App Metadata Translate-URL: https://hosted.weblate.org/projects/pianoli/app-metadata/nb_NO/
Currently translated at 88.4% (23 of 26 strings) Translation: PianOli/Android strings Translate-URL: https://hosted.weblate.org/projects/pianoli/android-strings/nb_NO/
Currently translated at 100.0% (17 of 17 strings) Translation: PianOli/App Metadata Translate-URL: https://hosted.weblate.org/projects/pianoli/app-metadata/es/
Merged
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.
Manually fixing merge conflicts found in Weblate due to #79 and #80 conflicting with changes in Weblate. Will merge here to master, then go back to Weblate and poke it with a stick until it works.
Manually merged https://hosted.weblate.org/git/pianoli/android-strings remote into this repo, so it includes all the translations from Weblate to date.