[ryanbr]

@Quaii's #929 with the merge conflict resolved. Same commit, authored by @Quaii and unchanged —
this branch only adds a merge of main on top, because the fork could not be pushed to from here
(maintainerCanModify is set, but the push is refused, and GitHub's own Update branch returns
422 merge conflict between base and head).

Please treat #929 as the PR of record for review and credit; this exists purely to carry it past the
conflict.

The conflict, and how it was resolved

Only Strand/Resources/Localizable.xcstrings conflicted — the six strings.xml files auto-merged. Both
sides had appended new entries to the same sorted JSON object, from #938 landing earlier today.

Resolved by unioning the two catalogues programmatically rather than hand-patching, then checking the
arithmetic: base 3274 strings, #929 adds 8, main adds 1, zero keys added on both sides with
different values, zero base entries edited on both sides → 3283. Verified afterwards that #938's
"Raw counts only — needs an import" still carries all 8 locales, that the keys are still sorted, and
that all ten today_customize_* keys survive in each of the six locales.

Tools/i18n_audit.py --ci main and Tools/doc_comment_lint.py both clean on the merged tree, and every
strings.xml still parses.

Review

Reviewed and approved on #929. The short version: the new today.hiddenSections key is additive
alongside an untouched today.sectionOrder, no TodaySection raw value changed on either platform, so
existing saved layouts survive; the two platforms encode it byte-identically; and
visibleOrder_filtersHiddenWithoutChangingSavedOrder asserts the saved order still holds every section
after hiding, which is the reversibility proof that matters.

StrandTests/TodayLayoutPrefsTests.swift is not run by CI (app-build.yml is disabled), so the Swift
half rests on @Quaii's local xcodebuild ... test run rather than on the green ticks here.

[ryanbr]

Verification of the merge itself, since that is the only thing here that is not @Quaii's reviewed work.

Nothing on main had touched any file this changes. Zero commits since v9.2.1 modified
TodayView.swift, LiquidTodayView.swift, Components.swift, TodayScreen.kt or Theme.kt. So there
is no semantic conflict available to get wrong — the only genuine overlap was the string catalogues.

@Quaii's code is byte-identical to their commit. Diffed every file the PR touches between d03e6c51
and this branch: all fifteen code files identical, and the only seven that differ are the catalogues
(Localizable.xcstrings + the six strings.xml), which is exactly where main's entries had to land.

The catalogue union checks out arithmetically: base 3274, this PR adds 8, main adds 1, zero keys
added on both sides with different values, zero base entries edited on both sides → 3283. Top-level
metadata (sourceLanguage, version) preserved. Keys still sorted. #938's string still carries its 8
locales; all ten today_customize_* keys present in each of the six locales.

On the usual app-target caveat: app-build.yml is disabled, so nothing in CI compiles
TodayView.swift or the new sheets — but since no commit on main touched them, they are byte-identical
to what @Quaii compiled locally with xcodebuild ... test and ran in the Simulator. The merge adds no
app-target risk that their own build did not already cover.