diff --git a/config/scripts/locale-cross-locale-key-overrides.mjs b/config/scripts/locale-cross-locale-key-overrides.mjs
index 124fb8f32e55..85b937b3244d 100644
--- a/config/scripts/locale-cross-locale-key-overrides.mjs
+++ b/config/scripts/locale-cross-locale-key-overrides.mjs
@@ -134,5 +134,30 @@ export const CROSS_LOCALE_KEY_OVERRIDES = {
   'auto.hooks.useSettingsNavigationMetadata.40d80bad8a': {
     zh: '测试版',
     ja: 'ベータ'
+  },
+  // Issue/PR state picker; it sits beside 已关闭, so 进行中 is a different state.
+  'auto.components.PullRequestPage.7b8f6bf6d8': {
+    zh: '开放'
+  },
+  // This "Open" is the button that opens the config file, not an issue state.
+  'auto.components.settings.McpConfigFileRow.e720c139cd': {
+    zh: '打开'
+  },
+  // Terminal cursor-color group: the on-screen cursor, not the Cursor editor.
+  'auto.components.settings.TerminalWindowSection.c9e1fdf42f': {
+    ko: '커서',
+    zh: '光标'
+  },
+  'auto.components.onboarding.ThemeStep.ab2a583a97': {
+    ko: '커서',
+    zh: '光标'
+  },
+  // Tailwind swatch labels: bare 天空 (the sky), 锌 and 空 (the metal, the sky) are not colors.
+  'auto.components.sidebar.workspace.status.6437a8c253': {
+    zh: '天蓝',
+    ja: '空色'
+  },
+  'auto.components.sidebar.workspace.status.caabd5ca85': {
+    zh: '锌灰'
   }
 }
diff --git a/config/scripts/locale-generic-ui-terms.mjs b/config/scripts/locale-generic-ui-terms.mjs
new file mode 100644
index 000000000000..2b41a324ce64
--- /dev/null
+++ b/config/scripts/locale-generic-ui-terms.mjs
@@ -0,0 +1,102 @@
+// Ordinary UI vocabulary that reads like a brand but is not one. Every locale should translate
+// these, so the policy must neither pin the whole value to English nor revert the translation
+// inside a sentence. The product-name homonyms (Continue.dev, the agent entries) stay Latin
+// through ENGLISH_ONLY_KEY_PREFIXES, which matches on the catalog key rather than the word.
+
+// Renderings a locale is expected to use. They are translations, never machine-translation
+// errors, so a brand revert must leave them alone. Nonsense forms that share the same English
+// term (zh 回购 "repurchase agreement", ja 端子 "electrical connector", es "Comprometerse")
+// stay in BRAND_MISTRANSLATIONS and keep getting reverted.
+const GENERIC_TERM_FAMILIES = [
+  {
+    terms: ['Agent', 'Agents', 'agent', 'agents'],
+    renderings: {
+      ko: ['에이전트'],
+      ja: ['エージェント'],
+      zh: ['代理', '智能体'],
+      es: ['Agente', 'agente', 'Agentes', 'agentes']
+    }
+  },
+  {
+    terms: ['Commit', 'Commits', 'commit', 'commits'],
+    renderings: {
+      ko: ['커밋'],
+      ja: ['コミット'],
+      zh: ['提交'],
+      es: [
+        'Confirmación',
+        'confirmación',
+        'Confirmaciones',
+        'confirmaciones',
+        'Confirmar',
+        'confirmar'
+      ]
+    }
+  },
+  {
+    terms: ['Continue'],
+    renderings: {
+      ko: ['계속하다', '계속'],
+      ja: ['続ける', '続行'],
+      zh: ['继续'],
+      es: ['Continuar', 'continuar']
+    }
+  },
+  {
+    terms: ['Repo', 'Repos', 'repo', 'repos'],
+    renderings: {
+      ko: ['저장소', '레포'],
+      ja: ['リポジトリ', 'リポ'],
+      zh: ['存储库', '仓库'],
+      es: ['Repositorio', 'repositorio', 'Repositorios', 'repositorios']
+    }
+  },
+  {
+    terms: ['Terminal', 'Terminals', 'terminal', 'terminals'],
+    renderings: {
+      ko: ['터미널'],
+      ja: ['ターミナル'],
+      zh: ['终端'],
+      es: ['Terminales', 'terminales']
+    }
+  }
+]
+
+export const LOCALIZABLE_GENERIC_TERMS = new Set(
+  GENERIC_TERM_FAMILIES.flatMap((family) => family.terms)
+)
+
+const RENDERINGS_BY_TERM = new Map(
+  GENERIC_TERM_FAMILIES.flatMap((family) => family.terms.map((term) => [term, family.renderings]))
+)
+
+export function isLocalizableGenericTerm(term) {
+  return LOCALIZABLE_GENERIC_TERMS.has(term)
+}
+
+export function isCanonicalGenericRendering(term, locale, form) {
+  return RENDERINGS_BY_TERM.get(term)?.[locale]?.includes(form) ?? false
+}
+
+export function canonicalGenericRenderings(locale) {
+  return GENERIC_TERM_FAMILIES.flatMap((family) =>
+    (family.renderings[locale] ?? []).map((form) => ({ form, terms: family.terms }))
+  )
+}
+
+function spansOf(value, needle) {
+  const spans = []
+  for (let at = value.indexOf(needle); at !== -1; at = value.indexOf(needle, at + 1)) {
+    spans.push([at, at + needle.length])
+  }
+  return spans
+}
+
+// Why: zh 终端子进程 ("terminal sub-process") contains 端子, so a blind revert of the
+// electrical-connector mistranslation would cut a valid word in half.
+export function overlapsCanonicalRendering(term, locale, value, start, end) {
+  const renderings = RENDERINGS_BY_TERM.get(term)?.[locale] ?? []
+  return renderings.some((form) =>
+    spansOf(value, form).some(([from, to]) => start < to && from < end)
+  )
+}
diff --git a/config/scripts/locale-generic-ui-terms.test.mjs b/config/scripts/locale-generic-ui-terms.test.mjs
new file mode 100644
index 000000000000..42a7d63d0b3b
--- /dev/null
+++ b/config/scripts/locale-generic-ui-terms.test.mjs
@@ -0,0 +1,174 @@
+import { describe, expect, it } from 'vitest'
+
+import { LOCALIZABLE_GENERIC_TERMS } from './locale-generic-ui-terms.mjs'
+import { NEVER_TRANSLATE_VALUES, repairTranslatedValue } from './locale-translation-policy.mjs'
+
+// Why: #12113 — repair-locale-catalog rewrote ~2000 translated values back to English because
+// generic UI words (agent, terminal, commit, repo, Continue) were treated as brands. These pin
+// the boundary: generic words stay translated, real brand names stay Latin.
+describe('locale generic UI terms', () => {
+  it('keeps a translated generic term when the whole value is that term', () => {
+    expect(
+      repairTranslatedValue({
+        key: 'auto.components.settings.AppearancePane.terminalTitle',
+        enValue: 'Terminal',
+        localeValue: '터미널',
+        locale: 'ko'
+      })
+    ).toBe('터미널')
+    expect(
+      repairTranslatedValue({
+        key: 'auto.components.settings.QuickCommandsPane.4ccc63da87',
+        enValue: 'Agent',
+        localeValue: '에이전트',
+        locale: 'ko'
+      })
+    ).toBe('에이전트')
+    expect(
+      repairTranslatedValue({
+        key: 'auto.components.mobile.MobileHero.a8fb43cf1c',
+        enValue: 'Continue',
+        localeValue: '继续',
+        locale: 'zh'
+      })
+    ).toBe('继续')
+  })
+
+  it('keeps a translated generic term inside a sentence', () => {
+    expect(
+      repairTranslatedValue({
+        key: 'auto.components.settings.EditorFontSection.matchTerminal',
+        enValue: 'Match terminal font',
+        localeValue: '터미널 글꼴과 동일',
+        locale: 'ko'
+      })
+    ).toBe('터미널 글꼴과 동일')
+    expect(
+      repairTranslatedValue({
+        key: 'auto.components.settings.ExperimentalPane.agentDashboard.toggleLabel',
+        enValue: 'Toggle Agent Dashboard',
+        localeValue: '에이전트 대시보드 전환',
+        locale: 'ko'
+      })
+    ).toBe('에이전트 대시보드 전환')
+    expect(
+      repairTranslatedValue({
+        key: 'components.agentSessionContinuation.dialogTitle',
+        enValue: 'Continue in New Session',
+        localeValue: '新しいセッションで続ける',
+        locale: 'ja'
+      })
+      // 新しい → 新規 is an unrelated phrase fix; 続ける is what must survive.
+    ).toBe('新規セッションで続ける')
+  })
+
+  it('still reverts real brand names that machine translation localized', () => {
+    expect(
+      repairTranslatedValue({
+        key: 'auto.stats.StatsPane.7d26110cea',
+        enValue: 'Codex',
+        localeValue: '사본',
+        locale: 'ko'
+      })
+    ).toBe('Codex')
+    expect(
+      repairTranslatedValue({
+        key: 'auto.components.settings.appearance.search.9ae151b26b',
+        enValue: 'linear',
+        localeValue: '线性',
+        locale: 'zh'
+      })
+    ).toBe('Linear')
+    expect(
+      repairTranslatedValue({
+        key: 'auto.components.settings.NetworkPane.tailscale',
+        enValue: 'Connect over Tailscale',
+        localeValue: '通过尾鳞连接',
+        locale: 'zh'
+      })
+    ).toBe('通过 Tailscale 连接')
+  })
+
+  it('still reverts nonsense renderings of a generic term', () => {
+    // 端子 is an electrical connector, 回购 a repurchase agreement, Comprometerse "to pledge".
+    expect(
+      repairTranslatedValue({
+        key: 'auto.components.agent.AgentCombobox.986f946354',
+        enValue: 'Blank Terminal',
+        localeValue: '空白端子',
+        locale: 'zh'
+      })
+    ).toBe('空白 Terminal')
+    expect(
+      repairTranslatedValue({
+        key: 'auto.components.right.sidebar.source.control.primary.action.ed93b4f14f',
+        enValue: 'Commit',
+        localeValue: 'Comprometerse',
+        locale: 'es'
+      })
+    ).toBe('Commit')
+    expect(
+      repairTranslatedValue({
+        key: 'auto.components.LinearIssueMarkdownDescriptionEditor.d9c47069ef',
+        enValue: 'Markdown',
+        localeValue: '가격 인하',
+        locale: 'ko'
+      })
+    ).toBe('Markdown')
+  })
+
+  it('does not cut a valid word that contains a nonsense rendering', () => {
+    // 终端子进程 is "terminal sub-process" — 端子 sits inside 终端 + 子.
+    expect(
+      repairTranslatedValue({
+        key: 'auto.components.settings.AdvancedNetworkSettingsSection.823e0f15b1',
+        enValue: 'Proxy URL for Orca network requests and local terminal subprocesses.',
+        localeValue: '用于 Orca 网络请求和本地终端子进程的代理 URL。',
+        locale: 'zh'
+      })
+    ).toBe('用于 Orca 网络请求和本地终端子进程的代理 URL。')
+  })
+
+  it('still fills in a translation when the catalog holds English', () => {
+    expect(
+      repairTranslatedValue({
+        key: 'auto.components.feature.wall.BrowserAnimatedVisual.04096318ab',
+        enValue: 'Terminal 1',
+        localeValue: 'Terminal 1',
+        locale: 'ko'
+      })
+    ).toBe('터미널 1')
+    expect(
+      repairTranslatedValue({
+        key: 'auto.store.slices.worktrees.889487d8bb',
+        enValue: 'Dismiss',
+        localeValue: '해고하다',
+        locale: 'ko'
+      })
+    ).toBe('닫기')
+  })
+
+  it('keeps agent catalog product names in English by key, not by word', () => {
+    expect(
+      repairTranslatedValue({
+        key: 'auto.lib.agent.catalog.9e2a9bb87b',
+        enValue: 'Continue',
+        localeValue: '继续',
+        locale: 'zh'
+      })
+    ).toBe('Continue')
+    expect(
+      repairTranslatedValue({
+        key: 'auto.lib.agent.catalog.760bc6883d',
+        enValue: 'Codex',
+        localeValue: '사본',
+        locale: 'ko'
+      })
+    ).toBe('Codex')
+  })
+
+  it('does not list a generic term as never-translatable', () => {
+    const pinned = [...LOCALIZABLE_GENERIC_TERMS].filter((term) => NEVER_TRANSLATE_VALUES.has(term))
+    expect(pinned).toEqual([])
+  })
+})
diff --git a/config/scripts/locale-ja-value-overrides.mjs b/config/scripts/locale-ja-value-overrides.mjs
index 7f9eeb60af73..30954473186b 100644
--- a/config/scripts/locale-ja-value-overrides.mjs
+++ b/config/scripts/locale-ja-value-overrides.mjs
@@ -94,7 +94,7 @@ export const JA_VALUE_OVERRIDES = {
   'Launch plan': '起動プラン',
   'Launch agent': 'エージェントを起動',
   'Launch {{value0}} in a new terminal': '新規ターミナルで {{value0}} を起動',
-  Play: 'Play',
+  Play: '再生',
   Action: '操作',
   Actions: '操作',
   action: '操作',
@@ -135,7 +135,7 @@ export const JA_VALUE_OVERRIDES = {
   'Pick a base branch below': '以下のベースブランチを選択',
   'Choose floating workspace directory': 'フローティング ワークスペース ディレクトリを選択',
   'Local project, Git repo, or folder with many repos':
-    'ローカルプロジェクト、Git repo、または多数の repos を含むフォルダー',
+    'ローカルプロジェクト、Git リポジトリ、または多数のリポジトリを含むフォルダー',
   'Enter passphrase': 'パスフレーズを入力',
   'Enter password': 'パスワードを入力',
   'Enter the passphrase for': 'のパスフレーズを入力',
diff --git a/config/scripts/locale-key-overrides.mjs b/config/scripts/locale-key-overrides.mjs
index d0577e80babd..d1b4b853bd75 100644
--- a/config/scripts/locale-key-overrides.mjs
+++ b/config/scripts/locale-key-overrides.mjs
@@ -162,8 +162,8 @@ const BASE_LOCALE_KEY_OVERRIDES = {
     ja: 'クローズ'
   },
   'auto.components.GitHubItemDialog.dc1ca081a8': {
-    ko: '진행 중',
-    zh: '进行中',
+    ko: '열림',
+    zh: '开放',
     ja: 'オープン'
   },
   'auto.components.tab.bar.TabBarCreateEntry.b27864279e': {
@@ -176,10 +176,11 @@ const BASE_LOCALE_KEY_OVERRIDES = {
     zh: '打开 Linear 任务',
     ja: 'Linear タスクを開く'
   },
+  // Onboarding pill beside Orca Mobile: "New" marks a new feature, not a create action.
   'auto.components.sidebar.SidebarNav.c86d83b5c3': {
-    ko: '새로 만들기',
-    zh: '新建',
-    ja: '新規'
+    ko: '신규',
+    zh: '新功能',
+    ja: '新機能'
   },
   'auto.components.sidebar.SidebarSettingsHelpMenu.eb9884e55b': {
     ko: 'Discord',
diff --git a/config/scripts/locale-ko-key-overrides.json b/config/scripts/locale-ko-key-overrides.json
index 9b40ad61f503..e8d13941ffaa 100644
--- a/config/scripts/locale-ko-key-overrides.json
+++ b/config/scripts/locale-ko-key-overrides.json
@@ -752,6 +752,21 @@
   "auto.components.contextual.tours.ContextualTourProgressDots.dcd6e6b03e": {
     "ko": "{{value1}}단계 중 {{value0}}단계"
   },
+  "auto.components.contextual.tours.ContextualTourOverlaySurface.complete": {
+    "ko": "완료"
+  },
+  "auto.components.contextual.tours.contextual.tour.overlay.measurement.automations.intro.body": {
+    "ko": "자동화는 일정에 따라 agent 작업을 실행합니다. 이 버튼을 눌러 자동화를 추가하세요."
+  },
+  "auto.components.contextual.tours.contextual.tour.overlay.measurement.automations.intro.title": {
+    "ko": "자동화란 무엇인가요?"
+  },
+  "auto.components.contextual.tours.contextual.tour.overlay.measurement.automations.results.body": {
+    "ko": "실행 내역에서 자동화가 언제 실행되었는지, 어떤 일이 발생했는지, 출력을 어디서 확인할 수 있는지 볼 수 있습니다."
+  },
+  "auto.components.contextual.tours.contextual.tour.overlay.measurement.automations.results.title": {
+    "ko": "결과 확인"
+  },
   "auto.components.crash.report.CrashReportDialog.88fea8e84e": {
     "ko": "보내지 않음"
   },
@@ -1868,6 +1883,9 @@
   "auto.components.right.sidebar.SourceControl.3a231c845b": {
     "ko": "알 수 없음"
   },
+  "auto.components.right.sidebar.SourceControl.6d7f2a47e5": {
+    "ko": "폴더의 변경 사항 취소"
+  },
   "auto.components.right.sidebar.SourceControl.812cb992ee": {
     "ko": "{{value0}}에서 열기"
   },
@@ -1880,6 +1898,9 @@
   "auto.components.right.sidebar.SourceControl.9bb062a886": {
     "ko": "commit 되지 않음"
   },
+  "auto.components.right.sidebar.SourceControl.a5e5a11090": {
+    "ko": "모든 변경 사항 취소 실패 — 취소 전에 파일의 스테이징을 해제하지 못했습니다."
+  },
   "auto.components.right.sidebar.SourceControl.aaf1451654": {
     "ko": "초안 {{value0}} 만들기"
   },
@@ -1994,6 +2015,9 @@
   "auto.components.right.sidebar.source.control.discard.confirmation.2ae5a785b3": {
     "ko": "스테이징되지 않은 변경 사항을 모두 삭제하시겠습니까?"
   },
+  "auto.components.right.sidebar.source.control.discard.confirmation.40e9357b2a": {
+    "ko": "이렇게 하면 HEAD에서 파일을 복원하고 파일 삭제를 취소합니다. 이 작업은 취소할 수 없습니다."
+  },
   "auto.components.right.sidebar.source.control.discard.confirmation.5ddd8cac7f": {
     "ko": "스테이징된 변경 사항을 모두 삭제하시겠습니까?"
   },
@@ -2015,6 +2039,9 @@
   "auto.components.right.sidebar.source.control.primary.action.1d47e850cf": {
     "ko": "연결된 리뷰 브랜치에 업데이트 푸시"
   },
+  "auto.components.right.sidebar.source.control.primary.action.5a477d80cb": {
+    "ko": "모든 변경 사항 스테이징"
+  },
   "auto.components.right.sidebar.source.control.primary.action.a5d1f7b036": {
     "ko": "{{value0}}을(를) 만들기 전에 commits을 게시하세요."
   },
@@ -2162,6 +2189,9 @@
   "auto.components.settings.AutoRenameBranchFromWorkSetting.a4fa380b67": {
     "ko": "{assistantMessage}"
   },
+  "auto.components.settings.AutoRenameBranchFromWorkSetting.d9b65054ef": {
+    "ko": ") 작업을 요약하는 짧은 이름으로 변경됩니다. Orca가 직접 이름 붙인 브랜치만 이름을 바꾸며, 푸시된 후에는 이름을 바꾸지 않습니다."
+  },
   "auto.components.settings.AutoRenameBranchPromptEditor.ebb942a2ec": {
     "ko": "fix-login-flow"
   },
@@ -2228,6 +2258,9 @@
   "auto.components.settings.DefaultWindowsProjectRuntimeSetting.wslUnavailable": {
     "ko": "WSL을 사용할 수 없습니다. WSL을 상속하는 프로젝트는 복구가 필요합니다."
   },
+  "auto.components.settings.DevToolsPane.orcaCloudDescription": {
+    "ko": "자사 클라우드 로그인의 개발자 전용 미리보기. 프로덕션에서는 숨겨집니다. 개발 환경에서는 ORCA_CLOUD_API_URL과 ORCA_CLOUD_CLIENT_ID가 설정되면 사이드바 계정 전환기에도 표시됩니다."
+  },
   "auto.components.settings.DeveloperPermissionsPane.16381e040a": {
     "ko": "마이크"
   },
@@ -2255,6 +2288,12 @@
   "auto.components.settings.ExperimentalPane.newWorktreeCardStyle.description": {
     "ko": "업데이트된 워크트리 카드 레이아웃, 메타데이터 배치, 카드 표시 메뉴 옵션 및 상태 표시를 미리 봅니다."
   },
+  "auto.components.settings.EphemeralVmsPane.recipes": {
+    "ko": "레시피"
+  },
+  "auto.components.settings.EphemeralVmsPane.whatTitle": {
+    "ko": "이 스킬로 함께 하는 작업"
+  },
   "auto.components.settings.GeneralEditorSettingsSection.45c6e85c4d": {
     "ko": "편집기"
   },
@@ -2727,7 +2766,7 @@
     "ko": "이 SSH 대상의 원격 릴레이를 강제로 중지합니다. 이 대상의 활성 원격 terminals과 포트 포워딩이 종료됩니다."
   },
   "auto.components.settings.SshTargetForm.137e88ce8d": {
-    "ko": "연결 해제 후 릴레이가 terminals을 활성 상태로 유지하는 기간입니다. 기본값: 10800(3시간). 최대:"
+    "ko": "Orca가 이 호스트에서 연결 해제된 뒤에도 원격 터미널은 계속 실행됩니다."
   },
   "auto.components.settings.SshTargetForm.2ee9bcd2e8": {
     "ko": "server, deploy@server:2222, ssh://server"
@@ -3710,6 +3749,9 @@
   "auto.components.settings.ssh.search.f9493b80c0": {
     "ko": "서버"
   },
+  "auto.components.settings.source.control.action.recipe.options.commitMessage": {
+    "ko": "스테이징된 변경 사항에서 commit 메시지를 생성합니다."
+  },
   "auto.components.settings.task.tracker.integration.cards.1a12e33fe5": {
     "ko": "Linear 액세스 추가"
   },
@@ -4683,7 +4725,7 @@
     "ko": "중지 중"
   },
   "auto.components.status.bar.WorkspaceSpaceCompactPanel.8ff597593d": {
-    "ko": "Space"
+    "ko": "저장 공간"
   },
   "auto.components.status.bar.WorkspaceSpaceCompactPanel.9be86c46a0": {
     "ko": "확보 가능"
@@ -4953,7 +4995,7 @@
     "ko": "선택한 리포지토리와 일치하는 비활성 워크스페이스가 없습니다."
   },
   "auto.components.workspace.space.WorkspaceSpacePage.45f6302dbc": {
-    "ko": "Space"
+    "ko": "저장 공간"
   },
   "auto.components.workspace.space.WorkspaceSpacePage.8d0048e1cb": {
     "ko": "워크스페이스 디스크 사용량과 회수 가능한 워크트리 저장 공간."
diff --git a/config/scripts/locale-ko-value-overrides.mjs b/config/scripts/locale-ko-value-overrides.mjs
index 1d128a67897c..19db7c753ec5 100644
--- a/config/scripts/locale-ko-value-overrides.mjs
+++ b/config/scripts/locale-ko-value-overrides.mjs
@@ -209,7 +209,7 @@ export const KO_VALUE_OVERRIDES = {
   'Install the Orca skill so agents know to use the Orca CLI.':
     '에이전트가 Orca CLI를 사용하도록 Orca 스킬을 설치하세요.',
   'Local project, Git repo, or folder with many repos':
-    '로컬 프로젝트, Git repo 또는 repos가 많은 폴더',
+    '로컬 프로젝트, Git 저장소 또는 저장소가 많은 폴더',
   'Linear, GitLab, Bitbucket, Azure DevOps, Gitea, and Jira live in Settings > Integrations.':
     'Linear, GitLab, Bitbucket, Azure DevOps, Gitea 및 Jira는 설정 > 연동에 있습니다.',
   'changed since you last approved. Re-review before it runs':
diff --git a/config/scripts/locale-phrase-fixes.mjs b/config/scripts/locale-phrase-fixes.mjs
index fec68ef8b5d7..b3c8026cea55 100644
--- a/config/scripts/locale-phrase-fixes.mjs
+++ b/config/scripts/locale-phrase-fixes.mjs
@@ -371,9 +371,10 @@ export const LOCALE_PHRASE_FIXES = {
     { pattern: /指挥进展/g, replacement: 'Conductor 进度', whenEnIncludes: 'Conductor Progress' },
     { pattern: /指挥评论/g, replacement: 'Conductor 评审', whenEnIncludes: 'Conductor Review' },
     { pattern: /指挥完成/g, replacement: 'Conductor 完成', whenEnIncludes: 'Conductor Done' },
-    { pattern: /琥珀色/g, replacement: 'Amber', whenEnIncludes: 'Amber' },
-    { pattern: /蓝色的/g, replacement: 'Blue', whenEnIncludes: 'Blue' },
-    { pattern: /中性的/g, replacement: 'Neutral', whenEnIncludes: 'Neutral' },
+    // Swatch labels want the bare color noun, not the adjectival 的 form — and not English.
+    { pattern: /琥珀色/g, replacement: '琥珀', whenEnIncludes: 'Amber' },
+    { pattern: /蓝色的/g, replacement: '蓝色', whenEnIncludes: 'Blue' },
+    { pattern: /中性的/g, replacement: '中性', whenEnIncludes: 'Neutral' },
     { pattern: /破坏性的/g, replacement: 'destructive', whenEnIncludes: 'destructive' },
     { pattern: /注解/g, replacement: '批注', whenEnIncludes: 'Annotation' },
     ...ZH_PHRASE_FIXES_ROUND5
diff --git a/config/scripts/locale-prose-term-exemptions.mjs b/config/scripts/locale-prose-term-exemptions.mjs
deleted file mode 100644
index fbe2d483fa1f..000000000000
--- a/config/scripts/locale-prose-term-exemptions.mjs
+++ /dev/null
@@ -1,19 +0,0 @@
-const LOCALIZED_PROSE_TERM_KEYS = new Set([
-  'auto.hooks.useMacosTccPromptNotice.description',
-  'auto.components.settings.DeveloperPermissionsPane.7ca17b62c8'
-])
-
-const LOCALIZABLE_PROSE_TERMS = new Set([
-  'Agent',
-  'Agents',
-  'agent',
-  'agents',
-  'Terminal',
-  'Terminals',
-  'terminal',
-  'terminals'
-])
-
-export function isLocalizedProseTermContext(term, key) {
-  return LOCALIZED_PROSE_TERM_KEYS.has(key) && LOCALIZABLE_PROSE_TERMS.has(term)
-}
diff --git a/config/scripts/locale-repair-catalog-missing-leaves.test.mjs b/config/scripts/locale-repair-catalog-missing-leaves.test.mjs
new file mode 100644
index 000000000000..65e142e5149a
--- /dev/null
+++ b/config/scripts/locale-repair-catalog-missing-leaves.test.mjs
@@ -0,0 +1,30 @@
+import { describe, expect, it } from 'vitest'
+
+import { repairCatalog } from './locale-translation-policy.mjs'
+
+// Regression: en.json routinely carries keys a locale catalog has not been bootstrapped with yet
+// (~190 per locale at the time of writing), which crashed the whole repair run before it did any work.
+describe('repairCatalog with un-bootstrapped keys', () => {
+  const enCatalog = {
+    auto: {
+      lib: { agent: { catalog: { '760bc6883d': 'Codex' } } },
+      components: { untranslated: 'Continue', nested: { alsoMissing: 'Refresh' } }
+    }
+  }
+
+  const translatedOnly = () => ({ auto: { lib: { agent: { catalog: { '760bc6883d': '사본' } } } } })
+
+  it('skips leaves the locale catalog is missing instead of throwing', () => {
+    for (const locale of ['ko', 'ja', 'zh', 'es']) {
+      const localeCatalog = translatedOnly()
+      expect(() => repairCatalog(enCatalog, localeCatalog, locale), locale).not.toThrow()
+      expect(localeCatalog.auto.components, locale).toBeUndefined()
+    }
+  })
+
+  it('still repairs the leaves that are present', () => {
+    const localeCatalog = translatedOnly()
+    expect(repairCatalog(enCatalog, localeCatalog, 'ko')).toBe(1)
+    expect(localeCatalog.auto.lib.agent.catalog['760bc6883d']).toBe('Codex')
+  })
+})
diff --git a/config/scripts/locale-translation-policy-ko-round5.test.mjs b/config/scripts/locale-translation-policy-ko-round5.test.mjs
index b3f88e4e1414..e03157e0bc60 100644
--- a/config/scripts/locale-translation-policy-ko-round5.test.mjs
+++ b/config/scripts/locale-translation-policy-ko-round5.test.mjs
@@ -45,7 +45,7 @@ describe('locale-translation-policy ko round 5', () => {
         localeValue: '에이전트가 Orca CLI 사용 방법을 알 수 있도록 Orca 기술을 설치합니다.',
         locale: 'ko'
       })
-    ).toBe('agents가 Orca CLI를 사용하도록 Orca 스킬을 설치하세요.')
+    ).toBe('에이전트가 Orca CLI를 사용하도록 Orca 스킬을 설치하세요.')
     expect(
       repairTranslatedValue({
         key: 'auto.components.editor.MarkdownPreview.322afab6ff',
@@ -92,7 +92,8 @@ describe('locale-translation-policy ko round 5', () => {
     ).toBe('파이프라인')
   })
 
-  it('keeps protected workflow terms in English', () => {
+  // Why: #12113 — brand names stay Latin, but generic workflow nouns keep their Korean.
+  it('keeps brand names English and generic workflow terms translated', () => {
     expect(
       repairTranslatedValue({
         key: 'auto.components.feature.wall.BrowserAnimatedVisual.04096318ab',
@@ -100,7 +101,7 @@ describe('locale-translation-policy ko round 5', () => {
         localeValue: '터미널 1',
         locale: 'ko'
       })
-    ).toBe('Terminal 1')
+    ).toBe('터미널 1')
     expect(
       repairTranslatedValue({
         key: 'auto.components.skills.SkillsPage.38e0951c3a',
@@ -108,7 +109,7 @@ describe('locale-translation-policy ko round 5', () => {
         localeValue: '에이전트 스킬',
         locale: 'ko'
       })
-    ).toBe('Agent 스킬')
+    ).toBe('에이전트 스킬')
     expect(
       repairTranslatedValue({
         key: 'auto.components.LinearIssueMarkdownDescriptionEditor.d9c47069ef',
@@ -124,7 +125,7 @@ describe('locale-translation-policy ko round 5', () => {
         localeValue: '푸시되지 않은 커밋',
         locale: 'ko'
       })
-    ).toBe('푸시되지 않은 commits')
+    ).toBe('푸시되지 않은 커밋')
     expect(
       repairTranslatedValue({
         key: 'auto.components.workspace.cleanup.WorkspaceCleanupDialog.0b1766738a',
@@ -132,7 +133,7 @@ describe('locale-translation-policy ko round 5', () => {
         localeValue: '레포',
         locale: 'ko'
       })
-    ).toBe('Repo')
+    ).toBe('레포')
     expect(
       repairTranslatedValue({
         key: 'auto.components.sidebar.add.repo.local.start.actions.fb4fc5380e',
@@ -140,7 +141,7 @@ describe('locale-translation-policy ko round 5', () => {
         localeValue: '로컬 프로젝트, Git 저장소 또는 저장소가 많은 폴더',
         locale: 'ko'
       })
-    ).toBe('로컬 프로젝트, Git repo 또는 repos가 많은 폴더')
+    ).toBe('로컬 프로젝트, Git 저장소 또는 저장소가 많은 폴더')
   })
 
   it('re-glues Korean particles after Latin terms without gluing content words', () => {
diff --git a/config/scripts/locale-translation-policy.es-round5.test.mjs b/config/scripts/locale-translation-policy.es-round5.test.mjs
index b52afceb02d3..3bf5a77fb3a0 100644
--- a/config/scripts/locale-translation-policy.es-round5.test.mjs
+++ b/config/scripts/locale-translation-policy.es-round5.test.mjs
@@ -3,7 +3,8 @@ import { describe, expect, it } from 'vitest'
 import { repairTranslatedValue } from './locale-translation-policy.mjs'
 
 describe('locale-translation-policy es round 5', () => {
-  it('keeps protected workflow terms in English', () => {
+  // Why: #12113 — brand names stay Latin, but generic workflow nouns keep their Spanish.
+  it('keeps brand names English and generic workflow terms translated', () => {
     expect(
       repairTranslatedValue({
         key: 'auto.components.LinearIssueMarkdownDescriptionEditor.d9c47069ef',
@@ -43,7 +44,7 @@ describe('locale-translation-policy es round 5', () => {
         localeValue: 'mensaje de confirmación',
         locale: 'es'
       })
-    ).toBe('mensaje de Commit')
+    ).toBe('mensaje de confirmación')
     expect(
       repairTranslatedValue({
         key: 'auto.components.workspace.cleanup.WorkspaceCleanupDialog.0b1766738a',
@@ -51,7 +52,7 @@ describe('locale-translation-policy es round 5', () => {
         localeValue: 'repositorio',
         locale: 'es'
       })
-    ).toBe('Repo')
+    ).toBe('repositorio')
     expect(
       repairTranslatedValue({
         key: 'auto.components.sidebar.add.repo.local.start.actions.fb4fc5380e',
@@ -59,6 +60,6 @@ describe('locale-translation-policy es round 5', () => {
         localeValue: 'Proyecto local, repositorio de Git o carpeta con muchos repositorios',
         locale: 'es'
       })
-    ).toBe('Proyecto local, repo de Git o carpeta con muchos repos')
+    ).toBe('Proyecto local, repositorio de Git o carpeta con muchos repositorios')
   })
 })
diff --git a/config/scripts/locale-translation-policy.ja-round5.test.mjs b/config/scripts/locale-translation-policy.ja-round5.test.mjs
index 3100efc3abea..219bc33113b4 100644
--- a/config/scripts/locale-translation-policy.ja-round5.test.mjs
+++ b/config/scripts/locale-translation-policy.ja-round5.test.mjs
@@ -27,7 +27,7 @@ describe('locale-translation-policy ja round 5', () => {
         localeValue: '遊ぶ',
         locale: 'ja'
       })
-    ).toBe('Play')
+    ).toBe('再生')
     expect(
       repairTranslatedValue({
         key: 'auto.components.TaskPage.8396825a14',
@@ -102,7 +102,8 @@ describe('locale-translation-policy ja round 5', () => {
     ).toBe('まずプロジェクトを追加')
   })
 
-  it('keeps protected workflow terms in English', () => {
+  // Why: #12113 — brand names stay Latin, but generic workflow nouns keep their Japanese.
+  it('keeps brand names English and generic workflow terms translated', () => {
     expect(
       repairTranslatedValue({
         key: 'auto.components.status.bar.WorkspaceSpaceManagerPanel.e9528a89b3',
@@ -118,7 +119,7 @@ describe('locale-translation-policy ja round 5', () => {
         localeValue: 'エージェントのスキル',
         locale: 'ja'
       })
-    ).toBe('Agent のスキル')
+    ).toBe('エージェントのスキル')
     expect(
       repairTranslatedValue({
         key: 'auto.components.tab.bar.TabBar.3d5d6c960d',
@@ -134,7 +135,7 @@ describe('locale-translation-policy ja round 5', () => {
         localeValue: 'コミット',
         locale: 'ja'
       })
-    ).toBe('commits')
+    ).toBe('コミット')
     expect(
       repairTranslatedValue({
         key: 'auto.components.mobile.slides.WorktreeListSlide.22971156df',
@@ -142,7 +143,7 @@ describe('locale-translation-policy ja round 5', () => {
         localeValue: 'リポ',
         locale: 'ja'
       })
-    ).toBe('Repo')
+    ).toBe('リポ')
     expect(
       repairTranslatedValue({
         key: 'auto.components.sidebar.add.repo.local.start.actions.fb4fc5380e',
@@ -151,6 +152,6 @@ describe('locale-translation-policy ja round 5', () => {
           'ローカル プロジェクト、Git リポジトリ、または多数のリポジトリを含むフォルダー',
         locale: 'ja'
       })
-    ).toBe('ローカルプロジェクト、Git repo、または多数の repos を含むフォルダー')
+    ).toBe('ローカルプロジェクト、Git リポジトリ、または多数のリポジトリを含むフォルダー')
   })
 })
diff --git a/config/scripts/locale-translation-policy.mjs b/config/scripts/locale-translation-policy.mjs
index a3feb5f59dfd..50a490dc184a 100644
--- a/config/scripts/locale-translation-policy.mjs
+++ b/config/scripts/locale-translation-policy.mjs
@@ -1,5 +1,8 @@
 import { CJK_LATIN_SPACED_TERMS } from './locale-cjk-latin-spaced-terms.mjs'
-import { isLocalizedProseTermContext } from './locale-prose-term-exemptions.mjs'
+import {
+  isCanonicalGenericRendering,
+  overlapsCanonicalRendering
+} from './locale-generic-ui-terms.mjs'
 import { isScreenCursorContext } from './locale-screen-cursor-exemptions.mjs'
 import { LOCALE_KEY_OVERRIDES } from './locale-key-overrides.mjs'
 import { LOCALE_PHRASE_FIXES } from './locale-phrase-fixes.mjs'
@@ -17,9 +20,10 @@ const OPEN_IN_APP_CATALOG_PREFIX = 'auto.lib.open.in.app.catalog.'
 // Why: product names and agent labels stay Latin — MT reads them as common words (Codex→copy, Gemini→zodiac).
 export const ENGLISH_ONLY_KEY_PREFIXES = [AGENT_CATALOG_PREFIX, OPEN_IN_APP_CATALOG_PREFIX]
 
+// Only genuine brand, product, and code tokens belong here. Ordinary UI words that happen to
+// name a product (agent, terminal, commit, repo, Continue) live in locale-generic-ui-terms.mjs
+// and are translated; their product sense is pinned by ENGLISH_ONLY_KEY_PREFIXES instead.
 export const NEVER_TRANSLATE_VALUES = new Set([
-  'Agent',
-  'Agents',
   'Aider',
   'Amp',
   'Android',
@@ -33,7 +37,6 @@ export const NEVER_TRANSLATE_VALUES = new Set([
   'Codebuff',
   'Codex',
   'Command Code',
-  'Continue',
   'Cursor',
   'Droid',
   'Devin',
@@ -60,30 +63,16 @@ export const NEVER_TRANSLATE_VALUES = new Set([
   'Pi',
   'PostHog',
   'Qwen Code',
-  'Repo',
-  'Repos',
   'Rovo Dev',
-  'Commit',
-  'Commits',
   'Markdown',
-  'Terminal',
-  'Terminals',
   'VS Code',
   'Warp',
   'Zed',
-  'agent',
-  'agents',
   'android',
   'codex',
-  'commit',
-  'commits',
   'gemini',
   'claude',
   'markdown',
-  'repo',
-  'repos',
-  'terminal',
-  'terminals',
   'gh',
   'idle',
   'anthropic',
@@ -368,6 +357,18 @@ function includesPreservedLatinTerm(value, term) {
   return new RegExp(`(^|[^A-Za-z_])${escapeRegExp(term)}($|[^A-Za-z_])`).test(value)
 }
 
+function replaceMistranslatedForm(value, wrong, brand, locale) {
+  let result = ''
+  let cursor = 0
+  for (let at = value.indexOf(wrong); at !== -1; at = value.indexOf(wrong, cursor)) {
+    const end = at + wrong.length
+    result += value.slice(cursor, at)
+    result += overlapsCanonicalRendering(brand, locale, value, at, end) ? wrong : brand
+    cursor = end
+  }
+  return result + value.slice(cursor)
+}
+
 function applyBrandMistranslationFixes(enValue, localeValue, locale, key = '') {
   let result = localeValue
   const mistranslations = BRAND_MISTRANSLATIONS[locale] ?? {}
@@ -383,9 +384,6 @@ function applyBrandMistranslationFixes(enValue, localeValue, locale, key = '') {
     if (isScreenCursorContext(brand, enValue, key)) {
       continue
     }
-    if (isLocalizedProseTermContext(brand, key)) {
-      continue
-    }
     if (includesPreservedLatinTerm(result, brand)) {
       continue
     }
@@ -393,11 +391,16 @@ function applyBrandMistranslationFixes(enValue, localeValue, locale, key = '') {
       if (!result.includes(wrong)) {
         continue
       }
+      // Why: #12113 — a generic term's correct translation is not a mistranslation; reverting it
+      // rewrote ~2000 translated values back to English on every repair run.
+      if (isCanonicalGenericRendering(brand, locale, wrong)) {
+        continue
+      }
       // Why: "Copy identifier" legitimately uses 사본/复制 — only swap when English names the brand.
       if (brand === 'Codex' && /\bCopy\b/i.test(enValue)) {
         continue
       }
-      result = result.replaceAll(wrong, brand)
+      result = replaceMistranslatedForm(result, wrong, brand, locale)
     }
   }
 
@@ -548,6 +551,11 @@ export function repairCatalog(enCatalog, localeCatalog, locale) {
 
   for (const leaf of leaves) {
     const current = leaf.key.split('.').reduce((cursor, part) => cursor?.[part], localeCatalog)
+    // Why: en.json carries keys the locale catalog has not been bootstrapped with yet; repair only
+    // rewrites values that already exist, so skip instead of crashing on undefined.
+    if (typeof current !== 'string') {
+      continue
+    }
     const next = repairTranslatedValue({
       key: leaf.key,
       enValue: leaf.value,
diff --git a/config/scripts/locale-translation-policy.test.mjs b/config/scripts/locale-translation-policy.test.mjs
index 1722f8f946ee..d919de96cff3 100644
--- a/config/scripts/locale-translation-policy.test.mjs
+++ b/config/scripts/locale-translation-policy.test.mjs
@@ -80,7 +80,7 @@ describe('locale-translation-policy', () => {
         localeValue: '壊れた小切手に対して AI エージェントを開始しました。',
         locale: 'ja'
       })
-    ).toBe('失敗したチェックに対して AI agent を開始しました。')
+    ).toBe('失敗したチェックに対して AI エージェントを開始しました。')
     expect(
       repairTranslatedValue({
         key: 'auto.hooks.useSettingsNavigationMetadata.95a1886d94',
@@ -88,7 +88,7 @@ describe('locale-translation-policy', () => {
         localeValue: '電話機からターミナルとエージェントを制御します。',
         locale: 'ja'
       })
-    ).toBe('スマートフォンから terminals と agents を操作')
+    ).toBe('スマートフォンからターミナルとエージェントを操作')
     expect(
       repairTranslatedValue({
         key: 'auto.components.GitHubItemDialog.934add88b6',
@@ -267,7 +267,7 @@ describe('locale-translation-policy', () => {
         localeValue: '未已检测代理',
         locale: 'zh'
       })
-    ).toBe('未检测到 agents')
+    ).toBe('未检测到代理')
     expect(
       repairTranslatedValue({
         key: 'auto.components.skills.SkillsPage.38e0951c3a',
@@ -275,7 +275,7 @@ describe('locale-translation-policy', () => {
         localeValue: '代理技巧',
         locale: 'zh'
       })
-    ).toBe('Agent 技能')
+    ).toBe('代理技能')
     expect(
       repairTranslatedValue({
         key: 'auto.components.settings.appearance.search.9ae151b26b',
@@ -358,7 +358,7 @@ describe('locale-translation-policy', () => {
         localeValue: 'コミットするものは何もありません。 PR はすでに統合されています。',
         locale: 'ja'
       })
-    ).toBe('commit するものはありません。PR はすでにマージされています。')
+    ).toBe('コミットするものはありません。PR はすでにマージされています。')
     expect(
       repairTranslatedValue({
         key: 'auto.components.settings.integrations.search.581844769a',
@@ -546,7 +546,7 @@ describe('locale-translation-policy', () => {
         localeValue: '玩',
         locale: 'zh'
       })
-    ).toBe('Play')
+    ).toBe('播放')
     expect(
       repairTranslatedValue({
         key: 'auto.components.right.sidebar.SourceControlAgentActionDialogForm.1bc0bdbb5e',
diff --git a/config/scripts/locale-translation-policy.zh-round5.test.mjs b/config/scripts/locale-translation-policy.zh-round5.test.mjs
index 6e451c6d89b5..28901fba8d45 100644
--- a/config/scripts/locale-translation-policy.zh-round5.test.mjs
+++ b/config/scripts/locale-translation-policy.zh-round5.test.mjs
@@ -86,7 +86,9 @@ describe('locale-translation-policy zh round 5', () => {
     ).toBe('集成')
   })
 
-  it('keeps Terminal as a product surface term', () => {
+  // Why: #12113 — 终端 is the correct rendering and survives; only the 端子 ("electrical
+  // connector") mistranslation still reverts to Latin.
+  it('keeps terminal translated but reverts the 端子 mistranslation', () => {
     expect(
       repairTranslatedValue({
         key: 'auto.components.settings.Settings.3de4bbb841',
@@ -94,7 +96,7 @@ describe('locale-translation-policy zh round 5', () => {
         localeValue: '终端',
         locale: 'zh'
       })
-    ).toBe('Terminal')
+    ).toBe('终端')
     expect(
       repairTranslatedValue({
         key: 'auto.components.feature.wall.BrowserAnimatedVisual.04096318ab',
@@ -102,7 +104,7 @@ describe('locale-translation-policy zh round 5', () => {
         localeValue: '终端 1',
         locale: 'zh'
       })
-    ).toBe('Terminal 1')
+    ).toBe('终端 1')
     expect(
       repairTranslatedValue({
         key: 'auto.components.agent.AgentCombobox.986f946354',
@@ -118,7 +120,7 @@ describe('locale-translation-policy zh round 5', () => {
         localeValue: '分体式端子右',
         locale: 'zh'
       })
-    ).toBe('向右拆分 Terminal')
+    ).toBe('向右拆分终端')
     expect(
       repairTranslatedValue({
         key: 'auto.components.settings.TerminalAppearanceSection.abcb4dd019',
@@ -126,7 +128,7 @@ describe('locale-translation-policy zh round 5', () => {
         localeValue: '终端Cursor',
         locale: 'zh'
       })
-    ).toBe('Terminal Cursor')
+    ).toBe('终端 Cursor')
     expect(
       repairTranslatedValue({
         key: 'auto.components.terminal.FloatingTerminalPanel.3215fc73e9',
@@ -137,7 +139,8 @@ describe('locale-translation-policy zh round 5', () => {
     ).toBe('新 Terminal')
   })
 
-  it('keeps workflow terms in English', () => {
+  // Why: #12113 — brand names stay Latin, but generic workflow nouns keep their Chinese.
+  it('keeps brand names English and generic workflow terms translated', () => {
     expect(
       repairTranslatedValue({
         key: 'auto.components.sidebar.SidebarNav.9c95e1ce91',
@@ -145,7 +148,7 @@ describe('locale-translation-policy zh round 5', () => {
         localeValue: '代理',
         locale: 'zh'
       })
-    ).toBe('Agents')
+    ).toBe('代理')
     expect(
       repairTranslatedValue({
         key: 'auto.components.GitHubItemDialog.28986b3747',
@@ -153,7 +156,7 @@ describe('locale-translation-policy zh round 5', () => {
         localeValue: '已启动 AI 代理处理失败的检查。',
         locale: 'zh'
       })
-    ).toBe('已启动 AI agent 处理失败的检查。')
+    ).toBe('已启动 AI 代理处理失败的检查。')
     expect(
       repairTranslatedValue({
         key: 'auto.components.LinearIssueMarkdownDescriptionEditor.d9c47069ef',
@@ -177,7 +180,7 @@ describe('locale-translation-policy zh round 5', () => {
         localeValue: '次提交',
         locale: 'zh'
       })
-    ).toBe('commits')
+    ).toBe('次提交')
     expect(
       repairTranslatedValue({
         key: 'auto.store.slices.worktrees.d1d78a7baa',
@@ -187,7 +190,7 @@ describe('locale-translation-policy zh round 5', () => {
           'Git 无法安全删除分支“{{value0}}”{{value1}}，因此 Orca 保留它以避免丢失本地提交。',
         locale: 'zh'
       })
-    ).toBe('Git 无法安全删除分支“{{value0}}”{{value1}}，因此 Orca 保留它以避免丢失本地 commits。')
+    ).toBe('Git 无法安全删除分支“{{value0}}”{{value1}}，因此 Orca 保留它以避免丢失本地提交。')
   })
 
   it('does not confuse proxy copy with Agent terminology', () => {
@@ -234,7 +237,7 @@ describe('locale-translation-policy zh round 5', () => {
         localeValue: '本地项目、Git 存储库或包含多个存储库的文件夹',
         locale: 'zh'
       })
-    ).toBe('本地项目、Git repo 或包含多个 repos 的文件夹')
+    ).toBe('本地项目、Git 仓库或包含多个仓库的文件夹')
   })
 
   it('keeps product, provider, code, and shell tokens untranslated', () => {
diff --git a/config/scripts/locale-value-overrides.mjs b/config/scripts/locale-value-overrides.mjs
index e237bca76b09..ea49d748250f 100644
--- a/config/scripts/locale-value-overrides.mjs
+++ b/config/scripts/locale-value-overrides.mjs
@@ -8,7 +8,7 @@ export const LOCALE_VALUE_OVERRIDES = {
     'OpenCode Go': 'OpenCode Go',
     'Open in Cursor': 'Abrir en Cursor',
     'Local project, Git repo, or folder with many repos':
-      'Proyecto local, repo de Git o carpeta con muchos repos'
+      'Proyecto local, repositorio de Git o carpeta con muchos repositorios'
   },
   ko: {
     Save: '저장',
@@ -305,7 +305,8 @@ export const LOCALE_VALUE_OVERRIDES = {
     teams: '团队',
     passing: '通过',
     'opened this issue': '创建了此议题',
-    Open: '进行中',
+    // No blanket "Open" override: it is a verb on buttons (打开) and a state next to 已关闭 (开放),
+    // so a single value-wide mapping is wrong for half the call sites. Per-key catalog values decide.
     'Join Discord': '加入 Discord',
     'Pull request merged': '拉取请求已合并',
     'Agent Skills': '代理技能',
diff --git a/config/scripts/locale-zh-value-overrides.mjs b/config/scripts/locale-zh-value-overrides.mjs
index d11c747c1df0..087091a3f3ef 100644
--- a/config/scripts/locale-zh-value-overrides.mjs
+++ b/config/scripts/locale-zh-value-overrides.mjs
@@ -67,8 +67,8 @@ export const ZH_VALUE_OVERRIDES = {
   Inline: '内联',
   thread: '帖子串',
   destructive: 'destructive',
-  sheet: 'sheet',
-  page: 'page',
+  sheet: '面板',
+  page: '页面',
   Annotation: '批注',
   'check #': '检查 #',
   by: '由',
@@ -92,16 +92,18 @@ export const ZH_VALUE_OVERRIDES = {
     '仓库操作方案。在此仓库自定义之前，将使用全局设置。',
   'Adds action recipes for Source Control commit, pull request, branch-name, and fix actions.':
     '为源代码管理的提交、拉取请求、分支命名和修复操作添加操作方案。',
-  Play: 'Play',
-  Flag: 'Flag',
-  Zinc: 'Zinc',
-  Rose: 'Rose',
-  Emerald: 'Emerald',
-  Amber: 'Amber',
-  Violet: 'Violet',
-  Sky: 'Sky',
-  Blue: 'Blue',
-  Neutral: 'Neutral',
+  // Workspace status icon and color swatch labels; siblings below are translated, so English
+  // pins here would leave the picker half-Chinese on the next catalog regeneration.
+  Play: '播放',
+  Flag: '标记',
+  Zinc: '锌灰',
+  Rose: '玫瑰',
+  Emerald: '翡翠',
+  Amber: '琥珀',
+  Violet: '紫罗兰',
+  Sky: '天蓝',
+  Blue: '蓝色',
+  Neutral: '中性',
   Dashed: '虚线',
   Dot: '圆点',
   Circle: '圆形',
@@ -201,8 +203,7 @@ export const ZH_VALUE_OVERRIDES = {
     '每个已连接的 Linear 工作区都有一个由活动运行时存储的密钥。全权限密钥可覆盖密钥所有者可访问的所有团队；受限密钥可随时更换。',
   'Show Linear in the Tasks source picker and sidebar shortcuts.':
     '在任务源选择器和侧边栏快捷方式中显示 Linear。',
-  'Local project, Git repo, or folder with many repos':
-    '本地项目、Git repo 或包含多个 repos 的文件夹',
+  'Local project, Git repo, or folder with many repos': '本地项目、Git 仓库或包含多个仓库的文件夹',
   'Staged Changes': '已暂存的更改',
   Changes: '更改',
   'Untracked Files': '未跟踪文件',
@@ -210,8 +211,8 @@ export const ZH_VALUE_OVERRIDES = {
   'Split Down': '向下拆分',
   'Split Left': '向左拆分',
   'Split Right': '向右拆分',
-  'Split Terminal Down': '向下拆分 Terminal',
-  'Split Terminal Right': '向右拆分 Terminal',
+  'Split Terminal Down': '向下拆分终端',
+  'Split Terminal Right': '向右拆分终端',
   'Optional account switching for Claude while preserving shared chat context.':
     'Claude 的可选账户切换，同时保留共享聊天上下文。',
   'Countdown timer showing time until prompt cache expires (Claude agents).':
diff --git a/config/scripts/verify-localization-catalog.mjs b/config/scripts/verify-localization-catalog.mjs
index 901c651798d0..d3e25d3fd2ca 100644
--- a/config/scripts/verify-localization-catalog.mjs
+++ b/config/scripts/verify-localization-catalog.mjs
@@ -6,6 +6,9 @@ import process from 'node:process'
 // TypeScript 7 is a native CLI; AST consumers still need the legacy JavaScript API.
 import ts from 'typescript-api'
 
+import { canonicalGenericRenderings } from './locale-generic-ui-terms.mjs'
+import { repairTranslatedValue } from './locale-translation-policy.mjs'
+
 const SOURCE_EXTENSIONS = new Set(['.ts', '.tsx', '.js', '.jsx', '.mts', '.cts'])
 const SKIP_PATH_PARTS = new Set(['.git', 'dist', 'node_modules', 'out', '__snapshots__', 'assets'])
 const LOCALIZATION_FUNCTION_NAMES = new Set(['t', 'translate', 'translateMain'])
@@ -282,9 +285,51 @@ function applyMissingEnglishEntries(catalog, missing) {
   return changed
 }
 
+// Why: #12113 — parity checks pass while repair-locale-catalog rewrites translated generic terms
+// back to English, so drift only surfaces when someone regenerates the catalog.
+export function collectGenericTermRegressions(enEntries, localeEntries, localeName) {
+  const renderings = canonicalGenericRenderings(localeName)
+  if (renderings.length === 0) {
+    return []
+  }
+
+  const regressions = []
+  for (const [key, enValue] of enEntries) {
+    const localeValue = localeEntries.get(key)
+    if (typeof enValue !== 'string' || typeof localeValue !== 'string') {
+      continue
+    }
+    const repaired = repairTranslatedValue({ key, enValue, localeValue, locale: localeName })
+    if (repaired === localeValue) {
+      continue
+    }
+    // Why: {{agent}} is an interpolation name, not English copy the reader sees.
+    const repairedCopy = repaired.replace(PLACEHOLDER_RE, '')
+    for (const { form, terms } of renderings) {
+      if (!localeValue.includes(form) || repaired.includes(form)) {
+        continue
+      }
+      if (
+        terms.some((term) => new RegExp(`(^|[^A-Za-z])${term}($|[^A-Za-z])`).test(repairedCopy))
+      ) {
+        regressions.push({ key, form, localeValue, repaired })
+        break
+      }
+    }
+  }
+  return regressions
+}
+
+function formatGenericTermRegressions(regressions) {
+  return regressions
+    .map((entry) => `${entry.key}: ${entry.form} -> English (${entry.repaired})`)
+    .join('\n')
+}
+
 function verifyLocaleCatalog(enCatalog, localeName, localeCatalog) {
   const { enEntries, localeEntries, missingInLocale, extraInLocale, interpolationMismatches } =
     collectLocaleParityIssues(enCatalog, localeCatalog)
+  const genericTermRegressions = collectGenericTermRegressions(enEntries, localeEntries, localeName)
 
   // Why: feature PRs own English declarations; absent target leaves deliberately
   // use i18next's existing English fallback until a localization PR supplies them.
@@ -292,7 +337,11 @@ function verifyLocaleCatalog(enCatalog, localeName, localeCatalog) {
     `${localeName}.json coverage: ${enEntries.size - missingInLocale.length}/${enEntries.size} translated, ${missingInLocale.length} missing.`
   )
 
-  if (extraInLocale.length > 0 || interpolationMismatches.length > 0) {
+  if (
+    extraInLocale.length > 0 ||
+    interpolationMismatches.length > 0 ||
+    genericTermRegressions.length > 0
+  ) {
     console.error(`Locale catalog validation failed for ${localeName}.json.`)
     if (extraInLocale.length > 0) {
       console.error('')
@@ -310,6 +359,18 @@ function verifyLocaleCatalog(enCatalog, localeName, localeCatalog) {
         console.error(`...and ${interpolationMismatches.length - 20} more interpolation mismatches`)
       }
     }
+    if (genericTermRegressions.length > 0) {
+      console.error('')
+      console.error(
+        'repair-locale-catalog would rewrite these translated terms back to English.',
+        'Treat the term as generic in config/scripts/locale-generic-ui-terms.mjs',
+        'instead of listing its translation as a mistranslation.'
+      )
+      console.error(formatGenericTermRegressions(genericTermRegressions.slice(0, 20)))
+      if (genericTermRegressions.length > 20) {
+        console.error(`...and ${genericTermRegressions.length - 20} more generic term regressions`)
+      }
+    }
     return 1
   }
 
diff --git a/config/scripts/verify-localization-catalog.test.mjs b/config/scripts/verify-localization-catalog.test.mjs
index 89e24bc0c0dd..4bf3d7d7ebad 100644
--- a/config/scripts/verify-localization-catalog.test.mjs
+++ b/config/scripts/verify-localization-catalog.test.mjs
@@ -4,7 +4,10 @@ import path from 'node:path'
 
 import { describe, expect, it, vi } from 'vitest'
 
-import { main as verifyLocalizationCatalog } from './verify-localization-catalog.mjs'
+import {
+  collectGenericTermRegressions,
+  main as verifyLocalizationCatalog
+} from './verify-localization-catalog.mjs'
 
 function writeJson(filePath, value) {
   writeFileSync(filePath, `${JSON.stringify(value, null, 2)}\n`, 'utf8')
@@ -123,4 +126,47 @@ describe('verify-localization-catalog', () => {
       report.mockRestore()
     }
   })
+
+  // Why: #12113 — parity checks passed while the repair policy rewrote translated terms to English.
+  it('flags catalog values the repair policy would rewrite back to English', () => {
+    const enEntries = new Map([['auto.example.commitLabel', 'Commit message']])
+
+    expect(
+      collectGenericTermRegressions(
+        enEntries,
+        new Map([['auto.example.commitLabel', 'mensaje de confirmación']]),
+        'es'
+      )
+    ).toEqual([])
+
+    // A locale whose committed value is the English term is stable, not a regression.
+    expect(
+      collectGenericTermRegressions(
+        enEntries,
+        new Map([['auto.example.commitLabel', 'mensaje de Commit']]),
+        'es'
+      )
+    ).toEqual([])
+
+    // 'Comprometerse' is a real mistranslation, so reverting it to Latin is expected.
+    expect(
+      collectGenericTermRegressions(
+        enEntries,
+        new Map([['auto.example.commitLabel', 'mensaje de Comprometerse']]),
+        'es'
+      )
+    ).toEqual([])
+  })
+
+  it('ignores interpolation names when looking for English rewrites', () => {
+    expect(
+      collectGenericTermRegressions(
+        new Map([
+          ['components.agentSessionContinuation.originalAgent', 'Original agent: {{agent}}']
+        ]),
+        new Map([['components.agentSessionContinuation.originalAgent', '原智能体：{{agent}}']]),
+        'zh'
+      )
+    ).toEqual([])
+  })
 })
diff --git a/src/renderer/src/components/JiraIssueWorkspace.tsx b/src/renderer/src/components/JiraIssueWorkspace.tsx
index dd1ccb4f2d79..969765c4dcaa 100644
--- a/src/renderer/src/components/JiraIssueWorkspace.tsx
+++ b/src/renderer/src/components/JiraIssueWorkspace.tsx
@@ -48,6 +48,7 @@ import type {
 } from '../../../shared/types'
 import type { TaskSourceContext } from '../../../shared/task-source-context'
 import { translate } from '@/i18n/i18n'
+import { formatUiRelativeTimeFromDate } from '@/i18n/relative-time-format'
 
 type JiraIssueWorkspaceProps = {
   issue: JiraIssue | null
@@ -56,22 +57,8 @@ type JiraIssueWorkspaceProps = {
   sourceContext?: TaskSourceContext | null
 }
 
-const relativeFormatter = new Intl.RelativeTimeFormat(undefined, { numeric: 'auto' })
-
 function formatRelativeTime(input: string): string {
-  const date = new Date(input)
-  if (Number.isNaN(date.getTime())) {
-    return 'recently'
-  }
-  const diffMinutes = Math.round((date.getTime() - Date.now()) / 60_000)
-  if (Math.abs(diffMinutes) < 60) {
-    return relativeFormatter.format(diffMinutes, 'minute')
-  }
-  const diffHours = Math.round(diffMinutes / 60)
-  if (Math.abs(diffHours) < 24) {
-    return relativeFormatter.format(diffHours, 'hour')
-  }
-  return relativeFormatter.format(Math.round(diffHours / 24), 'day')
+  return formatUiRelativeTimeFromDate(input)
 }
 
 function buildJiraBranchName(issue: JiraIssue): string {
diff --git a/src/renderer/src/components/LinearItemDrawer.tsx b/src/renderer/src/components/LinearItemDrawer.tsx
index 25ee1ffef163..719aecbf4b18 100644
--- a/src/renderer/src/components/LinearItemDrawer.tsx
+++ b/src/renderer/src/components/LinearItemDrawer.tsx
@@ -50,6 +50,7 @@ import {
   linearUpdateIssue
 } from '@/runtime/runtime-linear-client'
 import { translate } from '@/i18n/i18n'
+import { formatUiRelativeTimeFromDate } from '@/i18n/relative-time-format'
 
 function LinearIcon({ className }: { className?: string }): React.JSX.Element {
   return (
@@ -101,22 +102,7 @@ function LinearEditChipAdornment({
 }
 
 function formatRelativeTime(input: string): string {
-  const date = new Date(input)
-  if (Number.isNaN(date.getTime())) {
-    return 'recently'
-  }
-  const diffMs = date.getTime() - Date.now()
-  const diffMinutes = Math.round(diffMs / 60_000)
-  const formatter = new Intl.RelativeTimeFormat(undefined, { numeric: 'auto' })
-  if (Math.abs(diffMinutes) < 60) {
-    return formatter.format(diffMinutes, 'minute')
-  }
-  const diffHours = Math.round(diffMinutes / 60)
-  if (Math.abs(diffHours) < 24) {
-    return formatter.format(diffHours, 'hour')
-  }
-  const diffDays = Math.round(diffHours / 24)
-  return formatter.format(diffDays, 'day')
+  return formatUiRelativeTimeFromDate(input)
 }
 
 type LinearItemDrawerProps = {
diff --git a/src/renderer/src/components/TaskPage.tsx b/src/renderer/src/components/TaskPage.tsx
index b430b0c33a3e..0f2fa5c12fb2 100644
--- a/src/renderer/src/components/TaskPage.tsx
+++ b/src/renderer/src/components/TaskPage.tsx
@@ -359,6 +359,7 @@ import {
   resolveVisibleTaskProvider
 } from '../../../shared/task-providers'
 import { translate } from '@/i18n/i18n'
+import { formatUiRelativeTimeFromDate } from '@/i18n/relative-time-format'
 import {
   getGitHubModeButtons,
   getGitHubTaskKindPresets,
@@ -585,29 +586,8 @@ function scopeGitHubTaskSearch(query: string, kind: GitHubTaskKind): string {
   return `${inferredKind === 'prs' ? 'is:pr' : 'is:issue'} ${trimmed}`
 }
 
-// Why: Intl.RelativeTimeFormat allocation is non-trivial; hoist to module scope so all rows share one instance instead of allocating per render.
-const relativeTimeFormatter = new Intl.RelativeTimeFormat(undefined, { numeric: 'auto' })
-
 function formatRelativeTime(input: string): string {
-  const date = new Date(input)
-  if (Number.isNaN(date.getTime())) {
-    return 'recently'
-  }
-
-  const diffMs = date.getTime() - Date.now()
-  const diffMinutes = Math.round(diffMs / 60_000)
-
-  if (Math.abs(diffMinutes) < 60) {
-    return relativeTimeFormatter.format(diffMinutes, 'minute')
-  }
-
-  const diffHours = Math.round(diffMinutes / 60)
-  if (Math.abs(diffHours) < 24) {
-    return relativeTimeFormatter.format(diffHours, 'hour')
-  }
-
-  const diffDays = Math.round(diffHours / 24)
-  return relativeTimeFormatter.format(diffDays, 'day')
+  return formatUiRelativeTimeFromDate(input)
 }
 
 type LinearProjectTab = 'overview' | 'issues'
diff --git a/src/renderer/src/components/activity/ActivityPrototypePage.tsx b/src/renderer/src/components/activity/ActivityPrototypePage.tsx
index 4ee1e7c8be6a..2c3f6b28bb19 100644
--- a/src/renderer/src/components/activity/ActivityPrototypePage.tsx
+++ b/src/renderer/src/components/activity/ActivityPrototypePage.tsx
@@ -73,6 +73,7 @@ import { parsePaneKey } from '../../../../shared/stable-pane-id'
 import { isClipboardTextByteLengthOverLimit } from '../../../../shared/clipboard-text'
 import { migrationUnsupportedToAgentStatusEntry } from '@/lib/migration-unsupported-agent-entry'
 import { translate } from '@/i18n/i18n'
+import { formatUiRelativeTime } from '@/i18n/relative-time-format'
 import {
   getActivityThreadTaskTitle,
   getActivityThreadWorkspaceTitle,
@@ -168,24 +169,12 @@ const absoluteDateFormatter = new Intl.DateTimeFormat(undefined, {
   minute: '2-digit'
 })
 
-const relativeTimeFormatter = new Intl.RelativeTimeFormat(undefined, { numeric: 'auto' })
-
 function formatAbsoluteDate(timestamp: number): string {
   return absoluteDateFormatter.format(new Date(timestamp))
 }
 
 function formatRelativeTime(timestamp: number): string {
-  const diffMs = timestamp - Date.now()
-  const diffMinutes = Math.round(diffMs / 60_000)
-  if (Math.abs(diffMinutes) < 60) {
-    return relativeTimeFormatter.format(diffMinutes, 'minute')
-  }
-  const diffHours = Math.round(diffMinutes / 60)
-  if (Math.abs(diffHours) < 24) {
-    return relativeTimeFormatter.format(diffHours, 'hour')
-  }
-  const diffDays = Math.round(diffHours / 24)
-  return relativeTimeFormatter.format(diffDays, 'day')
+  return formatUiRelativeTime(timestamp - Date.now())
 }
 
 function findActivityTerminalPane(
diff --git a/src/renderer/src/components/contextual-tours/ContextualTourOverlaySurface.localization.test.tsx b/src/renderer/src/components/contextual-tours/ContextualTourOverlaySurface.localization.test.tsx
new file mode 100644
index 000000000000..b9923d0fc112
--- /dev/null
+++ b/src/renderer/src/components/contextual-tours/ContextualTourOverlaySurface.localization.test.tsx
@@ -0,0 +1,56 @@
+// @vitest-environment happy-dom
+
+import type { ReactElement, RefObject } from 'react'
+import { renderToStaticMarkup } from 'react-dom/server'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { setRendererUiLanguage } from '@/i18n/i18n'
+import {
+  ContextualTourOverlaySurface,
+  handleContextualTourOverlayKeyDown,
+  type ActiveTourRenderState
+} from './ContextualTourOverlaySurface'
+
+afterEach(async () => {
+  await setRendererUiLanguage('en')
+})
+
+function renderSurface(isLastStep: boolean): ReactElement {
+  const panelRef: RefObject<HTMLElement | null> = { current: null }
+  const renderState: ActiveTourRenderState = {
+    rect: new DOMRect(0, 0, 20, 20),
+    targetElement: document.createElement('button'),
+    progress: { current: isLastStep ? 2 : 1, total: 2 },
+    title: 'Tour title',
+    body: 'Tour body',
+    isLastStep,
+    isFirstStep: !isLastStep,
+    panelHost: null
+  }
+  return (
+    <ContextualTourOverlaySurface
+      activeTourId="automations"
+      renderState={renderState}
+      panelRef={panelRef}
+      panelHost={null}
+      onSkip={vi.fn()}
+      onBack={vi.fn()}
+      onNext={vi.fn()}
+      onStepAction={vi.fn()}
+      onOverlayKeyDownCapture={handleContextualTourOverlayKeyDown}
+    />
+  )
+}
+
+describe('ContextualTourOverlaySurface localization', () => {
+  it('renders default tour actions in Korean when the UI locale is Korean', async () => {
+    await setRendererUiLanguage('ko')
+
+    const firstStep = renderToStaticMarkup(renderSurface(false))
+    const finalStep = renderToStaticMarkup(renderSurface(true))
+
+    expect(firstStep).toContain('다음')
+    expect(firstStep).not.toContain('>Next<')
+    expect(finalStep).toContain('완료')
+    expect(finalStep).not.toContain('>Done<')
+  })
+})
diff --git a/src/renderer/src/components/contextual-tours/ContextualTourOverlaySurface.tsx b/src/renderer/src/components/contextual-tours/ContextualTourOverlaySurface.tsx
index a692a6cdaf19..5b6284ae6483 100644
--- a/src/renderer/src/components/contextual-tours/ContextualTourOverlaySurface.tsx
+++ b/src/renderer/src/components/contextual-tours/ContextualTourOverlaySurface.tsx
@@ -107,7 +107,12 @@ export function ContextualTourOverlaySurface({
   const stepKey = `${activeTourId}-${renderState.progress.current}`
   const defaultPrimaryAction = {
     kind: renderState.isLastStep ? 'complete' : 'next',
-    label: renderState.isLastStep ? 'Done' : 'Next'
+    label: renderState.isLastStep
+      ? translate('auto.components.contextual.tours.ContextualTourOverlaySurface.complete', 'Done')
+      : translate(
+          'auto.components.contextual.tours.contextual.tour.overlay.measurement.38b3155418',
+          'Next'
+        )
   } satisfies ContextualTourStepAction
   const primaryAction =
     renderState.primaryAction ?? (renderState.hidePrimaryAction ? null : defaultPrimaryAction)
diff --git a/src/renderer/src/components/contextual-tours/contextual-tour-overlay-measurement.test.ts b/src/renderer/src/components/contextual-tours/contextual-tour-overlay-measurement.test.ts
index d83fafd3fc17..4b2ce9631ca1 100644
--- a/src/renderer/src/components/contextual-tours/contextual-tour-overlay-measurement.test.ts
+++ b/src/renderer/src/components/contextual-tours/contextual-tour-overlay-measurement.test.ts
@@ -1,12 +1,104 @@
-import { describe, expect, it } from 'vitest'
+// @vitest-environment happy-dom
+
+import { afterEach, describe, expect, it } from 'vitest'
 import { getContextualTour } from '../../../../shared/contextual-tours'
+import { setRendererUiLanguage } from '@/i18n/i18n'
 import {
   getContextualTourDisplayProgress,
   getContextualTourMeasurementAction,
+  measureContextualTourOverlayRenderState,
   isContextualTourLastDisplayStep
 } from './contextual-tour-overlay-measurement'
 
+afterEach(async () => {
+  document.body.replaceChildren()
+  await setRendererUiLanguage('en')
+})
+
 describe('contextual tour overlay measurement', () => {
+  it('renders the automation tour copy in Korean when the UI locale is Korean', async () => {
+    await setRendererUiLanguage('ko')
+    const target = document.createElement('button')
+    target.setAttribute('data-contextual-tour-target', 'automations-create')
+    target.getBoundingClientRect = () => new DOMRect(0, 0, 20, 20)
+    document.body.appendChild(target)
+
+    const result = measureContextualTourOverlayRenderState({
+      tour: getContextualTour('automations'),
+      activeStepIndex: 0,
+      sidebarOpen: true,
+      keybindings: undefined,
+      previousTelemetryTotalSteps: 0
+    })
+
+    expect(result.kind).toBe('render')
+    if (result.kind !== 'render') {
+      throw new Error(`Expected render result, received ${result.kind}`)
+    }
+    expect(result.renderState.title).toBe('자동화란 무엇인가요?')
+    expect(result.renderState.body).toBe(
+      '자동화는 일정에 따라 agent 작업을 실행합니다. 이 버튼을 눌러 자동화를 추가하세요.'
+    )
+  })
+
+  it('renders the automation results step in Korean when the UI locale is Korean', async () => {
+    await setRendererUiLanguage('ko')
+    const target = document.createElement('div')
+    target.setAttribute('data-contextual-tour-target', 'automations-runs')
+    target.getBoundingClientRect = () => new DOMRect(0, 0, 20, 20)
+    document.body.appendChild(target)
+
+    const result = measureContextualTourOverlayRenderState({
+      tour: getContextualTour('automations'),
+      activeStepIndex: 1,
+      sidebarOpen: true,
+      keybindings: undefined,
+      previousTelemetryTotalSteps: 0
+    })
+
+    expect(result.kind).toBe('render')
+    if (result.kind !== 'render') {
+      throw new Error(`Expected render result, received ${result.kind}`)
+    }
+    expect(result.renderState.title).toBe('결과 확인')
+    expect(result.renderState.body).toBe(
+      '실행 내역에서 자동화가 언제 실행되었는지, 어떤 일이 발생했는지, 출력을 어디서 확인할 수 있는지 볼 수 있습니다.'
+    )
+  })
+
+  it('keeps localized copy on its own step when a step is inserted before it', async () => {
+    await setRendererUiLanguage('ko')
+    const target = document.createElement('button')
+    target.setAttribute('data-contextual-tour-target', 'automations-create')
+    target.getBoundingClientRect = () => new DOMRect(0, 0, 20, 20)
+    document.body.appendChild(target)
+
+    const automations = getContextualTour('automations')
+    const result = measureContextualTourOverlayRenderState({
+      tour: {
+        ...automations,
+        steps: [
+          {
+            title: 'Inserted step',
+            body: 'Added ahead of the localized steps.',
+            targetSelector: '[data-contextual-tour-target="automations-create"]'
+          },
+          ...automations.steps
+        ]
+      },
+      activeStepIndex: 1,
+      sidebarOpen: true,
+      keybindings: undefined,
+      previousTelemetryTotalSteps: 0
+    })
+
+    expect(result.kind).toBe('render')
+    if (result.kind !== 'render') {
+      throw new Error(`Expected render result, received ${result.kind}`)
+    }
+    expect(result.renderState.title).toBe('자동화란 무엇인가요?')
+  })
+
   it('shows all defined browser steps in progress even when step 3 is hidden', () => {
     const tour = getContextualTour('browser')
 
diff --git a/src/renderer/src/components/contextual-tours/contextual-tour-overlay-measurement.ts b/src/renderer/src/components/contextual-tours/contextual-tour-overlay-measurement.ts
index a807ade9fe41..1fe945a42cbf 100644
--- a/src/renderer/src/components/contextual-tours/contextual-tour-overlay-measurement.ts
+++ b/src/renderer/src/components/contextual-tours/contextual-tour-overlay-measurement.ts
@@ -28,6 +28,36 @@ export type ContextualTourOverlayMeasurementResult =
       telemetryTotalSteps: number
     }
 
+// Why: keyed by the step's stable id, not its position — inserting a step must
+// not shift localized copy onto a neighbour. Thunks keep translate() out of
+// module scope so the lookup resolves in the language active at render time.
+const LOCALIZED_STEP_COPY: Record<string, { title: () => string; body: () => string }> = {
+  'automations-intro': {
+    title: () =>
+      translate(
+        'auto.components.contextual.tours.contextual.tour.overlay.measurement.automations.intro.title',
+        'What is an automation?'
+      ),
+    body: () =>
+      translate(
+        'auto.components.contextual.tours.contextual.tour.overlay.measurement.automations.intro.body',
+        'Automations run agent work on a schedule. Add an automation by clicking this button.'
+      )
+  },
+  'automations-results': {
+    title: () =>
+      translate(
+        'auto.components.contextual.tours.contextual.tour.overlay.measurement.automations.results.title',
+        'Find the results'
+      ),
+    body: () =>
+      translate(
+        'auto.components.contextual.tours.contextual.tour.overlay.measurement.automations.results.body',
+        'Runs show when automations ran, what happened, and where to inspect their output.'
+      )
+  }
+}
+
 export function getContextualTourDisplayProgress(args: {
   tour: ContextualTour
   visibleStepIndexes: readonly number[]
@@ -89,6 +119,13 @@ export function measureContextualTourOverlayRenderState(args: {
   )
   const activeStep = args.tour.steps[args.activeStepIndex]
   const target = activeStep ? getMeasurableContextualTourTarget(activeStep.targetSelector) : null
+  const localizedCopy = activeStep?.id ? LOCALIZED_STEP_COPY[activeStep.id] : undefined
+  const localizedTitle = localizedCopy ? localizedCopy.title() : activeStep?.title
+  const localizedBody = localizedCopy
+    ? localizedCopy.body()
+    : activeStep
+      ? getContextualTourStepCopy(activeStep)
+      : undefined
   const progress = getContextualTourDisplayProgress({
     tour: args.tour,
     visibleStepIndexes,
@@ -135,8 +172,11 @@ export function measureContextualTourOverlayRenderState(args: {
       rect: target.rect,
       targetElement: target.element,
       progress,
-      title: activeStep.title,
-      body: formatContextualTourStepCopy(getContextualTourStepCopy(activeStep), args.keybindings),
+      title: localizedTitle ?? activeStep.title,
+      body: formatContextualTourStepCopy(
+        localizedBody ?? getContextualTourStepCopy(activeStep),
+        args.keybindings
+      ),
       control: activeStep.control,
       primaryAction,
       secondaryAction,
diff --git a/src/renderer/src/components/github/work-item-state-presentation.tsx b/src/renderer/src/components/github/work-item-state-presentation.tsx
index 7e14804fbafa..fadc502fb917 100644
--- a/src/renderer/src/components/github/work-item-state-presentation.tsx
+++ b/src/renderer/src/components/github/work-item-state-presentation.tsx
@@ -1,24 +1,10 @@
 import React from 'react'
 import { GitHubUserAvatar } from '@/components/github/github-user-avatar'
 import type { GitHubAssignableUser, GitHubWorkItem } from '../../../../shared/types'
+import { formatUiRelativeTimeFromDate } from '@/i18n/relative-time-format'
 
 export function formatRelativeTime(input: string): string {
-  const date = new Date(input)
-  if (Number.isNaN(date.getTime())) {
-    return 'recently'
-  }
-  const diffMs = date.getTime() - Date.now()
-  const diffMinutes = Math.round(diffMs / 60_000)
-  const formatter = new Intl.RelativeTimeFormat(undefined, { numeric: 'auto' })
-  if (Math.abs(diffMinutes) < 60) {
-    return formatter.format(diffMinutes, 'minute')
-  }
-  const diffHours = Math.round(diffMinutes / 60)
-  if (Math.abs(diffHours) < 24) {
-    return formatter.format(diffHours, 'hour')
-  }
-  const diffDays = Math.round(diffHours / 24)
-  return formatter.format(diffDays, 'day')
+  return formatUiRelativeTimeFromDate(input)
 }
 
 export function getStateLabel(item: GitHubWorkItem): string {
diff --git a/src/renderer/src/components/linear-issue-workspace-text.ts b/src/renderer/src/components/linear-issue-workspace-text.ts
index b4e88121bb89..e047495d40b0 100644
--- a/src/renderer/src/components/linear-issue-workspace-text.ts
+++ b/src/renderer/src/components/linear-issue-workspace-text.ts
@@ -1,25 +1,10 @@
 import { getLinearIssueWorkspaceName } from '../../../shared/workspace-name'
 import type { LinearIssue } from '../../../shared/types'
 import { getUsableLinearBranchName } from '../../../shared/new-workspace/workspace-source'
-
-const relativeTimeFormatter = new Intl.RelativeTimeFormat(undefined, { numeric: 'auto' })
+import { formatUiRelativeTimeFromDate } from '@/i18n/relative-time-format'
 
 export function formatLinearIssueRelativeTime(input: string): string {
-  const date = new Date(input)
-  if (Number.isNaN(date.getTime())) {
-    return 'recently'
-  }
-  const diffMs = date.getTime() - Date.now()
-  const diffMinutes = Math.round(diffMs / 60_000)
-  if (Math.abs(diffMinutes) < 60) {
-    return relativeTimeFormatter.format(diffMinutes, 'minute')
-  }
-  const diffHours = Math.round(diffMinutes / 60)
-  if (Math.abs(diffHours) < 24) {
-    return relativeTimeFormatter.format(diffHours, 'hour')
-  }
-  const diffDays = Math.round(diffHours / 24)
-  return relativeTimeFormatter.format(diffDays, 'day')
+  return formatUiRelativeTimeFromDate(input)
 }
 
 export function buildLinearIssueBranchName(issue: LinearIssue): string {
diff --git a/src/renderer/src/components/settings/AccountsPane.tsx b/src/renderer/src/components/settings/AccountsPane.tsx
index 7578112895a6..d9db52dd9c6e 100644
--- a/src/renderer/src/components/settings/AccountsPane.tsx
+++ b/src/renderer/src/components/settings/AccountsPane.tsx
@@ -81,6 +81,7 @@ import {
   type ProviderAccountRuntimeView
 } from './provider-account-visibility'
 import { translate } from '@/i18n/i18n'
+import { formatUiRelativeTime } from '@/i18n/relative-time-format'
 import { cn } from '@/lib/utils'
 import { isWebClientLocation } from '@/lib/web-client-location'
 import {
@@ -104,16 +105,7 @@ function formatMiniMaxRelativeRefresh(updatedAt: number, now: number): string {
   if (diffMs < 60_000) {
     return translate('auto.components.settings.AccountsPane.3a30aaf526', 'just now')
   }
-  const formatter = new Intl.RelativeTimeFormat(undefined, { numeric: 'auto' })
-  const minutes = Math.round(diffMs / 60_000)
-  if (minutes < 60) {
-    return formatter.format(-minutes, 'minute')
-  }
-  const hours = Math.round(minutes / 60)
-  if (hours < 24) {
-    return formatter.format(-hours, 'hour')
-  }
-  return formatter.format(-Math.round(hours / 24), 'day')
+  return formatUiRelativeTime(-diffMs)
 }
 
 function MiniMaxCookieHelpPopover(): React.JSX.Element {
diff --git a/src/renderer/src/components/settings/BrowserLinkRoutingModifierSetting.tsx b/src/renderer/src/components/settings/BrowserLinkRoutingModifierSetting.tsx
index aeb8f4151d8d..b0c55e87204d 100644
--- a/src/renderer/src/components/settings/BrowserLinkRoutingModifierSetting.tsx
+++ b/src/renderer/src/components/settings/BrowserLinkRoutingModifierSetting.tsx
@@ -4,7 +4,7 @@ import { SettingsSwitchRow } from './SettingsFormControls'
 import {
   getLinkRoutingModifierDescription,
   getLinkRoutingModifierTitle
-} from './browser-link-routing-modifier-copy'
+} from './browser-link-routing-copy'
 
 type BrowserLinkRoutingModifierSettingProps = {
   settings: Pick<GlobalSettings, 'openLinksInApp' | 'openLinksInAppModifierInverts'>
diff --git a/src/renderer/src/components/settings/BrowserPane.tsx b/src/renderer/src/components/settings/BrowserPane.tsx
index d67aaf7ef70e..5c8088cc9bbf 100644
--- a/src/renderer/src/components/settings/BrowserPane.tsx
+++ b/src/renderer/src/components/settings/BrowserPane.tsx
@@ -2,7 +2,8 @@ import { useCallback, useEffect, useMemo, useRef, useState, type MutableRefObjec
 import type { GlobalSettings } from '../../../../shared/types'
 import { useAppStore } from '../../store'
 import { matchesSettingsSearch } from './settings-search'
-import { getBrowserPaneSearchEntries, getBrowserLinkRoutingDescription } from './browser-search'
+import { getBrowserPaneSearchEntries } from './browser-search'
+import { getBrowserLinkRoutingDescription } from './browser-link-routing-copy'
 import { getBrowserUsePaneSearchEntries } from './browser-use-search'
 import { getBrowserPaneCombinedSearchEntries } from './browser-pane-search'
 import { BrowserHomePageSetting } from './BrowserHomePageSetting'
diff --git a/src/renderer/src/components/settings/browser-link-routing-modifier-copy.ts b/src/renderer/src/components/settings/browser-link-routing-copy.ts
similarity index 58%
rename from src/renderer/src/components/settings/browser-link-routing-modifier-copy.ts
rename to src/renderer/src/components/settings/browser-link-routing-copy.ts
index 1151d3e70e13..5a4d5bac2d65 100644
--- a/src/renderer/src/components/settings/browser-link-routing-modifier-copy.ts
+++ b/src/renderer/src/components/settings/browser-link-routing-copy.ts
@@ -1,5 +1,30 @@
 import { translate } from '@/i18n/i18n'
 
+export function getBrowserLinkRoutingShortcutLabel(platform: { isMac: boolean }): string {
+  return platform.isMac ? '⇧⌘-click' : 'Shift+Ctrl+click'
+}
+
+// Why: "always" stops being true once inverting is on, so only then does the nested
+// row take over the chord sentence — with it off this reads exactly as it always has.
+// Each variant is a complete catalog entry: stitched suffixes break in locales whose
+// sentence joining differs from English.
+export function getBrowserLinkRoutingDescription(
+  platform: { isMac: boolean },
+  modifierInverts = false
+): string {
+  if (modifierInverts) {
+    return translate(
+      'auto.components.settings.BrowserLinkRoutingSetting.descriptionBase',
+      "Open http(s) links in Orca's built-in browser — from the terminal, markdown, and the editor."
+    )
+  }
+  return translate(
+    'auto.components.settings.BrowserLinkRoutingSetting.description',
+    "Open http(s) links in Orca's built-in browser — from the terminal, markdown, and the editor. {{shortcut}} always uses your system browser.",
+    { shortcut: getBrowserLinkRoutingShortcutLabel(platform) }
+  )
+}
+
 /**
  * Title and description both name the destination the modifier reaches, which is
  * the opposite of wherever Link Routing points. Kept out of the component so the
diff --git a/src/renderer/src/components/settings/browser-link-routing-localization.test.ts b/src/renderer/src/components/settings/browser-link-routing-localization.test.ts
new file mode 100644
index 000000000000..613f8e0de1cf
--- /dev/null
+++ b/src/renderer/src/components/settings/browser-link-routing-localization.test.ts
@@ -0,0 +1,55 @@
+import { afterEach, describe, expect, it } from 'vitest'
+
+import { i18n } from '@/i18n/i18n'
+import { getBrowserLinkRoutingDescription } from './browser-link-routing-copy'
+
+// The Link Routing description was a bare template literal, so it stayed English in every
+// locale while its own title and the rest of the pane translated. It carries the platform
+// shortcut label, so each locale must interpolate it rather than embed a hardcoded modifier.
+const NON_ENGLISH_LOCALES = ['es', 'ja', 'ko', 'zh'] as const
+
+const SHORTCUT_BY_PLATFORM = {
+  mac: '⇧⌘-click',
+  other: 'Shift+Ctrl+click'
+} as const
+
+describe('Link Routing description localization', () => {
+  afterEach(async () => {
+    await i18n.changeLanguage('en')
+  })
+
+  it('translates the description in every non-English locale on both platforms', async () => {
+    const english = {
+      mac: getBrowserLinkRoutingDescription({ isMac: true }),
+      other: getBrowserLinkRoutingDescription({ isMac: false })
+    }
+
+    for (const locale of NON_ENGLISH_LOCALES) {
+      await i18n.changeLanguage(locale)
+
+      for (const [platform, shortcut] of Object.entries(SHORTCUT_BY_PLATFORM)) {
+        const description = getBrowserLinkRoutingDescription({ isMac: platform === 'mac' })
+
+        expect(description, `${locale}/${platform} fell back to English`).not.toBe(
+          english[platform as keyof typeof english]
+        )
+        // The label is a key symbol, not prose: it stays literal in every locale.
+        expect(description, `${locale}/${platform} lost the shortcut label`).toContain(shortcut)
+        expect(description, `${locale}/${platform} leaked a placeholder`).not.toMatch(/\{\{.+?\}\}/)
+      }
+    }
+  })
+
+  it('keeps each platform label out of the other platform copy', async () => {
+    for (const locale of ['en', ...NON_ENGLISH_LOCALES]) {
+      await i18n.changeLanguage(locale)
+
+      expect(getBrowserLinkRoutingDescription({ isMac: true })).not.toContain(
+        SHORTCUT_BY_PLATFORM.other
+      )
+      expect(getBrowserLinkRoutingDescription({ isMac: false })).not.toContain(
+        SHORTCUT_BY_PLATFORM.mac
+      )
+    }
+  })
+})
diff --git a/src/renderer/src/components/settings/browser-search.test.ts b/src/renderer/src/components/settings/browser-search.test.ts
index 2ac1b67239e5..0df9173b28d3 100644
--- a/src/renderer/src/components/settings/browser-search.test.ts
+++ b/src/renderer/src/components/settings/browser-search.test.ts
@@ -1,12 +1,25 @@
-import { describe, expect, it } from 'vitest'
-import { getBrowserLinkRoutingDescription, getBrowserPaneSearchEntries } from './browser-search'
+import { beforeEach, describe, expect, it } from 'vitest'
+
+import ko from '@/i18n/locales/ko.json'
+import { i18n } from '@/i18n/i18n'
+import { getBrowserPaneSearchEntries } from './browser-search'
 import {
+  getBrowserLinkRoutingDescription,
+  getBrowserLinkRoutingShortcutLabel,
   getLinkRoutingModifierDescription,
   getLinkRoutingModifierTitle
-} from './browser-link-routing-modifier-copy'
+} from './browser-link-routing-copy'
 
 describe('browser settings search copy', () => {
-  it('uses macOS shortcut keywords for Link Routing search metadata', () => {
+  it('uses macOS shortcut symbols for Link Routing copy and search metadata', () => {
+    expect(getBrowserLinkRoutingShortcutLabel({ isMac: true })).toBe('⇧⌘-click')
+
+    const description = getBrowserLinkRoutingDescription({ isMac: true })
+    expect(description).toContain('⇧⌘-click')
+    expect(description).not.toContain('Cmd/Ctrl')
+    // The copy is translated: a leaked `{{...}}` means the interpolation name drifted from the catalog.
+    expect(description).not.toMatch(/\{\{.+?\}\}/)
+
     const linkRoutingEntry = getBrowserPaneSearchEntries({ isMac: true }).find(
       (entry) => entry.title === 'Link Routing'
     )
@@ -20,7 +33,14 @@ describe('browser settings search copy', () => {
     expect(defaultZoomEntry?.keywords).toContain('zoom')
   })
 
-  it('uses Ctrl shortcut keywords for Link Routing search metadata off macOS', () => {
+  it('uses Ctrl shortcut text for Link Routing copy and search metadata off macOS', () => {
+    expect(getBrowserLinkRoutingShortcutLabel({ isMac: false })).toBe('Shift+Ctrl+click')
+
+    const description = getBrowserLinkRoutingDescription({ isMac: false })
+    expect(description).toContain('Shift+Ctrl+click')
+    expect(description).not.toContain('Cmd/Ctrl')
+    expect(description).not.toMatch(/\{\{.+?\}\}/)
+
     const linkRoutingEntry = getBrowserPaneSearchEntries({ isMac: false }).find(
       (entry) => entry.title === 'Link Routing'
     )
@@ -102,3 +122,61 @@ describe('browser link routing modifier copy', () => {
     expect(entry?.keywords).toContain(getLinkRoutingModifierTitle(true))
   })
 })
+
+// The bug this file guards: the Link Routing description was a bare template
+// literal, so it stayed English in every locale. Asserting only "no {{...}} leaked"
+// cannot catch that — the English literal has no placeholder either.
+describe('Link Routing description localization', () => {
+  const KEY = 'auto.components.settings.BrowserLinkRoutingSetting.description'
+  const BASE_KEY = 'auto.components.settings.BrowserLinkRoutingSetting.descriptionBase'
+
+  beforeEach(async () => {
+    await i18n.changeLanguage('en')
+  })
+
+  it('renders the Korean copy with the shortcut interpolated', async () => {
+    const koCopy = (
+      ko.auto.components.settings.BrowserLinkRoutingSetting as unknown as Record<string, string>
+    )['description']
+    expect(koCopy).toBeTruthy()
+    expect(koCopy).toContain('{{shortcut}}')
+
+    i18n.addResourceBundle('ko', 'translation', ko, true, true)
+    await i18n.changeLanguage('ko')
+
+    const description = getBrowserLinkRoutingDescription({ isMac: true })
+    expect(description).toBe(koCopy.replace('{{shortcut}}', '⇧⌘-click'))
+    expect(description).not.toMatch(/\{\{.+?\}\}/)
+    // Fails when the copy is a hardcoded English literal.
+    expect(description).not.toContain("Orca's built-in browser")
+
+    // The entry title is localized too, so match on the description instead.
+    const entry = getBrowserPaneSearchEntries({ isMac: true }).find(
+      (item) => item.description === description
+    )
+    expect(entry).toBeDefined()
+
+    await i18n.changeLanguage('en')
+    expect(getBrowserLinkRoutingDescription({ isMac: true })).toContain("Orca's built-in browser")
+  })
+
+  it('renders the Korean copy for the invert-on variant', async () => {
+    const koBase = (
+      ko.auto.components.settings.BrowserLinkRoutingSetting as unknown as Record<string, string>
+    )['descriptionBase']
+    expect(koBase).toBeTruthy()
+
+    i18n.addResourceBundle('ko', 'translation', ko, true, true)
+    await i18n.changeLanguage('ko')
+
+    const description = getBrowserLinkRoutingDescription({ isMac: true }, true)
+    expect(description).toBe(koBase)
+    // Fails when the invert-on branch regresses to a hardcoded English literal.
+    expect(description).not.toContain("Orca's built-in browser")
+  })
+
+  it('uses the catalog key rather than an inline literal', () => {
+    expect(i18n.exists(KEY)).toBe(true)
+    expect(i18n.exists(BASE_KEY)).toBe(true)
+  })
+})
diff --git a/src/renderer/src/components/settings/browser-search.ts b/src/renderer/src/components/settings/browser-search.ts
index a9b204441429..67f5506de42c 100644
--- a/src/renderer/src/components/settings/browser-search.ts
+++ b/src/renderer/src/components/settings/browser-search.ts
@@ -2,9 +2,10 @@ import type { SettingsSearchEntry } from './settings-search'
 import { translate } from '@/i18n/i18n'
 import { translateSearchKeyword } from './settings-search-keywords'
 import {
+  getBrowserLinkRoutingDescription,
   getLinkRoutingModifierDescription,
   getLinkRoutingModifierTitle
-} from './browser-link-routing-modifier-copy'
+} from './browser-link-routing-copy'
 
 type BrowserShortcutPlatform = {
   isMac: boolean
@@ -16,19 +17,6 @@ function getDefaultBrowserShortcutPlatform(): BrowserShortcutPlatform {
   }
 }
 
-// Why: "always" stops being true once inverting is on, so only then does the nested
-// row take over the chord sentence — with it off this reads exactly as it always has.
-export function getBrowserLinkRoutingDescription(
-  platform: BrowserShortcutPlatform = getDefaultBrowserShortcutPlatform(),
-  modifierInverts = false
-): string {
-  const base =
-    "Open http(s) links in Orca's built-in browser — from the terminal, markdown, and the editor."
-  return modifierInverts
-    ? base
-    : `${base} ${platform.isMac ? '⇧⌘-click' : 'Shift+Ctrl+click'} always uses your system browser.`
-}
-
 export function getBrowserPaneSearchEntries(
   platform: BrowserShortcutPlatform = getDefaultBrowserShortcutPlatform()
 ): SettingsSearchEntry[] {
diff --git a/src/renderer/src/components/settings/jira-integration-card.tsx b/src/renderer/src/components/settings/jira-integration-card.tsx
index e1889c2f073f..e9f510628c62 100644
--- a/src/renderer/src/components/settings/jira-integration-card.tsx
+++ b/src/renderer/src/components/settings/jira-integration-card.tsx
@@ -99,7 +99,14 @@ export function JiraIntegrationCard(): React.JSX.Element {
       }
       checking={checking}
       statusTone={connected ? 'connected' : 'attention'}
-      statusLabel={connected ? 'Connected' : 'Not connected'}
+      statusLabel={
+        connected
+          ? translate('auto.components.settings.jira.integration.card.statusConnected', 'Connected')
+          : translate(
+              'auto.components.settings.jira.integration.card.statusNotConnected',
+              'Not connected'
+            )
+      }
       actions={
         !checking ? (
           <Button
diff --git a/src/renderer/src/components/settings/task-tracker-integration-cards.tsx b/src/renderer/src/components/settings/task-tracker-integration-cards.tsx
index e40c864a7ca3..1ac07ac94e0a 100644
--- a/src/renderer/src/components/settings/task-tracker-integration-cards.tsx
+++ b/src/renderer/src/components/settings/task-tracker-integration-cards.tsx
@@ -91,7 +91,17 @@ export function LinearIntegrationCard(): React.JSX.Element {
       }
       checking={checking}
       statusTone={connected ? 'connected' : 'attention'}
-      statusLabel={connected ? 'Connected' : 'Not connected'}
+      statusLabel={
+        connected
+          ? translate(
+              'auto.components.settings.task.tracker.integration.cards.statusConnected',
+              'Connected'
+            )
+          : translate(
+              'auto.components.settings.task.tracker.integration.cards.statusNotConnected',
+              'Not connected'
+            )
+      }
       actions={
         !checking ? (
           <Button
diff --git a/src/renderer/src/components/settings/token-source-control-integration-cards.tsx b/src/renderer/src/components/settings/token-source-control-integration-cards.tsx
index fe83e1e6b625..5c609f0543df 100644
--- a/src/renderer/src/components/settings/token-source-control-integration-cards.tsx
+++ b/src/renderer/src/components/settings/token-source-control-integration-cards.tsx
@@ -3,6 +3,7 @@ import { Button } from '@/components/ui/button'
 import { IntegrationCardDetails, IntegrationCardShell } from './integration-card-shell'
 import { usePreflightCardStatuses } from './source-control-preflight-card-status'
 import { translate } from '@/i18n/i18n'
+import { tokenProviderStatusLabel } from './token-source-control-status'
 
 export function BitbucketIntegrationCard(): React.JSX.Element {
   const { statuses, unavailable, refresh } = usePreflightCardStatuses('bitbucket')
@@ -32,15 +33,7 @@ export function BitbucketIntegrationCard(): React.JSX.Element {
       }
       checking={status === 'checking'}
       statusTone={connected ? 'connected' : 'attention'}
-      statusLabel={
-        connected
-          ? 'Connected'
-          : status === 'unavailable'
-            ? 'Unavailable'
-            : status === 'not-configured'
-              ? 'Not configured'
-              : 'Auth failed'
-      }
+      statusLabel={tokenProviderStatusLabel({ configured: connected, status })}
     >
       {status !== 'checking' && !connected ? (
         <IntegrationCardDetails>
@@ -154,17 +147,11 @@ export function AzureDevOpsIntegrationCard(): React.JSX.Element {
       }
       checking={status === 'checking'}
       statusTone={configured ? 'connected' : 'attention'}
-      statusLabel={
-        configured
-          ? statuses.azureDevOpsAccount
-            ? 'Connected'
-            : 'Configured'
-          : status === 'unavailable'
-            ? 'Unavailable'
-            : status === 'not-configured'
-              ? 'Not configured'
-              : 'Auth failed'
-      }
+      statusLabel={tokenProviderStatusLabel({
+        configured,
+        hasAccount: Boolean(statuses.azureDevOpsAccount),
+        status
+      })}
     >
       {status !== 'checking' && !configured ? (
         <IntegrationCardDetails>
@@ -283,17 +270,12 @@ export function GiteaIntegrationCard(): React.JSX.Element {
       }
       checking={status === 'checking'}
       statusTone={configured ? 'connected' : 'attention'}
-      statusLabel={
-        configured
-          ? statuses.giteaAccount
-            ? 'Connected'
-            : 'Configured'
-          : status === 'unavailable'
-            ? 'Unavailable'
-            : status === 'not-configured'
-              ? 'Optional setup'
-              : 'Auth failed'
-      }
+      statusLabel={tokenProviderStatusLabel({
+        configured,
+        hasAccount: Boolean(statuses.giteaAccount),
+        status,
+        optional: true
+      })}
     >
       {status !== 'checking' && !configured ? (
         <IntegrationCardDetails>
diff --git a/src/renderer/src/components/settings/token-source-control-status.ts b/src/renderer/src/components/settings/token-source-control-status.ts
new file mode 100644
index 000000000000..edb2f48dada4
--- /dev/null
+++ b/src/renderer/src/components/settings/token-source-control-status.ts
@@ -0,0 +1,39 @@
+import { translate } from '@/i18n/i18n'
+import type { AzureDevOpsStatus, BitbucketStatus, GiteaStatus } from './integrations-pane-status'
+
+/**
+ * Card status as the pane computes it: the provider's own state, or
+ * `'unavailable'` when the runtime cannot report on it at all.
+ */
+export type TokenProviderStatus = BitbucketStatus | AzureDevOpsStatus | GiteaStatus | 'unavailable'
+
+const NS = 'auto.components.settings.token.source.control.integration.cards'
+
+/**
+ * Status copy for the token-configured source-control cards (Bitbucket, Azure
+ * DevOps, Gitea). They share the same states, so the labels live in one place.
+ */
+export function tokenProviderStatusLabel(input: {
+  /** Credentials present for the provider. */
+  configured: boolean
+  /** An account was resolved with those credentials. */
+  hasAccount?: boolean
+  status: TokenProviderStatus
+  /** Gitea works read-only without a token, so its unconfigured state is softer. */
+  optional?: boolean
+}): string {
+  if (input.configured) {
+    return input.hasAccount === false
+      ? translate(`${NS}.statusConfigured`, 'Configured')
+      : translate(`${NS}.statusConnected`, 'Connected')
+  }
+  if (input.status === 'unavailable') {
+    return translate(`${NS}.statusUnavailable`, 'Unavailable')
+  }
+  if (input.status === 'not-configured') {
+    return input.optional
+      ? translate(`${NS}.statusOptionalSetup`, 'Optional setup')
+      : translate(`${NS}.statusNotConfigured`, 'Not configured')
+  }
+  return translate(`${NS}.statusAuthFailed`, 'Auth failed')
+}
diff --git a/src/renderer/src/components/sidebar/SidebarToolbar.test.tsx b/src/renderer/src/components/sidebar/SidebarToolbar.test.tsx
index f3dde9621ea1..1ef570524cb9 100644
--- a/src/renderer/src/components/sidebar/SidebarToolbar.test.tsx
+++ b/src/renderer/src/components/sidebar/SidebarToolbar.test.tsx
@@ -4,6 +4,8 @@ import { act, type ReactNode } from 'react'
 import { createRoot, type Root } from 'react-dom/client'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type { AppState } from '@/store'
+import { i18n } from '@/i18n/i18n'
+import ko from '@/i18n/locales/ko.json'
 import SidebarToolbar from './SidebarToolbar'
 
 const mocks = vi.hoisted(() => ({
@@ -82,12 +84,15 @@ describe('SidebarToolbar moved workspace board hint', () => {
     }
   })
 
-  afterEach(() => {
+  afterEach(async () => {
     roots.splice(0).forEach((root) => {
       act(() => root.unmount())
     })
     document.body.replaceChildren()
     vi.clearAllMocks()
+    // Why: the language-change case mutates the shared i18n instance; restore
+    // here so a failing assertion cannot leave later tests running in Korean.
+    await i18n.changeLanguage('en')
   })
 
   it('does not show the moved hint to brand-new users after their first board click', async () => {
@@ -131,6 +136,26 @@ describe('SidebarToolbar moved workspace board hint', () => {
     expect(window.localStorage.getItem('orca.workspaceBoardMovedHintSeen.v1')).toBe('true')
   })
 
+  // Why: the toolbar is a React.memo boundary whose props never change on a
+  // language switch, so without its own useTranslation() subscription it keeps
+  // the English copy it rendered at boot (the persisted locale is applied
+  // asynchronously, after the lazy catalog loads).
+  it('relabels itself when the UI language changes after mount', async () => {
+    const { container } = await renderToolbar()
+    expect(container.querySelector('button[aria-label="Workspace board"]')).not.toBeNull()
+
+    await act(async () => {
+      await i18n.changeLanguage('ko')
+    })
+
+    // Why: read the expected copy from the catalog instead of hardcoding it, so
+    // editing the Korean wording cannot fail this test as a bogus stale-render
+    // report.
+    const localized = ko.auto.components.sidebar.SidebarToolbar['49f62c5665']
+    expect(localized).not.toBe('Workspace board')
+    expect(container.querySelector(`button[aria-label="${localized}"]`)).not.toBeNull()
+  })
+
   it('renders the profile switcher before settings in the footer controls', async () => {
     const { container } = await renderToolbar()
     const html = container.innerHTML
diff --git a/src/renderer/src/components/sidebar/SidebarToolbar.tsx b/src/renderer/src/components/sidebar/SidebarToolbar.tsx
index ff2e030c7a51..dcf572488398 100644
--- a/src/renderer/src/components/sidebar/SidebarToolbar.tsx
+++ b/src/renderer/src/components/sidebar/SidebarToolbar.tsx
@@ -1,5 +1,6 @@
 import React from 'react'
 import { Kanban } from 'lucide-react'
+import { useTranslation } from 'react-i18next'
 import { Button } from '@/components/ui/button'
 import { Tooltip, TooltipTrigger, TooltipContent } from '@/components/ui/tooltip'
 import { ScrollToCurrentWorkspaceToolbarButton } from './ScrollToCurrentWorkspaceToolbarButton'
@@ -23,6 +24,12 @@ const SidebarToolbar = React.memo(function SidebarToolbar({
   workspaceBoardDragPreviewOpen = false,
   onWorkspaceBoardToggle
 }: SidebarToolbarProps) {
+  // Why: this memo boundary needs its own language subscription, while
+  // translate() preserves Orca's pseudo-localization behavior. Without it the
+  // toolbar (and the ScrollToCurrentWorkspaceToolbarButton it renders) keeps
+  // whatever language was active at boot — English, since the persisted locale
+  // is applied asynchronously after the lazy catalog loads.
+  useTranslation()
   const [workspaceBoardMovedHintOpen, setWorkspaceBoardMovedHintOpen] = React.useState(false)
   const movedHintEligibleRef = React.useRef<boolean | null>(null)
   const persistedUIReady = useAppStore((state) => state.persistedUIReady)
diff --git a/src/renderer/src/components/stats/StatsPane.tsx b/src/renderer/src/components/stats/StatsPane.tsx
index 002a2dca4ae7..4d62ad89bb59 100644
--- a/src/renderer/src/components/stats/StatsPane.tsx
+++ b/src/renderer/src/components/stats/StatsPane.tsx
@@ -15,7 +15,7 @@ import {
   DropdownMenuTrigger
 } from '../ui/dropdown-menu'
 import { AgentIcon } from '@/lib/agent-catalog'
-import { translate } from '@/i18n/i18n'
+import { getIntlLocale, translate } from '@/i18n/i18n'
 export { getStatsPaneSearchEntries } from './stats-search'
 
 function formatDuration(ms: number): string {
@@ -44,7 +44,7 @@ function formatTrackingSince(timestamp: number | null): string {
   }
   const date = new Date(timestamp)
   return translate('auto.components.stats.StatsPane.trackingSince', 'Tracking since {{value0}}', {
-    value0: date.toLocaleDateString(undefined, {
+    value0: date.toLocaleDateString(getIntlLocale(), {
       month: 'short',
       day: 'numeric',
       year: 'numeric'
diff --git a/src/renderer/src/components/status-bar/workspace-space-format.test.ts b/src/renderer/src/components/status-bar/workspace-space-format.test.ts
index 6c43b22136c7..57b089bc2ac6 100644
--- a/src/renderer/src/components/status-bar/workspace-space-format.test.ts
+++ b/src/renderer/src/components/status-bar/workspace-space-format.test.ts
@@ -22,7 +22,8 @@ describe('workspace space format helpers', () => {
 
   it('formats scan times as relative age labels', () => {
     const now = new Date('2026-05-14T22:15:00Z').getTime()
-    const formatter = new Intl.RelativeTimeFormat(undefined, { numeric: 'auto' })
+    // Pinned to 'en' so the expectation matches the UI language, not the machine's OS locale.
+    const formatter = new Intl.RelativeTimeFormat('en', { numeric: 'auto' })
 
     expect(getWorkspaceSpaceScanTimeLabel(now - 2 * 60_000, now)).toBe(
       formatter.format(-2, 'minute')
diff --git a/src/renderer/src/components/status-bar/workspace-space-format.ts b/src/renderer/src/components/status-bar/workspace-space-format.ts
index ab056ea68e4d..e02443fd0d07 100644
--- a/src/renderer/src/components/status-bar/workspace-space-format.ts
+++ b/src/renderer/src/components/status-bar/workspace-space-format.ts
@@ -3,9 +3,9 @@ import type {
   WorkspaceSpaceScanStatus,
   WorkspaceSpaceWorktree
 } from '../../../../shared/workspace-space-types'
+import { formatUiRelativeTime } from '@/i18n/relative-time-format'
 
 const BYTE_UNITS = ['B', 'KB', 'MB', 'GB', 'TB', 'PB'] as const
-const relativeTimeFormatter = new Intl.RelativeTimeFormat(undefined, { numeric: 'auto' })
 const fullDateTimeFormatter = new Intl.DateTimeFormat(undefined, {
   dateStyle: 'medium',
   timeStyle: 'short'
@@ -41,19 +41,7 @@ export function formatCompactCount(count: number): string {
 }
 
 export function getWorkspaceSpaceScanTimeLabel(scannedAt: number, now = Date.now()): string {
-  const diffMs = scannedAt - now
-  const diffMinutes = Math.round(diffMs / 60_000)
-  if (Math.abs(diffMinutes) < 60) {
-    return relativeTimeFormatter.format(diffMinutes, 'minute')
-  }
-
-  const diffHours = Math.round(diffMinutes / 60)
-  if (Math.abs(diffHours) < 24) {
-    return relativeTimeFormatter.format(diffHours, 'hour')
-  }
-
-  const diffDays = Math.round(diffHours / 24)
-  return relativeTimeFormatter.format(diffDays, 'day')
+  return formatUiRelativeTime(scannedAt - now)
 }
 
 export function getWorkspaceSpaceScanDateTimeLabel(scannedAt: number): string {
diff --git a/src/renderer/src/i18n/i18n.ts b/src/renderer/src/i18n/i18n.ts
index 3f35e2ec2244..0d5cbad54cfa 100644
--- a/src/renderer/src/i18n/i18n.ts
+++ b/src/renderer/src/i18n/i18n.ts
@@ -95,6 +95,24 @@ export async function setRendererUiLanguage(language: UiLanguage): Promise<void>
 const registeredPluginLanguages = new Set<string>()
 let pluginLanguagePacks: readonly PluginLanguagePackRegistration[] = []
 
+/**
+ * BCP-47 tag for `Intl` formatting. Plugin catalogs register under a synthetic
+ * `plugin<hex>` resource language that `Intl` rejects, so fall back to the tag
+ * the pack declares (for example `ru-RU`) and finally to the default locale.
+ */
+export function getIntlLocale(): string {
+  const active = i18n.language
+  const pack = pluginLanguagePacks.find((entry) => entry.resourceLanguage === active)
+  const candidate = pack?.locale ?? active
+  try {
+    // Why: an empty result means Intl has no data for the tag, so fall through
+    // to the default locale instead of letting Intl pick the runtime one.
+    return Intl.DateTimeFormat.supportedLocalesOf(candidate)[0] ?? DEFAULT_LOCALE
+  } catch {
+    return DEFAULT_LOCALE
+  }
+}
+
 export function resolveRendererResourceLanguage(language: string): string {
   return pluginLanguagePacks.find((pack) => pack.id === language)?.resourceLanguage ?? language
 }
diff --git a/src/renderer/src/i18n/integration-card-status-localization.test.ts b/src/renderer/src/i18n/integration-card-status-localization.test.ts
new file mode 100644
index 000000000000..739d4ed5edf4
--- /dev/null
+++ b/src/renderer/src/i18n/integration-card-status-localization.test.ts
@@ -0,0 +1,44 @@
+/**
+ * Integration cards build their status pill inside the JSX call, which the
+ * coverage audit does not inspect — it looks at JSX attributes and object
+ * properties, not conditional expressions passed to a prop. These assertions
+ * pin the catalog contract so a card that goes back to a bare literal fails here.
+ */
+import { describe, expect, it } from 'vitest'
+import en from './locales/en.json'
+
+function lookup(key: string): string | undefined {
+  const value = key
+    .split('.')
+    .reduce<unknown>(
+      (node, part) =>
+        node && typeof node === 'object' ? (node as Record<string, unknown>)[part] : undefined,
+      en as unknown
+    )
+  return typeof value === 'string' ? value : undefined
+}
+
+const REQUIRED_KEYS: Record<string, string> = {
+  // Linear and other task trackers
+  'auto.components.settings.task.tracker.integration.cards.statusConnected': 'Connected',
+  'auto.components.settings.task.tracker.integration.cards.statusNotConnected': 'Not connected',
+  // Jira
+  'auto.components.settings.jira.integration.card.statusConnected': 'Connected',
+  'auto.components.settings.jira.integration.card.statusNotConnected': 'Not connected',
+  // Bitbucket, Azure DevOps, Gitea
+  'auto.components.settings.token.source.control.integration.cards.statusConnected': 'Connected',
+  'auto.components.settings.token.source.control.integration.cards.statusConfigured': 'Configured',
+  'auto.components.settings.token.source.control.integration.cards.statusUnavailable':
+    'Unavailable',
+  'auto.components.settings.token.source.control.integration.cards.statusNotConfigured':
+    'Not configured',
+  'auto.components.settings.token.source.control.integration.cards.statusOptionalSetup':
+    'Optional setup',
+  'auto.components.settings.token.source.control.integration.cards.statusAuthFailed': 'Auth failed'
+}
+
+describe('integration card status labels', () => {
+  it.each(Object.entries(REQUIRED_KEYS))('keeps %s in the English catalog', (key, expected) => {
+    expect(lookup(key)).toBe(expected)
+  })
+})
diff --git a/src/renderer/src/i18n/intl-locale.test.ts b/src/renderer/src/i18n/intl-locale.test.ts
new file mode 100644
index 000000000000..69f0de084555
--- /dev/null
+++ b/src/renderer/src/i18n/intl-locale.test.ts
@@ -0,0 +1,79 @@
+/**
+ * `getIntlLocale()` exists because plugin catalogs register under a synthetic
+ * `plugin<hex>` resource language. Passing that straight to `Intl` throws, and
+ * passing `undefined` silently falls back to the OS locale rather than the
+ * language the user selected.
+ *
+ * The branch assertions stub `supportedLocalesOf` so they describe the helper's
+ * logic rather than whichever locales the runtime's ICU build happens to carry.
+ */
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { getIntlLocale, i18n, setRendererPluginLanguagePacks } from './i18n'
+import { pluginLanguageResourceId } from '../../../shared/plugins/plugin-language-pack-artifact'
+import { DEFAULT_LOCALE } from './supported-languages'
+
+const PACK_ID = 'plugin:smwbev.russian/ru-RU' as const
+const PACK_RESOURCE = pluginLanguageResourceId(PACK_ID)
+const PACK = {
+  id: PACK_ID,
+  resourceLanguage: PACK_RESOURCE,
+  pluginKey: 'smwbev.russian',
+  locale: 'ru-RU',
+  catalog: {}
+}
+
+type Packs = Parameters<typeof setRendererPluginLanguagePacks>[0]
+
+async function activate(language: string, packs: Packs = []): Promise<void> {
+  setRendererPluginLanguagePacks(packs)
+  await i18n.changeLanguage(language)
+}
+
+/** Stubs ICU lookup so a locale counts as supported only when listed. */
+function withSupportedLocales(supported: readonly string[]): void {
+  vi.spyOn(Intl.DateTimeFormat, 'supportedLocalesOf').mockImplementation((requested) => {
+    const tags = Array.isArray(requested) ? requested : [requested as string]
+    return tags.filter((tag) => supported.includes(tag)) as string[]
+  })
+}
+
+afterEach(async () => {
+  vi.restoreAllMocks()
+  setRendererPluginLanguagePacks([])
+  await i18n.changeLanguage(DEFAULT_LOCALE)
+})
+
+describe('getIntlLocale', () => {
+  it('passes a supported built-in locale straight through', async () => {
+    withSupportedLocales(['es'])
+    await activate('es')
+    expect(getIntlLocale()).toBe('es')
+  })
+
+  it('resolves a plugin resource language to the locale the pack declares', async () => {
+    withSupportedLocales(['ru-RU'])
+    await activate(PACK_RESOURCE, [PACK])
+    // Without the pack lookup this would reach Intl as `plugin<hex>`.
+    expect(getIntlLocale()).toBe('ru-RU')
+  })
+
+  it('falls back to the default locale when ICU has no data for the tag', async () => {
+    withSupportedLocales([])
+    await activate('es')
+    // Returning the tag here would let Intl silently format with the runtime locale.
+    expect(getIntlLocale()).toBe(DEFAULT_LOCALE)
+  })
+
+  it('falls back to the default locale when Intl rejects the tag', async () => {
+    vi.spyOn(Intl.DateTimeFormat, 'supportedLocalesOf').mockImplementation(() => {
+      throw new RangeError('invalid language tag')
+    })
+    await activate(PACK_RESOURCE)
+    expect(getIntlLocale()).toBe(DEFAULT_LOCALE)
+  })
+
+  it('keeps the synthetic resource language unusable for Intl directly', () => {
+    // Unstubbed on purpose: this is a property of the tag, not of ICU data.
+    expect(() => Intl.DateTimeFormat.supportedLocalesOf(PACK_RESOURCE)).toThrow(RangeError)
+  })
+})
diff --git a/src/renderer/src/i18n/ja-technical-literal-mistranslations.test.ts b/src/renderer/src/i18n/ja-technical-literal-mistranslations.test.ts
new file mode 100644
index 000000000000..5067c0b8f8a9
--- /dev/null
+++ b/src/renderer/src/i18n/ja-technical-literal-mistranslations.test.ts
@@ -0,0 +1,42 @@
+/**
+ * Guards the source control "Push"/"Pull" button mistranslations so
+ * bootstrap re-translation cannot silently regress them.
+ */
+import { describe, expect, it } from 'vitest'
+import ja from './locales/ja.json'
+
+function findByKey(node: unknown, key: string): string | undefined {
+  if (!node || typeof node !== 'object') {
+    return undefined
+  }
+  if (Array.isArray(node)) {
+    for (const item of node) {
+      const found = findByKey(item, key)
+      if (found !== undefined) {
+        return found
+      }
+    }
+    return undefined
+  }
+  const record = node as Record<string, unknown>
+  if (typeof record[key] === 'string') {
+    return record[key] as string
+  }
+  for (const value of Object.values(record)) {
+    const found = findByKey(value, key)
+    if (found !== undefined) {
+      return found
+    }
+  }
+  return undefined
+}
+
+describe('ja technical literal / sense fixes', () => {
+  it('translates the source control Push action as プッシュ, not 押す', () => {
+    expect(findByKey(ja, '95550cff15')).toBe('プッシュ')
+  })
+
+  it('translates the source control Pull action as プル, not 引く', () => {
+    expect(findByKey(ja, 'd64292a938')).toBe('プル')
+  })
+})
diff --git a/src/renderer/src/i18n/ko-ui-semantic-mistranslations.test.ts b/src/renderer/src/i18n/ko-ui-semantic-mistranslations.test.ts
new file mode 100644
index 000000000000..f00f4686b0e3
--- /dev/null
+++ b/src/renderer/src/i18n/ko-ui-semantic-mistranslations.test.ts
@@ -0,0 +1,52 @@
+import fs from 'node:fs'
+
+import { describe, expect, it } from 'vitest'
+import ko from './locales/ko.json'
+
+const correctedValues = {
+  'auto.components.settings.AutoRenameBranchFromWorkSetting.d9b65054ef':
+    ') 작업을 요약하는 짧은 이름으로 변경됩니다. Orca가 직접 이름 붙인 브랜치만 이름을 바꾸며, 푸시된 후에는 이름을 바꾸지 않습니다.',
+  'auto.components.settings.source.control.action.recipe.options.commitMessage':
+    '스테이징된 변경 사항에서 commit 메시지를 생성합니다.',
+  'auto.components.settings.DevToolsPane.orcaCloudDescription':
+    '자사 클라우드 로그인의 개발자 전용 미리보기. 프로덕션에서는 숨겨집니다. 개발 환경에서는 ORCA_CLOUD_API_URL과 ORCA_CLOUD_CLIENT_ID가 설정되면 사이드바 계정 전환기에도 표시됩니다.',
+  'auto.components.settings.EphemeralVmsPane.whatTitle': '이 스킬로 함께 하는 작업',
+  'auto.components.settings.EphemeralVmsPane.recipes': '레시피',
+  'auto.components.right.sidebar.SourceControl.a5e5a11090':
+    '모든 변경 사항 취소 실패 — 취소 전에 파일의 스테이징을 해제하지 못했습니다.',
+  'auto.components.right.sidebar.SourceControl.6d7f2a47e5': '폴더의 변경 사항 취소',
+  'auto.components.right.sidebar.source.control.discard.confirmation.40e9357b2a':
+    '이렇게 하면 HEAD에서 파일을 복원하고 파일 삭제를 취소합니다. 이 작업은 취소할 수 없습니다.',
+  'auto.components.right.sidebar.source.control.primary.action.5a477d80cb':
+    '모든 변경 사항 스테이징'
+} as const
+
+function getLocaleValue(path: string): unknown {
+  return path.split('.').reduce<unknown>((node, segment) => {
+    if (!node || typeof node !== 'object' || Array.isArray(node)) {
+      return undefined
+    }
+    return (node as Record<string, unknown>)[segment]
+  }, ko)
+}
+
+describe('Korean UI semantic mistranslation fixes', () => {
+  it('keeps the corrected values in the Korean catalog', () => {
+    for (const [path, expected] of Object.entries(correctedValues)) {
+      expect(getLocaleValue(path), path).toBe(expected)
+    }
+  })
+
+  it('keeps the corrected values in the translation overrides', () => {
+    const overrides = JSON.parse(
+      fs.readFileSync(
+        new URL('../../../../config/scripts/locale-ko-key-overrides.json', import.meta.url),
+        'utf8'
+      )
+    ) as Record<string, { ko?: string }>
+
+    for (const [path, expected] of Object.entries(correctedValues)) {
+      expect(overrides[path]?.ko, path).toBe(expected)
+    }
+  })
+})
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index c8086bd3dbdb..b3ce98a4edd4 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -8489,7 +8489,9 @@
               "d5c5b47bb9": "update",
               "fb854902d9": "connecting",
               "9a9f8d4910": "Connect Jira Cloud to browse, create, and link issues.",
-              "74f3063026": "{{value0}} site{{value1}} connected"
+              "74f3063026": "{{value0}} site{{value1}} connected",
+              "statusConnected": "Connected",
+              "statusNotConnected": "Not connected"
             }
           }
         },
@@ -9312,7 +9314,9 @@
                 "disconnect_all": "Disconnect",
                 "account_scope_prefix": "Account scope",
                 "2d60ec7921": "Connect a Jira Cloud site with an API token, or a self-hosted Jira with a personal access token or username and password. Credentials are sent to the selected remote runtime and stored there with runtime-supported encryption.",
-                "977e360b71": "Connect a Jira Cloud site with an API token, or a self-hosted Jira with a personal access token or username and password. Credentials are stored locally and encrypted when local runtime storage supports it."
+                "977e360b71": "Connect a Jira Cloud site with an API token, or a self-hosted Jira with a personal access token or username and password. Credentials are stored locally and encrypted when local runtime storage supports it.",
+                "statusConnected": "Connected",
+                "statusNotConnected": "Not connected"
               }
             }
           }
@@ -9353,7 +9357,13 @@
                   "63a7f47392": "ORCA_BITBUCKET_EMAIL",
                   "24ac1c69dc": "Bitbucket status is not available in this runtime yet.",
                   "a924e8dcd1": "Pull requests and build statuses via Bitbucket Cloud API tokens.",
-                  "0fa5629dad": "Pull requests and build statuses"
+                  "0fa5629dad": "Pull requests and build statuses",
+                  "statusConnected": "Connected",
+                  "statusUnavailable": "Unavailable",
+                  "statusNotConfigured": "Not configured",
+                  "statusAuthFailed": "Auth failed",
+                  "statusConfigured": "Configured",
+                  "statusOptionalSetup": "Optional setup"
                 }
               }
             }
@@ -9817,6 +9827,10 @@
           "unpackedHelp": "Development builds must be updated from their source checkout.",
           "legacyHelp": "Update this server manually once to enable remote updates."
         },
+        "BrowserLinkRoutingSetting": {
+          "description": "Open http(s) links in Orca's built-in browser — from the terminal, markdown, and the editor. {{shortcut}} always uses your system browser.",
+          "descriptionBase": "Open http(s) links in Orca's built-in browser — from the terminal, markdown, and the editor."
+        },
         "BrowserLinkRoutingModifierSetting": {
           "titleSystem": "Hold Shift to open in your web browser",
           "titleOrca": "Hold Shift to open in Orca",
@@ -13486,7 +13500,8 @@
             "4a9568f773": "Back",
             "4f86e2a10b": "Skip tour",
             "d974f32a83": "Dismiss tour",
-            "ffa4412b66": "next"
+            "ffa4412b66": "next",
+            "complete": "Done"
           },
           "ContextualTourProgressDots": {
             "7734cb8ad3": "of",
@@ -13496,7 +13511,17 @@
             "tour": {
               "overlay": {
                 "measurement": {
-                  "38b3155418": "Next"
+                  "38b3155418": "Next",
+                  "automations": {
+                    "intro": {
+                      "title": "What is an automation?",
+                      "body": "Automations run agent work on a schedule. Add an automation by clicking this button."
+                    },
+                    "results": {
+                      "title": "Find the results",
+                      "body": "Runs show when automations ran, what happened, and where to inspect their output."
+                    }
+                  }
                 }
               }
             }
diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json
index 14dd169539ea..a970938ac403 100644
--- a/src/renderer/src/i18n/locales/es.json
+++ b/src/renderer/src/i18n/locales/es.json
@@ -9679,6 +9679,10 @@
           "unpackedHelp": "Development builds must be updated from their source checkout.",
           "legacyHelp": "Update this server manually once to enable remote updates."
         },
+        "BrowserLinkRoutingSetting": {
+          "description": "Abre los enlaces http(s) del terminal, Markdown y el editor en el navegador integrado de Orca. {{shortcut}} siempre usa el navegador del sistema.",
+          "descriptionBase": "Abre los enlaces http(s) del terminal, Markdown y el editor en el navegador integrado de Orca."
+        },
         "BrowserLinkRoutingModifierSetting": {
           "titleSystem": "Hold Shift to open in your web browser",
           "titleOrca": "Hold Shift to open in Orca",
@@ -14613,25 +14617,25 @@
   },
   "browser": {
     "loadFailure": {
-      "connectionNotSecure": "Connection isn't secure",
-      "cantReachHost": "Can't reach {{value0}}",
-      "cantLoadPage": "Can't load this page",
-      "certificateNameMismatch": "The certificate doesn't match {{value0}}.",
-      "certificateDateInvalid": "The certificate for {{value0}} isn't valid at the current date and time.",
-      "certificateAuthorityInvalid": "Orca doesn't trust the authority that issued the certificate for {{value0}}.",
-      "certificateVerificationFailed": "Orca couldn't verify the certificate for {{value0}}.",
-      "trustedCertificateGuidance": "For local development, use a trusted local certificate when possible.",
-      "retry": "Retry",
-      "copyAddress": "Copy Address",
-      "addressCopied": "Copied the current page address.",
-      "openExternally": "Open Externally",
-      "tryHttps": "Try HTTPS",
-      "proceedUnsafe": "Proceed Anyway (Unsafe)",
-      "connecting": "Connecting…",
-      "certificateChallengeExpired": "This certificate approval expired. Retry the page to request a new one.",
-      "certificateChallengeChanged": "The certificate request changed. Retry the page and review the new warning.",
-      "certificateChallengeUnavailable": "This certificate request is no longer available. Retry the page to request a new one.",
-      "certificateProceedFailed": "Orca could not approve this certificate request. Retry the page and try again."
+      "connectionNotSecure": "La conexión no es segura",
+      "cantReachHost": "No se puede acceder a {{value0}}",
+      "cantLoadPage": "No se puede cargar esta página",
+      "certificateNameMismatch": "El certificado no coincide con {{value0}}.",
+      "certificateDateInvalid": "El certificado de {{value0}} no es válido en la fecha y hora actuales.",
+      "certificateAuthorityInvalid": "Orca no confía en la autoridad que emitió el certificado de {{value0}}.",
+      "certificateVerificationFailed": "Orca no pudo verificar el certificado de {{value0}}.",
+      "trustedCertificateGuidance": "Para el desarrollo local, usa un certificado local de confianza siempre que sea posible.",
+      "retry": "Reintentar",
+      "copyAddress": "Copiar dirección",
+      "addressCopied": "Se copió la dirección de la página actual.",
+      "openExternally": "Abrir externamente",
+      "tryHttps": "Probar HTTPS",
+      "proceedUnsafe": "Continuar (no seguro)",
+      "connecting": "Conectando…",
+      "certificateChallengeExpired": "Esta aprobación de certificado caducó. Vuelve a intentarlo con la página para solicitar una nueva.",
+      "certificateChallengeChanged": "La solicitud de certificado cambió. Vuelve a intentarlo con la página y revisa la nueva advertencia.",
+      "certificateChallengeUnavailable": "Esta solicitud de certificado ya no está disponible. Vuelve a intentarlo con la página para solicitar una nueva.",
+      "certificateProceedFailed": "Orca no pudo aprobar esta solicitud de certificado. Vuelve a intentarlo con la página e inténtalo de nuevo."
     }
   },
   "runtimeRpc": {
diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json
index 9ec2f14a80dc..769a06c354fc 100644
--- a/src/renderer/src/i18n/locales/ja.json
+++ b/src/renderer/src/i18n/locales/ja.json
@@ -4223,7 +4223,7 @@
         "SidebarNav": {
           "80611a8b10": "検索",
           "0c3395fd32": "ワークツリーとブラウザタブを検索する",
-          "c86d83b5c3": "新規",
+          "c86d83b5c3": "新機能",
           "1b5c41caee": "Orca モバイル",
           "9c95e1ce91": "エージェント",
           "f323383e9a": "自動化",
@@ -4759,7 +4759,7 @@
             "ddf25b6262": "エメラルド",
             "7cebab6d4a": "アンバー",
             "1b81da243a": "バイオレット",
-            "6437a8c253": "空",
+            "6437a8c253": "空色",
             "fc3b92756c": "青",
             "52e3c6e2a4": "中性"
           }
@@ -9679,6 +9679,10 @@
           "unpackedHelp": "開発ビルドはソースチェックアウトから更新する必要があります。",
           "legacyHelp": "リモート更新を有効にするには、このサーバーを手動で一度更新してください。"
         },
+        "BrowserLinkRoutingSetting": {
+          "description": "ターミナル、Markdown、エディターの http(s) リンクを Orca の組み込みブラウザで開きます。{{shortcut}} は常にシステム ブラウザを使用します。",
+          "descriptionBase": "ターミナル、Markdown、エディターの http(s) リンクを Orca の組み込みブラウザで開きます。"
+        },
         "BrowserLinkRoutingModifierSetting": {
           "titleSystem": "Hold Shift to open in your web browser",
           "titleOrca": "Hold Shift to open in Orca",
@@ -10994,8 +10998,8 @@
                   "ed93b4f14f": "Commit",
                   "946a8a05ea": "このブランチの {{value0}} を作成します",
                   "e7ffa46946": "{{value0}} を作成する",
-                  "95550cff15": "押す",
-                  "d64292a938": "引く",
+                  "95550cff15": "プッシュ",
+                  "d64292a938": "プル",
                   "795f1509c5": "同期",
                   "390abeab93": "フォースプッシュ",
                   "1884cf34af": "このブランチをオリジンに公開します",
@@ -11021,19 +11025,19 @@
                   "8c6d15a07d": "PR を作成",
                   "d37e68f61d": "レビュー用にブランチを準備中…",
                   "c72e5e65d1": "このブランチを準備して {{value0}} を作成",
-                  "b8e4f2a901": "Wait for the remote operation to finish.",
-                  "c9f3a1b802": "Resolve conflicts before creating a {{value0}}.",
-                  "d2a8c4e703": "No changes on this branch to include in a {{value0}}.",
-                  "e3b9d5f814": "Cannot create a {{value0}} from the default branch.",
-                  "f4c0e6a925": "Commit changes before creating a {{value0}}.",
-                  "a5d1f7b036": "Publish commits before creating a {{value0}}.",
-                  "b6e2a8c147": "Push commits before creating a {{value0}}.",
-                  "c7f3b9d258": "Sync this branch before creating a {{value0}}.",
-                  "d8a4c0e369": "Authenticate before creating a {{value0}}.",
-                  "e9b5d1f470": "Check out a branch before creating a {{value0}}.",
-                  "f0c6e2a581": "This branch is not ready for a {{value0}} yet.",
+                  "b8e4f2a901": "リモート操作が終了するまでお待ちください。",
+                  "c9f3a1b802": "{{value0}} を作成する前に競合を解決してください。",
+                  "d2a8c4e703": "このブランチに {{value0}} に含める変更はありません。",
+                  "e3b9d5f814": "デフォルトブランチから {{value0}} を作成することはできません。",
+                  "f4c0e6a925": "{{value0}} を作成する前に変更を commit してください。",
+                  "a5d1f7b036": "{{value0}} を作成する前に commit を公開してください。",
+                  "b6e2a8c147": "{{value0}} を作成する前に commit をプッシュしてください。",
+                  "c7f3b9d258": "{{value0}} を作成する前にこのブランチを同期してください。",
+                  "d8a4c0e369": "{{value0}} を作成する前に認証してください。",
+                  "e9b5d1f470": "{{value0}} を作成する前にブランチをチェックアウトしてください。",
+                  "f0c6e2a581": "このブランチはまだ {{value0}} の準備ができていません。",
                   "8f9a0b1c2d": "コミットするものがありません。ブランチは最新です。",
-                  "h3i4j5k607": "Checking whether this branch can create a {{value0}}…"
+                  "h3i4j5k607": "このブランチが {{value0}} を作成できるか確認中…"
                 }
               }
             }
@@ -14613,25 +14617,25 @@
   },
   "browser": {
     "loadFailure": {
-      "connectionNotSecure": "Connection isn't secure",
-      "cantReachHost": "Can't reach {{value0}}",
-      "cantLoadPage": "Can't load this page",
-      "certificateNameMismatch": "The certificate doesn't match {{value0}}.",
-      "certificateDateInvalid": "The certificate for {{value0}} isn't valid at the current date and time.",
-      "certificateAuthorityInvalid": "Orca doesn't trust the authority that issued the certificate for {{value0}}.",
-      "certificateVerificationFailed": "Orca couldn't verify the certificate for {{value0}}.",
-      "trustedCertificateGuidance": "For local development, use a trusted local certificate when possible.",
-      "retry": "Retry",
-      "copyAddress": "Copy Address",
-      "addressCopied": "Copied the current page address.",
-      "openExternally": "Open Externally",
-      "tryHttps": "Try HTTPS",
-      "proceedUnsafe": "Proceed Anyway (Unsafe)",
-      "connecting": "Connecting…",
-      "certificateChallengeExpired": "This certificate approval expired. Retry the page to request a new one.",
-      "certificateChallengeChanged": "The certificate request changed. Retry the page and review the new warning.",
-      "certificateChallengeUnavailable": "This certificate request is no longer available. Retry the page to request a new one.",
-      "certificateProceedFailed": "Orca could not approve this certificate request. Retry the page and try again."
+      "connectionNotSecure": "接続は安全ではありません",
+      "cantReachHost": "{{value0}} に接続できません",
+      "cantLoadPage": "このページを読み込めません",
+      "certificateNameMismatch": "証明書が {{value0}} と一致しません。",
+      "certificateDateInvalid": "{{value0}} の証明書は現在の日時では有効ではありません。",
+      "certificateAuthorityInvalid": "Orca は {{value0}} の証明書を発行した認証局を信頼していません。",
+      "certificateVerificationFailed": "Orca は {{value0}} の証明書を検証できませんでした。",
+      "trustedCertificateGuidance": "ローカル開発では、可能な限り信頼されたローカル証明書を使用してください。",
+      "retry": "再試行",
+      "copyAddress": "アドレスをコピー",
+      "addressCopied": "現在のページのアドレスをコピーしました。",
+      "openExternally": "外部で開く",
+      "tryHttps": "HTTPS を試す",
+      "proceedUnsafe": "続行（安全ではない）",
+      "connecting": "接続中…",
+      "certificateChallengeExpired": "この証明書の承認は期限切れです。ページを再試行して、承認をもう一度リクエストしてください。",
+      "certificateChallengeChanged": "証明書のリクエストが変更されました。ページを再試行して、警告の内容を改めて確認してください。",
+      "certificateChallengeUnavailable": "この証明書のリクエストは利用できなくなりました。ページを再試行して、もう一度リクエストしてください。",
+      "certificateProceedFailed": "Orca はこの証明書のリクエストを承認できませんでした。ページを再試行して、もう一度お試しください。"
     }
   },
   "runtimeRpc": {
diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json
index 152e6a771dc1..a1309686c999 100644
--- a/src/renderer/src/i18n/locales/ko.json
+++ b/src/renderer/src/i18n/locales/ko.json
@@ -1000,7 +1000,7 @@
         "ba8e329d92": "본 것으로 표시 해제",
         "3f79ffc8b7": "현재 리뷰어를 보려면 PR 세부정보를 엽니다.",
         "5c1c973855": "리뷰어 삭제",
-        "commentTooLarge": "댓글이 너무 커서 안전하게 제출할 수 없습니다.",
+        "commentTooLarge": "댓글이 너무 길어 안전하게 제출할 수 없습니다.",
         "timeline": {
           "completed": "를 완료로",
           "notPlanned": "미계획으로",
@@ -1082,7 +1082,7 @@
         "3a051b8ade": "작업 항목",
         "32f8bef818": "로그 출력이 없습니다.",
         "4168eb2c51": "해결",
-        "commentTooLarge": "댓글이 너무 커서 안전하게 제출할 수 없습니다."
+        "commentTooLarge": "댓글이 너무 길어 안전하게 제출할 수 없습니다."
       },
       "JiraIssueWorkspace": {
         "b0b92666c9": "댓글",
@@ -1117,7 +1117,7 @@
         "2a829a2f00": "우선순위",
         "693be070d0": "전환",
         "ef21405c6d": "Jira 이슈",
-        "commentTooLarge": "댓글이 너무 커서 안전하게 제출할 수 없습니다."
+        "commentTooLarge": "댓글이 너무 길어 안전하게 제출할 수 없습니다."
       },
       "Landing": {
         "76a95f7f47": "생성",
@@ -1240,7 +1240,7 @@
         "39883467f4": "Linear 이슈",
         "fda549766e": "댓글을 달려면 {{value0}}",
         "d71cd3003e": "+ 담당자",
-        "commentTooLarge": "댓글이 너무 커서 안전하게 제출할 수 없습니다."
+        "commentTooLarge": "댓글이 너무 길어 안전하게 제출할 수 없습니다."
       },
       "NewWorkspaceComposerCard": {
         "cbb47ee0dc": "로컬 Git 프로젝트에만 사용할 수 있습니다.",
@@ -1488,7 +1488,7 @@
         "2b4fdb880c": "본 표시 해제",
         "56ec6eafb7": "현재 리뷰어를 보려면 PR 세부정보를 엽니다.",
         "7f964a365a": "리뷰어 삭제",
-        "commentTooLarge": "댓글이 너무 커서 안전하게 제출할 수 없습니다.",
+        "commentTooLarge": "댓글이 너무 길어 안전하게 제출할 수 없습니다.",
         "8ff5ae8866": "담당자",
         "82c87eceb9": "담당자 편집",
         "1ff5d979df": "할당된 사람이 없음",
@@ -2139,7 +2139,7 @@
                 "463d030ae4": "삭제",
                 "8564f58542": "편집",
                 "5f104bf855": "아직 댓글이 없습니다.",
-                "commentTooLarge": "댓글이 너무 커서 안전하게 제출할 수 없습니다."
+                "commentTooLarge": "댓글이 너무 길어 안전하게 제출할 수 없습니다."
               },
               "LabelsEditor": {
                 "34dd57d6c8": "로드 중…",
@@ -2259,7 +2259,7 @@
           "b1c2d3e4f5": "이슈 다시 열기",
           "0a73f59e85": "댓글 보내기",
           "bf43425540": "댓글",
-          "commentTooLarge": "댓글이 너무 커서 안전하게 제출할 수 없습니다."
+          "commentTooLarge": "댓글이 너무 길어 안전하게 제출할 수 없습니다."
         },
         "GitHubWorkItemAssigneePopoverContent": {
           "cddd9b04a7": "담당자 로드 중",
@@ -2327,7 +2327,7 @@
               "9ddb58edbd": "상태",
               "0a6a5a7dd6": "최신 업데이트",
               "c8db98b73b": "리소스",
-              "bb1405eff8": "이정표",
+              "bb1405eff8": "마일스톤",
               "5d99315fb8": "계획",
               "3ad562bdf4": "범위 내 이슈",
               "563501f191": "진행률",
@@ -2408,7 +2408,7 @@
           "WorkspaceSpacePage": {
             "8d0048e1cb": "워크스페이스 디스크 사용량과 회수 가능한 워크트리 저장 공간.",
             "e8d6ba11ab": "베타",
-            "45f6302dbc": "공간",
+            "45f6302dbc": "저장 공간",
             "ecf72fdc3b": "뒤로"
           }
         },
@@ -3235,7 +3235,7 @@
             "f4d2651498": "스캔됨",
             "6a5dc3c61a": "리뷰",
             "c361440dc0": "베타",
-            "8ff597593d": "공간",
+            "8ff597593d": "저장 공간",
             "0582df6d2e": "스캔",
             "f5e1a84d79": "새로고침",
             "2af2174d6d": "취소",
@@ -3750,13 +3750,13 @@
           "8b12c0850a": "저장",
           "de8fce5854": "취소",
           "ddbcaef7be": "src/renderer packages/ui",
-          "0e9ad9c798": "디렉토리",
+          "0e9ad9c798": "디렉터리",
           "064c1e2d12": "렌더러 UI",
           "b3a500c623": "이름",
           "16223dde6a": "사전 설정 로드",
           "a683a4bc8e": "사전 설정 로드를 다시 시도하세요.",
-          "14952d451e": "{{value0}} 디렉토리",
-          "e9283eb171": "디렉토리 1개",
+          "14952d451e": "{{value0}} 디렉터리",
+          "e9283eb171": "디렉터리 1개",
           "69c020eddc": "사전 설정 편집",
           "bd6cec2056": "새 사전 설정"
         }
@@ -4054,7 +4054,7 @@
           "29aefb7e52": "다시 묻지 마세요"
         },
         "DeleteWorktreeWarningPanels": {
-          "026738155a": "(원본 복제 디렉토리).",
+          "026738155a": "(원본 복제 디렉터리).",
           "c4f96a6e18": "메인 워크트리",
           "e3be9eba15": "이것은"
         },
@@ -4121,7 +4121,7 @@
           "2300612806": "필터링하려면 입력하거나 경로를 입력하세요…",
           "9e060f5815": "폴더 선택",
           "f8b1deb1a4": "취소",
-          "51001182e3": "빈 디렉토리",
+          "51001182e3": "빈 디렉터리",
           "971d85cc84": "이 호스트에서 프로젝트로 열립니다 · {{value0}}",
           "00c4235c10": "'{{value0}}'과(와) 일치하는 항목이 없습니다.",
           "largeInputNoMatches": "이 긴 입력과 일치하는 항목 없음"
@@ -4223,7 +4223,7 @@
         "SidebarNav": {
           "80611a8b10": "검색",
           "0c3395fd32": "작업 트리 및 브라우저 탭 검색",
-          "c86d83b5c3": "새로 만들기",
+          "c86d83b5c3": "신규",
           "1b5c41caee": "Orca 모바일",
           "9c95e1ce91": "에이전트",
           "f323383e9a": "자동화",
@@ -4658,7 +4658,7 @@
               "1d0fa5c0a5": "워크스페이스 {{value0}}을(를) 삭제하지 못했습니다.",
               "ead7b8ee15": "파일이 변경되었습니다. 어쨌든 삭제하려면 강제 삭제를 사용하세요.",
               "905fc8efac": "Git은 이미 이 워크스페이스를 제거했습니다. 강제 삭제를 사용하여 Orca에서 삭제합니다.",
-              "0899ebdb28": "Git은 이미 이 워크스페이스를 잊어버렸지만 해당 디렉토리는 여전히 디스크에 있습니다. 강제 삭제를 사용하여 분리된 디렉터리를 제거합니다.",
+              "0899ebdb28": "Git은 이미 이 워크스페이스를 잊어버렸지만 해당 디렉터리는 여전히 디스크에 있습니다. 강제 삭제를 사용하여 분리된 디렉터리를 제거합니다.",
               "locked": "이 워크트리는 Git에 의해 잠겨 있습니다. 저장소에서 git worktree unlock <worktree-path>을 실행한 후 삭제를 다시 시도하세요.",
               "lockedReason": "이 워크트리는 Git에 의해 잠겨 있습니다. Git 보고: {{value0}}. 저장소에서 git worktree unlock <worktree-path>을 실행한 후 삭제를 다시 시도하세요."
             }
@@ -5296,7 +5296,7 @@
           "1c9a9679ec": "{{value0}} 사용 가능 여부",
           "0d9e293a02": "새로고침",
           "c9b33eb5c0": "새로고침 중…",
-          "13647f9f80": "쉘 PATH를 다시 ​​읽고 설치된 agents를 다시 검색하십시오.",
+          "13647f9f80": "셸 PATH를 다시 ​​읽고 설치된 agents를 다시 검색하십시오.",
           "dc4a2ffdc0": "확장 명령 재정의",
           "cea7d97be1": "축소 명령 재정의",
           "db9e9e5887": "명령 사용자 정의",
@@ -5404,7 +5404,7 @@
           "9241b59bf5": "사용",
           "a869d0edd8": "브랜치 이름 명령 템플릿",
           "e784ea62dc": "고급",
-          "d9b65054ef": ") 작업을 요약하는 짧은 이름으로 변경됩니다. Orca 라는 이름의 브랜치만 이름이 변경되며 푸시된 후에는 이름이 변경되지 않습니다.",
+          "d9b65054ef": ") 작업을 요약하는 짧은 이름으로 변경됩니다. Orca가 직접 이름 붙인 브랜치만 이름을 바꾸며, 푸시된 후에는 이름을 바꾸지 않습니다.",
           "12ea4a408d": "agent가 새 워크스페이스에서 작업을 시작하면 Orca는 자동 생성된 브랜치의 이름을 바꿉니다(예:",
           "ef787db0e3": "브랜치 자동 이름 바꾸기",
           "6a051586d2": "agent가 시작되면 작업을 기반으로 자동 생성된 브랜치의 이름을 바꿉니다.",
@@ -5561,7 +5561,7 @@
           "15eaad0d31": "명령 경로:",
           "5dae812f50": "새로고침",
           "52e640f3a0": "CLI 상태 새로 고침",
-          "38edbb5721": "쉘 명령",
+          "38edbb5721": "셸 명령",
           "6930feda9e": "terminals에서 Orca를 사용하여 앱을 열고, 작업 트리를 관리하고, Orca terminals과 상호 작용할 수 있습니다.",
           "c5c0f2641d": "Orca CLI",
           "d77352f2df": "PATH에서 `{{value0}}`을(를) 제거하지 못했습니다.",
@@ -5593,7 +5593,7 @@
           "0c9f3cf9da": "Orca가 글로벌 agent 스킬을 확인하고 설치하는 위치를 선택합니다.",
           "f00d6aa9b5": "이 컴퓨터에서는 WSL을 사용할 수 없습니다.",
           "7c776ff9d8": "wsl",
-          "fc0fcf72fd": "스킬 설정 전 WSL 쉘 명령어를 등록하세요.",
+          "fc0fcf72fd": "스킬 설정 전 WSL 셸 명령어를 등록하세요.",
           "windowsPathUnknown": "WSL shell command PATH could not be checked"
         },
         "CommitMessageAiPane": {
@@ -5663,11 +5663,11 @@
         "DeveloperPermissionsPane": {
           "4c17304beb": "새로고침",
           "6326a4c5cc": "CLI, 로컬 앱 또는 자동화 도구에 macOS 개인 정보 보호 액세스가 필요한 경우 이러한 컨트롤을 사용하십시오. Orca는 시작 시 묻지 않습니다.",
-          "6f011b9bf6": "Terminal 도구는 Orca의 macOS 개인 정보 보호 봉투를 상속합니다.",
+          "6f011b9bf6": "Terminal 도구는 Orca의 macOS 개인정보 보호 환경 안에서 실행됩니다.",
           "bfa3402305": "권한을 요청할 수 없습니다.",
           "66e94d6cf3": "권한 요청이 전송되었습니다.",
           "fa809e8ada": "macOS 개인정보 보호 및 보안 오픈",
-          "48d87edcd2": "허가가 부여되었습니다",
+          "48d87edcd2": "권한이 허용되었습니다",
           "a552887288": "개발자 권한을 로드할 수 없습니다.",
           "4cfaa7e98a": "블루투스 장치 도구 및 로컬 하드웨어 실험.",
           "b2210b1b4f": "블루투스",
@@ -5745,9 +5745,9 @@
           "9fb225f2d7": "플로팅 버튼",
           "3c900e26e5": "키보드 단축키는 토글이 표시되는 위치에 관계없이 작동합니다.",
           "5e5a8da236": "토글 버튼 위치",
-          "505001823e": "플로팅 워크스페이스 디렉토리 선택",
+          "505001823e": "플로팅 워크스페이스 디렉터리 선택",
           "81afb79785": "새로운 플로팅 terminal 탭이 여기에서 시작됩니다. Markdown 메모는 Orca의 앱 소유 플로팅 워크스페이스에 저장됩니다.",
-          "12aa09f10c": "Terminal 디렉토리",
+          "12aa09f10c": "Terminal 디렉터리",
           "41eb95f7f0": "플로팅 워크스페이스 버튼과 패널을 표시합니다.",
           "5136813663": "플로팅 워크스페이스 활성화",
           "37df688d6f": "플로팅 워크스페이스를 활성화하고 새 탭이 시작되는 위치를 선택하세요.",
@@ -5873,7 +5873,7 @@
           "ba3480642f": "워크스페이스 중첩",
           "a246f5ce6f": "워크스페이스 폴더가 생성되는 루트 디렉터리입니다.",
           "5567191a6e": "찾아보기",
-          "0e9fc0eadc": "워크스페이스 디렉토리",
+          "0e9fc0eadc": "워크스페이스 디렉터리",
           "e2955d9ccb": "새 워크스페이스가 생성되는 위치를 구성합니다.",
           "7511097c5d": "워크스페이스"
         },
@@ -6385,7 +6385,7 @@
           "8567127a40": "작업 트리가 생성되거나 보관될 때 실행되는 스크립트입니다. 로컬 스크립트는 이 시스템에 저장됩니다. `orca.yaml` 스크립트는 팀과 공유됩니다.",
           "ff082fe7c6": "작업트리 후크",
           "5d940bde5c": "로컬 스크립트 추가",
-          "8c2893fae0": "단일 쉘 스크립트로 실행됩니다. 이 컴퓨터에 저장되었습니다.",
+          "8c2893fae0": "단일 셸 스크립트로 실행됩니다. 이 컴퓨터에 저장되었습니다.",
           "40a446ae16": "- 이 기기에서 나만 사용",
           "2d03a514db": "로컬",
           "7e4427b4a2": "변경합니다.",
@@ -6930,7 +6930,7 @@
           "2d7d45e991": "취소",
           "c240a16f25": "packages/web 또는 apps/api와 같은 repo 상대 경로를 사용하세요.",
           "fde7ff2cc3": "packages/web shared/ui",
-          "caf33029cc": "디렉토리",
+          "caf33029cc": "디렉터리",
           "3b6f1abd3e": "예를 들어 웹 전용",
           "a6fcdd9e3c": "이름",
           "b9922ec194": "사전 설정 편집 취소",
@@ -6940,12 +6940,12 @@
           "a7bcf206b1": "삭제 중",
           "ba9ad2d4cd": "업데이트 날짜 알 수 없음",
           "568d7e1e49": "{{value0}} 업데이트됨",
-          "d7b3f0bdc3": "{{value0}} 디렉토리",
-          "9d3c087fc0": "디렉토리 1개",
+          "d7b3f0bdc3": "{{value0}} 디렉터리",
+          "9d3c087fc0": "디렉터리 1개",
           "8deb7024ab": "스파스 사전 설정 로드 중...",
           "92c08ccae3": "스파스 사전 설정을 로드할 수 없습니다.",
-          "3dfa765ca7": "{{value0}} 디렉토리가 저장됩니다.",
-          "b532b9c17d": "1개의 디렉토리가 저장됩니다.",
+          "3dfa765ca7": "{{value0}} 디렉터리가 저장됩니다.",
+          "b532b9c17d": "1개의 디렉터리가 저장됩니다.",
           "623b4cf910": "사전 설정 편집",
           "68bbcd864a": "새로운",
           "2ef2b2674b": "{{value0}} 삭제"
@@ -7207,7 +7207,7 @@
           "f61ac77f16": "Git Bash",
           "0f1b8669e6": "명령 프롬프트",
           "eb7fc4d98a": "PowerShell",
-          "27e301f22c": "기본 쉘",
+          "27e301f22c": "기본 셸",
           "09bf02de9a": "새 terminals 패널을 열 때 사용할 셸입니다. 새 terminals에 적용됩니다.",
           "bd68f3170d": "Windows의 새 terminal 패널에 대한 기본 셸을 선택합니다.",
           "a55eee649f": "Windows의 새 terminal 패널에 대한 기본 셸입니다.",
@@ -7329,7 +7329,7 @@
           "7f4063076c": "커서 아래의 텍스트 색상(블록 커서)",
           "a2d9f095a7": "Cursor 텍스트",
           "cd0700762b": "Cursor 색상",
-          "c9e1fdf42f": "Cursor",
+          "c9e1fdf42f": "커서",
           "da64e8f4c1": "Terminal 배경색",
           "cc1b2ffeb2": "배경",
           "026a0b8013": "본문 색상",
@@ -8002,7 +8002,7 @@
             "search": {
               "94f4d013c8": "상태 표시줄",
               "a452146574": "토글 버튼",
-              "6765b85e48": "실행 디렉토리",
+              "6765b85e48": "실행 디렉터리",
               "a38bfc3f77": "퀵 패널",
               "52db6e3baf": "메모",
               "156ffeee08": "메모",
@@ -8153,7 +8153,7 @@
             "7887a2c262": "폴더",
             "7baf524b04": "워크스페이스",
             "d0bc793689": "워크스페이스 폴더가 생성되는 루트 디렉터리입니다.",
-            "4c95d08fa2": "워크스페이스 디렉토리",
+            "4c95d08fa2": "워크스페이스 디렉터리",
             "161a86a9da": "고정된 탭을 닫기 전에 확인",
             "8e593f04fc": "고정된 탭을 닫기 전에 확인 대화상자를 표시합니다.",
             "defaultProjectRuntime": "기본 프로젝트 런타임",
@@ -8613,7 +8613,7 @@
             "c86478c3d8": "Orca에서 이 프로젝트를 제거하세요.",
             "c5266c2c9d": "프로젝트 제거",
             "4b9a18a56d": "모노 repo",
-            "4e2529722c": "디렉토리",
+            "4e2529722c": "디렉터리",
             "1ff4f12c0c": "디렉터리",
             "9f5ae26ccd": "사전 설정",
             "095fca94fe": "사전 설정",
@@ -8994,7 +8994,7 @@
               "6cd20b9e64": "cmd",
               "7c7056940a": "셸",
               "713c4a2f92": "Windows의 새 terminal 패널에 대한 기본 셸을 선택합니다.",
-              "13715f9d23": "기본 쉘"
+              "13715f9d23": "기본 셸"
             }
           }
         },
@@ -9032,7 +9032,7 @@
             "action": {
               "recipe": {
                 "options": {
-                  "commitMessage": "단계적 변경에서 commit 메시지를 생성합니다.",
+                  "commitMessage": "스테이징된 변경 사항에서 commit 메시지를 생성합니다.",
                   "pullRequest": "호스팅된 리뷰 제목 및 설명을 생성합니다.",
                   "branchName": "초기 agent 작업에서 Orca가 생성한 브랜치의 이름을 바꿉니다.",
                   "fixCommitFailure": "commit 후크 또는 git commit이 실패하면 agent를 시작합니다.",
@@ -9421,7 +9421,7 @@
           "notificationPlaygroundDescription": "토스트 레이아웃, 복구 액션, 긴 텍스트 줄바꿈을 확인하기 위한 개발 전용 트리거입니다.",
           "devOnly": "Dev only",
           "orcaCloud": "Orca Cloud",
-          "orcaCloudDescription": "1方클라우드 로그인의 개발자 전용 미리보기. 프로덕션에서는 숨겨집니다. 개발 환경에서는 ORCA_CLOUD_API_URL과 ORCA_CLOUD_CLIENT_ID가 설정되면 사이드바 계정 전환기에도 표시됩니다.",
+          "orcaCloudDescription": "자사 클라우드 로그인의 개발자 전용 미리보기. 프로덕션에서는 숨겨집니다. 개발 환경에서는 ORCA_CLOUD_API_URL과 ORCA_CLOUD_CLIENT_ID가 설정되면 사이드바 계정 전환기에도 표시됩니다.",
           "orcaCloudStatus": "상태",
           "orcaCloudSignOut": "로그아웃",
           "orcaCloudConnect": "프로필 연결",
@@ -9471,14 +9471,14 @@
           "loadError": "레시피를 로드할 수 없습니다.",
           "copyError": "프롬프트를 복사할 수 없습니다.",
           "skillDescription": "repo 소유 환경 레시피를 설정, 빌드, 인증 및 검증합니다.",
-          "whatTitle": "당신과 함께 기술이 하는 일",
+          "whatTitle": "이 스킬로 함께 하는 작업",
           "whatScaffold": "Orca 서버 또는 SSH를 통해 연결된 공급자를 위한 레시피 및 스크립트를 작성합니다.",
           "whatBuild": "재사용 가능한 기본 이미지를 구축하고 agent에 로그인합니다.",
           "whatValidate": "워크스페이스를 생성할 수 있도록 유효성을 검사합니다.",
           "promptHint": "어떤 워크스페이스에서든 agent에게 다음과 같이 질문하세요.",
           "copy": "복사",
           "copied": "복사됨",
-          "recipes": "조리법",
+          "recipes": "레시피",
           "recipesHelp": "orca.yaml과 활성화된 플러그인의 레시피가 여기에 표시되어 워크스페이스를 시작할 수 있습니다.",
           "checking": "레시피 확인 중...",
           "none": "아직 레시피를 찾을 수 없습니다.",
@@ -9679,6 +9679,10 @@
           "unpackedHelp": "개발 빌드는 소스 체크아웃에서 업데이트해야 합니다.",
           "legacyHelp": "원격 업데이트를 활성화하려면 이 서버를 수동으로 한 번 업데이트하세요."
         },
+        "BrowserLinkRoutingSetting": {
+          "description": "터미널, Markdown, 편집기의 http(s) 링크를 Orca 내장 브라우저에서 엽니다. {{shortcut}}을(를) 누르면 항상 시스템 브라우저를 사용합니다.",
+          "descriptionBase": "터미널, Markdown, 편집기의 http(s) 링크를 Orca 내장 브라우저에서 엽니다."
+        },
         "BrowserLinkRoutingModifierSetting": {
           "titleSystem": "Hold Shift to open in your web browser",
           "titleOrca": "Hold Shift to open in Orca",
@@ -10402,7 +10406,7 @@
             "c07b236287": "변경사항을 보려면 워크스페이스를 선택하세요.",
             "dc5a6465fc": "{{value0}}(예: {{value1}}{{value2}})",
             "8eb3782a0c": "{{value0}} 파일{{value1}}을(를) 삭제하지 못했습니다.",
-            "a5e5a11090": "모두 삭제 실패 - 삭제하기 전에 파일을 스테이지 해제할 수 없습니다.",
+            "a5e5a11090": "모든 변경 사항 취소 실패 — 취소 전에 파일의 스테이징을 해제하지 못했습니다.",
             "8a5ba6a988": "commit 차이점을 로드하지 못했습니다.",
             "fe5bd1a610": "{{value0}} 생성 중...",
             "812cb992ee": "{{value0}}에서 열기",
@@ -10420,7 +10424,7 @@
             "d62bc0c7d8": "추적되지 않은",
             "ab31221779": "언스테이지 폴더",
             "bfe9011a0e": "스테이지 폴더",
-            "6d7f2a47e5": "폴더 삭제",
+            "6d7f2a47e5": "폴더의 변경 사항 취소",
             "9b367363b6": "추적되지 않은 폴더 삭제",
             "540ca8f78c": "병합 중단",
             "425f138269": "리베이스 중단",
@@ -10905,7 +10909,7 @@
                   "542bf6a7e2": "기울임",
                   "256300f8ea": "굵게",
                   "87aff03d63": "전송 중...",
-                  "commentTooLarge": "댓글이 너무 커서 안전하게 제출할 수 없습니다."
+                  "commentTooLarge": "댓글이 너무 길어 안전하게 제출할 수 없습니다."
                 }
               }
             }
@@ -10963,7 +10967,7 @@
                   "5ddd8cac7f": "스테이징된 변경 사항을 모두 삭제하시겠습니까?",
                   "1426c2efff": "그러면 이 파일의 모든 변경 사항이 되돌려집니다. 이 작업은 취소할 수 없습니다.",
                   "d4df3a61df": "'{{value0}}' 변경사항을 취소하시겠습니까?",
-                  "40e9357b2a": "이렇게 하면 HEAD에서 파일이 복원되고 삭제 내용이 삭제됩니다. 이 작업은 취소할 수 없습니다.",
+                  "40e9357b2a": "이렇게 하면 HEAD에서 파일을 복원하고 파일 삭제를 취소합니다. 이 작업은 취소할 수 없습니다.",
                   "5c0bdbc4cb": "'{{value0}}'을(를) 복원하시겠습니까?",
                   "d97bf697c9": "이 파일이 영구적으로 삭제됩니다. 이 작업은 취소할 수 없습니다.",
                   "96c772bee9": "'{{value0}}'을 삭제하시겠습니까?"
@@ -11004,7 +11008,7 @@
                   "41d4bcf157": "PR 상태 확인 중…",
                   "acce237921": "commit 할 것이 없습니다. 브랜치에 게시할 변경 사항이 없습니다.",
                   "fa3bd4f40c": "commit 할 파일을 하나 이상 스테이지하세요",
-                  "5a477d80cb": "모든 변경 사항을 준비합니다.",
+                  "5a477d80cb": "모든 변경 사항 스테이징",
                   "18a0fca877": "모두 스테이지",
                   "f01f16d77f": "commit 하려면 commit 메시지를 입력하세요.",
                   "ab41fb926b": "스테이지된 변경 사항 Commit",
@@ -11285,7 +11289,7 @@
                 "fastForwardOnly": "fast-forward만 허용",
                 "fastForwardOnlyDescription": "병합이나 리베이스가 필요 없을 때만 pull합니다.",
                 "title": "Pull 정책 필요",
-                "diverged": "Diverged",
+                "diverged": "분기됨",
                 "body": "이 브랜치에는 로컬 commits과 원격 commits이 모두 있습니다. 이 워크트리 또는 SSH 호스트에서 명령 하나를 실행한 다음 풀 또는 동기화를 다시 시도하세요.",
                 "copyAria": "{{value0}} pull 정책 명령 복사",
                 "copied": "복사됨",
@@ -11553,7 +11557,7 @@
           "86c0f1caa2": "패딩",
           "06a24f4f2d": "색상",
           "c021e9dddd": "테마 팔레트",
-          "ab2a583a97": "Cursor",
+          "ab2a583a97": "커서",
           "cc1858e19e": "글꼴",
           "248c812283": "가져오기",
           "7ee9234e54": "Ghostty 설정을 찾았습니다.",
@@ -13205,7 +13209,7 @@
             "2b3ce6d394": "취소",
             "e05063cfc1": "라인 {{value0}}",
             "c845170b3b": "라인 {{value0}}-{{value1}}",
-            "commentTooLarge": "댓글이 너무 커서 안전하게 제출할 수 없습니다."
+            "commentTooLarge": "댓글이 너무 길어 안전하게 제출할 수 없습니다."
           },
           "useDiffCommentDecorator": {
             "995fa28b50": "이 메모"
@@ -13290,7 +13294,8 @@
             "4a9568f773": "뒤로",
             "4f86e2a10b": "둘러보기 건너뛰기",
             "d974f32a83": "투어 닫기",
-            "ffa4412b66": "다음"
+            "ffa4412b66": "다음",
+            "complete": "완료"
           },
           "ContextualTourProgressDots": {
             "7734cb8ad3": "중",
@@ -13300,7 +13305,17 @@
             "tour": {
               "overlay": {
                 "measurement": {
-                  "38b3155418": "다음"
+                  "38b3155418": "다음",
+                  "automations": {
+                    "intro": {
+                      "title": "자동화란 무엇인가요?",
+                      "body": "자동화는 일정에 따라 agent 작업을 실행합니다. 이 버튼을 눌러 자동화를 추가하세요."
+                    },
+                    "results": {
+                      "title": "결과 확인",
+                      "body": "실행 내역에서 자동화가 언제 실행되었는지, 어떤 일이 발생했는지, 출력을 어디서 확인할 수 있는지 볼 수 있습니다."
+                    }
+                  }
                 }
               }
             }
@@ -14613,25 +14628,25 @@
   },
   "browser": {
     "loadFailure": {
-      "connectionNotSecure": "Connection isn't secure",
-      "cantReachHost": "Can't reach {{value0}}",
-      "cantLoadPage": "Can't load this page",
-      "certificateNameMismatch": "The certificate doesn't match {{value0}}.",
-      "certificateDateInvalid": "The certificate for {{value0}} isn't valid at the current date and time.",
-      "certificateAuthorityInvalid": "Orca doesn't trust the authority that issued the certificate for {{value0}}.",
-      "certificateVerificationFailed": "Orca couldn't verify the certificate for {{value0}}.",
-      "trustedCertificateGuidance": "For local development, use a trusted local certificate when possible.",
-      "retry": "Retry",
-      "copyAddress": "Copy Address",
-      "addressCopied": "Copied the current page address.",
-      "openExternally": "Open Externally",
-      "tryHttps": "Try HTTPS",
-      "proceedUnsafe": "Proceed Anyway (Unsafe)",
-      "connecting": "Connecting…",
-      "certificateChallengeExpired": "This certificate approval expired. Retry the page to request a new one.",
-      "certificateChallengeChanged": "The certificate request changed. Retry the page and review the new warning.",
-      "certificateChallengeUnavailable": "This certificate request is no longer available. Retry the page to request a new one.",
-      "certificateProceedFailed": "Orca could not approve this certificate request. Retry the page and try again."
+      "connectionNotSecure": "연결이 안전하지 않습니다",
+      "cantReachHost": "{{value0}}에 연결할 수 없습니다",
+      "cantLoadPage": "이 페이지를 불러올 수 없습니다",
+      "certificateNameMismatch": "인증서가 {{value0}}과(와) 일치하지 않습니다.",
+      "certificateDateInvalid": "{{value0}}의 인증서가 현재 날짜와 시간에는 유효하지 않습니다.",
+      "certificateAuthorityInvalid": "Orca는 {{value0}}의 인증서를 발급한 인증 기관을 신뢰하지 않습니다.",
+      "certificateVerificationFailed": "Orca가 {{value0}}의 인증서를 확인하지 못했습니다.",
+      "trustedCertificateGuidance": "로컬 개발에서는 가능하면 신뢰할 수 있는 로컬 인증서를 사용하세요.",
+      "retry": "다시 시도",
+      "copyAddress": "주소 복사",
+      "addressCopied": "현재 페이지 주소를 복사했습니다.",
+      "openExternally": "외부에서 열기",
+      "tryHttps": "HTTPS로 시도",
+      "proceedUnsafe": "계속(안전하지 않음)",
+      "connecting": "연결 중…",
+      "certificateChallengeExpired": "이 인증서 승인이 만료되었습니다. 페이지를 다시 시도해 새로 요청하세요.",
+      "certificateChallengeChanged": "인증서 요청이 변경되었습니다. 페이지를 다시 시도하고 새 경고를 확인하세요.",
+      "certificateChallengeUnavailable": "이 인증서 요청은 더 이상 사용할 수 없습니다. 페이지를 다시 시도해 새로 요청하세요.",
+      "certificateProceedFailed": "Orca가 이 인증서 요청을 승인하지 못했습니다. 페이지를 다시 시도한 후 다시 요청하세요."
     }
   },
   "runtimeRpc": {
diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json
index 7f9907ab1819..2d7abce6580d 100644
--- a/src/renderer/src/i18n/locales/zh.json
+++ b/src/renderer/src/i18n/locales/zh.json
@@ -187,7 +187,7 @@
         "browser": {
           "d175274b6d": "新浏览器选项卡",
           "08fc23631d": "浏览器",
-          "remoteCookieImportUnavailable": "Manual cookie file import is unavailable while a remote runtime is active."
+          "remoteCookieImportUnavailable": "远程运行时激活期间无法手动导入 Cookie 文件。"
         },
         "editor": {
           "dcb521ed29": "该文件处于冲突状态，但没有可编辑的工作树文件。",
@@ -349,7 +349,7 @@
               "8d6eedf97e": "无法在 PATH 中注册 Orca CLI。",
               "0f116999f1": "在安装之前重新启动 shell 或将 Orca CLI 目录添加到 PATH。",
               "15cbedc3e3": "在运行智能体技能设置之前安装 Orca CLI。",
-              "windowsPathUnknown": "Orca could not check your Windows user PATH"
+              "windowsPathUnknown": "Orca 无法检查您的 Windows 用户 PATH"
             }
           }
         }
@@ -613,21 +613,21 @@
       "linear": {
         "usage": {
           "examples": {
-            "readTicket": "Read the linked ticket",
-            "postUpdate": "Post a progress update",
-            "moveState": "Move the ticket forward",
+            "readTicket": "阅读关联的议题",
+            "postUpdate": "发布进度更新",
+            "moveState": "推进议题",
             "attachPr": "附加评审链接",
-            "triageFollowups": "Triage and create follow-ups",
-            "readTicketSummary": "Pull the linked Linear issue's full context before starting work.",
-            "readTicketPrompt": "Use {{value0}} to read the linked Linear issue for this worktree, then summarize the goal and acceptance criteria before you start.",
-            "postUpdateSummary": "Comment progress or a completion summary back to the Linear issue.",
-            "postUpdatePrompt": "Use {{value0}} to post a completion update on the linked Linear issue with what changed and how it was verified.",
-            "moveStateSummary": "Advance the Linear workflow state as the work progresses.",
-            "moveStatePrompt": "Use {{value0}} to move the linked Linear issue to In Review now that the change is ready.",
+            "triageFollowups": "分类处理并创建跟进项",
+            "readTicketSummary": "开始工作前，获取关联 Linear 议题的完整上下文。",
+            "readTicketPrompt": "使用 {{value0}} 读取此工作树关联的 Linear 议题，然后在开始前总结目标和验收标准。",
+            "postUpdateSummary": "将进度或完成情况总结评论回 Linear 议题。",
+            "postUpdatePrompt": "使用 {{value0}} 在关联的 Linear 议题上发布完成更新，说明变更内容及验证方式。",
+            "moveStateSummary": "随着工作进展推进 Linear 工作流状态。",
+            "moveStatePrompt": "变更已就绪后，使用 {{value0}} 将关联的 Linear 议题移至 In Review。",
             "attachPrSummary": "创建拉取或合并请求时，将其关联到 Linear 议题。",
             "attachPrPrompt": "使用 {{value0}} 将此拉取或合并请求附加到关联的 Linear 议题。",
-            "triageFollowupsSummary": "Set assignee, priority, or estimate, and file parented follow-up tickets.",
-            "triageFollowupsPrompt": "Use {{value0}} to triage the linked Linear issue — set priority and estimate — and create a parented follow-up ticket for the deferred cleanup."
+            "triageFollowupsSummary": "设置负责人、优先级或预估工时，并创建带父级关联的后续议题。",
+            "triageFollowupsPrompt": "使用 {{value0}} 对关联的 Linear 议题进行分类处理 — 设置优先级和预估工时 — 并为延后清理创建带父级关联的后续议题。"
           }
         }
       },
@@ -643,8 +643,8 @@
         "cookie": {
           "import": {
             "toast": {
-              "restartFallbackUnavailableNone": "None of the {{value0}} cookies could be loaded, and the restart fallback was unavailable. The previous cookies for this profile were replaced. Try the import again.",
-              "restartFallbackUnavailablePartial": "Imported {{value0}} of {{value1}} cookies. The rest could not be loaded, and the restart fallback was unavailable. Try the import again."
+              "restartFallbackUnavailableNone": "{{value0}} 个 Cookie 均无法加载，且重启回退不可用。此配置文件的旧 Cookie 已被替换。请重试导入。",
+              "restartFallbackUnavailablePartial": "已导入 {{value1}} 个 Cookie 中的 {{value0}} 个。其余无法加载，且重启回退不可用。请重试导入。"
             }
           }
         }
@@ -655,14 +655,14 @@
       "feedback": {
         "image": {
           "attachments": {
-            "fallbackName": "Image attachment",
-            "unsupportedType": "{{fileName}} is not a supported image type.",
-            "empty": "{{fileName}} is empty.",
-            "tooLarge": "{{fileName}} is larger than {{maxSize}}.",
-            "tooMany": "You can attach up to {{maxCount}} images.",
-            "dimensionsTooLarge": "{{fileName}} has dimensions that are too large to preview safely.",
-            "invalidImage": "{{fileName}} is not a valid supported image.",
-            "additionalErrors": "{{count}} additional images could not be attached."
+            "fallbackName": "图片附件",
+            "unsupportedType": "{{fileName}} 不是受支持的图片类型。",
+            "empty": "{{fileName}} 为空。",
+            "tooLarge": "{{fileName}} 大于 {{maxSize}}。",
+            "tooMany": "最多可附加 {{maxCount}} 张图片。",
+            "dimensionsTooLarge": "{{fileName}} 的尺寸过大，无法安全预览。",
+            "invalidImage": "{{fileName}} 不是有效的受支持图片。",
+            "additionalErrors": "还有 {{count}} 张图片无法附加。"
           }
         }
       }
@@ -694,7 +694,7 @@
         "nativeDropTooManyPaths": "拖放包含过多文件。",
         "nativeDropPathsTooLargeDescription": "请减少文件数量或使用更短的路径列表。",
         "nativeDropPathsTooLarge": "拖放的路径列表过大。",
-        "ownerChanged": "Couldn't verify which host owns this workspace. Try again after it reconnects."
+        "ownerChanged": "无法确认哪个主机拥有此工作区。请在它重新连接后重试。"
       },
       "useIpcEvents": {
         "0e3cf53060": "未找到浏览器选项卡 {{value0}}",
@@ -713,10 +713,10 @@
         "2ec42e1c52": "还没有远程工作区",
         "88214a785b": "工作区同步等待本地会话恢复(hydration)并超时",
         "4f78ba5885": "工作区已同步",
-        "ef223fbb6b": "A device tried to connect but is not paired",
-        "11992d0337": "If this was your phone or another Orca client, re-pair it from Settings → Mobile.",
-        "6573cfe955": "Open Mobile Settings",
-        "unresolvedTerminalWorktreeOwner": "Terminal creation is unavailable because the worktree owner could not be resolved"
+        "ef223fbb6b": "有设备尝试连接但未配对",
+        "11992d0337": "如果这是您的手机或其他 Orca 客户端，请从设置 → 移动端重新配对。",
+        "6573cfe955": "打开移动端设置",
+        "unresolvedTerminalWorktreeOwner": "由于无法解析工作树所有者，终端创建不可用"
       },
       "useSettingsNavigationMetadata": {
         "4a728cd56b": "仍在完善中的新功能。尝试一下。",
@@ -859,7 +859,7 @@
         "c6f37a563d": "+ 负责人",
         "f41ec96c13": "+ 标签",
         "ab050dffec": "已关闭",
-        "dc1ca081a8": "进行中",
+        "dc1ca081a8": "开放",
         "2e4d806c92": "工作区",
         "886a64b081": "还没有",
         "4ba0132f37": "编辑标签",
@@ -1311,15 +1311,15 @@
         "perWorkspaceEnvHint": "通过环境模板按需创建环境",
         "branchName": "分支名称",
         "branchNamePlaceholder": "feature/my-branch",
-        "connectTimedOut": "Connection timed out. It may still be connecting in the background.",
+        "connectTimedOut": "连接超时，可能仍在后台连接中。",
         "connectingHost": "Connecting…",
         "connectHost": "Connect",
         "addHost": "Add host",
-        "addHostHint": "Register another machine or Orca server",
-        "addSshHost": "Add SSH host",
-        "addSshHostHint": "Use an existing machine over SSH",
-        "addRemoteOrcaServer": "Add Remote Orca Server",
-        "addRemoteOrcaServerHint": "Pair another Orca runtime",
+        "addHostHint": "注册另一台机器或 Orca 服务器",
+        "addSshHost": "添加 SSH 主机",
+        "addSshHostHint": "通过 SSH 使用现有机器",
+        "addRemoteOrcaServer": "添加远程 Orca 服务器",
+        "addRemoteOrcaServerHint": "配对另一个 Orca 运行时",
         "hostConnectionFailed": "Connection failed"
       },
       "NewWorkspaceComposerModal": {
@@ -1357,7 +1357,7 @@
         "14c9fc70ed": "+ 负责人",
         "bc215fea4d": "+ 标签",
         "b936cc51a4": "已关闭",
-        "7b8f6bf6d8": "进行中",
+        "7b8f6bf6d8": "开放",
         "a18d01cda3": "尚未报告任何 CI 检查",
         "3912daf310": "此PR尚未报告检查。",
         "45877f5089": "未找到检查",
@@ -1495,7 +1495,7 @@
         "checkActionRequiredHint": "此检查需要在 GitHub 上执行手动操作（例如，批准工作流运行），然后才能解除合并阻止。",
         "dd5d9a4f17": "{{value0}}更新",
         "71a3c0f9d2": "启动工作区",
-        "filesUnavailable": "Couldn't load changed files.",
+        "filesUnavailable": "无法加载变更的文件。",
         "filesRetry": "Retry"
       },
       "QuickOpen": {
@@ -1517,7 +1517,7 @@
         "b227d88520": "找到 {{value0}} 文件",
         "995be8ea22": "复制",
         "cf144856dc": "已复制",
-        "344f8a48dd": "on the host running the Quick Open scan to enable fast, gitignore-aware listing:"
+        "344f8a48dd": "在运行 Quick Open 扫描的主机上启用快速、遵循 gitignore 的文件列表："
       },
       "SelectedTextCopyMenu": {
         "9b40d7b018": "复制"
@@ -1544,7 +1544,7 @@
         "2abe22ef76": "您的token通过操作系统钥匙串加密并存储在本地。",
         "246c2b3dd3": "Atlassian 账户设置",
         "59c14d34a2": "创建一个token",
-        "b95623e93f": "Atlassian API token",
+        "b95623e93f": "Atlassian API 令牌",
         "68df347677": "你@example.com",
         "163df31e0e": "https://example.atlassian.net",
         "33fc2bcb30": "使用 Jira Cloud 站点 URL、Atlassian 电子邮件和 API token来浏览议题。",
@@ -1853,10 +1853,10 @@
         "jiraSortDescending": "降序",
         "jiraSortBy": "排序方式",
         "jiraToggleSortDirection": "按{{value0}}排序",
-        "75a38d7df8": "GitHub data is temporarily unavailable. Its API may be down, rate-limited, or unreachable. Please try again shortly.",
-        "noGithubSourceDetected": "No GitHub source detected for",
-        "noGithubSourceDetectedHint": "it may have no GitHub remote, or the source could not be resolved.",
-        "jiraLinkSourceUnavailable": "Couldn’t link this Jira issue. Reconnect Jira or pick the matching site, then try again.",
+        "75a38d7df8": "GitHub 数据暂时不可用，其 API 可能已宕机、被限流或无法访问。请稍后重试。",
+        "noGithubSourceDetected": "未检测到 GitHub 来源：",
+        "noGithubSourceDetectedHint": "它可能没有 GitHub 远程仓库，或来源无法解析。",
+        "jiraLinkSourceUnavailable": "无法关联此 Jira 议题。请重新连接 Jira 或选择匹配的站点，然后重试。",
         "loadPageUnreachable": "第 {{value0}} 页超出了 GitHub 搜索可返回的范围。",
         "loadPageFailed": "无法从 GitHub 加载第 {{value0}} 页。",
         "loadPageNoMoreResults": "第 {{value0}} 页没有更多结果。"
@@ -2501,7 +2501,7 @@
             "error": "工作区清理失败",
             "skippedAncestor": "由于无法删除嵌套工作区，已跳过。",
             "timedOut": "删除 {{value0}} 的时间比预期长。它将在后台继续运行。",
-            "stillRemoving": "Still removing workspaces: {{value0}}",
+            "stillRemoving": "仍在移除工作区：{{value0}}",
             "skippedPendingAncestor": "已跳过，因为嵌套的工作区尚未完成移除。"
           },
           "candidateRow": {
@@ -2799,7 +2799,7 @@
                     "pane": {
                       "id": {
                         "copy": {
-                          "failed": "Unable to copy pane ID"
+                          "failed": "无法复制窗格 ID"
                         }
                       }
                     }
@@ -3381,10 +3381,10 @@
             "c06c1d215d": "由于网络请求失败，无法刷新 Claude 用量。",
             "cabdc2a9e0": "无法读取 Claude 登录凭据。",
             "a7517cccb6": "Claude 用量目前不可用。",
-            "e2c6a4f917": "Run Grok to refresh",
-            "d1b7f509ac": "Run grok in a terminal on the computer running Orca and wait for it to start. If prompted, complete sign-in, then retry usage. You do not need to send a chat message.",
-            "f90b3d7a16": "Run Kimi to refresh",
-            "a37e8c15d4": "Run kimi in a terminal on the computer running Orca and wait for it to start, then retry usage."
+            "e2c6a4f917": "运行 Grok 以刷新",
+            "d1b7f509ac": "在运行 Orca 的电脑上的终端中运行 grok，并等待其启动。如有提示，请完成登录，然后重试用量检查。您无需发送聊天消息。",
+            "f90b3d7a16": "运行 Kimi 以刷新",
+            "a37e8c15d4": "在运行 Orca 的电脑上的终端中运行 kimi，等待其启动，然后重试用量检查。"
           },
           "SshTargetStatusRow": {
             "sshHost": "SSH 主机"
@@ -3394,8 +3394,8 @@
             "remaining": "剩余 {{value0}}%"
           },
           "UsagePercentageDisplayChangeNotice": {
-            "title": "Usage now shows % used",
-            "body": "Prefer remaining? Change it in Settings.",
+            "title": "用量现在显示已用百分比",
+            "body": "更喜欢剩余额度？请在设置中更改。",
             "dismiss": "Dismiss",
             "openSettings": "Open Settings",
             "gotIt": "Got it"
@@ -3417,12 +3417,12 @@
           },
           "RemoteServerUpdateStatusSegment": {
             "updating": "Updating {{value0}}/{{value1}}",
-            "updatingTooltip": "Remote Orca Server updates are in progress",
-            "failed": "{{value0}} server updates failed",
-            "failedTooltip": "Open Remote Orca Server updates to review and retry",
+            "updatingTooltip": "远程 Orca 服务器更新正在进行中",
+            "failed": "{{value0}} 个服务器更新失败",
+            "failedTooltip": "打开远程 Orca 服务器更新以查看并重试",
             "updated": "{{value0}} servers updated",
-            "updatedTooltip": "Remote Orca Server updates completed",
-            "failedOne": "1 server update failed",
+            "updatedTooltip": "远程 Orca 服务器更新已完成",
+            "failedOne": "1 个服务器更新失败",
             "updatedOne": "1 server updated"
           },
           "resource": {
@@ -3437,17 +3437,17 @@
             "runningLabel": "Updating skills",
             "runningOne": "Updating {{value0}}…",
             "runningMany": "Updating {{value0}} skills…",
-            "runningAria": "Skills updating. Click to open details.",
+            "runningAria": "技能正在更新。点击查看详情。",
             "successLabel": "Skills updated",
             "successOne": "Updated {{value0}}",
             "successMany": "Updated {{value0}} skills",
-            "successAria": "Skills updated. Click to open details.",
+            "successAria": "技能已更新。点击查看详情。",
             "errorLabel": "Update failed",
-            "errorTooltip": "Skill update failed — click to see details",
-            "errorAria": "Skill update failed. Click to open details.",
+            "errorTooltip": "技能更新失败 — 点击查看详情",
+            "errorAria": "技能更新失败。点击查看详情。",
             "stoppingLabel": "Stopping update",
-            "stoppingTooltip": "Stopping the skill update…",
-            "stoppingAria": "Stopping the skill update. Click to open details."
+            "stoppingTooltip": "正在停止技能更新…",
+            "stoppingAria": "正在停止技能更新。点击查看详情。"
           }
         }
       },
@@ -3841,18 +3841,18 @@
           "tipReadOnly": "这里的技能位于只读位置，需更改其权限后才能更新。",
           "tipInRepo": "这里的技能位于某个项目内，而非全局技能；Orca 只更新全局技能。",
           "tipPluginCache": "这里的技能由插件管理；请改为更新插件。",
-          "skippedReasonUnrecognized": "The copy here doesn’t match the official version — it may be modified, or a different skill with the same name. Orca left it out of the update so it won’t overwrite it. Remove it if you want Orca to update this skill.",
-          "skippedReasonReadOnly": "This copy is in a read-only location, so Orca left it out of the update. Change its permissions to let Orca update it.",
-          "skippedReasonInaccessible": "Orca couldn’t read this copy, so it left the skill out of the update.",
-          "skippedReasonInRepo": "This is a project skill, not a global one — Orca only updates your global skills, so it left this out of the update.",
-          "skippedReasonPluginCache": "A plugin manages this skill, so Orca left it out of the update — update the plugin instead.",
-          "skippedReasonExternalLink": "This copy is a shortcut pointing outside Orca’s skill folders, so Orca left it out of the update.",
-          "skippedReasonBrokenLink": "This copy is a shortcut to something that no longer exists, so Orca left it out — you can safely delete it.",
-          "skippedReasonDuplicate": "This is a separate copy, so the update won’t reach it — the command only refreshes the main copy. Remove this copy, then reinstall the skill so this location follows the main one.",
-          "skippedReasonNewer": "This copy is a later version than the one this build of Orca ships, so Orca left it alone rather than roll it back. Updating Orca will bring the two back in line.",
-          "skippedReasonStaleRecord": "The skills updater has no usable record of this copy, so it reports the skill as already up to date and changes nothing. Reinstall it to bring the record back in line: {{value0}}",
+          "skippedReasonUnrecognized": "此处的副本与官方版本不一致 — 它可能被修改过，或是同名但内容不同的技能。Orca 将其排除在更新之外，以免覆盖它。如果您希望 Orca 更新此技能，请删除它。",
+          "skippedReasonReadOnly": "此副本位于只读位置，因此 Orca 未将其纳入更新。请更改其权限，让 Orca 更新它。",
+          "skippedReasonInaccessible": "Orca 无法读取此副本，因此未将该技能纳入更新。",
+          "skippedReasonInRepo": "这是项目技能而非全局技能 — Orca 只更新您的全局技能，因此将其排除在更新之外。",
+          "skippedReasonPluginCache": "此技能由插件管理，因此 Orca 未将其纳入更新 — 请改为更新插件。",
+          "skippedReasonExternalLink": "此副本是指向 Orca 技能文件夹之外的快捷方式，因此 Orca 未将其纳入更新。",
+          "skippedReasonBrokenLink": "此副本是指向已不存在内容的快捷方式，因此 Orca 将其排除 — 您可以放心删除。",
+          "skippedReasonDuplicate": "这是独立的副本，因此更新不会触及它 — 该命令只刷新主副本。请删除此副本并重新安装技能，使此位置跟随主副本。",
+          "skippedReasonNewer": "此副本的版本比当前 Orca 版本内置的更新，因此 Orca 未动它，以免回退。更新 Orca 后两者将恢复一致。",
+          "skippedReasonStaleRecord": "技能更新器没有此副本的有效记录，因此它报告技能已是最新且不做任何更改。请重新安装，使记录恢复一致：{{value0}}",
           "chipNewer": "Newer",
-          "tipNewer": "This copy is a later version than the one this build of Orca ships."
+          "tipNewer": "此副本的版本比当前 Orca 版本内置的更新。"
         },
         "SkillFreshnessUpdateDialog": {
           "title": "更新技能",
@@ -3864,16 +3864,16 @@
           "attention": "部分已安装的 Orca 技能无法自动更新。",
           "checkNow": "立即检查",
           "close": "关闭",
-          "blockedOne": "1 skill can't be updated automatically.",
-          "blockedMany": "{{value0}} skills can't be updated automatically.",
+          "blockedOne": "有 1 个技能无法自动更新。",
+          "blockedMany": "有 {{value0}} 个技能无法自动更新。",
           "runningOne": "Updating 1 skill…",
           "runningMany": "Updating {{value0}} skills…",
-          "runningDescription": "You can close this window — it keeps running in the background.",
+          "runningDescription": "您可以关闭此窗口 — 更新会在后台继续运行。",
           "progressAria": "Updating skills",
           "updatedOne": "Updated 1 skill",
           "updatedMany": "Updated {{value0}} skills",
-          "updatedPartial": "Updated {{value0}} of {{value1}} skills",
-          "errorTitle": "The update didn't finish",
+          "updatedPartial": "已更新 {{value1}} 个技能中的 {{value0}} 个",
+          "errorTitle": "更新未完成",
           "retry": "Retry",
           "copyCommand": "Copy command",
           "copied": "Copied",
@@ -3884,7 +3884,7 @@
           "done": "Done",
           "stop": "Stop",
           "stopping": "Stopping…",
-          "stoppingHeadline": "Stopping the update…",
+          "stoppingHeadline": "正在停止更新…",
           "scanIncomplete": "Orca 无法完成对插件管理技能的检查。",
           "scanDepthLimit": "在检查此文件夹之前，Orca 已达到插件扫描深度上限。",
           "scanEntryLimit": "在检查此缓存的其余内容之前，Orca 已达到插件扫描条目数上限。",
@@ -3903,7 +3903,7 @@
           "needsAttention": "Review skill"
         },
         "SkillUpdateResultRows": {
-          "stillOutdated": "Still out of date after the update ran."
+          "stillOutdated": "更新运行后仍为过期状态。"
         },
         "SkillUpdateRow": {
           "oneLocation": "1 location",
@@ -4200,9 +4200,9 @@
           "a2fd890d9e": "请在提交前输入反馈。",
           "f2e42e1307": "发送",
           "69969ba364": "正在发送...",
-          "imageReadFailed": "Could not read the attached images. Try attaching them again.",
-          "attachWhileSending": "Wait for the current feedback to finish sending before attaching more images.",
-          "imagesNotDelivered": "Feedback sent, but image delivery could not be confirmed."
+          "imageReadFailed": "无法读取附加的图片。请重新附加。",
+          "attachWhileSending": "请等待当前反馈发送完成，再附加更多图片。",
+          "imagesNotDelivered": "反馈已发送，但无法确认图片已送达。"
         },
         "SidebarFilter": {
           "e3b3898218": "添加项目",
@@ -4235,7 +4235,7 @@
         "SidebarNav": {
           "80611a8b10": "搜索",
           "0c3395fd32": "搜索工作树和浏览器选项卡",
-          "c86d83b5c3": "新建",
+          "c86d83b5c3": "新功能",
           "1b5c41caee": "Orca 手机端",
           "9c95e1ce91": "智能体",
           "f323383e9a": "自动化",
@@ -4471,10 +4471,10 @@
           "issueLinkLabel": "议题链接",
           "reviewLinkLabel": "{{value0}} 链接",
           "cliHeader": "Orca CLI",
-          "cliCreatedFromAgent": "Created by an agent via `orca worktree create`",
-          "cliCreatedFromShell": "Created via `orca worktree create`",
+          "cliCreatedFromAgent": "由智能体通过 `orca worktree create` 创建",
+          "cliCreatedFromShell": "通过 `orca worktree create` 创建",
           "cliStartupAgent": "Started with {{value0}}",
-          "cliCreated": "Created by Orca CLI",
+          "cliCreated": "由 Orca CLI 创建",
           "jiraIssue": "Jira {{value0}}",
           "viewOnJira": "在 Jira 中查看",
           "linkedJira": "已关联 Jira {{value0}}"
@@ -4605,20 +4605,20 @@
           "3ec372b664": "文件管理器",
           "localOnly": "Local only",
           "remoteSsh": "Remote SSH",
-          "remoteRuntimeUnsupported": "Opening this path in a local app is not available.",
-          "remoteRuntimeUnsupportedDetail": "Switch to a local or SSH workspace, then try again.",
-          "sshTargetNotFound": "SSH host is no longer available.",
-          "sshTargetNotFoundDetail": "Refresh workspaces or reconnect the host, then try again.",
-          "sshTargetInvalid": "SSH host configuration is incomplete.",
-          "sshTargetInvalidDetail": "Edit or reconnect the SSH host, then try again.",
-          "sshAliasRequired": "VS Code needs an SSH config alias for this host.",
-          "sshAliasRequiredDetail": "Add a Host alias for {{host}}:{{port}} to your local SSH config, reconnect the workspace, then try again.",
-          "remoteEditorUnsupported": "This app cannot open SSH workspaces.",
-          "remoteEditorUnsupportedDetail": "Choose VS Code or use the app locally.",
-          "remotePathInvalid": "Path is not valid for the SSH host.",
-          "remotePathInvalidDetail": "Refresh the workspace before trying again.",
-          "remoteLaunchFailed": "Could not open the path in VS Code.",
-          "remoteLaunchFailedDetail": "Check the VS Code command configured on this machine."
+          "remoteRuntimeUnsupported": "无法在本地应用中打开此路径。",
+          "remoteRuntimeUnsupportedDetail": "请切换到本地或 SSH 工作区，然后重试。",
+          "sshTargetNotFound": "SSH 主机已不可用。",
+          "sshTargetNotFoundDetail": "请刷新工作区或重新连接主机，然后重试。",
+          "sshTargetInvalid": "SSH 主机配置不完整。",
+          "sshTargetInvalidDetail": "请编辑或重新连接 SSH 主机，然后重试。",
+          "sshAliasRequired": "VS Code 需要此主机的 SSH 配置别名。",
+          "sshAliasRequiredDetail": "请在本地 SSH 配置中为 {{host}}:{{port}} 添加 Host 别名，重新连接工作区，然后重试。",
+          "remoteEditorUnsupported": "此应用无法打开 SSH 工作区。",
+          "remoteEditorUnsupportedDetail": "请选择 VS Code 或在本地使用该应用。",
+          "remotePathInvalid": "路径对此 SSH 主机无效。",
+          "remotePathInvalidDetail": "请先刷新工作区，再重试。",
+          "remoteLaunchFailed": "无法在 VS Code 中打开此路径。",
+          "remoteLaunchFailedDetail": "请检查此机器上配置的 VS Code 命令。"
         },
         "WorktreeTitleInlineRename": {
           "2f42ae024f": "未读：",
@@ -4716,12 +4716,12 @@
               "c460fecc4a": "无法睡眠某些工作区",
               "8bc3fc0671": "无法睡眠工作区",
               "legacy": {
-                "unverified": "The older host runtime could not confirm terminal shutdown. The workspace was kept open; update the host and try again."
+                "unverified": "旧版主机运行时无法确认终端已关闭。工作区已保持打开；请更新主机后重试。"
               },
               "host": {
-                "unverified": "The host could not confirm terminal shutdown. The workspace was kept open; check the connection and try again."
+                "unverified": "主机无法确认终端已关闭。工作区已保持打开；请检查连接后重试。"
               },
-              "retry": "The workspace was kept open. Try again; if the problem continues, check the host connection."
+              "retry": "工作区已保持打开。请重试；如果问题仍然存在，请检查主机连接。"
             }
           }
         },
@@ -4766,12 +4766,12 @@
             "1a9383112b": "Conductor 进度",
             "caebe3c10f": "Conductor 评审",
             "895f381714": "Conductor 完成",
-            "caabd5ca85": "锌",
+            "caabd5ca85": "锌灰",
             "7adb43ecf0": "玫瑰",
             "ddf25b6262": "翡翠",
             "7cebab6d4a": "琥珀",
             "1b81da243a": "紫罗兰",
-            "6437a8c253": "天空",
+            "6437a8c253": "天蓝",
             "fc3b92756c": "蓝色",
             "52e3c6e2a4": "中性"
           }
@@ -5056,7 +5056,7 @@
           "parkTerminal": "Park terminal"
         },
         "SidebarFeedbackImageAttachments": {
-          "screenshotsHint": "Attach up to {count} screenshots",
+          "screenshotsHint": "最多附加 {count} 张截图",
           "attachImages": "Attach",
           "removeImage": "Remove {{fileName}}"
         },
@@ -5242,9 +5242,9 @@
           "remoteEmptyCodexAccounts": "{{value0}} 上没有受管理的 Codex 账户。它使用其系统默认的 Codex 登录；请在该服务器上添加账户。",
           "codexSystemDefaultCustomProvider": "自定义提供商 — 不跟踪使用情况。",
           "codexSystemDefaultNeedsSignIn": "未找到 {{value0}} 的 Codex 登录信息。",
-          "codexConfigSyncMissingSource": "Codex is still using the settings it last synced because {{value0}} is missing. Restore that file to resume syncing.",
-          "codexConfigSyncBlankSource": "Codex is still using the settings it last synced because {{value0}} is empty. That is expected while a synced folder finishes downloading.",
-          "codexConfigSyncUnreadableSource": "Codex is still using the settings it last synced because {{value0}} could not be read. Check that file's permissions."
+          "codexConfigSyncMissingSource": "由于缺少 {{value0}}，Codex 仍在使用上次同步的设置。请恢复该文件以恢复同步。",
+          "codexConfigSyncBlankSource": "由于 {{value0}} 为空，Codex 仍在使用上次同步的设置。同步文件夹完成下载前出现这种情况是正常的。",
+          "codexConfigSyncUnreadableSource": "由于无法读取 {{value0}}，Codex 仍在使用上次同步的设置。请检查该文件的权限。"
         },
         "AdvancedPane": {
           "40b29e0bf3": "重新启动",
@@ -5331,8 +5331,8 @@
           "codexSessionSourceInfo": "关于导入 Codex 历史记录",
           "codexSessionSourceTooltip": "Orca 在隔离的主目录中运行 Codex。将此项指向您现有的 Codex 主目录以导入会话历史记录。留空则使用 ~/.codex。",
           "03e1a5081a": "on {{value0}}",
-          "25a41a9aad": "Re-detect agents installed on the active server",
-          "remoteDetectionFailed": "Couldn’t detect installed agents. Check the host connection and try again.",
+          "25a41a9aad": "重新检测活动服务器上安装的智能体",
+          "remoteDetectionFailed": "无法检测已安装的智能体。请检查主机连接后重试。",
           "retryDetection": "Retry"
         },
         "AppIconSelector": {
@@ -5606,7 +5606,7 @@
           "f00d6aa9b5": "WSL 在此计算机上不可用。",
           "7c776ff9d8": "wsl",
           "fc0fcf72fd": "在技​​能设置之前注册 WSL shell 命令。",
-          "windowsPathUnknown": "WSL shell command PATH could not be checked"
+          "windowsPathUnknown": "无法检查 WSL shell 命令 PATH"
         },
         "CommitMessageAiPane": {
           "841ed9884a": "由未自定义源代码控制 AI 的存储库使用。",
@@ -5804,7 +5804,7 @@
           "4aa4d9fb73": "在差异编辑器中换行显示长行，而不是要求水平滚动。",
           "bf16ef0af2": "关闭",
           "3f6892f307": "开启",
-          "b82f86d7d2": "Rich Markdown Spellcheck",
+          "b82f86d7d2": "Markdown 拼写检查（富文本）",
           "5195f0b9ef": "在编辑富 Markdown 时显示浏览器拼写下划线和建议。",
           "7ddd66fede": "编辑器自动换行",
           "9b18de6eea": "在文件编辑器中自动换行长行，而无需水平滚动。"
@@ -6097,7 +6097,7 @@
         },
         "McpConfigFileRow": {
           "b145eb6009": "环境：",
-          "e720c139cd": "开放",
+          "e720c139cd": "打开",
           "845ae248e8": "有效的"
         },
         "McpConfigSection": {
@@ -7349,7 +7349,7 @@
           "cf37ff69f6": "根据",
           "8abdab9f7c": "立即重启",
           "907131d741": "正在重新启动...",
-          "605a35d600": "Not applied by the terminal renderer yet — xterm.js has no bold color slot. A saved value is preserved."
+          "605a35d600": "终端渲染器尚未应用此项 — xterm.js 没有粗体颜色槽位。已保存的值会被保留。"
         },
         "UIZoomControl": {
           "c2c64b24d0": "重置"
@@ -7376,7 +7376,7 @@
           "8f4d2a51d7": "离线",
           "d504ab05f0": "流媒体",
           "fbe5990716": "选择型号",
-          "e24f7d43d2": "选择语音模型。本地模型离线运行；云模型需要 API 密钥。",
+          "e24f7d43d2": "选择语音模型，本地模型离线运行；云模型需要 API 密钥。",
           "174da92062": "抓住",
           "118b3c2dee": "切换",
           "901985625d": "切换",
@@ -8170,12 +8170,12 @@
             "8e593f04fc": "关闭固定标签页前显示确认对话框。",
             "defaultProjectRuntime": "默认项目运行时",
             "defaultProjectRuntimeDescription": "选择本地 Windows 项目继承的运行时。",
-            "d2d2d929c0": "Rich Markdown Spellcheck",
+            "d2d2d929c0": "Markdown 拼写检查（富文本）",
             "4497e2e2bb": "在编辑富 Markdown 时显示浏览器拼写下划线和建议。",
             "e61157e926": "编辑器自动换行",
             "005be5c699": "在文件编辑器中自动换行长行，而无需水平滚动。",
             "editorFontFamily": "编辑器字体",
-            "editorFontFamilyDesc": "文件编辑器和差异视图使用的字体。留空则跟随终端字体。"
+            "editorFontFamilyDesc": "文件编辑器和差异视图使用的字体，留空则跟随终端字体。"
           }
         },
         "git": {
@@ -8308,7 +8308,7 @@
               "d914d7ab70": "正在验证...",
               "5936977fcd": "取消",
               "1666f8d562": "创建 Atlassian API token",
-              "1ab7f551f3": "Atlassian API token",
+              "1ab7f551f3": "Atlassian API 令牌",
               "09d310e42d": "你@example.com",
               "27dae4ab60": "https://example.atlassian.net",
               "a28f417220": "连接 Jira",
@@ -8618,7 +8618,7 @@
             "cfad7ce5f3": "AI",
             "a47f51127e": "源代码控制",
             "6cc5c65e64": "项目特定的 git 生成覆盖。",
-            "eec3995dc6": "Git AI Author",
+            "eec3995dc6": "Git AI 作者",
             "cc876ca5f2": "存储库",
             "6469de5368": "项目",
             "3067595d82": "删除",
@@ -9633,21 +9633,21 @@
           "manageConnectionLink": "集成"
         },
         "MobileRelayBetaNotice": {
-          "notice": "Orca Relay is in beta."
+          "notice": "Orca Relay 目前处于测试阶段。"
         },
         "EditorFontFamilySetting": {
           "title": "编辑器字体",
-          "description": "文件编辑器和差异视图使用的字体。留空则跟随终端字体。",
+          "description": "文件编辑器和差异视图使用的字体，留空则跟随终端字体。",
           "placeholder": "与终端字体相同"
         },
         "GeneralRemoteServerUpdates": {
           "serverCount": "{{value0}} paired servers",
-          "availableCount": "{{value0}} ready to update",
-          "currentCount": "{{value0}} up to date",
+          "availableCount": "{{value0}} 个可更新",
+          "currentCount": "{{value0}} 个已是最新",
           "manualCount": "{{value0}} manual",
           "offlineCount": "{{value0}} offline",
-          "title": "Remote Orca Servers",
-          "description": "Check and update paired Orca servers from this client.",
+          "title": "远程 Orca 服务器",
+          "description": "从此客户端检查和更新已配对的 Orca 服务器。",
           "updating": "Updating servers…",
           "reviewUpdates": "{{value0}} updates available",
           "reviewServers": "Server updates",
@@ -9691,11 +9691,15 @@
           "unpackedHelp": "开发版本必须从其源代码检出进行更新。",
           "legacyHelp": "手动更新此服务器一次以启用远程更新。"
         },
+        "BrowserLinkRoutingSetting": {
+          "description": "在 Orca 内置浏览器中打开来自终端、Markdown 和编辑器的 http(s) 链接。{{shortcut}} 始终使用系统浏览器。",
+          "descriptionBase": "在 Orca 内置浏览器中打开来自终端、Markdown 和编辑器的 http(s) 链接。"
+        },
         "BrowserLinkRoutingModifierSetting": {
-          "titleSystem": "Hold Shift to open in your web browser",
-          "titleOrca": "Hold Shift to open in Orca",
-          "descriptionSystem": "Links open in Orca, so {{chord}}+click sends one to your system browser instead.",
-          "descriptionOrca": "Links open in your system browser. When enabled, {{chord}}+click opens one in Orca's built-in browser instead."
+          "titleSystem": "按住 Shift 在系统浏览器中打开",
+          "titleOrca": "按住 Shift 在 Orca 中打开",
+          "descriptionSystem": "链接在 Orca 中打开，因此 {{chord}}+点击会将其发送到系统浏览器。",
+          "descriptionOrca": "链接在系统浏览器中打开。启用后，{{chord}}+点击会改在 Orca 内置浏览器中打开。"
         },
         "PluginConsentDialog": {
           "workerTrust": "后台工作进程 — 运行自己的进程",
@@ -9732,13 +9736,13 @@
         },
         "PluginConsentProvenance": {
           "official": "Official",
-          "bundled": "Bundled with Orca",
+          "bundled": "随 Orca 捆绑提供",
           "local": "Local folder",
           "community": "Community",
           "source": "Source",
           "sourceLabel": "Source",
           "commit": "Pinned commit",
-          "localCommit": "Local folder — no commit",
+          "localCommit": "本地文件夹 — 无提交",
           "indexCommit": "Index commit"
         },
         "PluginDevelopmentSection": {
@@ -9802,7 +9806,7 @@
         "PluginMarketplaceListingRow": {
           "official": "官方",
           "installed": "已安装",
-          "noDescription": "No description provided.",
+          "noDescription": "未提供描述。",
           "blocked": "已被 Orca 安全列表阻止：{{value0}}",
           "blockedAction": "已阻止",
           "checkUpdate": "检查更新",
@@ -10053,6 +10057,14 @@
           "setupRecipe": "为你的云提供商设置环境模板。",
           "createWorkspace": "创建工作区，并在“运行于”中选择该模板。",
           "openSetup": "设置环境模板"
+        },
+        "VoiceMicrophoneSetting": {
+          "systemDefault": "系统默认",
+          "unavailable": "不可用",
+          "label": "麦克风",
+          "description": "用于语音听写的输入设备，系统默认会跟随操作系统的麦克风设置。",
+          "accessHint": "允许麦克风访问以列出输入设备。",
+          "allowAccess": "允许访问"
         }
       },
       "right": {
@@ -11128,7 +11140,7 @@
             "openSupportedWorkspace": "在恢复会话之前，请先打开一个工作区。",
             "localSessionSshWorkspaceUnsupported": "此会话的历史记录存储在本机上，因此无法在 SSH 工作区中恢复。请改为打开一个本地工作区。",
             "sessionHostMismatchUnsupported": "此会话属于其他主机。请打开同一主机上的工作区以恢复它。",
-            "prepareSessionResumeFailed": "Could not prepare this session for resume."
+            "prepareSessionResumeFailed": "无法为恢复准备此会话。"
           },
           "AiVaultPanelControls": {
             "scanningSessions": "正在扫描会话",
@@ -11330,16 +11342,16 @@
             "refresh": {
               "error": {
                 "copy": {
-                  "580025e7b7": "GitHub is unavailable",
-                  "01c85b5770": "GitHub's API is temporarily unavailable. This panel reloads automatically once it recovers.",
-                  "d1a9f2b165": "Can't reach GitHub",
-                  "7d01d42a3a": "GitHub is unreachable right now. Check your connection, then try again shortly.",
-                  "e9d681894a": "GitHub rate limit reached",
-                  "8c77434d6f": "GitHub is rate-limiting requests. This panel refreshes once the limit resets.",
-                  "79aa06bb2c": "Couldn't refresh. GitHub's API is temporarily unavailable. Showing the last known status.",
-                  "6ec12cee0c": "Couldn't refresh. GitHub is unreachable right now. Showing the last known status.",
-                  "de088015e8": "Couldn't refresh. GitHub is rate-limiting requests. Showing the last known status.",
-                  "d9dd7c6687": "Couldn't refresh from GitHub. Showing the last known status."
+                  "580025e7b7": "GitHub 不可用",
+                  "01c85b5770": "GitHub 的 API 暂时不可用。恢复后此面板会自动重新加载。",
+                  "d1a9f2b165": "无法访问 GitHub",
+                  "7d01d42a3a": "现在无法访问 GitHub。请检查网络连接，稍后重试。",
+                  "e9d681894a": "已达到 GitHub 速率限制",
+                  "8c77434d6f": "GitHub 正在限制请求频率。限制重置后此面板会自动刷新。",
+                  "79aa06bb2c": "刷新失败。GitHub 的 API 暂时不可用。正在显示上次已知状态。",
+                  "6ec12cee0c": "刷新失败。现在无法访问 GitHub。正在显示上次已知状态。",
+                  "de088015e8": "刷新失败。GitHub 正在限制请求频率。正在显示上次已知状态。",
+                  "d9dd7c6687": "无法从 GitHub 刷新。正在显示上次已知状态。"
                 }
               }
             }
@@ -11565,7 +11577,7 @@
           "86c0f1caa2": "内边距",
           "06a24f4f2d": "颜色",
           "c021e9dddd": "主题配色",
-          "ab2a583a97": "Cursor",
+          "ab2a583a97": "光标",
           "cc1858e19e": "字体",
           "248c812283": "导入",
           "7ee9234e54": "已检测 Ghostty 配置。",
@@ -11690,7 +11702,7 @@
             "retryJira": "重试",
             "searchJira": "搜索 Jira 议题或粘贴议题 URL",
             "jiraMode": "Jira",
-            "jiraSelectBindFailed": "Couldn’t link this Jira issue. Pick the matching site or reconnect Jira, then try again.",
+            "jiraSelectBindFailed": "无法关联此 Jira 议题。请选择匹配的站点或重新连接 Jira，然后重试。",
             "emoji": "Emoji"
           },
           "ProjectHostSetupCombobox": {
@@ -13196,7 +13208,7 @@
           "save": {
             "failure": {
               "notice": {
-                "8c59ce5075": "Failed to save the file. Please try again."
+                "8c59ce5075": "保存文件失败。请重试。"
               }
             }
           }
@@ -13911,7 +13923,7 @@
             "79e7aaed39": "取消",
             "fdd26d81cc": "Atlassian 账户设置",
             "8090504a3e": "在此创建 token：",
-            "7b3967c12f": "Atlassian API token",
+            "7b3967c12f": "Atlassian API 令牌",
             "3d81bf3ab3": "API 令牌",
             "e91b9a4073": "you@example.com",
             "2849ddb295": "Atlassian 邮箱",
@@ -13920,7 +13932,7 @@
             "d785c42b8b": "使用 Jira Cloud 站点 URL、Atlassian 邮箱和 API token 来浏览议题。",
             "8388bdea2b": "连接 Jira 站点",
             "2e2b69e48e": "使用自托管 Jira 的基础 URL 和个人访问令牌来浏览议题。",
-            "b67e919bd5": "Jira instance type",
+            "b67e919bd5": "Jira 实例类型",
             "17787d6e4b": "Atlassian Cloud",
             "bc7a831773": "Self-hosted",
             "3489e186d6": "Jira 站点 URL",
@@ -13929,12 +13941,12 @@
             "8b9c7b9e7b": "Jira 个人访问令牌",
             "ccfb086d3e": "在 Jira 个人资料中的 Personal Access Tokens 下创建一个个人访问令牌。",
             "1d947a07ab": "使用自托管 Jira 的基础 URL、用户名和密码来浏览议题。",
-            "f49708c369": "Jira authentication method",
+            "f49708c369": "Jira 身份验证方式",
             "84a810dd0e": "Username & password",
             "8d1223fa5c": "Username",
             "be9eba0a1b": "username",
             "70035652d7": "Password",
-            "c50abbf340": "Jira account password",
+            "c50abbf340": "Jira 账户密码",
             "d8737db691": "使用你的 Jira Server 或 Data Center 账户用户名和密码。"
           }
         }
@@ -14323,12 +14335,12 @@
           "all": "All",
           "installed": "Installed",
           "searchLabel": "Search plugins",
-          "searchPlaceholder": "Search plugins, categories, or publishers"
+          "searchPlaceholder": "搜索插件、分类或发布者"
         }
       },
       "terminalPane": {
         "useManualTerminalWorktreeParking": {
-          "cannotPark": "These terminals cannot be parked safely."
+          "cannotPark": "这些终端无法安全停放。"
         }
       },
       "pr-check-counts": {
@@ -14355,18 +14367,18 @@
     },
     "runtime": {
       "remoteServerUpdateErrors": {
-        "manualRequired": "This server must be updated manually through its service manager.",
-        "notAvailable": "The server no longer reports an available update. Check again.",
-        "notDownloaded": "The server update has not finished downloading.",
-        "legacyServer": "Update this server manually once to enable remote updates.",
-        "updaterTimeout": "Timed out waiting for the server updater.",
-        "requestedVersionUnavailable": "The server updater did not offer the requested Orca version.",
-        "updateUnavailable": "The server did not report an available update.",
-        "downloadIncomplete": "The server update did not finish downloading.",
-        "reconnectTimeout": "The server did not reconnect on the updated version."
+        "manualRequired": "此服务器必须通过其服务管理器手动更新。",
+        "notAvailable": "服务器不再报告有可用更新。请再次检查。",
+        "notDownloaded": "服务器更新尚未下载完成。",
+        "legacyServer": "请手动更新此服务器一次，以启用远程更新。",
+        "updaterTimeout": "等待服务器更新器超时。",
+        "requestedVersionUnavailable": "服务器更新器未提供所请求的 Orca 版本。",
+        "updateUnavailable": "服务器未报告有可用更新。",
+        "downloadIncomplete": "服务器更新未完成下载。",
+        "reconnectTimeout": "服务器未以更新后的版本重新连接。"
       },
       "webRuntimeSession": {
-        "remoteHostDisconnected": "The workspace is not connected to a remote Orca host."
+        "remoteHostDisconnected": "工作区未连接到远程 Orca 主机。"
       },
       "gitlabJobTraceClient": {
         "loadFailed": "加载 GitLab 作业日志失败。",
@@ -14549,11 +14561,11 @@
   "dashboardPopout": {
     "placeholder": {
       "title": "Agent dashboard",
-      "description": "This is where all your agents will show up at a glance. The board is coming soon."
+      "description": "你的所有智能体都会在这里一览无余。看板即将上线。"
     },
     "recoverableError": {
-      "title": "Orca dashboard hit an error.",
-      "description": "The dashboard could not finish rendering. Retry to remount it, or reopen it."
+      "title": "Orca 看板遇到错误。",
+      "description": "看板未能完成渲染。请重试以重新挂载，或重新打开。"
     },
     "bucket": {
       "attention": "Needs You",
@@ -14582,7 +14594,7 @@
       "subagents_other": "{{count}} 个子代理"
     },
     "terminal": {
-      "closed": "No live terminal — this agent's pane has closed.",
+      "closed": "没有活动的终端 — 该智能体的窗格已关闭。",
       "focusWorktree": "Focus worktree",
       "close": "Close"
     },
@@ -14625,40 +14637,40 @@
   },
   "browser": {
     "loadFailure": {
-      "connectionNotSecure": "Connection isn't secure",
-      "cantReachHost": "Can't reach {{value0}}",
-      "cantLoadPage": "Can't load this page",
-      "certificateNameMismatch": "The certificate doesn't match {{value0}}.",
-      "certificateDateInvalid": "The certificate for {{value0}} isn't valid at the current date and time.",
-      "certificateAuthorityInvalid": "Orca doesn't trust the authority that issued the certificate for {{value0}}.",
-      "certificateVerificationFailed": "Orca couldn't verify the certificate for {{value0}}.",
-      "trustedCertificateGuidance": "For local development, use a trusted local certificate when possible.",
-      "retry": "Retry",
-      "copyAddress": "Copy Address",
-      "addressCopied": "Copied the current page address.",
-      "openExternally": "Open Externally",
-      "tryHttps": "Try HTTPS",
-      "proceedUnsafe": "Proceed Anyway (Unsafe)",
-      "connecting": "Connecting…",
-      "certificateChallengeExpired": "This certificate approval expired. Retry the page to request a new one.",
-      "certificateChallengeChanged": "The certificate request changed. Retry the page and review the new warning.",
-      "certificateChallengeUnavailable": "This certificate request is no longer available. Retry the page to request a new one.",
-      "certificateProceedFailed": "Orca could not approve this certificate request. Retry the page and try again."
+      "connectionNotSecure": "连接不安全",
+      "cantReachHost": "无法访问 {{value0}}",
+      "cantLoadPage": "无法加载此页面",
+      "certificateNameMismatch": "证书与 {{value0}} 不匹配。",
+      "certificateDateInvalid": "{{value0}} 的证书在当前日期和时间无效。",
+      "certificateAuthorityInvalid": "Orca 不信任签发 {{value0}} 证书的机构。",
+      "certificateVerificationFailed": "Orca 无法验证 {{value0}} 的证书。",
+      "trustedCertificateGuidance": "进行本地开发时，请尽可能使用受信任的本地证书。",
+      "retry": "重试",
+      "copyAddress": "复制地址",
+      "addressCopied": "已复制当前页面地址。",
+      "openExternally": "在外部打开",
+      "tryHttps": "尝试 HTTPS",
+      "proceedUnsafe": "仍然继续（不安全）",
+      "connecting": "正在连接…",
+      "certificateChallengeExpired": "此证书审批已过期。请重试该页面以请求新的审批。",
+      "certificateChallengeChanged": "证书请求已更改。请重试该页面并查看新的警告。",
+      "certificateChallengeUnavailable": "此证书请求已不可用。请重试该页面以重新请求。",
+      "certificateProceedFailed": "Orca 无法批准此证书请求。请重试该页面后再试。"
     }
   },
   "runtimeRpc": {
     "startupFailure": {
-      "unknownCause": "No additional error details were available.",
-      "continueButton": "Continue without CLI",
-      "title": "Orca CLI unavailable",
-      "message": "Orca couldn't start its local command transport.",
-      "detail": "Orca will continue to work, but commands such as orca status, orca terminal, and orchestration are unavailable for this session.\n\n{{guidance}}\n\nCause: {{cause}}",
+      "unknownCause": "没有其他错误详情可用。",
+      "continueButton": "不使用 CLI 继续",
+      "title": "Orca CLI 不可用",
+      "message": "Orca 无法启动其本地命令传输通道。",
+      "detail": "Orca 仍可正常工作，但本会话中 orca status、orca terminal 和编排等命令不可用。\n\n{{guidance}}\n\n原因：{{cause}}",
       "guidance": {
-        "permissionDenied": "Orca couldn't write its runtime file. Check permissions on Orca's data folder, then restart.",
-        "storageUnavailable": "Your disk may be full or read-only. Free up space, then restart Orca.",
-        "invalidPath": "Orca's data folder may be missing, moved, or at a path that is too long. Restore it or use a shorter path, then restart Orca.",
-        "addressInUse": "Another process may be holding the port. Restart Orca to try again.",
-        "unknown": "Restart Orca to try again."
+        "permissionDenied": "Orca 无法写入其运行时文件。请检查 Orca 数据文件夹的权限，然后重启。",
+        "storageUnavailable": "磁盘可能已满或为只读。请释放空间，然后重启 Orca。",
+        "invalidPath": "Orca 的数据文件夹可能缺失、被移动或路径过长。请恢复它或使用更短的路径，然后重启 Orca。",
+        "addressInUse": "另一个进程可能占用了端口。请重启 Orca 以重试。",
+        "unknown": "请重启 Orca 以重试。"
       }
     }
   }
diff --git a/src/renderer/src/i18n/plugin-chrome-allowlist.test.ts b/src/renderer/src/i18n/plugin-chrome-allowlist.test.ts
new file mode 100644
index 000000000000..19859369a782
--- /dev/null
+++ b/src/renderer/src/i18n/plugin-chrome-allowlist.test.ts
@@ -0,0 +1,56 @@
+/**
+ * The plugin-chrome exemption is a list of exact catalog paths, so it can rot in
+ * two directions: a renamed key leaves a dead entry behind, and a key that moves
+ * into a component the security tests name would widen the exemption silently.
+ * These assertions catch both.
+ */
+import { describe, expect, it } from 'vitest'
+import { translatablePluginChromePaths } from '../../../shared/plugins/plugin-translatable-chrome'
+import en from './locales/en.json'
+
+// Kept in sync with the components plugin-language-pack-artifact.test.ts pins as
+// security copy: nothing from them may appear in the chrome exemption.
+const SECURITY_COPY_COMPONENTS = [
+  'PluginConsentDialog',
+  'PluginConsentProvenance',
+  'pluginError',
+  'PluginKeybindingConsentPreview',
+  'PluginMarketplaceListingRow',
+  'PluginMarketplacePreviewDialog',
+  'PluginMarketplaceSourceDialog',
+  'PluginVmRecipeConsentPreview'
+]
+
+function lookup(key: string): string | undefined {
+  const value = key
+    .split('.')
+    .reduce<unknown>(
+      (node, part) =>
+        node && typeof node === 'object' ? (node as Record<string, unknown>)[part] : undefined,
+      en as unknown
+    )
+  return typeof value === 'string' ? value : undefined
+}
+
+describe('translatable plugin chrome', () => {
+  it.each(translatablePluginChromePaths())('%s still exists in the English catalog', (path) => {
+    expect(lookup(path)).toBeTypeOf('string')
+  })
+
+  it('exempts nothing from a component the security tests pin', () => {
+    const leaked = translatablePluginChromePaths().filter((path) =>
+      SECURITY_COPY_COMPONENTS.some((component) =>
+        path.startsWith(`auto.components.settings.${component}.`)
+      )
+    )
+
+    expect(leaked).toEqual([])
+  })
+
+  // Why: `*Failed` copy reports what happened to a trust decision (a reviewed
+  // source that changed, a rollback target that is gone), so the boundary is the
+  // whole family rather than a per-message judgement.
+  it('exempts no failure copy', () => {
+    expect(translatablePluginChromePaths().filter((path) => path.endsWith('Failed'))).toEqual([])
+  })
+})
diff --git a/src/renderer/src/i18n/relative-time-format.test.ts b/src/renderer/src/i18n/relative-time-format.test.ts
new file mode 100644
index 000000000000..81cfc08bdaae
--- /dev/null
+++ b/src/renderer/src/i18n/relative-time-format.test.ts
@@ -0,0 +1,59 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const { mockIntlLocale } = vi.hoisted(() => ({ mockIntlLocale: { value: 'en' } }))
+
+vi.mock('./i18n', () => ({ getIntlLocale: () => mockIntlLocale.value }))
+
+import {
+  formatUiRelativeTime,
+  formatUiRelativeTimeFromDate,
+  getUiRelativeTimeFormatter
+} from './relative-time-format'
+
+beforeEach(() => {
+  mockIntlLocale.value = 'en'
+})
+
+describe('getUiRelativeTimeFormatter', () => {
+  it('formats with the configured UI language instead of the OS locale', () => {
+    expect(getUiRelativeTimeFormatter().format(-1, 'day')).toBe('yesterday')
+  })
+
+  it('reuses the cached formatter while the language is unchanged', () => {
+    expect(getUiRelativeTimeFormatter()).toBe(getUiRelativeTimeFormatter())
+  })
+
+  it('rebuilds the formatter after a runtime language switch', () => {
+    const english = getUiRelativeTimeFormatter()
+    mockIntlLocale.value = 'ko'
+    const korean = getUiRelativeTimeFormatter()
+    expect(korean).not.toBe(english)
+    expect(korean.format(-1, 'day')).toBe('어제')
+  })
+
+  // getIntlLocale() already maps the synthetic plugin<hex> resource language to a real BCP-47 tag,
+  // so the constructor never sees a value Intl would reject.
+  it('formats in the tag a plugin language pack resolves to', () => {
+    mockIntlLocale.value = 'ja'
+    expect(getUiRelativeTimeFormatter().format(-1, 'day')).toBe('昨日')
+  })
+})
+
+describe('formatUiRelativeTime', () => {
+  it('picks the minute/hour/day unit from the signed millisecond delta', () => {
+    expect(formatUiRelativeTime(-5 * 60_000)).toBe('5 minutes ago')
+    expect(formatUiRelativeTime(-3 * 3_600_000)).toBe('3 hours ago')
+    expect(formatUiRelativeTime(-2 * 86_400_000)).toBe('2 days ago')
+  })
+
+  it('formats future deltas', () => {
+    expect(formatUiRelativeTime(2 * 86_400_000)).toBe('in 2 days')
+  })
+})
+
+describe('formatUiRelativeTimeFromDate', () => {
+  it('returns the fallback for an invalid date', () => {
+    expect(formatUiRelativeTimeFromDate('not-a-date')).toBe('recently')
+    expect(formatUiRelativeTimeFromDate('not-a-date', 'unknown')).toBe('unknown')
+  })
+})
diff --git a/src/renderer/src/i18n/relative-time-format.ts b/src/renderer/src/i18n/relative-time-format.ts
new file mode 100644
index 000000000000..95387b5daf19
--- /dev/null
+++ b/src/renderer/src/i18n/relative-time-format.ts
@@ -0,0 +1,39 @@
+import { getIntlLocale } from './i18n'
+
+// Why: relative times are language words ("2 days ago" / "그저께"), so they must follow the
+// configured UI language rather than the OS locale — unlike Intl.DateTimeFormat, where numeric
+// date shapes following the OS region is conventional. The language can change at runtime, and
+// plugin packs register under a synthetic tag Intl rejects, so resolve through getIntlLocale()
+// and cache per resolved locale rather than freezing one formatter at module scope.
+let cached: { locale: string; formatter: Intl.RelativeTimeFormat } | null = null
+
+export function getUiRelativeTimeFormatter(): Intl.RelativeTimeFormat {
+  const locale = getIntlLocale()
+  if (!cached || cached.locale !== locale) {
+    cached = { locale, formatter: new Intl.RelativeTimeFormat(locale, { numeric: 'auto' }) }
+  }
+  return cached.formatter
+}
+
+/** Format a signed millisecond delta (future positive, past negative) at minute/hour/day granularity. */
+export function formatUiRelativeTime(diffMs: number): string {
+  const formatter = getUiRelativeTimeFormatter()
+  const diffMinutes = Math.round(diffMs / 60_000)
+  if (Math.abs(diffMinutes) < 60) {
+    return formatter.format(diffMinutes, 'minute')
+  }
+  const diffHours = Math.round(diffMinutes / 60)
+  if (Math.abs(diffHours) < 24) {
+    return formatter.format(diffHours, 'hour')
+  }
+  return formatter.format(Math.round(diffHours / 24), 'day')
+}
+
+/** Parse a date string and format it relative to now; returns `fallback` when the input is invalid. */
+export function formatUiRelativeTimeFromDate(input: string, fallback = 'recently'): string {
+  const date = new Date(input)
+  if (Number.isNaN(date.getTime())) {
+    return fallback
+  }
+  return formatUiRelativeTime(date.getTime() - Date.now())
+}
diff --git a/src/shared/contextual-tours.ts b/src/shared/contextual-tours.ts
index e57161d38604..623a0bbd6ec8 100644
--- a/src/shared/contextual-tours.ts
+++ b/src/shared/contextual-tours.ts
@@ -30,6 +30,8 @@ export type ContextualTourStepAction = {
 export type ContextualTourStepPlacement = 'top' | 'right' | 'bottom' | 'left'
 
 export type ContextualTourStep = {
+  // Stable anchor for localized copy — position-keyed translations shift onto the wrong step when one is inserted.
+  id?: string
   title: string
   body: string
   targetSelector: string
@@ -146,14 +148,16 @@ export const CONTEXTUAL_TOURS = [
     id: 'automations',
     steps: [
       {
+        id: 'automations-intro',
         title: 'What is an automation?',
         body: 'Automations run agent work on a schedule. Add an automation by clicking this button.',
         targetSelector: '[data-contextual-tour-target="automations-create"]',
         requiredForStart: true
       },
       {
+        id: 'automations-results',
         title: 'Find the results',
-        body: 'Runs show when automations executed, what happened, and where to inspect their output.',
+        body: 'Runs show when automations ran, what happened, and where to inspect their output.',
         targetSelector: '[data-contextual-tour-target="automations-runs"]'
       }
     ]
diff --git a/src/shared/plugins/plugin-language-pack-artifact.test.ts b/src/shared/plugins/plugin-language-pack-artifact.test.ts
index c3f9980e7e6e..e684bb50095e 100644
--- a/src/shared/plugins/plugin-language-pack-artifact.test.ts
+++ b/src/shared/plugins/plugin-language-pack-artifact.test.ts
@@ -57,6 +57,66 @@ describe('plugin language-pack artifacts', () => {
     ).toMatchObject({ ok: false, error: expect.stringContaining('protected security copy') })
   })
 
+  it.each([
+    ['PluginsSettingsSection', 'title', 'Плагины'],
+    ['PluginMarketplaceBrowser', 'refresh', 'Обновить'],
+    ['PluginDevelopmentSection', 'title', 'Разработка']
+  ])('lets a language pack translate %s.%s, which asserts nothing', (component, key, value) => {
+    expect(
+      parsePluginLanguagePackArtifact(
+        JSON.stringify({
+          auto: { components: { settings: { [component]: { [key]: value } } } }
+        })
+      ).ok
+    ).toBe(true)
+  })
+
+  // Why: the chrome exemption must not leak into the copy that carries a claim
+  // about what plugins may do — that copy is the whole reason the prefix is broad.
+  it.each([
+    ['description', 'Plugins are sandboxed and cannot read your files.'],
+    ['systemDescription', 'Every plugin here has been reviewed by Orca.'],
+    ['featureOff', 'Installed plugins keep running while the system is off.']
+  ])('still refuses PluginsSettingsSection.%s', (key, value) => {
+    expect(
+      parsePluginLanguagePackArtifact(
+        JSON.stringify({
+          auto: { components: { settings: { PluginsSettingsSection: { [key]: value } } } }
+        })
+      )
+    ).toMatchObject({ ok: false, error: expect.stringContaining('protected security copy') })
+  })
+
+  it('still refuses the development-plugin permission promise', () => {
+    expect(
+      parsePluginLanguagePackArtifact(
+        JSON.stringify({
+          auto: {
+            components: {
+              settings: {
+                PluginDevelopmentSection: { help: 'Dev plugins skip permission review.' }
+              }
+            }
+          }
+        })
+      )
+    ).toMatchObject({ ok: false, error: expect.stringContaining('protected security copy') })
+  })
+
+  it('still refuses install failure copy that reports a trust event', () => {
+    expect(
+      parsePluginLanguagePackArtifact(
+        JSON.stringify({
+          auto: {
+            components: {
+              settings: { PluginMarketplaceBrowser: { installFailed: 'Installed successfully.' } }
+            }
+          }
+        })
+      )
+    ).toMatchObject({ ok: false, error: expect.stringContaining('protected security copy') })
+  })
+
   it('forges no trust badge: the community→Official swap is refused', () => {
     expect(
       parsePluginLanguagePackArtifact(
diff --git a/src/shared/plugins/plugin-language-pack-artifact.ts b/src/shared/plugins/plugin-language-pack-artifact.ts
index 0e4dd218d95b..917adeef69ef 100644
--- a/src/shared/plugins/plugin-language-pack-artifact.ts
+++ b/src/shared/plugins/plugin-language-pack-artifact.ts
@@ -1,3 +1,8 @@
+import {
+  translatablePluginChrome,
+  translatablePluginChromeContainer
+} from './plugin-translatable-chrome'
+
 export const PLUGIN_LANGUAGE_CATALOG_MAX_ENTRIES = 20_000
 export const PLUGIN_LANGUAGE_CATALOG_MAX_DEPTH = 16
 
@@ -5,6 +10,8 @@ const DANGEROUS_CATALOG_KEYS = new Set(['__proto__', 'prototype', 'constructor']
 // Why: every plugin-facing security surface lives under this namespace, so
 // protecting the whole subtree keeps a new dialog from silently becoming
 // plugin-writable the way PluginConsentProvenance did when it was extracted.
+// The subtree also holds copy with no security meaning; those exact paths are
+// listed in plugin-translatable-chrome.ts and stay translatable.
 const PROTECTED_TRANSLATION_ROOT = 'auto.components.settings.'
 const PROTECTED_TRANSLATION_MODULE = /^plugin/i
 
@@ -45,6 +52,9 @@ function protectedTranslation(path: string): boolean {
   if (!path.startsWith(PROTECTED_TRANSLATION_ROOT)) {
     return false
   }
+  if (translatablePluginChrome(path)) {
+    return false
+  }
   return PROTECTED_TRANSLATION_MODULE.test(path.slice(PROTECTED_TRANSLATION_ROOT.length))
 }
 
@@ -88,7 +98,12 @@ export function parsePluginLanguagePackArtifact(raw: string): PluginLanguagePack
         return { ok: false, error: `catalog key ${key || '(empty)'} is not safe` }
       }
       const path = frame.path ? `${frame.path}.${key}` : key
-      if (protectedTranslation(path)) {
+      // A protected container stays walkable only when exempt chrome sits below
+      // it; every leaf inside is still matched against its own full path.
+      if (
+        protectedTranslation(path) &&
+        !(isCatalogObject(value) && translatablePluginChromeContainer(path))
+      ) {
         return { ok: false, error: `catalog cannot replace protected security copy at ${path}` }
       }
       if (typeof value === 'string') {
diff --git a/src/shared/plugins/plugin-translatable-chrome.ts b/src/shared/plugins/plugin-translatable-chrome.ts
new file mode 100644
index 000000000000..7a2e4c0fa2a7
--- /dev/null
+++ b/src/shared/plugins/plugin-translatable-chrome.ts
@@ -0,0 +1,92 @@
+// Why: the protected-translation prefix is deliberately broad so a consent
+// surface added tomorrow is covered the day it lands — the lesson from
+// PluginConsentProvenance. That breadth also catches copy that carries no
+// security meaning at all: section titles, empty states, search affordances,
+// and the local development form. A language pack that cannot translate
+// "Refresh" leaves the plugins pane half-translated in every locale.
+//
+// This list is the narrow exception, and it is a list of exact paths rather
+// than a pattern on purpose: anything new stays protected until someone
+// deliberately adds it here, so the fail-safe survives.
+//
+// A path belongs here only if rewriting it cannot mislead the person deciding
+// whether to trust a plugin. That rules out, and this list therefore omits:
+//
+//   - trust badges and safety status — `PluginMarketplaceListingRow.official`,
+//     `.blocked`, `PluginSettingsRow.blocked`;
+//   - promises about what plugins may do — `PluginsSettingsSection.description`
+//     ("Plugins run on this computer"), `.systemDescription` ("Nothing runs
+//     until you review and enable it"), `.featureOff` ("stays disabled"), and
+//     `PluginDevelopmentSection.help` ("Dev plugins still require permission
+//     review"). Swapping any of these for reassuring text is the attack;
+//   - failure copy that reports a trust event — `installFailed` ("The reviewed
+//     source may have changed"). Sibling `*Failed` strings stay protected too,
+//     so the boundary is a rule rather than a judgement call per message;
+//   - destructive confirmations — `PluginRemoveDialog`, `PluginRollbackDialog`;
+//   - every dialog the existing tests already name as security copy.
+const TRANSLATABLE_PLUGIN_CHROME = new Set([
+  // Plugins pane frame: headings and list states, no claims about behavior.
+  'auto.components.settings.PluginsSettingsSection.title',
+  'auto.components.settings.PluginsSettingsSection.systemLabel',
+  'auto.components.settings.PluginsSettingsSection.install',
+  'auto.components.settings.PluginsSettingsSection.loading',
+  'auto.components.settings.PluginsSettingsSection.empty',
+  'auto.components.settings.PluginsSettingsSection.emptyTitle',
+  'auto.components.settings.PluginsSettingsSection.noInstalledResults',
+  'auto.components.settings.PluginsSettingsSection.noInstalledResultsTitle',
+  // Marketplace browser chrome: refresh, search, and empty states.
+  'auto.components.settings.PluginMarketplaceBrowser.manageSources',
+  'auto.components.settings.PluginMarketplaceBrowser.addSource',
+  'auto.components.settings.PluginMarketplaceBrowser.refresh',
+  'auto.components.settings.PluginMarketplaceBrowser.refreshing',
+  'auto.components.settings.PluginMarketplaceBrowser.loading',
+  'auto.components.settings.PluginMarketplaceBrowser.tryAgain',
+  'auto.components.settings.PluginMarketplaceBrowser.clearSearch',
+  'auto.components.settings.PluginMarketplaceBrowser.empty',
+  'auto.components.settings.PluginMarketplaceBrowser.emptyTitle',
+  'auto.components.settings.PluginMarketplaceBrowser.noInstalled',
+  'auto.components.settings.PluginMarketplaceBrowser.noInstalledTitle',
+  'auto.components.settings.PluginMarketplaceBrowser.noResults',
+  'auto.components.settings.PluginMarketplaceBrowser.noResultsTitle',
+  'auto.components.settings.PluginMarketplaceBrowser.noSourcesTitle',
+  // Local development form: field labels and validation, desktop-only paths.
+  'auto.components.settings.PluginDevelopmentSection.title',
+  'auto.components.settings.PluginDevelopmentSection.add',
+  'auto.components.settings.PluginDevelopmentSection.remove',
+  'auto.components.settings.PluginDevelopmentSection.pathLabel',
+  'auto.components.settings.PluginDevelopmentSection.pathRequired',
+  'auto.components.settings.PluginDevelopmentSection.placeholder',
+  // Settings-search index entries: they route to a pane, they do not assert.
+  'auto.components.settings.plugins.search.title',
+  'auto.components.settings.plugins.search.description',
+  'auto.components.settings.plugins.search.install',
+  'auto.components.settings.plugins.search.permissions',
+  'auto.components.settings.plugins.search.logs',
+  'auto.components.settings.plugins.search.development'
+])
+
+/** True when a protected-prefix path is plugin chrome a language pack may translate. */
+export function translatablePluginChrome(path: string): boolean {
+  return TRANSLATABLE_PLUGIN_CHROME.has(path)
+}
+
+/**
+ * True when a protected-prefix container holds exempt chrome somewhere below it.
+ * The walk rejects a protected path as soon as it sees it, so a container has to
+ * stay walkable for its exempt leaves to be reachable — every leaf inside is
+ * still checked against its own full path.
+ */
+export function translatablePluginChromeContainer(path: string): boolean {
+  const prefix = `${path}.`
+  for (const exempt of TRANSLATABLE_PLUGIN_CHROME) {
+    if (exempt.startsWith(prefix)) {
+      return true
+    }
+  }
+  return false
+}
+
+/** The exempt paths, for tests that check the list against the English catalog. */
+export function translatablePluginChromePaths(): string[] {
+  return [...TRANSLATABLE_PLUGIN_CHROME]
+}