* fix(i18n): restore the Japanese renderings the brand revert left in Latin
Before #12113 landed the canonical-rendering guard, the brand-mistranslation
revert treated ターミナル/エージェント/コミット/リポジトリ as machine-translation errors
and rewrote them back to English on every repair run. The guard stops new
damage, but ~700 values still carry it, so the Japanese UI reads
"この terminal を閉じると、agent の現在の作業が停止します。"
This heals what the catalog already holds and closes the defects the same
pipeline introduced elsewhere:
- Relocalize the four generic terms inside Japanese sentences. Both sides are
anchored on an adjacent Japanese character and reject a `-`, word character
or `.` neighbour, so `--agent`, agents.md and "Agent SDK" keep their spelling,
and the 和欧間スペース survives in front of an interpolation.
- Preserve style blocks and command/identifier values in English. MT had
rewritten a CSS selector to [データスラッシュメニュー], `background:` to `背景:` and a
keyframe name to ブラウザフラッシュ, and had turned `pnpm install` into
`pnpmインストール` and a toast dedup id into 陳腐なエージェント行. The same values are
restored in ko, zh and es.
- Drop the phrase fixes that stripped ～してください from validation messages,
which left 30 prompts ending in a bare noun.
- Settle terminology and typography: 紛争→競合, 資格情報→認証情報, 未知→不明,
プロフィール→プロファイル, the full-width ellipsis, no separator space inside
compound katakana, and one long-vowel form per word.
- Fix literal-translation errors (ナメクジ for slug, ミスター for MR, ランニング for
Running, 高い/中くらい for priority labels) and complete the truncated Kimi
status-bar description.
- Translate 570 values that were still English, 485 of them fragments the
catalog had left untouched and 85 newly added strings.
The catalog is regenerated with `repair-locale-catalog.mjs` and the run is
idempotent: a second pass reports 0 leaf updates.
* fix(i18n): keep the leading space in concatenated Japanese fragments
* fix(i18n): close the self-review findings in the Japanese repair rules
Seven defects the relocalization pass introduced or left behind:
- `git commit` and `orca terminal` are two-word commands, and the position
guards only looked at the character before the term, so the second word was
katakana-ized ("git コミットが失敗したとき"). A command-head lookbehind covers
git/gh/glab/orca/npm/pnpm/npx/yarn/docker/kubectl. A following Latin word now
also blocks the rule, so "Agent SDK" keeps its spelling as the comment claims.
- `on: 'オン'` matched every "on" in the catalog, including the preposition in
the external-automation delete confirmation, which rendered as
"外部ソース オン myhost". Moved to a new ja key-override module so the toggle
states and the preposition can differ; the module keeps
locale-key-overrides.mjs under max-lines.
- The phrase fixes write Cookie and fast-forward back in Latin, but neither was
in CJK_LATIN_SPACED_TERMS, so the 和欧間スペース was missing in five values.
- Three overrides spelled a half-width `...` that the ellipsis phrase fix
rewrites anyway, so the comment described the opposite of the behavior.
- Two descriptions render as [text] <code> [text]. The Japanese closed the
sentence with 。 and dropped the "such as" / "like" hand-off, leaving the code
span outside the sentence in the Git and quick-command panes.
- `' vs {{value0}}'` and `' · {{value0}} external'` were missed by the previous
leading-space fix, so "3 変更されたファイルvs main" rendered without a gap.
Adds three regression cases: two-word commands, the Latin-only label, and the
spacing for terms the phrase fixes reintroduce.
* fix(i18n): correct the Japanese an external review flagged
73 findings from a ChatGPT review of the full changed-value list, each
reproduced against the shipped catalog before being fixed:
- Two commands were translated into text that does not run: `pnpm playwright
test` became `pnpm プレイライトテスト` and `gh auth login` became `GH 認証ログイン`.
Both are pinned to English. A third value corrupted an identifier,
rendering `packages/web` as `package/web`.
- Two descriptions carried a stale translation with no relation to their
English source, and one had another row's text entirely.
- Syntax was misread in six values: `Command line Orca runs when…` read as
"the command line runs", `Let programs … copy` as "copy the programs",
`Dim files matched by .gitignore` kept `Dim` as a noun, and
`powers live quota reads` became 強化.
- Wording that changed the warning: `diffs may miss recent commits` read as
the commits being lost, `before merging is unblocked` as un-merging, and
`the newer disk content` as new content.
- `host` was rendered as サーバー in eight values even though it covers SSH
hosts, `worktrees` as ワークスペース, and `on this host` as リモート.
- Git vocabulary translated to its everyday sense: `upstream`→上流,
`staged changes`→段階的な変更; and identifiers `lan`/`deploy` were localized.
- Instructions to the user had lost their imperative (…をインストールします),
three validation messages still ended in a bare noun, and two completion
notices read as future tense.
- Assorted breakage: 窓 for a desktop window, 分割分割線, ターミナルパネル for
Terminal Panes, オプション for the macOS Option key, Herme for Hermes,
and a reversed noun phrase in the repo-icon import error.
The `Open` action needed a key override: bare "Open" is the PR/issue state in
16 of 18 places, and only the browser download row and the checks panel use it
as the verb, matching what ko/zh/es already do.
Three fixes had to be reworded rather than written literally: the existing
新しい→新規 and 実験的→実験的機能 phrase fixes run after value overrides and
turned 新しい名前 into 新規名前 and 実験的な into 実験的機能な.
Not fixed: `{{value0}} site{{value1}} connected` still shows the plural-suffix
placeholder, which needs the code change already listed in the PR notes.
* fix(i18n): sweep the whole catalog for the defect classes the reviews found
The external review covered a sample. This runs each of its finding classes as
a detector over all 11,857 values and fixes what they turn up, as durable
pipeline rules rather than one-off value edits where the class recurs:
- host は サーバー ではない. Orca's "host" covers SSH hosts and this computer,
so a phrase fix rewrites サーバー to ホスト whenever the English says host and
does not also say server, where the two are deliberately distinct (15 values).
- worktree joins the guarded generic-term list, so the seven values still
reading "worktree を削除" match the 205 that already say ワークツリー.
- Git vocabulary and brands restored from their everyday sense: 上流→upstream,
起源→origin, 段階的な変更→ステージ済みの変更, エルメス/ヘルメス→Hermes,
パワーシェル→PowerShell, アヒルアヒル→DuckDuckGo. All five terms are added to
CJK_LATIN_SPACED_TERMS so the restored Latin keeps its 和欧間スペース.
- 14 more code values pinned to English: Tailwind class strings
(size-4 text-muted-foreground → サイズ 4 テキストミュート前景), git refs
(origin/main → 原点/メイン), sample hosts (example.com → 例.com) and spec
fixtures (dashboard.spec.ts → ダッシュボードの仕様).
- 12 instructions regained their predicate (…を選択。 → …を選択してください。),
and 窓のぼかし, macOSのオプションキー, 中くらいのセクション見出し are corrected.
Checked and deliberately not changed: toast notifications that end in 〜しました
(237) read correctly for a completion notice, and setting descriptions ending in
〜します (200) describe what the setting does rather than instructing the user.
Sound preset names stay katakana, matching the rest of that list.
Adds three regression cases covering the host rule and its server exception,
the Git/brand restorations, and the newly pinned class strings and refs.
* fix(i18n): keep Agent in Latin in the Japanese catalog
Japanese developer UIs conventionally leave Agent unlocalized — it names Orca's
own concept rather than the everyday word — so the ja catalog now writes it in
Latin and only normalizes the case, so no sentence mixes "agent" and "Agent".
The 和欧間スペース comes from the existing spaced-term list.
This is the one term where ja diverges from locale-generic-ui-terms.mjs, which
lists エージェント as the expected rendering; ターミナル, コミット and リポジトリ
follow it exactly. Three test expectations are updated to match, and the PR
description flags the divergence so a maintainer can ask for it to be reverted
— it is a single rule in locale-ja-phrase-fixes.mjs.
The guards are unchanged, so `--agent`, agents.md, `orca agent` and "Agent SDK"
keep their spelling.
* fix(i18n): preserve selectors with no declaration block, and sharpen progress labels
CodeRabbit was right that `STYLE_BLOCK` only matched a selector when it carried
a declaration block or an attribute selector. `div.pricing-grid >
div.card.starter:nth-of-type(1) > a.cta` was unprotected and only survived
because MT happened to leave it alone.
A value now also counts as style when every whitespace token is selector-shaped
and at least two carry a class, id, pseudo or attribute. The first attempt at
that threshold counted a sentence-final period as a selector join and froze 259
ordinary two-sentence strings in English; the marker must now be followed by a
letter, so `Show live workspace ports. Click it for …` stays translated. Both
directions are pinned by tests.
The predicate moved to locale-style-values.mjs to keep locale-translation-policy
under max-lines.
A DeepL cross-check of the whole changed-value list surfaced six more:
- Progress labels had lost their 〜中: `Creating...` read 作成…, `Reopening...`
read 再開…, `Thinking…` read 考え…
- `Hide from sidebar` / `Show in sidebar` carried a stale 左サイドバーから Orca
Mobileを削除 in one of six places, with the 和欧間スペース missing too
- `Recent or tab strip.` was 最近のまたはタブストリップ。, which is not Japanese
Everything else DeepL flagged was this PR's settled terminology (Agent, Issue,
ホスト, 競合, fast-forward) or a fragment where DeepL had no surrounding context.
* fix(i18n): treat proper nouns as brands, and cut the comment noise
Review feedback, all verified against the catalog:
- Hermes, PowerShell, Mermaid, Claude Code and VS Code are proper nouns, so
they belong in BRAND_MISTRANSLATIONS with the other product names, not in the
ja phrase fixes. Claude コードセッション, マーメイドダイアグラム and VS コードで開く
were unfixed until now because nothing covered them.
- Sweeping every proper noun against the catalog found more the same way:
Orca IDE rendered as OrcaIDE, and Git had no 和欧間スペース in eight values,
because neither term was in CJK_LATIN_SPACED_TERMS.
- Settings-search keywords are lowercase, so the brand revert (case-sensitive)
cannot reach them. windows read 窓, gitignore read ギティ無視, component read
成分 (the chemistry sense), compose read 作曲する, and neovim/hermes/powershell
were transliterated. Pinned by value.
- The override sources still spelled エージェント in 34 places even though the
shipped value is Agent, so the file no longer said what it produced. The
代理人 rule also ran after the Agent rule, so a future MT 代理人 would have
stayed katakana; it now maps straight to Agent.
- Two of my own overrides had no matching English source left and were dead.
Comment volume is cut from 80 added lines to 25. The locale modules carry 2-8
comment lines each, and this PR was running an order of magnitude over that;
what is left is one line per genuinely non-obvious constraint.
BRAND_MISTRANSLATIONS moves to its own module to keep locale-translation-policy
under max-lines.
* fix(i18n): give every English string one Japanese rendering
215 English sources had two or more Japanese forms in the catalog, so the same
button read 削除 in one place and 削除する in another. Several of the variants
were also wrong outright: Hide read 隠れる, Sort read 選別, Run read 走る, and
"Don't ask again" read 二度と聞かないでください.
Picks follow the catalog majority — action labels drop する, completion notices
use 〜しました, status labels are 体言, and デフォルト / フィルター / スコープ /
ディストリビューション / 並べ替え win their pairs. A value override is keyed on the
English string, so one entry makes every occurrence agree.
Three key overrides contradicted the value they now share and were realigned;
seven pairs remain and are deliberate, where the same English is a different
thing per call site (Cursor the product vs the caret, Open the PR state vs the
action, Forward the port vs the browser button).
Grab mode picks a page element and hands it to the AI, but read 掴む as a button
and グラブモード in the web-client notice while the rest of the feature said 取得.
Also from CodeRabbit: a single dotted, colon or bracketed token — button.primary,
a:hover, wsl.exe, localhost:3000 — is code whether it names a selector, a file
or a host, so it is preserved too. That caught localhost:3000 reading
ローカルホスト:3000. And an override still spelled `Agent 、` with a space before
the Japanese comma.
The unified map lives in locale-ja-unified-values.mjs to keep the override file
under max-lines.
* fix(i18n): scope the catalog change to ja, and drop the zh-only Terminal form
The ja brand list carried 端子 as a Terminal mistranslation, but 端子 is the
zh rendering and never appears in ja — the Japanese one is 端末, which the
phrase fixes already rewrite to ターミナル. Listing 端末 here instead would be
wrong in the other direction, because this list reverts to Latin. The round-5
expectation moves to 端末 → ターミナル, which is behaviour that can actually occur.
The ko/zh/es identifier restorations are pulled back out; they are real bugs
(pr-view read PR视图, pnpm install read pnpm 설치) but they belong in their own
PR rather than a Japanese one. One zh line has to stay: without it,
verify-localization-catalog refuses the new stale-agent-row-{{value0}} entry
because repair would rewrite the Chinese text to English. That value is a toast
dedup id, not copy.
* chore(i18n): regenerate the Japanese catalog on the current base
The branch point moved forward 68 commits, which added 45 keys to en.json. The
catalog is rebuilt from that base so the repair run stays idempotent, and the
one string the new keys left in English is translated.
* fix(i18n): preserve the code strings rendered inside <code> and font-mono
@smwbev scanned by call-site context rather than value shape — a translate()
that renders inside <code> or a font-mono element is code — and found values
the shape-based list missed. Reproduced against the catalog and fixed here:
- {prompt} read {プロンプト}. It is the substitution token for the commit-message
prompt template, so a translated one never substitutes.
- /goal read /ゴール, which is not a slash command.
- npm run dev read npm 実行開発, in the same font-mono placeholder role as
pnpm install.
- nbformat read nbフォーマット.
upstream and upstream/main were already covered. The remaining values in the
scan break in zh rather than ja, but the entries are locale-agnostic, so
orca.yaml, LIN-329, GH #1799 and orca · zsh are pinned here too and #13124
restores the Chinese catalog.
* fix(i18n): repair Japanese translations of code, CLI, and URLs
Code samples, CLI arguments, URLs, and template variables must remain
executable. Adds to NEVER_TRANSLATE_VALUES to prevent future mistakes,
fixes ja.json mistranslations, and adds regression tests.
---------
Co-authored-by: m4air <m4air@m4airs-Air.localdomain>
bf406720a0