From 84450ffc19040968c4768cbe97247a4a819b4aa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E7=94=B5=E8=8A=BD=E8=A1=A3?= Date: Mon, 12 Oct 2026 00:45:50 -0400 Subject: [PATCH] Plan: the PR branches and the integration branch --- plans/omarchycn.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/plans/omarchycn.md b/plans/omarchycn.md index 40727797..441819d5 100644 --- a/plans/omarchycn.md +++ b/plans/omarchycn.md @@ -34,6 +34,17 @@ These replace the 2026-10-05 decisions where they disagree. - A local-source ISO builds `omarchy-dev` and `omarchy-settings-dev` under the published version number and does not pin them, so the next published release replaces them on `omarchy update`. Local test ISOs are for testing only. - `stable-mirror.omarchy.cn`, `rc-mirror.omarchy.cn` and `mirror.omarchy.cn` resolve and serve `core.db` (checked 2026-10-09). +## PR branches (T32, 2026-10-12) + +omarchy, each a fork branch: + +- `cjk-variant-selection` on upstream `quattro`: the Noto CJK variant fontconfig. +- `chinese-language` on upstream `quattro`: `omarchy language`, Setup > Language, the installer's language prompt, the Chinese menu overlay, shell and notification text. +- `cn-developer-mirrors` on #13690: the `cn` developer mirrors at install. +- `cn-region-switch` on `cn-developer-mirrors`: `omarchy region`, Setup > Region, China Apps, `manual/52-china.md`; English only. + +`omarchycn` merges them onto `quattro` and adds what no PR can carry yet: the Chinese wording for Region and China Apps and the language half of the China manual (needs both language and region), and an integration-only pacman resolution until #13690 rebases onto upstream's ARM templates. Known failure there: `pacman-templates-test` expects x86 refresh to copy templates directly, which #13690 replaces with a render. + ## Tasks - [x] T0 Branches and this list