chore(l10n): merge Weblate translations (resolves #514 conflicts)#516
Merged
Conversation
Translation: COSMIC-utils/Camera Language: Czech Progress: 100.0% (295 of 295 strings) Translate-URL: https://hosted.weblate.org/projects/cosmic-utils/camera/cs/
Translation: COSMIC-utils/Camera Language: French Progress: 100.0% (295 of 295 strings) Translate-URL: https://hosted.weblate.org/projects/cosmic-utils/camera/fr/
…camera # Conflicts: # i18n/cs/camera.ftl # i18n/fr/camera.ftl
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Brings in the pending Weblate translation updates from #514 with merge conflicts resolved.
#514 could not be merged directly because its branch lives on the
weblatefork and conflicted with recentmainchanges that removed unused keys. This branch merges the current PR #514 tip withmainand resolves the conflicts ini18n/cs/camera.ftlandi18n/fr/camera.ftlby dropping keys no longer present in theensource (e.g.view,welcome,settings-version,preset-*,preview-fit/cover,insights-audio-not-recording) while keeping all live translations.Weblate should auto-close #514 on its next sync once these land on
main.