Repository navigation
Integrate aligned contributions and Slovenian website help - #10
Merged
Merged
Conversation
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
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.
The fork already contains the desktop features from the contribution chain, but its main branch did not yet contain the Slovenian website help or the newly aligned contribution ancestry.
Merge the aligned #6 → #7 → #8 → #9 → #15 history while preserving the fork's complete 20-language desktop implementation, then integrate the independent Slovenian contribution (#5). Existing contribution commits remain in history. The resulting content diff against fork main is 10 website/translation-documentation/test files; application C#, XAML, desktop resource dictionaries and Engine/test sources are unchanged.
Result
Validation
3672ce5.No installer/USB update, real scan, deployment or user-data migration is included. The separately merged fork PR #9 (release-channel CI guard) is preserved by integrating current fork main
f792bdd.