Skip to content

Integrate aligned contributions and Slovenian website help - #10

Merged
MrCodeLabs merged 18 commits into
mainfrom
sync/contributions-20261023
Oct 23, 2026
Merged

MrCodeLabs merged 18 commits into
mainfrom
sync/contributions-20261023

Conversation

@MrCodeLabs

@MrCodeLabs MrCodeLabs commented Oct 23, 2026 •

Copy link
Copy Markdown
Owner

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

  • Slovenian language choice on all five website pages, translated help/shared controls and the More label; prose outside the translated scope keeps the existing English fallback.
  • Current upstream navigation, contrast, content and all other website translations are preserved.
  • Regenerated shortcut labels: 74 bindings, 20 locales, including Slovenian in the keyboard map and list.
  • Translation documentation explains the separate website resources and regeneration checks.
  • The existing fork retains all 537 own Slovenian desktop strings, scan options, interface selection, locations/profiles, recognition evidence and verified access.

Validation

  • Generated-catalog check and Node shortcut/list/map tests passed for 74 bindings/20 locales.
  • Existing upstream website translations preserved; 232 Slovenian help label occurrences, five language selectors and inline-script syntax checked.
  • Local browser inspection passed for Slovenian help, language switching and the keyboard map.
  • All 20 desktop dictionary XML files, 537 Slovenian key/placeholder contracts, staged whitespace and sensitive-pattern checks passed.
  • Git comparison confirms no application/Engine/desktop-test source changes from fork main; local application builds and network tests were not repeated for this website-only content change.
  • Hosted PR build/tests: all four jobs passed (application, engine-net48, engine-net10, speed-test-fixtures) on submitted head 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.

@MrCodeLabs
MrCodeLabs merged commit baa6169 into main Oct 23, 2026
4 checks passed
@MrCodeLabs
MrCodeLabs deleted the sync/contributions-20261023 branch October 23, 2026 15:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant