From fe168c2af02a7cf00f5320bc160203f2b262ef0b Mon Sep 17 00:00:00 2001
From: allen <allen@gzj2001.com>
Date: Fri, 24 Apr 2026 05:33:57 +0800
Subject: [PATCH 1/2] feat(i18n): add app language switching

---
 src-tauri/src/types.rs                        |    8 +
 src/features/about/components/AboutView.tsx   |   38 +-
 .../app/components/ApprovalToasts.tsx         |   18 +-
 .../app/components/LaunchScriptButton.tsx     |   32 +-
 .../components/LaunchScriptEntryButton.tsx    |   14 +-
 .../app/components/LaunchScriptIconPicker.tsx |    5 +-
 src/features/app/components/MainApp.tsx       |    7 +-
 src/features/app/components/MainHeader.tsx    |   55 +-
 .../app/components/MainHeaderActions.tsx      |   15 +-
 src/features/app/components/OpenAppMenu.tsx   |   18 +-
 .../components/PlanReadyFollowupMessage.tsx   |   14 +-
 .../components/RequestUserInputMessage.tsx    |   18 +-
 src/features/app/components/Sidebar.tsx       |   18 +-
 .../app/components/SidebarBottomRail.tsx      |   26 +-
 src/features/app/components/SidebarHeader.tsx |   40 +-
 .../app/components/SidebarSearchBar.tsx       |    9 +-
 .../components/SidebarThreadsOnlySection.tsx  |   11 +-
 .../app/components/SidebarWorkspaceGroups.tsx |   34 +-
 src/features/app/components/ThreadList.tsx    |   10 +-
 src/features/app/components/ThreadLoading.tsx |    6 +-
 src/features/app/components/ThreadRow.tsx     |   14 +-
 src/features/app/components/WorkspaceCard.tsx |   10 +-
 .../app/components/WorkspaceGroup.tsx         |   13 +-
 src/features/app/components/WorktreeCard.tsx  |   10 +-
 .../app/components/WorktreeSection.tsx        |    5 +-
 .../app/hooks/useMainAppDisplayNodes.tsx      |    9 +-
 src/features/composer/components/Composer.tsx |   32 +-
 .../components/ComposerAttachments.tsx        |   10 +-
 .../composer/components/ComposerInput.tsx     |   22 +-
 .../composer/components/ComposerMetaBar.tsx   |   46 +-
 .../components/ComposerMobileActionsMenu.tsx  |   11 +-
 .../composer/components/ComposerQueue.tsx     |   21 +-
 .../components/ComposerSuggestionsPopover.tsx |    4 +-
 .../components/ReviewInlinePrompt.tsx         |   60 +-
 .../hooks/useComposerDictationControls.ts     |   18 +-
 src/features/debug/components/DebugPanel.tsx  |   12 +-
 .../components/DictationWaveform.tsx          |    4 +-
 .../files/components/FilePreviewPopover.tsx   |   27 +-
 .../files/components/FileTreePanel.tsx        |   50 +-
 .../git/components/BranchSwitcherPrompt.tsx   |   12 +-
 src/features/git/components/GitDiffPanel.tsx  |  101 +-
 .../git/components/GitDiffPanelDiffMode.tsx   |   57 +-
 .../git/components/GitDiffPanelListModes.tsx  |   30 +-
 .../git/components/GitDiffPanelOverview.tsx   |   27 +-
 .../git/components/GitDiffPanelShared.tsx     |   70 +-
 src/features/git/components/GitDiffViewer.tsx |   27 +-
 .../git/components/GitDiffViewerDiffCard.tsx  |   32 +-
 .../GitDiffViewerPullRequestSummary.tsx       |   42 +-
 src/features/git/components/ImageDiffCard.tsx |   16 +-
 .../git/components/InitGitRepoPrompt.tsx      |   35 +-
 .../git/components/PierreDiffBlock.tsx        |    4 +-
 src/features/home/components/Home.tsx         |    7 +-
 .../components/HomeLatestAgentsSection.tsx    |   15 +-
 .../home/components/HomeUsageSection.tsx      |   47 +-
 .../layout/components/DesktopLayout.tsx       |   10 +-
 src/features/layout/components/PanelTabs.tsx  |    9 +-
 .../components/SidebarToggleControls.tsx      |   29 +-
 .../layout/components/TabletLayout.tsx        |    5 +-
 .../components/WindowCaptionControls.tsx      |   10 +-
 .../hooks/layoutNodes/buildPrimaryNodes.tsx   |    8 +-
 .../hooks/layoutNodes/buildSecondaryNodes.tsx |   27 +-
 src/features/layout/hooks/useLayoutNodes.tsx  |    6 +-
 src/features/messages/components/Markdown.tsx |   10 +-
 .../messages/components/MessageRows.tsx       |   86 +-
 src/features/messages/components/Messages.tsx |   22 +-
 .../messages/hooks/useFileLinkOpener.ts       |   20 +-
 .../components/MobileServerSetupWizard.tsx    |   30 +-
 .../notifications/components/ErrorToasts.tsx  |    7 +-
 src/features/plan/components/PlanPanel.tsx    |    6 +-
 .../prompts/components/PromptPanel.tsx        |   98 +-
 .../settings/components/SettingsNav.tsx       |   31 +-
 .../settings/components/SettingsView.test.tsx |    1 +
 .../settings/components/SettingsView.tsx      |   14 +-
 .../sections/SettingsAboutSection.tsx         |   45 +-
 .../sections/SettingsAgentsSection.tsx        |  147 +-
 .../sections/SettingsCodexSection.tsx         |  121 +-
 .../sections/SettingsComposerSection.tsx      |   77 +-
 .../sections/SettingsDictationSection.tsx     |   85 +-
 .../sections/SettingsDisplaySection.test.tsx  |   51 +
 .../sections/SettingsDisplaySection.tsx       |  139 +-
 .../sections/SettingsEnvironmentsSection.tsx  |   56 +-
 .../sections/SettingsFeaturesSection.tsx      |   46 +-
 .../sections/SettingsGitSection.tsx           |   31 +-
 .../sections/SettingsOpenAppsSection.tsx      |   66 +-
 .../sections/SettingsProjectsSection.tsx      |   44 +-
 .../sections/SettingsServerSection.tsx        |  154 +-
 .../sections/SettingsShortcutsSection.tsx     |   67 +-
 .../components/settingsViewConstants.ts       |   17 +
 src/features/settings/hooks/useAppSettings.ts |    5 +
 .../shared/components/FileEditorCard.tsx      |   17 +-
 .../terminal/components/TerminalDock.tsx      |   13 +-
 .../threads/components/RenameThreadPrompt.tsx |   16 +-
 .../update/components/UpdateToast.tsx         |   48 +-
 .../workspaces/components/ClonePrompt.tsx     |   30 +-
 .../MobileRemoteWorkspacePrompt.tsx           |   18 +-
 .../components/WorkspaceFromUrlPrompt.tsx     |   24 +-
 .../workspaces/components/WorkspaceHome.tsx   |   18 +-
 .../components/WorkspaceHomeGitInitBanner.tsx |   11 +-
 .../components/WorkspaceHomeHistory.tsx       |   38 +-
 .../components/WorkspaceHomeRunControls.tsx   |   24 +-
 .../workspaces/components/WorktreePrompt.tsx  |   27 +-
 src/i18n/i18n.test.ts                         |   30 +
 src/i18n/index.tsx                            | 1255 +++++++++++++++++
 src/types.ts                                  |    2 +
 104 files changed, 3147 insertions(+), 1300 deletions(-)
 create mode 100644 src/i18n/i18n.test.ts
 create mode 100644 src/i18n/index.tsx

diff --git a/src-tauri/src/types.rs b/src-tauri/src/types.rs
index 6b595106b..10051f475 100644
--- a/src-tauri/src/types.rs
+++ b/src-tauri/src/types.rs
@@ -489,6 +489,8 @@ pub(crate) struct AppSettings {
     pub(crate) ui_scale: f64,
     #[serde(default = "default_theme", rename = "theme")]
     pub(crate) theme: String,
+    #[serde(default = "default_app_language", rename = "appLanguage")]
+    pub(crate) app_language: String,
     #[serde(
         default = "default_usage_show_remaining",
         rename = "usageShowRemaining"
@@ -707,6 +709,10 @@ fn default_theme() -> String {
     "system".to_string()
 }
 
+fn default_app_language() -> String {
+    "system".to_string()
+}
+
 fn default_usage_show_remaining() -> bool {
     false
 }
@@ -1155,6 +1161,7 @@ impl Default for AppSettings {
             last_composer_reasoning_effort: None,
             ui_scale: 1.0,
             theme: default_theme(),
+            app_language: default_app_language(),
             usage_show_remaining: default_usage_show_remaining(),
             show_message_file_path: default_show_message_file_path(),
             chat_history_scrollback_items: default_chat_history_scrollback_items(),
@@ -1321,6 +1328,7 @@ mod tests {
         assert!(settings.last_composer_reasoning_effort.is_none());
         assert!((settings.ui_scale - 1.0).abs() < f64::EPSILON);
         assert_eq!(settings.theme, "system");
+        assert_eq!(settings.app_language, "system");
         assert!(!settings.usage_show_remaining);
         assert!(settings.show_message_file_path);
         assert_eq!(settings.chat_history_scrollback_items, Some(200));
diff --git a/src/features/about/components/AboutView.tsx b/src/features/about/components/AboutView.tsx
index 12ab9696e..d44ae6e61 100644
--- a/src/features/about/components/AboutView.tsx
+++ b/src/features/about/components/AboutView.tsx
@@ -1,11 +1,39 @@
 import { useEffect, useState } from "react";
 import { getVersion } from "@tauri-apps/api/app";
 import { openUrl } from "@tauri-apps/plugin-opener";
+import type { AppLanguagePreference } from "@/types";
+import { getAppSettings } from "@services/tauri";
+import { I18nProvider, useI18n } from "@/i18n";
 
 const GITHUB_URL = "https://github.com/Dimillian/CodexMonitor";
 const TWITTER_URL = "https://x.com/dimillian";
 
 export function AboutView() {
+  const [language, setLanguage] = useState<AppLanguagePreference>("system");
+
+  useEffect(() => {
+    let active = true;
+    void getAppSettings()
+      .then((settings) => {
+        if (active) {
+          setLanguage(settings.appLanguage);
+        }
+      })
+      .catch(() => {});
+    return () => {
+      active = false;
+    };
+  }, []);
+
+  return (
+    <I18nProvider language={language}>
+      <AboutViewContent />
+    </I18nProvider>
+  );
+}
+
+function AboutViewContent() {
+  const { tx } = useI18n();
   const [version, setVersion] = useState<string | null>(null);
 
   const handleOpenGitHub = () => {
@@ -44,15 +72,15 @@ export function AboutView() {
           <img
             className="about-icon"
             src="/app-icon.png"
-            alt="Codex Monitor icon"
+            alt={tx("Codex Monitor icon")}
           />
-          <div className="about-title">Codex Monitor</div>
+          <div className="about-title">{tx("Codex Monitor")}</div>
         </div>
         <div className="about-version">
-          {version ? `Version ${version}` : "Version —"}
+          {version ? tx("Version {version}", { version }) : tx("Version —")}
         </div>
         <div className="about-tagline">
-          Monitor the situation of your Codex agents
+          {tx("Monitor the situation of your Codex agents")}
         </div>
         <div className="about-divider" />
         <div className="about-links">
@@ -72,7 +100,7 @@ export function AboutView() {
             Twitter
           </button>
         </div>
-        <div className="about-footer">Made with ♥ by Codex & Dimillian</div>
+        <div className="about-footer">{tx("Made with ♥ by Codex & Dimillian")}</div>
       </div>
     </div>
   );
diff --git a/src/features/app/components/ApprovalToasts.tsx b/src/features/app/components/ApprovalToasts.tsx
index 67a702399..46093bc84 100644
--- a/src/features/app/components/ApprovalToasts.tsx
+++ b/src/features/app/components/ApprovalToasts.tsx
@@ -1,4 +1,5 @@
 import { useEffect, useMemo } from "react";
+import { useI18n } from "@/i18n";
 import type { ApprovalRequest, WorkspaceInfo } from "../../../types";
 import { getApprovalCommandInfo } from "../../../utils/approvalRules";
 import {
@@ -24,6 +25,7 @@ export function ApprovalToasts({
   onDecision,
   onRemember,
 }: ApprovalToastsProps) {
+  const { tx } = useI18n();
   const workspaceLabels = useMemo(
     () => new Map(workspaces.map((workspace) => [workspace.id, workspace.name])),
     [workspaces],
@@ -75,7 +77,7 @@ export function ApprovalToasts({
 
   const renderParamValue = (value: unknown) => {
     if (value === null || value === undefined) {
-      return { text: "None", isCode: false };
+      return { text: tx("None"), isCode: false };
     }
     if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
       return { text: String(value), isCode: false };
@@ -103,7 +105,7 @@ export function ApprovalToasts({
             role="alert"
           >
             <ToastHeader className="approval-toast-header">
-              <ToastTitle className="approval-toast-title">Approval needed</ToastTitle>
+              <ToastTitle className="approval-toast-title">{tx("Approval needed")}</ToastTitle>
               {workspaceName ? (
                 <div className="approval-toast-workspace">{workspaceName}</div>
               ) : null}
@@ -132,7 +134,7 @@ export function ApprovalToasts({
                 })
               ) : (
                 <div className="approval-toast-detail approval-toast-detail-empty">
-                  No extra details.
+                  {tx("No extra details.")}
                 </div>
               )}
             </div>
@@ -141,22 +143,24 @@ export function ApprovalToasts({
                 className="secondary"
                 onClick={() => onDecision(request, "decline")}
               >
-                Decline
+                {tx("Decline")}
               </button>
               {commandInfo && onRemember ? (
                 <button
                   className="ghost approval-toast-remember"
                   onClick={() => onRemember(request, commandInfo.tokens)}
-                  title={`Allow commands that start with ${commandInfo.preview}`}
+                  title={tx("Allow commands that start with {command}", {
+                    command: commandInfo.preview,
+                  })}
                 >
-                  Always allow
+                  {tx("Always allow")}
                 </button>
               ) : null}
               <button
                 className="primary"
                 onClick={() => onDecision(request, "accept")}
               >
-                Approve (Enter)
+                {tx("Approve (Enter)")}
               </button>
             </ToastActions>
           </ToastCard>
diff --git a/src/features/app/components/LaunchScriptButton.tsx b/src/features/app/components/LaunchScriptButton.tsx
index 8e2d82f2d..72ebc66f5 100644
--- a/src/features/app/components/LaunchScriptButton.tsx
+++ b/src/features/app/components/LaunchScriptButton.tsx
@@ -1,4 +1,5 @@
 import Play from "lucide-react/dist/esm/icons/play";
+import { useI18n } from "@/i18n";
 import type { LaunchScriptIconId } from "../../../types";
 import { PopoverSurface } from "../../design-system/components/popover/PopoverPrimitives";
 import { useMenuController } from "../hooks/useMenuController";
@@ -54,6 +55,7 @@ export function LaunchScriptButton({
   onNewDraftLabelChange,
   onCreateNew,
 }: LaunchScriptButtonProps) {
+  const { tx } = useI18n();
   const editorMenu = useMenuController({
     open: editorOpen,
     onDismiss: () => {
@@ -76,9 +78,9 @@ export function LaunchScriptButton({
             onOpenEditor();
           }}
           data-tauri-drag-region="false"
-          aria-label={hasLaunchScript ? "Run launch script" : "Set launch script"}
-          title={hasLaunchScript ? "Run launch script" : "Set launch script"}
-          data-tooltip={hasLaunchScript ? "Run launch script" : "Set launch script"}
+          aria-label={hasLaunchScript ? tx("Run launch script") : tx("Set launch script")}
+          title={hasLaunchScript ? tx("Run launch script") : tx("Set launch script")}
+          data-tooltip={hasLaunchScript ? tx("Run launch script") : tx("Set launch script")}
           data-tooltip-placement="bottom"
         >
           <Play size={14} aria-hidden />
@@ -86,10 +88,10 @@ export function LaunchScriptButton({
       </div>
       {editorOpen && (
         <PopoverSurface className="launch-script-popover" role="dialog">
-          <div className="launch-script-title">Launch script</div>
+          <div className="launch-script-title">{tx("Launch script")}</div>
           <textarea
             className="launch-script-textarea"
-            placeholder="e.g. npm run dev"
+            placeholder={tx("e.g. npm run dev")}
             value={draftScript}
             onChange={(event) => onDraftChange(event.target.value)}
             rows={6}
@@ -106,7 +108,7 @@ export function LaunchScriptButton({
               }}
               data-tauri-drag-region="false"
             >
-              Cancel
+              {tx("Cancel")}
             </button>
             {showNew && onOpenNew && (
               <button
@@ -115,7 +117,7 @@ export function LaunchScriptButton({
                 onClick={onOpenNew}
                 data-tauri-drag-region="false"
               >
-                New
+                {tx("New")}
               </button>
             )}
             <button
@@ -125,12 +127,12 @@ export function LaunchScriptButton({
               disabled={isSaving}
               data-tauri-drag-region="false"
             >
-              {isSaving ? "Saving..." : "Save"}
+              {isSaving ? tx("Saving...") : tx("Save")}
             </button>
           </div>
           {showNew && newEditorOpen && onNewDraftChange && onNewDraftIconChange && onCreateNew && (
             <div className="launch-script-new">
-              <div className="launch-script-title">New launch script</div>
+              <div className="launch-script-title">{tx("New launch script")}</div>
               <LaunchScriptIconPicker
                 value={newDraftIcon}
                 onChange={onNewDraftIconChange}
@@ -138,14 +140,14 @@ export function LaunchScriptButton({
               <input
                 className="launch-script-input"
                 type="text"
-                placeholder="Optional label"
+                placeholder={tx("Optional label")}
                 value={newDraftLabel}
                 onChange={(event) => onNewDraftLabelChange?.(event.target.value)}
                 data-tauri-drag-region="false"
               />
               <textarea
                 className="launch-script-textarea"
-                placeholder="e.g. npm run dev"
+                placeholder={tx("e.g. npm run dev")}
                 value={newDraftScript}
                 onChange={(event) => onNewDraftChange(event.target.value)}
                 rows={5}
@@ -158,8 +160,8 @@ export function LaunchScriptButton({
                   className="ghost"
                   onClick={onCloseNew}
                   data-tauri-drag-region="false"
-                >
-                  Cancel
+              >
+                  {tx("Cancel")}
                 </button>
                 <button
                   type="button"
@@ -167,8 +169,8 @@ export function LaunchScriptButton({
                   onClick={onCreateNew}
                   disabled={isSaving}
                   data-tauri-drag-region="false"
-                >
-                  {isSaving ? "Saving..." : "Create"}
+              >
+                  {isSaving ? tx("Saving...") : tx("Create")}
                 </button>
               </div>
             </div>
diff --git a/src/features/app/components/LaunchScriptEntryButton.tsx b/src/features/app/components/LaunchScriptEntryButton.tsx
index 0a02f78a1..9ab694ed3 100644
--- a/src/features/app/components/LaunchScriptEntryButton.tsx
+++ b/src/features/app/components/LaunchScriptEntryButton.tsx
@@ -1,4 +1,5 @@
 import type { LaunchScriptEntry, LaunchScriptIconId } from "../../../types";
+import { useI18n } from "@/i18n";
 import { PopoverSurface } from "../../design-system/components/popover/PopoverPrimitives";
 import { useMenuController } from "../hooks/useMenuController";
 import { LaunchScriptIconPicker } from "./LaunchScriptIconPicker";
@@ -39,6 +40,7 @@ export function LaunchScriptEntryButton({
   onSave,
   onDelete,
 }: LaunchScriptEntryButtonProps) {
+  const { tx } = useI18n();
   const editorMenu = useMenuController({
     open: editorOpen,
     onDismiss: onCloseEditor,
@@ -70,20 +72,20 @@ export function LaunchScriptEntryButton({
       {editorOpen && (
         <PopoverSurface className="launch-script-popover" role="dialog">
           <div className="launch-script-title">
-            {entry.label?.trim() || "Launch script"}
+            {entry.label?.trim() || tx("Launch script")}
           </div>
           <LaunchScriptIconPicker value={draftIcon} onChange={onDraftIconChange} />
           <input
             className="launch-script-input"
             type="text"
-            placeholder="Optional label"
+            placeholder={tx("Optional label")}
             value={draftLabel}
             onChange={(event) => onDraftLabelChange(event.target.value)}
             data-tauri-drag-region="false"
           />
           <textarea
             className="launch-script-textarea"
-            placeholder="e.g. npm run dev"
+            placeholder={tx("e.g. npm run dev")}
             value={draftScript}
             onChange={(event) => onDraftChange(event.target.value)}
             rows={6}
@@ -97,7 +99,7 @@ export function LaunchScriptEntryButton({
               onClick={onCloseEditor}
               data-tauri-drag-region="false"
             >
-              Cancel
+              {tx("Cancel")}
             </button>
             <button
               type="button"
@@ -105,7 +107,7 @@ export function LaunchScriptEntryButton({
               onClick={onDelete}
               data-tauri-drag-region="false"
             >
-              Delete
+              {tx("Delete")}
             </button>
             <button
               type="button"
@@ -114,7 +116,7 @@ export function LaunchScriptEntryButton({
               disabled={isSaving}
               data-tauri-drag-region="false"
             >
-              {isSaving ? "Saving..." : "Save"}
+              {isSaving ? tx("Saving...") : tx("Save")}
             </button>
           </div>
         </PopoverSurface>
diff --git a/src/features/app/components/LaunchScriptIconPicker.tsx b/src/features/app/components/LaunchScriptIconPicker.tsx
index 31c1c8dfa..0cb8397be 100644
--- a/src/features/app/components/LaunchScriptIconPicker.tsx
+++ b/src/features/app/components/LaunchScriptIconPicker.tsx
@@ -1,3 +1,4 @@
+import { useI18n } from "@/i18n";
 import type { LaunchScriptIconId } from "../utils/launchScriptIcons";
 import {
   LAUNCH_SCRIPT_ICON_OPTIONS,
@@ -10,6 +11,8 @@ type LaunchScriptIconPickerProps = {
 };
 
 export function LaunchScriptIconPicker({ value, onChange }: LaunchScriptIconPickerProps) {
+  const { tx } = useI18n();
+
   return (
     <div className="launch-script-icon-picker">
       {LAUNCH_SCRIPT_ICON_OPTIONS.map((option) => {
@@ -21,7 +24,7 @@ export function LaunchScriptIconPicker({ value, onChange }: LaunchScriptIconPick
             type="button"
             className={`launch-script-icon-option${selected ? " is-selected" : ""}`}
             onClick={() => onChange(option.id)}
-            aria-label={option.label}
+            aria-label={tx(option.label)}
             aria-pressed={selected}
             data-tauri-drag-region="false"
           >
diff --git a/src/features/app/components/MainApp.tsx b/src/features/app/components/MainApp.tsx
index 1ce7cc587..33c436a15 100644
--- a/src/features/app/components/MainApp.tsx
+++ b/src/features/app/components/MainApp.tsx
@@ -80,6 +80,7 @@ import {
 import { useAppShellOrchestration } from "@app/orchestration/useLayoutOrchestration";
 import { normalizeCodexArgsInput } from "@/utils/codexArgsInput";
 import { subscribeTrayOpenThread } from "@services/events";
+import { I18nProvider } from "@/i18n";
 
 const SettingsView = lazy(() =>
   import("@settings/components/SettingsView").then((module) => ({
@@ -1877,5 +1878,9 @@ export default function MainApp() {
     },
   });
 
-  return <MainAppShell {...mainAppShellProps} />;
+  return (
+    <I18nProvider language={appSettings.appLanguage}>
+      <MainAppShell {...mainAppShellProps} />
+    </I18nProvider>
+  );
 }
diff --git a/src/features/app/components/MainHeader.tsx b/src/features/app/components/MainHeader.tsx
index f8bce2506..1a0d03193 100644
--- a/src/features/app/components/MainHeader.tsx
+++ b/src/features/app/components/MainHeader.tsx
@@ -1,4 +1,5 @@
 import { useEffect, useMemo, useRef, useState } from "react";
+import { useI18n } from "@/i18n";
 import Check from "lucide-react/dist/esm/icons/check";
 import Copy from "lucide-react/dist/esm/icons/copy";
 import Terminal from "lucide-react/dist/esm/icons/terminal";
@@ -107,6 +108,7 @@ export function MainHeader({
   launchScriptsState,
   worktreeRename,
 }: MainHeaderProps) {
+  const { tx } = useI18n();
   const [branchQuery, setBranchQuery] = useState("");
   const [error, setError] = useState<string | null>(null);
   const [copyFeedback, setCopyFeedback] = useState(false);
@@ -135,8 +137,11 @@ export function MainHeader({
   );
   const canCreate = trimmedQuery.length > 0 && !exactMatch;
   const branchValidationMessage = useMemo(
-    () => validateBranchName(trimmedQuery),
-    [trimmedQuery],
+    () => {
+      const message = validateBranchName(trimmedQuery);
+      return message ? tx(message) : null;
+    },
+    [trimmedQuery, tx],
   );
   const resolvedWorktreePath = worktreePath ?? workspace.path;
   const relativeWorktreePath = useMemo(() => {
@@ -202,7 +207,7 @@ export function MainHeader({
                 className="workspace-branch-static-button"
                 onClick={infoMenu.toggle}
                 data-tauri-drag-region="false"
-                title="Worktree info"
+                title={tx("Worktree info")}
               >
                 {worktreeLabel || branchName}
               </MenuTrigger>
@@ -210,7 +215,7 @@ export function MainHeader({
                 <PopoverSurface className="worktree-info-popover" role="dialog">
                   {worktreeRename && (
                     <div className="worktree-info-rename">
-                      <span className="worktree-info-label">Name</span>
+                      <span className="worktree-info-label">{tx("Name")}</span>
                       <div className="worktree-info-command">
                         <input
                           ref={renameInputRef}
@@ -257,8 +262,8 @@ export function MainHeader({
                           disabled={
                             worktreeRename.isSubmitting || !worktreeRename.isDirty
                           }
-                          aria-label="Confirm rename"
-                          title="Confirm rename"
+                          aria-label={tx("Confirm rename")}
+                          title={tx("Confirm rename")}
                         >
                           <Check aria-hidden />
                         </button>
@@ -274,7 +279,7 @@ export function MainHeader({
                       {worktreeRename.upstream && (
                         <div className="worktree-info-upstream">
                           <span className="worktree-info-subtle">
-                            Do you want to update the upstream branch to{" "}
+                            {tx("Do you want to update the upstream branch to")}{" "}
                             <strong>{worktreeRename.upstream.newBranch}</strong>?
                           </span>
                           <button
@@ -283,7 +288,7 @@ export function MainHeader({
                             onClick={worktreeRename.upstream.onConfirm}
                             disabled={worktreeRename.upstream.isSubmitting}
                           >
-                            Update upstream
+                            {tx("Update upstream")}
                           </button>
                           {worktreeRename.upstream.error && (
                             <div className="worktree-info-error">
@@ -294,10 +299,10 @@ export function MainHeader({
                       )}
                     </div>
                   )}
-                  <div className="worktree-info-title">Worktree</div>
+                  <div className="worktree-info-title">{tx("Worktree")}</div>
                   <div className="worktree-info-row">
                     <span className="worktree-info-label">
-                      Terminal{parentPath ? " (repo root)" : ""}
+                      {parentPath ? tx("Terminal (repo root)") : tx("Terminal")}
                     </span>
                     <div className="worktree-info-command">
                       <code className="worktree-info-code">
@@ -310,18 +315,18 @@ export function MainHeader({
                           await navigator.clipboard.writeText(cdCommand);
                         }}
                         data-tauri-drag-region="false"
-                        aria-label="Copy command"
-                        title="Copy command"
+                        aria-label={tx("Copy command")}
+                        title={tx("Copy command")}
                       >
                         <Copy aria-hidden />
                       </button>
                     </div>
                     <span className="worktree-info-subtle">
-                      Open this worktree in your terminal.
+                      {tx("Open this worktree in your terminal.")}
                     </span>
                   </div>
                   <div className="worktree-info-row">
-                    <span className="worktree-info-label">Reveal</span>
+                    <span className="worktree-info-label">{tx("Reveal")}</span>
                     <button
                       type="button"
                       className="worktree-info-reveal"
@@ -398,14 +403,14 @@ export function MainHeader({
                             }
                           }
                         }}
-                        placeholder="Search or create branch"
+                        placeholder={tx("Search or create branch")}
                         className="branch-input"
                         autoCorrect="off"
                         autoCapitalize="none"
                         spellCheck={false}
                         autoFocus
                         data-tauri-drag-region="false"
-                        aria-label="Search branches"
+                        aria-label={tx("Search branches")}
                       />
                       <button
                         type="button"
@@ -432,7 +437,7 @@ export function MainHeader({
                         }}
                         data-tauri-drag-region="false"
                       >
-                        Create
+                        {tx("Create")}
                       </button>
                     </div>
                     {branchValidationMessage && (
@@ -440,7 +445,7 @@ export function MainHeader({
                     )}
                     {canCreate && !branchValidationMessage && (
                       <div className="branch-create-hint">
-                        Create branch “{trimmedQuery}”
+                        {tx("Create branch \"{branch}\"", { branch: trimmedQuery })}
                       </div>
                     )}
                   </div>
@@ -454,7 +459,7 @@ export function MainHeader({
                     itemRole="menuitem"
                     itemDataTauriDragRegion="false"
                     emptyClassName="branch-empty"
-                    emptyText="No branches found"
+                    emptyText={tx("No branches found")}
                     onSelect={async (branch) => {
                       if (branch.name === branchName) {
                         return;
@@ -545,9 +550,9 @@ export function MainHeader({
             className={`ghost main-header-action ds-tooltip-trigger${isTerminalOpen ? " is-active" : ""}`}
             onClick={onToggleTerminal}
             data-tauri-drag-region="false"
-            aria-label="Toggle terminal panel"
-            title="Terminal"
-            data-tooltip="Terminal"
+            aria-label={tx("Toggle terminal panel")}
+            title={tx("Terminal")}
+            data-tooltip={tx("Terminal")}
             data-tooltip-placement="bottom"
           >
             <Terminal size={14} aria-hidden />
@@ -559,9 +564,9 @@ export function MainHeader({
           onClick={handleCopyClick}
           disabled={!canCopyThread || !onCopyThread}
           data-tauri-drag-region="false"
-          aria-label="Copy thread"
-          title="Copy thread"
-          data-tooltip="Copy thread"
+          aria-label={tx("Copy thread")}
+          title={tx("Copy thread")}
+          data-tooltip={tx("Copy thread")}
           data-tooltip-placement="bottom"
         >
           <span className="main-header-icon" aria-hidden>
diff --git a/src/features/app/components/MainHeaderActions.tsx b/src/features/app/components/MainHeaderActions.tsx
index a115c2a25..1f72664c1 100644
--- a/src/features/app/components/MainHeaderActions.tsx
+++ b/src/features/app/components/MainHeaderActions.tsx
@@ -1,6 +1,7 @@
 import { memo } from "react";
 import AlignLeft from "lucide-react/dist/esm/icons/align-left";
 import Columns2 from "lucide-react/dist/esm/icons/columns-2";
+import { useI18n } from "@/i18n";
 import type { SidebarToggleProps } from "../../layout/components/SidebarToggleControls";
 import {
   RightPanelCollapseButton,
@@ -24,10 +25,14 @@ export const MainHeaderActions = memo(function MainHeaderActions({
   rightPanelCollapsed,
   sidebarToggleProps,
 }: MainHeaderActionsProps) {
+  const { tx } = useI18n();
+  const splitLabel = tx("Dual-panel diff");
+  const unifiedLabel = tx("Single-column diff");
+
   return (
     <>
       {centerMode === "diff" && (
-        <div className="diff-view-toggle" role="group" aria-label="Diff view">
+        <div className="diff-view-toggle" role="group" aria-label={tx("Diff view")}>
           <button
             type="button"
             className={`diff-view-toggle-button${
@@ -35,8 +40,8 @@ export const MainHeaderActions = memo(function MainHeaderActions({
             } ds-tooltip-trigger`}
             onClick={() => onSelectDiffViewStyle("split")}
             aria-pressed={gitDiffViewStyle === "split"}
-            title="Dual-panel diff"
-            data-tooltip="Dual-panel diff"
+            title={splitLabel}
+            data-tooltip={splitLabel}
             data-tooltip-placement="bottom"
             data-tauri-drag-region="false"
           >
@@ -49,8 +54,8 @@ export const MainHeaderActions = memo(function MainHeaderActions({
             } ds-tooltip-trigger`}
             onClick={() => onSelectDiffViewStyle("unified")}
             aria-pressed={gitDiffViewStyle === "unified"}
-            title="Single-column diff"
-            data-tooltip="Single-column diff"
+            title={unifiedLabel}
+            data-tooltip={unifiedLabel}
             data-tooltip-placement="bottom"
             data-tauri-drag-region="false"
           >
diff --git a/src/features/app/components/OpenAppMenu.tsx b/src/features/app/components/OpenAppMenu.tsx
index fd53d18a9..d37120965 100644
--- a/src/features/app/components/OpenAppMenu.tsx
+++ b/src/features/app/components/OpenAppMenu.tsx
@@ -1,4 +1,5 @@
 import { useMemo } from "react";
+import { useI18n } from "@/i18n";
 import ChevronDown from "lucide-react/dist/esm/icons/chevron-down";
 import { revealItemInDir } from "@tauri-apps/plugin-opener";
 import * as Sentry from "@sentry/react";
@@ -39,6 +40,7 @@ export function OpenAppMenu({
   onSelectOpenAppId,
   iconById = {},
 }: OpenAppMenuProps) {
+  const { tx } = useI18n();
   const openMenu = useMenuController();
   const { isOpen: openMenuOpen, containerRef: openMenuRef } = openMenu;
   const availableTargets =
@@ -104,7 +106,7 @@ export function OpenAppMenu({
       },
     });
     pushErrorToast({
-      title: "Couldn’t open workspace",
+      title: tx("Couldn’t open workspace"),
       message,
     });
     console.warn("Failed to open workspace in target app", {
@@ -177,10 +179,10 @@ export function OpenAppMenu({
 
   const selectedCanOpen = canOpenTarget(selectedOpenTarget);
   const openLabel = selectedCanOpen
-    ? `Open in ${selectedOpenTarget.label}`
+    ? tx("Open in {app}", { app: selectedOpenTarget.label })
     : selectedOpenTarget.target.kind === "command"
-      ? "Set command in Settings"
-      : "Set app name in Settings";
+      ? tx("Set command in Settings")
+      : tx("Set app name in Settings");
 
   return (
     <SplitActionMenu
@@ -194,7 +196,7 @@ export function OpenAppMenu({
           onClick={handleOpen}
           disabled={!selectedCanOpen}
           data-tauri-drag-region="false"
-          aria-label={`Open in ${selectedOpenTarget.label}`}
+          aria-label={tx("Open in {app}", { app: selectedOpenTarget.label })}
           title={openLabel}
           data-tooltip={openLabel}
           data-tooltip-placement="bottom"
@@ -213,9 +215,9 @@ export function OpenAppMenu({
       isOpen={openMenuOpen}
       onToggle={openMenu.toggle}
       toggleClassName="ghost main-header-action open-app-toggle ds-tooltip-trigger"
-      toggleAriaLabel="Select editor"
-      toggleTitle="Select editor"
-      toggleTooltip="Select editor"
+      toggleAriaLabel={tx("Select editor")}
+      toggleTitle={tx("Select editor")}
+      toggleTooltip={tx("Select editor")}
       toggleTooltipPlacement="bottom"
       toggleIcon={<ChevronDown size={14} aria-hidden />}
       popoverClassName="open-app-dropdown"
diff --git a/src/features/app/components/PlanReadyFollowupMessage.tsx b/src/features/app/components/PlanReadyFollowupMessage.tsx
index 7e5d78f8d..afe181473 100644
--- a/src/features/app/components/PlanReadyFollowupMessage.tsx
+++ b/src/features/app/components/PlanReadyFollowupMessage.tsx
@@ -1,4 +1,5 @@
 import { useMemo, useState } from "react";
+import { useI18n } from "@/i18n";
 
 type PlanReadyFollowupMessageProps = {
   onAccept: () => void;
@@ -9,6 +10,7 @@ export function PlanReadyFollowupMessage({
   onAccept,
   onSubmitChanges,
 }: PlanReadyFollowupMessageProps) {
+  const { tx } = useI18n();
   const [changes, setChanges] = useState("");
   const trimmed = useMemo(() => changes.trim(), [changes]);
 
@@ -17,19 +19,19 @@ export function PlanReadyFollowupMessage({
       <div
         className="bubble request-user-input-card"
         role="group"
-        aria-label="Plan ready"
+        aria-label={tx("Plan ready")}
       >
         <div className="request-user-input-header">
-          <div className="request-user-input-title">Plan ready</div>
+          <div className="request-user-input-title">{tx("Plan ready")}</div>
         </div>
         <div className="request-user-input-body">
           <section className="request-user-input-question">
             <div className="request-user-input-question-text">
-              Start building from this plan, or describe changes to the plan.
+              {tx("Start building from this plan, or describe changes to the plan.")}
             </div>
             <textarea
               className="request-user-input-notes"
-              placeholder="Describe what you want to change in the plan..."
+              placeholder={tx("Describe what you want to change in the plan...")}
               value={changes}
               onChange={(event) => setChanges(event.target.value)}
               rows={3}
@@ -49,10 +51,10 @@ export function PlanReadyFollowupMessage({
             }}
             disabled={!trimmed}
           >
-            Send changes
+            {tx("Send changes")}
           </button>
           <button type="button" className="primary" onClick={onAccept}>
-            Implement this plan
+            {tx("Implement this plan")}
           </button>
         </div>
       </div>
diff --git a/src/features/app/components/RequestUserInputMessage.tsx b/src/features/app/components/RequestUserInputMessage.tsx
index ab2ff115e..cd297a91b 100644
--- a/src/features/app/components/RequestUserInputMessage.tsx
+++ b/src/features/app/components/RequestUserInputMessage.tsx
@@ -1,4 +1,5 @@
 import { useEffect, useMemo, useState } from "react";
+import { useI18n } from "@/i18n";
 import type {
   RequestUserInputRequest,
   RequestUserInputResponse,
@@ -23,6 +24,7 @@ export function RequestUserInputMessage({
   activeWorkspaceId,
   onSubmit,
 }: RequestUserInputMessageProps) {
+  const { tx } = useI18n();
   const activeRequests = useMemo(
     () =>
       requests.filter((request) => {
@@ -116,13 +118,13 @@ export function RequestUserInputMessage({
       <div
         className="bubble request-user-input-card"
         role="group"
-        aria-label="User input requested"
+        aria-label={tx("User input requested")}
       >
         <div className="request-user-input-header">
-          <div className="request-user-input-title">Input requested</div>
+          <div className="request-user-input-title">{tx("Input requested")}</div>
           {totalRequests > 1 ? (
             <div className="request-user-input-queue">
-              {`Request 1 of ${totalRequests}`}
+              {tx("Request 1 of {count}", { count: totalRequests })}
             </div>
           ) : null}
         </div>
@@ -133,10 +135,10 @@ export function RequestUserInputMessage({
               const selectedIndex = selections[questionId];
               const options = question.options ?? [];
               const notePlaceholder = question.isOther
-                ? "Type your answer (optional)"
+                ? tx("Type your answer (optional)")
                 : options.length
-                ? "Add notes (optional)"
-                : "Type your answer (optional)";
+                  ? tx("Add notes (optional)")
+                  : tx("Type your answer (optional)");
               return (
                 <section key={questionId} className="request-user-input-question">
                   {question.header ? (
@@ -184,13 +186,13 @@ export function RequestUserInputMessage({
             })
           ) : (
             <div className="request-user-input-empty">
-              No questions provided.
+              {tx("No questions provided.")}
             </div>
           )}
         </div>
         <div className="request-user-input-actions">
           <button className="primary" onClick={handleSubmit}>
-            Submit
+            {tx("Submit")}
           </button>
         </div>
       </div>
diff --git a/src/features/app/components/Sidebar.tsx b/src/features/app/components/Sidebar.tsx
index 395d62010..c62559a03 100644
--- a/src/features/app/components/Sidebar.tsx
+++ b/src/features/app/components/Sidebar.tsx
@@ -9,6 +9,7 @@ import type {
 } from "../../../types";
 import { memo, useCallback, useEffect, useMemo, useState } from "react";
 import type { MouseEvent, RefObject } from "react";
+import { useI18n } from "@/i18n";
 import { FolderOpen } from "lucide-react";
 import { SidebarBottomRail } from "./SidebarBottomRail";
 import { SidebarHeader } from "./SidebarHeader";
@@ -217,6 +218,7 @@ export const Sidebar = memo(function Sidebar({
   onWorkspaceDragLeave,
   onWorkspaceDrop,
 }: SidebarProps) {
+  const { tx } = useI18n();
   const [expandedWorkspaces, setExpandedWorkspaces] = useState(
     new Set<string>(),
   );
@@ -358,9 +360,9 @@ export const Sidebar = memo(function Sidebar({
   const accountButtonLabel = accountEmail
     ? accountEmail
     : accountInfo?.type === "apikey"
-      ? "API key"
-      : "Sign in to Codex";
-  const accountActionLabel = accountEmail ? "Switch account" : "Sign in";
+      ? tx("API key")
+      : tx("Sign in to Codex");
+  const accountActionLabel = accountEmail ? tx("Switch account") : tx("Sign in");
   const showAccountSwitcher = Boolean(activeWorkspaceId);
   const accountSwitchDisabled = accountSwitching || !activeWorkspaceId;
   const accountCancelDisabled = !accountSwitching || !activeWorkspaceId;
@@ -906,7 +908,7 @@ export const Sidebar = memo(function Sidebar({
           {workspaceDropText === "Drop Project Here" && (
             <FolderOpen className="workspace-drop-overlay-icon" aria-hidden />
           )}
-          {workspaceDropText}
+          {tx(workspaceDropText)}
         </div>
       </div>
       <div
@@ -920,7 +922,7 @@ export const Sidebar = memo(function Sidebar({
           {pinnedThreadRows.length > 0 && (
             <div className="pinned-section">
               <div className="sidebar-section-header">
-                <div className="sidebar-section-title">Pinned conversations</div>
+                <div className="sidebar-section-title">{tx("Pinned conversations")}</div>
                 <div className="sidebar-section-count">{pinnedRootCount}</div>
               </div>
               <PinnedThreadList
@@ -1015,15 +1017,15 @@ export const Sidebar = memo(function Sidebar({
           {!groupedWorkspacesForRender.length && (
             <div className="empty">
               {isSearchActive
-                ? "No conversations match your search."
-                : "Add a workspace to start."}
+                ? tx("No conversations match your search.")
+                : tx("Add a workspace to start.")}
             </div>
           )}
           {isThreadsOnlyMode &&
             groupedWorkspacesForRender.length > 0 &&
             flatThreadRows.length === 0 &&
             pinnedThreadRows.length === 0 && (
-              <div className="empty">No conversations yet.</div>
+              <div className="empty">{tx("No conversations yet.")}</div>
             )}
         </div>
       </div>
diff --git a/src/features/app/components/SidebarBottomRail.tsx b/src/features/app/components/SidebarBottomRail.tsx
index e14576399..de5dd0196 100644
--- a/src/features/app/components/SidebarBottomRail.tsx
+++ b/src/features/app/components/SidebarBottomRail.tsx
@@ -3,6 +3,7 @@ import Settings from "lucide-react/dist/esm/icons/settings";
 import User from "lucide-react/dist/esm/icons/user";
 import X from "lucide-react/dist/esm/icons/x";
 import { useEffect } from "react";
+import { useI18n } from "@/i18n";
 import {
   MenuTrigger,
   PopoverSurface,
@@ -71,6 +72,7 @@ export function SidebarBottomRail({
   onSwitchAccount,
   onCancelSwitchAccount,
 }: SidebarBottomRailProps) {
+  const { tx } = useI18n();
   const accountMenu = useMenuController();
   const {
     isOpen: accountMenuOpen,
@@ -89,18 +91,18 @@ export function SidebarBottomRail({
     <div className="sidebar-bottom-rail">
       <div className="sidebar-usage-panel">
         <div className="sidebar-usage-header">
-          <div className="sidebar-usage-kicker">Usage</div>
+          <div className="sidebar-usage-kicker">{tx("Usage")}</div>
           {creditsLabel && <div className="sidebar-usage-credits">{creditsLabel}</div>}
         </div>
         <div className="sidebar-usage-list">
           <UsageRow
-            label="Session"
+            label={tx("Session")}
             percent={sessionPercent}
             resetLabel={sessionResetLabel}
           />
           {showWeekly && (
             <UsageRow
-              label="Weekly"
+              label={tx("Weekly")}
               percent={weeklyPercent}
               resetLabel={weeklyResetLabel}
             />
@@ -118,18 +120,18 @@ export function SidebarBottomRail({
               className="ghost sidebar-labeled-button sidebar-account-trigger"
               activeClassName="is-open"
               onClick={toggleAccountMenu}
-              aria-label="Account"
+              aria-label={tx("Account")}
             >
               <span className="sidebar-account-trigger-content">
                 <span className="sidebar-account-avatar" aria-hidden>
                   <User size={12} aria-hidden />
                 </span>
-                <span className="sidebar-account-trigger-label">Account</span>
+                <span className="sidebar-account-trigger-label">{tx("Account")}</span>
               </span>
             </MenuTrigger>
             {accountMenuOpen && (
               <PopoverSurface className="sidebar-account-popover" role="dialog">
-                <div className="sidebar-account-title">Account</div>
+                <div className="sidebar-account-title">{tx("Account")}</div>
                 <div className="sidebar-account-value">{accountLabel}</div>
                 <div className="sidebar-account-actions-row">
                   <button
@@ -143,7 +145,7 @@ export function SidebarBottomRail({
                       {accountSwitching && (
                         <span className="sidebar-account-spinner" aria-hidden />
                       )}
-                      <span>{accountActionLabel}</span>
+                      <span>{tx(accountActionLabel)}</span>
                     </span>
                   </button>
                   {accountSwitching && (
@@ -152,8 +154,8 @@ export function SidebarBottomRail({
                       className="secondary sidebar-account-cancel"
                       onClick={onCancelSwitchAccount}
                       disabled={accountCancelDisabled}
-                      aria-label="Cancel account switch"
-                      title="Cancel"
+                      aria-label={tx("Cancel account switch")}
+                      title={tx("Cancel")}
                     >
                       <X size={12} aria-hidden />
                     </button>
@@ -168,19 +170,19 @@ export function SidebarBottomRail({
               className="ghost sidebar-labeled-button sidebar-utility-button"
               type="button"
               onClick={onOpenSettings}
-              aria-label="Open settings"
+              aria-label={tx("Open settings")}
             >
               <span className="sidebar-labeled-button-icon" aria-hidden>
                 <Settings size={14} aria-hidden />
               </span>
-              <span>Settings</span>
+              <span>{tx("Settings")}</span>
             </button>
           {showDebugButton && (
             <button
               className="ghost sidebar-utility-button"
               type="button"
               onClick={onOpenDebug}
-              aria-label="Open debug log"
+              aria-label={tx("Open debug log")}
             >
               <ScrollText size={14} aria-hidden />
             </button>
diff --git a/src/features/app/components/SidebarHeader.tsx b/src/features/app/components/SidebarHeader.tsx
index b3c2a5752..5f74fdf02 100644
--- a/src/features/app/components/SidebarHeader.tsx
+++ b/src/features/app/components/SidebarHeader.tsx
@@ -8,6 +8,7 @@ import ListTree from "lucide-react/dist/esm/icons/list-tree";
 import RefreshCw from "lucide-react/dist/esm/icons/refresh-cw";
 import Search from "lucide-react/dist/esm/icons/search";
 import { useCallback, useEffect, useRef, useState } from "react";
+import { useI18n } from "@/i18n";
 import type { ThreadListOrganizeMode, ThreadListSortKey } from "../../../types";
 import {
   MenuTrigger,
@@ -43,6 +44,7 @@ export function SidebarHeader({
   refreshDisabled = false,
   refreshInProgress = false,
 }: SidebarHeaderProps) {
+  const { tx } = useI18n();
   const sortMenu = useMenuController();
   const { isOpen: sortMenuOpen, containerRef: sortMenuRef } = sortMenu;
   const sortMenuPopoverRef = useRef<HTMLDivElement | null>(null);
@@ -129,8 +131,8 @@ export function SidebarHeader({
             className="sidebar-title-add ds-tooltip-trigger"
             onClick={onAddWorkspace}
             data-tauri-drag-region="false"
-            aria-label="Add workspaces"
-            data-tooltip="Add workspaces"
+            aria-label={tx("Add workspaces")}
+            data-tooltip={tx("Add workspaces")}
             data-tooltip-align="start"
             data-tooltip-placement="bottom"
             type="button"
@@ -141,9 +143,9 @@ export function SidebarHeader({
             className="subtitle subtitle-button sidebar-title-button"
             onClick={onSelectHome}
             data-tauri-drag-region="false"
-            aria-label="Open home"
+            aria-label={tx("Open home")}
           >
-            Projects
+            {tx("Projects")}
           </button>
         </div>
       </div>
@@ -155,9 +157,9 @@ export function SidebarHeader({
             className="ghost sidebar-sort-toggle ds-tooltip-trigger"
             onClick={sortMenu.toggle}
             data-tauri-drag-region="false"
-            aria-label="Organize and sort threads"
-            title="Organize and sort threads"
-            data-tooltip="Organize and sort threads"
+            aria-label={tx("Organize and sort threads")}
+            title={tx("Organize and sort threads")}
+            data-tooltip={tx("Organize and sort threads")}
             data-tooltip-align="end"
             data-tooltip-placement="bottom"
           >
@@ -174,7 +176,7 @@ export function SidebarHeader({
                   : undefined
               }
             >
-              <div className="sidebar-sort-section-label">Organize</div>
+              <div className="sidebar-sort-section-label">{tx("Organize")}</div>
               <PopoverMenuItem
                 className="sidebar-sort-option"
                 role="menuitemradio"
@@ -184,7 +186,7 @@ export function SidebarHeader({
                 icon={<FolderTree aria-hidden />}
                 active={threadListOrganizeMode === "by_project"}
               >
-                By project
+                {tx("By project")}
               </PopoverMenuItem>
               <PopoverMenuItem
                 className="sidebar-sort-option"
@@ -195,7 +197,7 @@ export function SidebarHeader({
                 icon={<BetweenHorizontalStart aria-hidden />}
                 active={threadListOrganizeMode === "by_project_activity"}
               >
-                By project activity
+                {tx("By project activity")}
               </PopoverMenuItem>
               <PopoverMenuItem
                 className="sidebar-sort-option"
@@ -206,10 +208,10 @@ export function SidebarHeader({
                 icon={<ListTree aria-hidden />}
                 active={threadListOrganizeMode === "threads_only"}
               >
-                Thread list
+                {tx("Thread list")}
               </PopoverMenuItem>
               <div className="sidebar-sort-divider" aria-hidden />
-              <div className="sidebar-sort-section-label">Sort by</div>
+              <div className="sidebar-sort-section-label">{tx("Sort by")}</div>
               <PopoverMenuItem
                 className="sidebar-sort-option"
                 role="menuitemradio"
@@ -219,7 +221,7 @@ export function SidebarHeader({
                 icon={<ArrowDownUp aria-hidden />}
                 active={threadListSortKey === "updated_at"}
               >
-                Updated
+                {tx("Updated")}
               </PopoverMenuItem>
               <PopoverMenuItem
                 className="sidebar-sort-option"
@@ -230,7 +232,7 @@ export function SidebarHeader({
                 icon={<Calendar aria-hidden />}
                 active={threadListSortKey === "created_at"}
               >
-                Created
+                {tx("Created")}
               </PopoverMenuItem>
             </PopoverSurface>
           )}
@@ -239,10 +241,10 @@ export function SidebarHeader({
           className="ghost sidebar-refresh-toggle ds-tooltip-trigger"
           onClick={onRefreshAllThreads}
           data-tauri-drag-region="false"
-          aria-label="Refresh all workspace threads"
+          aria-label={tx("Refresh all workspace threads")}
           type="button"
-          title="Refresh all workspace threads"
-          data-tooltip="Refresh all workspace threads"
+          title={tx("Refresh all workspace threads")}
+          data-tooltip={tx("Refresh all workspace threads")}
           data-tooltip-align="end"
           data-tooltip-placement="bottom"
           disabled={refreshDisabled}
@@ -257,8 +259,8 @@ export function SidebarHeader({
           className={`ghost sidebar-search-toggle ds-tooltip-trigger${isSearchOpen ? " is-active" : ""}`}
           onClick={onToggleSearch}
           data-tauri-drag-region="false"
-          aria-label="Toggle search"
-          data-tooltip={isSearchOpen ? "Close search" : "Search threads"}
+          aria-label={tx("Toggle search")}
+          data-tooltip={isSearchOpen ? tx("Close search") : tx("Search threads")}
           data-tooltip-align="end"
           data-tooltip-placement="bottom"
           aria-pressed={isSearchOpen}
diff --git a/src/features/app/components/SidebarSearchBar.tsx b/src/features/app/components/SidebarSearchBar.tsx
index 9a22b0b86..7593901c2 100644
--- a/src/features/app/components/SidebarSearchBar.tsx
+++ b/src/features/app/components/SidebarSearchBar.tsx
@@ -1,4 +1,5 @@
 import X from "lucide-react/dist/esm/icons/x";
+import { useI18n } from "@/i18n";
 
 type SidebarSearchBarProps = {
   isSearchOpen: boolean;
@@ -13,6 +14,8 @@ export function SidebarSearchBar({
   onSearchQueryChange,
   onClearSearch,
 }: SidebarSearchBarProps) {
+  const { tx } = useI18n();
+
   return (
     <div className={`sidebar-search${isSearchOpen ? " is-open" : ""}`}>
       {isSearchOpen && (
@@ -20,8 +23,8 @@ export function SidebarSearchBar({
           className="sidebar-search-input"
           value={searchQuery}
           onChange={(event) => onSearchQueryChange(event.target.value)}
-          placeholder="Search conversations"
-          aria-label="Search conversations"
+          placeholder={tx("Search conversations")}
+          aria-label={tx("Search conversations")}
           data-tauri-drag-region="false"
           autoFocus
         />
@@ -31,7 +34,7 @@ export function SidebarSearchBar({
           type="button"
           className="sidebar-search-clear"
           onClick={onClearSearch}
-          aria-label="Clear search"
+          aria-label={tx("Clear search")}
           data-tauri-drag-region="false"
         >
           <X size={12} aria-hidden />
diff --git a/src/features/app/components/SidebarThreadsOnlySection.tsx b/src/features/app/components/SidebarThreadsOnlySection.tsx
index 2936e6ef0..81f1e44f6 100644
--- a/src/features/app/components/SidebarThreadsOnlySection.tsx
+++ b/src/features/app/components/SidebarThreadsOnlySection.tsx
@@ -1,5 +1,6 @@
 import { createPortal } from "react-dom";
 import type { MouseEvent, MutableRefObject } from "react";
+import { useI18n } from "@/i18n";
 import Plus from "lucide-react/dist/esm/icons/plus";
 
 import type { ThreadSummary, WorkspaceInfo } from "../../../types";
@@ -55,16 +56,18 @@ export function SidebarThreadsOnlySection({
   onToggleAddMenu,
   onCreateThreadInProject,
 }: SidebarThreadsOnlySectionProps) {
+  const { tx } = useI18n();
+
   return (
     <div className="workspace-group">
       <div className="sidebar-section-header workspace-group-header-all-threads">
-        <div className="sidebar-section-title">Recent conversations</div>
+        <div className="sidebar-section-title">{tx("Recent conversations")}</div>
         <button
           className="ghost all-threads-add"
           onClick={onToggleAddMenu}
           data-tauri-drag-region="false"
-          aria-label="New thread in project"
-          title="New thread in project"
+          aria-label={tx("New thread in project")}
+          title={tx("New thread in project")}
           aria-expanded={addMenuOpen}
           disabled={projectOptionsForNewThread.length === 0}
         >
@@ -74,7 +77,7 @@ export function SidebarThreadsOnlySection({
       {threadBuckets.map((bucket) => (
         <div key={bucket.id} className="thread-bucket">
           <div className="thread-bucket-header">
-            <div className="thread-bucket-label">{bucket.label}</div>
+            <div className="thread-bucket-label">{tx(bucket.label)}</div>
           </div>
           <PinnedThreadList
             rows={bucket.rows}
diff --git a/src/features/app/components/SidebarWorkspaceGroups.tsx b/src/features/app/components/SidebarWorkspaceGroups.tsx
index f440d4b20..85d33bd15 100644
--- a/src/features/app/components/SidebarWorkspaceGroups.tsx
+++ b/src/features/app/components/SidebarWorkspaceGroups.tsx
@@ -1,5 +1,6 @@
 import { createPortal } from "react-dom";
 import type { MouseEvent, MutableRefObject, ReactNode } from "react";
+import { useI18n } from "@/i18n";
 import Copy from "lucide-react/dist/esm/icons/copy";
 import GitBranch from "lucide-react/dist/esm/icons/git-branch";
 import Plus from "lucide-react/dist/esm/icons/plus";
@@ -141,6 +142,7 @@ function SidebarWorkspaceEntry({
   onLoadOlderThreads,
   onToggleAddMenu,
 }: SidebarWorkspaceEntryProps) {
+  const { tx } = useI18n();
   if (cloneChildIds.has(workspace.id)) {
     return null;
   }
@@ -194,18 +196,28 @@ function SidebarWorkspaceEntry({
     !activeThreadId;
   const draftStatusClass =
     startingDraftThreadWorkspaceId === workspace.id ? "processing" : "ready";
+  const workspaceSummary =
+    displayThreadRootCount > 0
+      ? tx(
+          threads[0]
+            ? displayThreadRootCount === 1
+              ? "{count} conversation · Updated {time}"
+              : "{count} conversations · Updated {time}"
+            : displayThreadRootCount === 1
+              ? "{count} conversation"
+              : "{count} conversations",
+          {
+            count: displayThreadRootCount,
+            time: threads[0] ? (getThreadTime(threads[0]) ?? "") : "",
+          },
+        )
+      : tx("No conversations yet");
 
   return (
     <WorkspaceCard
       workspace={workspace}
       workspaceName={renderHighlightedName(workspace.name)}
-      summary={
-        displayThreadRootCount > 0
-          ? `${displayThreadRootCount} conversation${
-              displayThreadRootCount === 1 ? "" : "s"
-            }${threads[0] ? ` · Updated ${getThreadTime(threads[0])}` : ""}`
-          : "No conversations yet"
-      }
+      summary={workspaceSummary}
       isActive={workspace.id === activeWorkspaceId}
       isCollapsed={isCollapsed}
       addMenuOpen={addMenuOpen}
@@ -236,7 +248,7 @@ function SidebarWorkspaceEntry({
               }}
               icon={<Plus aria-hidden />}
             >
-              New agent
+              {tx("New agent")}
             </PopoverMenuItem>
             <PopoverMenuItem
               className="workspace-add-option"
@@ -247,7 +259,7 @@ function SidebarWorkspaceEntry({
               }}
               icon={<GitBranch aria-hidden />}
             >
-              New worktree agent
+              {tx("New worktree agent")}
             </PopoverMenuItem>
             <PopoverMenuItem
               className="workspace-add-option"
@@ -258,7 +270,7 @@ function SidebarWorkspaceEntry({
               }}
               icon={<Copy aria-hidden />}
             >
-              New clone agent
+              {tx("New clone agent")}
             </PopoverMenuItem>
           </PopoverSurface>,
           document.body,
@@ -279,7 +291,7 @@ function SidebarWorkspaceEntry({
           <span className={`thread-status ${draftStatusClass}`} aria-hidden />
           <div className="thread-content">
             <div className="thread-headline">
-              <span className="thread-name">New Agent</span>
+              <span className="thread-name">{tx("New Agent")}</span>
             </div>
           </div>
         </div>
diff --git a/src/features/app/components/ThreadList.tsx b/src/features/app/components/ThreadList.tsx
index a84efe586..2f4ae2143 100644
--- a/src/features/app/components/ThreadList.tsx
+++ b/src/features/app/components/ThreadList.tsx
@@ -1,4 +1,5 @@
 import { useMemo, useState, type MouseEvent } from "react";
+import { useI18n } from "@/i18n";
 
 import type { ThreadSummary } from "../../../types";
 import type { ThreadStatusById } from "../../../utils/threadStatus";
@@ -62,6 +63,7 @@ export function ThreadList({
   onSelectThread,
   onShowThreadMenu,
 }: ThreadListProps) {
+  const { tx } = useI18n();
   const indentUnit = nested ? 10 : 14;
   const [collapsedThreadKeys, setCollapsedThreadKeys] = useState<Set<string>>(new Set());
 
@@ -150,7 +152,7 @@ export function ThreadList({
             onToggleExpanded(workspaceId);
           }}
         >
-          {isExpanded ? "Show less" : "More..."}
+          {isExpanded ? tx("Show less") : tx("More...")}
         </button>
       )}
       {showLoadOlder && nextCursor && (isExpanded || totalThreadRoots <= 3) && (
@@ -163,10 +165,10 @@ export function ThreadList({
           disabled={isPaging}
         >
           {isPaging
-            ? "Loading..."
+            ? tx("Loading...")
             : totalThreadRoots === 0
-              ? "Search older..."
-              : "Load older..."}
+              ? tx("Search older...")
+              : tx("Load older...")}
         </button>
       )}
     </div>
diff --git a/src/features/app/components/ThreadLoading.tsx b/src/features/app/components/ThreadLoading.tsx
index 8d37c0804..909ea05b4 100644
--- a/src/features/app/components/ThreadLoading.tsx
+++ b/src/features/app/components/ThreadLoading.tsx
@@ -1,12 +1,16 @@
+import { useI18n } from "@/i18n";
+
 type ThreadLoadingProps = {
   nested?: boolean;
 };
 
 export function ThreadLoading({ nested }: ThreadLoadingProps) {
+  const { tx } = useI18n();
+
   return (
     <div
       className={`thread-loading${nested ? " thread-loading-nested" : ""}`}
-      aria-label="Loading agents"
+      aria-label={tx("Loading agents")}
     >
       <span className="thread-skeleton thread-skeleton-wide" />
       <span className="thread-skeleton" />
diff --git a/src/features/app/components/ThreadRow.tsx b/src/features/app/components/ThreadRow.tsx
index de5926ab2..9098345b1 100644
--- a/src/features/app/components/ThreadRow.tsx
+++ b/src/features/app/components/ThreadRow.tsx
@@ -1,4 +1,5 @@
 import type { CSSProperties, MouseEvent } from "react";
+import { useI18n } from "@/i18n";
 
 import type { ThreadSummary } from "../../../types";
 import { getThreadStatusClass, type ThreadStatusById } from "../../../utils/threadStatus";
@@ -86,6 +87,7 @@ export function ThreadRow({
   onToggleSubagents,
   showPinnedLabel = true,
 }: ThreadRowProps) {
+  const { tx } = useI18n();
   const relativeTime = getThreadTime(thread);
   const badge = getThreadArgsBadge?.(workspaceId, thread.id) ?? null;
   const modelBadge =
@@ -107,9 +109,9 @@ export function ThreadRow({
   );
   const statusLabel =
     statusClass === "reviewing"
-      ? "Reviewing"
+      ? tx("Reviewing")
       : hasPendingUserInput
-        ? "Waiting"
+        ? tx("Waiting")
         : null;
   const subagentLabel =
     thread.isSubagent && (thread.subagentNickname || thread.subagentRole)
@@ -197,7 +199,9 @@ export function ThreadRow({
                 {contextLabel}
               </span>
             )}
-            {showPinnedLabel && isPinned && <span className="thread-pinned-label">Pinned</span>}
+            {showPinnedLabel && isPinned && (
+              <span className="thread-pinned-label">{tx("Pinned")}</span>
+            )}
           </div>
         )}
       </div>
@@ -211,10 +215,10 @@ export function ThreadRow({
               onToggleSubagents?.(workspaceId, thread.id);
             }}
             data-tauri-drag-region="false"
-            aria-label={subagentsExpanded ? "Hide sub-agents" : "Show sub-agents"}
+            aria-label={subagentsExpanded ? tx("Hide sub-agents") : tx("Show sub-agents")}
             aria-expanded={subagentsExpanded}
           >
-            <span className="thread-subagent-time-label">{relativeTime ?? "Now"}</span>
+            <span className="thread-subagent-time-label">{relativeTime ?? tx("Now")}</span>
             <span className="thread-subagent-toggle-icon" aria-hidden>
               ›
             </span>
diff --git a/src/features/app/components/WorkspaceCard.tsx b/src/features/app/components/WorkspaceCard.tsx
index dae94c00b..c1546163d 100644
--- a/src/features/app/components/WorkspaceCard.tsx
+++ b/src/features/app/components/WorkspaceCard.tsx
@@ -1,4 +1,5 @@
 import type { MouseEvent } from "react";
+import { useI18n } from "@/i18n";
 
 import type { WorkspaceInfo } from "../../../types";
 
@@ -38,6 +39,7 @@ export function WorkspaceCard({
   onToggleAddMenu,
   children,
 }: WorkspaceCardProps) {
+  const { tx } = useI18n();
   const contentCollapsedClass = isCollapsed ? " collapsed" : "";
 
   return (
@@ -66,7 +68,7 @@ export function WorkspaceCard({
                   onToggleWorkspaceCollapse(workspace.id, !isCollapsed);
                 }}
                 data-tauri-drag-region="false"
-                aria-label={isCollapsed ? "Show agents" : "Hide agents"}
+                aria-label={isCollapsed ? tx("Show agents") : tx("Hide agents")}
                 aria-expanded={!isCollapsed}
               >
                 <span className="workspace-toggle-icon">›</span>
@@ -98,7 +100,7 @@ export function WorkspaceCard({
               );
             }}
             data-tauri-drag-region="false"
-            aria-label="Add agent options"
+            aria-label={tx("Add agent options")}
             aria-expanded={addMenuOpen}
           >
             +
@@ -106,13 +108,13 @@ export function WorkspaceCard({
           {!workspace.connected && (
             <span
               className="connect"
-              title="Connect workspace context to the shared Codex server"
+              title={tx("Connect workspace context to the shared Codex server")}
               onClick={(event) => {
                 event.stopPropagation();
                 onConnectWorkspace(workspace);
               }}
             >
-              connect
+              {tx("connect")}
             </span>
           )}
         </div>
diff --git a/src/features/app/components/WorkspaceGroup.tsx b/src/features/app/components/WorkspaceGroup.tsx
index 6c03a9d12..f657efeff 100644
--- a/src/features/app/components/WorkspaceGroup.tsx
+++ b/src/features/app/components/WorkspaceGroup.tsx
@@ -1,3 +1,5 @@
+import { useI18n } from "@/i18n";
+
 type WorkspaceGroupProps = {
   toggleId: string | null;
   name: string;
@@ -15,6 +17,7 @@ export function WorkspaceGroup({
   onToggleCollapse,
   children,
 }: WorkspaceGroupProps) {
+  const { tx } = useI18n();
   const isToggleable = Boolean(toggleId);
   return (
     <div className="workspace-group">
@@ -39,7 +42,13 @@ export function WorkspaceGroup({
               : undefined
           }
           role={isToggleable ? "button" : undefined}
-          aria-label={isToggleable ? `${isCollapsed ? "Expand" : "Collapse"} group` : undefined}
+          aria-label={
+            isToggleable
+              ? isCollapsed
+                ? tx("Expand group")
+                : tx("Collapse group")
+              : undefined
+          }
           aria-expanded={isToggleable ? !isCollapsed : undefined}
           tabIndex={isToggleable ? 0 : undefined}
         >
@@ -54,7 +63,7 @@ export function WorkspaceGroup({
                 }
                 onToggleCollapse(toggleId);
               }}
-              aria-label={isCollapsed ? "Expand group" : "Collapse group"}
+              aria-label={isCollapsed ? tx("Expand group") : tx("Collapse group")}
               aria-expanded={!isCollapsed}
               type="button"
             >
diff --git a/src/features/app/components/WorktreeCard.tsx b/src/features/app/components/WorktreeCard.tsx
index b38e3da36..c36d417ef 100644
--- a/src/features/app/components/WorktreeCard.tsx
+++ b/src/features/app/components/WorktreeCard.tsx
@@ -1,4 +1,5 @@
 import type { MouseEvent } from "react";
+import { useI18n } from "@/i18n";
 
 import type { WorkspaceInfo } from "../../../types";
 
@@ -23,6 +24,7 @@ export function WorktreeCard({
   onConnectWorkspace,
   children,
 }: WorktreeCardProps) {
+  const { tx } = useI18n();
   const worktreeCollapsed = worktree.settings.sidebarCollapsed;
   const worktreeBranch = worktree.worktree?.branch ?? "";
   const worktreeLabel = worktree.name?.trim() || worktreeBranch;
@@ -65,7 +67,7 @@ export function WorktreeCard({
           {isDeleting ? (
             <div className="worktree-deleting" role="status" aria-live="polite">
               <span className="worktree-deleting-spinner" aria-hidden />
-              <span className="worktree-deleting-label">Deleting</span>
+              <span className="worktree-deleting-label">{tx("Deleting")}</span>
             </div>
           ) : (
             <>
@@ -76,7 +78,7 @@ export function WorktreeCard({
                   onToggleWorkspaceCollapse(worktree.id, !worktreeCollapsed);
                 }}
                 data-tauri-drag-region="false"
-                aria-label={worktreeCollapsed ? "Show agents" : "Hide agents"}
+                aria-label={worktreeCollapsed ? tx("Show agents") : tx("Hide agents")}
                 aria-expanded={!worktreeCollapsed}
               >
                 <span className="worktree-toggle-icon">›</span>
@@ -84,13 +86,13 @@ export function WorktreeCard({
               {!worktree.connected && (
                 <span
                   className="connect"
-                  title="Connect workspace context to the shared Codex server"
+                  title={tx("Connect workspace context to the shared Codex server")}
                   onClick={(event) => {
                     event.stopPropagation();
                     onConnectWorkspace(worktree);
                   }}
                 >
-                  connect
+                  {tx("connect")}
                 </span>
               )}
             </>
diff --git a/src/features/app/components/WorktreeSection.tsx b/src/features/app/components/WorktreeSection.tsx
index a417ed376..53c1e71fb 100644
--- a/src/features/app/components/WorktreeSection.tsx
+++ b/src/features/app/components/WorktreeSection.tsx
@@ -1,5 +1,6 @@
 import Layers from "lucide-react/dist/esm/icons/layers";
 import type { MouseEvent, ReactNode } from "react";
+import { useI18n } from "@/i18n";
 
 import type { ThreadSummary, WorkspaceInfo } from "../../../types";
 import type { ThreadStatusById } from "../../../utils/threadStatus";
@@ -91,6 +92,8 @@ export function WorktreeSection({
   sectionIcon,
   className,
 }: WorktreeSectionProps) {
+  const { tx } = useI18n();
+
   if (!worktrees.length) {
     return null;
   }
@@ -102,7 +105,7 @@ export function WorktreeSection({
           <span className="worktree-header-icon-wrap">
             {sectionIcon ?? <Layers className="worktree-header-icon" aria-hidden />}
           </span>
-          <span>{sectionLabel}</span>
+          <span>{tx(sectionLabel)}</span>
         </span>
         <span className="worktree-header-count">{worktrees.length}</span>
       </div>
diff --git a/src/features/app/hooks/useMainAppDisplayNodes.tsx b/src/features/app/hooks/useMainAppDisplayNodes.tsx
index 69b03d8b9..b56bec2d7 100644
--- a/src/features/app/hooks/useMainAppDisplayNodes.tsx
+++ b/src/features/app/hooks/useMainAppDisplayNodes.tsx
@@ -1,5 +1,6 @@
 import type { ComponentProps } from "react";
 import RefreshCw from "lucide-react/dist/esm/icons/refresh-cw";
+import { useI18n } from "@/i18n";
 import { MainHeaderActions } from "@app/components/MainHeaderActions";
 import { WorkspaceHome } from "@/features/workspaces/components/WorkspaceHome";
 
@@ -28,6 +29,8 @@ export function useMainAppDisplayNodes({
   sidebarToggleProps,
   workspaceHomeProps,
 }: UseMainAppDisplayNodesArgs) {
+  const { tx } = useI18n();
+  const refreshLabel = tx("Refresh current thread from server");
   const mainHeaderActionsNode = (
     <>
       {showCompactCodexThreadActions ? (
@@ -36,9 +39,9 @@ export function useMainAppDisplayNodes({
           className="ghost main-header-action ds-tooltip-trigger"
           onClick={handleMobileThreadRefresh}
           data-tauri-drag-region="false"
-          aria-label="Refresh current thread from server"
-          title="Refresh current thread from server"
-          data-tooltip="Refresh current thread from server"
+          aria-label={refreshLabel}
+          title={refreshLabel}
+          data-tooltip={refreshLabel}
           data-tooltip-placement="bottom"
           disabled={mobileThreadRefreshLoading}
         >
diff --git a/src/features/composer/components/Composer.tsx b/src/features/composer/components/Composer.tsx
index b9f7d6f71..7c9275a9e 100644
--- a/src/features/composer/components/Composer.tsx
+++ b/src/features/composer/components/Composer.tsx
@@ -44,6 +44,7 @@ import { ComposerMetaBar } from "./ComposerMetaBar";
 import { ComposerQueue } from "./ComposerQueue";
 import { isMacPlatform } from "../../../utils/platformPaths";
 import type { CodexArgsOption } from "../../threads/utils/codexArgsProfiles";
+import { useI18n } from "@/i18n";
 
 type ComposerProps = {
   onSend: (
@@ -244,6 +245,7 @@ export const Composer = memo(function Composer({
   onFileAutocompleteActiveChange,
   contextActions = [],
 }: ComposerProps) {
+  const { tx } = useI18n();
   const [text, setText] = useState(draftText);
   const [selectionStart, setSelectionStart] = useState<number | null>(null);
   const [appMentionBindings, setAppMentionBindings] = useState<AppMentionBinding[]>([]);
@@ -268,9 +270,9 @@ export const Composer = memo(function Composer({
     : "default";
   const effectiveSendLabel = isProcessing
     ? effectiveFollowUpBehavior === "steer"
-      ? "Steer"
-      : "Queue"
-    : sendLabel;
+      ? tx("Steer")
+      : tx("Queue")
+    : tx(sendLabel);
   const {
     expandFenceOnSpace,
     expandFenceOnEnter,
@@ -584,25 +586,25 @@ export const Composer = memo(function Composer({
       />
       {isProcessing && composerFollowUpHintEnabled && (
         <div className="composer-followup-hint" role="status" aria-live="polite">
-          <div className="composer-followup-title">Follow-up behavior</div>
+          <div className="composer-followup-title">{tx("Follow-up behavior")}</div>
           <div className="composer-followup-copy">
             {oppositeFallsBackToQueue ? (
-              <>
-                Default: Queue (Steer unavailable). Both Enter and {followUpShortcutLabel} will
-                queue this message.
-              </>
+              tx(
+                "Default: Queue (Steer unavailable). Both Enter and {shortcut} will queue this message.",
+                { shortcut: followUpShortcutLabel },
+              )
             ) : (
-              <>
-                Default: {effectiveFollowUpBehavior === "steer" ? "Steer" : "Queue"}. Press{" "}
-                {followUpShortcutLabel} to{" "}
-                {oppositeFollowUpIntent === "steer" ? "steer" : "queue"} this message.
-              </>
+              tx("Default: {behavior}. Press {shortcut} to {intent} this message.", {
+                behavior: effectiveFollowUpBehavior === "steer" ? tx("Steer") : tx("Queue"),
+                shortcut: followUpShortcutLabel,
+                intent: oppositeFollowUpIntent === "steer" ? tx("steer") : tx("queue"),
+              })
             )}
           </div>
         </div>
       )}
       {contextActions.length > 0 ? (
-        <div className="composer-context-actions" role="toolbar" aria-label="Review tools">
+        <div className="composer-context-actions" role="toolbar" aria-label={tx("Review tools")}>
           {contextActions.map((action) => (
             <button
               key={action.id}
@@ -614,7 +616,7 @@ export const Composer = memo(function Composer({
                 void action.onSelect();
               }}
             >
-              {action.label}
+              {tx(action.label)}
             </button>
           ))}
         </div>
diff --git a/src/features/composer/components/ComposerAttachments.tsx b/src/features/composer/components/ComposerAttachments.tsx
index f2934f57e..ed45944d9 100644
--- a/src/features/composer/components/ComposerAttachments.tsx
+++ b/src/features/composer/components/ComposerAttachments.tsx
@@ -1,6 +1,7 @@
 import { convertFileSrc } from "@tauri-apps/api/core";
 import Image from "lucide-react/dist/esm/icons/image";
 import X from "lucide-react/dist/esm/icons/x";
+import { useI18n } from "@/i18n";
 
 type ComposerAttachmentsProps = {
   attachments: string[];
@@ -39,6 +40,8 @@ export function ComposerAttachments({
   disabled,
   onRemoveAttachment,
 }: ComposerAttachmentsProps) {
+  const { tx } = useI18n();
+
   if (attachments.length === 0) {
     return null;
   }
@@ -46,8 +49,9 @@ export function ComposerAttachments({
   return (
     <div className="composer-attachments">
       {attachments.map((path) => {
-        const title = fileTitle(path);
-        const titleAttr = path.startsWith("data:") ? "Pasted image" : path;
+        const rawTitle = fileTitle(path);
+        const title = tx(rawTitle);
+        const titleAttr = path.startsWith("data:") ? tx("Pasted image") : path;
         const previewSrc = attachmentPreviewSrc(path);
         return (
           <div
@@ -74,7 +78,7 @@ export function ComposerAttachments({
               type="button"
               className="composer-attachment-remove"
               onClick={() => onRemoveAttachment?.(path)}
-              aria-label={`Remove ${title}`}
+              aria-label={tx("Remove {title}", { title })}
               disabled={disabled}
             >
               <X size={12} aria-hidden />
diff --git a/src/features/composer/components/ComposerInput.tsx b/src/features/composer/components/ComposerInput.tsx
index e6a3595e5..fea3c3f25 100644
--- a/src/features/composer/components/ComposerInput.tsx
+++ b/src/features/composer/components/ComposerInput.tsx
@@ -22,6 +22,7 @@ import { useComposerDictationControls } from "../hooks/useComposerDictationContr
 import { useComposerInputLayout } from "../hooks/useComposerInputLayout";
 import { useComposerMobileActions } from "../hooks/useComposerMobileActions";
 import type { ReviewPromptState, ReviewPromptStep } from "../../threads/hooks/useReviewPrompt";
+import { useI18n } from "@/i18n";
 
 type ComposerInputProps = {
   text: string;
@@ -136,6 +137,7 @@ export function ComposerInput({
   onReviewPromptUpdateCustomInstructions,
   onReviewPromptConfirmCustom,
 }: ComposerInputProps) {
+  const { tx } = useI18n();
   const suggestionListRef = useRef<HTMLDivElement | null>(null);
   const suggestionRefs = useRef<Array<HTMLButtonElement | null>>([]);
   const { isPhoneLayout, isPhoneTallInput } = useComposerInputLayout({
@@ -247,8 +249,8 @@ export function ComposerInput({
             className="composer-attach"
             onClick={onAddAttachment}
             disabled={disabled || !onAddAttachment}
-            aria-label="Add image"
-            title="Add image"
+            aria-label={tx("Add image")}
+            title={tx("Add image")}
           >
             <ImagePlus size={14} aria-hidden />
           </button>
@@ -275,8 +277,8 @@ export function ComposerInput({
             ref={textareaRef}
             placeholder={
               disabled
-                ? "Review in progress. Chat will re-enable when it completes."
-                : "Ask Codex to do something..."
+                ? tx("Review in progress. Chat will re-enable when it completes.")
+                : tx("Ask Codex to do something...")
             }
             value={text}
             onChange={handleTextareaChange}
@@ -297,8 +299,8 @@ export function ComposerInput({
                 }`}
                 onClick={onToggleExpand}
                 disabled={disabled}
-                aria-label={isExpanded ? "Collapse input" : "Expand input"}
-                title={isExpanded ? "Collapse input" : "Expand input"}
+                aria-label={isExpanded ? tx("Collapse input") : tx("Expand input")}
+                title={isExpanded ? tx("Collapse input") : tx("Expand input")}
               >
                 {isExpanded ? <ChevronDown aria-hidden /> : <ChevronUp aria-hidden />}
               </button>
@@ -328,8 +330,8 @@ export function ComposerInput({
               }`}
               onClick={handleActionClick}
               disabled={(disabled && !canStop) || isDictationBusy || (!canStop && !canSend)}
-              aria-label={canStop ? "Stop" : sendLabel}
-              title={canStop ? "Stop" : sendLabel}
+              aria-label={canStop ? tx("Stop") : sendLabel}
+              title={canStop ? tx("Stop") : sendLabel}
             >
               {canStop ? (
                 <>
@@ -367,7 +369,7 @@ export function ComposerInput({
               className="ghost composer-dictation-error-dismiss"
               onClick={onDismissDictationError}
             >
-              Dismiss
+              {tx("Dismiss")}
             </button>
           </div>
         )}
@@ -380,7 +382,7 @@ export function ComposerInput({
                 className="ghost composer-dictation-error-dismiss"
                 onClick={onDismissDictationHint}
               >
-                Dismiss
+                {tx("Dismiss")}
               </button>
             )}
           </div>
diff --git a/src/features/composer/components/ComposerMetaBar.tsx b/src/features/composer/components/ComposerMetaBar.tsx
index 085a2d606..f64476318 100644
--- a/src/features/composer/components/ComposerMetaBar.tsx
+++ b/src/features/composer/components/ComposerMetaBar.tsx
@@ -2,6 +2,7 @@ import type { CSSProperties } from "react";
 import { BrainCog, SlidersHorizontal, Zap } from "lucide-react";
 import type { AccessMode, ServiceTier, ThreadTokenUsage } from "../../../types";
 import type { CodexArgsOption } from "../../threads/utils/codexArgsProfiles";
+import { useI18n } from "@/i18n";
 
 type ComposerMetaBarProps = {
   disabled: boolean;
@@ -44,10 +45,11 @@ export function ComposerMetaBar({
   onSelectCodexArgsOverride,
   contextUsage = null,
 }: ComposerMetaBarProps) {
+  const { tx } = useI18n();
   const selectedModel =
     models.find((model) => model.id === selectedModelId) ?? null;
   const selectedModelLabel =
-    selectedModel?.displayName || selectedModel?.model || "No models";
+    selectedModel?.displayName || selectedModel?.model || tx("No models");
   const modelSelectStyle = {
     "--composer-model-select-width": `${Math.max(selectedModelLabel.length + 2, 8)}ch`,
   } as CSSProperties;
@@ -80,7 +82,7 @@ export function ComposerMetaBar({
         {collaborationModes.length > 0 && (
           canUsePlanToggle ? (
             <div className="composer-select-wrap composer-plan-toggle-wrap">
-              <label className="composer-plan-toggle" aria-label="Plan mode">
+              <label className="composer-plan-toggle" aria-label={tx("Plan mode")}>
                 <input
                   className="composer-plan-toggle-input"
                   type="checkbox"
@@ -106,7 +108,7 @@ export function ComposerMetaBar({
                   </svg>
                 </span>
                 <span className="composer-plan-toggle-label">
-                  {planMode?.label || "Plan"}
+                  {tx(planMode?.label || "Plan")}
                 </span>
               </label>
             </div>
@@ -125,7 +127,7 @@ export function ComposerMetaBar({
             </span>
               <select
                 className="composer-select composer-select--model composer-select--collab"
-                aria-label="Collaboration mode"
+                aria-label={tx("Collaboration mode")}
                 value={selectedCollaborationModeId ?? ""}
                 onChange={(event) =>
                   onSelectCollaborationMode(event.target.value || null)
@@ -134,7 +136,7 @@ export function ComposerMetaBar({
               >
                 {collaborationModes.map((mode) => (
                   <option key={mode.id} value={mode.id}>
-                    {mode.label || mode.id}
+                    {tx(mode.label || mode.id)}
                   </option>
                 ))}
               </select>
@@ -174,13 +176,13 @@ export function ComposerMetaBar({
           </span>
           <select
             className="composer-select composer-select--model"
-            aria-label="Model"
+            aria-label={tx("Model")}
             value={selectedModelId ?? ""}
             onChange={(event) => onSelectModel(event.target.value)}
             disabled={disabled}
             style={modelSelectStyle}
           >
-            {models.length === 0 && <option value="">No models</option>}
+            {models.length === 0 && <option value="">{tx("No models")}</option>}
             {models.map((model) => (
               <option key={model.id} value={model.id}>
                 {model.displayName || model.model}
@@ -191,8 +193,8 @@ export function ComposerMetaBar({
             <span
               className="composer-fast-indicator"
               role="status"
-              aria-label="Fast mode enabled"
-              title="Fast mode enabled"
+              aria-label={tx("Fast mode enabled")}
+              title={tx("Fast mode enabled")}
             >
               <Zap size={12} strokeWidth={1.8} />
             </span>
@@ -204,12 +206,12 @@ export function ComposerMetaBar({
           </span>
           <select
             className="composer-select composer-select--effort"
-            aria-label="Thinking mode"
+            aria-label={tx("Thinking mode")}
             value={selectedEffort ?? ""}
             onChange={(event) => onSelectEffort(event.target.value)}
             disabled={disabled || !reasoningSupported}
           >
-            {reasoningOptions.length === 0 && <option value="">Default</option>}
+            {reasoningOptions.length === 0 && <option value="">{tx("Default")}</option>}
             {reasoningOptions.map((effort) => (
               <option key={effort} value={effort}>
                 {effort}
@@ -224,7 +226,7 @@ export function ComposerMetaBar({
             </span>
             <select
               className="composer-select composer-select--approval"
-              aria-label="Codex args profile"
+              aria-label={tx("Codex args profile")}
               disabled={disabled}
               value={selectedCodexArgsOverride ?? ""}
               onChange={(event) =>
@@ -259,16 +261,16 @@ export function ComposerMetaBar({
           </span>
           <select
             className="composer-select composer-select--approval"
-            aria-label="Agent access"
+            aria-label={tx("Agent access")}
             disabled={disabled}
             value={accessMode}
             onChange={(event) =>
               onSelectAccessMode(event.target.value as AccessMode)
             }
           >
-            <option value="read-only">Read only</option>
-            <option value="current">On-Request</option>
-            <option value="full-access">Full access</option>
+            <option value="read-only">{tx("Read only")}</option>
+            <option value="current">{tx("On-Request")}</option>
+            <option value="full-access">{tx("Full access")}</option>
           </select>
         </div>
       </div>
@@ -277,13 +279,17 @@ export function ComposerMetaBar({
           className="composer-context-ring"
           data-tooltip={
             contextFreePercent === null
-              ? "Context free --"
-              : `Context free ${Math.round(contextFreePercent)}%`
+              ? tx("Context free --")
+              : tx("Context free {percent}%", {
+                  percent: Math.round(contextFreePercent),
+                })
           }
           aria-label={
             contextFreePercent === null
-              ? "Context free --"
-              : `Context free ${Math.round(contextFreePercent)}%`
+              ? tx("Context free --")
+              : tx("Context free {percent}%", {
+                  percent: Math.round(contextFreePercent),
+                })
           }
           style={
             {
diff --git a/src/features/composer/components/ComposerMobileActionsMenu.tsx b/src/features/composer/components/ComposerMobileActionsMenu.tsx
index 8538719f3..2de9d9308 100644
--- a/src/features/composer/components/ComposerMobileActionsMenu.tsx
+++ b/src/features/composer/components/ComposerMobileActionsMenu.tsx
@@ -10,6 +10,7 @@ import {
   PopoverMenuItem,
   PopoverSurface,
 } from "../../design-system/components/popover/PopoverPrimitives";
+import { useI18n } from "@/i18n";
 
 type ComposerMobileActionsMenuProps = {
   disabled: boolean;
@@ -46,6 +47,8 @@ export function ComposerMobileActionsMenu({
   setMobileActionsOpen,
   showDictationAction,
 }: ComposerMobileActionsMenuProps) {
+  const { tx } = useI18n();
+
   return (
     <div
       className={`composer-mobile-menu${mobileActionsOpen ? " is-open" : ""}`}
@@ -58,8 +61,8 @@ export function ComposerMobileActionsMenu({
         disabled={disabled}
         aria-expanded={mobileActionsOpen}
         aria-haspopup="menu"
-        aria-label="More actions"
-        title="More actions"
+        aria-label={tx("More actions")}
+        title={tx("More actions")}
       >
         <Plus size={14} aria-hidden />
       </button>
@@ -70,7 +73,7 @@ export function ComposerMobileActionsMenu({
             disabled={disabled || !onAddAttachment}
             icon={<ImagePlus size={14} />}
           >
-            Add image
+            {tx("Add image")}
           </PopoverMenuItem>
           {onToggleExpand && (
             <PopoverMenuItem
@@ -80,7 +83,7 @@ export function ComposerMobileActionsMenu({
                 isExpanded ? <ChevronDown size={14} /> : <ChevronUp size={14} />
               }
             >
-              {isExpanded ? "Collapse input" : "Expand input"}
+              {isExpanded ? tx("Collapse input") : tx("Expand input")}
             </PopoverMenuItem>
           )}
           {showDictationAction && (
diff --git a/src/features/composer/components/ComposerQueue.tsx b/src/features/composer/components/ComposerQueue.tsx
index 3e0f173ca..7bb9c6fa4 100644
--- a/src/features/composer/components/ComposerQueue.tsx
+++ b/src/features/composer/components/ComposerQueue.tsx
@@ -6,6 +6,7 @@ import {
   PopoverSurface,
 } from "../../design-system/components/popover/PopoverPrimitives";
 import { useMenuController } from "../../app/hooks/useMenuController";
+import { useI18n } from "@/i18n";
 
 type ComposerQueueProps = {
   queuedMessages: QueuedMessage[];
@@ -20,13 +21,15 @@ export function ComposerQueue({
   onEditQueued,
   onDeleteQueued,
 }: ComposerQueueProps) {
+  const { tx } = useI18n();
+
   if (queuedMessages.length === 0) {
     return null;
   }
 
   return (
     <div className="composer-queue">
-      <div className="composer-queue-title">Queued</div>
+      <div className="composer-queue-title">{tx("Queued")}</div>
       {pausedReason ? (
         <div className="composer-queue-hint">{pausedReason}</div>
       ) : null}
@@ -37,11 +40,14 @@ export function ComposerQueue({
               {item.text ||
                 (item.images?.length
                   ? item.images.length === 1
-                    ? "Image"
-                    : "Images"
+                    ? tx("Image")
+                    : tx("Images")
                   : "")}
               {item.images?.length
-                ? ` · ${item.images.length} image${item.images.length === 1 ? "" : "s"}`
+                ? tx(" · {count} image{plural}", {
+                    count: item.images.length,
+                    plural: item.images.length === 1 ? "" : "s",
+                  })
                 : ""}
             </span>
             <QueueMenuButton
@@ -63,6 +69,7 @@ type QueueMenuButtonProps = {
 };
 
 function QueueMenuButton({ item, onEditQueued, onDeleteQueued }: QueueMenuButtonProps) {
+  const { tx } = useI18n();
   const menu = useMenuController();
   const handleToggleMenu = useCallback(
     (event: ReactMouseEvent<HTMLButtonElement>) => {
@@ -89,7 +96,7 @@ function QueueMenuButton({ item, onEditQueued, onDeleteQueued }: QueueMenuButton
         type="button"
         className={`composer-queue-menu${menu.isOpen ? " is-open" : ""}`}
         onClick={handleToggleMenu}
-        aria-label="Queue item menu"
+        aria-label={tx("Queue item menu")}
         aria-haspopup="menu"
         aria-expanded={menu.isOpen}
       >
@@ -97,8 +104,8 @@ function QueueMenuButton({ item, onEditQueued, onDeleteQueued }: QueueMenuButton
       </button>
       {menu.isOpen && (
         <PopoverSurface className="composer-queue-item-popover" role="menu">
-          <PopoverMenuItem onClick={handleEdit}>Edit</PopoverMenuItem>
-          <PopoverMenuItem onClick={handleDelete}>Delete</PopoverMenuItem>
+          <PopoverMenuItem onClick={handleEdit}>{tx("Edit")}</PopoverMenuItem>
+          <PopoverMenuItem onClick={handleDelete}>{tx("Delete")}</PopoverMenuItem>
         </PopoverSurface>
       )}
     </div>
diff --git a/src/features/composer/components/ComposerSuggestionsPopover.tsx b/src/features/composer/components/ComposerSuggestionsPopover.tsx
index 38d362da3..a5ad8775c 100644
--- a/src/features/composer/components/ComposerSuggestionsPopover.tsx
+++ b/src/features/composer/components/ComposerSuggestionsPopover.tsx
@@ -13,6 +13,7 @@ import { PopoverSurface } from "../../design-system/components/popover/PopoverPr
 import { ReviewInlinePrompt } from "./ReviewInlinePrompt";
 import type { ReviewPromptState, ReviewPromptStep } from "../../threads/hooks/useReviewPrompt";
 import { getFileTypeIconUrl } from "../../../utils/fileTypeIcons";
+import { useI18n } from "@/i18n";
 
 type ComposerSuggestionsPopoverProps = {
   highlightIndex: number;
@@ -115,6 +116,7 @@ export function ComposerSuggestionsPopover({
   suggestionsOpen,
   suggestionsStyle,
 }: ComposerSuggestionsPopoverProps) {
+  const { tx } = useI18n();
   const reviewPromptOpen = Boolean(reviewPrompt);
   const suggestionsCount = suggestions.length;
 
@@ -208,7 +210,7 @@ export function ComposerSuggestionsPopover({
 
           return (
             <div key={item.id}>
-              {showGroup && <div className="composer-suggestion-section">{item.group}</div>}
+              {showGroup && <div className="composer-suggestion-section">{tx(item.group ?? "")}</div>}
               <button
                 type="button"
                 className={`composer-suggestion${index === highlightIndex ? " is-active" : ""}`}
diff --git a/src/features/composer/components/ReviewInlinePrompt.tsx b/src/features/composer/components/ReviewInlinePrompt.tsx
index 3cae0b0a2..9bc3a6dd9 100644
--- a/src/features/composer/components/ReviewInlinePrompt.tsx
+++ b/src/features/composer/components/ReviewInlinePrompt.tsx
@@ -3,6 +3,7 @@ import type {
   ReviewPromptState,
   ReviewPromptStep,
 } from "../../threads/hooks/useReviewPrompt";
+import { useI18n } from "@/i18n";
 
 type ReviewInlinePromptProps = {
   reviewPrompt: NonNullable<ReviewPromptState>;
@@ -40,6 +41,7 @@ const PresetStep = memo(function PresetStep({
   highlightedPresetIndex: number;
   onHighlightPreset: (index: number) => void;
 }) {
+  const { tx } = useI18n();
   const optionClass = (index: number) =>
     `review-inline-option${index === highlightedPresetIndex ? " is-selected" : ""}`;
   return (
@@ -51,8 +53,8 @@ const PresetStep = memo(function PresetStep({
         onMouseEnter={() => onHighlightPreset(0)}
         disabled={isSubmitting}
       >
-        <span className="review-inline-option-title">Review against a base branch</span>
-        <span className="review-inline-option-subtitle">(PR Style)</span>
+        <span className="review-inline-option-title">{tx("Review against a base branch")}</span>
+        <span className="review-inline-option-subtitle">{tx("(PR Style)")}</span>
       </button>
       <button
         type="button"
@@ -61,7 +63,7 @@ const PresetStep = memo(function PresetStep({
         onMouseEnter={() => onHighlightPreset(1)}
         disabled={isSubmitting}
       >
-        <span className="review-inline-option-title">Review uncommitted changes</span>
+        <span className="review-inline-option-title">{tx("Review uncommitted changes")}</span>
       </button>
       <button
         type="button"
@@ -70,7 +72,7 @@ const PresetStep = memo(function PresetStep({
         onMouseEnter={() => onHighlightPreset(2)}
         disabled={isSubmitting}
       >
-        <span className="review-inline-option-title">Review a commit</span>
+        <span className="review-inline-option-title">{tx("Review a commit")}</span>
       </button>
       <button
         type="button"
@@ -79,7 +81,7 @@ const PresetStep = memo(function PresetStep({
         onMouseEnter={() => onHighlightPreset(3)}
         disabled={isSubmitting}
       >
-        <span className="review-inline-option-title">Custom review instructions</span>
+        <span className="review-inline-option-title">{tx("Custom review instructions")}</span>
       </button>
     </div>
   );
@@ -102,6 +104,7 @@ const BaseBranchStep = memo(function BaseBranchStep({
   highlightedBranchIndex: number;
   onHighlightBranch: (index: number) => void;
 }) {
+  const { tx } = useI18n();
   const branches = reviewPrompt.branches;
   return (
     <div className="review-inline-section">
@@ -112,7 +115,7 @@ const BaseBranchStep = memo(function BaseBranchStep({
           onClick={onShowPreset}
           disabled={reviewPrompt.isSubmitting}
         >
-          Back
+          {tx("Back")}
         </button>
         <button
           type="button"
@@ -120,15 +123,15 @@ const BaseBranchStep = memo(function BaseBranchStep({
           onClick={() => void onConfirmBranch()}
           disabled={reviewPrompt.isSubmitting || !reviewPrompt.selectedBranch.trim()}
         >
-          Start review
+          {tx("Start review")}
         </button>
       </div>
-      <div className="review-inline-hint">Pick a recent local branch:</div>
-      <div className="review-inline-list" role="listbox" aria-label="Base branches">
+      <div className="review-inline-hint">{tx("Pick a recent local branch:")}</div>
+      <div className="review-inline-list" role="listbox" aria-label={tx("Base branches")}>
         {reviewPrompt.isLoadingBranches ? (
-          <div className="review-inline-empty">Loading branches…</div>
+          <div className="review-inline-empty">{tx("Loading branches…")}</div>
         ) : branches.length === 0 ? (
-          <div className="review-inline-empty">No branches found.</div>
+          <div className="review-inline-empty">{tx("No branches found.")}</div>
         ) : (
           branches.map((branch, index) => {
             const selected = index === highlightedBranchIndex;
@@ -173,6 +176,7 @@ const CommitStep = memo(function CommitStep({
   highlightedCommitIndex: number;
   onHighlightCommit: (index: number) => void;
 }) {
+  const { tx } = useI18n();
   const commits = reviewPrompt.commits;
   return (
     <div className="review-inline-section">
@@ -183,7 +187,7 @@ const CommitStep = memo(function CommitStep({
           onClick={onShowPreset}
           disabled={reviewPrompt.isSubmitting}
         >
-          Back
+          {tx("Back")}
         </button>
         <button
           type="button"
@@ -191,15 +195,15 @@ const CommitStep = memo(function CommitStep({
           onClick={() => void onConfirmCommit()}
           disabled={reviewPrompt.isSubmitting || !reviewPrompt.selectedCommitSha}
         >
-          Start review
+          {tx("Start review")}
         </button>
       </div>
-      <div className="review-inline-hint">Select a recent commit:</div>
-      <div className="review-inline-list" role="listbox" aria-label="Commits">
+      <div className="review-inline-hint">{tx("Select a recent commit:")}</div>
+      <div className="review-inline-list" role="listbox" aria-label={tx("Commits")}>
         {reviewPrompt.isLoadingCommits ? (
-          <div className="review-inline-empty">Loading commits…</div>
+          <div className="review-inline-empty">{tx("Loading commits…")}</div>
         ) : commits.length === 0 ? (
-          <div className="review-inline-empty">No commits found.</div>
+          <div className="review-inline-empty">{tx("No commits found.")}</div>
         ) : (
           commits.map((commit, index) => {
             const title = commit.summary || commit.sha;
@@ -242,6 +246,7 @@ const CustomStep = memo(function CustomStep({
   onUpdateCustomInstructions: (value: string) => void;
   onConfirmCustom: () => Promise<void>;
 }) {
+  const { tx } = useI18n();
   const canSubmit = reviewPrompt.customInstructions.trim().length > 0;
   return (
     <div className="review-inline-section">
@@ -252,7 +257,7 @@ const CustomStep = memo(function CustomStep({
           onClick={onShowPreset}
           disabled={reviewPrompt.isSubmitting}
         >
-          Back
+          {tx("Back")}
         </button>
         <button
           type="button"
@@ -260,18 +265,18 @@ const CustomStep = memo(function CustomStep({
           onClick={() => void onConfirmCustom()}
           disabled={reviewPrompt.isSubmitting || !canSubmit}
         >
-          Start review
+          {tx("Start review")}
         </button>
       </div>
       <label className="review-inline-label" htmlFor="review-inline-custom-instructions">
-        Instructions
+        {tx("Instructions")}
       </label>
       <textarea
         id="review-inline-custom-instructions"
         className="review-inline-textarea"
         value={reviewPrompt.customInstructions}
         onChange={(event) => onUpdateCustomInstructions(event.target.value)}
-        placeholder="Focus on correctness, edge cases, and missing tests."
+        placeholder={tx("Focus on correctness, edge cases, and missing tests.")}
         autoFocus
         rows={6}
       />
@@ -299,21 +304,22 @@ export const ReviewInlinePrompt = memo(function ReviewInlinePrompt({
   onUpdateCustomInstructions,
   onConfirmCustom,
 }: ReviewInlinePromptProps) {
+  const { tx } = useI18n();
   const { step, error, isSubmitting } = reviewPrompt;
 
   const title = useMemo(() => {
     switch (step) {
       case "baseBranch":
-        return "Select a base branch";
+        return tx("Select a base branch");
       case "commit":
-        return "Select a commit to review";
+        return tx("Select a commit to review");
       case "custom":
-        return "Custom review instructions";
+        return tx("Custom review instructions");
       case "preset":
       default:
-        return "Select a review preset";
+        return tx("Select a review preset");
     }
-  }, [step]);
+  }, [step, tx]);
 
   return (
     <div className="review-inline" role="dialog" aria-label={title}>
@@ -362,7 +368,7 @@ export const ReviewInlinePrompt = memo(function ReviewInlinePrompt({
 
       <div className="review-inline-actions">
         <button type="button" className="ghost review-inline-button" onClick={onClose}>
-          Close
+          {tx("Close")}
         </button>
       </div>
     </div>
diff --git a/src/features/composer/hooks/useComposerDictationControls.ts b/src/features/composer/hooks/useComposerDictationControls.ts
index b7927b222..94a5a097b 100644
--- a/src/features/composer/hooks/useComposerDictationControls.ts
+++ b/src/features/composer/hooks/useComposerDictationControls.ts
@@ -1,4 +1,5 @@
 import { useCallback } from "react";
+import { useI18n } from "@/i18n";
 
 type DictationState = "idle" | "listening" | "processing";
 
@@ -19,6 +20,7 @@ export function useComposerDictationControls({
   onCancelDictation,
   onOpenDictationSettings,
 }: UseComposerDictationControlsArgs) {
+  const { tx } = useI18n();
   const isDictating = dictationState === "listening";
   const isDictationProcessing = dictationState === "processing";
   const isDictationBusy = dictationState !== "idle";
@@ -30,19 +32,19 @@ export function useComposerDictationControls({
     (!allowOpenDictationSettings &&
       (isDictationProcessing ? !onCancelDictation : !dictationEnabled || !onToggleDictation));
   const micAriaLabel = allowOpenDictationSettings
-    ? "Open dictation settings"
+    ? tx("Open dictation settings")
     : isDictationProcessing
-      ? "Cancel transcription"
+      ? tx("Cancel transcription")
       : isDictating
-        ? "Stop dictation"
-        : "Start dictation";
+        ? tx("Stop dictation")
+        : tx("Start dictation");
   const micTitle = allowOpenDictationSettings
-    ? "Dictation disabled. Open settings"
+    ? tx("Dictation disabled. Open settings")
     : isDictationProcessing
-      ? "Cancel transcription"
+      ? tx("Cancel transcription")
       : isDictating
-        ? "Stop dictation"
-        : "Start dictation";
+        ? tx("Stop dictation")
+        : tx("Start dictation");
 
   const handleMicClick = useCallback(() => {
     if (isDictationProcessing) {
diff --git a/src/features/debug/components/DebugPanel.tsx b/src/features/debug/components/DebugPanel.tsx
index e3a21cfc1..f1f03d1f4 100644
--- a/src/features/debug/components/DebugPanel.tsx
+++ b/src/features/debug/components/DebugPanel.tsx
@@ -1,6 +1,7 @@
 import { useMemo, useRef } from "react";
 import type { MouseEvent as ReactMouseEvent } from "react";
 import type { DebugEntry } from "../../../types";
+import { useI18n } from "@/i18n";
 
 type DebugPanelProps = {
   entries: DebugEntry[];
@@ -33,6 +34,7 @@ export function DebugPanel({
   onResizeStart,
   variant = "dock",
 }: DebugPanelProps) {
+  const { tx } = useI18n();
   const isVisible = variant === "full" || isOpen;
 
   type FormattedDebugEntry = DebugEntry & {
@@ -96,25 +98,25 @@ export function DebugPanel({
           className="debug-panel-resizer"
           role="separator"
           aria-orientation="horizontal"
-          aria-label="Resize debug panel"
+          aria-label={tx("Resize debug panel")}
           onMouseDown={onResizeStart}
         />
       ) : null}
       <div className="debug-header">
-        <div className="debug-title">Debug</div>
+        <div className="debug-title">{tx("Debug")}</div>
         <div className="debug-actions">
           <button className="ghost" onClick={onCopy}>
-            Copy
+            {tx("Copy")}
           </button>
           <button className="ghost" onClick={onClear}>
-            Clear
+            {tx("Clear")}
           </button>
         </div>
       </div>
       {isOpen ? (
         <div className="debug-list">
           {formattedEntries.length === 0 ? (
-            <div className="debug-empty">No debug events yet.</div>
+            <div className="debug-empty">{tx("No debug events yet.")}</div>
           ) : null}
           {formattedEntries.map((entry) => (
             <div key={entry.id} className="debug-row">
diff --git a/src/features/dictation/components/DictationWaveform.tsx b/src/features/dictation/components/DictationWaveform.tsx
index 761d5e27e..ba08c71bf 100644
--- a/src/features/dictation/components/DictationWaveform.tsx
+++ b/src/features/dictation/components/DictationWaveform.tsx
@@ -1,4 +1,5 @@
 import { useEffect, useMemo, useState } from "react";
+import { useI18n } from "@/i18n";
 
 type DictationWaveformProps = {
   active: boolean;
@@ -21,6 +22,7 @@ export function DictationWaveform({
   processing,
   level,
 }: DictationWaveformProps) {
+  const { tx } = useI18n();
   const [bars, setBars] = useState<number[]>(
     () => new Array(MAX_BARS).fill(0),
   );
@@ -50,7 +52,7 @@ export function DictationWaveform({
       className={`composer-waveform${processing ? " is-processing" : ""}`}
       aria-hidden
     >
-      {processing && <span className="composer-waveform-label">Processing...</span>}
+      {processing && <span className="composer-waveform-label">{tx("Processing...")}</span>}
       {barHeights.map((height, index) => (
         <span
           key={index}
diff --git a/src/features/files/components/FilePreviewPopover.tsx b/src/features/files/components/FilePreviewPopover.tsx
index d05784410..005742338 100644
--- a/src/features/files/components/FilePreviewPopover.tsx
+++ b/src/features/files/components/FilePreviewPopover.tsx
@@ -1,5 +1,6 @@
 import { useMemo } from "react";
 import type { CSSProperties, MouseEvent } from "react";
+import { useI18n } from "@/i18n";
 import X from "lucide-react/dist/esm/icons/x";
 import { highlightLine, languageFromPath } from "../../../utils/syntax";
 import { OpenAppMenu } from "../../app/components/OpenAppMenu";
@@ -57,6 +58,7 @@ export function FilePreviewPopover({
   isLoading = false,
   error = null,
 }: FilePreviewPopoverProps) {
+  const { tx } = useI18n();
   const isImagePreview = previewKind === "image";
   const lines = useMemo(
     () => (isImagePreview ? [] : content.split("\n")),
@@ -64,10 +66,13 @@ export function FilePreviewPopover({
   );
   const language = useMemo(() => languageFromPath(path), [path]);
   const selectionLabel = selection
-    ? `Lines ${selection.start + 1}-${selection.end + 1}`
+    ? tx("Lines {start}-{end}", {
+        start: selection.start + 1,
+        end: selection.end + 1,
+      })
     : isImagePreview
-      ? "Image preview"
-      : "No selection";
+      ? tx("Image preview")
+      : tx("No selection");
   const highlightedLines = useMemo(
     () =>
       isImagePreview
@@ -85,21 +90,21 @@ export function FilePreviewPopover({
         <div className="file-preview-title">
           <span className="file-preview-path">{path}</span>
           {truncated && (
-            <span className="file-preview-warning">Truncated</span>
+            <span className="file-preview-warning">{tx("Truncated")}</span>
           )}
         </div>
         <button
           type="button"
           className="icon-button file-preview-close"
           onClick={onClose}
-          aria-label="Close preview"
-          title="Close preview"
+          aria-label={tx("Close preview")}
+          title={tx("Close preview")}
         >
           <X size={14} aria-hidden />
         </button>
       </div>
       {isLoading ? (
-        <div className="file-preview-status">Loading file...</div>
+        <div className="file-preview-status">{tx("Loading file...")}</div>
       ) : error ? (
         <div className="file-preview-status file-preview-error">{error}</div>
       ) : isImagePreview ? (
@@ -122,7 +127,7 @@ export function FilePreviewPopover({
             </div>
           ) : (
             <div className="file-preview-status file-preview-error">
-              Image preview unavailable.
+              {tx("Image preview unavailable.")}
             </div>
           )}
         </div>
@@ -132,7 +137,7 @@ export function FilePreviewPopover({
             <div className="file-preview-selection-group">
               <span className="file-preview-selection">{selectionLabel}</span>
               {selectionHints.length > 0 ? (
-                <div className="file-preview-hints" aria-label="Selection hints">
+                <div className="file-preview-hints" aria-label={tx("Selection hints")}>
                   {selectionHints.map((hint) => (
                     <span key={hint} className="file-preview-hint">
                       {hint}
@@ -155,7 +160,7 @@ export function FilePreviewPopover({
                 onClick={onClearSelection}
                 disabled={!selection}
               >
-                Clear
+                {tx("Clear")}
               </button>
               <button
                 type="button"
@@ -163,7 +168,7 @@ export function FilePreviewPopover({
                 onClick={onAddSelection}
                 disabled={!selection || !canInsertText}
               >
-                Add to chat
+                {tx("Add to chat")}
               </button>
             </div>
           </div>
diff --git a/src/features/files/components/FileTreePanel.tsx b/src/features/files/components/FileTreePanel.tsx
index 8040365f5..31c67640d 100644
--- a/src/features/files/components/FileTreePanel.tsx
+++ b/src/features/files/components/FileTreePanel.tsx
@@ -7,6 +7,7 @@ import { Menu, MenuItem } from "@tauri-apps/api/menu";
 import { LogicalPosition } from "@tauri-apps/api/dpi";
 import { getCurrentWindow } from "@tauri-apps/api/window";
 import { revealItemInDir } from "@tauri-apps/plugin-opener";
+import { useI18n } from "@/i18n";
 import Plus from "lucide-react/dist/esm/icons/plus";
 import ChevronsUpDown from "lucide-react/dist/esm/icons/chevrons-up-down";
 import File from "lucide-react/dist/esm/icons/file";
@@ -175,6 +176,7 @@ export function FileTreePanel({
   selectedOpenAppId,
   onSelectOpenAppId,
 }: FileTreePanelProps) {
+  const { tx } = useI18n();
   const [filterMode, setFilterMode] = useState<"all" | "modified">("all");
   const [expandedFolders, setExpandedFolders] = useState<Set<string>>(new Set());
   const [query, setQuery] = useState("");
@@ -514,9 +516,9 @@ export function FileTreePanel({
   const selectionHints = useMemo(
     () =>
       previewKind === "text"
-        ? ["Shift + click or drag + click", "for multi-line selection"]
+        ? [tx("Shift + click or drag + click"), tx("for multi-line selection")]
         : [],
-    [previewKind],
+    [previewKind, tx],
   );
 
   const handleAddSelection = useCallback(() => {
@@ -556,7 +558,7 @@ export function FileTreePanel({
       const menu = await Menu.new({
         items: [
           await MenuItem.new({
-            text: "Add to chat",
+            text: tx("Add to chat"),
             enabled: canInsertText,
             action: async () => {
               if (!canInsertText) {
@@ -577,7 +579,7 @@ export function FileTreePanel({
       const position = new LogicalPosition(event.clientX, event.clientY);
       await menu.popup(position, window);
     },
-    [canInsertText, onInsertText, resolvePath],
+    [canInsertText, onInsertText, resolvePath, tx],
   );
 
   const renderRow = (entry: FileTreeRowEntry) => {
@@ -636,8 +638,8 @@ export function FileTreePanel({
               onInsertText?.(node.path);
             }}
             disabled={!canInsertText}
-            aria-label={`Mention ${node.name}`}
-            title="Mention in chat"
+            aria-label={tx("Mention {name}", { name: node.name })}
+            title={tx("Mention in chat")}
           >
             <Plus size={10} aria-hidden />
           </button>
@@ -657,23 +659,27 @@ export function FileTreePanel({
           <div className="file-tree-count">
             {visibleEntries.length
               ? normalizedQuery
-                ? `${visibleEntries.length} match${visibleEntries.length === 1 ? "" : "es"}`
+                ? visibleEntries.length === 1
+                  ? tx("{count} match", { count: visibleEntries.length })
+                  : tx("{count} matches", { count: visibleEntries.length })
                 : filterMode === "modified"
-                  ? `${visibleEntries.length} modified`
-                  : `${visibleEntries.length} file${visibleEntries.length === 1 ? "" : "s"}`
+                  ? tx("{count} modified", { count: visibleEntries.length })
+                  : visibleEntries.length === 1
+                    ? tx("{count} file", { count: visibleEntries.length })
+                    : tx("{count} files", { count: visibleEntries.length })
               : showLoading
-                ? "Loading files"
+                ? tx("Loading files")
                 : filterMode === "modified"
-                  ? "No modified"
-                  : "No files"}
+                  ? tx("No modified")
+                  : tx("No files")}
           </div>
           {hasFolders ? (
             <button
               type="button"
               className="ghost icon-button file-tree-toggle"
               onClick={toggleAllFolders}
-              aria-label={allVisibleExpanded ? "Collapse all folders" : "Expand all folders"}
-              title={allVisibleExpanded ? "Collapse all folders" : "Expand all folders"}
+              aria-label={allVisibleExpanded ? tx("Collapse all folders") : tx("Expand all folders")}
+              title={allVisibleExpanded ? tx("Collapse all folders") : tx("Expand all folders")}
             >
               <ChevronsUpDown aria-hidden />
             </button>
@@ -684,10 +690,10 @@ export function FileTreePanel({
         <PanelSearchField
           className="file-tree-search"
           inputClassName="file-tree-search-input"
-          placeholder="Filter files and folders"
+          placeholder={tx("Filter files and folders")}
           value={query}
           onChange={(event) => setQuery(event.target.value)}
-          aria-label="Filter files and folders"
+          aria-label={tx("Filter files and folders")}
           icon={<Search aria-hidden />}
           trailing={
             <button
@@ -698,9 +704,9 @@ export function FileTreePanel({
               }}
               aria-pressed={filterMode === "modified"}
               aria-label={
-                filterMode === "modified" ? "Show all files" : "Show modified files only"
+                filterMode === "modified" ? tx("Show all files") : tx("Show modified files only")
               }
-              title={filterMode === "modified" ? "Show all files" : "Show modified files only"}
+              title={filterMode === "modified" ? tx("Show all files") : tx("Show modified files only")}
             >
               <GitBranch size={14} aria-hidden />
             </button>
@@ -727,11 +733,11 @@ export function FileTreePanel({
           <div className="file-tree-empty">
             {normalizedQuery
               ? filterMode === "modified"
-                ? "No modified files match your filter."
-                : "No matches found."
+                ? tx("No modified files match your filter.")
+                : tx("No matches found.")
               : filterMode === "modified"
-                ? "No modified files."
-                : "No files available."}
+                ? tx("No modified files.")
+                : tx("No files available.")}
           </div>
         ) : (
           <div
diff --git a/src/features/git/components/BranchSwitcherPrompt.tsx b/src/features/git/components/BranchSwitcherPrompt.tsx
index 1ad969fca..ee812b380 100644
--- a/src/features/git/components/BranchSwitcherPrompt.tsx
+++ b/src/features/git/components/BranchSwitcherPrompt.tsx
@@ -1,4 +1,5 @@
 import { useEffect, useMemo, useRef, useState } from "react";
+import { useI18n } from "@/i18n";
 import type { BranchInfo, WorkspaceInfo } from "../../../types";
 import { ModalShell } from "../../design-system/components/modal/ModalShell";
 import { BranchList } from "./BranchList";
@@ -44,6 +45,7 @@ export function BranchSwitcherPrompt({
   onSelect,
   onCancel,
 }: BranchSwitcherPromptProps) {
+  const { tx } = useI18n();
   const inputRef = useRef<HTMLInputElement | null>(null);
   const listRef = useRef<HTMLDivElement | null>(null);
   const [query, setQuery] = useState("");
@@ -105,7 +107,7 @@ export function BranchSwitcherPrompt({
     <ModalShell
       className="branch-switcher-modal"
       onBackdropClick={onCancel}
-      ariaLabel="Switch branch"
+      ariaLabel={tx("Switch branch")}
     >
       <input
         ref={inputRef}
@@ -113,7 +115,7 @@ export function BranchSwitcherPrompt({
         value={query}
         onChange={(event) => setQuery(event.target.value)}
         onKeyDown={handleKeyDown}
-        placeholder="Search branches..."
+        placeholder={tx("Search branches...")}
       />
       <BranchList
         branches={filteredBranches}
@@ -125,7 +127,7 @@ export function BranchSwitcherPrompt({
         selectedItemClassName="selected"
         itemLabelClassName="branch-switcher-modal-item-name"
         emptyClassName="branch-switcher-modal-empty"
-        emptyText="No branches found"
+        emptyText={tx("No branches found")}
         onSelect={handleSelect}
         onMouseEnter={setSelectedIndex}
         renderMeta={(branch) => {
@@ -138,10 +140,10 @@ export function BranchSwitcherPrompt({
           return (
             <span className="branch-switcher-modal-item-meta">
               {isCurrent && (
-                <span className="branch-switcher-modal-item-current">current</span>
+                <span className="branch-switcher-modal-item-current">{tx("current")}</span>
               )}
               {worktree && (
-                <span className="branch-switcher-modal-item-worktree">worktree</span>
+                <span className="branch-switcher-modal-item-worktree">{tx("worktree")}</span>
               )}
             </span>
           );
diff --git a/src/features/git/components/GitDiffPanel.tsx b/src/features/git/components/GitDiffPanel.tsx
index 2cef95865..e50b5f14f 100644
--- a/src/features/git/components/GitDiffPanel.tsx
+++ b/src/features/git/components/GitDiffPanel.tsx
@@ -1,5 +1,6 @@
 import type { GitHubIssue, GitHubPullRequest, GitLogEntry } from "../../../types";
 import type { MouseEvent as ReactMouseEvent } from "react";
+import { useI18n } from "@/i18n";
 import { Menu, MenuItem } from "@tauri-apps/api/menu";
 import { LogicalPosition } from "@tauri-apps/api/dpi";
 import { getCurrentWindow } from "@tauri-apps/api/window";
@@ -233,6 +234,7 @@ export function GitDiffPanel({
   syncError = null,
   commitsAhead = 0,
 }: GitDiffPanelProps) {
+  const { tx } = useI18n();
   const [dismissedErrorSignatures, setDismissedErrorSignatures] = useState<Set<string>>(
     new Set(),
   );
@@ -268,8 +270,8 @@ export function GitDiffPanel({
     if (!pushNeedsSync) {
       return pushError;
     }
-    return `Remote has new commits. Sync (pull then push) before retrying.\n\n${pushError}`;
-  }, [pushError, pushNeedsSync]);
+    return `${tx("Remote has new commits. Sync (pull then push) before retrying.")}\n\n${pushError}`;
+  }, [pushError, pushNeedsSync, tx]);
 
   const handleSyncFromError = useCallback(() => {
     void _onSync?.();
@@ -280,12 +282,12 @@ export function GitDiffPanel({
       return null;
     }
     return {
-      label: _syncLoading ? "Syncing..." : "Sync (pull then push)",
+      label: _syncLoading ? tx("Syncing...") : tx("Sync (pull then push)"),
       onAction: handleSyncFromError,
       disabled: _syncLoading,
       loading: _syncLoading,
     };
-  }, [pushNeedsSync, _onSync, _syncLoading, handleSyncFromError]);
+  }, [pushNeedsSync, _onSync, _syncLoading, handleSyncFromError, tx]);
 
   const githubBaseUrl = useMemo(() => getGitHubBaseUrl(gitRemoteUrl), [gitRemoteUrl]);
 
@@ -295,7 +297,7 @@ export function GitDiffPanel({
       event.stopPropagation();
 
       const copyItem = await MenuItem.new({
-        text: "Copy SHA",
+        text: tx("Copy SHA"),
         action: async () => {
           await navigator.clipboard.writeText(entry.sha);
         },
@@ -304,7 +306,7 @@ export function GitDiffPanel({
       const items = [copyItem];
       if (githubBaseUrl) {
         const openItem = await MenuItem.new({
-          text: "Open on GitHub",
+          text: tx("Open on GitHub"),
           action: async () => {
             await openUrl(`${githubBaseUrl}/commit/${entry.sha}`);
           },
@@ -317,7 +319,7 @@ export function GitDiffPanel({
       const position = new LogicalPosition(event.clientX, event.clientY);
       await menu.popup(position, window);
     },
-    [githubBaseUrl],
+    [githubBaseUrl, tx],
   );
 
   const showPullRequestMenu = useCallback(
@@ -326,7 +328,7 @@ export function GitDiffPanel({
       event.stopPropagation();
 
       const openItem = await MenuItem.new({
-        text: "Open on GitHub",
+        text: tx("Open on GitHub"),
         action: async () => {
           await openUrl(pullRequest.url);
         },
@@ -337,7 +339,7 @@ export function GitDiffPanel({
       const position = new LogicalPosition(event.clientX, event.clientY);
       await menu.popup(position, window);
     },
-    [],
+    [tx],
   );
 
   const discardFiles = useCallback(
@@ -349,12 +351,20 @@ export function GitDiffPanel({
       const isSingle = paths.length === 1;
       const previewLimit = 6;
       const preview = paths.slice(0, previewLimit).join("\n");
-      const more = paths.length > previewLimit ? `\n… and ${paths.length - previewLimit} more` : "";
+      const more =
+        paths.length > previewLimit
+          ? tx("\n… and {count} more", { count: paths.length - previewLimit })
+          : "";
       const message = isSingle
-        ? `Discard changes in:\n\n${paths[0]}\n\nThis cannot be undone.`
-        : `Discard changes in these files?\n\n${preview}${more}\n\nThis cannot be undone.`;
+        ? tx("Discard changes in:\n\n{path}\n\nThis cannot be undone.", {
+            path: paths[0],
+          })
+        : tx("Discard changes in these files?\n\n{preview}{more}\n\nThis cannot be undone.", {
+            preview,
+            more,
+          });
       const confirmed = await ask(message, {
-        title: "Discard changes",
+        title: tx("Discard changes"),
         kind: "warning",
       });
       if (!confirmed) {
@@ -365,7 +375,7 @@ export function GitDiffPanel({
         await onRevertFile(path);
       }
     },
-    [onRevertFile],
+    [onRevertFile, tx],
   );
 
   const discardFile = useCallback(
@@ -392,8 +402,6 @@ export function GitDiffPanel({
       }
 
       const fileCount = targetPaths.length;
-      const plural = fileCount > 1 ? "s" : "";
-      const countSuffix = fileCount > 1 ? ` (${fileCount})` : "";
       const normalizedRoot = resolveRootPath(gitRoot, workspacePath);
       const inferredRoot =
         !normalizedRoot && gitRootCandidates.length === 1
@@ -414,7 +422,10 @@ export function GitDiffPanel({
       if (stagedPaths.length > 0 && onUnstageFile) {
         items.push(
           await MenuItem.new({
-            text: `Unstage file${stagedPaths.length > 1 ? `s (${stagedPaths.length})` : ""}`,
+            text:
+              stagedPaths.length > 1
+                ? tx("Unstage files ({count})", { count: stagedPaths.length })
+                : tx("Unstage file"),
             action: async () => {
               for (const stagedPath of stagedPaths) {
                 await onUnstageFile(stagedPath);
@@ -427,7 +438,10 @@ export function GitDiffPanel({
       if (unstagedPaths.length > 0 && onStageFile) {
         items.push(
           await MenuItem.new({
-            text: `Stage file${unstagedPaths.length > 1 ? `s (${unstagedPaths.length})` : ""}`,
+            text:
+              unstagedPaths.length > 1
+                ? tx("Stage files ({count})", { count: unstagedPaths.length })
+                : tx("Stage file"),
             action: async () => {
               for (const unstagedPath of unstagedPaths) {
                 await onStageFile(unstagedPath);
@@ -449,13 +463,13 @@ export function GitDiffPanel({
 
         items.push(
           await MenuItem.new({
-            text: `Show in ${fileManagerLabel}`,
+            text: tx("Show in {app}", { app: fileManagerLabel }),
             action: async () => {
               try {
                 if (!resolvedRoot && !isAbsolutePathForPlatform(absolutePath)) {
                   pushErrorToast({
-                    title: `Couldn't show file in ${fileManagerLabel}`,
-                    message: "Select a git root first.",
+                    title: tx("Couldn't show file in {app}", { app: fileManagerLabel }),
+                    message: tx("Select a git root first."),
                   });
                   return;
                 }
@@ -464,7 +478,7 @@ export function GitDiffPanel({
               } catch (menuError) {
                 const message = menuError instanceof Error ? menuError.message : String(menuError);
                 pushErrorToast({
-                  title: `Couldn't show file in ${fileManagerLabel}`,
+                  title: tx("Couldn't show file in {app}", { app: fileManagerLabel }),
                   message,
                 });
                 console.warn("Failed to reveal file", {
@@ -478,13 +492,13 @@ export function GitDiffPanel({
 
         items.push(
           await MenuItem.new({
-            text: "Copy file name",
+            text: tx("Copy file name"),
             action: async () => {
               await navigator.clipboard.writeText(fileName);
             },
           }),
           await MenuItem.new({
-            text: "Copy file path",
+            text: tx("Copy file path"),
             action: async () => {
               await navigator.clipboard.writeText(projectRelativePath);
             },
@@ -495,7 +509,10 @@ export function GitDiffPanel({
       if (onRevertFile) {
         items.push(
           await MenuItem.new({
-            text: `Discard change${plural}${countSuffix}`,
+            text:
+              fileCount > 1
+                ? tx("Discard changes ({count})", { count: fileCount })
+                : tx("Discard change"),
             action: async () => {
               await discardFiles(targetPaths);
             },
@@ -524,16 +541,21 @@ export function GitDiffPanel({
       gitRoot,
       gitRootCandidates,
       workspacePath,
+      tx,
     ],
   );
 
   const logCountLabel = logTotal
-    ? `${logTotal} commit${logTotal === 1 ? "" : "s"}`
+    ? logTotal === 1
+      ? tx("{count} commit", { count: logTotal })
+      : tx("{count} commits", { count: logTotal })
     : logEntries.length
-      ? `${logEntries.length} commit${logEntries.length === 1 ? "" : "s"}`
-      : "No commits";
-  const logSyncLabel = logUpstream ? `↑${logAhead} ↓${logBehind}` : "No upstream configured";
-  const logUpstreamLabel = logUpstream ? `Upstream ${logUpstream}` : "";
+      ? logEntries.length === 1
+        ? tx("{count} commit", { count: logEntries.length })
+        : tx("{count} commits", { count: logEntries.length })
+      : tx("No commits");
+  const logSyncLabel = logUpstream ? `↑${logAhead} ↓${logBehind}` : tx("No upstream configured");
+  const logUpstreamLabel = logUpstream ? tx("Upstream {upstream}", { upstream: logUpstream }) : "";
   const showAheadSection = Boolean(logUpstream && logAhead > 0);
   const showBehindSection = Boolean(logUpstream && logBehind > 0);
   const hasDiffTotals = totalAdditions > 0 || totalDeletions > 0;
@@ -541,7 +563,10 @@ export function GitDiffPanel({
     (total, group) => total + group.edits.length,
     0,
   );
-  const perFileDiffStatusLabel = `${perFileDiffGroups.length} files · ${perFileEditCount} edits`;
+  const perFileDiffStatusLabel = tx("{files} files · {edits} edits", {
+    files: perFileDiffGroups.length,
+    edits: perFileEditCount,
+  });
   const diffTotalsLabel = `+${totalAdditions} / -${totalDeletions}`;
   const diffStatusLabel = hasDiffTotals
     ? [logUpstream ? logSyncLabel : null, diffTotalsLabel].filter(Boolean).join(" · ")
@@ -643,7 +668,7 @@ export function GitDiffPanel({
       onFilePanelModeChange={onFilePanelModeChange}
       headerClassName="git-panel-header"
       headerRight={
-        <div className="git-panel-actions" role="group" aria-label="Git panel">
+        <div className="git-panel-actions" role="group" aria-label={tx("Git panel")}>
           <div className="git-panel-select">
             <span className="git-panel-select-icon" aria-hidden>
               <ModeIcon />
@@ -652,13 +677,13 @@ export function GitDiffPanel({
               className="git-panel-select-input"
               value={mode}
               onChange={(event) => onModeChange(event.target.value as GitDiffPanelProps["mode"])}
-              aria-label="Git panel view"
+              aria-label={tx("Git panel view")}
             >
-              <option value="diff">Diff</option>
-              <option value="perFile">Agent edits</option>
-              <option value="log">Log</option>
-              <option value="issues">Issues</option>
-              <option value="prs">PRs</option>
+              <option value="diff">{tx("Diff")}</option>
+              <option value="perFile">{tx("Agent edits")}</option>
+              <option value="log">{tx("Log")}</option>
+              <option value="issues">{tx("Issues")}</option>
+              <option value="prs">{tx("PRs")}</option>
             </select>
           </div>
         </div>
diff --git a/src/features/git/components/GitDiffPanelDiffMode.tsx b/src/features/git/components/GitDiffPanelDiffMode.tsx
index 89a7c84d3..96fbc5827 100644
--- a/src/features/git/components/GitDiffPanelDiffMode.tsx
+++ b/src/features/git/components/GitDiffPanelDiffMode.tsx
@@ -1,4 +1,5 @@
 import type { MouseEvent as ReactMouseEvent } from "react";
+import { useI18n } from "@/i18n";
 import {
   MagicSparkleIcon,
   MagicSparkleLoaderIcon,
@@ -129,16 +130,17 @@ export function GitDiffModeContent({
   onShowFileMenu,
   onDiffListClick,
 }: GitDiffModeContentProps) {
+  const { tx } = useI18n();
   const normalizedGitRoot = normalizeRootPath(gitRoot);
   const missingRepo = isMissingRepo(error);
   const gitRootNotFound = isGitRootNotFound(error);
   const showInitGitRepo = Boolean(onInitGitRepo) && missingRepo && !gitRootNotFound;
   const gitRootTitle = gitRootNotFound
-    ? "Git root folder not found."
+    ? tx("Git root folder not found.")
     : missingRepo
-      ? "This workspace isn't a Git repository yet."
-      : "Choose a repo for this workspace.";
-  const generateCommitMessageTooltip = "Generate commit message";
+      ? tx("This workspace isn't a Git repository yet.")
+      : tx("Choose a repo for this workspace.");
+  const generateCommitMessageTooltip = tx("Generate commit message");
   const showWorktreeApplyInUnstaged = showApplyWorktree && unstagedFiles.length > 0;
   const showWorktreeApplyInStaged =
     showApplyWorktree && unstagedFiles.length === 0 && stagedFiles.length > 0;
@@ -158,7 +160,7 @@ export function GitDiffModeContent({
                 }}
                 disabled={initGitRepoLoading || gitRootScanLoading}
               >
-                {initGitRepoLoading ? "Initializing..." : "Initialize Git"}
+                {initGitRepoLoading ? tx("Initializing...") : tx("Initialize Git")}
               </button>
             </div>
           )}
@@ -169,10 +171,10 @@ export function GitDiffModeContent({
               onClick={onScanGitRoots}
               disabled={!onScanGitRoots || gitRootScanLoading || initGitRepoLoading}
             >
-              Scan workspace
+              {tx("Scan workspace")}
             </button>
             <label className="git-root-depth">
-              <span>Depth</span>
+              <span>{tx("Depth")}</span>
               <select
                 className="git-root-select"
                 value={gitRootScanDepth}
@@ -183,6 +185,7 @@ export function GitDiffModeContent({
                   }
                 }}
                 disabled={gitRootScanLoading || initGitRepoLoading}
+                aria-label={tx("Depth")}
               >
                 {DEPTH_OPTIONS.map((depth) => (
                   <option key={depth} value={depth}>
@@ -200,7 +203,7 @@ export function GitDiffModeContent({
                 }}
                 disabled={gitRootScanLoading || initGitRepoLoading}
               >
-                Pick folder
+                {tx("Pick folder")}
               </button>
             )}
             {hasGitRoot && onClearGitRoot && (
@@ -210,18 +213,18 @@ export function GitDiffModeContent({
                 onClick={onClearGitRoot}
                 disabled={gitRootScanLoading || initGitRepoLoading}
               >
-                Use workspace root
+                {tx("Use workspace root")}
               </button>
             )}
           </div>
           {gitRootScanLoading && (
-            <div className="diff-empty">Scanning for repositories...</div>
+            <div className="diff-empty">{tx("Scanning for repositories...")}</div>
           )}
           {!gitRootScanLoading &&
             !gitRootScanError &&
             gitRootScanHasScanned &&
             gitRootCandidates.length === 0 && (
-              <div className="diff-empty">No repositories found.</div>
+              <div className="diff-empty">{tx("No repositories found.")}</div>
             )}
           {gitRootCandidates.length > 0 && (
             <div className="git-root-list">
@@ -236,7 +239,7 @@ export function GitDiffModeContent({
                     onClick={() => onSelectGitRoot?.(path)}
                   >
                     <span className="git-root-path">{path}</span>
-                    {isActive && <span className="git-root-tag">Active</span>}
+                    {isActive && <span className="git-root-tag">{tx("Active")}</span>}
                   </button>
                 );
               })}
@@ -249,7 +252,7 @@ export function GitDiffModeContent({
           <div className="commit-message-input-wrapper">
             <textarea
               className="commit-message-input"
-              placeholder="Commit message..."
+              placeholder={tx("Commit message...")}
               value={commitMessage}
               onChange={(event) => onCommitMessageChange?.(event.target.value)}
               disabled={commitMessageLoading}
@@ -269,7 +272,7 @@ export function GitDiffModeContent({
               data-tooltip={generateCommitMessageTooltip}
               data-tooltip-placement="bottom"
               data-tooltip-align="end"
-              aria-label="Generate commit message"
+              aria-label={generateCommitMessageTooltip}
             >
               {commitMessageLoading ? (
                 <MagicSparkleLoaderIcon className="commit-message-loader" />
@@ -296,14 +299,18 @@ export function GitDiffModeContent({
                 className="push-button-secondary"
                 onClick={() => void onPull?.()}
                 disabled={!onPull || pullLoading || syncLoading}
-                title={`Pull ${commitsBehind} commit${commitsBehind > 1 ? "s" : ""}`}
+                title={
+                  commitsBehind > 1
+                    ? tx("Pull {count} commits", { count: commitsBehind })
+                    : tx("Pull {count} commit", { count: commitsBehind })
+                }
               >
                 {pullLoading ? (
                   <span className="commit-button-spinner" aria-hidden />
                 ) : (
                   <Download size={14} aria-hidden />
                 )}
-                <span>{pullLoading ? "Pulling..." : "Pull"}</span>
+                <span>{pullLoading ? tx("Pulling...") : tx("Pull")}</span>
                 <span className="push-count">{commitsBehind}</span>
               </button>
             )}
@@ -315,8 +322,10 @@ export function GitDiffModeContent({
                 disabled={!onPush || pushLoading || commitsBehind > 0}
                 title={
                   commitsBehind > 0
-                    ? "Remote is ahead. Pull first, or use Sync."
-                    : `Push ${commitsAhead} commit${commitsAhead > 1 ? "s" : ""}`
+                    ? tx("Remote is ahead. Pull first, or use Sync.")
+                    : commitsAhead > 1
+                      ? tx("Push {count} commits", { count: commitsAhead })
+                      : tx("Push {count} commit", { count: commitsAhead })
                 }
               >
                 {pushLoading ? (
@@ -324,7 +333,7 @@ export function GitDiffModeContent({
                 ) : (
                   <Upload size={14} aria-hidden />
                 )}
-                <span>Push</span>
+                <span>{tx("Push")}</span>
                 <span className="push-count">{commitsAhead}</span>
               </button>
             )}
@@ -335,14 +344,14 @@ export function GitDiffModeContent({
               className="push-button-secondary"
               onClick={() => void onSync?.()}
               disabled={!onSync || syncLoading || pullLoading}
-              title="Pull latest changes and push your local commits"
+              title={tx("Pull latest changes and push your local commits")}
             >
               {syncLoading ? (
                 <span className="commit-button-spinner" aria-hidden />
               ) : (
                 <RotateCcw size={14} aria-hidden />
               )}
-              <span>{syncLoading ? "Syncing..." : "Sync (pull then push)"}</span>
+              <span>{syncLoading ? tx("Syncing...") : tx("Sync (pull then push)")}</span>
             </button>
           )}
         </div>
@@ -351,12 +360,12 @@ export function GitDiffModeContent({
         !stagedFiles.length &&
         !unstagedFiles.length &&
         commitsAhead === 0 &&
-        commitsBehind === 0 && <div className="diff-empty">No changes detected.</div>}
+        commitsBehind === 0 && <div className="diff-empty">{tx("No changes detected.")}</div>}
       {(stagedFiles.length > 0 || unstagedFiles.length > 0) && (
         <>
           {stagedFiles.length > 0 && (
             <DiffSection
-              title="Staged"
+              title={tx("Staged")}
               files={stagedFiles}
               section="staged"
               selectedFiles={selectedFiles}
@@ -376,7 +385,7 @@ export function GitDiffModeContent({
           )}
           {unstagedFiles.length > 0 && (
             <DiffSection
-              title="Unstaged"
+              title={tx("Unstaged")}
               files={unstagedFiles}
               section="unstaged"
               selectedFiles={selectedFiles}
diff --git a/src/features/git/components/GitDiffPanelListModes.tsx b/src/features/git/components/GitDiffPanelListModes.tsx
index bc8745b41..03d2e6adf 100644
--- a/src/features/git/components/GitDiffPanelListModes.tsx
+++ b/src/features/git/components/GitDiffPanelListModes.tsx
@@ -1,5 +1,6 @@
 import type { GitHubIssue, GitHubPullRequest, GitLogEntry } from "../../../types";
 import type { MouseEvent as ReactMouseEvent } from "react";
+import { useI18n } from "@/i18n";
 import { useCallback, useEffect, useState } from "react";
 import { openUrl } from "@tauri-apps/plugin-opener";
 import ChevronDown from "lucide-react/dist/esm/icons/chevron-down";
@@ -20,6 +21,7 @@ export function GitPerFileModeContent({
   selectedPath,
   onSelectFile,
 }: GitPerFileModeContentProps) {
+  const { tx } = useI18n();
   const [collapsedPaths, setCollapsedPaths] = useState<Set<string>>(new Set());
 
   useEffect(() => {
@@ -61,7 +63,7 @@ export function GitPerFileModeContent({
   }, []);
 
   if (groups.length === 0) {
-    return <div className="diff-empty">No agent edits in this thread yet.</div>;
+    return <div className="diff-empty">{tx("No agent edits in this thread yet.")}</div>;
   }
 
   return (
@@ -83,7 +85,9 @@ export function GitPerFileModeContent({
                 {fileName || group.path}
               </span>
               <span className="per-file-group-count">
-                {group.edits.length} edit{group.edits.length === 1 ? "" : "s"}
+                {group.edits.length === 1
+                  ? tx("{count} edit", { count: group.edits.length })
+                  : tx("{count} edits", { count: group.edits.length })}
               </span>
             </button>
             {isExpanded && (
@@ -153,19 +157,21 @@ export function GitLogModeContent({
   onSelectCommit,
   onShowLogMenu,
 }: GitLogModeContentProps) {
+  const { tx } = useI18n();
+
   return (
     <div className="git-log-list">
       {!logError && logLoading && (
-        <div className="diff-viewer-loading">Loading commits...</div>
+        <div className="diff-viewer-loading">{tx("Loading commits...")}</div>
       )}
       {!logError &&
         !logLoading &&
         !logEntries.length &&
         !showAheadSection &&
-        !showBehindSection && <div className="diff-empty">No commits yet.</div>}
+        !showBehindSection && <div className="diff-empty">{tx("No commits yet.")}</div>}
       {showAheadSection && (
         <div className="git-log-section">
-          <div className="git-log-section-title">To push</div>
+          <div className="git-log-section-title">{tx("To push")}</div>
           <div className="git-log-section-list">
             {logAheadEntries.map((entry) => {
               const isSelected = selectedCommitSha === entry.sha;
@@ -185,7 +191,7 @@ export function GitLogModeContent({
       )}
       {showBehindSection && (
         <div className="git-log-section">
-          <div className="git-log-section-title">To pull</div>
+          <div className="git-log-section-title">{tx("To pull")}</div>
           <div className="git-log-section-list">
             {logBehindEntries.map((entry) => {
               const isSelected = selectedCommitSha === entry.sha;
@@ -205,7 +211,7 @@ export function GitLogModeContent({
       )}
       {(logEntries.length > 0 || logLoading) && (
         <div className="git-log-section">
-          <div className="git-log-section-title">Recent commits</div>
+          <div className="git-log-section-title">{tx("Recent commits")}</div>
           <div className="git-log-section-list">
             {logEntries.map((entry) => {
               const isSelected = selectedCommitSha === entry.sha;
@@ -237,10 +243,12 @@ export function GitIssuesModeContent({
   issuesLoading,
   issues,
 }: GitIssuesModeContentProps) {
+  const { tx } = useI18n();
+
   return (
     <div className="git-issues-list">
       {!issuesError && !issuesLoading && !issues.length && (
-        <div className="diff-empty">No open issues.</div>
+        <div className="diff-empty">{tx("No open issues.")}</div>
       )}
       {issues.map((issue) => {
         const relativeTime = formatRelativeTime(new Date(issue.updatedAt).getTime());
@@ -286,10 +294,12 @@ export function GitPullRequestsModeContent({
   onSelectPullRequest,
   onShowPullRequestMenu,
 }: GitPullRequestsModeContentProps) {
+  const { tx } = useI18n();
+
   return (
     <div className="git-pr-list">
       {!pullRequestsError && !pullRequestsLoading && !pullRequests.length && (
-        <div className="diff-empty">No open pull requests.</div>
+        <div className="diff-empty">{tx("No open pull requests.")}</div>
       )}
       {pullRequests.map((pullRequest) => {
         const relativeTime = formatRelativeTime(new Date(pullRequest.updatedAt).getTime());
@@ -321,7 +331,7 @@ export function GitPullRequestsModeContent({
             <div className="git-pr-meta">
               <span className="git-pr-author-inline">@{author}</span>
               {pullRequest.isDraft && (
-                <span className="git-pr-pill git-pr-draft">Draft</span>
+                <span className="git-pr-pill git-pr-draft">{tx("Draft")}</span>
               )}
             </div>
           </div>
diff --git a/src/features/git/components/GitDiffPanelOverview.tsx b/src/features/git/components/GitDiffPanelOverview.tsx
index eb132ad2f..c62e076c6 100644
--- a/src/features/git/components/GitDiffPanelOverview.tsx
+++ b/src/features/git/components/GitDiffPanelOverview.tsx
@@ -1,4 +1,5 @@
 import type { GitPanelMode } from "../types";
+import { useI18n } from "@/i18n";
 import ArrowLeftRight from "lucide-react/dist/esm/icons/arrow-left-right";
 import RotateCw from "lucide-react/dist/esm/icons/rotate-cw";
 
@@ -29,6 +30,8 @@ export function GitPanelModeStatus({
   pullRequestsLoading,
   pullRequestsTotal,
 }: GitPanelModeStatusProps) {
+  const { tx } = useI18n();
+
   if (mode === "diff") {
     return <div className="diff-status">{diffStatusLabel}</div>;
   }
@@ -58,11 +61,11 @@ export function GitPanelModeStatus({
     return (
       <>
         <div className="diff-status diff-status-issues">
-          <span>GitHub issues</span>
+          <span>{tx("GitHub issues")}</span>
           {issuesLoading && <span className="git-panel-spinner" aria-hidden />}
         </div>
         <div className="git-log-sync">
-          <span>{issuesTotal} open</span>
+          <span>{tx("{count} open", { count: issuesTotal })}</span>
         </div>
       </>
     );
@@ -71,11 +74,11 @@ export function GitPanelModeStatus({
   return (
     <>
       <div className="diff-status diff-status-issues">
-        <span>GitHub pull requests</span>
+        <span>{tx("GitHub pull requests")}</span>
         {pullRequestsLoading && <span className="git-panel-spinner" aria-hidden />}
       </div>
       <div className="git-log-sync">
-        <span>{pullRequestsTotal} open</span>
+        <span>{tx("{count} open", { count: pullRequestsTotal })}</span>
       </div>
     </>
   );
@@ -89,6 +92,8 @@ type GitBranchRowProps = {
 };
 
 export function GitBranchRow({ mode, branchName, onFetch, fetchLoading }: GitBranchRowProps) {
+  const { tx } = useI18n();
+
   if (mode !== "diff" && mode !== "perFile" && mode !== "log") {
     return null;
   }
@@ -96,16 +101,16 @@ export function GitBranchRow({ mode, branchName, onFetch, fetchLoading }: GitBra
   return (
     <div className="diff-branch-row">
       <div className="diff-branch-meta">
-        <span className="diff-branch-label">Branch</span>
-        <div className="diff-branch">{branchName || "unknown"}</div>
+        <span className="diff-branch-label">{tx("Branch")}</span>
+        <div className="diff-branch">{branchName || tx("unknown")}</div>
       </div>
       <button
         type="button"
         className="diff-branch-refresh"
         onClick={() => void onFetch?.()}
         disabled={!onFetch || fetchLoading}
-        title={fetchLoading ? "Fetching remote..." : "Fetch remote"}
-        aria-label={fetchLoading ? "Fetching remote" : "Fetch remote"}
+        title={fetchLoading ? tx("Fetching remote...") : tx("Fetch remote")}
+        aria-label={fetchLoading ? tx("Fetching remote") : tx("Fetch remote")}
       >
         {fetchLoading ? (
           <span className="git-panel-spinner" aria-hidden />
@@ -132,6 +137,8 @@ export function GitRootCurrentPath({
   onScanGitRoots,
   gitRootScanLoading,
 }: GitRootCurrentPathProps) {
+  const { tx } = useI18n();
+
   if (mode === "issues" || !hasGitRoot) {
     return null;
   }
@@ -139,7 +146,7 @@ export function GitRootCurrentPath({
   return (
     <div className="git-root-current">
       <div className="git-root-current-main">
-        <span className="git-root-label">Repository root</span>
+        <span className="git-root-label">{tx("Repository root")}</span>
         <span className="git-root-path" title={gitRoot ?? ""}>
           {gitRoot}
         </span>
@@ -152,7 +159,7 @@ export function GitRootCurrentPath({
           disabled={gitRootScanLoading}
         >
           <ArrowLeftRight className="git-root-button-icon" aria-hidden />
-          Change
+          {tx("Change")}
         </button>
       )}
     </div>
diff --git a/src/features/git/components/GitDiffPanelShared.tsx b/src/features/git/components/GitDiffPanelShared.tsx
index 8b99ad649..6214d594b 100644
--- a/src/features/git/components/GitDiffPanelShared.tsx
+++ b/src/features/git/components/GitDiffPanelShared.tsx
@@ -1,5 +1,6 @@
 import type { GitLogEntry } from "../../../types";
 import type { MouseEvent as ReactMouseEvent } from "react";
+import { useI18n } from "@/i18n";
 import Check from "lucide-react/dist/esm/icons/check";
 import Minus from "lucide-react/dist/esm/icons/minus";
 import Plus from "lucide-react/dist/esm/icons/plus";
@@ -44,6 +45,7 @@ export function CommitButton({
   commitLoading,
   onCommit,
 }: CommitButtonProps) {
+  const { tx } = useI18n();
   const hasMessage = commitMessage.trim().length > 0;
   const hasChanges = hasStagedFiles || hasUnstagedFiles;
   const canCommit = hasMessage && hasChanges && !commitLoading;
@@ -63,12 +65,12 @@ export function CommitButton({
         disabled={!canCommit}
         title={
           !hasMessage
-            ? "Enter a commit message"
+            ? tx("Enter a commit message")
             : !hasChanges
-              ? "No changes to commit"
+              ? tx("No changes to commit")
               : hasStagedFiles
-                ? "Commit staged changes"
-                : "Commit all unstaged changes"
+                ? tx("Commit staged changes")
+                : tx("Commit all unstaged changes")
         }
       >
         {commitLoading ? (
@@ -88,7 +90,7 @@ export function CommitButton({
             <path d="M20 6 9 17l-5-5" />
           </svg>
         )}
-        <span>{commitLoading ? "Committing..." : "Commit"}</span>
+        <span>{commitLoading ? tx("Committing...") : tx("Commit")}</span>
       </button>
     </div>
   );
@@ -107,6 +109,8 @@ export function SidebarError({
   action,
   onDismiss,
 }: SidebarErrorProps) {
+  const { tx } = useI18n();
+
   return (
     <div className={`sidebar-error sidebar-error-${variant}`}>
       <div className="sidebar-error-body">
@@ -129,8 +133,8 @@ export function SidebarError({
         type="button"
         className="ghost icon-button sidebar-error-dismiss"
         onClick={onDismiss}
-        aria-label="Dismiss error"
-        title="Dismiss error"
+        aria-label={tx("Dismiss error")}
+        title={tx("Dismiss error")}
       >
         <X size={12} aria-hidden />
       </button>
@@ -163,6 +167,7 @@ function DiffFileRow({
   onUnstageFile,
   onDiscardFile,
 }: DiffFileRowProps) {
+  const { tx } = useI18n();
   const { name, dir } = splitPath(file.path);
   const { base, extension } = splitNameAndExtension(name);
   const statusSymbol = getStatusSymbol(file.status);
@@ -203,7 +208,7 @@ function DiffFileRow({
           <span className="diff-sep">/</span>
           <span className="diff-del">-{file.deletions}</span>
         </span>
-        <div className="diff-row-actions" role="group" aria-label="File actions">
+        <div className="diff-row-actions" role="group" aria-label={tx("File actions")}>
           {showStage && (
             <button
               type="button"
@@ -212,9 +217,9 @@ function DiffFileRow({
                 event.stopPropagation();
                 void onStageFile?.(file.path);
               }}
-              data-tooltip="Stage Changes"
+              data-tooltip={tx("Stage Changes")}
               data-tooltip-align="end"
-              aria-label="Stage file"
+              aria-label={tx("Stage file")}
             >
               <Plus size={12} aria-hidden />
             </button>
@@ -227,9 +232,9 @@ function DiffFileRow({
                 event.stopPropagation();
                 void onUnstageFile?.(file.path);
               }}
-              data-tooltip="Unstage Changes"
+              data-tooltip={tx("Unstage Changes")}
               data-tooltip-align="end"
-              aria-label="Unstage file"
+              aria-label={tx("Unstage file")}
             >
               <Minus size={12} aria-hidden />
             </button>
@@ -242,9 +247,9 @@ function DiffFileRow({
                 event.stopPropagation();
                 void onDiscardFile?.(file.path);
               }}
-              data-tooltip="Discard Changes"
+              data-tooltip={tx("Discard Changes")}
               data-tooltip-align="end"
-              aria-label="Discard changes"
+              aria-label={tx("Discard changes")}
             >
               <RotateCcw size={12} aria-hidden />
             </button>
@@ -306,6 +311,7 @@ export function DiffSection({
   onFileClick,
   onShowFileMenu,
 }: DiffSectionProps) {
+  const { tx } = useI18n();
   const filePaths = files.map((file) => file.path);
   const canStageAll =
     section === "unstaged" &&
@@ -330,7 +336,11 @@ export function DiffSection({
           <span className="diff-section-count">{files.length}</span>
         </div>
         {showSectionActions && (
-          <div className="diff-section-actions" role="group" aria-label={`${title} actions`}>
+          <div
+            className="diff-section-actions"
+            role="group"
+            aria-label={tx("{title} actions", { title })}
+          >
             {canApplyWorktree && (
               <button
                 type="button"
@@ -339,9 +349,13 @@ export function DiffSection({
                   void onApplyWorktreeChanges?.();
                 }}
                 disabled={worktreeApplyLoading || worktreeApplySuccess}
-                data-tooltip={worktreeApplyTitle ?? "Apply changes to parent workspace"}
+                data-tooltip={
+                  worktreeApplyTitle
+                    ? tx(worktreeApplyTitle)
+                    : tx("Apply changes to parent workspace")
+                }
                 data-tooltip-align="end"
-                aria-label="Apply worktree changes"
+                aria-label={tx("Apply worktree changes")}
               >
                 <WorktreeApplyIcon success={worktreeApplySuccess} />
               </button>
@@ -353,9 +367,9 @@ export function DiffSection({
                 onClick={() => {
                   void onReviewUncommittedChanges?.();
                 }}
-                data-tooltip="Review Uncommitted Changes"
+                data-tooltip={tx("Review Uncommitted Changes")}
                 data-tooltip-align="end"
-                aria-label="Review uncommitted changes"
+                aria-label={tx("Review uncommitted changes")}
               >
                 <MagicSparkleIcon size={12} />
               </button>
@@ -375,9 +389,9 @@ export function DiffSection({
                     }
                   })();
                 }}
-                data-tooltip="Stage All Changes"
+                data-tooltip={tx("Stage All Changes")}
                 data-tooltip-align="end"
-                aria-label="Stage all changes"
+                aria-label={tx("Stage all changes")}
               >
                 <Plus size={12} aria-hidden />
               </button>
@@ -393,9 +407,9 @@ export function DiffSection({
                     }
                   })();
                 }}
-                data-tooltip="Unstage All Changes"
+                data-tooltip={tx("Unstage All Changes")}
                 data-tooltip-align="end"
-                aria-label="Unstage all changes"
+                aria-label={tx("Unstage all changes")}
               >
                 <Minus size={12} aria-hidden />
               </button>
@@ -407,9 +421,9 @@ export function DiffSection({
                 onClick={() => {
                   void onDiscardFiles?.(filePaths);
                 }}
-                data-tooltip="Discard All Changes"
+                data-tooltip={tx("Discard All Changes")}
                 data-tooltip-align="end"
-                aria-label="Discard all changes"
+                aria-label={tx("Discard all changes")}
               >
                 <RotateCcw size={12} aria-hidden />
               </button>
@@ -457,6 +471,8 @@ export function GitLogEntryRow({
   onSelect,
   onContextMenu,
 }: GitLogEntryRowProps) {
+  const { tx } = useI18n();
+
   return (
     <div
       className={`git-log-entry ${compact ? "git-log-entry-compact" : ""} ${isSelected ? "active" : ""}`}
@@ -471,11 +487,11 @@ export function GitLogEntryRow({
         }
       }}
     >
-      <div className="git-log-summary">{entry.summary || "No message"}</div>
+      <div className="git-log-summary">{entry.summary || tx("No message")}</div>
       <div className="git-log-meta">
         <span className="git-log-sha">{entry.sha.slice(0, 7)}</span>
         <span className="git-log-sep">·</span>
-        <span className="git-log-author">{entry.author || "Unknown"}</span>
+        <span className="git-log-author">{entry.author || tx("Unknown")}</span>
         <span className="git-log-sep">·</span>
         <span className="git-log-date">{formatRelativeTime(entry.timestamp * 1000)}</span>
       </div>
diff --git a/src/features/git/components/GitDiffViewer.tsx b/src/features/git/components/GitDiffViewer.tsx
index ff152e58c..8b7861629 100644
--- a/src/features/git/components/GitDiffViewer.tsx
+++ b/src/features/git/components/GitDiffViewer.tsx
@@ -3,6 +3,7 @@ import { ask } from "@tauri-apps/plugin-dialog";
 import { useVirtualizer } from "@tanstack/react-virtual";
 import type { SelectedLineRange } from "@pierre/diffs";
 import { WorkerPoolContextProvider } from "@pierre/diffs/react";
+import { useI18n } from "@/i18n";
 import GitCommitHorizontal from "lucide-react/dist/esm/icons/git-commit-horizontal";
 import RotateCcw from "lucide-react/dist/esm/icons/rotate-ccw";
 import type { ParsedDiffLine } from "../../../utils/diff";
@@ -146,6 +147,7 @@ export function GitDiffViewer({
   onActivePathChange,
   onInsertComposerText,
 }: GitDiffViewerProps) {
+  const { tx } = useI18n();
   const containerRef = useRef<HTMLDivElement>(null);
   const listRef = useRef<HTMLDivElement>(null);
   const activePathRef = useRef<string | null>(null);
@@ -320,15 +322,15 @@ export function GitDiffViewer({
         return;
       }
       const confirmed = await ask(
-        `Discard changes in:\n\n${path}\n\nThis cannot be undone.`,
-        { title: "Discard changes", kind: "warning" },
+        tx("Discard changes in:\n\n{path}\n\nThis cannot be undone.", { path }),
+        { title: tx("Discard changes"), kind: "warning" },
       );
       if (!confirmed) {
         return;
       }
       await onRevertFile(path);
     },
-    [onRevertFile],
+    [onRevertFile, tx],
   );
 
   useEffect(() => {
@@ -453,15 +455,16 @@ export function GitDiffViewer({
 
   const emptyStateCopy = pullRequest
     ? {
-        title: "No file changes in this pull request",
-        subtitle:
+        title: tx("No file changes in this pull request"),
+        subtitle: tx(
           "The pull request loaded, but there are no diff hunks to render for this selection.",
-        hint: "Try switching to another pull request or commit from the Git panel.",
+        ),
+        hint: tx("Try switching to another pull request or commit from the Git panel."),
       }
     : {
-        title: "Working tree is clean",
-        subtitle: "No local changes were detected for the current workspace.",
-        hint: "Make an edit, stage a file, or select a commit to inspect changes here.",
+        title: tx("Working tree is clean"),
+        subtitle: tx("No local changes were detected for the current workspace."),
+        hint: tx("Make an edit, stage a file, or select a commit to inspect changes here."),
       };
 
   return (
@@ -511,8 +514,8 @@ export function GitDiffViewer({
                 <button
                   type="button"
                   className="diff-viewer-header-action diff-viewer-header-action--discard"
-                  title="Discard changes in this file"
-                  aria-label="Discard changes in this file"
+                  title={tx("Discard changes in this file")}
+                  aria-label={tx("Discard changes in this file")}
                   onClick={(event) => {
                     event.preventDefault();
                     event.stopPropagation();
@@ -530,7 +533,7 @@ export function GitDiffViewer({
         {error && <div className="diff-viewer-empty">{error}</div>}
         {!error && isLoading && diffs.length > 0 && (
           <div className="diff-viewer-loading diff-viewer-loading-overlay">
-            Refreshing diff...
+            {tx("Refreshing diff...")}
           </div>
         )}
         {!error && !isLoading && !diffs.length && (
diff --git a/src/features/git/components/GitDiffViewerDiffCard.tsx b/src/features/git/components/GitDiffViewerDiffCard.tsx
index 0ccabf349..5ed2a9f71 100644
--- a/src/features/git/components/GitDiffViewerDiffCard.tsx
+++ b/src/features/git/components/GitDiffViewerDiffCard.tsx
@@ -6,6 +6,7 @@ import {
   type SelectedLineRange,
 } from "@pierre/diffs";
 import { FileDiff } from "@pierre/diffs/react";
+import { useI18n } from "@/i18n";
 import RotateCcw from "lucide-react/dist/esm/icons/rotate-ccw";
 import type {
   PullRequestReviewAction,
@@ -116,6 +117,7 @@ export const DiffCard = memo(function DiffCard({
   pullRequestReviewLaunching = false,
   pullRequestReviewThreadId = null,
 }: DiffCardProps) {
+  const { tx } = useI18n();
   const displayPath = entry.displayPath ?? entry.path;
   const { name: fileName, dir } = useMemo(
     () => splitPath(displayPath),
@@ -151,13 +153,13 @@ export const DiffCard = memo(function DiffCard({
 
   const placeholder = useMemo(() => {
     if (isLoading) {
-      return "Loading diff...";
+      return tx("Loading diff...");
     }
     if (ignoreWhitespaceChanges && !entry.diff.trim()) {
-      return "No non-whitespace changes.";
+      return tx("No non-whitespace changes.");
     }
-    return "Diff unavailable.";
-  }, [entry.diff, ignoreWhitespaceChanges, isLoading]);
+    return tx("Diff unavailable.");
+  }, [entry.diff, ignoreWhitespaceChanges, isLoading, tx]);
 
   const parsedLines = useMemo(() => {
     const parsed = parseDiff(entry.diff);
@@ -211,8 +213,8 @@ export const DiffCard = memo(function DiffCard({
           <button
             type="button"
             className="diff-viewer-header-action diff-viewer-header-action--discard"
-            title="Discard changes in this file"
-            aria-label="Discard changes in this file"
+            title={tx("Discard changes in this file")}
+            aria-label={tx("Discard changes in this file")}
             onClick={(event) => {
               event.preventDefault();
               event.stopPropagation();
@@ -224,7 +226,11 @@ export const DiffCard = memo(function DiffCard({
         )}
       </div>
       {useInteractiveDiff && selectedLines && reviewActions.length > 0 ? (
-        <div className="diff-viewer-review-actions" role="toolbar" aria-label="PR selection actions">
+        <div
+          className="diff-viewer-review-actions"
+          role="toolbar"
+          aria-label={tx("PR selection actions")}
+        >
           {reviewActions.map((action) => (
             <button
               key={action.id}
@@ -238,7 +244,7 @@ export const DiffCard = memo(function DiffCard({
                 void onRunReviewAction(action.intent, parsedLines, selectedLines);
               }}
             >
-              {action.label}
+              {tx(action.label)}
             </button>
           ))}
           <button
@@ -246,11 +252,13 @@ export const DiffCard = memo(function DiffCard({
             className="ghost diff-viewer-review-action"
             onClick={onClearSelection}
           >
-            Clear
+            {tx("Clear")}
           </button>
           {pullRequestReviewThreadId ? (
             <span className="diff-viewer-review-thread">
-              Last review thread: {pullRequestReviewThreadId}
+              {tx("Last review thread: {threadId}", {
+                threadId: pullRequestReviewThreadId,
+              })}
             </span>
           ) : null}
         </div>
@@ -267,8 +275,8 @@ export const DiffCard = memo(function DiffCard({
                     <button
                       type="button"
                       className="diff-viewer-line-action-button"
-                      aria-label="Ask for changes on hovered line"
-                      title="Ask for changes on this line"
+                      aria-label={tx("Ask for changes on hovered line")}
+                      title={tx("Ask for changes on this line")}
                       onMouseDown={(event) => {
                         event.preventDefault();
                         event.stopPropagation();
diff --git a/src/features/git/components/GitDiffViewerPullRequestSummary.tsx b/src/features/git/components/GitDiffViewerPullRequestSummary.tsx
index 61e5455b4..9fb6864b6 100644
--- a/src/features/git/components/GitDiffViewerPullRequestSummary.tsx
+++ b/src/features/git/components/GitDiffViewerPullRequestSummary.tsx
@@ -1,4 +1,5 @@
 import { memo, useEffect, useMemo, useState } from "react";
+import { useI18n } from "@/i18n";
 import type { GitHubPullRequest, GitHubPullRequestComment } from "../../../types";
 import { formatRelativeTime } from "../../../utils/time";
 import { Markdown } from "../../messages/components/Markdown";
@@ -27,10 +28,11 @@ export const PullRequestSummary = memo(function PullRequestSummary({
   pullRequestCommentsError,
   onCheckoutPullRequest,
 }: PullRequestSummaryProps) {
+  const { tx } = useI18n();
   const prUpdatedLabel = pullRequest.updatedAt
     ? formatRelativeTime(new Date(pullRequest.updatedAt).getTime())
     : null;
-  const prAuthor = pullRequest.author?.login ?? "unknown";
+  const prAuthor = pullRequest.author?.login ?? tx("unknown");
   const prBody = pullRequest.body?.trim() ?? "";
   const [isTimelineExpanded, setIsTimelineExpanded] = useState(false);
   const [isCheckingOut, setIsCheckingOut] = useState(false);
@@ -59,7 +61,7 @@ export const PullRequestSummary = memo(function PullRequestSummary({
   }, [pullRequest.number]);
 
   return (
-    <section className="diff-viewer-pr" aria-label="Pull request summary">
+    <section className="diff-viewer-pr" aria-label={tx("Pull request summary")}>
       <div className="diff-viewer-pr-header">
         <div className="diff-viewer-pr-header-row">
           <div className="diff-viewer-pr-title">
@@ -74,7 +76,7 @@ export const PullRequestSummary = memo(function PullRequestSummary({
                 type="button"
                 className="ghost diff-viewer-pr-jump"
                 onClick={onJumpToFirstFile}
-                aria-label="Jump to first file"
+                aria-label={tx("Jump to first file")}
               >
                 <span className="diff-viewer-pr-jump-add">
                   +{diffStats.additions}
@@ -89,7 +91,9 @@ export const PullRequestSummary = memo(function PullRequestSummary({
               <button
                 type="button"
                 className="ghost diff-viewer-pr-checkout"
-                aria-label={`Checkout PR #${pullRequest.number} branch`}
+                aria-label={tx("Checkout PR #{number} branch", {
+                  number: pullRequest.number,
+                })}
                 disabled={isCheckingOut}
                 onClick={() => {
                   setIsCheckingOut(true);
@@ -98,7 +102,7 @@ export const PullRequestSummary = memo(function PullRequestSummary({
                   });
                 }}
               >
-                {isCheckingOut ? "Checking out..." : "Checkout Branch"}
+                {isCheckingOut ? tx("Checking out...") : tx("Checkout Branch")}
               </button>
             ) : null}
           </div>
@@ -116,7 +120,7 @@ export const PullRequestSummary = memo(function PullRequestSummary({
             {pullRequest.baseRefName} ← {pullRequest.headRefName}
           </span>
           {pullRequest.isDraft && (
-            <span className="diff-viewer-pr-pill">Draft</span>
+            <span className="diff-viewer-pr-pill">{tx("Draft")}</span>
           )}
         </div>
       </div>
@@ -127,15 +131,16 @@ export const PullRequestSummary = memo(function PullRequestSummary({
             className="diff-viewer-pr-markdown markdown"
           />
         ) : (
-          <div className="diff-viewer-pr-empty">No description provided.</div>
+          <div className="diff-viewer-pr-empty">{tx("No description provided.")}</div>
         )}
       </div>
       <div className="diff-viewer-pr-timeline">
         <div className="diff-viewer-pr-timeline-header">
-          <span className="diff-viewer-pr-timeline-title">Activity</span>
+          <span className="diff-viewer-pr-timeline-title">{tx("Activity")}</span>
           <span className="diff-viewer-pr-timeline-count">
-            {sortedComments.length} comment
-            {sortedComments.length === 1 ? "" : "s"}
+            {sortedComments.length === 1
+              ? tx("{count} comment", { count: sortedComments.length })
+              : tx("{count} comments", { count: sortedComments.length })}
           </span>
           {hiddenCommentCount > 0 && (
             <button
@@ -143,7 +148,7 @@ export const PullRequestSummary = memo(function PullRequestSummary({
               className="ghost diff-viewer-pr-timeline-button"
               onClick={() => setIsTimelineExpanded(true)}
             >
-              Show all
+              {tx("Show all")}
             </button>
           )}
           {isTimelineExpanded &&
@@ -153,14 +158,14 @@ export const PullRequestSummary = memo(function PullRequestSummary({
                 className="ghost diff-viewer-pr-timeline-button"
                 onClick={() => setIsTimelineExpanded(false)}
               >
-                Collapse
+                {tx("Collapse")}
               </button>
             )}
         </div>
         <div className="diff-viewer-pr-timeline-list">
           {pullRequestCommentsLoading && (
             <div className="diff-viewer-pr-timeline-state">
-              Loading comments…
+              {tx("Loading comments…")}
             </div>
           )}
           {pullRequestCommentsError && (
@@ -172,17 +177,18 @@ export const PullRequestSummary = memo(function PullRequestSummary({
             !pullRequestCommentsError &&
             !sortedComments.length && (
               <div className="diff-viewer-pr-timeline-state">
-                No comments yet.
+                {tx("No comments yet.")}
               </div>
             )}
           {hiddenCommentCount > 0 && !isTimelineExpanded && (
             <div className="diff-viewer-pr-timeline-divider">
-              {hiddenCommentCount} earlier comment
-              {hiddenCommentCount === 1 ? "" : "s"}
+              {hiddenCommentCount === 1
+                ? tx("{count} earlier comment", { count: hiddenCommentCount })
+                : tx("{count} earlier comments", { count: hiddenCommentCount })}
             </div>
           )}
           {visibleComments.map((comment) => {
-            const commentAuthor = comment.author?.login ?? "unknown";
+            const commentAuthor = comment.author?.login ?? tx("unknown");
             const commentTime = formatRelativeTime(
               new Date(comment.createdAt).getTime(),
             );
@@ -204,7 +210,7 @@ export const PullRequestSummary = memo(function PullRequestSummary({
                     />
                   ) : (
                     <div className="diff-viewer-pr-timeline-text">
-                      No comment body.
+                      {tx("No comment body.")}
                     </div>
                   )}
                 </div>
diff --git a/src/features/git/components/ImageDiffCard.tsx b/src/features/git/components/ImageDiffCard.tsx
index da150036d..8f4923504 100644
--- a/src/features/git/components/ImageDiffCard.tsx
+++ b/src/features/git/components/ImageDiffCard.tsx
@@ -1,4 +1,5 @@
 import { memo, useMemo } from "react";
+import { useI18n } from "@/i18n";
 import ImageOff from "lucide-react/dist/esm/icons/image-off";
 import RotateCcw from "lucide-react/dist/esm/icons/rotate-ccw";
 import { splitPath } from "./GitDiffPanel.utils";
@@ -44,6 +45,7 @@ export const ImageDiffCard = memo(function ImageDiffCard({
   showRevert = false,
   onRequestRevert,
 }: ImageDiffCardProps) {
+  const { tx } = useI18n();
   const { name: fileName, dir } = useMemo(() => splitPath(path), [path]);
   const displayDir = dir ? `${dir}/` : "";
   const oldDataUri = useMemo(
@@ -79,7 +81,7 @@ export const ImageDiffCard = memo(function ImageDiffCard({
   const isAdded = status === "A";
   const isDeleted = status === "D";
   const isModified = !isAdded && !isDeleted;
-  const placeholderLabel = "Image preview unavailable.";
+  const placeholderLabel = tx("Image preview unavailable.");
   const renderPlaceholder = () => (
     <div className="image-diff-placeholder">
       <ImageOff className="image-diff-placeholder-icon" aria-hidden />
@@ -104,8 +106,8 @@ export const ImageDiffCard = memo(function ImageDiffCard({
           <button
             type="button"
             className="diff-viewer-header-action diff-viewer-header-action--discard"
-            title="Discard changes in this file"
-            aria-label="Discard changes in this file"
+            title={tx("Discard changes in this file")}
+            aria-label={tx("Discard changes in this file")}
             onClick={(event) => {
               event.preventDefault();
               event.stopPropagation();
@@ -123,7 +125,7 @@ export const ImageDiffCard = memo(function ImageDiffCard({
               {oldDataUri ? (
                 <img
                   src={oldDataUri}
-                  alt="Previous version"
+                  alt={tx("Previous version")}
                   className="image-diff-preview"
                 />
               ) : (
@@ -135,7 +137,7 @@ export const ImageDiffCard = memo(function ImageDiffCard({
               {newDataUri ? (
                 <img
                   src={newDataUri}
-                  alt="Current version"
+                  alt={tx("Current version")}
                   className="image-diff-preview"
                 />
               ) : (
@@ -151,7 +153,7 @@ export const ImageDiffCard = memo(function ImageDiffCard({
               {newDataUri ? (
                 <img
                   src={newDataUri}
-                  alt="New image"
+                  alt={tx("New image")}
                   className="image-diff-preview"
                 />
               ) : (
@@ -167,7 +169,7 @@ export const ImageDiffCard = memo(function ImageDiffCard({
               {oldDataUri ? (
                 <img
                   src={oldDataUri}
-                  alt="Deleted image"
+                  alt={tx("Deleted image")}
                   className="image-diff-preview"
                 />
               ) : (
diff --git a/src/features/git/components/InitGitRepoPrompt.tsx b/src/features/git/components/InitGitRepoPrompt.tsx
index 84f6082a1..aaf2d2f3e 100644
--- a/src/features/git/components/InitGitRepoPrompt.tsx
+++ b/src/features/git/components/InitGitRepoPrompt.tsx
@@ -1,4 +1,5 @@
 import { useEffect, useMemo, useRef } from "react";
+import { useI18n } from "@/i18n";
 import { ModalShell } from "../../design-system/components/modal/ModalShell";
 import { validateBranchName } from "../utils/branchValidation";
 
@@ -33,6 +34,7 @@ export function InitGitRepoPrompt({
   onCancel,
   onConfirm,
 }: InitGitRepoPromptProps) {
+  const { tx } = useI18n();
   const inputRef = useRef<HTMLInputElement | null>(null);
 
   useEffect(() => {
@@ -43,10 +45,11 @@ export function InitGitRepoPrompt({
   const validationError = useMemo(() => {
     const trimmed = branch.trim();
     if (!trimmed) {
-      return "Branch name is required.";
+      return tx("Branch name is required.");
     }
-    return validateBranchName(branch);
-  }, [branch]);
+    const branchError = validateBranchName(branch);
+    return branchError ? tx(branchError) : null;
+  }, [branch, tx]);
 
   const remoteValidationError = useMemo(() => {
     if (!createRemote) {
@@ -54,13 +57,13 @@ export function InitGitRepoPrompt({
     }
     const trimmed = repoName.trim();
     if (!trimmed) {
-      return "Repository name is required.";
+      return tx("Repository name is required.");
     }
     if (/\s/.test(trimmed)) {
-      return "Repository name cannot contain spaces.";
+      return tx("Repository name cannot contain spaces.");
     }
     return null;
-  }, [createRemote, repoName]);
+  }, [createRemote, repoName, tx]);
 
   const combinedValidationError = validationError || remoteValidationError;
   const canSubmit = !isBusy && !combinedValidationError;
@@ -68,20 +71,22 @@ export function InitGitRepoPrompt({
   return (
     <ModalShell
       className="git-init-modal"
-      ariaLabel="Initialize Git"
+      ariaLabel={tx("Initialize Git")}
       onBackdropClick={() => {
         if (!isBusy) {
           onCancel();
         }
       }}
     >
-      <div className="ds-modal-title git-init-modal-title">Initialize Git</div>
+      <div className="ds-modal-title git-init-modal-title">{tx("Initialize Git")}</div>
       <div className="ds-modal-subtitle git-init-modal-subtitle">
-        Create a new repository under "{workspaceName}" and make an initial commit.
+        {tx("Create a new repository under \"{workspaceName}\" and make an initial commit.", {
+          workspaceName,
+        })}
       </div>
 
       <label className="ds-modal-label git-init-modal-label" htmlFor="git-init-branch">
-        Initial branch
+        {tx("Initial branch")}
       </label>
       <input
         id="git-init-branch"
@@ -117,14 +122,14 @@ export function InitGitRepoPrompt({
           onChange={(event) => onCreateRemoteChange(event.target.checked)}
         />
         <span className="git-init-modal-checkbox-text">
-          Create GitHub repository and set up <code>origin</code>
+          {tx("Create GitHub repository and set up")} <code>origin</code>
         </span>
       </label>
 
       {createRemote && (
         <div className="git-init-modal-remote">
           <label className="ds-modal-label git-init-modal-label" htmlFor="git-init-repo-name">
-            GitHub repo
+            {tx("GitHub repo")}
           </label>
           <input
             id="git-init-repo-name"
@@ -158,7 +163,7 @@ export function InitGitRepoPrompt({
               disabled={isBusy}
               onChange={(event) => onPrivateChange(event.target.checked)}
             />
-            <span className="git-init-modal-checkbox-text">Private repo</span>
+            <span className="git-init-modal-checkbox-text">{tx("Private repo")}</span>
           </label>
         </div>
       )}
@@ -176,7 +181,7 @@ export function InitGitRepoPrompt({
           onClick={onCancel}
           disabled={isBusy}
         >
-          Cancel
+          {tx("Cancel")}
         </button>
         <button
           type="button"
@@ -184,7 +189,7 @@ export function InitGitRepoPrompt({
           onClick={onConfirm}
           disabled={!canSubmit}
         >
-          {isBusy ? "Initializing..." : "Initialize"}
+          {isBusy ? tx("Initializing...") : tx("Initialize")}
         </button>
       </div>
     </ModalShell>
diff --git a/src/features/git/components/PierreDiffBlock.tsx b/src/features/git/components/PierreDiffBlock.tsx
index 3a2bb5345..2cc238688 100644
--- a/src/features/git/components/PierreDiffBlock.tsx
+++ b/src/features/git/components/PierreDiffBlock.tsx
@@ -1,4 +1,5 @@
 import { useMemo } from "react";
+import { useI18n } from "@/i18n";
 import { parsePatchFiles, type FileDiffMetadata } from "@pierre/diffs";
 import { FileDiff, WorkerPoolContextProvider } from "@pierre/diffs/react";
 import { parseDiff } from "../../../utils/diff";
@@ -29,6 +30,7 @@ export function PierreDiffBlock({
   newLines,
   diffStyle = "unified",
 }: PierreDiffBlockProps) {
+  const { tx } = useI18n();
   const poolOptions = useMemo(() => ({ workerFactory }), []);
   const highlighterOptions = useMemo(
     () => DIFF_VIEWER_HIGHLIGHTER_OPTIONS,
@@ -82,7 +84,7 @@ export function PierreDiffBlock({
   );
 
   if (!diff.trim()) {
-    return <div className="diff-viewer-placeholder">Diff unavailable.</div>;
+    return <div className="diff-viewer-placeholder">{tx("Diff unavailable.")}</div>;
   }
 
   return (
diff --git a/src/features/home/components/Home.tsx b/src/features/home/components/Home.tsx
index 1c749b63b..f3e1bd282 100644
--- a/src/features/home/components/Home.tsx
+++ b/src/features/home/components/Home.tsx
@@ -11,6 +11,7 @@ import type {
   UsageMetric,
   UsageWorkspaceOption,
 } from "../homeTypes";
+import { useI18n } from "@/i18n";
 
 type HomeProps = {
   onAddWorkspace: () => void;
@@ -51,12 +52,14 @@ export function Home({
   accountInfo,
   onSelectThread,
 }: HomeProps) {
+  const { tx } = useI18n();
+
   return (
     <div className="home">
       <div className="home-hero">
-        <div className="home-title">Codex Monitor</div>
+        <div className="home-title">{tx("Codex Monitor")}</div>
         <div className="home-subtitle">
-          Orchestrate agents across your local projects.
+          {tx("Orchestrate agents across your local projects.")}
         </div>
       </div>
       <HomeLatestAgentsSection
diff --git a/src/features/home/components/HomeLatestAgentsSection.tsx b/src/features/home/components/HomeLatestAgentsSection.tsx
index 400d6f448..064e22cb2 100644
--- a/src/features/home/components/HomeLatestAgentsSection.tsx
+++ b/src/features/home/components/HomeLatestAgentsSection.tsx
@@ -1,5 +1,6 @@
 import { formatRelativeTime } from "../../../utils/time";
 import type { LatestAgentRun } from "../homeTypes";
+import { useI18n } from "@/i18n";
 
 type HomeLatestAgentsSectionProps = {
   isLoadingLatestAgents: boolean;
@@ -12,10 +13,12 @@ export function HomeLatestAgentsSection({
   latestAgentRuns,
   onSelectThread,
 }: HomeLatestAgentsSectionProps) {
+  const { tx } = useI18n();
+
   return (
     <div className="home-latest">
       <div className="home-latest-header">
-        <div className="home-latest-label">Latest agents</div>
+        <div className="home-latest-label">{tx("Latest agents")}</div>
       </div>
       {latestAgentRuns.length > 0 ? (
         <div className="home-latest-grid">
@@ -38,16 +41,16 @@ export function HomeLatestAgentsSection({
                 </div>
               </div>
               <div className="home-latest-message">
-                {run.message.trim() || "Agent replied."}
+                {run.message.trim() || tx("Agent replied.")}
               </div>
               {run.isProcessing && (
-                <div className="home-latest-status">Running</div>
+                <div className="home-latest-status">{tx("Running")}</div>
               )}
             </button>
           ))}
         </div>
       ) : isLoadingLatestAgents ? (
-        <div className="home-latest-grid home-latest-grid-loading" aria-label="Loading agents">
+        <div className="home-latest-grid home-latest-grid-loading" aria-label={tx("Loading agents")}>
           {Array.from({ length: 3 }).map((_, index) => (
             <div className="home-latest-card home-latest-card-skeleton" key={index}>
               <div className="home-latest-card-header">
@@ -61,9 +64,9 @@ export function HomeLatestAgentsSection({
         </div>
       ) : (
         <div className="home-latest-empty">
-          <div className="home-latest-empty-title">No agent activity yet</div>
+          <div className="home-latest-empty-title">{tx("No agent activity yet")}</div>
           <div className="home-latest-empty-subtitle">
-            Start a thread to see the latest responses here.
+            {tx("Start a thread to see the latest responses here.")}
           </div>
         </div>
       )}
diff --git a/src/features/home/components/HomeUsageSection.tsx b/src/features/home/components/HomeUsageSection.tsx
index 11a331cbf..96af601f6 100644
--- a/src/features/home/components/HomeUsageSection.tsx
+++ b/src/features/home/components/HomeUsageSection.tsx
@@ -15,6 +15,7 @@ import {
 } from "../homeFormatters";
 import type { HomeStatCard, UsageMetric, UsageWorkspaceOption } from "../homeTypes";
 import { buildHomeUsageViewModel } from "../homeUsageViewModel";
+import { useI18n } from "@/i18n";
 
 type HomeUsageSectionProps = {
   accountInfo: AccountSnapshot | null;
@@ -58,6 +59,7 @@ export function HomeUsageSection({
   usageWorkspaceId,
   usageWorkspaceOptions,
 }: HomeUsageSectionProps) {
+  const { tx } = useI18n();
   const [chartWeekOffset, setChartWeekOffset] = useState(0);
   const {
     accountCards,
@@ -93,15 +95,18 @@ export function HomeUsageSection({
   const chartRangeLabel = formatWeekRange(chartDays);
   const chartRangeAriaLabel =
     chartDays.length > 0
-      ? `Usage week ${chartDays[0]?.day} to ${chartDays[chartDays.length - 1]?.day}`
-      : "Usage week";
+      ? tx("Usage week {start} to {end}", {
+          start: chartDays[0]?.day ?? "",
+          end: chartDays[chartDays.length - 1]?.day ?? "",
+        })
+      : tx("Usage week");
   const showUsageSkeleton = isLoadingLocalUsage && !localUsageSnapshot;
   const showUsageEmpty = !isLoadingLocalUsage && !localUsageSnapshot;
 
   return (
     <div className="home-usage">
       <div className="home-section-header">
-        <div className="home-section-title">Usage snapshot</div>
+        <div className="home-section-title">{tx("Usage snapshot")}</div>
         <div className="home-section-meta-row">
           {updatedLabel && <div className="home-section-meta">{updatedLabel}</div>}
           <button
@@ -113,8 +118,8 @@ export function HomeUsageSection({
             }
             onClick={onRefreshLocalUsage}
             disabled={isLoadingLocalUsage}
-            aria-label="Refresh usage"
-            title="Refresh usage"
+            aria-label={tx("Refresh usage")}
+            title={tx("Refresh usage")}
           >
             <RefreshCw
               className={
@@ -129,7 +134,7 @@ export function HomeUsageSection({
       </div>
       <div className="home-usage-controls">
         <div className="home-usage-control-group">
-          <span className="home-usage-control-label">Workspace</span>
+          <span className="home-usage-control-label">{tx("Workspace")}</span>
           <div className="home-usage-select-wrap">
             <select
               className="home-usage-select"
@@ -137,7 +142,7 @@ export function HomeUsageSection({
               onChange={(event) => onUsageWorkspaceChange(event.target.value || null)}
               disabled={usageWorkspaceOptions.length === 0}
             >
-              <option value="">All workspaces</option>
+              <option value="">{tx("All workspaces")}</option>
               {usageWorkspaceOptions.map((option) => (
                 <option key={option.id} value={option.id}>
                   {option.label}
@@ -147,8 +152,8 @@ export function HomeUsageSection({
           </div>
         </div>
         <div className="home-usage-control-group">
-          <span className="home-usage-control-label">View</span>
-          <div className="home-usage-toggle" role="group" aria-label="Usage view">
+          <span className="home-usage-control-label">{tx("View")}</span>
+          <div className="home-usage-toggle" role="group" aria-label={tx("Usage view")}>
             <button
               type="button"
               className={
@@ -159,7 +164,7 @@ export function HomeUsageSection({
               onClick={() => onUsageMetricChange("tokens")}
               aria-pressed={usageMetric === "tokens"}
             >
-              Tokens
+              {tx("Tokens")}
             </button>
             <button
               type="button"
@@ -171,7 +176,7 @@ export function HomeUsageSection({
               onClick={() => onUsageMetricChange("time")}
               aria-pressed={usageMetric === "time"}
             >
-              Time
+              {tx("Time")}
             </button>
           </div>
         </div>
@@ -192,9 +197,9 @@ export function HomeUsageSection({
         </div>
       ) : showUsageEmpty ? (
         <div className="home-usage-empty">
-          <div className="home-usage-empty-title">No usage data yet</div>
+          <div className="home-usage-empty-title">{tx("No usage data yet")}</div>
           <div className="home-usage-empty-subtitle">
-            Run a Codex session to start tracking local usage.
+            {tx("Run a Codex session to start tracking local usage.")}
           </div>
           {localUsageError && (
             <div className="home-usage-error">{localUsageError}</div>
@@ -222,8 +227,8 @@ export function HomeUsageSection({
                     type="button"
                     className="home-usage-chart-button"
                     onClick={() => setChartWeekOffset((current) => current + 1)}
-                    aria-label="Show previous week"
-                    title="Show previous week"
+                    aria-label={tx("Show previous week")}
+                    title={tx("Show previous week")}
                   >
                     <ChevronLeft aria-hidden />
                   </button>
@@ -232,8 +237,8 @@ export function HomeUsageSection({
                   type="button"
                   className="home-usage-chart-button"
                   onClick={() => setChartWeekOffset((current) => Math.max(0, current - 1))}
-                  aria-label="Show next week"
-                  title="Show next week"
+                  aria-label={tx("Show next week")}
+                  title={tx("Show next week")}
                   disabled={!canShowNewerWeek}
                 >
                   <ChevronRight aria-hidden />
@@ -268,9 +273,9 @@ export function HomeUsageSection({
           </div>
           <div className="home-usage-models">
             <div className="home-usage-models-label">
-              Top models
+              {tx("Top models")}
               {usageMetric === "time" && (
-                <span className="home-usage-models-hint">Tokens</span>
+                <span className="home-usage-models-hint">{tx("Tokens")}</span>
               )}
             </div>
             <div className="home-usage-models-list">
@@ -288,7 +293,7 @@ export function HomeUsageSection({
                   </span>
                 ))
               ) : (
-                <span className="home-usage-model-empty">No models yet</span>
+                <span className="home-usage-model-empty">{tx("No models yet")}</span>
               )}
             </div>
             {localUsageError && <div className="home-usage-error">{localUsageError}</div>}
@@ -298,7 +303,7 @@ export function HomeUsageSection({
       {accountCards.length > 0 && (
         <div className="home-account">
           <div className="home-section-header">
-            <div className="home-section-title">Account limits</div>
+            <div className="home-section-title">{tx("Account limits")}</div>
             {accountMeta && (
               <div className="home-section-meta-row">
                 <div className="home-section-meta">{accountMeta}</div>
diff --git a/src/features/layout/components/DesktopLayout.tsx b/src/features/layout/components/DesktopLayout.tsx
index 810637c24..419f53125 100644
--- a/src/features/layout/components/DesktopLayout.tsx
+++ b/src/features/layout/components/DesktopLayout.tsx
@@ -1,4 +1,5 @@
 import { useEffect, useRef, type MouseEvent, type ReactNode } from "react";
+import { useI18n } from "@/i18n";
 import { MainTopbar } from "../../app/components/MainTopbar";
 import { ChatPane } from "./ChatPane";
 
@@ -107,6 +108,7 @@ export function DesktopLayout({
   onPlanPanelResizeStart,
   onChatDiffSplitPositionResizeStart,
 }: DesktopLayoutProps) {
+  const { tx } = useI18n();
   const diffLayerRef = useRef<HTMLDivElement | null>(null);
   const chatLayerRef = useRef<HTMLDivElement | null>(null);
   const chatPaneNode = <ChatPane messagesNode={messagesNode} composerNode={composerNode} />;
@@ -146,7 +148,7 @@ export function DesktopLayout({
         className="sidebar-resizer"
         role="separator"
         aria-orientation="vertical"
-        aria-label="Resize sidebar"
+        aria-label={tx("Resize sidebar")}
         onMouseDown={onSidebarResizeStart}
       />
 
@@ -176,7 +178,7 @@ export function DesktopLayout({
                     className="content-split-resizer"
                     role="separator"
                     aria-orientation="vertical"
-                    aria-label="Resize chat/diff split"
+                    aria-label={tx("Resize chat/diff split")}
                     onMouseDown={onChatDiffSplitPositionResizeStart}
                   />
                   <div
@@ -222,7 +224,7 @@ export function DesktopLayout({
               className="right-panel-resizer"
               role="separator"
               aria-orientation="vertical"
-              aria-label="Resize right panel"
+              aria-label={tx("Resize right panel")}
               onMouseDown={onRightPanelResizeStart}
             />
             <div className={`right-panel ${hasActivePlan ? "" : "plan-collapsed"}`}>
@@ -232,7 +234,7 @@ export function DesktopLayout({
                 className="right-panel-divider"
                 role="separator"
                 aria-orientation="horizontal"
-                aria-label="Resize plan panel"
+                aria-label={tx("Resize plan panel")}
                 onMouseDown={onPlanPanelResizeStart}
               />
               <div className="right-panel-bottom">{planPanelNode}</div>
diff --git a/src/features/layout/components/PanelTabs.tsx b/src/features/layout/components/PanelTabs.tsx
index 162e1059d..6b593999d 100644
--- a/src/features/layout/components/PanelTabs.tsx
+++ b/src/features/layout/components/PanelTabs.tsx
@@ -1,4 +1,5 @@
 import { useRef, type KeyboardEvent, type ReactNode } from "react";
+import { useI18n } from "@/i18n";
 import Folder from "lucide-react/dist/esm/icons/folder";
 import GitBranch from "lucide-react/dist/esm/icons/git-branch";
 import ScrollText from "lucide-react/dist/esm/icons/scroll-text";
@@ -24,6 +25,7 @@ const defaultTabs: PanelTab[] = [
 ];
 
 export function PanelTabs({ active, onSelect, tabs = defaultTabs }: PanelTabsProps) {
+  const { tx } = useI18n();
   const tabRefs = useRef<Array<HTMLButtonElement | null>>([]);
   const activeIndex = tabs.findIndex((tab) => tab.id === active);
   const focusableIndex = activeIndex >= 0 ? activeIndex : 0;
@@ -66,9 +68,10 @@ export function PanelTabs({ active, onSelect, tabs = defaultTabs }: PanelTabsPro
   };
 
   return (
-    <div className="panel-tabs" role="tablist" aria-label="Panel" aria-orientation="horizontal">
+    <div className="panel-tabs" role="tablist" aria-label={tx("Panel")} aria-orientation="horizontal">
       {tabs.map((tab, index) => {
         const isActive = active === tab.id;
+        const label = tx(tab.label);
         return (
           <button
             key={tab.id}
@@ -82,8 +85,8 @@ export function PanelTabs({ active, onSelect, tabs = defaultTabs }: PanelTabsPro
             role="tab"
             aria-selected={isActive}
             tabIndex={index === focusableIndex ? 0 : -1}
-            aria-label={tab.label}
-            title={tab.label}
+            aria-label={label}
+            title={label}
           >
             <span className="panel-tab-icon" aria-hidden>
               {tab.icon}
diff --git a/src/features/layout/components/SidebarToggleControls.tsx b/src/features/layout/components/SidebarToggleControls.tsx
index 5fe3c8578..cfcdb4f66 100644
--- a/src/features/layout/components/SidebarToggleControls.tsx
+++ b/src/features/layout/components/SidebarToggleControls.tsx
@@ -2,6 +2,7 @@ import PanelLeftClose from "lucide-react/dist/esm/icons/panel-left-close";
 import PanelLeftOpen from "lucide-react/dist/esm/icons/panel-left-open";
 import PanelRightClose from "lucide-react/dist/esm/icons/panel-right-close";
 import PanelRightOpen from "lucide-react/dist/esm/icons/panel-right-open";
+import { useI18n } from "@/i18n";
 
 export type SidebarToggleProps = {
   isCompact: boolean;
@@ -18,6 +19,7 @@ export function SidebarCollapseButton({
   sidebarCollapsed,
   onCollapseSidebar,
 }: SidebarToggleProps) {
+  const { tx } = useI18n();
   if (isCompact || sidebarCollapsed) {
     return null;
   }
@@ -27,9 +29,9 @@ export function SidebarCollapseButton({
       className="ghost main-header-action ds-tooltip-trigger"
       onClick={onCollapseSidebar}
       data-tauri-drag-region="false"
-      aria-label="Hide threads sidebar"
-      title="Hide threads sidebar"
-      data-tooltip="Hide threads sidebar"
+      aria-label={tx("Hide threads sidebar")}
+      title={tx("Hide threads sidebar")}
+      data-tooltip={tx("Hide threads sidebar")}
       data-tooltip-placement="bottom"
     >
       <PanelLeftClose size={14} aria-hidden />
@@ -42,6 +44,7 @@ export function RightPanelCollapseButton({
   rightPanelCollapsed,
   onCollapseRightPanel,
 }: SidebarToggleProps) {
+  const { tx } = useI18n();
   if (isCompact || rightPanelCollapsed) {
     return null;
   }
@@ -51,9 +54,9 @@ export function RightPanelCollapseButton({
       className="ghost main-header-action ds-tooltip-trigger"
       onClick={onCollapseRightPanel}
       data-tauri-drag-region="false"
-      aria-label="Hide git sidebar"
-      title="Hide git sidebar"
-      data-tooltip="Hide git sidebar"
+      aria-label={tx("Hide git sidebar")}
+      title={tx("Hide git sidebar")}
+      data-tooltip={tx("Hide git sidebar")}
       data-tooltip-placement="bottom"
     >
       <PanelRightClose size={14} aria-hidden />
@@ -66,6 +69,7 @@ export function RightPanelExpandButton({
   rightPanelCollapsed,
   onExpandRightPanel,
 }: SidebarToggleProps) {
+  const { tx } = useI18n();
   if (isCompact || !rightPanelCollapsed) {
     return null;
   }
@@ -75,9 +79,9 @@ export function RightPanelExpandButton({
       className="ghost main-header-action ds-tooltip-trigger"
       onClick={onExpandRightPanel}
       data-tauri-drag-region="false"
-      aria-label="Show git sidebar"
-      title="Show git sidebar"
-      data-tooltip="Show git sidebar"
+      aria-label={tx("Show git sidebar")}
+      title={tx("Show git sidebar")}
+      data-tooltip={tx("Show git sidebar")}
       data-tooltip-placement="bottom"
     >
       <PanelRightOpen size={14} aria-hidden />
@@ -90,6 +94,7 @@ export function TitlebarExpandControls({
   sidebarCollapsed,
   onExpandSidebar,
 }: SidebarToggleProps) {
+  const { tx } = useI18n();
   if (isCompact || !sidebarCollapsed) {
     return null;
   }
@@ -102,9 +107,9 @@ export function TitlebarExpandControls({
             className="ghost main-header-action ds-tooltip-trigger"
             onClick={onExpandSidebar}
             data-tauri-drag-region="false"
-            aria-label="Show threads sidebar"
-            title="Show threads sidebar"
-            data-tooltip="Show threads sidebar"
+            aria-label={tx("Show threads sidebar")}
+            title={tx("Show threads sidebar")}
+            data-tooltip={tx("Show threads sidebar")}
             data-tooltip-placement="bottom"
           >
             <PanelLeftOpen size={14} aria-hidden />
diff --git a/src/features/layout/components/TabletLayout.tsx b/src/features/layout/components/TabletLayout.tsx
index d37b87328..c73326af4 100644
--- a/src/features/layout/components/TabletLayout.tsx
+++ b/src/features/layout/components/TabletLayout.tsx
@@ -1,4 +1,5 @@
 import type { MouseEvent, ReactNode } from "react";
+import { useI18n } from "@/i18n";
 import { MainTopbar } from "../../app/components/MainTopbar";
 import { ChatPane } from "./ChatPane";
 
@@ -41,6 +42,8 @@ export function TabletLayout({
   gitDiffViewerNode,
   debugPanelNode,
 }: TabletLayoutProps) {
+  const { tx } = useI18n();
+
   return (
     <>
       {tabletNavNode}
@@ -49,7 +52,7 @@ export function TabletLayout({
         className="projects-resizer"
         role="separator"
         aria-orientation="vertical"
-        aria-label="Resize projects"
+        aria-label={tx("Resize projects")}
         onMouseDown={onSidebarResizeStart}
       />
       <section className="tablet-main">
diff --git a/src/features/layout/components/WindowCaptionControls.tsx b/src/features/layout/components/WindowCaptionControls.tsx
index 33fa1231f..ffb635fa3 100644
--- a/src/features/layout/components/WindowCaptionControls.tsx
+++ b/src/features/layout/components/WindowCaptionControls.tsx
@@ -5,6 +5,7 @@ import X from "lucide-react/dist/esm/icons/x";
 import { isTauri } from "@tauri-apps/api/core";
 import { getCurrentWindow } from "@tauri-apps/api/window";
 import { useEffect, useState } from "react";
+import { useI18n } from "@/i18n";
 import { isWindowsPlatform } from "@utils/platformPaths";
 
 function currentWindowSafe() {
@@ -16,6 +17,7 @@ function currentWindowSafe() {
 }
 
 export function WindowCaptionControls() {
+  const { tx } = useI18n();
   const isEnabled = isWindowsPlatform() && isTauri();
   const [isMaximized, setIsMaximized] = useState(false);
 
@@ -95,11 +97,11 @@ export function WindowCaptionControls() {
   };
 
   return (
-    <div className="window-caption-controls" role="group" aria-label="Window controls">
+    <div className="window-caption-controls" role="group" aria-label={tx("Window controls")}>
       <button
         type="button"
         className="window-caption-control"
-        aria-label="Minimize window"
+        aria-label={tx("Minimize window")}
         data-tauri-drag-region="false"
         onClick={handleMinimize}
       >
@@ -108,7 +110,7 @@ export function WindowCaptionControls() {
       <button
         type="button"
         className="window-caption-control"
-        aria-label={isMaximized ? "Restore window" : "Maximize window"}
+        aria-label={isMaximized ? tx("Restore window") : tx("Maximize window")}
         data-tauri-drag-region="false"
         onClick={handleToggleMaximize}
       >
@@ -117,7 +119,7 @@ export function WindowCaptionControls() {
       <button
         type="button"
         className="window-caption-control window-caption-control-close"
-        aria-label="Close window"
+        aria-label={tx("Close window")}
         data-tauri-drag-region="false"
         onClick={handleClose}
       >
diff --git a/src/features/layout/hooks/layoutNodes/buildPrimaryNodes.tsx b/src/features/layout/hooks/layoutNodes/buildPrimaryNodes.tsx
index 90666d75b..fc2cad9c8 100644
--- a/src/features/layout/hooks/layoutNodes/buildPrimaryNodes.tsx
+++ b/src/features/layout/hooks/layoutNodes/buildPrimaryNodes.tsx
@@ -9,6 +9,7 @@ import { ErrorToasts } from "../../../notifications/components/ErrorToasts";
 import { Composer } from "../../../composer/components/Composer";
 import { TabBar } from "../../../app/components/TabBar";
 import { TabletNav } from "../../../app/components/TabletNav";
+import type { TranslateText } from "@/i18n";
 import type {
   LayoutNodesResult,
   LayoutPrimarySurface,
@@ -31,7 +32,10 @@ type PrimaryLayoutNodes = Pick<
   | "tabBarNode"
 >;
 
-export function buildPrimaryNodes(options: PrimaryLayoutNodesOptions): PrimaryLayoutNodes {
+export function buildPrimaryNodes(
+  options: PrimaryLayoutNodesOptions,
+  tx: TranslateText,
+): PrimaryLayoutNodes {
   const sidebarNode = <Sidebar {...options.sidebarProps} />;
 
   const messagesNode = <Messages {...options.messagesProps} />;
@@ -56,7 +60,7 @@ export function buildPrimaryNodes(options: PrimaryLayoutNodesOptions): PrimaryLa
         <button
           className="icon-button back-button"
           onClick={options.desktopTopbarProps.onExitDiff}
-          aria-label="Back to chat"
+          aria-label={tx("Back to chat")}
         >
           <ArrowLeft aria-hidden />
         </button>
diff --git a/src/features/layout/hooks/layoutNodes/buildSecondaryNodes.tsx b/src/features/layout/hooks/layoutNodes/buildSecondaryNodes.tsx
index 1bb1d05a6..c7b8914a7 100644
--- a/src/features/layout/hooks/layoutNodes/buildSecondaryNodes.tsx
+++ b/src/features/layout/hooks/layoutNodes/buildSecondaryNodes.tsx
@@ -2,6 +2,7 @@ import { DebugPanel } from "../../../debug/components/DebugPanel";
 import { PlanPanel } from "../../../plan/components/PlanPanel";
 import { TerminalDock } from "../../../terminal/components/TerminalDock";
 import { TerminalPanel } from "../../../terminal/components/TerminalPanel";
+import type { TranslateText } from "@/i18n";
 import type {
   LayoutNodesResult,
   LayoutSecondarySurface,
@@ -51,17 +52,19 @@ function buildCompactEmptyNode({
   title,
   description,
   onGoProjects,
+  tx,
 }: {
   title: string;
   description: string;
   onGoProjects: () => void;
+  tx: TranslateText;
 }) {
   return (
     <div className="compact-empty">
       <h3>{title}</h3>
       <p>{description}</p>
       <button className="ghost" onClick={onGoProjects}>
-        Go to Projects
+        {tx("Go to Projects")}
       </button>
     </div>
   );
@@ -69,6 +72,7 @@ function buildCompactEmptyNode({
 
 function buildCompactGitBackNode(
   compactNavProps: SecondaryLayoutNodesOptions["compactNavProps"],
+  tx: TranslateText,
 ) {
   const compactGitDiffActive =
     compactNavProps.centerMode === "diff" &&
@@ -81,7 +85,7 @@ function buildCompactGitBackNode(
         className={`compact-git-switch-button${compactGitDiffActive ? "" : " active"}`}
         onClick={compactNavProps.onBackFromDiff}
       >
-        Files
+        {tx("Files")}
       </button>
       <button
         type="button"
@@ -89,13 +93,16 @@ function buildCompactGitBackNode(
         onClick={compactNavProps.onShowSelectedDiff}
         disabled={!compactNavProps.hasActiveGitDiffs}
       >
-        Diff
+        {tx("Diff")}
       </button>
     </div>
   );
 }
 
-export function buildSecondaryNodes(options: SecondaryLayoutNodesOptions): SecondaryLayoutNodes {
+export function buildSecondaryNodes(
+  options: SecondaryLayoutNodesOptions,
+  tx: TranslateText,
+): SecondaryLayoutNodes {
   const planPanelNode = <PlanPanel {...options.planPanelProps} />;
   const terminalPanelNode = buildTerminalPanelNode(options.terminalState);
 
@@ -109,18 +116,20 @@ export function buildSecondaryNodes(options: SecondaryLayoutNodesOptions): Secon
   const { debugPanelNode, debugPanelFullNode } = buildDebugPanels(options.debugPanelProps);
 
   const compactEmptyCodexNode = buildCompactEmptyNode({
-    title: "No workspace selected",
-    description: "Choose a project to start chatting.",
+    title: tx("No workspace selected"),
+    description: tx("Choose a project to start chatting."),
     onGoProjects: options.compactNavProps.onGoProjects,
+    tx,
   });
 
   const compactEmptyGitNode = buildCompactEmptyNode({
-    title: "No workspace selected",
-    description: "Select a project to inspect diffs.",
+    title: tx("No workspace selected"),
+    description: tx("Select a project to inspect diffs."),
     onGoProjects: options.compactNavProps.onGoProjects,
+    tx,
   });
 
-  const compactGitBackNode = buildCompactGitBackNode(options.compactNavProps);
+  const compactGitBackNode = buildCompactGitBackNode(options.compactNavProps, tx);
 
   return {
     planPanelNode,
diff --git a/src/features/layout/hooks/useLayoutNodes.tsx b/src/features/layout/hooks/useLayoutNodes.tsx
index 9c6b0b3f0..c5e3395ca 100644
--- a/src/features/layout/hooks/useLayoutNodes.tsx
+++ b/src/features/layout/hooks/useLayoutNodes.tsx
@@ -5,15 +5,17 @@ import type { PrimaryLayoutNodesOptions } from "./layoutNodes/buildPrimaryNodes"
 import { buildSecondaryNodes } from "./layoutNodes/buildSecondaryNodes";
 import type { SecondaryLayoutNodesOptions } from "./layoutNodes/buildSecondaryNodes";
 import type { LayoutNodesOptions, LayoutNodesResult } from "./layoutNodes/types";
+import { useI18n } from "@/i18n";
 
 export function useLayoutNodes(options: LayoutNodesOptions): LayoutNodesResult {
+  const { tx } = useI18n();
   const primaryOptions: PrimaryLayoutNodesOptions = options.primary;
   const gitOptions: GitLayoutNodesOptions = options.git;
   const secondaryOptions: SecondaryLayoutNodesOptions = options.secondary;
 
   return {
-    ...buildPrimaryNodes(primaryOptions),
+    ...buildPrimaryNodes(primaryOptions, tx),
     ...buildGitNodes(gitOptions),
-    ...buildSecondaryNodes(secondaryOptions),
+    ...buildSecondaryNodes(secondaryOptions, tx),
   };
 }
diff --git a/src/features/messages/components/Markdown.tsx b/src/features/messages/components/Markdown.tsx
index 38867e95f..f54537f7a 100644
--- a/src/features/messages/components/Markdown.tsx
+++ b/src/features/messages/components/Markdown.tsx
@@ -1,4 +1,5 @@
 import { useEffect, useRef, useState, type ReactNode, type MouseEvent } from "react";
+import { useI18n } from "@/i18n";
 import ReactMarkdown, { type Components } from "react-markdown";
 import remarkGfm from "remark-gfm";
 import { openUrl } from "@tauri-apps/plugin-opener";
@@ -350,10 +351,11 @@ function FileReferenceLink({
 }
 
 function CodeBlock({ className, value, copyUseModifier }: CodeBlockProps) {
+  const { tx } = useI18n();
   const [copied, setCopied] = useState(false);
   const copyTimeoutRef = useRef<number | null>(null);
   const languageTag = extractLanguageTag(className);
-  const languageLabel = languageTag ?? "Code";
+  const languageLabel = languageTag ?? tx("Code");
   const fencedValue = `\`\`\`${languageTag ?? ""}\n${value}\n\`\`\``;
 
   useEffect(() => {
@@ -389,10 +391,10 @@ function CodeBlock({ className, value, copyUseModifier }: CodeBlockProps) {
           type="button"
           className={`ghost markdown-codeblock-copy${copied ? " is-copied" : ""}`}
           onClick={handleCopy}
-          aria-label="Copy code block"
-          title={copied ? "Copied" : "Copy"}
+          aria-label={tx("Copy code block")}
+          title={copied ? tx("Copied") : tx("Copy")}
         >
-          {copied ? "Copied" : "Copy"}
+          {copied ? tx("Copied") : tx("Copy")}
         </button>
       </div>
       <pre>
diff --git a/src/features/messages/components/MessageRows.tsx b/src/features/messages/components/MessageRows.tsx
index 9e2848606..511a337fe 100644
--- a/src/features/messages/components/MessageRows.tsx
+++ b/src/features/messages/components/MessageRows.tsx
@@ -1,6 +1,7 @@
 import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react";
 import type { MouseEvent } from "react";
 import { createPortal } from "react-dom";
+import { useI18n } from "@/i18n";
 import Brain from "lucide-react/dist/esm/icons/brain";
 import Check from "lucide-react/dist/esm/icons/check";
 import Copy from "lucide-react/dist/esm/icons/copy";
@@ -108,6 +109,8 @@ const MessageImageGrid = memo(function MessageImageGrid({
   onOpen: (index: number) => void;
   hasText: boolean;
 }) {
+  const { tx } = useI18n();
+
   return (
     <div
       className={`message-image-grid${hasText ? " message-image-grid--with-text" : ""}`}
@@ -119,7 +122,7 @@ const MessageImageGrid = memo(function MessageImageGrid({
           type="button"
           className="message-image-thumb"
           onClick={() => onOpen(index)}
-          aria-label={`Open image ${index + 1}`}
+          aria-label={tx("Open image {index}", { index: index + 1 })}
         >
           <img src={image.src} alt={image.label} loading="lazy" />
         </button>
@@ -137,6 +140,7 @@ const ImageLightbox = memo(function ImageLightbox({
   activeIndex: number;
   onClose: () => void;
 }) {
+  const { tx } = useI18n();
   const activeImage = images[activeIndex];
 
   useEffect(() => {
@@ -178,7 +182,7 @@ const ImageLightbox = memo(function ImageLightbox({
           type="button"
           className="message-image-lightbox-close"
           onClick={onClose}
-          aria-label="Close image preview"
+          aria-label={tx("Close image preview")}
         >
           <X size={16} aria-hidden />
         </button>
@@ -307,6 +311,7 @@ export const WorkingIndicator = memo(function WorkingIndicator({
   showPollingFetchStatus = false,
   pollingIntervalMs = 12000,
 }: WorkingIndicatorProps) {
+  const { tx } = useI18n();
   const [elapsedMs, setElapsedMs] = useState(0);
   const [pollCountdownSeconds, setPollCountdownSeconds] = useState(() =>
     Math.max(1, Math.ceil(pollingIntervalMs / 1000)),
@@ -348,7 +353,7 @@ export const WorkingIndicator = memo(function WorkingIndicator({
           <div className="working-timer">
             <span className="working-timer-clock">{formatDurationMs(elapsedMs)}</span>
           </div>
-          <span className="working-text">{reasoningLabel || "Working…"}</span>
+          <span className="working-text">{reasoningLabel || tx("Working…")}</span>
         </div>
       )}
       {!isThinking && lastDurationMs !== null && hasItems && (
@@ -356,8 +361,12 @@ export const WorkingIndicator = memo(function WorkingIndicator({
           <span className="turn-complete-line" aria-hidden />
           <span className="turn-complete-label">
             {showPollingFetchStatus
-              ? `New message will be fetched in ${pollCountdownSeconds} seconds`
-              : `Done in ${formatDurationMs(lastDurationMs)}`}
+              ? tx("New message will be fetched in {seconds} seconds", {
+                  seconds: pollCountdownSeconds,
+                })
+              : tx("Done in {duration}", {
+                  duration: formatDurationMs(lastDurationMs),
+                })}
           </span>
           <span className="turn-complete-line" aria-hidden />
         </div>
@@ -378,6 +387,7 @@ export const MessageRow = memo(function MessageRow({
   onOpenFileLinkMenu,
   onOpenThreadLink,
 }: MessageRowProps) {
+  const { tx } = useI18n();
   const [lightboxIndex, setLightboxIndex] = useState<number | null>(null);
   const bubbleRef = useRef<HTMLDivElement | null>(null);
   const selectionSnapshotRef = useRef<string | null>(null);
@@ -392,10 +402,10 @@ export const MessageRow = memo(function MessageRow({
         if (!src) {
           return null;
         }
-        return { src, label: `Image ${index + 1}` };
+        return { src, label: tx("Image {index}", { index: index + 1 }) };
       })
       .filter(Boolean) as MessageImage[];
-  }, [item.images]);
+  }, [item.images, tx]);
   const isTableOnlyAssistantMessage =
     item.role === "assistant" &&
     hasText &&
@@ -484,8 +494,8 @@ export const MessageRow = memo(function MessageRow({
               selectionSnapshotRef.current = getSelectedMessageText();
             }}
             onClick={handleQuote}
-            aria-label="Quote message"
-            title="Quote message"
+            aria-label={tx("Quote message")}
+            title={tx("Quote message")}
           >
             <Quote size={14} aria-hidden />
           </button>
@@ -494,8 +504,8 @@ export const MessageRow = memo(function MessageRow({
           type="button"
           className={`ghost message-copy-button${isCopied ? " is-copied" : ""}`}
           onClick={() => onCopy(item)}
-          aria-label="Copy message"
-          title="Copy message"
+          aria-label={tx("Copy message")}
+          title={tx("Copy message")}
         >
           <span className="message-copy-icon" aria-hidden>
             <Copy className="message-copy-icon-copy" size={14} />
@@ -518,6 +528,7 @@ export const ReasoningRow = memo(function ReasoningRow({
   onOpenFileLinkMenu,
   onOpenThreadLink,
 }: ReasoningRowProps) {
+  const { tx } = useI18n();
   const { summaryTitle, bodyText, hasBody } = parsed;
   const reasoningTone: StatusTone = hasBody ? "completed" : "processing";
   return (
@@ -527,7 +538,7 @@ export const ReasoningRow = memo(function ReasoningRow({
         className="tool-inline-bar-toggle"
         onClick={() => onToggle(item.id)}
         aria-expanded={isExpanded}
-        aria-label="Toggle reasoning details"
+        aria-label={tx("Toggle reasoning details")}
       />
       <div className="tool-inline-content">
         <button
@@ -541,7 +552,7 @@ export const ReasoningRow = memo(function ReasoningRow({
             size={14}
             aria-hidden
           />
-          <span className="tool-inline-value">{summaryTitle}</span>
+          <span className="tool-inline-value">{tx(summaryTitle)}</span>
         </button>
         {hasBody && (
           <Markdown
@@ -569,7 +580,8 @@ export const ReviewRow = memo(function ReviewRow({
   onOpenFileLinkMenu,
   onOpenThreadLink,
 }: ReviewRowProps) {
-  const title = item.state === "started" ? "Review started" : "Review completed";
+  const { tx } = useI18n();
+  const title = item.state === "started" ? tx("Review started") : tx("Review completed");
   return (
     <div className="item-card review">
       <div className="review-header">
@@ -577,7 +589,7 @@ export const ReviewRow = memo(function ReviewRow({
         <span
           className={`review-badge ${item.state === "started" ? "active" : "done"}`}
         >
-          Review
+          {tx("Review")}
         </span>
       </div>
       {item.text && (
@@ -614,10 +626,11 @@ export const UserInputRow = memo(function UserInputRow({
   isExpanded,
   onToggle,
 }: UserInputRowProps) {
+  const { tx } = useI18n();
   const first = item.questions[0];
   const previewQuestion =
-    first?.question?.trim() || first?.header?.trim() || "Input requested";
-  const firstAnswer = first?.answers[0]?.trim() || "No answer provided";
+    first?.question?.trim() || first?.header?.trim() || tx("Input requested");
+  const firstAnswer = first?.answers[0]?.trim() || tx("No answer provided");
   const previewAnswer =
     first && first.answers.length > 1
       ? `${firstAnswer} +${first.answers.length - 1}`
@@ -631,7 +644,7 @@ export const UserInputRow = memo(function UserInputRow({
         className="tool-inline-bar-toggle"
         onClick={() => onToggle(item.id)}
         aria-expanded={isExpanded}
-        aria-label="Toggle answered input details"
+        aria-label={tx("Toggle answered input details")}
       />
       <div className="tool-inline-content">
         <button
@@ -641,16 +654,19 @@ export const UserInputRow = memo(function UserInputRow({
           aria-expanded={isExpanded}
         >
           <Check className="tool-inline-icon completed" size={14} aria-hidden />
-          <span className="tool-inline-label">answered:</span>
+          <span className="tool-inline-label">{tx("answered:")}</span>
           <span className="tool-inline-value user-input-inline-preview">
             {previewQuestion}: {previewAnswer}
-            {extraQuestions > 0 ? ` +${extraQuestions} more` : ""}
+            {extraQuestions > 0 ? tx(" +{count} more", { count: extraQuestions }) : ""}
           </span>
         </button>
         {isExpanded && (
           <div className="user-input-inline-details">
             {item.questions.map((question, index) => {
-              const title = question.question || question.header || `Question ${index + 1}`;
+              const title =
+                question.question ||
+                question.header ||
+                tx("Question {index}", { index: index + 1 });
               return (
                 <div
                   key={`${question.id}-${index}`}
@@ -670,7 +686,7 @@ export const UserInputRow = memo(function UserInputRow({
                     </div>
                   ) : (
                     <div className="user-input-inline-empty-answer">
-                      No answer provided.
+                      {tx("No answer provided.")}
                     </div>
                   )}
                 </div>
@@ -694,6 +710,7 @@ export const ToolRow = memo(function ToolRow({
   onOpenThreadLink,
   onRequestAutoScroll,
 }: ToolRowProps) {
+  const { tx } = useI18n();
   const isFileChange = item.toolType === "fileChange";
   const isCommand = item.toolType === "commandExecution";
   const isPlan = item.toolType === "plan";
@@ -709,16 +726,16 @@ export const ToolRow = memo(function ToolRow({
   const ToolIcon = toolIconForSummary(item, summary);
   const summaryLabel = isFileChange
     ? changeNames.length > 1
-      ? "files edited"
-      : "file edited"
+      ? tx("files edited")
+      : tx("file edited")
     : isCommand
       ? ""
-      : summary.label;
+      : tx(summary.label);
   const inlineStatus = formatToolStatusLabel(item);
   const summaryValue = isFileChange
     ? changeNames.length > 1
       ? `${changeNames[0]} +${changeNames.length - 1}`
-      : changeNames[0] || "changes"
+      : changeNames[0] || tx("changes")
     : summary.value;
   const shouldFadeCommand =
     isCommand && !isExpanded && (summaryValue?.length ?? 0) > 80;
@@ -767,16 +784,16 @@ export const ToolRow = memo(function ToolRow({
       try {
         await exportMarkdownFile(output, buildPlanExportFileName(item.id));
       } catch (error) {
-        const message = error instanceof Error ? error.message : "Unable to export plan.";
+        const message = error instanceof Error ? error.message : tx("Unable to export plan.");
         pushErrorToast({
-          title: "Plan export failed",
+          title: tx("Plan export failed"),
           message,
         });
       } finally {
         setIsExportingPlan(false);
       }
     },
-    [item.id, summary.output],
+    [item.id, summary.output, tx],
   );
 
   return (
@@ -786,7 +803,7 @@ export const ToolRow = memo(function ToolRow({
         className="tool-inline-bar-toggle"
         onClick={() => onToggle(item.id)}
         aria-expanded={isExpanded}
-        aria-label="Toggle tool details"
+        aria-label={tx("Toggle tool details")}
       />
       <div className="tool-inline-content">
         <button
@@ -819,7 +836,7 @@ export const ToolRow = memo(function ToolRow({
             </span>
           )}
           {inlineStatus && (
-            <span className="tool-inline-status">{inlineStatus}</span>
+            <span className="tool-inline-status">{tx(inlineStatus)}</span>
           )}
         </button>
         {isExpanded && summary.detail && !isFileChange && (
@@ -888,7 +905,7 @@ export const ToolRow = memo(function ToolRow({
               onClick={handlePlanExport}
               disabled={isExportingPlan}
             >
-              {isExportingPlan ? "Exporting..." : "Export .md"}
+              {isExportingPlan ? tx("Exporting...") : tx("Export .md")}
             </button>
           </div>
         )}
@@ -898,7 +915,8 @@ export const ToolRow = memo(function ToolRow({
 });
 
 export const ExploreRow = memo(function ExploreRow({ item }: ExploreRowProps) {
-  const title = item.status === "exploring" ? "Exploring" : "Explored";
+  const { tx } = useI18n();
+  const title = item.status === "exploring" ? tx("Exploring") : tx("Explored");
   return (
     <div className="tool-inline explore-inline">
       <div className="tool-inline-bar-toggle" aria-hidden />
@@ -916,7 +934,7 @@ export const ExploreRow = memo(function ExploreRow({ item }: ExploreRowProps) {
         <div className="explore-inline-list">
           {item.entries.map((entry, index) => (
             <div key={`${entry.kind}-${entry.label}-${index}`} className="explore-inline-item">
-              <span className="explore-inline-kind">{exploreKindLabel(entry.kind)}</span>
+              <span className="explore-inline-kind">{tx(exploreKindLabel(entry.kind))}</span>
               <span className="explore-inline-label">{entry.label}</span>
               {entry.detail && entry.detail !== entry.label && (
                 <span className="explore-inline-detail">{entry.detail}</span>
diff --git a/src/features/messages/components/Messages.tsx b/src/features/messages/components/Messages.tsx
index da2a318e1..09b7a3852 100644
--- a/src/features/messages/components/Messages.tsx
+++ b/src/features/messages/components/Messages.tsx
@@ -1,4 +1,5 @@
 import { memo, useCallback } from "react";
+import { useI18n } from "@/i18n";
 import ChevronDown from "lucide-react/dist/esm/icons/chevron-down";
 import ChevronUp from "lucide-react/dist/esm/icons/chevron-up";
 import type {
@@ -10,7 +11,7 @@ import type {
 import { PlanReadyFollowupMessage } from "../../app/components/PlanReadyFollowupMessage";
 import { RequestUserInputMessage } from "../../app/components/RequestUserInputMessage";
 import { useFileLinkOpener } from "../hooks/useFileLinkOpener";
-import { formatCount, parseReasoning } from "../utils/messageRenderUtils";
+import { parseReasoning } from "../utils/messageRenderUtils";
 import {
   DiffRow,
   ExploreRow,
@@ -71,6 +72,7 @@ export const Messages = memo(function Messages({
   onOpenThreadLink,
   onQuoteMessage,
 }: MessagesProps) {
+  const { tx } = useI18n();
   const activeUserInputRequestId =
     threadId && userInputRequests.length
       ? (userInputRequests.find(
@@ -243,10 +245,16 @@ export const Messages = memo(function Messages({
             const { group } = entry;
             const isCollapsed = collapsedToolGroups.has(group.id);
             const summaryParts = [
-              formatCount(group.toolCount, "tool call", "tool calls"),
+              group.toolCount === 1
+                ? tx("{count} tool call", { count: group.toolCount })
+                : tx("{count} tool calls", { count: group.toolCount }),
             ];
             if (group.messageCount > 0) {
-              summaryParts.push(formatCount(group.messageCount, "message", "messages"));
+              summaryParts.push(
+                group.messageCount === 1
+                  ? tx("{count} message", { count: group.messageCount })
+                  : tx("{count} messages", { count: group.messageCount }),
+              );
             }
             const summaryText = summaryParts.join(", ");
             const groupBodyId = `tool-group-${group.id}`;
@@ -263,7 +271,7 @@ export const Messages = memo(function Messages({
                     onClick={() => toggleToolGroup(group.id)}
                     aria-expanded={!isCollapsed}
                     aria-controls={groupBodyId}
-                    aria-label={isCollapsed ? "Expand tool calls" : "Collapse tool calls"}
+                    aria-label={isCollapsed ? tx("Expand tool calls") : tx("Collapse tool calls")}
                   >
                     <span className="tool-group-chevron" aria-hidden>
                       <ChevronIcon size={14} />
@@ -294,14 +302,16 @@ export const Messages = memo(function Messages({
         />
         {!items.length && !userInputNode && !isThinking && !isLoadingMessages && (
           <div className="empty messages-empty">
-            {threadId ? "Send a prompt to the agent." : "Send a prompt to start a new agent."}
+            {threadId
+              ? tx("Send a prompt to the agent.")
+              : tx("Send a prompt to start a new agent.")}
           </div>
         )}
         {!items.length && !userInputNode && !isThinking && isLoadingMessages && (
           <div className="empty messages-empty">
             <div className="messages-loading-indicator" role="status" aria-live="polite">
               <span className="working-spinner" aria-hidden />
-              <span className="messages-loading-label">Loading…</span>
+              <span className="messages-loading-label">{tx("Loading…")}</span>
             </div>
           </div>
         )}
diff --git a/src/features/messages/hooks/useFileLinkOpener.ts b/src/features/messages/hooks/useFileLinkOpener.ts
index e18bab494..dbb8586cb 100644
--- a/src/features/messages/hooks/useFileLinkOpener.ts
+++ b/src/features/messages/hooks/useFileLinkOpener.ts
@@ -1,5 +1,6 @@
 import { useCallback } from "react";
 import type { MouseEvent } from "react";
+import { useI18n } from "@/i18n";
 import { Menu, MenuItem, PredefinedMenuItem } from "@tauri-apps/api/menu";
 import { LogicalPosition } from "@tauri-apps/api/dpi";
 import { getCurrentWindow } from "@tauri-apps/api/window";
@@ -97,6 +98,7 @@ export function useFileLinkOpener(
   openTargets: OpenAppTarget[],
   selectedOpenAppId: string,
 ) {
+  const { tx } = useI18n();
   const reportOpenError = useCallback(
     (error: unknown, context: Record<string, string | null>) => {
       const message = error instanceof Error ? error.message : String(error);
@@ -110,12 +112,12 @@ export function useFileLinkOpener(
         },
       );
       pushErrorToast({
-        title: "Couldn’t open file",
+        title: tx("Couldn’t open file"),
         message,
       });
       console.warn("Failed to open file link", { message, ...context });
     },
-    [],
+    [tx],
   );
 
   const openFileLink = useCallback(
@@ -193,11 +195,11 @@ export function useFileLinkOpener(
           ? revealInFileManagerLabel()
           : target.kind === "command"
             ? command
-              ? `Open in ${target.label}`
-              : "Set command in Settings"
+              ? tx("Open in {app}", { app: target.label })
+              : tx("Set command in Settings")
             : appName
-              ? `Open in ${appName}`
-              : "Set app name in Settings";
+              ? tx("Open in {app}", { app: appName })
+              : tx("Set app name in Settings");
       const items = [
         await MenuItem.new({
           text: openLabel,
@@ -229,11 +231,11 @@ export function useFileLinkOpener(
               }),
             ]),
         await MenuItem.new({
-          text: "Download Linked File",
+          text: tx("Download Linked File"),
           enabled: false,
         }),
         await MenuItem.new({
-          text: "Copy Link",
+          text: tx("Copy Link"),
           action: async () => {
             const link = toFileUrl(resolvedPath, fileLocation.line, fileLocation.column);
             try {
@@ -252,7 +254,7 @@ export function useFileLinkOpener(
       const position = new LogicalPosition(event.clientX, event.clientY);
       await menu.popup(position, window);
     },
-    [openFileLink, openTargets, reportOpenError, selectedOpenAppId, workspacePath],
+    [openFileLink, openTargets, reportOpenError, selectedOpenAppId, workspacePath, tx],
   );
 
   return { openFileLink, showFileLinkMenu };
diff --git a/src/features/mobile/components/MobileServerSetupWizard.tsx b/src/features/mobile/components/MobileServerSetupWizard.tsx
index d1afa5e5b..49b856a74 100644
--- a/src/features/mobile/components/MobileServerSetupWizard.tsx
+++ b/src/features/mobile/components/MobileServerSetupWizard.tsx
@@ -1,6 +1,7 @@
 import "../../../styles/mobile-setup-wizard.css";
 import X from "lucide-react/dist/esm/icons/x";
 import { ModalShell } from "../../design-system/components/modal/ModalShell";
+import { useI18n } from "@/i18n";
 
 export type MobileServerSetupWizardProps = {
   remoteHostDraft: string;
@@ -27,33 +28,38 @@ export function MobileServerSetupWizard({
   onRemoteTokenChange,
   onConnectTest,
 }: MobileServerSetupWizardProps) {
+  const { tx } = useI18n();
+
   return (
     <ModalShell
       className="mobile-setup-wizard-overlay"
       cardClassName="mobile-setup-wizard-card"
       onBackdropClick={onClose}
-      ariaLabel="Mobile server setup"
+      ariaLabel={tx("Mobile server setup")}
     >
       <div className="mobile-setup-wizard-header">
         <button
           type="button"
           className="ghost icon-button mobile-setup-wizard-close"
           onClick={onClose}
-          aria-label="Close mobile setup"
+          aria-label={tx("Close mobile setup")}
         >
           <X aria-hidden />
         </button>
-        <div className="mobile-setup-wizard-kicker">Mobile Setup Required</div>
-        <h2 className="mobile-setup-wizard-title">Connect to your desktop backend</h2>
+        <div className="mobile-setup-wizard-kicker">{tx("Mobile Setup Required")}</div>
+        <h2 className="mobile-setup-wizard-title">
+          {tx("Connect to your desktop backend")}
+        </h2>
         <p className="mobile-setup-wizard-subtitle">
-          Complete this setup before using the app. Use the same connection details configured on
-          your desktop CodexMonitor server settings.
+          {tx(
+            "Complete this setup before using the app. Use the same connection details configured on your desktop CodexMonitor server settings.",
+          )}
         </p>
       </div>
 
       <div className="mobile-setup-wizard-body">
         <label className="mobile-setup-wizard-label" htmlFor="mobile-setup-host">
-          Tailscale host
+          {tx("Tailscale host")}
         </label>
         <input
           id="mobile-setup-host"
@@ -65,14 +71,14 @@ export function MobileServerSetupWizard({
         />
 
         <label className="mobile-setup-wizard-label" htmlFor="mobile-setup-token">
-          Remote backend token
+          {tx("Remote backend token")}
         </label>
         <input
           id="mobile-setup-token"
           type="password"
           className="mobile-setup-wizard-input"
           value={remoteTokenDraft}
-          placeholder="Token"
+          placeholder={tx("Token")}
           onChange={(event) => onRemoteTokenChange(event.target.value)}
           disabled={busy || checking}
         />
@@ -83,7 +89,7 @@ export function MobileServerSetupWizard({
           onClick={onConnectTest}
           disabled={busy || checking}
         >
-          {checking ? "Checking..." : busy ? "Connecting..." : "Connect & test"}
+          {checking ? tx("Checking...") : busy ? tx("Connecting...") : tx("Connect & test")}
         </button>
 
         {statusMessage ? (
@@ -99,7 +105,9 @@ export function MobileServerSetupWizard({
         ) : null}
 
         <div className="mobile-setup-wizard-hint">
-          Use the Tailscale host from desktop Server settings and keep the desktop daemon running.
+          {tx(
+            "Use the Tailscale host from desktop Server settings and keep the desktop daemon running.",
+          )}
         </div>
       </div>
     </ModalShell>
diff --git a/src/features/notifications/components/ErrorToasts.tsx b/src/features/notifications/components/ErrorToasts.tsx
index f9dd0c58a..e2ade4915 100644
--- a/src/features/notifications/components/ErrorToasts.tsx
+++ b/src/features/notifications/components/ErrorToasts.tsx
@@ -6,6 +6,7 @@ import {
   ToastTitle,
   ToastViewport,
 } from "../../design-system/components/toast/ToastPrimitives";
+import { useI18n } from "@/i18n";
 
 type ErrorToastsProps = {
   toasts: ErrorToast[];
@@ -13,6 +14,8 @@ type ErrorToastsProps = {
 };
 
 export function ErrorToasts({ toasts, onDismiss }: ErrorToastsProps) {
+  const { tx } = useI18n();
+
   if (!toasts.length) {
     return null;
   }
@@ -27,8 +30,8 @@ export function ErrorToasts({ toasts, onDismiss }: ErrorToastsProps) {
               type="button"
               className="ghost error-toast-dismiss"
               onClick={() => onDismiss(toast.id)}
-              aria-label="Dismiss error"
-              title="Dismiss"
+              aria-label={tx("Dismiss error")}
+              title={tx("Dismiss")}
             >
               ×
             </button>
diff --git a/src/features/plan/components/PlanPanel.tsx b/src/features/plan/components/PlanPanel.tsx
index 854d6b01c..95964c432 100644
--- a/src/features/plan/components/PlanPanel.tsx
+++ b/src/features/plan/components/PlanPanel.tsx
@@ -1,3 +1,4 @@
+import { useI18n } from "@/i18n";
 import type { TurnPlan } from "../../../types";
 
 type PlanPanelProps = {
@@ -25,15 +26,16 @@ function statusLabel(status: TurnPlan["steps"][number]["status"]) {
 }
 
 export function PlanPanel({ plan, isProcessing }: PlanPanelProps) {
+  const { tx } = useI18n();
   const progress = plan ? formatProgress(plan) : "";
   const steps = plan?.steps ?? [];
   const showEmpty = !steps.length && !plan?.explanation;
-  const emptyLabel = isProcessing ? "Waiting on a plan..." : "No active plan.";
+  const emptyLabel = isProcessing ? tx("Waiting on a plan...") : tx("No active plan.");
 
   return (
     <aside className="plan-panel">
       <div className="plan-header">
-        <span>Plan</span>
+        <span>{tx("Plan")}</span>
         {progress && <span className="plan-progress">{progress}</span>}
       </div>
       {plan?.explanation && (
diff --git a/src/features/prompts/components/PromptPanel.tsx b/src/features/prompts/components/PromptPanel.tsx
index 2335ab4a8..d6f94c630 100644
--- a/src/features/prompts/components/PromptPanel.tsx
+++ b/src/features/prompts/components/PromptPanel.tsx
@@ -5,6 +5,7 @@ import {
   useState,
   type MouseEvent as ReactMouseEvent,
 } from "react";
+import { useI18n } from "@/i18n";
 import type { CustomPromptOption } from "../../../types";
 import { expandCustomPromptText, getPromptArgumentHint } from "../../../utils/customPrompts";
 import type { PanelTabId } from "../../layout/components/PanelTabs";
@@ -85,6 +86,7 @@ export function PromptPanel({
   onRevealGeneralPrompts,
   canRevealGeneralPrompts,
 }: PromptPanelProps) {
+  const { tx } = useI18n();
   const [query, setQuery] = useState("");
   const [argsByPrompt, setArgsByPrompt] = useState<Record<string, string>>({});
   const [editor, setEditor] = useState<PromptEditorState | null>(null);
@@ -214,11 +216,11 @@ export function PromptPanel({
     }
     const name = editor.name.trim();
     if (!name) {
-      setEditorError("Name is required.");
+      setEditorError(tx("Name is required."));
       return;
     }
     if (/\s/.test(name)) {
-      setEditorError("Name cannot include whitespace.");
+      setEditorError(tx("Name cannot include whitespace."));
       return;
     }
     setEditorError(null);
@@ -298,15 +300,19 @@ export function PromptPanel({
     const menu = await Menu.new({
       items: [
         await MenuItem.new({
-          text: "Edit",
+          text: tx("Edit"),
           action: () => startEdit(prompt),
         }),
         await MenuItem.new({
-          text: `Move to ${nextScope === "workspace" ? "workspace" : "general"}`,
+          text: tx(
+            nextScope === "workspace"
+              ? "Move to workspace"
+              : "Move to general",
+          ),
           action: () => void handleMove(prompt, nextScope),
         }),
         await MenuItem.new({
-          text: "Delete",
+          text: tx("Delete"),
           action: () => handleDeleteRequest(prompt),
         }),
       ],
@@ -337,10 +343,10 @@ export function PromptPanel({
             <input
               className="prompt-args-input"
               type="text"
-              placeholder={hint ?? "Arguments"}
+              placeholder={hint ?? tx("Arguments")}
               value={argsValue}
               onChange={(event) => handleArgsChange(key, event.target.value)}
-              aria-label={`Arguments for ${prompt.name}`}
+              aria-label={tx("Arguments for {name}", { name: prompt.name })}
             />
           ) : null}
           <button
@@ -353,9 +359,9 @@ export function PromptPanel({
               }
               void onSendPrompt(text);
             }}
-            title="Send to current agent"
+            title={tx("Send to current agent")}
           >
-            Send
+            {tx("Send")}
           </button>
           <button
             type="button"
@@ -367,36 +373,36 @@ export function PromptPanel({
               }
               void onSendPromptToNewAgent(text);
             }}
-            title="Send to a new agent"
+            title={tx("Send to a new agent")}
           >
-            New agent
+            {tx("New agent")}
           </button>
           <button
             type="button"
             className="ghost icon-button prompt-action-menu"
             onClick={(event) => void showPromptMenu(event, prompt)}
-            aria-label="Prompt actions"
-            title="Prompt actions"
+            aria-label={tx("Prompt actions")}
+            title={tx("Prompt actions")}
           >
             <MoreHorizontal aria-hidden />
           </button>
         </div>
         {pendingDeletePath === prompt.path && (
           <div className="prompt-delete-confirm">
-            <span>Delete this prompt?</span>
+            <span>{tx("Delete this prompt?")}</span>
             <button
               type="button"
               className="ghost prompt-action"
               onClick={() => void handleDeleteConfirm(prompt)}
             >
-              Delete
+              {tx("Delete")}
             </button>
             <button
               type="button"
               className="ghost prompt-action"
               onClick={() => setPendingDeletePath(null)}
             >
-              Cancel
+              {tx("Cancel")}
             </button>
           </div>
         )}
@@ -412,17 +418,21 @@ export function PromptPanel({
       headerClassName="git-panel-header"
       headerRight={
         <PanelMeta className="prompt-panel-meta">
-          {hasPrompts ? `${totalCount} prompt${totalCount === 1 ? "" : "s"}` : "No prompts"}
+          {hasPrompts
+            ? totalCount === 1
+              ? tx("{count} prompt", { count: totalCount })
+              : tx("{count} prompts", { count: totalCount })
+            : tx("No prompts")}
         </PanelMeta>
       }
       search={
         <PanelSearchField
           className="file-tree-search"
           inputClassName="file-tree-search-input"
-          placeholder="Filter prompts"
+          placeholder={tx("Filter prompts")}
           value={query}
           onChange={(event) => setQuery(event.target.value)}
-          aria-label="Filter prompts"
+          aria-label={tx("Filter prompts")}
           icon={<Search aria-hidden />}
         />
       }
@@ -432,17 +442,17 @@ export function PromptPanel({
           <div className="prompt-editor">
             <div className="prompt-editor-row">
               <label className="prompt-editor-label">
-                Name
+                {tx("Name")}
                 <input
                   className="prompt-args-input"
                   type="text"
                   value={editor.name}
                   onChange={(event) => updateEditor({ name: event.target.value })}
-                  placeholder="Prompt name"
+                  placeholder={tx("Prompt name")}
                 />
               </label>
               <label className="prompt-editor-label">
-                Scope
+                {tx("Scope")}
                 <select
                   className="prompt-scope-select"
                   value={editor.scope}
@@ -453,40 +463,40 @@ export function PromptPanel({
                   }
                   disabled={editor.mode === "edit"}
                 >
-                  <option value="workspace">Workspace</option>
-                  <option value="global">General</option>
+                  <option value="workspace">{tx("Workspace")}</option>
+                  <option value="global">{tx("General")}</option>
                 </select>
               </label>
             </div>
             <div className="prompt-editor-row">
               <label className="prompt-editor-label">
-                Description
+                {tx("Description")}
                 <input
                   className="prompt-args-input"
                   type="text"
                   value={editor.description}
                   onChange={(event) => updateEditor({ description: event.target.value })}
-                  placeholder="Optional description"
+                  placeholder={tx("Optional description")}
                 />
               </label>
               <label className="prompt-editor-label">
-                Argument hint
+                {tx("Argument hint")}
                 <input
                   className="prompt-args-input"
                   type="text"
                   value={editor.argumentHint}
                   onChange={(event) => updateEditor({ argumentHint: event.target.value })}
-                  placeholder="Optional argument hint"
+                  placeholder={tx("Optional argument hint")}
                 />
               </label>
             </div>
             <label className="prompt-editor-label">
-              Content
+              {tx("Content")}
               <textarea
                 className="prompt-editor-textarea"
                 value={editor.content}
                 onChange={(event) => updateEditor({ content: event.target.value })}
-                placeholder="Prompt content"
+                placeholder={tx("Prompt content")}
                 rows={6}
               />
             </label>
@@ -498,7 +508,7 @@ export function PromptPanel({
                 onClick={() => setEditor(null)}
                 disabled={isSaving}
               >
-                Cancel
+                {tx("Cancel")}
               </button>
               <button
                 type="button"
@@ -506,20 +516,20 @@ export function PromptPanel({
                 onClick={() => void handleSave()}
                 disabled={isSaving}
               >
-                {editor.mode === "create" ? "Create" : "Save"}
+                {editor.mode === "create" ? tx("Create") : tx("Save")}
               </button>
             </div>
           </div>
         )}
         <div className="prompt-section">
           <div className="prompt-section-header">
-            <div className="prompt-section-title">Workspace prompts</div>
+            <div className="prompt-section-title">{tx("Workspace prompts")}</div>
             <button
               type="button"
               className="ghost icon-button prompt-section-add"
               onClick={() => startCreate("workspace")}
-              aria-label="Add workspace prompt"
-              title="Add workspace prompt"
+              aria-label={tx("Add workspace prompt")}
+              title={tx("Add workspace prompt")}
             >
               <Plus aria-hidden />
             </button>
@@ -532,20 +542,20 @@ export function PromptPanel({
             <div className="prompt-empty-card">
               <ScrollText className="prompt-empty-icon" aria-hidden />
               <div className="prompt-empty-text">
-                <div className="prompt-empty-title">No workspace prompts yet</div>
+                <div className="prompt-empty-title">{tx("No workspace prompts yet")}</div>
                 <div className="prompt-empty-subtitle">
-                  Create one here or drop a .md file into the{" "}
+                  {tx("Create one here or drop a .md file into the")}{" "}
                   {workspacePath ? (
                     <button
                       type="button"
                       className="prompt-empty-link"
                       onClick={() => void onRevealWorkspacePrompts()}
                     >
-                      workspace prompts folder
+                      {tx("workspace prompts folder")}
                     </button>
                   ) : (
                     <span className="prompt-empty-link is-disabled">
-                      workspace prompts folder
+                      {tx("workspace prompts folder")}
                     </span>
                   )}
                   .
@@ -556,13 +566,13 @@ export function PromptPanel({
         </div>
         <div className="prompt-section">
           <div className="prompt-section-header">
-            <div className="prompt-section-title">General prompts</div>
+            <div className="prompt-section-title">{tx("General prompts")}</div>
             <button
               type="button"
               className="ghost icon-button prompt-section-add"
               onClick={() => startCreate("global")}
-              aria-label="Add general prompt"
-              title="Add general prompt"
+              aria-label={tx("Add general prompt")}
+              title={tx("Add general prompt")}
             >
               <Plus aria-hidden />
             </button>
@@ -575,9 +585,9 @@ export function PromptPanel({
             <div className="prompt-empty-card">
               <ScrollText className="prompt-empty-icon" aria-hidden />
               <div className="prompt-empty-text">
-                <div className="prompt-empty-title">No general prompts yet</div>
+                <div className="prompt-empty-title">{tx("No general prompts yet")}</div>
                 <div className="prompt-empty-subtitle">
-                  Create one here or drop a .md file into{" "}
+                  {tx("Create one here or drop a .md file into")}{" "}
                   {canRevealGeneralPrompts ? (
                     <button
                       type="button"
diff --git a/src/features/settings/components/SettingsNav.tsx b/src/features/settings/components/SettingsNav.tsx
index 9e51920b0..60e6004e8 100644
--- a/src/features/settings/components/SettingsNav.tsx
+++ b/src/features/settings/components/SettingsNav.tsx
@@ -12,7 +12,9 @@ import ServerCog from "lucide-react/dist/esm/icons/server-cog";
 import Bot from "lucide-react/dist/esm/icons/bot";
 import Info from "lucide-react/dist/esm/icons/info";
 import { PanelNavItem, PanelNavList } from "@/features/design-system/components/panel/PanelPrimitives";
+import { useI18n } from "@/i18n";
 import type { CodexSection } from "./settingsTypes";
+import { SETTINGS_SECTION_LABEL_KEYS } from "./settingsViewConstants";
 
 type SettingsNavProps = {
   activeSection: CodexSection;
@@ -25,6 +27,9 @@ export function SettingsNav({
   onSelectSection,
   showDisclosure = false,
 }: SettingsNavProps) {
+  const { t } = useI18n();
+  const label = (section: CodexSection) => t(SETTINGS_SECTION_LABEL_KEYS[section]);
+
   return (
     <aside className="settings-sidebar">
       <PanelNavList className="settings-nav-list">
@@ -35,7 +40,7 @@ export function SettingsNav({
           showDisclosure={showDisclosure}
           onClick={() => onSelectSection("projects")}
         >
-          Projects
+          {label("projects")}
         </PanelNavItem>
         <PanelNavItem
           className="settings-nav"
@@ -44,7 +49,7 @@ export function SettingsNav({
           showDisclosure={showDisclosure}
           onClick={() => onSelectSection("environments")}
         >
-          Environments
+          {label("environments")}
         </PanelNavItem>
         <PanelNavItem
           className="settings-nav"
@@ -53,7 +58,7 @@ export function SettingsNav({
           showDisclosure={showDisclosure}
           onClick={() => onSelectSection("display")}
         >
-          Display &amp; Sound
+          {label("display")}
         </PanelNavItem>
         <PanelNavItem
           className="settings-nav"
@@ -62,7 +67,7 @@ export function SettingsNav({
           showDisclosure={showDisclosure}
           onClick={() => onSelectSection("composer")}
         >
-          Composer
+          {label("composer")}
         </PanelNavItem>
         <PanelNavItem
           className="settings-nav"
@@ -71,7 +76,7 @@ export function SettingsNav({
           showDisclosure={showDisclosure}
           onClick={() => onSelectSection("dictation")}
         >
-          Dictation
+          {label("dictation")}
         </PanelNavItem>
         <PanelNavItem
           className="settings-nav"
@@ -80,7 +85,7 @@ export function SettingsNav({
           showDisclosure={showDisclosure}
           onClick={() => onSelectSection("shortcuts")}
         >
-          Shortcuts
+          {label("shortcuts")}
         </PanelNavItem>
         <PanelNavItem
           className="settings-nav"
@@ -89,7 +94,7 @@ export function SettingsNav({
           showDisclosure={showDisclosure}
           onClick={() => onSelectSection("open-apps")}
         >
-          Open in
+          {label("open-apps")}
         </PanelNavItem>
         <PanelNavItem
           className="settings-nav"
@@ -98,7 +103,7 @@ export function SettingsNav({
           showDisclosure={showDisclosure}
           onClick={() => onSelectSection("git")}
         >
-          Git
+          {label("git")}
         </PanelNavItem>
         <PanelNavItem
           className="settings-nav"
@@ -107,7 +112,7 @@ export function SettingsNav({
           showDisclosure={showDisclosure}
           onClick={() => onSelectSection("server")}
         >
-          Server
+          {label("server")}
         </PanelNavItem>
         <PanelNavItem
           className="settings-nav"
@@ -116,7 +121,7 @@ export function SettingsNav({
           showDisclosure={showDisclosure}
           onClick={() => onSelectSection("agents")}
         >
-          Agents
+          {label("agents")}
         </PanelNavItem>
         <PanelNavItem
           className="settings-nav"
@@ -125,7 +130,7 @@ export function SettingsNav({
           showDisclosure={showDisclosure}
           onClick={() => onSelectSection("codex")}
         >
-          Codex
+          {label("codex")}
         </PanelNavItem>
         <PanelNavItem
           className="settings-nav"
@@ -134,7 +139,7 @@ export function SettingsNav({
           showDisclosure={showDisclosure}
           onClick={() => onSelectSection("features")}
         >
-          Features
+          {label("features")}
         </PanelNavItem>
         <PanelNavItem
           className="settings-nav"
@@ -143,7 +148,7 @@ export function SettingsNav({
           showDisclosure={showDisclosure}
           onClick={() => onSelectSection("about")}
         >
-          About
+          {label("about")}
         </PanelNavItem>
       </PanelNavList>
     </aside>
diff --git a/src/features/settings/components/SettingsView.test.tsx b/src/features/settings/components/SettingsView.test.tsx
index 9633cbca0..7d057cf3e 100644
--- a/src/features/settings/components/SettingsView.test.tsx
+++ b/src/features/settings/components/SettingsView.test.tsx
@@ -109,6 +109,7 @@ const baseSettings: AppSettings = {
   lastComposerReasoningEffort: null,
   uiScale: 1,
   theme: "system",
+  appLanguage: "system",
   usageShowRemaining: false,
   showMessageFilePath: true,
   chatHistoryScrollbackItems: 200,
diff --git a/src/features/settings/components/SettingsView.tsx b/src/features/settings/components/SettingsView.tsx
index cdd67326b..b4a7e5e10 100644
--- a/src/features/settings/components/SettingsView.tsx
+++ b/src/features/settings/components/SettingsView.tsx
@@ -13,9 +13,10 @@ import { useSettingsViewCloseShortcuts } from "@settings/hooks/useSettingsViewCl
 import { useSettingsViewNavigation } from "@settings/hooks/useSettingsViewNavigation";
 import { useSettingsViewOrchestration } from "@settings/hooks/useSettingsViewOrchestration";
 import { ModalShell } from "@/features/design-system/components/modal/ModalShell";
+import { useI18n } from "@/i18n";
 import { SettingsNav } from "./SettingsNav";
 import type { CodexSection } from "./settingsTypes";
-import { SETTINGS_SECTION_LABELS } from "./settingsViewConstants";
+import { SETTINGS_SECTION_LABEL_KEYS } from "./settingsViewConstants";
 import { SettingsSectionContainers } from "./sections/SettingsSectionContainers";
 
 export type SettingsViewProps = {
@@ -99,6 +100,7 @@ export function SettingsView({
   onRemoveDictationModel,
   initialSection,
 }: SettingsViewProps) {
+  const { t } = useI18n();
   const {
     activeSection,
     showMobileDetail,
@@ -140,7 +142,7 @@ export function SettingsView({
 
   useSettingsViewCloseShortcuts(onClose);
 
-  const activeSectionLabel = SETTINGS_SECTION_LABELS[activeSection];
+  const activeSectionLabel = t(SETTINGS_SECTION_LABEL_KEYS[activeSection]);
   const settingsBodyClassName = `settings-body${
     useMobileMasterDetail ? " settings-body-mobile-master-detail" : ""
   }${useMobileMasterDetail && showMobileDetail ? " is-detail-visible" : ""}`;
@@ -154,13 +156,13 @@ export function SettingsView({
     >
       <div className="settings-titlebar">
         <div className="settings-title" id="settings-modal-title">
-          Settings
+          {t("settings.title")}
         </div>
         <button
           type="button"
           className="ghost icon-button settings-close"
           onClick={onClose}
-          aria-label="Close settings"
+          aria-label={t("settings.close")}
         >
           <X aria-hidden />
         </button>
@@ -183,10 +185,10 @@ export function SettingsView({
                   type="button"
                   className="settings-mobile-back"
                   onClick={() => setShowMobileDetail(false)}
-                  aria-label="Back to settings sections"
+                  aria-label={t("settings.backToSections")}
                 >
                   <ChevronLeft aria-hidden />
-                  Sections
+                  {t("settings.sections")}
                 </button>
                 <div className="settings-mobile-detail-title">{activeSectionLabel}</div>
               </div>
diff --git a/src/features/settings/components/sections/SettingsAboutSection.tsx b/src/features/settings/components/sections/SettingsAboutSection.tsx
index d22af22e6..06b55c8e8 100644
--- a/src/features/settings/components/sections/SettingsAboutSection.tsx
+++ b/src/features/settings/components/sections/SettingsAboutSection.tsx
@@ -1,5 +1,6 @@
 import { useEffect, useState } from "react";
 import type { AppSettings } from "@/types";
+import { useI18n } from "@/i18n";
 import {
   getAppBuildType,
   isMobileRuntime,
@@ -35,6 +36,7 @@ export function SettingsAboutSection({
   appSettings,
   onToggleAutomaticAppUpdateChecks,
 }: SettingsAboutSectionProps) {
+  const { tx } = useI18n();
   const [appBuildType, setAppBuildType] = useState<AppBuildType | "unknown">("unknown");
   const [updaterEnabled, setUpdaterEnabled] = useState(false);
   const { state: updaterState, checkForUpdates, startUpdate } = useUpdater({
@@ -86,33 +88,36 @@ export function SettingsAboutSection({
   const buildDateValue = __APP_BUILD_DATE__.trim();
   const parsedBuildDate = Date.parse(buildDateValue);
   const buildDateLabel = Number.isNaN(parsedBuildDate)
-    ? buildDateValue || "unknown"
+    ? buildDateValue || tx("unknown")
     : new Date(parsedBuildDate).toLocaleString();
 
   return (
-    <SettingsSection title="About" subtitle="App version, build metadata, and update controls.">
+    <SettingsSection
+      title={tx("About")}
+      subtitle={tx("App version, build metadata, and update controls.")}
+    >
       <div className="settings-field">
         <div className="settings-help">
-          Version: <code>{__APP_VERSION__}</code>
+          {tx("Version:")} <code>{__APP_VERSION__}</code>
         </div>
         <div className="settings-help">
-          Build type: <code>{appBuildType}</code>
+          {tx("Build type:")} <code>{tx(appBuildType)}</code>
         </div>
         <div className="settings-help">
-          Branch: <code>{__APP_GIT_BRANCH__ || "unknown"}</code>
+          {tx("Branch:")} <code>{__APP_GIT_BRANCH__ || tx("unknown")}</code>
         </div>
         <div className="settings-help">
-          Commit: <code>{__APP_COMMIT_HASH__ || "unknown"}</code>
+          {tx("Commit:")} <code>{__APP_COMMIT_HASH__ || tx("unknown")}</code>
         </div>
         <div className="settings-help">
-          Build date: <code>{buildDateLabel}</code>
+          {tx("Build date:")} <code>{buildDateLabel}</code>
         </div>
       </div>
       <div className="settings-field">
-        <div className="settings-label">App Updates</div>
+        <div className="settings-label">{tx("App Updates")}</div>
         <SettingsToggleRow
-          title="Automatically check for app updates"
-          subtitle="When enabled, CodexMonitor checks for new app versions on launch."
+          title={tx("Automatically check for app updates")}
+          subtitle={tx("When enabled, CodexMonitor checks for new app versions on launch.")}
         >
           <SettingsToggleSwitch
             pressed={appSettings.automaticAppUpdateChecksEnabled}
@@ -122,17 +127,17 @@ export function SettingsAboutSection({
           />
         </SettingsToggleRow>
         <div className="settings-help">
-          Currently running version <code>{__APP_VERSION__}</code>
+          {tx("Currently running version")} <code>{__APP_VERSION__}</code>
         </div>
         {!updaterEnabled && (
           <div className="settings-help">
-            Updates are unavailable in this runtime.
+            {tx("Updates are unavailable in this runtime.")}
           </div>
         )}
 
         {updaterState.stage === "error" && (
           <div className="settings-help ds-text-danger">
-            Update failed: {updaterState.error}
+            {tx("Update failed:")} {updaterState.error}
           </div>
         )}
 
@@ -142,23 +147,23 @@ export function SettingsAboutSection({
           <div className="settings-help">
             {updaterState.stage === "downloading" ? (
               <>
-                Downloading update...{" "}
+                {tx("Downloading update...")}{" "}
                 {updaterState.progress?.totalBytes
                   ? `${Math.round((updaterState.progress.downloadedBytes / updaterState.progress.totalBytes) * 100)}%`
                   : formatBytes(updaterState.progress?.downloadedBytes ?? 0)}
               </>
             ) : updaterState.stage === "installing" ? (
-              "Installing update..."
+              tx("Installing update...")
             ) : (
-              "Restarting..."
+              tx("Restarting...")
             )}
           </div>
         ) : updaterState.stage === "available" ? (
           <div className="settings-help">
-            Version <code>{updaterState.version}</code> is available.
+            {tx("Version")} <code>{updaterState.version}</code> {tx("is available.")}
           </div>
         ) : updaterState.stage === "latest" ? (
-          <div className="settings-help">You are on the latest version.</div>
+          <div className="settings-help">{tx("You are on the latest version.")}</div>
         ) : null}
 
         <div className="settings-controls">
@@ -169,7 +174,7 @@ export function SettingsAboutSection({
               disabled={!updaterEnabled}
               onClick={() => void startUpdate()}
             >
-              Download & Install
+              {tx("Download & Install")}
             </button>
           ) : (
             <button
@@ -184,7 +189,7 @@ export function SettingsAboutSection({
               }
               onClick={() => void checkForUpdates({ announceNoUpdate: true })}
             >
-              {updaterState.stage === "checking" ? "Checking..." : "Check for updates"}
+              {updaterState.stage === "checking" ? tx("Checking...") : tx("Check for updates")}
             </button>
           )}
         </div>
diff --git a/src/features/settings/components/sections/SettingsAgentsSection.tsx b/src/features/settings/components/sections/SettingsAgentsSection.tsx
index 85b588cb2..7311f562e 100644
--- a/src/features/settings/components/sections/SettingsAgentsSection.tsx
+++ b/src/features/settings/components/sections/SettingsAgentsSection.tsx
@@ -1,5 +1,6 @@
 import { useEffect, useMemo, useState } from "react";
 import { revealItemInDir } from "@tauri-apps/plugin-opener";
+import { useI18n } from "@/i18n";
 import type { ModelOption } from "@/types";
 import {
   MagicSparkleIcon,
@@ -62,6 +63,7 @@ export function SettingsAgentsSection({
   modelOptionsLoading,
   modelOptionsError,
 }: SettingsAgentsSectionProps) {
+  const { tx } = useI18n();
   const [openPathError, setOpenPathError] = useState<string | null>(null);
   const [maxThreadsDraft, setMaxThreadsDraft] = useState("6");
   const [maxDepthDraft, setMaxDepthDraft] = useState("1");
@@ -162,7 +164,7 @@ export function SettingsAgentsSection({
       await revealItemInDir(path);
     } catch (openError) {
       setOpenPathError(
-        openError instanceof Error ? openError.message : "Unable to open path.",
+        openError instanceof Error ? openError.message : tx("Unable to open path."),
       );
     }
   };
@@ -181,7 +183,10 @@ export function SettingsAgentsSection({
       setCreateError(null);
       setEditError(null);
       setOpenPathError(
-        `Max threads must be an integer between ${MIN_MAX_THREADS} and ${MAX_MAX_THREADS}.`,
+        tx("Max threads must be an integer between {min} and {max}.", {
+          min: MIN_MAX_THREADS,
+          max: MAX_MAX_THREADS,
+        }),
       );
       return;
     }
@@ -216,7 +221,10 @@ export function SettingsAgentsSection({
       setCreateError(null);
       setEditError(null);
       setOpenPathError(
-        `Max depth must be an integer between ${MIN_MAX_DEPTH} and ${MAX_MAX_DEPTH}.`,
+        tx("Max depth must be an integer between {min} and {max}.", {
+          min: MIN_MAX_DEPTH,
+          max: MAX_MAX_DEPTH,
+        }),
       );
       return;
     }
@@ -247,7 +255,7 @@ export function SettingsAgentsSection({
   const handleCreateAgent = async () => {
     const name = createName.trim();
     if (!name) {
-      setCreateError("Agent name is required.");
+      setCreateError(tx("Agent name is required."));
       return;
     }
     setCreateError(null);
@@ -282,7 +290,7 @@ export function SettingsAgentsSection({
     }
     const nextName = editNameDraft.trim();
     if (!nextName) {
-      setEditError("Agent name is required.");
+      setEditError(tx("Agent name is required."));
       return;
     }
     const editingAgent = settings?.agents.find((agent) => agent.name === editingName) ?? null;
@@ -351,21 +359,21 @@ export function SettingsAgentsSection({
 
   return (
     <SettingsSection
-      title="Agents"
-      subtitle="Configure multi-agent mode, limits, and custom agent roles."
+      title={tx("Agents")}
+      subtitle={tx("Configure multi-agent mode, limits, and custom agent roles.")}
     >
       <div className="settings-help settings-agents-builtins-help">
-        Built-in roles from Codex are still available: <code>default</code>, <code>explorer</code>,
-        and <code>worker</code>.
+        {tx("Built-in roles from Codex are still available:")} <code>default</code>,{" "}
+        <code>explorer</code>, {tx("and")} <code>worker</code>.
       </div>
 
       <SettingsToggleRow
-        title="Config file"
-        subtitle={<>Open global Codex config in {fileManagerName()}.</>}
+        title={tx("Config file")}
+        subtitle={<>{tx("Open global Codex config in {app}.", { app: fileManagerName() })}</>}
       >
         <div className="settings-agents-actions">
           <button type="button" className="ghost" onClick={onRefresh} disabled={isLoading}>
-            Refresh
+            {tx("Refresh")}
           </button>
           <button
             type="button"
@@ -379,10 +387,10 @@ export function SettingsAgentsSection({
       </SettingsToggleRow>
 
       <SettingsToggleRow
-        title="Enable Multi-Agent"
+        title={tx("Enable Multi-Agent")}
         subtitle={
           <>
-            Writes <code>features.multi_agent</code> in config.toml.
+            {tx("Writes")} <code>features.multi_agent</code> {tx("in config.toml.")}
           </>
         }
       >
@@ -394,14 +402,15 @@ export function SettingsAgentsSection({
       </SettingsToggleRow>
 
       <SettingsToggleRow
-        title="Max Threads"
+        title={tx("Max Threads")}
         subtitle={
           <>
-            Maximum open agent threads. Valid range: <code>1-12</code>. Changes save immediately.
+            {tx("Maximum open agent threads. Valid range:")} <code>1-12</code>.{" "}
+            {tx("Changes save immediately.")}
           </>
         }
       >
-        <div className="settings-agents-stepper" role="group" aria-label="Maximum agent threads">
+        <div className="settings-agents-stepper" role="group" aria-label={tx("Maximum agent threads")}>
           <button
             type="button"
             className="ghost settings-agents-stepper-button"
@@ -409,7 +418,7 @@ export function SettingsAgentsSection({
               void handleMaxThreadsStep(-1);
             }}
             disabled={!settings || isUpdatingCore || currentMaxThreads <= MIN_MAX_THREADS}
-            aria-label="Decrease max threads"
+            aria-label={tx("Decrease max threads")}
           >
             ▼
           </button>
@@ -423,7 +432,7 @@ export function SettingsAgentsSection({
               void handleMaxThreadsStep(1);
             }}
             disabled={!settings || isUpdatingCore || currentMaxThreads >= MAX_MAX_THREADS}
-            aria-label="Increase max threads"
+            aria-label={tx("Increase max threads")}
           >
             ▲
           </button>
@@ -431,14 +440,15 @@ export function SettingsAgentsSection({
       </SettingsToggleRow>
 
       <SettingsToggleRow
-        title="Max Depth"
+        title={tx("Max Depth")}
         subtitle={
           <>
-            Maximum nested spawn depth. Valid range: <code>1-4</code>. Changes save immediately.
+            {tx("Maximum nested spawn depth. Valid range:")} <code>1-4</code>.{" "}
+            {tx("Changes save immediately.")}
           </>
         }
       >
-        <div className="settings-agents-stepper" role="group" aria-label="Maximum agent depth">
+        <div className="settings-agents-stepper" role="group" aria-label={tx("Maximum agent depth")}>
           <button
             type="button"
             className="ghost settings-agents-stepper-button"
@@ -446,7 +456,7 @@ export function SettingsAgentsSection({
               void handleMaxDepthStep(-1);
             }}
             disabled={!settings || isUpdatingCore || currentMaxDepth <= MIN_MAX_DEPTH}
-            aria-label="Decrease max depth"
+            aria-label={tx("Decrease max depth")}
           >
             ▼
           </button>
@@ -460,7 +470,7 @@ export function SettingsAgentsSection({
               void handleMaxDepthStep(1);
             }}
             disabled={!settings || isUpdatingCore || currentMaxDepth >= MAX_MAX_DEPTH}
-            aria-label="Increase max depth"
+            aria-label={tx("Increase max depth")}
           >
             ▲
           </button>
@@ -468,17 +478,18 @@ export function SettingsAgentsSection({
       </SettingsToggleRow>
 
       <SettingsSubsection
-        title="Create Agent"
+        title={tx("Create Agent")}
         subtitle={
           <>
-            Add a custom role under <code>[agents.&lt;name&gt;]</code> and create its config file.
+            {tx("Add a custom role under")} <code>[agents.&lt;name&gt;]</code>{" "}
+            {tx("and create its config file.")}
           </>
         }
       />
       <div className="settings-field settings-agents-form">
         <div className="settings-agents-description-row">
           <label className="settings-label" htmlFor="settings-agent-create-name">
-            Name
+            {tx("Name")}
           </label>
           <button
             type="button"
@@ -504,8 +515,8 @@ export function SettingsAgentsSection({
               })();
             }}
             disabled={creatingAgent || createDescriptionGenerating || !canGenerateCreateFromName}
-            title="Generate description and developer instructions with AI"
-            aria-label="Generate fields for new agent"
+            title={tx("Generate description and developer instructions with AI")}
+            aria-label={tx("Generate fields for new agent")}
           >
             {createDescriptionGenerating ? (
               <MagicSparkleLoaderIcon className="settings-agents-generate-loader" />
@@ -523,38 +534,38 @@ export function SettingsAgentsSection({
           disabled={creatingAgent}
         />
         <label className="settings-label" htmlFor="settings-agent-create-description">
-          Description
+          {tx("Description")}
         </label>
         <textarea
           id="settings-agent-create-description"
           className="settings-agents-textarea settings-agents-textarea--compact"
           value={createDescription}
           onChange={(event) => setCreateDescription(event.target.value)}
-          placeholder="Short role summary."
+          placeholder={tx("Short role summary.")}
           rows={2}
           disabled={creatingAgent}
         />
         <label className="settings-label" htmlFor="settings-agent-create-developer-instructions">
-          Developer instructions
+          {tx("Developer instructions")}
         </label>
         <textarea
           id="settings-agent-create-developer-instructions"
           className="settings-agents-textarea"
           value={createDeveloperInstructions}
           onChange={(event) => setCreateDeveloperInstructions(event.target.value)}
-          placeholder="Multiline per-agent developer instructions."
+          placeholder={tx("Multiline per-agent developer instructions.")}
           disabled={creatingAgent}
         />
         <div className="settings-agents-model-row">
           <div className="settings-agents-model-field settings-agents-model-field--model">
-            <span className="settings-agents-inline-label">model:</span>
+            <span className="settings-agents-inline-label">{tx("model:")}</span>
             <select
               id="settings-agent-create-model"
               className="settings-select settings-select--compact"
               value={createModel}
               onChange={(event) => setCreateModel(event.target.value)}
               disabled={creatingAgent}
-              aria-label="Agent model"
+              aria-label={tx("Agent model")}
             >
               {effectiveModelOptions.map((option) => (
                 <option key={option.model} value={option.model}>
@@ -567,16 +578,16 @@ export function SettingsAgentsSection({
             |
           </span>
           <div className="settings-agents-model-field settings-agents-model-field--effort">
-            <span className="settings-agents-inline-label">reasoning:</span>
+            <span className="settings-agents-inline-label">{tx("reasoning:")}</span>
             <select
               id="settings-agent-create-effort"
               className="settings-select settings-select--compact"
               value={createReasoningEffort}
               onChange={(event) => setCreateReasoningEffort(event.target.value)}
               disabled={creatingAgent || createReasoningOptions.length === 0}
-              aria-label="Agent reasoning effort"
+              aria-label={tx("Agent reasoning effort")}
             >
-              {createReasoningOptions.length === 0 && <option value="">not supported</option>}
+              {createReasoningOptions.length === 0 && <option value="">{tx("not supported")}</option>}
               {createReasoningOptions.map((effort) => (
                 <option key={effort} value={effort}>
                   {effort}
@@ -587,14 +598,14 @@ export function SettingsAgentsSection({
         </div>
         <div className="settings-agents-actions">
           <button type="button" className="ghost" onClick={() => void handleCreateAgent()}>
-            {creatingAgent ? "Creating..." : "Create Agent"}
+            {creatingAgent ? tx("Creating...") : tx("Create Agent")}
           </button>
         </div>
         {modelOptions.length === 0 && (
           <div className="settings-help">
             {modelOptionsLoading
-              ? "Loading workspace model metadata. Using fallback model defaults for now."
-              : "Using fallback model defaults until workspace model metadata is available."}
+              ? tx("Loading workspace model metadata. Using fallback model defaults for now.")
+              : tx("Using fallback model defaults until workspace model metadata is available.")}
           </div>
         )}
         {modelOptionsError && <div className="settings-help">{modelOptionsError}</div>}
@@ -602,12 +613,12 @@ export function SettingsAgentsSection({
       </div>
 
       <SettingsSubsection
-        title="Configured Agents"
-        subtitle="Manage custom roles and their per-agent config files."
+        title={tx("Configured Agents")}
+        subtitle={tx("Manage custom roles and their per-agent config files.")}
       />
 
       {settings && settings.agents.length === 0 && !isLoading && (
-        <div className="settings-help">No custom agents configured yet.</div>
+        <div className="settings-help">{tx("No custom agents configured yet.")}</div>
       )}
 
       {settings?.agents.map((agent) => {
@@ -625,13 +636,13 @@ export function SettingsAgentsSection({
               <div>
                 <div className="settings-toggle-title">{agent.name}</div>
                 <div className="settings-toggle-subtitle">
-                  {agent.description || "No description."}
+                  {agent.description || tx("No description.")}
                 </div>
               </div>
             </div>
 
             <div className="settings-help settings-help-inline">
-              <code>{agent.configFile || "(missing config_file)"}</code>
+              <code>{agent.configFile || tx("(missing config_file)")}</code>
             </div>
             <div className="settings-agents-actions">
               {!isPendingDelete && (
@@ -642,7 +653,7 @@ export function SettingsAgentsSection({
                     onClick={() => startEditing(agent)}
                     disabled={isUpdating || isDeleting}
                   >
-                    Edit
+                    {tx("Edit")}
                   </button>
                   <button
                     type="button"
@@ -650,7 +661,7 @@ export function SettingsAgentsSection({
                     onClick={() => handleDeleteAgent(agent.name)}
                     disabled={isUpdating || isDeleting}
                   >
-                    Delete
+                    {tx("Delete")}
                   </button>
                 </>
               )}
@@ -667,16 +678,16 @@ export function SettingsAgentsSection({
                 onClick={() => void handleOpenConfigEditor(agent.name)}
                 disabled={!agent.managedByApp || isReadingConfig || isWritingConfig}
               >
-                {isReadingConfig ? "Opening..." : "Edit File"}
+                {isReadingConfig ? tx("Opening...") : tx("Edit File")}
               </button>
               {!agent.managedByApp && (
-                <span className="settings-help settings-help-inline">External path</span>
+                <span className="settings-help settings-help-inline">{tx("External path")}</span>
               )}
             </div>
             {isPendingDelete && (
               <div className="settings-agents-actions">
                 <span className="settings-help settings-help-inline">
-                  Delete agent and managed config file?
+                  {tx("Delete agent and managed config file?")}
                 </span>
                 <button
                   type="button"
@@ -686,7 +697,7 @@ export function SettingsAgentsSection({
                   }}
                   disabled={isDeleting}
                 >
-                  Cancel
+                  {tx("Cancel")}
                 </button>
                 <button
                   type="button"
@@ -694,7 +705,7 @@ export function SettingsAgentsSection({
                   onClick={() => void handleConfirmDeleteAgent(agent.name)}
                   disabled={isDeleting}
                 >
-                  {isDeleting ? "Deleting..." : "Confirm Delete"}
+                  {isDeleting ? tx("Deleting...") : tx("Confirm Delete")}
                 </button>
               </div>
             )}
@@ -706,7 +717,7 @@ export function SettingsAgentsSection({
                     className="settings-label"
                     htmlFor={`settings-agent-edit-name-${agent.name}`}
                   >
-                    Name
+                    {tx("Name")}
                   </label>
                   <button
                     type="button"
@@ -734,8 +745,8 @@ export function SettingsAgentsSection({
                     disabled={
                       isUpdating || editDescriptionGenerating || !canGenerateEditFromName
                     }
-                    title="Generate description and developer instructions with AI"
-                    aria-label={`Generate fields for ${agent.name}`}
+                    title={tx("Generate description and developer instructions with AI")}
+                    aria-label={tx("Generate fields for {name}", { name: agent.name })}
                   >
                     {editDescriptionGenerating ? (
                       <MagicSparkleLoaderIcon className="settings-agents-generate-loader" />
@@ -755,14 +766,14 @@ export function SettingsAgentsSection({
                   className="settings-label"
                   htmlFor={`settings-agent-edit-description-${agent.name}`}
                 >
-                  Description
+                  {tx("Description")}
                 </label>
                 <textarea
                   id={`settings-agent-edit-description-${agent.name}`}
                   className="settings-agents-textarea settings-agents-textarea--compact"
                   value={editDescriptionDraft}
                   onChange={(event) => setEditDescriptionDraft(event.target.value)}
-                  placeholder="Short role summary."
+                  placeholder={tx("Short role summary.")}
                   rows={2}
                   disabled={isUpdating}
                 />
@@ -770,7 +781,7 @@ export function SettingsAgentsSection({
                   className="settings-label"
                   htmlFor={`settings-agent-edit-developer-instructions-${agent.name}`}
                 >
-                  Developer instructions
+                  {tx("Developer instructions")}
                 </label>
                 <textarea
                   id={`settings-agent-edit-developer-instructions-${agent.name}`}
@@ -779,7 +790,7 @@ export function SettingsAgentsSection({
                   onChange={(event) =>
                     setEditDeveloperInstructionsDraft(event.target.value)
                   }
-                  placeholder="Multiline per-agent developer instructions."
+                  placeholder={tx("Multiline per-agent developer instructions.")}
                   disabled={isUpdating}
                 />
                 <label className="settings-checkbox">
@@ -788,7 +799,7 @@ export function SettingsAgentsSection({
                     checked={renameManagedFile}
                     onChange={(event) => setRenameManagedFile(event.target.checked)}
                   />
-                  Rename managed config file when agent name changes
+                  {tx("Rename managed config file when agent name changes")}
                 </label>
                 <div className="settings-agents-actions">
                   <button
@@ -800,7 +811,7 @@ export function SettingsAgentsSection({
                     }}
                     disabled={isUpdating}
                   >
-                    Cancel
+                    {tx("Cancel")}
                   </button>
                   <button
                     type="button"
@@ -808,7 +819,7 @@ export function SettingsAgentsSection({
                     onClick={() => void handleUpdateAgent()}
                     disabled={isUpdating}
                   >
-                    {isUpdating ? "Saving..." : "Save"}
+                    {isUpdating ? tx("Saving...") : tx("Save")}
                   </button>
                 </div>
                 {editError && <div className="settings-agents-error">{editError}</div>}
@@ -819,7 +830,9 @@ export function SettingsAgentsSection({
               <div className="settings-field settings-agents-editor">
                 <div className="settings-agents-header">
                   <div>
-                    <div className="settings-toggle-title">{agent.name} config file</div>
+                    <div className="settings-toggle-title">
+                      {tx("{name} config file", { name: agent.name })}
+                    </div>
                     <div className="settings-toggle-subtitle">
                       <code>{agent.configFile}</code>
                     </div>
@@ -833,7 +846,7 @@ export function SettingsAgentsSection({
                         setConfigEditorDirty(false);
                       }}
                     >
-                      Close
+                      {tx("Close")}
                     </button>
                     <button
                       type="button"
@@ -841,7 +854,7 @@ export function SettingsAgentsSection({
                       onClick={() => void handleSaveConfigEditor()}
                       disabled={!configEditorDirty || writingConfigAgentName === agent.name}
                     >
-                      {isWritingConfig ? "Saving..." : "Save"}
+                      {isWritingConfig ? tx("Saving...") : tx("Save")}
                     </button>
                   </div>
                 </div>
@@ -859,7 +872,7 @@ export function SettingsAgentsSection({
         );
       })}
 
-      {isLoading && <div className="settings-help">Loading agents settings...</div>}
+      {isLoading && <div className="settings-help">{tx("Loading agents settings...")}</div>}
       {openPathError && <div className="settings-agents-error">{openPathError}</div>}
       {error && <div className="settings-agents-error">{error}</div>}
     </SettingsSection>
diff --git a/src/features/settings/components/sections/SettingsCodexSection.tsx b/src/features/settings/components/sections/SettingsCodexSection.tsx
index a522b3ac1..dd0753640 100644
--- a/src/features/settings/components/sections/SettingsCodexSection.tsx
+++ b/src/features/settings/components/sections/SettingsCodexSection.tsx
@@ -1,4 +1,5 @@
 import { useEffect, useMemo, useRef } from "react";
+import { useI18n } from "@/i18n";
 import Stethoscope from "lucide-react/dist/esm/icons/stethoscope";
 import type { Dispatch, SetStateAction } from "react";
 import type {
@@ -146,6 +147,7 @@ export function SettingsCodexSection({
   onRefreshGlobalConfig,
   onSaveGlobalConfig,
 }: SettingsCodexSectionProps) {
+  const { tx } = useI18n();
   const latestModelSlug = defaultModels[0]?.model ?? null;
   const savedModelSlug = useMemo(
     () => coerceSavedModelSlug(appSettings.lastComposerModelId, defaultModels),
@@ -229,12 +231,12 @@ export function SettingsCodexSection({
 
   return (
     <SettingsSection
-      title="Codex"
-      subtitle="Configure the Codex CLI used by CodexMonitor and validate the install."
+      title={tx("Codex")}
+      subtitle={tx("Configure the Codex CLI used by CodexMonitor and validate the install.")}
     >
       <div className="settings-field">
         <label className="settings-field-label" htmlFor="codex-path">
-          Default Codex path
+          {tx("Default Codex path")}
         </label>
         <div className="settings-field-row">
           <input
@@ -251,19 +253,19 @@ export function SettingsCodexSection({
               void onBrowseCodex();
             }}
           >
-            Browse
+            {tx("Browse")}
           </button>
           <button
             type="button"
             className="ghost"
             onClick={() => onSetCodexPathDraft("")}
           >
-            Use PATH
+            {tx("Use PATH")}
           </button>
         </div>
-        <div className="settings-help">Leave empty to use the system PATH resolution.</div>
+        <div className="settings-help">{tx("Leave empty to use the system PATH resolution.")}</div>
         <label className="settings-field-label" htmlFor="codex-args">
-          Default Codex args
+          {tx("Default Codex args")}
         </label>
         <div className="settings-field-row">
           <input
@@ -278,17 +280,18 @@ export function SettingsCodexSection({
             className="ghost"
             onClick={() => onSetCodexArgsDraft("")}
           >
-            Clear
+            {tx("Clear")}
           </button>
         </div>
         <div className="settings-help">
-          Extra flags passed before <code>app-server</code>. Use quotes for values with spaces.
+          {tx("Extra flags passed before")} <code>app-server</code>.{" "}
+          {tx("Use quotes for values with spaces.")}
         </div>
         <div className="settings-help">
-          These settings apply to the shared Codex app-server used across all connected workspaces.
+          {tx("These settings apply to the shared Codex app-server used across all connected workspaces.")}
         </div>
         <div className="settings-help">
-          Per-thread override processing ignores unsupported flags: <code>-m</code>/
+          {tx("Per-thread override processing ignores unsupported flags:")} <code>-m</code>/
           <code>--model</code>, <code>-a</code>/<code>--ask-for-approval</code>,{" "}
           <code>-s</code>/<code>--sandbox</code>, <code>--full-auto</code>,{" "}
           <code>--dangerously-bypass-approvals-and-sandbox</code>, <code>--oss</code>,{" "}
@@ -304,7 +307,7 @@ export function SettingsCodexSection({
               }}
               disabled={isSavingSettings}
             >
-              {isSavingSettings ? "Saving..." : "Save"}
+              {isSavingSettings ? tx("Saving...") : tx("Save")}
             </button>
           )}
           <button
@@ -316,7 +319,7 @@ export function SettingsCodexSection({
             disabled={doctorState.status === "running"}
           >
             <Stethoscope aria-hidden />
-            {doctorState.status === "running" ? "Running..." : "Run doctor"}
+            {doctorState.status === "running" ? tx("Running...") : tx("Run doctor")}
           </button>
           <button
             type="button"
@@ -325,31 +328,31 @@ export function SettingsCodexSection({
               void onRunCodexUpdate();
             }}
             disabled={codexUpdateState.status === "running"}
-            title="Update Codex"
+            title={tx("Update Codex")}
           >
             <Stethoscope aria-hidden />
-            {codexUpdateState.status === "running" ? "Updating..." : "Update"}
+            {codexUpdateState.status === "running" ? tx("Updating...") : tx("Update")}
           </button>
         </div>
 
         {doctorState.result && (
           <div className={`settings-doctor ${doctorState.result.ok ? "ok" : "error"}`}>
             <div className="settings-doctor-title">
-              {doctorState.result.ok ? "Codex looks good" : "Codex issue detected"}
+              {doctorState.result.ok ? tx("Codex looks good") : tx("Codex issue detected")}
             </div>
             <div className="settings-doctor-body">
-              <div>Version: {doctorState.result.version ?? "unknown"}</div>
-              <div>App-server: {doctorState.result.appServerOk ? "ok" : "failed"}</div>
+              <div>{tx("Version:")} {doctorState.result.version ?? tx("unknown")}</div>
+              <div>{tx("App-server:")} {doctorState.result.appServerOk ? tx("ok") : tx("failed")}</div>
               <div>
-                Node:{" "}
+                {tx("Node:")}{" "}
                 {doctorState.result.nodeOk
-                  ? `ok (${doctorState.result.nodeVersion ?? "unknown"})`
-                  : "missing"}
+                  ? tx("ok ({version})", { version: doctorState.result.nodeVersion ?? tx("unknown") })
+                  : tx("missing")}
               </div>
               {doctorState.result.details && <div>{doctorState.result.details}</div>}
               {doctorState.result.nodeDetails && <div>{doctorState.result.nodeDetails}</div>}
               {doctorState.result.path && (
-                <div className="settings-doctor-path">PATH: {doctorState.result.path}</div>
+                <div className="settings-doctor-path">{tx("PATH:")} {doctorState.result.path}</div>
               )}
             </div>
           </div>
@@ -362,25 +365,25 @@ export function SettingsCodexSection({
             <div className="settings-doctor-title">
               {codexUpdateState.result.ok
                 ? codexUpdateState.result.upgraded
-                  ? "Codex updated"
-                  : "Codex already up-to-date"
-                : "Codex update failed"}
+                  ? tx("Codex updated")
+                  : tx("Codex already up-to-date")
+                : tx("Codex update failed")}
             </div>
             <div className="settings-doctor-body">
-              <div>Method: {codexUpdateState.result.method}</div>
+              <div>{tx("Method:")} {codexUpdateState.result.method}</div>
               {codexUpdateState.result.package && (
-                <div>Package: {codexUpdateState.result.package}</div>
+                <div>{tx("Package:")} {codexUpdateState.result.package}</div>
               )}
               <div>
-                Version:{" "}
+                {tx("Version:")}{" "}
                 {codexUpdateState.result.afterVersion ??
                   codexUpdateState.result.beforeVersion ??
-                  "unknown"}
+                  tx("unknown")}
               </div>
               {codexUpdateState.result.details && <div>{codexUpdateState.result.details}</div>}
               {codexUpdateState.result.output && (
                 <details>
-                  <summary>output</summary>
+                  <summary>{tx("output")}</summary>
                   <pre>{codexUpdateState.result.output}</pre>
                 </details>
               )}
@@ -391,23 +394,23 @@ export function SettingsCodexSection({
 
       <div className="settings-divider" />
       <div className="settings-field-label settings-field-label--section">
-        Default parameters
+        {tx("Default parameters")}
       </div>
 
       <SettingsToggleRow
         title={
           <label htmlFor="default-model">
-            Model
+            {tx("Model")}
           </label>
         }
         subtitle={
           defaultModelsConnectedWorkspaceCount === 0
-            ? "Add a workspace to load available models."
+            ? tx("Add a workspace to load available models.")
             : defaultModelsLoading
-              ? "Loading models from the first workspace…"
+              ? tx("Loading models from the first workspace…")
               : defaultModelsError
-                ? `Couldn’t load models: ${defaultModelsError}`
-                : "Sourced from the first workspace and used when there is no thread-specific override."
+                ? tx("Couldn’t load models: {error}", { error: defaultModelsError })
+                : tx("Sourced from the first workspace and used when there is no thread-specific override.")
         }
       >
         <div className="settings-field-row">
@@ -422,7 +425,7 @@ export function SettingsCodexSection({
                 lastComposerModelId: event.target.value,
               })
             }
-            aria-label="Model"
+            aria-label={tx("Model")}
           >
             {defaultModels.map((model) => (
               <option key={model.model} value={model.model}>
@@ -436,7 +439,7 @@ export function SettingsCodexSection({
             onClick={onRefreshDefaultModels}
             disabled={defaultModelsLoading || defaultModelsConnectedWorkspaceCount === 0}
           >
-            Refresh
+            {tx("Refresh")}
           </button>
         </div>
       </SettingsToggleRow>
@@ -444,13 +447,13 @@ export function SettingsCodexSection({
       <SettingsToggleRow
         title={
           <label htmlFor="default-effort">
-            Reasoning effort
+            {tx("Reasoning effort")}
           </label>
         }
         subtitle={
           reasoningSupported
-            ? "Available options depend on the selected model."
-            : "The selected model does not expose reasoning effort options."
+            ? tx("Available options depend on the selected model.")
+            : tx("The selected model does not expose reasoning effort options.")
         }
       >
         <select
@@ -463,10 +466,10 @@ export function SettingsCodexSection({
               lastComposerReasoningEffort: event.target.value,
             })
           }
-          aria-label="Reasoning effort"
+          aria-label={tx("Reasoning effort")}
           disabled={!reasoningSupported}
         >
-          {!reasoningSupported && <option value="">not supported</option>}
+          {!reasoningSupported && <option value="">{tx("not supported")}</option>}
           {reasoningOptions.map((effort) => (
             <option key={effort} value={effort}>
               {effort}
@@ -478,10 +481,10 @@ export function SettingsCodexSection({
       <SettingsToggleRow
         title={
           <label htmlFor="default-access">
-            Access mode
+            {tx("Access mode")}
           </label>
         }
-        subtitle="Used when there is no thread-specific override."
+        subtitle={tx("Used when there is no thread-specific override.")}
       >
         <select
           id="default-access"
@@ -494,14 +497,14 @@ export function SettingsCodexSection({
             })
           }
         >
-          <option value="read-only">Read only</option>
-          <option value="current">On-request</option>
-          <option value="full-access">Full access</option>
+          <option value="read-only">{tx("Read only")}</option>
+          <option value="current">{tx("On-request")}</option>
+          <option value="full-access">{tx("Full access")}</option>
         </select>
       </SettingsToggleRow>
       <div className="settings-field">
         <label className="settings-field-label" htmlFor="review-delivery">
-          Review mode
+          {tx("Review mode")}
         </label>
         <select
           id="review-delivery"
@@ -514,21 +517,21 @@ export function SettingsCodexSection({
             })
           }
         >
-          <option value="inline">Inline (same thread)</option>
-          <option value="detached">Detached (new review thread)</option>
+          <option value="inline">{tx("Inline (same thread)")}</option>
+          <option value="detached">{tx("Detached (new review thread)")}</option>
         </select>
         <div className="settings-help">
-          Choose whether <code>/review</code> runs in the current thread or a detached review
-          thread.
+          {tx("Choose whether")} <code>/review</code>{" "}
+          {tx("runs in the current thread or a detached review thread.")}
         </div>
       </div>
 
       <FileEditorCard
-        title="Global AGENTS.md"
+        title={tx("Global AGENTS.md")}
         meta={globalAgentsMeta}
         error={globalAgentsError}
         value={globalAgentsContent}
-        placeholder="Add global instructions for Codex agents…"
+        placeholder={tx("Add global instructions for Codex agents…")}
         disabled={globalAgentsLoading}
         refreshDisabled={globalAgentsRefreshDisabled}
         saveDisabled={globalAgentsSaveDisabled}
@@ -538,7 +541,7 @@ export function SettingsCodexSection({
         onSave={onSaveGlobalAgents}
         helpText={
           <>
-            Stored at <code>~/.codex/AGENTS.md</code>.
+            {tx("Stored at")} <code>~/.codex/AGENTS.md</code>.
           </>
         }
         classNames={{
@@ -555,11 +558,11 @@ export function SettingsCodexSection({
       />
 
       <FileEditorCard
-        title="Global config.toml"
+        title={tx("Global config.toml")}
         meta={globalConfigMeta}
         error={globalConfigError}
         value={globalConfigContent}
-        placeholder="Edit the global Codex config.toml…"
+        placeholder={tx("Edit the global Codex config.toml…")}
         disabled={globalConfigLoading}
         refreshDisabled={globalConfigRefreshDisabled}
         saveDisabled={globalConfigSaveDisabled}
@@ -569,7 +572,7 @@ export function SettingsCodexSection({
         onSave={onSaveGlobalConfig}
         helpText={
           <>
-            Stored at <code>~/.codex/config.toml</code>.
+            {tx("Stored at")} <code>~/.codex/config.toml</code>.
           </>
         }
         classNames={{
diff --git a/src/features/settings/components/sections/SettingsComposerSection.tsx b/src/features/settings/components/sections/SettingsComposerSection.tsx
index 1b5bef63f..55009752c 100644
--- a/src/features/settings/components/sections/SettingsComposerSection.tsx
+++ b/src/features/settings/components/sections/SettingsComposerSection.tsx
@@ -1,4 +1,5 @@
 import type { AppSettings } from "@/types";
+import { useI18n } from "@/i18n";
 import {
   SettingsSection,
   SettingsToggleRow,
@@ -24,15 +25,16 @@ export function SettingsComposerSection({
   onComposerPresetChange,
   onUpdateAppSettings,
 }: SettingsComposerSectionProps) {
+  const { tx } = useI18n();
   const steerUnavailable = !appSettings.steerEnabled;
   return (
     <SettingsSection
-      title="Composer"
-      subtitle="Control helpers and formatting behavior inside the message editor."
+      title={tx("Composer")}
+      subtitle={tx("Control helpers and formatting behavior inside the message editor.")}
     >
       <div className="settings-field">
-        <div className="settings-field-label">Follow-up behavior</div>
-        <div className={`settings-segmented${appSettings.followUpMessageBehavior === "steer" ? " is-second-active" : ""}`} aria-label="Follow-up behavior">
+        <div className="settings-field-label">{tx("Follow-up behavior")}</div>
+        <div className={`settings-segmented${appSettings.followUpMessageBehavior === "steer" ? " is-second-active" : ""}`} aria-label={tx("Follow-up behavior")}>
           <label
             className={`settings-segmented-option${
               appSettings.followUpMessageBehavior === "queue" ? " is-active" : ""
@@ -51,13 +53,13 @@ export function SettingsComposerSection({
                 })
               }
             />
-            <span className="settings-segmented-option-label">Queue</span>
+            <span className="settings-segmented-option-label">{tx("Queue")}</span>
           </label>
           <label
             className={`settings-segmented-option${
               appSettings.followUpMessageBehavior === "steer" ? " is-active" : ""
             }${steerUnavailable ? " is-disabled" : ""}`}
-            title={steerUnavailable ? "Steer is unavailable in the current Codex config." : ""}
+            title={steerUnavailable ? tx("Steer is unavailable in the current Codex config.") : ""}
           >
             <input
               className="settings-segmented-input"
@@ -76,16 +78,17 @@ export function SettingsComposerSection({
                 });
               }}
             />
-            <span className="settings-segmented-option-label">Steer</span>
+            <span className="settings-segmented-option-label">{tx("Steer")}</span>
           </label>
         </div>
         <div className="settings-help">
-          Choose the default while a run is active. Press {followUpShortcutLabel} to send the
-          opposite behavior for one message.
+          {tx("Choose the default while a run is active. Press {shortcut} to send the opposite behavior for one message.", {
+            shortcut: followUpShortcutLabel,
+          })}
         </div>
         <SettingsToggleRow
-          title="Show follow-up hint while processing"
-          subtitle="Displays queue/steer shortcut guidance above the composer."
+          title={tx("Show follow-up hint while processing")}
+          subtitle={tx("Displays queue/steer shortcut guidance above the composer.")}
         >
           <SettingsToggleSwitch
             pressed={appSettings.composerFollowUpHintEnabled}
@@ -99,18 +102,18 @@ export function SettingsComposerSection({
         </SettingsToggleRow>
         {steerUnavailable && (
           <div className="settings-help">
-            Steer is unavailable in the current Codex config. Follow-ups will queue.
+            {tx("Steer is unavailable in the current Codex config. Follow-ups will queue.")}
           </div>
         )}
       </div>
       <div className="settings-divider" />
-      <div className="settings-subsection-title">Presets</div>
+      <div className="settings-subsection-title">{tx("Presets")}</div>
       <div className="settings-subsection-subtitle">
-        Choose a starting point and fine-tune the toggles below.
+        {tx("Choose a starting point and fine-tune the toggles below.")}
       </div>
       <div className="settings-field">
         <label className="settings-field-label" htmlFor="composer-preset">
-          Preset
+          {tx("Preset")}
         </label>
         <select
           id="composer-preset"
@@ -122,19 +125,19 @@ export function SettingsComposerSection({
         >
           {Object.entries(composerPresetLabels).map(([preset, label]) => (
             <option key={preset} value={preset}>
-              {label}
+              {tx(label)}
             </option>
           ))}
         </select>
         <div className="settings-help">
-          Presets update the toggles below. Customize any setting after selecting.
+          {tx("Presets update the toggles below. Customize any setting after selecting.")}
         </div>
       </div>
       <div className="settings-divider" />
-      <div className="settings-subsection-title">Code fences</div>
+      <div className="settings-subsection-title">{tx("Code fences")}</div>
       <SettingsToggleRow
-        title="Expand fences on Space"
-        subtitle="Typing ``` then Space inserts a fenced block."
+        title={tx("Expand fences on Space")}
+        subtitle={tx("Typing ``` then Space inserts a fenced block.")}
       >
         <SettingsToggleSwitch
           pressed={appSettings.composerFenceExpandOnSpace}
@@ -147,8 +150,8 @@ export function SettingsComposerSection({
         />
       </SettingsToggleRow>
       <SettingsToggleRow
-        title="Expand fences on Enter"
-        subtitle="Use Enter to expand ``` lines when enabled."
+        title={tx("Expand fences on Enter")}
+        subtitle={tx("Use Enter to expand ``` lines when enabled.")}
       >
         <SettingsToggleSwitch
           pressed={appSettings.composerFenceExpandOnEnter}
@@ -161,8 +164,8 @@ export function SettingsComposerSection({
         />
       </SettingsToggleRow>
       <SettingsToggleRow
-        title="Support language tags"
-        subtitle="Allows ```lang + Space to include a language."
+        title={tx("Support language tags")}
+        subtitle={tx("Allows ```lang + Space to include a language.")}
       >
         <SettingsToggleSwitch
           pressed={appSettings.composerFenceLanguageTags}
@@ -175,8 +178,8 @@ export function SettingsComposerSection({
         />
       </SettingsToggleRow>
       <SettingsToggleRow
-        title="Wrap selection in fences"
-        subtitle="Wraps selected text when creating a fence."
+        title={tx("Wrap selection in fences")}
+        subtitle={tx("Wraps selected text when creating a fence.")}
       >
         <SettingsToggleSwitch
           pressed={appSettings.composerFenceWrapSelection}
@@ -189,10 +192,12 @@ export function SettingsComposerSection({
         />
       </SettingsToggleRow>
       <SettingsToggleRow
-        title="Copy blocks without fences"
+        title={tx("Copy blocks without fences")}
         subtitle={
           <>
-            When enabled, Copy is plain text. Hold {optionKeyLabel} to include ``` fences.
+            {tx("When enabled, Copy is plain text. Hold {key} to include ``` fences.", {
+              key: optionKeyLabel,
+            })}
           </>
         }
       >
@@ -208,10 +213,10 @@ export function SettingsComposerSection({
         />
       </SettingsToggleRow>
       <div className="settings-divider" />
-      <div className="settings-subsection-title">Pasting</div>
+      <div className="settings-subsection-title">{tx("Pasting")}</div>
       <SettingsToggleRow
-        title="Auto-wrap multi-line paste"
-        subtitle="Wraps multi-line paste inside a fenced block."
+        title={tx("Auto-wrap multi-line paste")}
+        subtitle={tx("Wraps multi-line paste inside a fenced block.")}
       >
         <SettingsToggleSwitch
           pressed={appSettings.composerFenceAutoWrapPasteMultiline}
@@ -225,8 +230,8 @@ export function SettingsComposerSection({
         />
       </SettingsToggleRow>
       <SettingsToggleRow
-        title="Auto-wrap code-like single lines"
-        subtitle="Wraps long single-line code snippets on paste."
+        title={tx("Auto-wrap code-like single lines")}
+        subtitle={tx("Wraps long single-line code snippets on paste.")}
       >
         <SettingsToggleSwitch
           pressed={appSettings.composerFenceAutoWrapPasteCodeLike}
@@ -240,10 +245,10 @@ export function SettingsComposerSection({
         />
       </SettingsToggleRow>
       <div className="settings-divider" />
-      <div className="settings-subsection-title">Lists</div>
+      <div className="settings-subsection-title">{tx("Lists")}</div>
       <SettingsToggleRow
-        title="Continue lists on Shift+Enter"
-        subtitle="Continues numbered and bulleted lists when the line has content."
+        title={tx("Continue lists on Shift+Enter")}
+        subtitle={tx("Continues numbered and bulleted lists when the line has content.")}
       >
         <SettingsToggleSwitch
           pressed={appSettings.composerListContinuation}
diff --git a/src/features/settings/components/sections/SettingsDictationSection.tsx b/src/features/settings/components/sections/SettingsDictationSection.tsx
index 83c37279e..e119bde15 100644
--- a/src/features/settings/components/sections/SettingsDictationSection.tsx
+++ b/src/features/settings/components/sections/SettingsDictationSection.tsx
@@ -1,4 +1,5 @@
 import type { AppSettings, DictationModelStatus } from "@/types";
+import { useI18n } from "@/i18n";
 import {
   SettingsSection,
   SettingsToggleRow,
@@ -40,16 +41,17 @@ export function SettingsDictationSection({
   onCancelDictationDownload,
   onRemoveDictationModel,
 }: SettingsDictationSectionProps) {
+  const { tx } = useI18n();
   const dictationProgress = dictationModelStatus?.progress ?? null;
 
   return (
     <SettingsSection
-      title="Dictation"
-      subtitle="Enable microphone dictation with on-device transcription."
+      title={tx("Dictation")}
+      subtitle={tx("Enable microphone dictation with on-device transcription.")}
     >
       <SettingsToggleRow
-        title="Enable dictation"
-        subtitle="Downloads the selected Whisper model on first use."
+        title={tx("Enable dictation")}
+        subtitle={tx("Downloads the selected Whisper model on first use.")}
       >
         <SettingsToggleSwitch
           pressed={appSettings.dictationEnabled}
@@ -78,7 +80,7 @@ export function SettingsDictationSection({
       </SettingsToggleRow>
       <div className="settings-field">
         <label className="settings-field-label" htmlFor="dictation-model">
-          Dictation model
+          {tx("Dictation model")}
         </label>
         <select
           id="dictation-model"
@@ -98,12 +100,13 @@ export function SettingsDictationSection({
           ))}
         </select>
         <div className="settings-help">
-          {selectedDictationModel.note} Download size: {selectedDictationModel.size}.
+          {tx(selectedDictationModel.note)}{" "}
+          {tx("Download size: {size}.", { size: selectedDictationModel.size })}
         </div>
       </div>
       <div className="settings-field">
         <label className="settings-field-label" htmlFor="dictation-language">
-          Preferred dictation language
+          {tx("Preferred dictation language")}
         </label>
         <select
           id="dictation-language"
@@ -116,33 +119,33 @@ export function SettingsDictationSection({
             })
           }
         >
-          <option value="">Auto-detect only</option>
-          <option value="en">English</option>
-          <option value="es">Spanish</option>
-          <option value="fr">French</option>
-          <option value="de">German</option>
-          <option value="it">Italian</option>
-          <option value="pt">Portuguese</option>
-          <option value="nl">Dutch</option>
-          <option value="sv">Swedish</option>
-          <option value="no">Norwegian</option>
-          <option value="da">Danish</option>
-          <option value="fi">Finnish</option>
-          <option value="pl">Polish</option>
-          <option value="tr">Turkish</option>
-          <option value="ru">Russian</option>
-          <option value="uk">Ukrainian</option>
-          <option value="ja">Japanese</option>
-          <option value="ko">Korean</option>
-          <option value="zh">Chinese</option>
+          <option value="">{tx("Auto-detect only")}</option>
+          <option value="en">{tx("English")}</option>
+          <option value="es">{tx("Spanish")}</option>
+          <option value="fr">{tx("French")}</option>
+          <option value="de">{tx("German")}</option>
+          <option value="it">{tx("Italian")}</option>
+          <option value="pt">{tx("Portuguese")}</option>
+          <option value="nl">{tx("Dutch")}</option>
+          <option value="sv">{tx("Swedish")}</option>
+          <option value="no">{tx("Norwegian")}</option>
+          <option value="da">{tx("Danish")}</option>
+          <option value="fi">{tx("Finnish")}</option>
+          <option value="pl">{tx("Polish")}</option>
+          <option value="tr">{tx("Turkish")}</option>
+          <option value="ru">{tx("Russian")}</option>
+          <option value="uk">{tx("Ukrainian")}</option>
+          <option value="ja">{tx("Japanese")}</option>
+          <option value="ko">{tx("Korean")}</option>
+          <option value="zh">{tx("Chinese")}</option>
         </select>
         <div className="settings-help">
-          Auto-detect stays on; this nudges the decoder toward your preference.
+          {tx("Auto-detect stays on; this nudges the decoder toward your preference.")}
         </div>
       </div>
       <div className="settings-field">
         <label className="settings-field-label" htmlFor="dictation-hold-key">
-          Hold-to-dictate key
+          {tx("Hold-to-dictate key")}
         </label>
         <select
           id="dictation-hold-key"
@@ -155,25 +158,27 @@ export function SettingsDictationSection({
             })
           }
         >
-          <option value="">Off</option>
+          <option value="">{tx("Off")}</option>
           <option value="alt">{optionKeyLabel}</option>
-          <option value="shift">Shift</option>
-          <option value="control">Control</option>
+          <option value="shift">{tx("Shift")}</option>
+          <option value="control">{tx("Control")}</option>
           <option value="meta">{metaKeyLabel}</option>
         </select>
         <div className="settings-help">
-          Hold the key to start dictation, release to stop and process.
+          {tx("Hold the key to start dictation, release to stop and process.")}
         </div>
       </div>
       {dictationModelStatus && (
         <div className="settings-field">
-          <div className="settings-field-label">Model status ({selectedDictationModel.label})</div>
+          <div className="settings-field-label">
+            {tx("Model status ({model})", { model: selectedDictationModel.label })}
+          </div>
           <div className="settings-help">
-            {dictationModelStatus.state === "ready" && "Ready for dictation."}
-            {dictationModelStatus.state === "missing" && "Model not downloaded yet."}
-            {dictationModelStatus.state === "downloading" && "Downloading model..."}
+            {dictationModelStatus.state === "ready" && tx("Ready for dictation.")}
+            {dictationModelStatus.state === "missing" && tx("Model not downloaded yet.")}
+            {dictationModelStatus.state === "downloading" && tx("Downloading model...")}
             {dictationModelStatus.state === "error" &&
-              (dictationModelStatus.error ?? "Download error.")}
+              (dictationModelStatus.error ?? tx("Download error."))}
           </div>
           {dictationProgress && (
             <div className="settings-download-progress">
@@ -203,7 +208,7 @@ export function SettingsDictationSection({
                 onClick={onDownloadDictationModel}
                 disabled={!onDownloadDictationModel}
               >
-                Download model
+                {tx("Download model")}
               </button>
             )}
             {dictationModelStatus.state === "downloading" && (
@@ -213,7 +218,7 @@ export function SettingsDictationSection({
                 onClick={onCancelDictationDownload}
                 disabled={!onCancelDictationDownload}
               >
-                Cancel download
+                {tx("Cancel download")}
               </button>
             )}
             {dictationReady && (
@@ -223,7 +228,7 @@ export function SettingsDictationSection({
                 onClick={onRemoveDictationModel}
                 disabled={!onRemoveDictationModel}
               >
-                Remove model
+                {tx("Remove model")}
               </button>
             )}
           </div>
diff --git a/src/features/settings/components/sections/SettingsDisplaySection.test.tsx b/src/features/settings/components/sections/SettingsDisplaySection.test.tsx
index 2f273d437..a65eae51b 100644
--- a/src/features/settings/components/sections/SettingsDisplaySection.test.tsx
+++ b/src/features/settings/components/sections/SettingsDisplaySection.test.tsx
@@ -8,6 +8,57 @@ describe("SettingsDisplaySection", () => {
   afterEach(() => {
     cleanup();
   });
+  it("persists language preference changes", () => {
+    const onUpdateAppSettings = vi.fn(async () => {});
+
+    render(
+      <SettingsDisplaySection
+        appSettings={
+          ({
+            theme: "system",
+            appLanguage: "system",
+            usageShowRemaining: false,
+            showMessageFilePath: true,
+            threadTitleAutogenerationEnabled: false,
+            uiFontFamily: "",
+            codeFontFamily: "",
+            codeFontSize: 11,
+            notificationSoundsEnabled: true,
+            systemNotificationsEnabled: true,
+          } as unknown) as AppSettings
+        }
+        reduceTransparency={false}
+        scaleShortcutTitle=""
+        scaleShortcutText=""
+        scaleDraft="100%"
+        uiFontDraft=""
+        codeFontDraft=""
+        codeFontSizeDraft={11}
+        onUpdateAppSettings={onUpdateAppSettings}
+        onToggleTransparency={vi.fn()}
+        onSetScaleDraft={vi.fn() as any}
+        onCommitScale={vi.fn(async () => {})}
+        onResetScale={vi.fn(async () => {})}
+        onSetUiFontDraft={vi.fn() as any}
+        onCommitUiFont={vi.fn(async () => {})}
+        onSetCodeFontDraft={vi.fn() as any}
+        onCommitCodeFont={vi.fn(async () => {})}
+        onSetCodeFontSizeDraft={vi.fn() as any}
+        onCommitCodeFontSize={vi.fn(async () => {})}
+        onTestNotificationSound={vi.fn()}
+        onTestSystemNotification={vi.fn()}
+      />,
+    );
+
+    fireEvent.change(screen.getByLabelText("Language"), {
+      target: { value: "zh-CN" },
+    });
+
+    expect(onUpdateAppSettings).toHaveBeenCalledWith(
+      expect.objectContaining({ appLanguage: "zh-CN" }),
+    );
+  });
+
   it("toggles auto-generated thread titles", () => {
     const onUpdateAppSettings = vi.fn(async () => {});
 
diff --git a/src/features/settings/components/sections/SettingsDisplaySection.tsx b/src/features/settings/components/sections/SettingsDisplaySection.tsx
index 0dc2b9583..c4d490a3d 100644
--- a/src/features/settings/components/sections/SettingsDisplaySection.tsx
+++ b/src/features/settings/components/sections/SettingsDisplaySection.tsx
@@ -21,6 +21,7 @@ import {
   SettingsToggleRow,
   SettingsToggleSwitch,
 } from "@/features/design-system/components/settings/SettingsPrimitives";
+import { normalizeLanguagePreference, useI18n } from "@/i18n";
 
 type SettingsDisplaySectionProps = {
   appSettings: AppSettings;
@@ -69,6 +70,8 @@ export function SettingsDisplaySection({
   onTestNotificationSound,
   onTestSystemNotification,
 }: SettingsDisplaySectionProps) {
+  const { t } = useI18n();
+  const languagePreference = normalizeLanguagePreference(appSettings.appLanguage);
   const scrollbackUnlimited = appSettings.chatHistoryScrollbackItems === null;
   const [scrollbackDraft, setScrollbackDraft] = useState(() => {
     const value = appSettings.chatHistoryScrollbackItems;
@@ -160,16 +163,39 @@ export function SettingsDisplaySection({
 
   return (
     <SettingsSection
-      title="Display & Sound"
-      subtitle="Tune visuals and audio alerts to your preferences."
+      title={t("settings.display.title")}
+      subtitle={t("settings.display.subtitle")}
     >
-      <div className="settings-subsection-title">Display</div>
+      <div className="settings-subsection-title">{t("settings.display.display.title")}</div>
       <div className="settings-subsection-subtitle">
-        Adjust how the window renders backgrounds and effects.
+        {t("settings.display.display.subtitle")}
+      </div>
+      <div className="settings-field">
+        <label className="settings-field-label" htmlFor="language-select">
+          {t("settings.display.language.label")}
+        </label>
+        <select
+          id="language-select"
+          className="settings-select"
+          value={languagePreference}
+          onChange={(event) =>
+            void onUpdateAppSettings({
+              ...appSettings,
+              appLanguage: normalizeLanguagePreference(event.target.value),
+            })
+          }
+        >
+          <option value="system">{t("language.system")}</option>
+          <option value="en">{t("language.en")}</option>
+          <option value="zh-CN">{t("language.zh-CN")}</option>
+        </select>
+        <div className="settings-help">
+          {t("settings.display.language.help")}
+        </div>
       </div>
       <div className="settings-field">
         <label className="settings-field-label" htmlFor="theme-select">
-          Theme
+          {t("settings.display.theme.label")}
         </label>
         <select
           id="theme-select"
@@ -182,15 +208,15 @@ export function SettingsDisplaySection({
             })
           }
         >
-          <option value="system">System</option>
-          <option value="light">Light</option>
-          <option value="dark">Dark</option>
-          <option value="dim">Dim</option>
+          <option value="system">{t("settings.display.theme.system")}</option>
+          <option value="light">{t("settings.display.theme.light")}</option>
+          <option value="dark">{t("settings.display.theme.dark")}</option>
+          <option value="dim">{t("settings.display.theme.dim")}</option>
         </select>
       </div>
       <SettingsToggleRow
-        title="Show remaining Codex limits"
-        subtitle="Display what is left instead of what is used."
+        title={t("settings.display.usageRemaining.title")}
+        subtitle={t("settings.display.usageRemaining.subtitle")}
       >
         <SettingsToggleSwitch
           pressed={appSettings.usageShowRemaining}
@@ -203,8 +229,8 @@ export function SettingsDisplaySection({
         />
       </SettingsToggleRow>
       <SettingsToggleRow
-        title="Show file path in messages"
-        subtitle="Display the parent path next to file links in messages."
+        title={t("settings.display.filePath.title")}
+        subtitle={t("settings.display.filePath.subtitle")}
       >
         <SettingsToggleSwitch
           pressed={appSettings.showMessageFilePath}
@@ -217,8 +243,8 @@ export function SettingsDisplaySection({
         />
       </SettingsToggleRow>
       <SettingsToggleRow
-        title="Split chat and diff center panes"
-        subtitle="Show chat and diff side by side instead of swapping between them."
+        title={t("settings.display.splitView.title")}
+        subtitle={t("settings.display.splitView.subtitle")}
       >
         <SettingsToggleSwitch
           pressed={appSettings.splitChatDiffView}
@@ -231,8 +257,8 @@ export function SettingsDisplaySection({
         />
       </SettingsToggleRow>
       <SettingsToggleRow
-        title="Auto-generate new thread titles"
-        subtitle="Generate a short title from your first message (uses extra tokens)."
+        title={t("settings.display.threadTitles.title")}
+        subtitle={t("settings.display.threadTitles.subtitle")}
       >
         <SettingsToggleSwitch
           pressed={appSettings.threadTitleAutogenerationEnabled}
@@ -245,13 +271,13 @@ export function SettingsDisplaySection({
           }
         />
       </SettingsToggleRow>
-      <div className="settings-subsection-title">Chat</div>
+      <div className="settings-subsection-title">{t("settings.display.chat.title")}</div>
       <div className="settings-subsection-subtitle">
-        Control how much conversation history is retained per thread.
+        {t("settings.display.chat.subtitle")}
       </div>
       <SettingsToggleRow
-        title="Unlimited chat history"
-        subtitle="Keep full thread history in memory (may impact performance)."
+        title={t("settings.display.scrollback.unlimited.title")}
+        subtitle={t("settings.display.scrollback.unlimited.subtitle")}
       >
         <SettingsToggleSwitch
           pressed={scrollbackUnlimited}
@@ -261,7 +287,7 @@ export function SettingsDisplaySection({
       </SettingsToggleRow>
       <div className="settings-field">
         <label className="settings-field-label" htmlFor="chat-scrollback-preset">
-          Scrollback preset
+          {t("settings.display.scrollback.preset.label")}
         </label>
         <select
           id="chat-scrollback-preset"
@@ -271,21 +297,22 @@ export function SettingsDisplaySection({
           data-scrollback-control="true"
           disabled={scrollbackUnlimited}
         >
-          <option value="custom">Custom</option>
+          <option value="custom">{t("settings.display.scrollback.custom")}</option>
           {CHAT_SCROLLBACK_PRESETS.map((value) => (
             <option key={value} value={value}>
-              {value === CHAT_SCROLLBACK_DEFAULT ? `${value} (Default)` : value}
+              {value === CHAT_SCROLLBACK_DEFAULT
+                ? `${value} (${t("settings.display.scrollback.defaultSuffix")})`
+                : value}
             </option>
           ))}
         </select>
         <div className="settings-help">
-          Higher values keep more history but may increase memory usage. Use “Sync from
-          server” on a thread to re-fetch older messages.
+          {t("settings.display.scrollback.help")}
         </div>
       </div>
       <div className="settings-field">
         <label className="settings-field-label" htmlFor="chat-scrollback-items">
-          Max items per thread
+          {t("settings.display.scrollback.maxItems.label")}
         </label>
         <div className="settings-field-row">
           <input
@@ -326,17 +353,19 @@ export function SettingsDisplaySection({
               });
             }}
           >
-            Reset
+            {t("common.reset")}
           </button>
         </div>
         <div className="settings-help">
-          Range: {CHAT_SCROLLBACK_MIN}–{CHAT_SCROLLBACK_MAX}. Counts messages, tool calls,
-          and other conversation items.
+          {t("settings.display.scrollback.range", {
+            min: CHAT_SCROLLBACK_MIN,
+            max: CHAT_SCROLLBACK_MAX,
+          })}
         </div>
       </div>
       <SettingsToggleRow
-        title="Reduce transparency"
-        subtitle="Use solid surfaces instead of glass."
+        title={t("settings.display.transparency.title")}
+        subtitle={t("settings.display.transparency.subtitle")}
       >
         <SettingsToggleSwitch
           pressed={reduceTransparency}
@@ -345,7 +374,7 @@ export function SettingsDisplaySection({
       </SettingsToggleRow>
       <div className="settings-toggle-row settings-scale-row">
         <div>
-          <div className="settings-toggle-title">Interface scale</div>
+          <div className="settings-toggle-title">{t("settings.display.scale.title")}</div>
           <div className="settings-toggle-subtitle" title={scaleShortcutTitle}>
             {scaleShortcutText}
           </div>
@@ -357,7 +386,7 @@ export function SettingsDisplaySection({
             inputMode="decimal"
             className="settings-input settings-input--scale"
             value={scaleDraft}
-            aria-label="Interface scale"
+            aria-label={t("settings.display.scale.aria")}
             onChange={(event) => onSetScaleDraft(event.target.value)}
             onBlur={() => {
               void onCommitScale();
@@ -376,13 +405,13 @@ export function SettingsDisplaySection({
               void onResetScale();
             }}
           >
-            Reset
+            {t("common.reset")}
           </button>
         </div>
       </div>
       <div className="settings-field">
         <label className="settings-field-label" htmlFor="ui-font-family">
-          UI font family
+          {t("settings.display.uiFont.label")}
         </label>
         <div className="settings-field-row">
           <input
@@ -412,16 +441,16 @@ export function SettingsDisplaySection({
               });
             }}
           >
-            Reset
+            {t("common.reset")}
           </button>
         </div>
         <div className="settings-help">
-          Applies to all UI text. Leave empty to use the default system font stack.
+          {t("settings.display.uiFont.help")}
         </div>
       </div>
       <div className="settings-field">
         <label className="settings-field-label" htmlFor="code-font-family">
-          Code font family
+          {t("settings.display.codeFont.label")}
         </label>
         <div className="settings-field-row">
           <input
@@ -451,14 +480,14 @@ export function SettingsDisplaySection({
               });
             }}
           >
-            Reset
+            {t("common.reset")}
           </button>
         </div>
-        <div className="settings-help">Applies to git diffs and other mono-spaced readouts.</div>
+        <div className="settings-help">{t("settings.display.codeFont.help")}</div>
       </div>
       <div className="settings-field">
         <label className="settings-field-label" htmlFor="code-font-size">
-          Code font size
+          {t("settings.display.codeSize.label")}
         </label>
         <div className="settings-field-row">
           <input
@@ -484,16 +513,18 @@ export function SettingsDisplaySection({
               void onCommitCodeFontSize(CODE_FONT_SIZE_DEFAULT);
             }}
           >
-            Reset
+            {t("common.reset")}
           </button>
         </div>
-        <div className="settings-help">Adjusts code and diff text size.</div>
+        <div className="settings-help">{t("settings.display.codeSize.help")}</div>
+      </div>
+      <div className="settings-subsection-title">{t("settings.display.sounds.title")}</div>
+      <div className="settings-subsection-subtitle">
+        {t("settings.display.sounds.subtitle")}
       </div>
-      <div className="settings-subsection-title">Sounds</div>
-      <div className="settings-subsection-subtitle">Control notification audio alerts.</div>
       <SettingsToggleRow
-        title="Notification sounds"
-        subtitle="Play a sound when a long-running agent finishes while the window is unfocused."
+        title={t("settings.display.notificationSounds.title")}
+        subtitle={t("settings.display.notificationSounds.subtitle")}
       >
         <SettingsToggleSwitch
           pressed={appSettings.notificationSoundsEnabled}
@@ -506,8 +537,8 @@ export function SettingsDisplaySection({
         />
       </SettingsToggleRow>
       <SettingsToggleRow
-        title="System notifications"
-        subtitle="Show a system notification when a long-running agent finishes while the window is unfocused."
+        title={t("settings.display.systemNotifications.title")}
+        subtitle={t("settings.display.systemNotifications.subtitle")}
       >
         <SettingsToggleSwitch
           pressed={appSettings.systemNotificationsEnabled}
@@ -520,8 +551,8 @@ export function SettingsDisplaySection({
         />
       </SettingsToggleRow>
       <SettingsToggleRow
-        title="Sub-agent notifications"
-        subtitle="Include spawned sub-agent threads in system notifications."
+        title={t("settings.display.subagentNotifications.title")}
+        subtitle={t("settings.display.subagentNotifications.subtitle")}
       >
         <SettingsToggleSwitch
           pressed={appSettings.subagentSystemNotificationsEnabled}
@@ -540,14 +571,14 @@ export function SettingsDisplaySection({
           className="ghost settings-button-compact"
           onClick={onTestNotificationSound}
         >
-          Test sound
+          {t("settings.display.testSound")}
         </button>
         <button
           type="button"
           className="ghost settings-button-compact"
           onClick={onTestSystemNotification}
         >
-          Test notification
+          {t("settings.display.testNotification")}
         </button>
       </div>
     </SettingsSection>
diff --git a/src/features/settings/components/sections/SettingsEnvironmentsSection.tsx b/src/features/settings/components/sections/SettingsEnvironmentsSection.tsx
index bff9f01f4..d27667fc2 100644
--- a/src/features/settings/components/sections/SettingsEnvironmentsSection.tsx
+++ b/src/features/settings/components/sections/SettingsEnvironmentsSection.tsx
@@ -1,4 +1,5 @@
 import type { Dispatch, SetStateAction } from "react";
+import { useI18n } from "@/i18n";
 import { SettingsSection } from "@/features/design-system/components/settings/SettingsPrimitives";
 import type { WorkspaceInfo } from "@/types";
 import { pushErrorToast } from "@services/toasts";
@@ -44,22 +45,22 @@ export function SettingsEnvironmentsSection({
   onSetWorktreesFolderDraft,
   onSaveEnvironmentSetup,
 }: SettingsEnvironmentsSectionProps) {
+  const { tx } = useI18n();
   const hasAnyChanges =
     environmentDirty || globalWorktreesFolderDirty || worktreesFolderDirty;
   const hasProjects = mainWorkspaces.length > 0;
 
   return (
     <SettingsSection
-      title="Environments"
-      subtitle="Configure per-project setup scripts and worktree locations."
+      title={tx("Environments")}
+      subtitle={tx("Configure per-project setup scripts and worktree locations.")}
     >
       <div className="settings-field">
         <label className="settings-field-label" htmlFor="settings-global-worktrees-folder">
-          Global worktrees root
+          {tx("Global worktrees root")}
         </label>
         <div className="settings-help">
-          Default location for new worktrees when a project does not override it. Each
-          project gets its own subfolder under this root.
+          {tx("Default location for new worktrees when a project does not override it. Each project gets its own subfolder under this root.")}
         </div>
         <div className="settings-field-row">
           <input
@@ -80,21 +81,21 @@ export function SettingsEnvironmentsSection({
                 const selected = await open({
                   directory: true,
                   multiple: false,
-                  title: "Select global worktrees root",
+                  title: tx("Select global worktrees root"),
                 });
                 if (selected && typeof selected === "string") {
                   onSetGlobalWorktreesFolderDraft(selected);
                 }
               } catch (error) {
                 pushErrorToast({
-                  title: "Failed to open folder picker",
+                  title: tx("Failed to open folder picker"),
                   message: error instanceof Error ? error.message : String(error),
                 });
               }
             }}
             disabled={environmentSaving}
           >
-            Browse
+            {tx("Browse")}
           </button>
         </div>
         {!hasProjects ? (
@@ -105,7 +106,7 @@ export function SettingsEnvironmentsSection({
               onClick={() => onSetGlobalWorktreesFolderDraft(_globalWorktreesFolderSaved ?? "")}
               disabled={environmentSaving || !globalWorktreesFolderDirty}
             >
-              Reset
+              {tx("Reset")}
             </button>
             <button
               type="button"
@@ -115,7 +116,7 @@ export function SettingsEnvironmentsSection({
               }}
               disabled={environmentSaving || !globalWorktreesFolderDirty}
             >
-              {environmentSaving ? "Saving..." : "Save"}
+              {environmentSaving ? tx("Saving...") : tx("Save")}
             </button>
           </div>
         ) : null}
@@ -125,12 +126,12 @@ export function SettingsEnvironmentsSection({
       </div>
 
       {!hasProjects ? (
-        <div className="settings-empty">No projects yet.</div>
+        <div className="settings-empty">{tx("No projects yet.")}</div>
       ) : (
         <>
           <div className="settings-field">
             <label className="settings-field-label" htmlFor="settings-environment-project">
-              Project
+              {tx("Project")}
             </label>
             <select
               id="settings-environment-project"
@@ -151,9 +152,9 @@ export function SettingsEnvironmentsSection({
           </div>
 
           <div className="settings-field">
-            <div className="settings-field-label">Setup script</div>
+            <div className="settings-field-label">{tx("Setup script")}</div>
             <div className="settings-help">
-              Runs once in a dedicated terminal after each new worktree is created.
+              {tx("Runs once in a dedicated terminal after each new worktree is created.")}
             </div>
             {environmentError ? (
               <div className="settings-agents-error">{environmentError}</div>
@@ -174,24 +175,22 @@ export function SettingsEnvironmentsSection({
                   const clipboard = typeof navigator === "undefined" ? null : navigator.clipboard;
                   if (!clipboard?.writeText) {
                     pushErrorToast({
-                      title: "Copy failed",
-                      message:
-                        "Clipboard access is unavailable in this environment. Copy the script manually instead.",
+                      title: tx("Copy failed"),
+                      message: tx("Clipboard access is unavailable in this environment. Copy the script manually instead."),
                     });
                     return;
                   }
 
                   void clipboard.writeText(environmentDraftScript).catch(() => {
                     pushErrorToast({
-                      title: "Copy failed",
-                      message:
-                        "Could not write to the clipboard. Copy the script manually instead.",
+                      title: tx("Copy failed"),
+                      message: tx("Could not write to the clipboard. Copy the script manually instead."),
                     });
                   });
                 }}
                 disabled={environmentSaving || environmentDraftScript.length === 0}
               >
-                Copy
+                {tx("Copy")}
               </button>
               <button
                 type="button"
@@ -199,7 +198,7 @@ export function SettingsEnvironmentsSection({
                 onClick={() => onSetEnvironmentDraftScript(environmentSavedScript ?? "")}
                 disabled={environmentSaving || !environmentDirty}
               >
-                Reset
+                {tx("Reset")}
               </button>
               <button
                 type="button"
@@ -209,18 +208,17 @@ export function SettingsEnvironmentsSection({
                 }}
                 disabled={environmentSaving || !hasAnyChanges}
               >
-                {environmentSaving ? "Saving..." : "Save"}
+                {environmentSaving ? tx("Saving...") : tx("Save")}
               </button>
             </div>
           </div>
 
           <div className="settings-field">
             <label className="settings-field-label" htmlFor="settings-worktrees-folder">
-              Worktrees folder
+              {tx("Worktrees folder")}
             </label>
             <div className="settings-help">
-              Custom location for this project's worktrees. Leave empty to use the global root or
-              the built-in default.
+              {tx("Custom location for this project's worktrees. Leave empty to use the global root or the built-in default.")}
             </div>
             <div className="settings-field-row">
               <input
@@ -241,21 +239,21 @@ export function SettingsEnvironmentsSection({
                     const selected = await open({
                       directory: true,
                       multiple: false,
-                      title: "Select worktrees folder",
+                      title: tx("Select worktrees folder"),
                     });
                     if (selected && typeof selected === "string") {
                       onSetWorktreesFolderDraft(selected);
                     }
                   } catch (error) {
                     pushErrorToast({
-                      title: "Failed to open folder picker",
+                      title: tx("Failed to open folder picker"),
                       message: error instanceof Error ? error.message : String(error),
                     });
                   }
                 }}
                 disabled={environmentSaving}
               >
-                Browse
+                {tx("Browse")}
               </button>
             </div>
           </div>
diff --git a/src/features/settings/components/sections/SettingsFeaturesSection.tsx b/src/features/settings/components/sections/SettingsFeaturesSection.tsx
index 9362ef311..926ad6a10 100644
--- a/src/features/settings/components/sections/SettingsFeaturesSection.tsx
+++ b/src/features/settings/components/sections/SettingsFeaturesSection.tsx
@@ -1,4 +1,5 @@
 import type { CodexFeature } from "@/types";
+import { useI18n } from "@/i18n";
 import {
   SettingsSection,
   SettingsSubsection,
@@ -93,14 +94,15 @@ export function SettingsFeaturesSection({
   onToggleCodexFeature,
   onUpdateAppSettings,
 }: SettingsFeaturesSectionProps) {
+  const { tx } = useI18n();
   return (
     <SettingsSection
-      title="Features"
-      subtitle="Manage stable and experimental Codex features."
+      title={tx("Features")}
+      subtitle={tx("Manage stable and experimental Codex features.")}
     >
       <SettingsToggleRow
-        title="Config file"
-        subtitle={`Open the Codex config in ${fileManagerName()}.`}
+        title={tx("Config file")}
+        subtitle={tx("Open the Codex config in {app}.", { app: fileManagerName() })}
       >
         <button type="button" className="ghost" onClick={onOpenConfig}>
           {openInFileManagerLabel()}
@@ -108,15 +110,15 @@ export function SettingsFeaturesSection({
       </SettingsToggleRow>
       {openConfigError && <div className="settings-help">{openConfigError}</div>}
       <SettingsSubsection
-        title="Stable Features"
-        subtitle="Production-ready features enabled by default."
+        title={tx("Stable Features")}
+        subtitle={tx("Production-ready features enabled by default.")}
       />
       <SettingsToggleRow
-        title="Personality"
+        title={tx("Personality")}
         subtitle={
           <>
-            Choose Codex communication style (writes top-level <code>personality</code> in
-            config.toml).
+            {tx("Choose Codex communication style (writes top-level")}{" "}
+            <code>personality</code> {tx("in config.toml).")}
           </>
         }
       >
@@ -130,15 +132,15 @@ export function SettingsFeaturesSection({
               personality: event.target.value as (typeof appSettings)["personality"],
             })
           }
-          aria-label="Personality"
+          aria-label={tx("Personality")}
         >
-          <option value="friendly">Friendly</option>
-          <option value="pragmatic">Pragmatic</option>
+          <option value="friendly">{tx("Friendly")}</option>
+          <option value="pragmatic">{tx("Pragmatic")}</option>
         </select>
       </SettingsToggleRow>
       <SettingsToggleRow
-        title="Pause queued messages when a response is required"
-        subtitle="Keep queued messages paused while Codex is waiting for plan accept/changes or your answers."
+        title={tx("Pause queued messages when a response is required")}
+        subtitle={tx("Keep queued messages paused while Codex is waiting for plan accept/changes or your answers.")}
       >
         <SettingsToggleSwitch
           pressed={appSettings.pauseQueuedMessagesWhenResponseRequired}
@@ -155,7 +157,7 @@ export function SettingsFeaturesSection({
         <SettingsToggleRow
           key={feature.name}
           title={formatFeatureLabel(feature)}
-          subtitle={featureSubtitle(feature)}
+          subtitle={tx(featureSubtitle(feature))}
         >
           <SettingsToggleSwitch
             pressed={feature.enabled}
@@ -168,17 +170,17 @@ export function SettingsFeaturesSection({
         !featuresLoading &&
         !featureError &&
         stableFeatures.length === 0 && (
-        <div className="settings-help">No stable feature flags returned by Codex.</div>
+        <div className="settings-help">{tx("No stable feature flags returned by Codex.")}</div>
       )}
       <SettingsSubsection
-        title="Experimental Features"
-        subtitle="Preview and under-development features."
+        title={tx("Experimental Features")}
+        subtitle={tx("Preview and under-development features.")}
       />
       {experimentalFeatures.map((feature) => (
         <SettingsToggleRow
           key={feature.name}
           title={formatFeatureLabel(feature)}
-          subtitle={featureSubtitle(feature)}
+          subtitle={tx(featureSubtitle(feature))}
         >
           <SettingsToggleSwitch
             pressed={feature.enabled}
@@ -193,15 +195,15 @@ export function SettingsFeaturesSection({
         hasDynamicFeatureRows &&
         experimentalFeatures.length === 0 && (
           <div className="settings-help">
-            No preview or under-development feature flags returned by Codex.
+            {tx("No preview or under-development feature flags returned by Codex.")}
           </div>
         )}
       {featuresLoading && (
-        <div className="settings-help">Loading Codex feature flags...</div>
+        <div className="settings-help">{tx("Loading Codex feature flags...")}</div>
       )}
       {!hasFeatureWorkspace && !featuresLoading && (
         <div className="settings-help">
-          Connect a workspace to load Codex feature flags.
+          {tx("Connect a workspace to load Codex feature flags.")}
         </div>
       )}
       {featureError && <div className="settings-help">{featureError}</div>}
diff --git a/src/features/settings/components/sections/SettingsGitSection.tsx b/src/features/settings/components/sections/SettingsGitSection.tsx
index a99887221..69ab6d168 100644
--- a/src/features/settings/components/sections/SettingsGitSection.tsx
+++ b/src/features/settings/components/sections/SettingsGitSection.tsx
@@ -1,4 +1,5 @@
 import type { AppSettings, ModelOption } from "@/types";
+import { useI18n } from "@/i18n";
 import {
   SettingsSection,
   SettingsToggleRow,
@@ -28,14 +29,15 @@ export function SettingsGitSection({
   onSaveCommitMessagePrompt,
   onResetCommitMessagePrompt,
 }: SettingsGitSectionProps) {
+  const { tx } = useI18n();
   return (
     <SettingsSection
-      title="Git"
-      subtitle="Manage how diffs are loaded in the Git sidebar."
+      title={tx("Git")}
+      subtitle={tx("Manage how diffs are loaded in the Git sidebar.")}
     >
       <SettingsToggleRow
-        title="Preload git diffs"
-        subtitle="Make viewing git diff faster."
+        title={tx("Preload git diffs")}
+        subtitle={tx("Make viewing git diff faster.")}
       >
         <SettingsToggleSwitch
           pressed={appSettings.preloadGitDiffs}
@@ -48,8 +50,8 @@ export function SettingsGitSection({
         />
       </SettingsToggleRow>
       <SettingsToggleRow
-        title="Ignore whitespace changes"
-        subtitle="Hides whitespace-only changes in local and commit diffs."
+        title={tx("Ignore whitespace changes")}
+        subtitle={tx("Hides whitespace-only changes in local and commit diffs.")}
       >
         <SettingsToggleSwitch
           pressed={appSettings.gitDiffIgnoreWhitespaceChanges}
@@ -62,10 +64,10 @@ export function SettingsGitSection({
         />
       </SettingsToggleRow>
       <div className="settings-field">
-        <div className="settings-field-label">Commit message prompt</div>
+        <div className="settings-field-label">{tx("Commit message prompt")}</div>
         <div className="settings-help">
-          Used when generating commit messages. Include <code>{"{diff}"}</code> to insert the
-          git diff.
+          {tx("Used when generating commit messages. Include")}{" "}
+          <code>{"{diff}"}</code> {tx("to insert the git diff.")}
         </div>
         <textarea
           className="settings-agents-textarea"
@@ -83,7 +85,7 @@ export function SettingsGitSection({
             }}
             disabled={commitMessagePromptSaving || !commitMessagePromptDirty}
           >
-            Reset
+            {tx("Reset")}
           </button>
           <button
             type="button"
@@ -93,18 +95,17 @@ export function SettingsGitSection({
             }}
             disabled={commitMessagePromptSaving || !commitMessagePromptDirty}
           >
-            {commitMessagePromptSaving ? "Saving..." : "Save"}
+            {commitMessagePromptSaving ? tx("Saving...") : tx("Save")}
           </button>
         </div>
       </div>
       {models.length > 0 && (
         <div className="settings-field">
           <label className="settings-field-label" htmlFor="commit-message-model-select">
-            Commit message model
+            {tx("Commit message model")}
           </label>
           <div className="settings-help">
-            The model used when generating commit messages. Leave on default to use the
-            workspace model.
+            {tx("The model used when generating commit messages. Leave on default to use the workspace model.")}
           </div>
           <select
             id="commit-message-model-select"
@@ -118,7 +119,7 @@ export function SettingsGitSection({
               });
             }}
           >
-            <option value="">Default</option>
+            <option value="">{tx("Default")}</option>
             {models.map((model) => (
               <option key={model.id} value={model.model}>
                 {model.displayName?.trim() || model.model}
diff --git a/src/features/settings/components/sections/SettingsOpenAppsSection.tsx b/src/features/settings/components/sections/SettingsOpenAppsSection.tsx
index c3c37ffc6..2d8120b88 100644
--- a/src/features/settings/components/sections/SettingsOpenAppsSection.tsx
+++ b/src/features/settings/components/sections/SettingsOpenAppsSection.tsx
@@ -1,6 +1,7 @@
 import ChevronDown from "lucide-react/dist/esm/icons/chevron-down";
 import ChevronUp from "lucide-react/dist/esm/icons/chevron-up";
 import Trash2 from "lucide-react/dist/esm/icons/trash-2";
+import { useI18n } from "@/i18n";
 import { SettingsSection } from "@/features/design-system/components/settings/SettingsPrimitives";
 import type { OpenAppTarget } from "@/types";
 import {
@@ -40,10 +41,11 @@ export function SettingsOpenAppsSection({
   onAddOpenApp,
   onSelectOpenAppDefault,
 }: SettingsOpenAppsSectionProps) {
+  const { tx } = useI18n();
   return (
     <SettingsSection
-      title="Open in"
-      subtitle="Customize the Open in menu shown in the title bar and file previews."
+      title={tx("Open in")}
+      subtitle={tx("Customize the Open in menu shown in the title bar and file previews.")}
     >
       <div className="settings-open-apps">
         {openAppDrafts.map((target, index) => {
@@ -55,12 +57,12 @@ export function SettingsOpenAppsSection({
             target.kind !== "command" || Boolean(target.command?.trim());
           const isComplete = labelValid && appNameValid && commandValid;
           const incompleteHint = !labelValid
-            ? "Label required"
+            ? tx("Label required")
             : target.kind === "app"
-              ? "App name required"
+              ? tx("App name required")
               : target.kind === "command"
-                ? "Command required"
-                : "Complete required fields";
+                ? tx("Command required")
+                : tx("Complete required fields");
 
           return (
             <div
@@ -78,86 +80,86 @@ export function SettingsOpenAppsSection({
               </div>
               <div className="settings-open-app-fields">
                 <label className="settings-open-app-field settings-open-app-field--label">
-                  <span className="settings-visually-hidden">Label</span>
+                  <span className="settings-visually-hidden">{tx("Label")}</span>
                   <input
                     className="settings-input settings-input--compact settings-open-app-input settings-open-app-input--label"
                     value={target.label}
-                    placeholder="Label"
+                    placeholder={tx("Label")}
                     onChange={(event) =>
                       onOpenAppDraftChange(index, {
                         label: event.target.value,
                       })
                     }
                     onBlur={onCommitOpenApps}
-                    aria-label={`Open app label ${index + 1}`}
+                    aria-label={tx("Open app label {index}", { index: index + 1 })}
                     data-invalid={!labelValid || undefined}
                   />
                 </label>
                 <label className="settings-open-app-field settings-open-app-field--type">
-                  <span className="settings-visually-hidden">Type</span>
+                  <span className="settings-visually-hidden">{tx("Type")}</span>
                   <select
                     className="settings-select settings-select--compact settings-open-app-kind"
                     value={target.kind}
                     onChange={(event) =>
                       onOpenAppKindChange(index, event.target.value as OpenAppTarget["kind"])
                     }
-                    aria-label={`Open app type ${index + 1}`}
+                    aria-label={tx("Open app type {index}", { index: index + 1 })}
                   >
-                    <option value="app">App</option>
-                    <option value="command">Command</option>
+                    <option value="app">{tx("App")}</option>
+                    <option value="command">{tx("Command")}</option>
                     <option value="finder">{fileManagerName()}</option>
                   </select>
                 </label>
                 {target.kind === "app" && (
                   <label className="settings-open-app-field settings-open-app-field--appname">
-                    <span className="settings-visually-hidden">App name</span>
+                    <span className="settings-visually-hidden">{tx("App name")}</span>
                     <input
                       className="settings-input settings-input--compact settings-open-app-input settings-open-app-input--appname"
                       value={target.appName ?? ""}
-                      placeholder="App name"
+                      placeholder={tx("App name")}
                       onChange={(event) =>
                         onOpenAppDraftChange(index, {
                           appName: event.target.value,
                         })
                       }
                       onBlur={onCommitOpenApps}
-                      aria-label={`Open app name ${index + 1}`}
+                      aria-label={tx("Open app name {index}", { index: index + 1 })}
                       data-invalid={!appNameValid || undefined}
                     />
                   </label>
                 )}
                 {target.kind === "command" && (
                   <label className="settings-open-app-field settings-open-app-field--command">
-                    <span className="settings-visually-hidden">Command</span>
+                    <span className="settings-visually-hidden">{tx("Command")}</span>
                     <input
                       className="settings-input settings-input--compact settings-open-app-input settings-open-app-input--command"
                       value={target.command ?? ""}
-                      placeholder="Command"
+                      placeholder={tx("Command")}
                       onChange={(event) =>
                         onOpenAppDraftChange(index, {
                           command: event.target.value,
                         })
                       }
                       onBlur={onCommitOpenApps}
-                      aria-label={`Open app command ${index + 1}`}
+                      aria-label={tx("Open app command {index}", { index: index + 1 })}
                       data-invalid={!commandValid || undefined}
                     />
                   </label>
                 )}
                 {target.kind !== "finder" && (
                   <label className="settings-open-app-field settings-open-app-field--args">
-                    <span className="settings-visually-hidden">Args</span>
+                    <span className="settings-visually-hidden">{tx("Args")}</span>
                     <input
                       className="settings-input settings-input--compact settings-open-app-input settings-open-app-input--args"
                       value={target.argsText}
-                      placeholder="Args"
+                      placeholder={tx("Args")}
                       onChange={(event) =>
                         onOpenAppDraftChange(index, {
                           argsText: event.target.value,
                         })
                       }
                       onBlur={onCommitOpenApps}
-                      aria-label={`Open app args ${index + 1}`}
+                      aria-label={tx("Open app args {index}", { index: index + 1 })}
                     />
                   </label>
                 )}
@@ -169,7 +171,7 @@ export function SettingsOpenAppsSection({
                     title={incompleteHint}
                     aria-label={incompleteHint}
                   >
-                    Incomplete
+                    {tx("Incomplete")}
                   </span>
                 )}
                 <label className="settings-open-app-default">
@@ -180,7 +182,7 @@ export function SettingsOpenAppsSection({
                     onChange={() => onSelectOpenAppDefault(target.id)}
                     disabled={!isComplete}
                   />
-                  Default
+                  {tx("Default")}
                 </label>
                 <div className="settings-open-app-order">
                   <button
@@ -188,7 +190,7 @@ export function SettingsOpenAppsSection({
                     className="ghost icon-button"
                     onClick={() => onMoveOpenApp(index, "up")}
                     disabled={index === 0}
-                    aria-label="Move up"
+                    aria-label={tx("Move up")}
                   >
                     <ChevronUp aria-hidden />
                   </button>
@@ -197,7 +199,7 @@ export function SettingsOpenAppsSection({
                     className="ghost icon-button"
                     onClick={() => onMoveOpenApp(index, "down")}
                     disabled={index === openAppDrafts.length - 1}
-                    aria-label="Move down"
+                    aria-label={tx("Move down")}
                   >
                     <ChevronDown aria-hidden />
                   </button>
@@ -207,8 +209,8 @@ export function SettingsOpenAppsSection({
                   className="ghost icon-button"
                   onClick={() => onDeleteOpenApp(index)}
                   disabled={openAppDrafts.length <= 1}
-                  aria-label="Remove app"
-                  title="Remove app"
+                  aria-label={tx("Remove app")}
+                  title={tx("Remove app")}
                 >
                   <Trash2 aria-hidden />
                 </button>
@@ -219,13 +221,13 @@ export function SettingsOpenAppsSection({
       </div>
       <div className="settings-open-app-footer">
         <button type="button" className="ghost" onClick={onAddOpenApp}>
-          Add app
+          {tx("Add app")}
         </button>
         <div className="settings-help">
-          Commands receive the selected path as the final argument.{" "}
+          {tx("Commands receive the selected path as the final argument.")}{" "}
           {isMacPlatform()
-            ? "Apps open via `open -a` with optional args."
-            : "Apps run as an executable with optional args."}
+            ? tx("Apps open via `open -a` with optional args.")
+            : tx("Apps run as an executable with optional args.")}
         </div>
       </div>
     </SettingsSection>
diff --git a/src/features/settings/components/sections/SettingsProjectsSection.tsx b/src/features/settings/components/sections/SettingsProjectsSection.tsx
index e95cc8cd2..8fea4355f 100644
--- a/src/features/settings/components/sections/SettingsProjectsSection.tsx
+++ b/src/features/settings/components/sections/SettingsProjectsSection.tsx
@@ -2,6 +2,7 @@ import ChevronDown from "lucide-react/dist/esm/icons/chevron-down";
 import ChevronUp from "lucide-react/dist/esm/icons/chevron-up";
 import Trash2 from "lucide-react/dist/esm/icons/trash-2";
 import type { Dispatch, SetStateAction } from "react";
+import { useI18n } from "@/i18n";
 import {
   SettingsSection,
   SettingsSubsection,
@@ -57,21 +58,22 @@ export function SettingsProjectsSection({
   onMoveWorkspace,
   onDeleteWorkspace,
 }: SettingsProjectsSectionProps) {
+  const { tx } = useI18n();
   return (
     <SettingsSection
-      title="Projects"
-      subtitle="Group related workspaces and reorder projects within each group."
+      title={tx("Projects")}
+      subtitle={tx("Group related workspaces and reorder projects within each group.")}
     >
       <SettingsSubsection
-        title="Groups"
-        subtitle="Create group labels for related repositories."
+        title={tx("Groups")}
+        subtitle={tx("Create group labels for related repositories.")}
       />
       <div className="settings-groups">
         <div className="settings-group-create">
           <input
             className="settings-input settings-input--compact"
             value={newGroupName}
-            placeholder="New group name"
+            placeholder={tx("New group name")}
             onChange={(event) => onSetNewGroupName(event.target.value)}
             onKeyDown={(event) => {
               if (event.key === "Enter" && canCreateGroup) {
@@ -88,7 +90,7 @@ export function SettingsProjectsSection({
             }}
             disabled={!canCreateGroup}
           >
-            Add group
+            {tx("Add group")}
           </button>
         </div>
         {groupError && <div className="settings-group-error">{groupError}</div>}
@@ -117,13 +119,13 @@ export function SettingsProjectsSection({
                     }}
                   />
                   <div className="settings-group-copies">
-                    <div className="settings-group-copies-label">Copies folder</div>
+                    <div className="settings-group-copies-label">{tx("Copies folder")}</div>
                     <div className="settings-group-copies-row">
                       <div
                         className={`settings-group-copies-path${group.copiesFolder ? "" : " empty"}`}
                         title={group.copiesFolder ?? ""}
                       >
-                        {group.copiesFolder ?? "Not set"}
+                        {group.copiesFolder ?? tx("Not set")}
                       </div>
                       <button
                         type="button"
@@ -132,7 +134,7 @@ export function SettingsProjectsSection({
                           void onChooseGroupCopiesFolder(group);
                         }}
                       >
-                        Choose…
+                        {tx("Choose…")}
                       </button>
                       <button
                         type="button"
@@ -142,7 +144,7 @@ export function SettingsProjectsSection({
                         }}
                         disabled={!group.copiesFolder}
                       >
-                        Clear
+                        {tx("Clear")}
                       </button>
                     </div>
                   </div>
@@ -155,7 +157,7 @@ export function SettingsProjectsSection({
                       void onMoveWorkspaceGroup(group.id, "up");
                     }}
                     disabled={index === 0}
-                    aria-label="Move group up"
+                    aria-label={tx("Move group up")}
                   >
                     <ChevronUp aria-hidden />
                   </button>
@@ -166,7 +168,7 @@ export function SettingsProjectsSection({
                       void onMoveWorkspaceGroup(group.id, "down");
                     }}
                     disabled={index === workspaceGroups.length - 1}
-                    aria-label="Move group down"
+                    aria-label={tx("Move group down")}
                   >
                     <ChevronDown aria-hidden />
                   </button>
@@ -176,7 +178,7 @@ export function SettingsProjectsSection({
                     onClick={() => {
                       void onDeleteGroup(group);
                     }}
-                    aria-label="Delete group"
+                    aria-label={tx("Delete group")}
                   >
                     <Trash2 aria-hidden />
                   </button>
@@ -185,12 +187,12 @@ export function SettingsProjectsSection({
             ))}
           </div>
         ) : (
-          <div className="settings-empty">No groups yet.</div>
+          <div className="settings-empty">{tx("No groups yet.")}</div>
         )}
       </div>
       <SettingsSubsection
-        title="Projects"
-        subtitle="Assign projects to groups and adjust their order."
+        title={tx("Projects")}
+        subtitle={tx("Assign projects to groups and adjust their order.")}
       />
       <div className="settings-projects">
         {groupedWorkspaces.map((group) => (
@@ -217,7 +219,7 @@ export function SettingsProjectsSection({
                         void onAssignWorkspaceGroup(workspace.id, nextGroupId);
                       }}
                     >
-                      <option value="">{ungroupedLabel}</option>
+                      <option value="">{tx(ungroupedLabel)}</option>
                       {workspaceGroups.map((entry) => (
                         <option key={entry.id} value={entry.id}>
                           {entry.name}
@@ -229,7 +231,7 @@ export function SettingsProjectsSection({
                       className="ghost icon-button"
                       onClick={() => onMoveWorkspace(workspace.id, "up")}
                       disabled={index === 0}
-                      aria-label="Move project up"
+                      aria-label={tx("Move project up")}
                     >
                       <ChevronUp aria-hidden />
                     </button>
@@ -238,7 +240,7 @@ export function SettingsProjectsSection({
                       className="ghost icon-button"
                       onClick={() => onMoveWorkspace(workspace.id, "down")}
                       disabled={index === group.workspaces.length - 1}
-                      aria-label="Move project down"
+                      aria-label={tx("Move project down")}
                     >
                       <ChevronDown aria-hidden />
                     </button>
@@ -246,7 +248,7 @@ export function SettingsProjectsSection({
                       type="button"
                       className="ghost icon-button"
                       onClick={() => onDeleteWorkspace(workspace.id)}
-                      aria-label="Delete project"
+                      aria-label={tx("Delete project")}
                     >
                       <Trash2 aria-hidden />
                     </button>
@@ -256,7 +258,7 @@ export function SettingsProjectsSection({
             })}
           </div>
         ))}
-        {projects.length === 0 && <div className="settings-empty">No projects yet.</div>}
+        {projects.length === 0 && <div className="settings-empty">{tx("No projects yet.")}</div>}
       </div>
     </SettingsSection>
   );
diff --git a/src/features/settings/components/sections/SettingsServerSection.tsx b/src/features/settings/components/sections/SettingsServerSection.tsx
index 7a1139d6b..e93c28336 100644
--- a/src/features/settings/components/sections/SettingsServerSection.tsx
+++ b/src/features/settings/components/sections/SettingsServerSection.tsx
@@ -1,6 +1,7 @@
 import { useMemo, useState } from "react";
 import type { Dispatch, SetStateAction } from "react";
 import X from "lucide-react/dist/esm/icons/x";
+import { useI18n } from "@/i18n";
 import type {
   AppSettings,
   TailscaleDaemonCommandPreview,
@@ -107,6 +108,7 @@ export function SettingsServerSection({
   onTcpDaemonStatus,
   onMobileConnectTest,
 }: SettingsServerSectionProps) {
+  const { tx } = useI18n();
   const [pendingDeleteRemoteId, setPendingDeleteRemoteId] = useState<string | null>(
     null,
   );
@@ -130,13 +132,20 @@ export function SettingsServerSection({
     }
     if (tcpDaemonStatus.state === "running") {
       return tcpDaemonStatus.pid
-        ? `Mobile daemon is running (pid ${tcpDaemonStatus.pid}) on ${tcpDaemonStatus.listenAddr ?? "configured listen address"}.`
-        : `Mobile daemon is running on ${tcpDaemonStatus.listenAddr ?? "configured listen address"}.`;
+        ? tx("Mobile daemon is running (pid {pid}) on {address}.", {
+            pid: tcpDaemonStatus.pid,
+            address: tcpDaemonStatus.listenAddr ?? tx("configured listen address"),
+          })
+        : tx("Mobile daemon is running on {address}.", {
+            address: tcpDaemonStatus.listenAddr ?? tx("configured listen address"),
+          });
     }
     if (tcpDaemonStatus.state === "error") {
-      return tcpDaemonStatus.lastError ?? "Mobile daemon is in an error state.";
+      return tcpDaemonStatus.lastError ?? tx("Mobile daemon is in an error state.");
     }
-    return `Mobile daemon is stopped${tcpDaemonStatus.listenAddr ? ` (${tcpDaemonStatus.listenAddr})` : ""}.`;
+    return tcpDaemonStatus.listenAddr
+      ? tx("Mobile daemon is stopped ({address}).", { address: tcpDaemonStatus.listenAddr })
+      : tx("Mobile daemon is stopped.");
   })();
 
   const openAddRemoteModal = () => {
@@ -170,7 +179,7 @@ export function SettingsServerSection({
         });
         setAddRemoteOpen(false);
       } catch (error) {
-        setAddRemoteError(error instanceof Error ? error.message : "Unable to add remote.");
+        setAddRemoteError(error instanceof Error ? error.message : tx("Unable to add remote."));
       } finally {
         setAddRemoteBusy(false);
       }
@@ -179,18 +188,18 @@ export function SettingsServerSection({
 
   return (
     <SettingsSection
-      title="Server"
+      title={tx("Server")}
       subtitle={
         isMobileSimplified
-          ? "Configure TCP host/token from your desktop setup, then run a connection test."
-          : "Configure how CodexMonitor exposes TCP backend access for mobile and remote clients. Desktop usage remains local unless you explicitly connect through remote mode."
+          ? tx("Configure TCP host/token from your desktop setup, then run a connection test.")
+          : tx("Configure how CodexMonitor exposes TCP backend access for mobile and remote clients. Desktop usage remains local unless you explicitly connect through remote mode.")
       }
     >
 
       {!isMobileSimplified && (
         <div className="settings-field">
           <label className="settings-field-label" htmlFor="backend-mode">
-            Backend mode
+            {tx("Backend mode")}
           </label>
           <select
             id="backend-mode"
@@ -203,12 +212,11 @@ export function SettingsServerSection({
               })
             }
           >
-            <option value="local">Local (default)</option>
-            <option value="remote">Remote (daemon)</option>
+            <option value="local">{tx("Local (default)")}</option>
+            <option value="remote">{tx("Remote (daemon)")}</option>
           </select>
           <div className="settings-help">
-            Local keeps desktop requests in-process. Remote routes desktop requests through the same
-            TCP transport path used by mobile clients.
+            {tx("Local keeps desktop requests in-process. Remote routes desktop requests through the same TCP transport path used by mobile clients.")}
           </div>
         </div>
       )}
@@ -217,8 +225,8 @@ export function SettingsServerSection({
         {isMobileSimplified && (
           <>
             <div className="settings-field">
-              <div className="settings-field-label">Saved remotes</div>
-              <div className="settings-mobile-remotes" role="list" aria-label="Saved remotes">
+              <div className="settings-field-label">{tx("Saved remotes")}</div>
+              <div className="settings-mobile-remotes" role="list" aria-label={tx("Saved remotes")}>
                 {remoteBackends.map((entry, index) => {
                   const isActive = entry.id === activeRemoteBackendId;
                   return (
@@ -230,14 +238,14 @@ export function SettingsServerSection({
                       <div className="settings-mobile-remote-main">
                         <div className="settings-mobile-remote-name-row">
                           <div className="settings-mobile-remote-name">{entry.name}</div>
-                          {isActive && <span className="settings-mobile-remote-badge">Active</span>}
+                          {isActive && <span className="settings-mobile-remote-badge">{tx("Active")}</span>}
                         </div>
                         <div className="settings-mobile-remote-meta">TCP · {entry.host}</div>
                         <div className="settings-mobile-remote-last">
-                          Last connected:{" "}
+                          {tx("Last connected:")}{" "}
                           {typeof entry.lastConnectedAtMs === "number"
                             ? new Date(entry.lastConnectedAtMs).toLocaleString()
-                            : "Never"}
+                            : tx("Never")}
                         </div>
                       </div>
                       <div className="settings-mobile-remote-actions">
@@ -248,9 +256,9 @@ export function SettingsServerSection({
                             void onSelectRemoteBackend(entry.id);
                           }}
                           disabled={isActive}
-                          aria-label={`Use ${entry.name} remote`}
+                          aria-label={tx("Use {name} remote", { name: entry.name })}
                         >
-                          {isActive ? "Using" : "Use"}
+                          {isActive ? tx("Using") : tx("Use")}
                         </button>
                         <button
                           type="button"
@@ -259,7 +267,7 @@ export function SettingsServerSection({
                             void onMoveRemoteBackend(entry.id, "up");
                           }}
                           disabled={index === 0}
-                          aria-label={`Move ${entry.name} up`}
+                          aria-label={tx("Move {name} up", { name: entry.name })}
                         >
                           ↑
                         </button>
@@ -270,7 +278,7 @@ export function SettingsServerSection({
                             void onMoveRemoteBackend(entry.id, "down");
                           }}
                           disabled={index === remoteBackends.length - 1}
-                          aria-label={`Move ${entry.name} down`}
+                          aria-label={tx("Move {name} down", { name: entry.name })}
                         >
                           ↓
                         </button>
@@ -280,9 +288,9 @@ export function SettingsServerSection({
                           onClick={() => {
                             setPendingDeleteRemoteId(entry.id);
                           }}
-                          aria-label={`Delete ${entry.name}`}
+                          aria-label={tx("Delete {name}", { name: entry.name })}
                         >
-                          Delete
+                          {tx("Delete")}
                         </button>
                       </div>
                     </div>
@@ -295,7 +303,7 @@ export function SettingsServerSection({
                   className="button settings-button-compact"
                   onClick={openAddRemoteModal}
                 >
-                  Add remote
+                  {tx("Add remote")}
                 </button>
               </div>
               {remoteStatusText && (
@@ -304,13 +312,13 @@ export function SettingsServerSection({
                 </div>
               )}
               <div className="settings-help">
-                Switch the active remote here. The fields below edit the active entry.
+                {tx("Switch the active remote here. The fields below edit the active entry.")}
               </div>
             </div>
 
             <div className="settings-field">
               <label className="settings-field-label" htmlFor="mobile-remote-name">
-                Remote name
+                {tx("Remote name")}
               </label>
               <input
                 id="mobile-remote-name"
@@ -335,8 +343,8 @@ export function SettingsServerSection({
 
         {!isMobileSimplified && (
           <SettingsToggleRow
-            title="Keep daemon running after app closes"
-            subtitle="If disabled, CodexMonitor stops managed TCP daemon processes before exit."
+            title={tx("Keep daemon running after app closes")}
+            subtitle={tx("If disabled, CodexMonitor stops managed TCP daemon processes before exit.")}
           >
             <SettingsToggleSwitch
               pressed={appSettings.keepDaemonRunningAfterAppClose}
@@ -351,7 +359,7 @@ export function SettingsServerSection({
         )}
 
         <div className="settings-field">
-          <div className="settings-field-label">Remote backend</div>
+          <div className="settings-field-label">{tx("Remote backend")}</div>
           <div className="settings-field-row">
             <input
               className="settings-input settings-input--compact"
@@ -367,13 +375,13 @@ export function SettingsServerSection({
                   void onCommitRemoteHost();
                 }
               }}
-              aria-label="Remote backend host"
+              aria-label={tx("Remote backend host")}
             />
             <input
               type="password"
               className="settings-input settings-input--compact"
               value={remoteTokenDraft}
-              placeholder="Token (required)"
+              placeholder={tx("Token (required)")}
               onChange={(event) => onSetRemoteTokenDraft(event.target.value)}
               onBlur={() => {
                 void onCommitRemoteToken();
@@ -384,20 +392,20 @@ export function SettingsServerSection({
                   void onCommitRemoteToken();
                 }
               }}
-              aria-label="Remote backend token"
+              aria-label={tx("Remote backend token")}
             />
           </div>
           {remoteHostError && <div className="settings-help settings-help-error">{remoteHostError}</div>}
           <div className="settings-help">
             {isMobileSimplified
-              ? "Use the Tailscale host from your desktop CodexMonitor app (Server section), for example `macbook.your-tailnet.ts.net:4732`."
-              : "This host/token is used by mobile clients and desktop remote-mode testing."}
+              ? tx("Use the Tailscale host from your desktop CodexMonitor app (Server section), for example `macbook.your-tailnet.ts.net:4732`.")
+              : tx("This host/token is used by mobile clients and desktop remote-mode testing.")}
           </div>
         </div>
 
         {isMobileSimplified && (
           <div className="settings-field">
-            <div className="settings-field-label">Connection test</div>
+            <div className="settings-field-label">{tx("Connection test")}</div>
             <div className="settings-field-row">
               <button
                 type="button"
@@ -405,7 +413,7 @@ export function SettingsServerSection({
                 onClick={onMobileConnectTest}
                 disabled={mobileConnectBusy}
               >
-                {mobileConnectBusy ? "Connecting..." : "Connect & test"}
+                {mobileConnectBusy ? tx("Connecting...") : tx("Connect & test")}
               </button>
             </div>
             {mobileConnectStatusText && (
@@ -414,15 +422,14 @@ export function SettingsServerSection({
               </div>
             )}
             <div className="settings-help">
-              Make sure your desktop app daemon is running and reachable on Tailscale, then retry
-              this test.
+              {tx("Make sure your desktop app daemon is running and reachable on Tailscale, then retry this test.")}
             </div>
           </div>
         )}
 
         {!isMobileSimplified && (
           <div className="settings-field">
-            <div className="settings-field-label">Mobile access daemon</div>
+            <div className="settings-field-label">{tx("Mobile access daemon")}</div>
             <div className="settings-field-row">
               <button
                 type="button"
@@ -432,7 +439,7 @@ export function SettingsServerSection({
                 }}
                 disabled={tcpDaemonBusyAction !== null}
               >
-                {tcpDaemonBusyAction === "start" ? "Starting..." : "Start daemon"}
+                {tcpDaemonBusyAction === "start" ? tx("Starting...") : tx("Start daemon")}
               </button>
               <button
                 type="button"
@@ -442,7 +449,7 @@ export function SettingsServerSection({
                 }}
                 disabled={tcpDaemonBusyAction !== null}
               >
-                {tcpDaemonBusyAction === "stop" ? "Stopping..." : "Stop daemon"}
+                {tcpDaemonBusyAction === "stop" ? tx("Stopping...") : tx("Stop daemon")}
               </button>
               <button
                 type="button"
@@ -452,25 +459,26 @@ export function SettingsServerSection({
                 }}
                 disabled={tcpDaemonBusyAction !== null}
               >
-                {tcpDaemonBusyAction === "status" ? "Refreshing..." : "Refresh status"}
+                {tcpDaemonBusyAction === "status" ? tx("Refreshing...") : tx("Refresh status")}
               </button>
             </div>
             {tcpRunnerStatusText && <div className="settings-help">{tcpRunnerStatusText}</div>}
             {tcpDaemonStatus?.startedAtMs && (
               <div className="settings-help">
-                Started at: {new Date(tcpDaemonStatus.startedAtMs).toLocaleString()}
+                {tx("Started at:")} {new Date(tcpDaemonStatus.startedAtMs).toLocaleString()}
               </div>
             )}
             <div className="settings-help">
-              Start this daemon before connecting from iOS. It uses your current token and listens
-              on <code>0.0.0.0:&lt;port&gt;</code>, matching your configured host port.
+              {tx("Start this daemon before connecting from iOS. It uses your current token and listens on")}{" "}
+              <code>0.0.0.0:&lt;port&gt;</code>,{" "}
+              {tx("matching your configured host port.")}
             </div>
           </div>
         )}
 
         {!isMobileSimplified && (
           <div className="settings-field">
-            <div className="settings-field-label">Tailscale helper</div>
+            <div className="settings-field-label">{tx("Tailscale helper")}</div>
             <div className="settings-field-row">
               <button
                 type="button"
@@ -478,7 +486,7 @@ export function SettingsServerSection({
                 onClick={onRefreshTailscaleStatus}
                 disabled={tailscaleStatusBusy}
               >
-                {tailscaleStatusBusy ? "Checking..." : "Detect Tailscale"}
+                {tailscaleStatusBusy ? tx("Checking...") : tx("Detect Tailscale")}
               </button>
               <button
                 type="button"
@@ -486,7 +494,7 @@ export function SettingsServerSection({
                 onClick={onRefreshTailscaleCommandPreview}
                 disabled={tailscaleCommandBusy}
               >
-                {tailscaleCommandBusy ? "Refreshing..." : "Refresh daemon command"}
+                {tailscaleCommandBusy ? tx("Refreshing...") : tx("Refresh daemon command")}
               </button>
               <button
                 type="button"
@@ -496,7 +504,7 @@ export function SettingsServerSection({
                   void onUseSuggestedTailscaleHost();
                 }}
               >
-                Use suggested host
+                {tx("Use suggested host")}
               </button>
             </div>
             {tailscaleStatusError && (
@@ -507,17 +515,17 @@ export function SettingsServerSection({
                 <div className="settings-help">{tailscaleStatus.message}</div>
                 <div className="settings-help">
                   {tailscaleStatus.installed
-                    ? `Version: ${tailscaleStatus.version ?? "unknown"}`
-                    : "Install Tailscale on both desktop and iOS to continue."}
+                    ? tx("Version: {version}", { version: tailscaleStatus.version ?? tx("unknown") })
+                    : tx("Install Tailscale on both desktop and iOS to continue.")}
                 </div>
                 {tailscaleStatus.suggestedRemoteHost && (
                   <div className="settings-help">
-                    Suggested remote host: <code>{tailscaleStatus.suggestedRemoteHost}</code>
+                    {tx("Suggested remote host:")} <code>{tailscaleStatus.suggestedRemoteHost}</code>
                   </div>
                 )}
                 {tailscaleStatus.tailnetName && (
                   <div className="settings-help">
-                    Tailnet: <code>{tailscaleStatus.tailnetName}</code>
+                    {tx("Tailnet:")} <code>{tailscaleStatus.tailnetName}</code>
                   </div>
                 )}
               </>
@@ -528,14 +536,14 @@ export function SettingsServerSection({
             {tailscaleCommandPreview && (
               <>
                 <div className="settings-help">
-                  Command template (manual fallback) for starting the daemon:
+                  {tx("Command template (manual fallback) for starting the daemon:")}
                 </div>
                 <pre className="settings-command-preview">
                   <code>{tailscaleCommandPreview.command}</code>
                 </pre>
                 {!tailscaleCommandPreview.tokenConfigured && (
                   <div className="settings-help settings-help-error">
-                    Remote backend token is empty. Set one before exposing daemon access.
+                    {tx("Remote backend token is empty. Set one before exposing daemon access.")}
                   </div>
                 )}
               </>
@@ -546,23 +554,23 @@ export function SettingsServerSection({
 
       <div className="settings-help">
         {isMobileSimplified
-          ? "Use your own infrastructure only. On iOS, get the Tailscale hostname and token from your desktop CodexMonitor setup."
-          : "Mobile access should stay scoped to your own infrastructure (tailnet). CodexMonitor does not provide hosted backend services."}
+          ? tx("Use your own infrastructure only. On iOS, get the Tailscale hostname and token from your desktop CodexMonitor setup.")
+          : tx("Mobile access should stay scoped to your own infrastructure (tailnet). CodexMonitor does not provide hosted backend services.")}
       </div>
       {addRemoteOpen && (
         <ModalShell
           className="settings-add-remote-overlay"
           cardClassName="settings-add-remote-card"
           onBackdropClick={closeAddRemoteModal}
-          ariaLabel="Add remote"
+          ariaLabel={tx("Add remote")}
         >
           <div className="settings-add-remote-header">
-            <div className="settings-add-remote-title">Add remote</div>
+            <div className="settings-add-remote-title">{tx("Add remote")}</div>
             <button
               type="button"
               className="ghost icon-button settings-add-remote-close"
               onClick={closeAddRemoteModal}
-              aria-label="Close add remote modal"
+              aria-label={tx("Close add remote modal")}
               disabled={addRemoteBusy}
             >
               <X aria-hidden />
@@ -570,7 +578,7 @@ export function SettingsServerSection({
           </div>
           <div className="settings-field">
             <label className="settings-field-label" htmlFor="settings-add-remote-name">
-              New remote name
+              {tx("New remote name")}
             </label>
             <input
               id="settings-add-remote-name"
@@ -582,7 +590,7 @@ export function SettingsServerSection({
           </div>
           <div className="settings-field">
             <label className="settings-field-label" htmlFor="settings-add-remote-host">
-              New remote host
+              {tx("New remote host")}
             </label>
             <input
               id="settings-add-remote-host"
@@ -595,14 +603,14 @@ export function SettingsServerSection({
           </div>
           <div className="settings-field">
             <label className="settings-field-label" htmlFor="settings-add-remote-token">
-              New remote token
+              {tx("New remote token")}
             </label>
             <input
               id="settings-add-remote-token"
               type="password"
               className="settings-input settings-input--compact"
               value={addRemoteTokenDraft}
-              placeholder="Token"
+              placeholder={tx("Token")}
               onChange={(event) => setAddRemoteTokenDraft(event.target.value)}
               onKeyDown={(event) => {
                 if (event.key === "Enter") {
@@ -616,7 +624,7 @@ export function SettingsServerSection({
           {addRemoteError && <div className="settings-help settings-help-error">{addRemoteError}</div>}
           <div className="settings-add-remote-actions">
             <button type="button" className="ghost" onClick={closeAddRemoteModal} disabled={addRemoteBusy}>
-              Cancel
+              {tx("Cancel")}
             </button>
             <button
               type="button"
@@ -624,7 +632,7 @@ export function SettingsServerSection({
               onClick={handleAddRemoteConfirm}
               disabled={addRemoteBusy}
             >
-              {addRemoteBusy ? "Connecting..." : "Connect & add"}
+              {addRemoteBusy ? tx("Connecting...") : tx("Connect & add")}
             </button>
           </div>
         </ModalShell>
@@ -634,12 +642,12 @@ export function SettingsServerSection({
           className="settings-delete-remote-overlay"
           cardClassName="settings-delete-remote-card"
           onBackdropClick={() => setPendingDeleteRemoteId(null)}
-          ariaLabel="Delete remote confirmation"
+          ariaLabel={tx("Delete remote confirmation")}
         >
-          <div className="settings-delete-remote-title">Delete remote?</div>
+          <div className="settings-delete-remote-title">{tx("Delete remote?")}</div>
           <div className="settings-delete-remote-message">
-            Remove <strong>{pendingDeleteRemote.name}</strong> from saved remotes? This only
-            removes the profile from this device.
+            {tx("Remove")} <strong>{pendingDeleteRemote.name}</strong>{" "}
+            {tx("from saved remotes? This only removes the profile from this device.")}
           </div>
           <div className="settings-delete-remote-actions">
             <button
@@ -647,7 +655,7 @@ export function SettingsServerSection({
               className="ghost"
               onClick={() => setPendingDeleteRemoteId(null)}
             >
-              Cancel
+              {tx("Cancel")}
             </button>
             <button
               type="button"
@@ -657,7 +665,7 @@ export function SettingsServerSection({
                 setPendingDeleteRemoteId(null);
               }}
             >
-              Delete remote
+              {tx("Delete remote")}
             </button>
           </div>
         </ModalShell>
diff --git a/src/features/settings/components/sections/SettingsShortcutsSection.tsx b/src/features/settings/components/sections/SettingsShortcutsSection.tsx
index 8c8f815cf..039d79817 100644
--- a/src/features/settings/components/sections/SettingsShortcutsSection.tsx
+++ b/src/features/settings/components/sections/SettingsShortcutsSection.tsx
@@ -1,4 +1,5 @@
 import { useMemo, useState, type KeyboardEvent } from "react";
+import { useI18n } from "@/i18n";
 import {
   SettingsSection,
   SettingsSubsection,
@@ -47,15 +48,16 @@ function ShortcutField({
   ) => void;
   onClearShortcut: (key: ShortcutSettingKey) => void;
 }) {
+  const { tx } = useI18n();
   return (
     <div className="settings-field">
-      <div className="settings-field-label">{item.label}</div>
+      <div className="settings-field-label">{tx(item.label)}</div>
       <div className="settings-field-row">
         <input
           className="settings-input settings-input--shortcut"
           value={formatShortcut(shortcutDrafts[item.draftKey])}
           onKeyDown={(event) => onShortcutKeyDown(event, item.settingKey)}
-          placeholder="Type shortcut"
+          placeholder={tx("Type shortcut")}
           readOnly
         />
         <button
@@ -63,10 +65,10 @@ function ShortcutField({
           className="ghost settings-button-compact"
           onClick={() => onClearShortcut(item.settingKey)}
         >
-          Clear
+          {tx("Clear")}
         </button>
       </div>
-      <div className="settings-help">{item.help}</div>
+      <div className="settings-help">{tx(item.help)}</div>
     </div>
   );
 }
@@ -76,6 +78,7 @@ export function SettingsShortcutsSection({
   onShortcutKeyDown,
   onClearShortcut,
 }: SettingsShortcutsSectionProps) {
+  const { tx } = useI18n();
   const isMac = isMacPlatform();
   const [searchQuery, setSearchQuery] = useState("");
 
@@ -89,25 +92,25 @@ export function SettingsShortcutsSection({
             label: "New Agent",
             draftKey: "newAgent",
             settingKey: "newAgentShortcut",
-            help: `Default: ${formatShortcut("cmd+n")}`,
+            help: tx("Default: {shortcut}", { shortcut: formatShortcut("cmd+n") }),
           },
           {
             label: "New Worktree Agent",
             draftKey: "newWorktreeAgent",
             settingKey: "newWorktreeAgentShortcut",
-            help: `Default: ${formatShortcut("cmd+shift+n")}`,
+            help: tx("Default: {shortcut}", { shortcut: formatShortcut("cmd+shift+n") }),
           },
           {
             label: "New Clone Agent",
             draftKey: "newCloneAgent",
             settingKey: "newCloneAgentShortcut",
-            help: `Default: ${formatShortcut("cmd+alt+n")}`,
+            help: tx("Default: {shortcut}", { shortcut: formatShortcut("cmd+alt+n") }),
           },
           {
             label: "Archive active thread",
             draftKey: "archiveThread",
             settingKey: "archiveThreadShortcut",
-            help: `Default: ${formatShortcut(isMac ? "cmd+ctrl+a" : "ctrl+alt+a")}`,
+            help: tx("Default: {shortcut}", { shortcut: formatShortcut(isMac ? "cmd+ctrl+a" : "ctrl+alt+a") }),
           },
         ],
       },
@@ -119,31 +122,31 @@ export function SettingsShortcutsSection({
             label: "Cycle model",
             draftKey: "model",
             settingKey: "composerModelShortcut",
-            help: `Press a new shortcut while focused. Default: ${formatShortcut("cmd+shift+m")}`,
+            help: tx("Press a new shortcut while focused. Default: {shortcut}", { shortcut: formatShortcut("cmd+shift+m") }),
           },
           {
             label: "Cycle access mode",
             draftKey: "access",
             settingKey: "composerAccessShortcut",
-            help: `Default: ${formatShortcut("cmd+shift+a")}`,
+            help: tx("Default: {shortcut}", { shortcut: formatShortcut("cmd+shift+a") }),
           },
           {
             label: "Cycle reasoning mode",
             draftKey: "reasoning",
             settingKey: "composerReasoningShortcut",
-            help: `Default: ${formatShortcut("cmd+shift+r")}`,
+            help: tx("Default: {shortcut}", { shortcut: formatShortcut("cmd+shift+r") }),
           },
           {
             label: "Cycle collaboration mode",
             draftKey: "collaboration",
             settingKey: "composerCollaborationShortcut",
-            help: `Default: ${formatShortcut("shift+tab")}`,
+            help: tx("Default: {shortcut}", { shortcut: formatShortcut("shift+tab") }),
           },
           {
             label: "Stop active run",
             draftKey: "interrupt",
             settingKey: "interruptShortcut",
-            help: `Default: ${formatShortcut(getDefaultInterruptShortcut())}`,
+            help: tx("Default: {shortcut}", { shortcut: formatShortcut(getDefaultInterruptShortcut()) }),
           },
         ],
       },
@@ -155,31 +158,31 @@ export function SettingsShortcutsSection({
             label: "Toggle projects sidebar",
             draftKey: "projectsSidebar",
             settingKey: "toggleProjectsSidebarShortcut",
-            help: `Default: ${formatShortcut("cmd+shift+p")}`,
+            help: tx("Default: {shortcut}", { shortcut: formatShortcut("cmd+shift+p") }),
           },
           {
             label: "Toggle git sidebar",
             draftKey: "gitSidebar",
             settingKey: "toggleGitSidebarShortcut",
-            help: `Default: ${formatShortcut("cmd+shift+g")}`,
+            help: tx("Default: {shortcut}", { shortcut: formatShortcut("cmd+shift+g") }),
           },
           {
             label: "Branch switcher",
             draftKey: "branchSwitcher",
             settingKey: "branchSwitcherShortcut",
-            help: `Default: ${formatShortcut("cmd+b")}`,
+            help: tx("Default: {shortcut}", { shortcut: formatShortcut("cmd+b") }),
           },
           {
             label: "Toggle debug panel",
             draftKey: "debugPanel",
             settingKey: "toggleDebugPanelShortcut",
-            help: `Default: ${formatShortcut("cmd+shift+d")}`,
+            help: tx("Default: {shortcut}", { shortcut: formatShortcut("cmd+shift+d") }),
           },
           {
             label: "Toggle terminal panel",
             draftKey: "terminal",
             settingKey: "toggleTerminalShortcut",
-            help: `Default: ${formatShortcut("cmd+shift+t")}`,
+            help: tx("Default: {shortcut}", { shortcut: formatShortcut("cmd+shift+t") }),
           },
         ],
       },
@@ -191,30 +194,30 @@ export function SettingsShortcutsSection({
             label: "Next agent",
             draftKey: "cycleAgentNext",
             settingKey: "cycleAgentNextShortcut",
-            help: `Default: ${formatShortcut(isMac ? "cmd+ctrl+down" : "ctrl+alt+down")}`,
+            help: tx("Default: {shortcut}", { shortcut: formatShortcut(isMac ? "cmd+ctrl+down" : "ctrl+alt+down") }),
           },
           {
             label: "Previous agent",
             draftKey: "cycleAgentPrev",
             settingKey: "cycleAgentPrevShortcut",
-            help: `Default: ${formatShortcut(isMac ? "cmd+ctrl+up" : "ctrl+alt+up")}`,
+            help: tx("Default: {shortcut}", { shortcut: formatShortcut(isMac ? "cmd+ctrl+up" : "ctrl+alt+up") }),
           },
           {
             label: "Next workspace",
             draftKey: "cycleWorkspaceNext",
             settingKey: "cycleWorkspaceNextShortcut",
-            help: `Default: ${formatShortcut(isMac ? "cmd+shift+down" : "ctrl+alt+shift+down")}`,
+            help: tx("Default: {shortcut}", { shortcut: formatShortcut(isMac ? "cmd+shift+down" : "ctrl+alt+shift+down") }),
           },
           {
             label: "Previous workspace",
             draftKey: "cycleWorkspacePrev",
             settingKey: "cycleWorkspacePrevShortcut",
-            help: `Default: ${formatShortcut(isMac ? "cmd+shift+up" : "ctrl+alt+shift+up")}`,
+            help: tx("Default: {shortcut}", { shortcut: formatShortcut(isMac ? "cmd+shift+up" : "ctrl+alt+shift+up") }),
           },
         ],
       },
     ],
-    [isMac],
+    [isMac, tx],
   );
 
   const normalizedSearchQuery = searchQuery.trim().toLowerCase();
@@ -235,18 +238,18 @@ export function SettingsShortcutsSection({
 
   return (
     <SettingsSection
-      title="Shortcuts"
-      subtitle="Customize keyboard shortcuts for file actions, composer, panels, and navigation."
+      title={tx("Shortcuts")}
+      subtitle={tx("Customize keyboard shortcuts for file actions, composer, panels, and navigation.")}
     >
       <div className="settings-field settings-shortcuts-search">
         <label className="settings-field-label" htmlFor="settings-shortcuts-search">
-          Search shortcuts
+          {tx("Search shortcuts")}
         </label>
         <div className="settings-field-row">
           <input
             id="settings-shortcuts-search"
             className="settings-input"
-            placeholder="Search shortcuts"
+            placeholder={tx("Search shortcuts")}
             value={searchQuery}
             onChange={(event) => setSearchQuery(event.target.value)}
           />
@@ -256,16 +259,16 @@ export function SettingsShortcutsSection({
               className="ghost settings-button-compact"
               onClick={() => setSearchQuery("")}
             >
-              Clear
+              {tx("Clear")}
             </button>
           )}
         </div>
-        <div className="settings-help">Filter by section name, action, or default shortcut.</div>
+        <div className="settings-help">{tx("Filter by section name, action, or default shortcut.")}</div>
       </div>
       {filteredGroups.map((group, index) => (
         <div key={group.title}>
           {index > 0 && <div className="settings-divider" />}
-          <SettingsSubsection title={group.title} subtitle={group.subtitle} />
+          <SettingsSubsection title={tx(group.title)} subtitle={tx(group.subtitle)} />
           {group.items.map((item) => (
             <ShortcutField
               key={item.settingKey}
@@ -279,7 +282,9 @@ export function SettingsShortcutsSection({
       ))}
       {filteredGroups.length === 0 && (
         <div className="settings-empty">
-          No shortcuts match {normalizedSearchQuery ? `"${searchQuery.trim()}"` : "your search"}.
+          {normalizedSearchQuery
+            ? tx("No shortcuts match \"{query}\".", { query: searchQuery.trim() })
+            : tx("No shortcuts match your search.")}
         </div>
       )}
     </SettingsSection>
diff --git a/src/features/settings/components/settingsViewConstants.ts b/src/features/settings/components/settingsViewConstants.ts
index 1219a4f92..9f9e6f5b7 100644
--- a/src/features/settings/components/settingsViewConstants.ts
+++ b/src/features/settings/components/settingsViewConstants.ts
@@ -1,4 +1,5 @@
 import type { AppSettings } from "@/types";
+import type { TranslationKey } from "@/i18n";
 import type { CodexSection, ShortcutDraftKey, ShortcutSettingKey } from "./settingsTypes";
 
 export const DICTATION_MODELS = [
@@ -89,6 +90,22 @@ export const SETTINGS_SECTION_LABELS: Record<CodexSection, string> = {
   features: "Features",
 };
 
+export const SETTINGS_SECTION_LABEL_KEYS: Record<CodexSection, TranslationKey> = {
+  projects: "settings.nav.projects",
+  environments: "settings.nav.environments",
+  display: "settings.nav.display",
+  about: "settings.nav.about",
+  composer: "settings.nav.composer",
+  dictation: "settings.nav.dictation",
+  shortcuts: "settings.nav.shortcuts",
+  "open-apps": "settings.nav.open-apps",
+  git: "settings.nav.git",
+  server: "settings.nav.server",
+  agents: "settings.nav.agents",
+  codex: "settings.nav.codex",
+  features: "settings.nav.features",
+};
+
 export const SHORTCUT_DRAFT_KEY_BY_SETTING: Record<
   ShortcutSettingKey,
   ShortcutDraftKey
diff --git a/src/features/settings/hooks/useAppSettings.ts b/src/features/settings/hooks/useAppSettings.ts
index 331bca4c0..8a457919b 100644
--- a/src/features/settings/hooks/useAppSettings.ts
+++ b/src/features/settings/hooks/useAppSettings.ts
@@ -21,6 +21,7 @@ import { isMobilePlatform } from "@utils/platformPaths";
 import { DEFAULT_COMMIT_MESSAGE_PROMPT } from "@utils/commitMessagePrompt";
 
 const allowedThemes = new Set(["system", "light", "dark", "dim"]);
+const allowedAppLanguages = new Set(["system", "en", "zh-CN"]);
 const allowedPersonality = new Set(["friendly", "pragmatic"]);
 const allowedFollowUpMessageBehavior = new Set(["queue", "steer"]);
 const DEFAULT_REMOTE_BACKEND_HOST = "127.0.0.1:4732";
@@ -167,6 +168,7 @@ function buildDefaultSettings(): AppSettings {
     lastComposerReasoningEffort: null,
     uiScale: UI_SCALE_DEFAULT,
     theme: "system",
+    appLanguage: "system",
     usageShowRemaining: false,
     showMessageFilePath: true,
     chatHistoryScrollbackItems: CHAT_SCROLLBACK_DEFAULT,
@@ -247,6 +249,9 @@ function normalizeAppSettings(settings: AppSettings): AppSettings {
     codexArgs: settings.codexArgs?.trim() ? settings.codexArgs.trim() : null,
     uiScale: clampUiScale(settings.uiScale),
     theme: allowedThemes.has(settings.theme) ? settings.theme : "system",
+    appLanguage: allowedAppLanguages.has(settings.appLanguage)
+      ? settings.appLanguage
+      : "system",
     uiFontFamily: normalizeFontFamily(
       settings.uiFontFamily,
       DEFAULT_UI_FONT_FAMILY,
diff --git a/src/features/shared/components/FileEditorCard.tsx b/src/features/shared/components/FileEditorCard.tsx
index 01ba16784..0c07e177a 100644
--- a/src/features/shared/components/FileEditorCard.tsx
+++ b/src/features/shared/components/FileEditorCard.tsx
@@ -1,4 +1,5 @@
 import type { ReactNode } from "react";
+import { useI18n } from "@/i18n";
 import RefreshCw from "lucide-react/dist/esm/icons/refresh-cw";
 import Save from "lucide-react/dist/esm/icons/save";
 
@@ -47,6 +48,9 @@ export function FileEditorCard({
   onSave,
   classNames,
 }: FileEditorCardProps) {
+  const { tx } = useI18n();
+  const translatedSaveLabel = tx(saveLabel);
+
   return (
     <div className={classNames.container}>
       <div className={classNames.header}>
@@ -58,8 +62,8 @@ export function FileEditorCard({
             className={classNames.iconButton}
             onClick={onRefresh}
             disabled={refreshDisabled}
-            aria-label={`Refresh ${title}`}
-            title="Refresh"
+            aria-label={tx("Refresh {title}", { title })}
+            title={tx("Refresh")}
           >
             <RefreshCw aria-hidden />
           </button>
@@ -68,8 +72,12 @@ export function FileEditorCard({
             className={classNames.iconButton}
             onClick={onSave}
             disabled={saveDisabled}
-            aria-label={saveLabel === "Create" ? `Create ${title}` : `Save ${title}`}
-            title={saveLabel}
+            aria-label={
+              saveLabel === "Create"
+                ? tx("Create {title}", { title })
+                : tx("Save {title}", { title })
+            }
+            title={translatedSaveLabel}
           >
             <Save aria-hidden />
           </button>
@@ -88,4 +96,3 @@ export function FileEditorCard({
     </div>
   );
 }
-
diff --git a/src/features/terminal/components/TerminalDock.tsx b/src/features/terminal/components/TerminalDock.tsx
index 652ae7e17..a23abccc8 100644
--- a/src/features/terminal/components/TerminalDock.tsx
+++ b/src/features/terminal/components/TerminalDock.tsx
@@ -1,4 +1,5 @@
 import type { MouseEvent as ReactMouseEvent, ReactNode } from "react";
+import { useI18n } from "@/i18n";
 import type { TerminalTab } from "../hooks/useTerminalTabs";
 
 type TerminalDockProps = {
@@ -22,6 +23,8 @@ export function TerminalDock({
   onResizeStart,
   terminalNode,
 }: TerminalDockProps) {
+  const { tx } = useI18n();
+
   if (!isOpen) {
     return null;
   }
@@ -33,12 +36,12 @@ export function TerminalDock({
           className="terminal-panel-resizer"
           role="separator"
           aria-orientation="horizontal"
-          aria-label="Resize terminal panel"
+          aria-label={tx("Resize terminal panel")}
           onMouseDown={onResizeStart}
         />
       )}
       <div className="terminal-header">
-        <div className="terminal-tabs" role="tablist" aria-label="Terminal tabs">
+        <div className="terminal-tabs" role="tablist" aria-label={tx("Terminal tabs")}>
           {terminals.map((tab) => (
             <button
               key={tab.id}
@@ -54,7 +57,7 @@ export function TerminalDock({
               <span
                 className="terminal-tab-close"
                 role="button"
-                aria-label={`Close ${tab.title}`}
+                aria-label={tx("Close {title}", { title: tab.title })}
                 onClick={(event) => {
                   event.stopPropagation();
                   onCloseTerminal(tab.id);
@@ -68,8 +71,8 @@ export function TerminalDock({
             className="terminal-tab-add"
             type="button"
             onClick={onNewTerminal}
-            aria-label="New terminal"
-            title="New terminal"
+            aria-label={tx("New terminal")}
+            title={tx("New terminal")}
           >
             +
           </button>
diff --git a/src/features/threads/components/RenameThreadPrompt.tsx b/src/features/threads/components/RenameThreadPrompt.tsx
index dcb6e2011..01572f23b 100644
--- a/src/features/threads/components/RenameThreadPrompt.tsx
+++ b/src/features/threads/components/RenameThreadPrompt.tsx
@@ -1,4 +1,5 @@
 import { useEffect, useRef } from "react";
+import { useI18n } from "@/i18n";
 import { ModalShell } from "../../design-system/components/modal/ModalShell";
 
 type RenameThreadPromptProps = {
@@ -16,6 +17,7 @@ export function RenameThreadPrompt({
   onCancel,
   onConfirm,
 }: RenameThreadPromptProps) {
+  const { tx } = useI18n();
   const inputRef = useRef<HTMLInputElement | null>(null);
 
   useEffect(() => {
@@ -27,12 +29,14 @@ export function RenameThreadPrompt({
     <ModalShell
       className="worktree-modal"
       onBackdropClick={onCancel}
-      ariaLabel="Rename thread"
+      ariaLabel={tx("Rename thread")}
     >
-      <div className="ds-modal-title worktree-modal-title">Rename thread</div>
-      <div className="ds-modal-subtitle worktree-modal-subtitle">Current name: "{currentName}"</div>
+      <div className="ds-modal-title worktree-modal-title">{tx("Rename thread")}</div>
+      <div className="ds-modal-subtitle worktree-modal-subtitle">
+        {tx("Current name: \"{name}\"", { name: currentName })}
+      </div>
       <label className="ds-modal-label worktree-modal-label" htmlFor="thread-rename">
-        New name
+        {tx("New name")}
       </label>
       <input
         id="thread-rename"
@@ -57,7 +61,7 @@ export function RenameThreadPrompt({
           onClick={onCancel}
           type="button"
         >
-          Cancel
+          {tx("Cancel")}
         </button>
         <button
           className="primary ds-modal-button worktree-modal-button"
@@ -65,7 +69,7 @@ export function RenameThreadPrompt({
           type="button"
           disabled={name.trim().length === 0}
         >
-          Rename
+          {tx("Rename")}
         </button>
       </div>
     </ModalShell>
diff --git a/src/features/update/components/UpdateToast.tsx b/src/features/update/components/UpdateToast.tsx
index 686b79818..bd4e8ecfb 100644
--- a/src/features/update/components/UpdateToast.tsx
+++ b/src/features/update/components/UpdateToast.tsx
@@ -11,6 +11,7 @@ import {
   ToastTitle,
   ToastViewport,
 } from "../../design-system/components/toast/ToastPrimitives";
+import { useI18n } from "@/i18n";
 
 type UpdateToastProps = {
   state: UpdateState;
@@ -41,23 +42,25 @@ export function UpdateToast({
   postUpdateNotice = null,
   onDismissPostUpdateNotice,
 }: UpdateToastProps) {
+  const { tx } = useI18n();
+
   if (postUpdateNotice) {
     return (
       <ToastViewport className="update-toasts" role="region" ariaLive="polite">
         <ToastCard className="update-toast" role="status">
           <ToastHeader className="update-toast-header">
-            <ToastTitle className="update-toast-title">What's New</ToastTitle>
+            <ToastTitle className="update-toast-title">{tx("What's New")}</ToastTitle>
             <div className="update-toast-version">v{postUpdateNotice.version}</div>
           </ToastHeader>
           {postUpdateNotice.stage === "loading" ? (
             <ToastBody className="update-toast-body">
-              Updated successfully. Loading release notes...
+              {tx("Updated successfully. Loading release notes...")}
             </ToastBody>
           ) : null}
           {postUpdateNotice.stage === "ready" ? (
             <>
               <ToastBody className="update-toast-body">
-                Updated successfully. Here is what is new:
+                {tx("Updated successfully. Here is what is new:")}
               </ToastBody>
               <div className="update-toast-notes" role="document">
                 <ReactMarkdown
@@ -90,8 +93,9 @@ export function UpdateToast({
           ) : null}
           {postUpdateNotice.stage === "fallback" ? (
             <ToastBody className="update-toast-body">
-              Updated to v{postUpdateNotice.version}. Release notes could not be
-              loaded.
+              {tx("Updated to v{version}. Release notes could not be loaded.", {
+                version: postUpdateNotice.version,
+              })}
             </ToastBody>
           ) : null}
           <ToastActions className="update-toast-actions">
@@ -100,16 +104,16 @@ export function UpdateToast({
                 className="primary"
                 onClick={() => {
                   void openUrl(postUpdateNotice.htmlUrl);
-                }}
-              >
-                View on GitHub
+              }}
+            >
+                {tx("View on GitHub")}
               </button>
             ) : null}
             <button
               className="secondary"
               onClick={onDismissPostUpdateNotice ?? onDismiss}
             >
-              Dismiss
+              {tx("Dismiss")}
             </button>
           </ToastActions>
         </ToastCard>
@@ -132,25 +136,25 @@ export function UpdateToast({
     <ToastViewport className="update-toasts" role="region" ariaLive="polite">
       <ToastCard className="update-toast" role="status">
         <ToastHeader className="update-toast-header">
-          <ToastTitle className="update-toast-title">Update</ToastTitle>
+          <ToastTitle className="update-toast-title">{tx("Update")}</ToastTitle>
           {state.version ? (
             <div className="update-toast-version">v{state.version}</div>
           ) : null}
         </ToastHeader>
         {state.stage === "checking" && (
-          <ToastBody className="update-toast-body">Checking for updates...</ToastBody>
+          <ToastBody className="update-toast-body">{tx("Checking for updates...")}</ToastBody>
         )}
         {state.stage === "available" && (
           <>
             <ToastBody className="update-toast-body">
-              A new version is available.
+              {tx("A new version is available.")}
             </ToastBody>
             <ToastActions className="update-toast-actions">
               <button className="secondary" onClick={onDismiss}>
-                Later
+                {tx("Later")}
               </button>
               <button className="primary" onClick={onUpdate}>
-                Update
+                {tx("Update")}
               </button>
             </ToastActions>
           </>
@@ -158,17 +162,17 @@ export function UpdateToast({
         {state.stage === "latest" && (
           <div className="update-toast-inline">
             <ToastBody className="update-toast-body update-toast-body-inline">
-              You’re up to date.
+              {tx("You’re up to date.")}
             </ToastBody>
             <button className="secondary" onClick={onDismiss}>
-              Dismiss
+              {tx("Dismiss")}
             </button>
           </div>
         )}
         {state.stage === "downloading" && (
           <>
             <ToastBody className="update-toast-body">
-              Downloading update…
+              {tx("Downloading update…")}
             </ToastBody>
             <div className="update-toast-progress">
               <div className="update-toast-progress-bar">
@@ -186,23 +190,23 @@ export function UpdateToast({
           </>
         )}
         {state.stage === "installing" && (
-          <ToastBody className="update-toast-body">Installing update…</ToastBody>
+          <ToastBody className="update-toast-body">{tx("Installing update…")}</ToastBody>
         )}
         {state.stage === "restarting" && (
-          <ToastBody className="update-toast-body">Restarting…</ToastBody>
+          <ToastBody className="update-toast-body">{tx("Restarting…")}</ToastBody>
         )}
         {state.stage === "error" && (
           <>
-            <ToastBody className="update-toast-body">Update failed.</ToastBody>
+            <ToastBody className="update-toast-body">{tx("Update failed.")}</ToastBody>
             {state.error ? (
               <ToastError className="update-toast-error">{state.error}</ToastError>
             ) : null}
             <ToastActions className="update-toast-actions">
               <button className="secondary" onClick={onDismiss}>
-                Dismiss
+                {tx("Dismiss")}
               </button>
               <button className="primary" onClick={onUpdate}>
-                Retry
+                {tx("Retry")}
               </button>
             </ToastActions>
           </>
diff --git a/src/features/workspaces/components/ClonePrompt.tsx b/src/features/workspaces/components/ClonePrompt.tsx
index 9254c20a4..6e73a4f8d 100644
--- a/src/features/workspaces/components/ClonePrompt.tsx
+++ b/src/features/workspaces/components/ClonePrompt.tsx
@@ -1,4 +1,5 @@
 import { useEffect, useRef } from "react";
+import { useI18n } from "@/i18n";
 import { ModalShell } from "../../design-system/components/modal/ModalShell";
 
 type ClonePromptProps = {
@@ -30,6 +31,7 @@ export function ClonePrompt({
   onConfirm,
   isBusy = false,
 }: ClonePromptProps) {
+  const { tx } = useI18n();
   const inputRef = useRef<HTMLInputElement | null>(null);
 
   useEffect(() => {
@@ -44,19 +46,19 @@ export function ClonePrompt({
   return (
     <ModalShell
       className="clone-modal"
-      ariaLabel="New clone agent"
+      ariaLabel={tx("New clone agent")}
       onBackdropClick={() => {
         if (!isBusy) {
           onCancel();
         }
       }}
     >
-      <div className="ds-modal-title clone-modal-title">New clone agent</div>
+      <div className="ds-modal-title clone-modal-title">{tx("New clone agent")}</div>
       <div className="ds-modal-subtitle clone-modal-subtitle">
-        Create a new working copy of "{workspaceName}".
+        {tx("Create a new working copy of \"{workspaceName}\".", { workspaceName })}
       </div>
       <label className="ds-modal-label clone-modal-label" htmlFor="clone-copy-name">
-        Copy name
+        {tx("Copy name")}
       </label>
       <input
         id="clone-copy-name"
@@ -78,14 +80,14 @@ export function ClonePrompt({
         }}
       />
       <label className="ds-modal-label clone-modal-label" htmlFor="clone-copies-folder">
-        Copies folder
+        {tx("Copies folder")}
       </label>
       <div className="clone-modal-folder-row">
         <textarea
           id="clone-copies-folder"
           className="ds-modal-input clone-modal-input clone-modal-input--path"
           value={copiesFolder}
-          placeholder="Not set"
+          placeholder={tx("Not set")}
           readOnly
           rows={1}
           wrap="off"
@@ -115,7 +117,7 @@ export function ClonePrompt({
           onClick={onChooseCopiesFolder}
           disabled={isBusy}
         >
-          Choose…
+          {tx("Choose…")}
         </button>
         <button
           type="button"
@@ -123,12 +125,12 @@ export function ClonePrompt({
           onClick={onClearCopiesFolder}
           disabled={isBusy || copiesFolder.trim().length === 0}
         >
-          Clear
+          {tx("Clear")}
         </button>
       </div>
       {showSuggested && (
         <div className="clone-modal-suggested">
-          <div className="clone-modal-suggested-label">Suggested</div>
+          <div className="clone-modal-suggested-label">{tx("Suggested")}</div>
           <div className="clone-modal-suggested-row">
             <textarea
               className="ds-modal-input clone-modal-suggested-path clone-modal-input--path"
@@ -136,7 +138,7 @@ export function ClonePrompt({
               readOnly
               rows={1}
               wrap="off"
-              aria-label="Suggested copies folder"
+              aria-label={tx("Suggested copies folder")}
               title={suggestedCopiesFolder ?? ""}
               onFocus={(event) => {
                 const value = event.currentTarget.value;
@@ -161,7 +163,7 @@ export function ClonePrompt({
               }}
               disabled={isBusy || !suggestedCopiesFolder}
             >
-              Copy
+              {tx("Copy")}
             </button>
             <button
               type="button"
@@ -169,7 +171,7 @@ export function ClonePrompt({
               onClick={onUseSuggestedCopiesFolder}
               disabled={isBusy}
             >
-              Use suggested
+              {tx("Use suggested")}
             </button>
           </div>
         </div>
@@ -182,7 +184,7 @@ export function ClonePrompt({
           type="button"
           disabled={isBusy}
         >
-          Cancel
+          {tx("Cancel")}
         </button>
         <button
           className="primary ds-modal-button clone-modal-button"
@@ -190,7 +192,7 @@ export function ClonePrompt({
           type="button"
           disabled={isBusy || !canCreate}
         >
-          Create
+          {tx("Create")}
         </button>
       </div>
     </ModalShell>
diff --git a/src/features/workspaces/components/MobileRemoteWorkspacePrompt.tsx b/src/features/workspaces/components/MobileRemoteWorkspacePrompt.tsx
index 0fed5447b..0eff35423 100644
--- a/src/features/workspaces/components/MobileRemoteWorkspacePrompt.tsx
+++ b/src/features/workspaces/components/MobileRemoteWorkspacePrompt.tsx
@@ -1,4 +1,5 @@
 import { useEffect, useRef } from "react";
+import { useI18n } from "@/i18n";
 import { ModalShell } from "../../design-system/components/modal/ModalShell";
 
 type MobileRemoteWorkspacePromptProps = {
@@ -20,6 +21,7 @@ export function MobileRemoteWorkspacePrompt({
   onCancel,
   onConfirm,
 }: MobileRemoteWorkspacePromptProps) {
+  const { tx } = useI18n();
   const textareaRef = useRef<HTMLTextAreaElement | null>(null);
   const focusTextareaAtEnd = () => {
     const textarea = textareaRef.current;
@@ -37,18 +39,18 @@ export function MobileRemoteWorkspacePrompt({
 
   return (
     <ModalShell
-      ariaLabel="Add remote workspace paths"
+      ariaLabel={tx("Add remote workspace paths")}
       className="mobile-remote-workspace-modal"
       cardClassName="mobile-remote-workspace-modal-card"
       onBackdropClick={onCancel}
     >
       <div className="mobile-remote-workspace-modal-content">
-        <div className="ds-modal-title">Add project directories</div>
+        <div className="ds-modal-title">{tx("Add project directories")}</div>
         <div className="ds-modal-subtitle">
-          Enter directories on the connected server.
+          {tx("Enter directories on the connected server.")}
         </div>
         <label className="ds-modal-label" htmlFor="mobile-remote-workspace-paths">
-          Paths
+          {tx("Paths")}
         </label>
         <textarea
           id="mobile-remote-workspace-paths"
@@ -61,11 +63,11 @@ export function MobileRemoteWorkspacePrompt({
           wrap="off"
         />
         <div className="mobile-remote-workspace-modal-hint">
-          One path per line. Comma and semicolon separators also work. You can use `~/...`.
+          {tx("One path per line. Comma and semicolon separators also work. You can use `~/...`.")}
         </div>
         {recentPaths.length > 0 && (
           <div className="mobile-remote-workspace-modal-recent">
-            <div className="mobile-remote-workspace-modal-recent-title">Recently added</div>
+            <div className="mobile-remote-workspace-modal-recent-title">{tx("Recently added")}</div>
             <div className="mobile-remote-workspace-modal-recent-list">
               {recentPaths.map((path) => (
                 <button
@@ -88,10 +90,10 @@ export function MobileRemoteWorkspacePrompt({
         {error && <div className="ds-modal-error">{error}</div>}
         <div className="ds-modal-actions">
           <button className="ghost ds-modal-button" onClick={onCancel} type="button">
-            Cancel
+            {tx("Cancel")}
           </button>
           <button className="primary ds-modal-button" onClick={onConfirm} type="button">
-            Add
+            {tx("Add")}
           </button>
         </div>
       </div>
diff --git a/src/features/workspaces/components/WorkspaceFromUrlPrompt.tsx b/src/features/workspaces/components/WorkspaceFromUrlPrompt.tsx
index f1eca4c71..0ccf6eb3a 100644
--- a/src/features/workspaces/components/WorkspaceFromUrlPrompt.tsx
+++ b/src/features/workspaces/components/WorkspaceFromUrlPrompt.tsx
@@ -1,4 +1,5 @@
 import { useEffect, useRef } from "react";
+import { useI18n } from "@/i18n";
 import { ModalShell } from "../../design-system/components/modal/ModalShell";
 
 type WorkspaceFromUrlPromptProps = {
@@ -30,6 +31,7 @@ export function WorkspaceFromUrlPrompt({
   onCancel,
   onConfirm,
 }: WorkspaceFromUrlPromptProps) {
+  const { tx } = useI18n();
   const inputRef = useRef<HTMLInputElement | null>(null);
 
   useEffect(() => {
@@ -38,7 +40,7 @@ export function WorkspaceFromUrlPrompt({
 
   return (
     <ModalShell
-      ariaLabel="Add workspace from URL"
+      ariaLabel={tx("Add workspace from URL")}
       className="workspace-from-url-modal"
       cardClassName="workspace-from-url-modal-card"
       onBackdropClick={() => {
@@ -48,9 +50,9 @@ export function WorkspaceFromUrlPrompt({
       }}
     >
       <div className="workspace-from-url-modal-content">
-        <div className="ds-modal-title">Add workspace from URL</div>
+        <div className="ds-modal-title">{tx("Add workspace from URL")}</div>
         <label className="ds-modal-label" htmlFor="workspace-url-input">
-          Remote Git URL
+          {tx("Remote Git URL")}
         </label>
         <input
           id="workspace-url-input"
@@ -61,30 +63,30 @@ export function WorkspaceFromUrlPrompt({
           placeholder="https://github.com/org/repo.git"
         />
         <label className="ds-modal-label" htmlFor="workspace-url-target-name">
-          Target folder name (optional)
+          {tx("Target folder name (optional)")}
         </label>
         <input
           id="workspace-url-target-name"
           className="ds-modal-input"
           value={targetFolderName}
           onChange={(event) => onTargetFolderNameChange(event.target.value)}
-          placeholder="Defaults to repo name"
+          placeholder={tx("Defaults to repo name")}
         />
         <label className="ds-modal-label" htmlFor="workspace-url-destination">
-          Destination parent folder
+          {tx("Destination parent folder")}
         </label>
         <div style={{ display: "flex", gap: 8 }}>
           <textarea
             id="workspace-url-destination"
             className="ds-modal-input"
             value={destinationPath}
-            placeholder="Not set"
+            placeholder={tx("Not set")}
             readOnly
             rows={1}
             wrap="off"
           />
           <button type="button" className="ghost ds-modal-button" onClick={onChooseDestinationPath}>
-            Choose…
+            {tx("Choose…")}
           </button>
           <button
             type="button"
@@ -92,20 +94,20 @@ export function WorkspaceFromUrlPrompt({
             onClick={onClearDestinationPath}
             disabled={destinationPath.trim().length === 0 || isBusy}
           >
-            Clear
+            {tx("Clear")}
           </button>
         </div>
         {error && <div className="ds-modal-error">{error}</div>}
         <div className="ds-modal-actions">
           <button className="ghost ds-modal-button" onClick={onCancel} disabled={isBusy}>
-            Cancel
+            {tx("Cancel")}
           </button>
           <button
             className="primary ds-modal-button"
             onClick={onConfirm}
             disabled={isBusy || !canSubmit}
           >
-            {isBusy ? "Cloning…" : "Clone and Add"}
+            {isBusy ? tx("Cloning…") : tx("Clone and Add")}
           </button>
         </div>
       </div>
diff --git a/src/features/workspaces/components/WorkspaceHome.tsx b/src/features/workspaces/components/WorkspaceHome.tsx
index 529e8b053..11c4a2d60 100644
--- a/src/features/workspaces/components/WorkspaceHome.tsx
+++ b/src/features/workspaces/components/WorkspaceHome.tsx
@@ -6,6 +6,7 @@ import {
   type KeyboardEvent,
   type RefObject,
 } from "react";
+import { useI18n } from "@/i18n";
 import { convertFileSrc } from "@tauri-apps/api/core";
 import type {
   AppOption,
@@ -160,6 +161,7 @@ export function WorkspaceHome({
   onAgentMdRefresh,
   onAgentMdSave,
 }: WorkspaceHomeProps) {
+  const { tx } = useI18n();
   const [showIcon, setShowIcon] = useState(true);
   const [selectionStart, setSelectionStart] = useState<number | null>(null);
   const iconPath = useMemo(() => buildIconPath(workspace.path), [workspace.path]);
@@ -329,21 +331,21 @@ export function WorkspaceHome({
   };
 
   const agentMdStatus = agentMdLoading
-    ? "Loading…"
+    ? tx("Loading…")
     : agentMdSaving
-      ? "Saving…"
+      ? tx("Saving…")
       : agentMdExists
         ? ""
-        : "Not found";
+        : tx("Not found");
   const agentMdMetaParts: string[] = [];
   if (agentMdStatus) {
     agentMdMetaParts.push(agentMdStatus);
   }
   if (agentMdTruncated) {
-    agentMdMetaParts.push("Truncated");
+    agentMdMetaParts.push(tx("Truncated"));
   }
   const agentMdMeta = agentMdMetaParts.join(" · ");
-  const agentMdSaveLabel = agentMdExists ? "Save" : "Create";
+  const agentMdSaveLabel = agentMdExists ? tx("Save") : tx("Create");
   const agentMdSaveDisabled = agentMdLoading || agentMdSaving || !agentMdDirty;
   const agentMdRefreshDisabled = agentMdLoading || agentMdSaving;
 
@@ -376,7 +378,7 @@ export function WorkspaceHome({
           <ComposerInput
             text={prompt}
             disabled={isSubmitting}
-            sendLabel="Send"
+            sendLabel={tx("Send")}
             canStop={false}
             canSend={prompt.trim().length > 0 || activeImages.length > 0}
             isProcessing={isSubmitting}
@@ -440,7 +442,7 @@ export function WorkspaceHome({
       <div className="workspace-home-agent">
         {agentMdTruncated && (
           <div className="workspace-home-agent-warning">
-            Showing the first part of a large file.
+            {tx("Showing the first part of a large file.")}
           </div>
         )}
         <FileEditorCard
@@ -448,7 +450,7 @@ export function WorkspaceHome({
           meta={agentMdMeta}
           error={agentMdError}
           value={agentMdContent}
-          placeholder="Add workspace instructions for the agent…"
+          placeholder={tx("Add workspace instructions for the agent…")}
           disabled={agentMdLoading}
           refreshDisabled={agentMdRefreshDisabled}
           saveDisabled={agentMdSaveDisabled}
diff --git a/src/features/workspaces/components/WorkspaceHomeGitInitBanner.tsx b/src/features/workspaces/components/WorkspaceHomeGitInitBanner.tsx
index fa2c77716..4b9c37ab5 100644
--- a/src/features/workspaces/components/WorkspaceHomeGitInitBanner.tsx
+++ b/src/features/workspaces/components/WorkspaceHomeGitInitBanner.tsx
@@ -1,3 +1,5 @@
+import { useI18n } from "@/i18n";
+
 type WorkspaceHomeGitInitBannerProps = {
   isLoading: boolean;
   onInitGitRepo: () => void | Promise<void>;
@@ -7,10 +9,12 @@ export function WorkspaceHomeGitInitBanner({
   isLoading,
   onInitGitRepo,
 }: WorkspaceHomeGitInitBannerProps) {
+  const { tx } = useI18n();
+
   return (
-    <div className="workspace-home-git-banner" role="region" aria-label="Git setup">
+    <div className="workspace-home-git-banner" role="region" aria-label={tx("Git setup")}>
       <div className="workspace-home-git-banner-title">
-        Git is not initialized for this project.
+        {tx("Git is not initialized for this project.")}
       </div>
       <div className="workspace-home-git-banner-actions">
         <button
@@ -19,10 +23,9 @@ export function WorkspaceHomeGitInitBanner({
           onClick={() => void onInitGitRepo()}
           disabled={isLoading}
         >
-          {isLoading ? "Initializing..." : "Initialize Git"}
+          {isLoading ? tx("Initializing...") : tx("Initialize Git")}
         </button>
       </div>
     </div>
   );
 }
-
diff --git a/src/features/workspaces/components/WorkspaceHomeHistory.tsx b/src/features/workspaces/components/WorkspaceHomeHistory.tsx
index 346b5d142..274e54c8f 100644
--- a/src/features/workspaces/components/WorkspaceHomeHistory.tsx
+++ b/src/features/workspaces/components/WorkspaceHomeHistory.tsx
@@ -1,3 +1,4 @@
+import { useI18n } from "@/i18n";
 import { formatRelativeTime } from "../../../utils/time";
 import {
   getWorkspaceHomeThreadState,
@@ -80,15 +81,17 @@ export function WorkspaceHomeHistory({
   threadStatusById,
   onSelectInstance,
 }: WorkspaceHomeHistoryProps) {
+  const { tx } = useI18n();
+
   return (
     <>
       <div className="workspace-home-runs">
         <div className="workspace-home-section-header">
-          <div className="workspace-home-section-title">Recent runs</div>
+          <div className="workspace-home-section-title">{tx("Recent runs")}</div>
         </div>
         {runs.length === 0 ? (
           <div className="workspace-home-empty">
-            Start a run to see its instances tracked here.
+            {tx("Start a run to see its instances tracked here.")}
           </div>
         ) : (
           <div className="workspace-home-run-grid">
@@ -101,10 +104,12 @@ export function WorkspaceHomeHistory({
                     <div>
                       <div className="workspace-home-run-title">{run.title}</div>
                       <div className="workspace-home-run-meta">
-                        {run.mode === "local" ? "Local" : "Worktree"} · {run.instances.length} instance
-                        {run.instances.length === 1 ? "" : "s"}
-                        {run.status === "failed" && " · Failed"}
-                        {run.status === "partial" && " · Partial"}
+                        {run.mode === "local" ? tx("Local") : tx("Worktree")} ·{" "}
+                        {run.instances.length === 1
+                          ? tx("{count} instance", { count: run.instances.length })
+                          : tx("{count} instances", { count: run.instances.length })}
+                        {run.status === "failed" && tx(" · Failed")}
+                        {run.status === "partial" && tx(" · Partial")}
                       </div>
                     </div>
                     <div className="workspace-home-run-time">
@@ -120,9 +125,9 @@ export function WorkspaceHomeHistory({
                         </div>
                       ))}
                       {run.instanceErrors.length > 2 && (
-                        <div className="workspace-home-run-error-item">
-                          +{run.instanceErrors.length - 2} more
-                        </div>
+                    <div className="workspace-home-run-error-item">
+                          {tx("+{count} more", { count: run.instanceErrors.length - 2 })}
+                    </div>
                       )}
                     </div>
                   )}
@@ -136,13 +141,13 @@ export function WorkspaceHomeHistory({
                     />
                   ) : run.status === "failed" ? (
                     <div className="workspace-home-empty">
-                      No instances were started.
+                      {tx("No instances were started.")}
                     </div>
                   ) : (
                     <div className="workspace-home-empty workspace-home-pending">
                       <span className="working-spinner" aria-hidden />
                       <span className="workspace-home-pending-text">
-                        Instances are preparing...
+                        {tx("Instances are preparing...")}
                       </span>
                     </div>
                   )}
@@ -155,21 +160,22 @@ export function WorkspaceHomeHistory({
 
       <div className="workspace-home-runs">
         <div className="workspace-home-section-header">
-          <div className="workspace-home-section-title">Recent threads</div>
+          <div className="workspace-home-section-title">{tx("Recent threads")}</div>
         </div>
         {recentThreadInstances.length === 0 ? (
           <div className="workspace-home-empty">
-            Threads from the sidebar will appear here.
+            {tx("Threads from the sidebar will appear here.")}
           </div>
         ) : (
           <div className="workspace-home-run-grid">
             <div className="workspace-home-run-card">
               <div className="workspace-home-run-header">
                 <div>
-                  <div className="workspace-home-run-title">Agents activity</div>
+                  <div className="workspace-home-run-title">{tx("Agents activity")}</div>
                   <div className="workspace-home-run-meta">
-                    {recentThreadInstances.length} thread
-                    {recentThreadInstances.length === 1 ? "" : "s"}
+                    {recentThreadInstances.length === 1
+                      ? tx("{count} thread", { count: recentThreadInstances.length })
+                      : tx("{count} threads", { count: recentThreadInstances.length })}
                   </div>
                 </div>
                 {recentThreadsUpdatedAt ? (
diff --git a/src/features/workspaces/components/WorkspaceHomeRunControls.tsx b/src/features/workspaces/components/WorkspaceHomeRunControls.tsx
index 421f3dd41..916e39dbe 100644
--- a/src/features/workspaces/components/WorkspaceHomeRunControls.tsx
+++ b/src/features/workspaces/components/WorkspaceHomeRunControls.tsx
@@ -1,4 +1,5 @@
 import { useCallback } from "react";
+import { useI18n } from "@/i18n";
 import type { ModelOption, WorkspaceInfo } from "../../../types";
 import type { WorkspaceRunMode } from "../hooks/useWorkspaceHome";
 import Laptop from "lucide-react/dist/esm/icons/laptop";
@@ -56,6 +57,7 @@ export function WorkspaceHomeRunControls({
   reasoningSupported,
   isSubmitting,
 }: WorkspaceHomeRunControlsProps) {
+  const { tx } = useI18n();
   const runModeMenu = useMenuController();
   const modelsMenu = useMenuController();
   const {
@@ -77,7 +79,7 @@ export function WorkspaceHomeRunControls({
   const selectedModelLabel = resolveModelLabel(selectedModel);
   const modelSummary = buildModelSummary(models, modelSelections);
   const showRunMode = (workspaceKind ?? "main") !== "worktree";
-  const runModeLabel = runMode === "local" ? "Local" : "Worktree";
+  const runModeLabel = runMode === "local" ? tx("Local") : tx("Worktree");
   const RunModeIcon = runMode === "local" ? Laptop : GitBranch;
   const toggleRunModeMenu = useCallback(() => {
     toggleRunModeOpen();
@@ -100,7 +102,7 @@ export function WorkspaceHomeRunControls({
               type="button"
               className="ghost open-app-action"
               onClick={toggleRunModeMenu}
-              aria-label="Select run mode"
+              aria-label={tx("Select run mode")}
               data-tauri-drag-region="false"
             >
               <span className="open-app-label">
@@ -112,7 +114,7 @@ export function WorkspaceHomeRunControls({
           isOpen={runModeOpen}
           onToggle={toggleRunModeMenu}
           toggleClassName="ghost open-app-toggle"
-          toggleAriaLabel="Toggle run mode menu"
+          toggleAriaLabel={tx("Toggle run mode menu")}
           toggleIcon={<ChevronDown size={14} aria-hidden />}
           popoverClassName="open-app-dropdown workspace-home-dropdown"
           popoverRole="menu"
@@ -127,7 +129,7 @@ export function WorkspaceHomeRunControls({
             icon={<Laptop className="workspace-home-mode-icon" aria-hidden />}
             active={runMode === "local"}
           >
-            Local
+            {tx("Local")}
           </PopoverMenuItem>
           <PopoverMenuItem
             className="open-app-option"
@@ -139,7 +141,7 @@ export function WorkspaceHomeRunControls({
             icon={<GitBranch className="workspace-home-mode-icon" aria-hidden />}
             active={runMode === "worktree"}
           >
-            Worktree
+            {tx("Worktree")}
           </PopoverMenuItem>
         </SplitActionMenu>
       )}
@@ -153,7 +155,7 @@ export function WorkspaceHomeRunControls({
             type="button"
             className="ghost open-app-action"
             onClick={toggleModelsMenu}
-            aria-label="Select models"
+            aria-label={tx("Select models")}
             data-tauri-drag-region="false"
           >
             <span className="open-app-label">
@@ -164,14 +166,14 @@ export function WorkspaceHomeRunControls({
         isOpen={modelsOpen}
         onToggle={toggleModelsMenu}
         toggleClassName="ghost open-app-toggle"
-        toggleAriaLabel="Toggle models menu"
+        toggleAriaLabel={tx("Toggle models menu")}
         toggleIcon={<ChevronDown size={14} aria-hidden />}
         popoverClassName="open-app-dropdown workspace-home-dropdown workspace-home-model-dropdown"
         popoverRole="menu"
       >
         {models.length === 0 && (
           <div className="workspace-home-empty">
-            Connect this workspace to load available models.
+            {tx("Connect this workspace to load available models.")}
           </div>
         )}
         {models.map((model) => {
@@ -244,7 +246,7 @@ export function WorkspaceHomeRunControls({
             </span>
             <select
               className="composer-select composer-select--model"
-              aria-label="Collaboration mode"
+              aria-label={tx("Collaboration mode")}
               value={selectedCollaborationModeId ?? ""}
               onChange={(event) => onSelectCollaborationMode(event.target.value || null)}
               disabled={isSubmitting}
@@ -290,12 +292,12 @@ export function WorkspaceHomeRunControls({
           </span>
           <select
             className="composer-select composer-select--effort"
-            aria-label="Thinking mode"
+            aria-label={tx("Thinking mode")}
             value={selectedEffort ?? ""}
             onChange={(event) => onSelectEffort(event.target.value)}
             disabled={isSubmitting || !reasoningSupported}
           >
-            {reasoningOptions.length === 0 && <option value="">Default</option>}
+            {reasoningOptions.length === 0 && <option value="">{tx("Default")}</option>}
             {reasoningOptions.map((effortOption) => (
               <option key={effortOption} value={effortOption}>
                 {effortOption}
diff --git a/src/features/workspaces/components/WorktreePrompt.tsx b/src/features/workspaces/components/WorktreePrompt.tsx
index 11bb5f5d0..166ee6a9c 100644
--- a/src/features/workspaces/components/WorktreePrompt.tsx
+++ b/src/features/workspaces/components/WorktreePrompt.tsx
@@ -1,5 +1,6 @@
 import { useEffect, useMemo, useRef, useState } from "react";
 import type { FocusEvent } from "react";
+import { useI18n } from "@/i18n";
 import type { BranchInfo } from "../../../types";
 import { ModalShell } from "../../design-system/components/modal/ModalShell";
 import { BranchList } from "../../git/components/BranchList";
@@ -44,6 +45,7 @@ export function WorktreePrompt({
   isBusy = false,
   isSavingScript = false,
 }: WorktreePromptProps) {
+  const { tx } = useI18n();
   const inputRef = useRef<HTMLInputElement | null>(null);
   const branchContainerRef = useRef<HTMLDivElement | null>(null);
   const branchListRef = useRef<HTMLDivElement | null>(null);
@@ -105,26 +107,26 @@ export function WorktreePrompt({
   return (
     <ModalShell
       className="worktree-modal"
-      ariaLabel="New worktree agent"
+      ariaLabel={tx("New worktree agent")}
       onBackdropClick={() => {
         if (!isBusy) {
           onCancel();
         }
       }}
     >
-      <div className="ds-modal-title worktree-modal-title">New worktree agent</div>
+      <div className="ds-modal-title worktree-modal-title">{tx("New worktree agent")}</div>
       <div className="ds-modal-subtitle worktree-modal-subtitle">
-        Create a worktree under "{workspaceName}".
+        {tx("Create a worktree under \"{workspaceName}\".", { workspaceName })}
       </div>
       <label className="ds-modal-label worktree-modal-label" htmlFor="worktree-name">
-        Name
+        {tx("Name")}
       </label>
       <input
         id="worktree-name"
         ref={inputRef}
         className="ds-modal-input worktree-modal-input"
         value={name}
-        placeholder="(Optional)"
+        placeholder={tx("(Optional)")}
         onChange={(event) => onNameChange(event.target.value)}
         onKeyDown={(event) => {
           if (event.key === "Escape") {
@@ -140,7 +142,7 @@ export function WorktreePrompt({
         }}
       />
       <label className="ds-modal-label worktree-modal-label" htmlFor="worktree-branch">
-        Branch name
+        {tx("Branch name")}
       </label>
       <div
         className="worktree-modal-branch"
@@ -217,7 +219,7 @@ export function WorktreePrompt({
             selectedItemClassName="selected"
             emptyClassName="worktree-modal-branch-empty"
             emptyText={
-              branch.trim().length > 0 ? "No matching branches" : "No branches found"
+              branch.trim().length > 0 ? tx("No matching branches") : tx("No branches found")
             }
             onMouseEnter={(index) => {
               setDidNavigateBranches(true);
@@ -237,14 +239,13 @@ export function WorktreePrompt({
           onChange={(event) => onCopyAgentsMdChange(event.target.checked)}
         />
         <label className="worktree-modal-checkbox-label" htmlFor="worktree-copy-agents">
-          Copy <code>AGENTS.md</code> into the worktree
+          {tx("Copy")} <code>AGENTS.md</code> {tx("into the worktree")}
         </label>
       </div>
       <div className="ds-modal-divider worktree-modal-divider" />
-      <div className="worktree-modal-section-title">Environment setup script</div>
+      <div className="worktree-modal-section-title">{tx("Environment setup script")}</div>
       <div className="worktree-modal-hint">
-        Stored on the project (Settings → Environments) and runs once in a dedicated
-        terminal after each new worktree is created.
+        {tx("Stored on the project (Settings → Environments) and runs once in a dedicated terminal after each new worktree is created.")}
       </div>
       <textarea
         id="worktree-setup-script"
@@ -264,7 +265,7 @@ export function WorktreePrompt({
           type="button"
           disabled={isBusy}
         >
-          Cancel
+          {tx("Cancel")}
         </button>
         <button
           className="primary ds-modal-button worktree-modal-button"
@@ -272,7 +273,7 @@ export function WorktreePrompt({
           type="button"
           disabled={isBusy || branch.trim().length === 0}
         >
-          Create
+          {tx("Create")}
         </button>
       </div>
     </ModalShell>
diff --git a/src/i18n/i18n.test.ts b/src/i18n/i18n.test.ts
new file mode 100644
index 000000000..d7d0f3ca4
--- /dev/null
+++ b/src/i18n/i18n.test.ts
@@ -0,0 +1,30 @@
+import { describe, expect, it } from "vitest";
+import {
+  normalizeLanguagePreference,
+  resolveLocale,
+  translate,
+} from "./index";
+
+describe("i18n", () => {
+  it("normalizes unsupported language preferences to system", () => {
+    expect(normalizeLanguagePreference("zh-CN")).toBe("zh-CN");
+    expect(normalizeLanguagePreference("fr")).toBe("system");
+    expect(normalizeLanguagePreference(null)).toBe("system");
+  });
+
+  it("resolves system language to a supported locale", () => {
+    expect(resolveLocale("system", ["zh-Hans-CN", "en-US"])).toBe("zh-CN");
+    expect(resolveLocale("system", ["en-US"])).toBe("en");
+    expect(resolveLocale("en", ["zh-CN"])).toBe("en");
+  });
+
+  it("translates and interpolates values", () => {
+    expect(translate("zh-CN", "settings.title")).toBe("设置");
+    expect(
+      translate("en", "settings.display.scrollback.range", {
+        min: 1,
+        max: 10,
+      }),
+    ).toBe("Range: 1-10. Counts messages, tool calls, and other conversation items.");
+  });
+});
diff --git a/src/i18n/index.tsx b/src/i18n/index.tsx
new file mode 100644
index 000000000..cb0d02fbb
--- /dev/null
+++ b/src/i18n/index.tsx
@@ -0,0 +1,1255 @@
+import {
+  createContext,
+  useContext,
+  useEffect,
+  useMemo,
+  type ReactNode,
+} from "react";
+import type { AppLanguagePreference } from "@/types";
+
+export type AppLocale = Exclude<AppLanguagePreference, "system">;
+
+type TranslationValues = Record<string, string | number>;
+
+const enTranslations = {
+  "common.reset": "Reset",
+
+  "language.system": "System",
+  "language.en": "English",
+  "language.zh-CN": "Simplified Chinese",
+
+  "settings.title": "Settings",
+  "settings.close": "Close settings",
+  "settings.backToSections": "Back to settings sections",
+  "settings.sections": "Sections",
+
+  "settings.nav.projects": "Projects",
+  "settings.nav.environments": "Environments",
+  "settings.nav.display": "Display & Sound",
+  "settings.nav.about": "About",
+  "settings.nav.composer": "Composer",
+  "settings.nav.dictation": "Dictation",
+  "settings.nav.shortcuts": "Shortcuts",
+  "settings.nav.open-apps": "Open in",
+  "settings.nav.git": "Git",
+  "settings.nav.server": "Server",
+  "settings.nav.agents": "Agents",
+  "settings.nav.codex": "Codex",
+  "settings.nav.features": "Features",
+
+  "settings.display.title": "Display & Sound",
+  "settings.display.subtitle": "Tune visuals and audio alerts to your preferences.",
+  "settings.display.language.label": "Language",
+  "settings.display.language.help": "Choose the app language. System follows your OS/browser language.",
+  "settings.display.display.title": "Display",
+  "settings.display.display.subtitle": "Adjust how the window renders backgrounds and effects.",
+  "settings.display.theme.label": "Theme",
+  "settings.display.theme.system": "System",
+  "settings.display.theme.light": "Light",
+  "settings.display.theme.dark": "Dark",
+  "settings.display.theme.dim": "Dim",
+  "settings.display.usageRemaining.title": "Show remaining Codex limits",
+  "settings.display.usageRemaining.subtitle": "Display what is left instead of what is used.",
+  "settings.display.filePath.title": "Show file path in messages",
+  "settings.display.filePath.subtitle": "Display the parent path next to file links in messages.",
+  "settings.display.splitView.title": "Split chat and diff center panes",
+  "settings.display.splitView.subtitle": "Show chat and diff side by side instead of swapping between them.",
+  "settings.display.threadTitles.title": "Auto-generate new thread titles",
+  "settings.display.threadTitles.subtitle": "Generate a short title from your first message (uses extra tokens).",
+  "settings.display.chat.title": "Chat",
+  "settings.display.chat.subtitle": "Control how much conversation history is retained per thread.",
+  "settings.display.scrollback.unlimited.title": "Unlimited chat history",
+  "settings.display.scrollback.unlimited.subtitle": "Keep full thread history in memory (may impact performance).",
+  "settings.display.scrollback.preset.label": "Scrollback preset",
+  "settings.display.scrollback.custom": "Custom",
+  "settings.display.scrollback.defaultSuffix": "Default",
+  "settings.display.scrollback.help": "Higher values keep more history but may increase memory usage. Use \"Sync from server\" on a thread to re-fetch older messages.",
+  "settings.display.scrollback.maxItems.label": "Max items per thread",
+  "settings.display.scrollback.range": "Range: {min}-{max}. Counts messages, tool calls, and other conversation items.",
+  "settings.display.transparency.title": "Reduce transparency",
+  "settings.display.transparency.subtitle": "Use solid surfaces instead of glass.",
+  "settings.display.scale.title": "Interface scale",
+  "settings.display.scale.aria": "Interface scale",
+  "settings.display.uiFont.label": "UI font family",
+  "settings.display.uiFont.help": "Applies to all UI text. Leave empty to use the default system font stack.",
+  "settings.display.codeFont.label": "Code font family",
+  "settings.display.codeFont.help": "Applies to git diffs and other mono-spaced readouts.",
+  "settings.display.codeSize.label": "Code font size",
+  "settings.display.codeSize.help": "Adjusts code and diff text size.",
+  "settings.display.sounds.title": "Sounds",
+  "settings.display.sounds.subtitle": "Control notification audio alerts.",
+  "settings.display.notificationSounds.title": "Notification sounds",
+  "settings.display.notificationSounds.subtitle": "Play a sound when a long-running agent finishes while the window is unfocused.",
+  "settings.display.systemNotifications.title": "System notifications",
+  "settings.display.systemNotifications.subtitle": "Show a system notification when a long-running agent finishes while the window is unfocused.",
+  "settings.display.subagentNotifications.title": "Sub-agent notifications",
+  "settings.display.subagentNotifications.subtitle": "Include spawned sub-agent threads in system notifications.",
+  "settings.display.testSound": "Test sound",
+  "settings.display.testNotification": "Test notification",
+} as const;
+
+const zhCNTranslations: Record<keyof typeof enTranslations, string> = {
+  "common.reset": "重置",
+
+  "language.system": "跟随系统",
+  "language.en": "English",
+  "language.zh-CN": "简体中文",
+
+  "settings.title": "设置",
+  "settings.close": "关闭设置",
+  "settings.backToSections": "返回设置分类",
+  "settings.sections": "分类",
+
+  "settings.nav.projects": "项目",
+  "settings.nav.environments": "环境",
+  "settings.nav.display": "显示与声音",
+  "settings.nav.about": "关于",
+  "settings.nav.composer": "输入框",
+  "settings.nav.dictation": "语音输入",
+  "settings.nav.shortcuts": "快捷键",
+  "settings.nav.open-apps": "打开方式",
+  "settings.nav.git": "Git",
+  "settings.nav.server": "服务器",
+  "settings.nav.agents": "智能体",
+  "settings.nav.codex": "Codex",
+  "settings.nav.features": "功能",
+
+  "settings.display.title": "显示与声音",
+  "settings.display.subtitle": "按你的偏好调整界面和提醒声音。",
+  "settings.display.language.label": "语言",
+  "settings.display.language.help": "选择应用语言。跟随系统会使用操作系统或浏览器语言。",
+  "settings.display.display.title": "显示",
+  "settings.display.display.subtitle": "调整窗口背景和视觉效果的渲染方式。",
+  "settings.display.theme.label": "主题",
+  "settings.display.theme.system": "跟随系统",
+  "settings.display.theme.light": "浅色",
+  "settings.display.theme.dark": "深色",
+  "settings.display.theme.dim": "暗淡",
+  "settings.display.usageRemaining.title": "显示剩余 Codex 限额",
+  "settings.display.usageRemaining.subtitle": "显示剩余额度，而不是已使用额度。",
+  "settings.display.filePath.title": "在消息中显示文件路径",
+  "settings.display.filePath.subtitle": "在消息里的文件链接旁显示父级路径。",
+  "settings.display.splitView.title": "拆分聊天和 Diff 中央面板",
+  "settings.display.splitView.subtitle": "并排显示聊天和 Diff，而不是在两者之间切换。",
+  "settings.display.threadTitles.title": "自动生成新线程标题",
+  "settings.display.threadTitles.subtitle": "根据第一条消息生成简短标题（会额外消耗 token）。",
+  "settings.display.chat.title": "聊天",
+  "settings.display.chat.subtitle": "控制每个线程保留多少会话历史。",
+  "settings.display.scrollback.unlimited.title": "无限聊天历史",
+  "settings.display.scrollback.unlimited.subtitle": "在内存中保留完整线程历史（可能影响性能）。",
+  "settings.display.scrollback.preset.label": "历史数量预设",
+  "settings.display.scrollback.custom": "自定义",
+  "settings.display.scrollback.defaultSuffix": "默认",
+  "settings.display.scrollback.help": "数值越高会保留更多历史，但可能增加内存占用。可在线程中使用“从服务器同步”重新获取更早的消息。",
+  "settings.display.scrollback.maxItems.label": "每个线程最大条目数",
+  "settings.display.scrollback.range": "范围：{min}-{max}。计数包含消息、工具调用和其他会话条目。",
+  "settings.display.transparency.title": "降低透明度",
+  "settings.display.transparency.subtitle": "使用纯色界面，而不是玻璃效果。",
+  "settings.display.scale.title": "界面缩放",
+  "settings.display.scale.aria": "界面缩放",
+  "settings.display.uiFont.label": "界面字体",
+  "settings.display.uiFont.help": "应用于所有界面文本。留空时使用默认系统字体栈。",
+  "settings.display.codeFont.label": "代码字体",
+  "settings.display.codeFont.help": "应用于 Git Diff 和其他等宽文本区域。",
+  "settings.display.codeSize.label": "代码字号",
+  "settings.display.codeSize.help": "调整代码和 Diff 文本大小。",
+  "settings.display.sounds.title": "声音",
+  "settings.display.sounds.subtitle": "控制通知提示音。",
+  "settings.display.notificationSounds.title": "通知声音",
+  "settings.display.notificationSounds.subtitle": "窗口未聚焦时，长时间运行的智能体完成后播放提示音。",
+  "settings.display.systemNotifications.title": "系统通知",
+  "settings.display.systemNotifications.subtitle": "窗口未聚焦时，长时间运行的智能体完成后显示系统通知。",
+  "settings.display.subagentNotifications.title": "子智能体通知",
+  "settings.display.subagentNotifications.subtitle": "在系统通知中包含派生的子智能体线程。",
+  "settings.display.testSound": "测试声音",
+  "settings.display.testNotification": "测试通知",
+};
+
+const translations: Record<AppLocale, Record<keyof typeof enTranslations, string>> = {
+  en: enTranslations,
+  "zh-CN": zhCNTranslations,
+};
+
+export type TranslationKey = keyof typeof enTranslations;
+export type Translate = (key: TranslationKey, values?: TranslationValues) => string;
+export type TranslateText = (source: string, values?: TranslationValues) => string;
+
+const zhCNTextTranslations: Record<string, string> = {
+  "Codex Monitor": "Codex Monitor",
+  "Made with ♥ by Codex & Dimillian": "由 Codex 与 Dimillian 制作",
+  Debug: "调试",
+  "No debug events yet.": "暂无调试事件。",
+  "Resize debug panel": "调整调试面板大小",
+  "Delete this prompt?": "删除这个提示词？",
+  Workspace: "工作区",
+  General: "通用",
+  "Workspace prompts": "工作区提示词",
+  "No workspace prompts yet": "暂无工作区提示词",
+  "General prompts": "通用提示词",
+  "No general prompts yet": "暂无通用提示词",
+  "What's New": "更新内容",
+  Update: "更新",
+  "Checking for updates...": "正在检查更新...",
+  "Installing update…": "正在安装更新…",
+  "Restarting…": "正在重启…",
+  "Update failed.": "更新失败。",
+  "Mobile Setup Required": "需要移动端设置",
+  "Connect to your desktop backend": "连接到你的桌面后端",
+  "Loading…": "加载中…",
+  Truncated: "已截断",
+  "Loading file...": "正在加载文件...",
+  "Close preview": "关闭预览",
+  "Selection hints": "选择提示",
+  "Usage snapshot": "用量快照",
+  "All workspaces": "所有工作区",
+  View: "视图",
+  "No usage data yet": "暂无用量数据",
+  Tokens: "Token",
+  "No models yet": "暂无模型",
+  "Account limits": "账号限额",
+  "Latest agents": "最近智能体",
+  Running: "运行中",
+  "No agent activity yet": "暂无智能体活动",
+  "Follow-up behavior": "跟进消息行为",
+  Queued: "已排队",
+  Edit: "编辑",
+  Delete: "删除",
+  "Review against a base branch": "基于基础分支评审",
+  "Review uncommitted changes": "评审未提交更改",
+  "Review a commit": "评审某个提交",
+  "Custom review instructions": "自定义评审说明",
+  "Pick a recent local branch:": "选择最近的本地分支：",
+  "Loading branches…": "正在加载分支…",
+  "No branches found.": "未找到分支。",
+  "Select a recent commit:": "选择最近的提交：",
+  "Loading commits…": "正在加载提交…",
+  "No commits found.": "未找到提交。",
+  Draft: "草稿",
+  "No description provided.": "未提供描述。",
+  Activity: "活动",
+  "Initialize Git": "初始化 Git",
+  "Private repo": "私有仓库",
+  Diff: "Diff",
+  "Agent edits": "智能体编辑",
+  Log: "日志",
+  Issues: "Issue",
+  PRs: "PR",
+  "GitHub issues": "GitHub Issue",
+  "GitHub pull requests": "GitHub PR",
+  Branch: "分支",
+  "Repository root": "仓库根目录",
+  Plan: "计划",
+  "No models": "无模型",
+  Default: "默认",
+  "Read only": "只读",
+  "On-Request": "按需确认",
+  "On-request": "按需确认",
+  "Full access": "完全访问",
+  "Diff unavailable.": "Diff 不可用。",
+  "App Updates": "应用更新",
+  "You are on the latest version.": "当前已是最新版本。",
+  "Leave empty to use the system PATH resolution.": "留空时使用系统 PATH 解析。",
+  "Inline (same thread)": "内联（同一线程）",
+  "Detached (new review thread)": "分离（新评审线程）",
+  Label: "标签",
+  Type: "类型",
+  App: "应用",
+  Command: "命令",
+  "App name": "应用名称",
+  Args: "参数",
+  "Filter by section name, action, or default shortcut.": "按分类名称、操作或默认快捷键筛选。",
+  Friendly: "友好",
+  Pragmatic: "务实",
+  "No stable feature flags returned by Codex.": "Codex 未返回稳定功能开关。",
+  "Loading Codex feature flags...": "正在加载 Codex 功能开关...",
+  "Commit message prompt": "提交消息提示词",
+  "Local (default)": "本地（默认）",
+  "Remote (daemon)": "远程（守护进程）",
+  "Saved remotes": "已保存远程",
+  Active: "当前",
+  "Remote backend": "远程后端",
+  "Connection test": "连接测试",
+  "Mobile access daemon": "移动访问守护进程",
+  "Tailscale helper": "Tailscale 辅助工具",
+  "Add remote": "添加远程",
+  "Delete remote?": "删除远程？",
+  "Rename thread": "重命名线程",
+  Depth: "深度",
+  "Scanning for repositories...": "正在扫描仓库...",
+  "No repositories found.": "未找到仓库。",
+  Push: "推送",
+  "No changes detected.": "未检测到更改。",
+  "No agent edits in this thread yet.": "此线程暂无智能体编辑。",
+  "Loading commits...": "正在加载提交...",
+  "No commits yet.": "暂无提交。",
+  "To push": "待推送",
+  "To pull": "待拉取",
+  "Recent commits": "最近提交",
+  "No open issues.": "没有打开的 Issue。",
+  "No open pull requests.": "没有打开的 PR。",
+  Queue: "排队",
+  Steer: "引导",
+  Presets: "预设",
+  "Code fences": "代码围栏",
+  Pasting: "粘贴",
+  Lists: "列表",
+  "Copies folder": "副本文件夹",
+  "No groups yet.": "暂无分组。",
+  "No projects yet.": "暂无项目。",
+  "Input requested": "需要输入",
+  "Auto-detect only": "仅自动检测",
+  English: "英语",
+  Spanish: "西班牙语",
+  French: "法语",
+  German: "德语",
+  Italian: "意大利语",
+  Portuguese: "葡萄牙语",
+  Dutch: "荷兰语",
+  Swedish: "瑞典语",
+  Norwegian: "挪威语",
+  Danish: "丹麦语",
+  Finnish: "芬兰语",
+  Polish: "波兰语",
+  Turkish: "土耳其语",
+  Russian: "俄语",
+  Ukrainian: "乌克兰语",
+  Japanese: "日语",
+  Korean: "韩语",
+  Chinese: "中文",
+  Off: "关闭",
+  Shift: "Shift",
+  Control: "Control",
+  "Approval needed": "需要批准",
+  Deleting: "正在删除",
+  Name: "名称",
+  Worktree: "工作树",
+  Reveal: "显示",
+  "Launch script": "启动脚本",
+  "New launch script": "新启动脚本",
+  Pinned: "已固定",
+  "Pinned conversations": "固定会话",
+  "No conversations yet.": "暂无会话。",
+  Organize: "组织",
+  "Sort by": "排序方式",
+  "Recent conversations": "最近会话",
+  "No custom agents configured yet.": "暂无自定义智能体。",
+  "External path": "外部路径",
+  "Loading agents settings...": "正在加载智能体设置...",
+  "New clone agent": "新克隆智能体",
+  Suggested: "建议",
+  "Add project directories": "添加项目目录",
+  "Recently added": "最近添加",
+  "Add workspace from URL": "从 URL 添加工作区",
+  "Plan ready": "计划已就绪",
+  Usage: "用量",
+  Account: "账号",
+  Settings: "设置",
+  "New Agent": "新智能体",
+  "New worktree agent": "新工作树智能体",
+  "Environment setup script": "环境设置脚本",
+  "Recent runs": "最近运行",
+  "Recent threads": "最近线程",
+  "Agents activity": "智能体活动",
+  "Processing...": "处理中...",
+  "Create agents and worktrees from the keyboard.": "通过键盘创建智能体和工作树。",
+  "Cycle between model, access, reasoning, and collaboration modes.": "在模型、访问权限、推理和协作模式之间循环。",
+  "Toggle sidebars and panels.": "切换侧边栏和面板。",
+  "Cycle between agents and workspaces.": "在智能体和工作区之间循环。",
+  "Archive active thread": "归档当前线程",
+  "Cycle model": "切换模型",
+  "Cycle access mode": "切换访问模式",
+  "Cycle reasoning mode": "切换推理模式",
+  "Cycle collaboration mode": "切换协作模式",
+  "Stop active run": "停止当前运行",
+  "Toggle projects sidebar": "切换项目侧边栏",
+  "Toggle git sidebar": "切换 Git 侧边栏",
+  "Branch switcher": "分支切换器",
+  "Toggle debug panel": "切换调试面板",
+  "Toggle terminal panel": "切换终端面板",
+  "Next agent": "下一个智能体",
+  "Previous agent": "上一个智能体",
+  "Next workspace": "下一个工作区",
+  "Previous workspace": "上一个工作区",
+};
+
+const zhCNAdditionalTextTranslations: Record<string, string> = {
+  "\n… and {count} more": "\n… 以及其他 {count} 项",
+  " · {count} image{plural}": " · {count} 张图片",
+  " · Failed": " · 失败",
+  " · Partial": " · 部分完成",
+  " +{count} more": " + 其他 {count} 项",
+  "(missing config_file)": "（缺少 config_file）",
+  "(Optional)": "（可选）",
+  "(PR Style)": "（PR 风格）",
+  "{count} comment": "{count} 条评论",
+  "{count} comments": "{count} 条评论",
+  "{count} commit": "{count} 个提交",
+  "{count} commits": "{count} 个提交",
+  "{count} earlier comment": "{count} 条较早评论",
+  "{count} earlier comments": "{count} 条较早评论",
+  "{count} edit": "{count} 处编辑",
+  "{count} edits": "{count} 处编辑",
+  "{count} file": "{count} 个文件",
+  "{count} files": "{count} 个文件",
+  "{count} instance": "{count} 个实例",
+  "{count} instances": "{count} 个实例",
+  "{count} match": "{count} 个匹配",
+  "{count} matches": "{count} 个匹配",
+  "{count} message": "{count} 条消息",
+  "{count} messages": "{count} 条消息",
+  "{count} modified": "{count} 个已修改",
+  "{count} open": "{count} 个打开中",
+  "{count} prompt": "{count} 个提示词",
+  "{count} prompts": "{count} 个提示词",
+  "{count} thread": "{count} 个线程",
+  "{count} threads": "{count} 个线程",
+  "{count} tool call": "{count} 次工具调用",
+  "{count} tool calls": "{count} 次工具调用",
+  "{files} files · {edits} edits": "{files} 个文件 · {edits} 处编辑",
+  "{name} config file": "{name} 配置文件",
+  "{title} actions": "{title} 操作",
+  "+{count} more": "+ 其他 {count} 项",
+  "A new version is available.": "有新版本可用。",
+  About: "关于",
+  "Access mode": "访问模式",
+  Add: "添加",
+  "Add a custom role under": "在以下位置添加自定义角色",
+  "Add a workspace to load available models.": "添加工作区以加载可用模型。",
+  "Add a workspace to start.": "添加工作区以开始。",
+  "Add agent options": "添加智能体选项",
+  "Add app": "添加应用",
+  "Add general prompt": "添加通用提示词",
+  "Add global instructions for Codex agents…": "添加 Codex 智能体的全局说明…",
+  "Add group": "添加分组",
+  "Add image": "添加图片",
+  "Add notes (optional)": "添加备注（可选）",
+  "Add remote workspace paths": "添加远程工作区路径",
+  "Add to chat": "添加到聊天",
+  "Add workspace instructions for the agent…": "添加此工作区的智能体说明…",
+  "Add workspace prompt": "添加工作区提示词",
+  "Add workspaces": "添加工作区",
+  "Agent access": "智能体访问权限",
+  "Agent model": "智能体模型",
+  "Agent name is required.": "智能体名称必填。",
+  "Agent reasoning effort": "智能体推理强度",
+  "Agent replied.": "智能体已回复。",
+  Agents: "智能体",
+  "Allow commands that start with {command}": "允许以 {command} 开头的命令",
+  "Allows ```lang + Space to include a language.": "允许输入 ```lang 后按空格补全语言。",
+  "Always allow": "始终允许",
+  and: "和",
+  "and create its config file.": "并创建其配置文件。",
+  "answered:": "已回答：",
+  "API key": "API key",
+  "App name required": "应用名称必填",
+  "App version, build metadata, and update controls.": "应用版本、构建元数据和更新控制。",
+  "App-server:": "App-server：",
+  "Apply changes to parent workspace": "应用更改到父工作区",
+  "Apply worktree changes": "应用工作树更改",
+  "Approve (Enter)": "批准（Enter）",
+  "Apps open via `open -a` with optional args.": "应用通过 `open -a` 打开，可带可选参数。",
+  "Apps run as an executable with optional args.": "应用作为可执行文件运行，可带可选参数。",
+  "Argument hint": "参数提示",
+  Arguments: "参数",
+  "Arguments for {name}": "{name} 的参数",
+  "Ask Codex to do something...": "让 Codex 做点什么...",
+  "Ask for changes on hovered line": "针对悬停行请求修改",
+  "Ask for changes on this line": "针对这一行请求修改",
+  "Assign projects to groups and adjust their order.": "将项目分配到分组并调整顺序。",
+  "Auto-detect stays on; this nudges the decoder toward your preference.": "仍会自动检测；此项会引导解码器优先使用你的偏好。",
+  "Auto-wrap code-like single lines": "自动包裹类似代码的单行",
+  "Auto-wrap multi-line paste": "自动包裹多行粘贴",
+  "Automatically check for app updates": "自动检查应用更新",
+  "Available options depend on the selected model.": "可用选项取决于所选模型。",
+  Back: "返回",
+  "Back to chat": "返回聊天",
+  "Backend mode": "后端模式",
+  "Base branches": "基础分支",
+  "Branch name": "分支名称",
+  "Branch name is required.": "分支名称必填。",
+  "Branch:": "分支：",
+  Browse: "浏览",
+  "Build date:": "构建日期：",
+  "Build type:": "构建类型：",
+  "Built-in roles from Codex are still available:": "Codex 内置角色仍然可用：",
+  "By project": "按项目",
+  "By project activity": "按项目活动",
+  Cancel: "取消",
+  "Cancel account switch": "取消账号切换",
+  "Cancel download": "取消下载",
+  "Cancel transcription": "取消转写",
+  Change: "更改",
+  changes: "更改",
+  "Changes save immediately.": "更改会立即保存。",
+  "Check for updates": "检查更新",
+  "Checking out...": "正在检出...",
+  "Checking...": "正在检查...",
+  "Checkout Branch": "检出分支",
+  "Checkout PR #{number} branch": "检出 PR #{number} 分支",
+  "Choose a project to start chatting.": "选择项目以开始聊天。",
+  "Choose a repo for this workspace.": "为此工作区选择仓库。",
+  "Choose a starting point and fine-tune the toggles below.": "选择起点，然后微调下方开关。",
+  "Choose Codex communication style (writes top-level": "选择 Codex 沟通风格（写入顶层",
+  "Choose the default while a run is active. Press {shortcut} to send the opposite behavior for one message.": "选择运行中默认行为。按 {shortcut} 可让单条消息使用相反行为。",
+  "Choose whether": "选择是否让",
+  "Choose…": "选择…",
+  Clear: "清除",
+  "Clear search": "清除搜索",
+  "Clipboard access is unavailable in this environment. Copy the script manually instead.": "此环境无法访问剪贴板。请手动复制脚本。",
+  "Clone and Add": "克隆并添加",
+  "Cloning…": "正在克隆…",
+  Close: "关闭",
+  "Close {title}": "关闭 {title}",
+  "Close add remote modal": "关闭添加远程弹窗",
+  "Close image preview": "关闭图片预览",
+  "Close mobile setup": "关闭移动端设置",
+  "Close search": "关闭搜索",
+  "Close window": "关闭窗口",
+  Code: "代码",
+  Codex: "Codex",
+  "Codex already up-to-date": "Codex 已是最新",
+  "Codex args profile": "Codex 参数配置",
+  "Codex issue detected": "检测到 Codex 问题",
+  "Codex looks good": "Codex 状态正常",
+  "Codex Monitor icon": "Codex Monitor 图标",
+  "Codex update failed": "Codex 更新失败",
+  "Codex updated": "Codex 已更新",
+  "Collaboration mode": "协作模式",
+  Collapse: "折叠",
+  "Collapse all folders": "折叠所有文件夹",
+  "Collapse group": "折叠分组",
+  "Collapse input": "折叠输入框",
+  "Collapse tool calls": "折叠工具调用",
+  "Command required": "命令必填",
+  "Command template (manual fallback) for starting the daemon:": "启动守护进程的命令模板（手动备用）：",
+  "Commands receive the selected path as the final argument.": "命令会把选中的路径作为最后一个参数。",
+  Commit: "提交",
+  "Commit all unstaged changes": "提交所有未暂存更改",
+  "Commit message model": "提交消息模型",
+  "Commit message...": "提交消息...",
+  "Commit staged changes": "提交已暂存更改",
+  "Commit:": "提交：",
+  Commits: "提交",
+  "Committing...": "正在提交...",
+  "Complete required fields": "请补全必填字段",
+  "Complete this setup before using the app. Use the same connection details configured on your desktop CodexMonitor server settings.": "使用应用前请完成此设置。请使用桌面端 CodexMonitor 服务器设置里的相同连接信息。",
+  Composer: "输入框",
+  "Config file": "配置文件",
+  "Configure how CodexMonitor exposes TCP backend access for mobile and remote clients. Desktop usage remains local unless you explicitly connect through remote mode.": "配置 CodexMonitor 如何向移动端和远程客户端暴露 TCP 后端访问。桌面端默认仍使用本地模式，除非你显式切换到远程模式。",
+  "Configure multi-agent mode, limits, and custom agent roles.": "配置多智能体模式、限制和自定义智能体角色。",
+  "Configure per-project setup scripts and worktree locations.": "配置每个项目的安装脚本和工作树位置。",
+  "Configure TCP host/token from your desktop setup, then run a connection test.": "根据桌面端设置配置 TCP 主机和 token，然后运行连接测试。",
+  "Configure the Codex CLI used by CodexMonitor and validate the install.": "配置 CodexMonitor 使用的 Codex CLI 并验证安装。",
+  "Configured Agents": "已配置智能体",
+  "configured listen address": "已配置监听地址",
+  "Confirm Delete": "确认删除",
+  "Confirm rename": "确认重命名",
+  connect: "连接",
+  "Connect & add": "连接并添加",
+  "Connect & test": "连接并测试",
+  "Connect a workspace to load Codex feature flags.": "连接工作区以加载 Codex 功能开关。",
+  "Connect this workspace to load available models.": "连接此工作区以加载可用模型。",
+  "Connect workspace context to the shared Codex server": "将工作区上下文连接到共享 Codex 服务器",
+  "Connecting...": "正在连接...",
+  Content: "内容",
+  "Context free --": "上下文剩余 --",
+  "Context free {percent}%": "上下文剩余 {percent}%",
+  "Continue lists on Shift+Enter": "Shift+Enter 延续列表",
+  "Continues numbered and bulleted lists when the line has content.": "当当前行有内容时，继续编号或项目符号列表。",
+  "Control helpers and formatting behavior inside the message editor.": "控制消息编辑器中的辅助功能和格式化行为。",
+  Copied: "已复制",
+  Copy: "复制",
+  "Copy blocks without fences": "复制代码块时不带围栏",
+  "Copy code block": "复制代码块",
+  "Copy command": "复制命令",
+  "Copy failed": "复制失败",
+  "Copy file name": "复制文件名",
+  "Copy file path": "复制文件路径",
+  "Copy Link": "复制链接",
+  "Copy message": "复制消息",
+  "Copy name": "复制名称",
+  "Copy SHA": "复制 SHA",
+  "Copy thread": "复制线程",
+  "Could not write to the clipboard. Copy the script manually instead.": "无法写入剪贴板。请手动复制脚本。",
+  "Couldn’t load models: {error}": "无法加载模型：{error}",
+  "Couldn’t open file": "无法打开文件",
+  "Couldn’t open workspace": "无法打开工作区",
+  "Couldn't show file in {app}": "无法在 {app} 中显示文件",
+  Create: "创建",
+  "Create {title}": "创建 {title}",
+  "Create a new repository under \"{workspaceName}\" and make an initial commit.": "在“{workspaceName}”下创建新仓库并进行初始提交。",
+  "Create a new working copy of \"{workspaceName}\".": "为“{workspaceName}”创建新的工作副本。",
+  "Create a worktree under \"{workspaceName}\".": "在“{workspaceName}”下创建工作树。",
+  "Create Agent": "创建智能体",
+  "Create branch \"{branch}\"": "创建分支“{branch}”",
+  "Create GitHub repository and set up": "创建 GitHub 仓库并设置",
+  "Create group labels for related repositories.": "为相关仓库创建分组标签。",
+  "Create one here or drop a .md file into": "在这里创建一个，或将 .md 文件拖入",
+  "Create one here or drop a .md file into the": "在这里创建一个，或将 .md 文件拖入",
+  Created: "已创建",
+  "Creating...": "正在创建...",
+  current: "当前",
+  "Current name: \"{name}\"": "当前名称：“{name}”",
+  "Current version": "当前版本",
+  "Currently running version": "当前运行版本",
+  "Custom location for this project's worktrees. Leave empty to use the global root or the built-in default.": "此项目工作树的自定义位置。留空时使用全局根目录或内置默认值。",
+  "Customize keyboard shortcuts for file actions, composer, panels, and navigation.": "自定义文件操作、输入框、面板和导航快捷键。",
+  "Customize the Open in menu shown in the title bar and file previews.": "自定义标题栏和文件预览中显示的“打开方式”菜单。",
+  Decline: "拒绝",
+  "Decrease max depth": "减少最大深度",
+  "Decrease max threads": "减少最大线程数",
+  "Default Codex args": "默认 Codex 参数",
+  "Default Codex path": "默认 Codex 路径",
+  "Default location for new worktrees when a project does not override it. Each project gets its own subfolder under this root.": "项目未覆盖时，新工作树的默认位置。每个项目会在此根目录下拥有自己的子文件夹。",
+  "Default parameters": "默认参数",
+  "Default: {behavior}. Press {shortcut} to {intent} this message.": "默认：{behavior}。按 {shortcut} 可让此消息执行{intent}。",
+  "Default: {shortcut}": "默认：{shortcut}",
+  "Default: Queue (Steer unavailable). Both Enter and {shortcut} will queue this message.": "默认：排队（无法引导）。Enter 和 {shortcut} 都会将此消息加入队列。",
+  "Defaults to repo name": "默认使用仓库名",
+  "Delete {name}": "删除 {name}",
+  "Delete agent and managed config file?": "删除智能体及其托管配置文件？",
+  "Delete group": "删除分组",
+  "Delete project": "删除项目",
+  "Delete remote": "删除远程",
+  "Delete remote confirmation": "删除远程确认",
+  "Deleted image": "已删除图片",
+  "Deleting...": "正在删除...",
+  "Describe what you want to change in the plan...": "描述你希望如何修改计划...",
+  Description: "描述",
+  "Destination parent folder": "目标父文件夹",
+  "Detect Tailscale": "检测 Tailscale",
+  "Developer instructions": "开发者说明",
+  Dictation: "语音输入",
+  "Dictation disabled. Open settings": "语音输入已禁用。打开设置",
+  "Dictation model": "语音输入模型",
+  "Diff view": "Diff 视图",
+  "Discard all changes": "丢弃所有更改",
+  "Discard All Changes": "丢弃所有更改",
+  "Discard change": "丢弃更改",
+  "Discard changes": "丢弃更改",
+  "Discard Changes": "丢弃更改",
+  "Discard changes ({count})": "丢弃更改（{count}）",
+  "Discard changes in these files?\n\n{preview}{more}\n\nThis cannot be undone.": "丢弃这些文件中的更改？\n\n{preview}{more}\n\n此操作无法撤销。",
+  "Discard changes in this file": "丢弃此文件中的更改",
+  "Discard changes in:\n\n{path}\n\nThis cannot be undone.": "丢弃以下路径中的更改：\n\n{path}\n\n此操作无法撤销。",
+  Dismiss: "关闭",
+  "Dismiss error": "关闭错误",
+  "Displays queue/steer shortcut guidance above the composer.": "在输入框上方显示排队/引导快捷键提示。",
+  "Do you want to update the upstream branch to": "是否要将上游分支更新为",
+  "Done in {duration}": "耗时 {duration}",
+  "Download & Install": "下载并安装",
+  "Download error.": "下载出错。",
+  "Download Linked File": "下载链接文件",
+  "Download model": "下载模型",
+  "Download size: {size}.": "下载大小：{size}。",
+  "Downloading model...": "正在下载模型...",
+  "Downloading update...": "正在下载更新...",
+  "Downloading update…": "正在下载更新…",
+  "Downloads the selected Whisper model on first use.": "首次使用时下载所选 Whisper 模型。",
+  "Dual-panel diff": "双栏 Diff",
+  "e.g. npm run dev": "例如 npm run dev",
+  "Edit File": "编辑文件",
+  "Edit the global Codex config.toml…": "编辑全局 Codex config.toml…",
+  "Enable dictation": "启用语音输入",
+  "Enable microphone dictation with on-device transcription.": "启用麦克风语音输入，并在本机转写。",
+  "Enable Multi-Agent": "启用多智能体",
+  "Enter a commit message": "输入提交消息",
+  "Enter directories on the connected server.": "输入已连接服务器上的目录。",
+  Environments: "环境",
+  "Expand all folders": "展开所有文件夹",
+  "Expand fences on Enter": "按 Enter 展开代码围栏",
+  "Expand fences on Space": "按空格展开代码围栏",
+  "Expand group": "展开分组",
+  "Expand input": "展开输入框",
+  "Expand tool calls": "展开工具调用",
+  "Experimental Features": "实验性功能",
+  Explored: "已探索",
+  Exploring: "探索中",
+  "Export .md": "导出 .md",
+  "Exporting...": "正在导出...",
+  "Extra flags passed before": "在以下命令前传入的额外参数",
+  failed: "失败",
+  "Failed to open folder picker": "无法打开文件夹选择器",
+  "Fast mode enabled": "已启用快速模式",
+  Features: "功能",
+  "Fetch remote": "获取远程",
+  "Fetching remote": "正在获取远程",
+  "Fetching remote...": "正在获取远程...",
+  "File actions": "文件操作",
+  "file edited": "个文件已编辑",
+  Files: "文件",
+  "files edited": "个文件已编辑",
+  "Filter files and folders": "筛选文件和文件夹",
+  "Filter prompts": "筛选提示词",
+  "Focus on correctness, edge cases, and missing tests.": "关注正确性、边界情况和缺失测试。",
+  "for multi-line selection": "用于多行选择",
+  "from saved remotes? This only removes the profile from this device.": "从已保存远程中移除？这只会从本设备删除该配置。",
+  "Generate commit message": "生成提交消息",
+  "Generate description and developer instructions with AI": "用 AI 生成描述和开发者说明",
+  "Generate fields for {name}": "为 {name} 生成字段",
+  "Generate fields for new agent": "为新智能体生成字段",
+  Git: "Git",
+  "Git is not initialized for this project.": "此项目尚未初始化 Git。",
+  "Git panel": "Git 面板",
+  "Git panel view": "Git 面板视图",
+  "Git root folder not found.": "未找到 Git 根文件夹。",
+  "Git setup": "Git 设置",
+  "GitHub repo": "GitHub 仓库",
+  "Global AGENTS.md": "全局 AGENTS.md",
+  "Global config.toml": "全局 config.toml",
+  "Global worktrees root": "全局工作树根目录",
+  "Go to Projects": "前往项目",
+  "Group related workspaces and reorder projects within each group.": "对相关工作区分组，并调整每组内项目顺序。",
+  Groups: "分组",
+  "Hide agents": "隐藏智能体",
+  "Hide git sidebar": "隐藏 Git 侧边栏",
+  "Hide sub-agents": "隐藏子智能体",
+  "Hide threads sidebar": "隐藏线程侧边栏",
+  "Hides whitespace-only changes in local and commit diffs.": "在本地和提交 Diff 中隐藏纯空白更改。",
+  "Hold the key to start dictation, release to stop and process.": "按住按键开始语音输入，松开后停止并处理。",
+  "Hold-to-dictate key": "按住语音输入键",
+  "If disabled, CodexMonitor stops managed TCP daemon processes before exit.": "禁用后，CodexMonitor 退出前会停止托管的 TCP 守护进程。",
+  "Ignore whitespace changes": "忽略空白更改",
+  Image: "图片",
+  "Image {index}": "图片 {index}",
+  "Image preview": "图片预览",
+  "Image preview unavailable.": "图片预览不可用。",
+  Images: "图片",
+  "Implement this plan": "执行此计划",
+  "in config.toml.": "写入 config.toml。",
+  "in config.toml).": "写入 config.toml）。",
+  Incomplete: "未完成",
+  "Increase max depth": "增加最大深度",
+  "Increase max threads": "增加最大线程数",
+  "Initial branch": "初始分支",
+  Initialize: "初始化",
+  "Initializing...": "正在初始化...",
+  "Install Tailscale on both desktop and iOS to continue.": "请在桌面端和 iOS 上安装 Tailscale 后继续。",
+  "Installing update...": "正在安装更新...",
+  "Instances are preparing...": "实例正在准备...",
+  Instructions: "说明",
+  "into the worktree": "到工作树",
+  "is available.": "可用。",
+  "Jump to first file": "跳到第一个文件",
+  "Keep daemon running after app closes": "应用关闭后保持守护进程运行",
+  "Keep queued messages paused while Codex is waiting for plan accept/changes or your answers.": "当 Codex 等待计划确认/修改或你的回答时，暂停队列消息。",
+  "Label required": "标签必填",
+  "Last connected:": "上次连接：",
+  "Last review thread: {threadId}": "上次评审线程：{threadId}",
+  Later: "稍后",
+  "Lines {start}-{end}": "第 {start}-{end} 行",
+  "Load older...": "加载更早内容...",
+  "Loading agents": "正在加载智能体",
+  "Loading comments…": "正在加载评论…",
+  "Loading diff...": "正在加载 Diff...",
+  "Loading files": "正在加载文件",
+  "Loading models from the first workspace…": "正在从第一个工作区加载模型…",
+  "Loading workspace model metadata. Using fallback model defaults for now.": "正在加载工作区模型元数据。暂时使用备用模型默认值。",
+  "Loading...": "正在加载...",
+  Local: "本地",
+  "Local keeps desktop requests in-process. Remote routes desktop requests through the same TCP transport path used by mobile clients.": "本地模式让桌面请求在进程内处理。远程模式会让桌面请求走与移动客户端相同的 TCP 传输路径。",
+  "Make an edit, stage a file, or select a commit to inspect changes here.": "编辑文件、暂存文件，或选择提交后可在此检查更改。",
+  "Make sure your desktop app daemon is running and reachable on Tailscale, then retry this test.": "请确认桌面端应用守护进程正在运行，并且可通过 Tailscale 访问，然后重试测试。",
+  "Make viewing git diff faster.": "加快 Git Diff 查看速度。",
+  "Manage custom roles and their per-agent config files.": "管理自定义角色及其每智能体配置文件。",
+  "Manage how diffs are loaded in the Git sidebar.": "管理 Git 侧边栏中 Diff 的加载方式。",
+  "Manage stable and experimental Codex features.": "管理稳定和实验性 Codex 功能。",
+  "matching your configured host port.": "与你配置的主机端口匹配。",
+  "Max Depth": "最大深度",
+  "Max depth must be an integer between {min} and {max}.": "最大深度必须是 {min} 到 {max} 之间的整数。",
+  "Max Threads": "最大线程数",
+  "Max threads must be an integer between {min} and {max}.": "最大线程数必须是 {min} 到 {max} 之间的整数。",
+  "Maximize window": "最大化窗口",
+  "Maximum agent depth": "最大智能体深度",
+  "Maximum agent threads": "最大智能体线程数",
+  "Maximum nested spawn depth. Valid range:": "最大嵌套派生深度。有效范围：",
+  "Maximum open agent threads. Valid range:": "最大打开智能体线程数。有效范围：",
+  "Mention {name}": "提及 {name}",
+  "Mention in chat": "在聊天中提及",
+  "Method:": "方法：",
+  "Minimize window": "最小化窗口",
+  missing: "缺失",
+  "Mobile access should stay scoped to your own infrastructure (tailnet). CodexMonitor does not provide hosted backend services.": "移动访问应限制在你自己的基础设施（tailnet）内。CodexMonitor 不提供托管后端服务。",
+  "Mobile daemon is in an error state.": "移动端守护进程处于错误状态。",
+  "Mobile daemon is running (pid {pid}) on {address}.": "移动端守护进程正在 {address} 运行（pid {pid}）。",
+  "Mobile daemon is running on {address}.": "移动端守护进程正在 {address} 运行。",
+  "Mobile daemon is stopped ({address}).": "移动端守护进程已停止（{address}）。",
+  "Mobile daemon is stopped.": "移动端守护进程已停止。",
+  "Mobile server setup": "移动端服务器设置",
+  Model: "模型",
+  "Model not downloaded yet.": "模型尚未下载。",
+  "Model status ({model})": "模型状态（{model}）",
+  "model:": "模型：",
+  "Monitor the situation of your Codex agents": "监控你的 Codex 智能体状态",
+  "More actions": "更多操作",
+  "More...": "更多...",
+  "Move {name} down": "下移 {name}",
+  "Move {name} up": "上移 {name}",
+  "Move down": "下移",
+  "Move group down": "下移分组",
+  "Move group up": "上移分组",
+  "Move project down": "下移项目",
+  "Move project up": "上移项目",
+  "Move up": "上移",
+  "Multiline per-agent developer instructions.": "每个智能体的多行开发者说明。",
+  "Name cannot include whitespace.": "名称不能包含空白字符。",
+  "Name is required.": "名称必填。",
+  Never: "从不",
+  New: "新建",
+  "New agent": "新智能体",
+  "New group name": "新分组名称",
+  "New image": "新图片",
+  "New message will be fetched in {seconds} seconds": "{seconds} 秒后获取新消息",
+  "New name": "新名称",
+  "New remote host": "新远程主机",
+  "New remote name": "新远程名称",
+  "New remote token": "新远程 token",
+  "New terminal": "新终端",
+  "New thread in project": "在项目中新建线程",
+  "No active plan.": "没有活动计划。",
+  "No answer provided": "未提供答案",
+  "No answer provided.": "未提供答案。",
+  "No branches found": "未找到分支",
+  "No changes to commit": "没有可提交的更改",
+  "No comment body.": "无评论正文。",
+  "No comments yet.": "暂无评论。",
+  "No commits": "暂无提交",
+  "No conversations match your search.": "没有匹配搜索的会话。",
+  "No conversations yet": "暂无会话",
+  "No description.": "无描述。",
+  "No extra details.": "无额外详情。",
+  "No file changes in this pull request": "此拉取请求没有文件更改",
+  "No files": "无文件",
+  "No files available.": "没有可用文件。",
+  "No instances were started.": "未启动任何实例。",
+  "No local changes were detected for the current workspace.": "当前工作区未检测到本地更改。",
+  "No matches found.": "未找到匹配项。",
+  "No matching branches": "没有匹配分支",
+  "No message": "无消息",
+  "No modified": "无已修改",
+  "No modified files match your filter.": "没有已修改文件匹配筛选条件。",
+  "No modified files.": "没有已修改文件。",
+  "No non-whitespace changes.": "没有非空白更改。",
+  "No preview or under-development feature flags returned by Codex.": "Codex 未返回预览或开发中的功能开关。",
+  "No prompts": "无提示词",
+  "No questions provided.": "未提供问题。",
+  "No selection": "未选择",
+  "No shortcuts match \"{query}\".": "没有快捷键匹配“{query}”。",
+  "No shortcuts match your search.": "没有快捷键匹配搜索条件。",
+  "No upstream configured": "未配置上游",
+  "No workspace selected": "未选择工作区",
+  "Node:": "节点：",
+  None: "无",
+  "Not found": "未找到",
+  "Not set": "未设置",
+  "not supported": "不支持",
+  Now: "现在",
+  ok: "正常",
+  "ok ({version})": "正常（{version}）",
+  "One path per line. Comma and semicolon separators also work. You can use `~/...`.": "每行一个路径。也可用逗号和分号分隔。可使用 `~/...`。",
+  "Open app args {index}": "打开应用参数 {index}",
+  "Open app command {index}": "打开应用命令 {index}",
+  "Open app label {index}": "打开应用标签 {index}",
+  "Open app name {index}": "打开应用名称 {index}",
+  "Open app type {index}": "打开应用类型 {index}",
+  "Open debug log": "打开调试日志",
+  "Open dictation settings": "打开语音输入设置",
+  "Open global Codex config in {app}.": "在 {app} 中打开全局 Codex 配置。",
+  "Open home": "打开首页",
+  "Open image {index}": "打开图片 {index}",
+  "Open in": "打开方式",
+  "Open in {app}": "在 {app} 中打开",
+  "Open on GitHub": "在 GitHub 上打开",
+  "Open settings": "打开设置",
+  "Open the Codex config in {app}.": "在 {app} 中打开 Codex 配置。",
+  "Open this worktree in your terminal.": "在终端中打开此工作树。",
+  "Opening...": "正在打开...",
+  "Optional argument hint": "可选参数提示",
+  "Optional description": "可选描述",
+  "Optional label": "可选标签",
+  "Orchestrate agents across your local projects.": "在本地项目间编排智能体。",
+  "Organize and sort threads": "组织并排序线程",
+  output: "输出",
+  "Package:": "包：",
+  Panel: "面板",
+  "Pasted image": "已粘贴图片",
+  "PATH:": "PATH：",
+  Paths: "路径",
+  "Pause queued messages when a response is required": "需要响应时暂停队列消息",
+  "Per-thread override processing ignores unsupported flags:": "每线程覆盖处理会忽略不支持的标志：",
+  Personality: "个性",
+  "Pick folder": "选择文件夹",
+  "Plan export failed": "计划导出失败",
+  "Plan mode": "计划模式",
+  "PR selection actions": "PR 选择操作",
+  "Preferred dictation language": "首选语音输入语言",
+  "Preload git diffs": "预加载 Git Diff",
+  Preset: "预设",
+  "Presets update the toggles below. Customize any setting after selecting.": "预设会更新下方开关。选择后仍可自定义任意设置。",
+  "Press a new shortcut while focused. Default: {shortcut}": "聚焦时按下新的快捷键。默认：{shortcut}",
+  "Preview and under-development features.": "预览版和开发中的功能。",
+  "Previous version": "上一版本",
+  "Production-ready features enabled by default.": "默认启用的生产可用功能。",
+  Project: "项目",
+  Projects: "项目",
+  "Prompt actions": "提示词操作",
+  "Prompt content": "提示词内容",
+  "Prompt name": "提示词名称",
+  Pull: "拉取",
+  "Pull {count} commit": "拉取 {count} 个提交",
+  "Pull {count} commits": "拉取 {count} 个提交",
+  "Pull latest changes and push your local commits": "拉取最新更改并推送本地提交",
+  "Pull request summary": "拉取请求摘要",
+  "Pulling...": "正在拉取...",
+  "Push {count} commit": "推送 {count} 个提交",
+  "Push {count} commits": "推送 {count} 个提交",
+  "Question {index}": "问题 {index}",
+  queue: "排队",
+  "Queue item menu": "队列项菜单",
+  "Quote message": "引用消息",
+  "Ready for dictation.": "语音输入已就绪。",
+  "Reasoning effort": "推理强度",
+  "reasoning:": "推理：",
+  Refresh: "刷新",
+  "Refresh {title}": "刷新 {title}",
+  "Refresh all workspace threads": "刷新所有工作区线程",
+  "Refresh current thread from server": "从服务器刷新当前线程",
+  "Refresh daemon command": "刷新守护进程命令",
+  "Refresh status": "刷新状态",
+  "Refresh usage": "刷新用量",
+  "Refreshing diff...": "正在刷新 Diff...",
+  "Refreshing...": "正在刷新...",
+  "Remote backend host": "远程后端主机",
+  "Remote backend token": "远程后端 token",
+  "Remote backend token is empty. Set one before exposing daemon access.": "远程后端 token 为空。暴露守护进程访问前请先设置。",
+  "Remote Git URL": "远程 Git URL",
+  "Remote has new commits. Sync (pull then push) before retrying.": "远程有新提交。重试前请先同步（拉取后推送）。",
+  "Remote is ahead. Pull first, or use Sync.": "远程领先。请先拉取，或使用同步。",
+  "Remote name": "远程名称",
+  Remove: "移除",
+  "Remove {title}": "移除 {title}",
+  "Remove app": "移除应用",
+  "Remove model": "移除模型",
+  Rename: "重命名",
+  "Rename managed config file when agent name changes": "智能体名称变更时重命名托管配置文件",
+  "Repository name cannot contain spaces.": "仓库名称不能包含空格。",
+  "Repository name is required.": "仓库名称必填。",
+  "Request 1 of {count}": "{count} 个请求中的第 1 个",
+  Reset: "重置",
+  "Resize chat/diff split": "调整聊天/Diff 分割",
+  "Resize plan panel": "调整计划面板大小",
+  "Resize projects": "调整项目区域大小",
+  "Resize right panel": "调整右侧面板大小",
+  "Resize sidebar": "调整侧边栏大小",
+  "Resize terminal panel": "调整终端面板大小",
+  "Restarting...": "正在重启...",
+  "Restore window": "还原窗口",
+  Retry: "重试",
+  Review: "评审",
+  "Review completed": "评审已完成",
+  "Review in progress. Chat will re-enable when it completes.": "评审进行中。完成后聊天会重新启用。",
+  "Review mode": "评审模式",
+  "Review started": "评审已开始",
+  "Review tools": "评审工具",
+  "Review Uncommitted Changes": "评审未提交更改",
+  Reviewing: "评审中",
+  "Run a Codex session to start tracking local usage.": "运行一次 Codex 会话后开始跟踪本地用量。",
+  "Run doctor": "运行 doctor",
+  "Run launch script": "运行启动脚本",
+  "Running...": "运行中...",
+  "runs in the current thread or a detached review thread.": "在当前线程或独立评审线程中运行。",
+  "Runs once in a dedicated terminal after each new worktree is created.": "每次创建新工作树后，会在专用终端中运行一次。",
+  Save: "保存",
+  "Save {title}": "保存 {title}",
+  "Saving...": "正在保存...",
+  "Saving…": "正在保存…",
+  "Scan workspace": "扫描工作区",
+  Scope: "范围",
+  "Search branches": "搜索分支",
+  "Search branches...": "搜索分支...",
+  "Search conversations": "搜索会话",
+  "Search older...": "搜索更早内容...",
+  "Search or create branch": "搜索或创建分支",
+  "Search shortcuts": "搜索快捷键",
+  "Search threads": "搜索线程",
+  "Select a base branch": "选择基础分支",
+  "Select a commit to review": "选择要评审的提交",
+  "Select a git root first.": "请先选择 Git 根目录。",
+  "Select a project to inspect diffs.": "选择项目以检查 Diff。",
+  "Select a review preset": "选择评审预设",
+  "Select editor": "选择编辑器",
+  "Select global worktrees root": "选择全局工作树根目录",
+  "Select models": "选择模型",
+  "Select run mode": "选择运行模式",
+  "Select worktrees folder": "选择工作树文件夹",
+  Send: "发送",
+  "Send a prompt to start a new agent.": "发送提示词以启动新智能体。",
+  "Send a prompt to the agent.": "向智能体发送提示词。",
+  "Send changes": "发送修改",
+  "Send to a new agent": "发送到新智能体",
+  "Send to current agent": "发送到当前智能体",
+  Server: "服务器",
+  Session: "会话",
+  "Set app name in Settings": "在设置中填写应用名称",
+  "Set command in Settings": "在设置中填写命令",
+  "Set launch script": "设置启动脚本",
+  "Setup script": "安装脚本",
+  "Shift + click or drag + click": "Shift + 点击或拖拽点击",
+  "Short role summary.": "简短角色摘要。",
+  Shortcuts: "快捷键",
+  "Show agents": "显示智能体",
+  "Show all": "显示全部",
+  "Show all files": "显示所有文件",
+  "Show follow-up hint while processing": "处理时显示跟进提示",
+  "Show git sidebar": "显示 Git 侧边栏",
+  "Show in {app}": "在 {app} 中显示",
+  "Show less": "收起",
+  "Show modified files only": "仅显示已修改文件",
+  "Show next week": "显示下一周",
+  "Show previous week": "显示上一周",
+  "Show sub-agents": "显示子智能体",
+  "Show threads sidebar": "显示线程侧边栏",
+  "Showing the first part of a large file.": "正在显示大文件的开头部分。",
+  "Sign in": "登录",
+  "Sign in to Codex": "登录 Codex",
+  "Single-column diff": "单栏 Diff",
+  "Sourced from the first workspace and used when there is no thread-specific override.": "来自第一个工作区，并在没有线程级覆盖时使用。",
+  "Stable Features": "稳定功能",
+  "Stage all changes": "暂存所有更改",
+  "Stage All Changes": "暂存所有更改",
+  "Stage Changes": "暂存更改",
+  "Stage file": "暂存文件",
+  "Stage files ({count})": "暂存文件（{count}）",
+  Staged: "已暂存",
+  "Start a run to see its instances tracked here.": "启动一次运行后可在此跟踪其实例。",
+  "Start a thread to see the latest responses here.": "启动线程后可在这里查看最新回复。",
+  "Start building from this plan, or describe changes to the plan.": "从此计划开始构建，或描述要修改的地方。",
+  "Start daemon": "启动守护进程",
+  "Start dictation": "开始语音输入",
+  "Start review": "开始评审",
+  "Start this daemon before connecting from iOS. It uses your current token and listens on": "从 iOS 连接前请启动此守护进程。它会使用当前 token 并监听",
+  "Started at:": "开始于：",
+  "Starting...": "正在启动...",
+  steer: "引导",
+  "Steer is unavailable in the current Codex config.": "当前 Codex 配置不支持引导。",
+  "Steer is unavailable in the current Codex config. Follow-ups will queue.": "当前 Codex 配置不支持引导。跟进消息会排队。",
+  Stop: "停止",
+  "Stop daemon": "停止守护进程",
+  "Stop dictation": "停止语音输入",
+  "Stopping...": "正在停止...",
+  "Stored at": "存储于",
+  "Stored on the project (Settings → Environments) and runs once in a dedicated terminal after each new worktree is created.": "存储在项目中（设置 → 环境），并在每次创建新工作树后于专用终端运行一次。",
+  Submit: "提交",
+  "Suggested copies folder": "建议副本文件夹",
+  "Suggested remote host:": "建议远程主机：",
+  "Support language tags": "支持语言标签",
+  "Switch account": "切换账号",
+  "Switch branch": "切换分支",
+  "Switch the active remote here. The fields below edit the active entry.": "在此切换当前远程。下方字段会编辑当前条目。",
+  "Sync (pull then push)": "同步（先拉取再推送）",
+  "Syncing...": "正在同步...",
+  "Tailnet:": "Tailnet：",
+  "Tailscale host": "Tailscale 主机",
+  "Target folder name (optional)": "目标文件夹名称（可选）",
+  Terminal: "终端",
+  "Terminal (repo root)": "终端（仓库根目录）",
+  "Terminal tabs": "终端标签页",
+  "The model used when generating commit messages. Leave on default to use the workspace model.": "生成提交消息时使用的模型。保留默认值会使用工作区模型。",
+  "The pull request loaded, but there are no diff hunks to render for this selection.": "拉取请求已加载，但此选择没有可渲染的 Diff hunks。",
+  "The selected model does not expose reasoning effort options.": "所选模型未暴露推理强度选项。",
+  "These settings apply to the shared Codex app-server used across all connected workspaces.": "这些设置应用于所有已连接工作区共享的 Codex app-server。",
+  "Thinking mode": "思考模式",
+  "This host/token is used by mobile clients and desktop remote-mode testing.": "此主机/token 用于移动客户端和桌面远程模式测试。",
+  "This workspace isn't a Git repository yet.": "此工作区还不是 Git 仓库。",
+  "Thread list": "线程列表",
+  "Threads from the sidebar will appear here.": "侧边栏中的线程会显示在这里。",
+  Time: "时间",
+  "to insert the git diff.": "以插入 Git Diff。",
+  "Toggle answered input details": "切换已回答输入详情",
+  "Toggle models menu": "切换模型菜单",
+  "Toggle reasoning details": "切换推理详情",
+  "Toggle run mode menu": "切换运行模式菜单",
+  "Toggle search": "切换搜索",
+  "Toggle tool details": "切换工具详情",
+  Token: "Token",
+  "Token (required)": "Token（必填）",
+  "Top models": "常用模型",
+  "Try switching to another pull request or commit from the Git panel.": "尝试从 Git 面板切换到其他拉取请求或提交。",
+  "Type shortcut": "输入快捷键",
+  "Type your answer (optional)": "输入你的答案（可选）",
+  "Typing ``` then Space inserts a fenced block.": "输入 ``` 后按空格会插入代码围栏。",
+  "Unable to add remote.": "无法添加远程。",
+  "Unable to export plan.": "无法导出计划。",
+  "Unable to open path.": "无法打开路径。",
+  unknown: "未知",
+  Unknown: "未知",
+  "Unstage all changes": "取消暂存所有更改",
+  "Unstage All Changes": "取消暂存所有更改",
+  "Unstage Changes": "取消暂存更改",
+  "Unstage file": "取消暂存文件",
+  "Unstage files ({count})": "取消暂存文件（{count}）",
+  Unstaged: "未暂存",
+  "Update Codex": "更新 Codex",
+  "Update failed:": "更新失败：",
+  "Update upstream": "更新上游",
+  Updated: "已更新",
+  "Updated successfully. Here is what is new:": "更新成功。以下是更新内容：",
+  "Updated successfully. Loading release notes...": "更新成功。正在加载发行说明...",
+  "Updated to v{version}. Release notes could not be loaded.": "已更新到 v{version}。无法加载发行说明。",
+  "Updates are unavailable in this runtime.": "当前运行环境不支持更新。",
+  "Updating...": "正在更新...",
+  "Upstream {upstream}": "上游 {upstream}",
+  "Usage view": "用量视图",
+  "Usage week": "用量周",
+  "Usage week {start} to {end}": "用量周：{start} 至 {end}",
+  Use: "使用",
+  "Use {name} remote": "使用 {name} 远程",
+  "Use Enter to expand ``` lines when enabled.": "启用后，按 Enter 会展开 ``` 行。",
+  "Use PATH": "使用 PATH",
+  "Use quotes for values with spaces.": "包含空格的值请使用引号。",
+  "Use suggested": "使用建议值",
+  "Use suggested host": "使用建议主机",
+  "Use the Tailscale host from desktop Server settings and keep the desktop daemon running.": "使用桌面端服务器设置中的 Tailscale 主机，并保持桌面守护进程运行。",
+  "Use the Tailscale host from your desktop CodexMonitor app (Server section), for example `macbook.your-tailnet.ts.net:4732`.": "使用桌面端 CodexMonitor 应用（服务器部分）里的 Tailscale 主机，例如 `macbook.your-tailnet.ts.net:4732`。",
+  "Use workspace root": "使用工作区根目录",
+  "Use your own infrastructure only. On iOS, get the Tailscale hostname and token from your desktop CodexMonitor setup.": "仅使用你自己的基础设施。在 iOS 上，请从桌面端 CodexMonitor 设置获取 Tailscale 主机名和 token。",
+  "Used when generating commit messages. Include": "用于生成提交消息。包含",
+  "Used when there is no thread-specific override.": "没有线程级覆盖时使用。",
+  "User input requested": "需要用户输入",
+  Using: "使用中",
+  "Using fallback model defaults until workspace model metadata is available.": "在工作区模型元数据可用前使用备用模型默认值。",
+  Version: "版本",
+  "Version —": "版本 —",
+  "Version {version}": "版本 {version}",
+  "Version:": "版本：",
+  "Version: {version}": "版本：{version}",
+  "View on GitHub": "在 GitHub 上查看",
+  Waiting: "等待中",
+  "Waiting on a plan...": "正在等待计划...",
+  Weekly: "每周",
+  "When enabled, CodexMonitor checks for new app versions on launch.": "启用后，CodexMonitor 会在启动时检查应用新版本。",
+  "When enabled, Copy is plain text. Hold {key} to include ``` fences.": "启用后，复制为纯文本。按住 {key} 可包含 ``` 围栏。",
+  "Window controls": "窗口控制",
+  "Working tree is clean": "工作树干净",
+  "Working…": "工作中…",
+  "workspace prompts folder": "工作区提示词文件夹",
+  worktree: "工作树",
+  "Worktree info": "工作树信息",
+  "Worktrees folder": "工作树文件夹",
+  "Wrap selection in fences": "用代码围栏包裹选区",
+  "Wraps long single-line code snippets on paste.": "粘贴较长单行代码片段时自动包裹。",
+  "Wraps multi-line paste inside a fenced block.": "将多行粘贴内容包裹在代码围栏中。",
+  "Wraps selected text when creating a fence.": "创建代码围栏时包裹所选文本。",
+  Writes: "写入",
+  "You’re up to date.": "当前已是最新版本。",
+};
+
+type I18nContextValue = {
+  locale: AppLocale;
+  language: AppLanguagePreference;
+  t: Translate;
+  tx: TranslateText;
+};
+
+const fallbackLocale: AppLocale = "en";
+
+function getNavigatorLanguages(): readonly string[] {
+  if (typeof navigator === "undefined") {
+    return [];
+  }
+  if (Array.isArray(navigator.languages) && navigator.languages.length > 0) {
+    return navigator.languages;
+  }
+  return navigator.language ? [navigator.language] : [];
+}
+
+function interpolate(template: string, values?: TranslationValues): string {
+  if (!values) {
+    return template;
+  }
+  return template.replace(/\{(\w+)\}/g, (match, key) => {
+    const value = values[key];
+    return value == null ? match : String(value);
+  });
+}
+
+export function normalizeLanguagePreference(value: unknown): AppLanguagePreference {
+  return value === "en" || value === "zh-CN" || value === "system"
+    ? value
+    : "system";
+}
+
+export function resolveLocale(
+  language: AppLanguagePreference,
+  systemLanguages: readonly string[] = getNavigatorLanguages(),
+): AppLocale {
+  if (language !== "system") {
+    return language;
+  }
+  const firstMatch = systemLanguages.find((entry) => entry.trim().length > 0);
+  return firstMatch?.toLowerCase().startsWith("zh") ? "zh-CN" : fallbackLocale;
+}
+
+export function translate(
+  locale: AppLocale,
+  key: TranslationKey,
+  values?: TranslationValues,
+): string {
+  const template = translations[locale][key] ?? translations[fallbackLocale][key] ?? key;
+  return interpolate(template, values);
+}
+
+export function translateText(
+  locale: AppLocale,
+  source: string,
+  values?: TranslationValues,
+): string {
+  const template =
+    locale === "zh-CN"
+      ? (zhCNTextTranslations[source] ?? zhCNAdditionalTextTranslations[source])
+      : undefined;
+  return interpolate(template ?? source, values);
+}
+
+const defaultI18nContext: I18nContextValue = {
+  locale: fallbackLocale,
+  language: "system",
+  t: (key, values) => translate(fallbackLocale, key, values),
+  tx: (source, values) => translateText(fallbackLocale, source, values),
+};
+
+const I18nContext = createContext<I18nContextValue>(defaultI18nContext);
+
+export function I18nProvider({
+  children,
+  language,
+}: {
+  children: ReactNode;
+  language: AppLanguagePreference;
+}) {
+  const normalizedLanguage = normalizeLanguagePreference(language);
+  const locale = resolveLocale(normalizedLanguage);
+
+  useEffect(() => {
+    if (typeof document === "undefined") {
+      return;
+    }
+    document.documentElement.lang = locale;
+  }, [locale]);
+
+  const value = useMemo<I18nContextValue>(
+    () => ({
+      locale,
+      language: normalizedLanguage,
+      t: (key, values) => translate(locale, key, values),
+      tx: (source, values) => translateText(locale, source, values),
+    }),
+    [locale, normalizedLanguage],
+  );
+
+  return <I18nContext.Provider value={value}>{children}</I18nContext.Provider>;
+}
+
+export function useI18n(): I18nContextValue {
+  return useContext(I18nContext);
+}
diff --git a/src/types.ts b/src/types.ts
index 51b1515c9..32cd7920e 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -206,6 +206,7 @@ export type RemoteBackendTarget = {
   lastConnectedAtMs?: number | null;
 };
 export type ThemePreference = "system" | "light" | "dark" | "dim";
+export type AppLanguagePreference = "system" | "en" | "zh-CN";
 export type PersonalityPreference = "friendly" | "pragmatic";
 export type FollowUpMessageBehavior = "queue" | "steer";
 export type ComposerSendIntent = "default" | "queue" | "steer";
@@ -269,6 +270,7 @@ export type AppSettings = {
   lastComposerReasoningEffort: string | null;
   uiScale: number;
   theme: ThemePreference;
+  appLanguage: AppLanguagePreference;
   usageShowRemaining: boolean;
   showMessageFilePath: boolean;
   chatHistoryScrollbackItems: number | null;

From 8a2dd1f87c42a0b331f5a243b9752cc80adb763a Mon Sep 17 00:00:00 2001
From: allen <allen@gzj2001.com>
Date: Fri, 24 Apr 2026 05:41:12 +0800
Subject: [PATCH 2/2] docs(i18n): add Chinese README and localization guide

---
 README.md            |   3 +
 README.zh-CN.md      | 321 +++++++++++++++++++++++++++++++++++++++++++
 docs/codebase-map.md |   1 +
 docs/i18n.md         | 206 +++++++++++++++++++++++++++
 4 files changed, 531 insertions(+)
 create mode 100644 README.zh-CN.md
 create mode 100644 docs/i18n.md

diff --git a/README.md b/README.md
index 8b21f43dd..eb9315def 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # CodexMonitor
 
+Language: English | [简体中文](README.zh-CN.md)
+
 [![gitcgr](https://gitcgr.com/badge/Dimillian/CodexMonitor.svg)](https://gitcgr.com/Dimillian/CodexMonitor)
 
 ![CodexMonitor](screenshot.png)
@@ -262,6 +264,7 @@ cd src-tauri && cargo check
 For task-oriented file lookup ("if you need X, edit Y"), use:
 
 - `docs/codebase-map.md`
+- `docs/i18n.md` for localization architecture, conventions, and validation.
 
 ## Project Structure
 
diff --git a/README.zh-CN.md b/README.zh-CN.md
new file mode 100644
index 000000000..e1ef0c665
--- /dev/null
+++ b/README.zh-CN.md
@@ -0,0 +1,321 @@
+# CodexMonitor
+
+语言：[English](README.md) | 简体中文
+
+[![gitcgr](https://gitcgr.com/badge/Dimillian/CodexMonitor.svg)](https://gitcgr.com/Dimillian/CodexMonitor)
+
+![CodexMonitor](screenshot.png)
+
+CodexMonitor 是一个 Tauri 应用，用于在本地工作区之间编排多个 Codex 智能体。它提供项目侧边栏、用于快速操作的首页，以及基于 Codex app-server 协议的会话视图。
+
+## 功能
+
+### 工作区与线程
+
+- 添加并持久化工作区，支持分组/排序，并可从首页仪表盘快速进入最近的智能体活动。
+- 为每个工作区启动一个 `codex app-server`，恢复线程，并跟踪未读/运行状态。
+- 使用工作树和克隆智能体进行隔离开发；工作树位于应用数据目录下（仍支持旧版 `.codex-worktrees`）。
+- 线程管理：置顶、重命名、归档、复制、每线程草稿，以及停止/中断正在运行的 turn。
+- 可选远程后端（daemon）模式，用于在另一台机器上运行 Codex。
+- 为自托管连接提供远程设置辅助（TCP 模式下的 Tailscale 检测和主机引导）。
+
+### 输入框与智能体控制
+
+- 支持图片附件（选择器、拖放、粘贴）和可配置的跟进消息行为（运行中使用 `Queue` 或 `Steer`）。
+- 使用 `Shift+Cmd+Enter`（macOS）或 `Shift+Ctrl+Enter`（Windows/Linux）为单条消息发送相反的跟进行为。
+- 支持技能（`$`）、提示词（`/prompts:`）、评审（`/review`）和文件路径（`@`）自动补全。
+- 模型选择器、协作模式（启用时）、推理强度、访问模式和上下文用量环。
+- 按住说话快捷键和实时波形的语音输入（Whisper）。
+- 渲染推理、工具、Diff 项，并处理审批提示。
+
+### Git 与 GitHub
+
+- Diff 统计、已暂存/未暂存文件 Diff、还原/暂存控制和提交日志。
+- 分支列表，支持检出/创建，并显示上游 ahead/behind 数量。
+- 通过 `gh` 集成 GitHub Issues 和 Pull Requests（列表、Diff、评论），并可在浏览器中打开提交/PR。
+- PR 输入：使用“Ask PR”把 PR 上下文发送到新的智能体线程。
+
+### 文件与提示词
+
+- 文件树支持搜索、文件类型图标，以及在 Finder/Explorer 中显示。
+- 全局/工作区提示词库：创建、编辑、删除、移动，并可在当前线程或新线程中运行。
+
+### UI 与体验
+
+- 可调整大小的侧边栏、右侧面板、计划面板、终端和调试面板，并持久化尺寸。
+- 响应式布局（桌面、平板、手机）和标签式导航。
+- 侧边栏用量与账号限额仪表，以及首页用量快照。
+- 支持多标签的终端 Dock，用于后台命令（实验性）。
+- 应用内更新、调试面板复制/清除、声音通知，以及平台特定窗口效果（macOS overlay title bar + vibrancy）和降低透明度开关。
+
+## 运行要求
+
+- Node.js + npm
+- Rust stable 工具链
+- CMake（原生依赖需要；语音输入/Whisper 会使用）
+- LLVM/Clang（Windows 上通过 bindgen 构建语音输入依赖需要）
+- 已安装 Codex CLI，并可通过 `PATH` 中的 `codex` 调用（也可在应用/工作区设置中配置自定义 Codex 可执行文件）
+- Git CLI（用于工作树操作）
+- GitHub CLI（`gh`，用于 GitHub Issues/PR 集成，可选）
+
+如果遇到原生构建错误，运行：
+
+```bash
+npm run doctor
+```
+
+## 开始使用
+
+安装依赖：
+
+```bash
+npm install
+```
+
+以开发模式运行：
+
+```bash
+npm run tauri:dev
+```
+
+## iOS 支持（开发中）
+
+iOS 支持目前仍在进行中。
+
+- 当前状态：移动端布局可运行，远程后端流程已接入，iOS 默认使用远程后端模式。
+- 当前限制：移动端构建中终端和语音输入仍不可用。
+- 桌面端行为不变：macOS/Linux/Windows 默认本地优先，除非显式选择远程模式。
+
+### iOS + Tailscale 设置（TCP）
+
+当 iOS 应用需要通过 Tailscale tailnet 连接到桌面端托管的 daemon 时使用此流程。
+权威 runbook：`docs/mobile-ios-tailscale-blueprint.md`。
+
+1. 在桌面端和 iPhone 上安装并登录 Tailscale（同一个 tailnet）。
+2. 在桌面端 CodexMonitor 中打开 `Settings > Server`。
+3. 设置 `Remote backend token`。
+4. 在 `Mobile access daemon` 中点击 `Start daemon` 启动桌面端 daemon。
+5. 在 `Tailscale helper` 中使用 `Detect Tailscale`，并记录建议主机（例如 `your-mac.your-tailnet.ts.net:4732`）。
+6. 在 iOS CodexMonitor 中打开 `Settings > Server`。
+7. 输入桌面端 Tailscale 主机和相同 token。
+8. 点击 `Connect & test` 并确认测试成功。
+
+说明：
+
+- iOS 连接期间，桌面端 daemon 必须保持运行。
+- 如果测试失败，确认两台设备都在线于 Tailscale，并且主机/token 与桌面端设置一致。
+
+### 无桌面 UI 的 Headless Daemon 管理
+
+当你想在不保持桌面应用打开的情况下使用 iOS 远程模式，可使用独立 daemon 控制 CLI。
+
+构建二进制：
+
+```bash
+cd src-tauri
+cargo build --bin codex_monitor_daemon --bin codex_monitor_daemonctl
+```
+
+示例：
+
+```bash
+# 显示当前 daemon 状态
+./target/debug/codex_monitor_daemonctl status
+
+# 使用 settings.json 中的 host/token 启动 daemon
+./target/debug/codex_monitor_daemonctl start
+
+# 停止 daemon
+./target/debug/codex_monitor_daemonctl stop
+
+# 打印等价的 daemon 启动命令
+./target/debug/codex_monitor_daemonctl command-preview
+```
+
+常用覆盖参数：
+
+- `--data-dir <path>`：包含 `settings.json` / `workspaces.json` 的应用数据目录
+- `--listen <addr>`：覆盖监听地址
+- `--token <token>`：覆盖 token
+- `--daemon-path <path>`：显式指定 `codex-monitor-daemon` 二进制路径
+- `--json`：输出机器可读格式
+
+### iOS 前置条件
+
+- 已安装 Xcode + Command Line Tools。
+- 已安装 Rust iOS targets：
+
+```bash
+rustup target add aarch64-apple-ios aarch64-apple-ios-sim
+# 可选（Intel Mac 模拟器构建）：
+rustup target add x86_64-apple-ios
+```
+
+- 已配置 Apple 签名（development team）。
+  - 推荐在本机使用 `src-tauri/tauri.ios.local.conf.json` 设置 `bundle.iOS.developmentTeam` 和 `identifier`，或
+  - 在 `src-tauri/tauri.ios.conf.json` 中设置，或
+  - 向设备脚本传入 `--team <TEAM_ID>`。
+  - `build_run_ios*.sh` 和 `release_testflight_ios.sh` 会在存在 `src-tauri/tauri.ios.local.conf.json` 时自动合并。
+
+### 在 iOS 模拟器运行
+
+```bash
+./scripts/build_run_ios.sh
+```
+
+选项：
+
+- `--simulator "<name>"` 指定模拟器。
+- `--target aarch64-sim|x86_64-sim` 覆盖架构。
+- `--skip-build` 复用当前 app bundle。
+- `--no-clean` 在构建之间保留 `src-tauri/gen/apple/build`。
+
+### 在 USB 设备运行
+
+列出可发现设备：
+
+```bash
+./scripts/build_run_ios_device.sh --list-devices
+```
+
+构建、安装并在指定设备上启动：
+
+```bash
+./scripts/build_run_ios_device.sh --device "<device name or identifier>" --team <TEAM_ID>
+```
+
+其他选项：
+
+- `--target aarch64` 覆盖架构。
+- `--skip-build` 复用当前 app bundle。
+- `--bundle-id <id>` 启动非默认 bundle identifier。
+
+首次设备设置通常需要：
+
+1. iPhone 已解锁，并信任此 Mac。
+2. iPhone 已启用 Developer Mode。
+3. 至少在 Xcode 中完成一次配对/签名确认。
+
+如果签名尚未准备好，可从脚本流程中打开 Xcode：
+
+```bash
+./scripts/build_run_ios_device.sh --open-xcode
+```
+
+### iOS TestFlight 发布（脚本化）
+
+使用端到端脚本完成 archive、上传、合规配置、分配 beta 分组并提交 beta review。
+
+```bash
+./scripts/release_testflight_ios.sh
+```
+
+脚本会自动从 `.testflight.local.env`（gitignored）加载发布元数据。
+首次设置时，复制 `.testflight.local.env.example` 为 `.testflight.local.env` 并填写值。
+
+## 发布构建
+
+构建生产 Tauri bundle：
+
+```bash
+npm run tauri:build
+```
+
+产物位于 `src-tauri/target/release/bundle/`（按平台分子目录）。
+
+### Windows（可选）
+
+Windows 构建是可选的，并使用独立 Tauri 配置文件以避免 macOS-only 窗口效果。
+
+```bash
+npm run tauri:build:win
+```
+
+产物位于：
+
+- `src-tauri/target/release/bundle/nsis/`（安装器 exe）
+- `src-tauri/target/release/bundle/msi/`（msi）
+
+注意：在 Windows 从源码构建时，除 CMake 外还需要 LLVM/Clang（用于 `bindgen` / `libclang`）。
+
+## 类型检查
+
+运行 TypeScript 检查（无输出）：
+
+```bash
+npm run typecheck
+```
+
+说明：`npm run build` 也会在打包前运行 `tsc`。
+
+## 验证
+
+推荐验证命令：
+
+```bash
+npm run lint
+npm run test
+npm run typecheck
+cd src-tauri && cargo check
+```
+
+## 代码库导航
+
+按任务查找文件（“如果需要 X，编辑 Y”）请使用：
+
+- `docs/codebase-map.md`
+- `docs/i18n.md`：多语言架构、约定和验证说明。
+
+## 项目结构
+
+```text
+src/
+  features/         按功能切分的 UI 与 hooks
+  features/app/bootstrap/      应用启动编排
+  features/app/orchestration/  应用布局/线程/工作区编排
+  features/threads/hooks/threadReducer/  线程 reducer slices
+  services/         Tauri IPC wrapper
+  styles/           按区域拆分的 CSS
+  types.ts          共享类型
+src-tauri/
+  src/lib.rs        Tauri 应用后端命令注册
+  src/bin/codex_monitor_daemon.rs  远程 daemon JSON-RPC 进程
+  src/bin/codex_monitor_daemon/rpc/  daemon RPC 领域 handlers
+  src/shared/       app + daemon 共用的后端核心
+  src/shared/git_ui_core/      git/github 共享核心模块
+  src/shared/workspaces_core/  workspace/worktree 共享核心模块
+  src/workspaces/   workspace/worktree adapters
+  src/codex/        codex app-server adapters
+  src/files/        file adapters
+  tauri.conf.json   窗口配置
+```
+
+## 说明
+
+- 工作区持久化到应用数据目录下的 `workspaces.json`。
+- 应用设置持久化到应用数据目录下的 `settings.json`（主题、后端模式/提供方、远程端点/token、Codex 路径、默认访问模式、UI 缩放、跟进消息行为）。
+- 功能设置在 UI 中支持，并会在加载/保存时同步到 `$CODEX_HOME/config.toml`（或 `~/.codex/config.toml`）。稳定功能：协作模式（`features.collaboration_modes`）、personality（`personality`）和后台终端（`features.unified_exec`）。实验功能：Apps（`features.apps`）。Steering 能力仍跟随 Codex 的 `features.steer`，但跟进默认行为由 Settings → Composer 控制。
+- 启动和窗口聚焦时，应用会为每个工作区重新连接并刷新线程列表。
+- 线程通过 workspace `cwd` 过滤 `thread/list` 结果恢复。
+- 选择线程时始终调用 `thread/resume` 从磁盘刷新消息。
+- CLI 会话在其 `cwd` 匹配工作区路径时出现；除非恢复，否则不会实时流式输出。
+- 应用通过 stdio 使用 `codex app-server`；参见 `src-tauri/src/lib.rs` 和 `src-tauri/src/codex/`。
+- 远程 daemon 入口是 `src-tauri/src/bin/codex_monitor_daemon.rs`；RPC 路由位于 `src-tauri/src/bin/codex_monitor_daemon/rpc.rs`，领域 handlers 位于 `src-tauri/src/bin/codex_monitor_daemon/rpc/`。
+- 共享领域逻辑位于 `src-tauri/src/shared/`（尤其是 `src-tauri/src/shared/git_ui_core/` 和 `src-tauri/src/shared/workspaces_core/`）。
+- Codex home 会按顺序从工作区设置、旧版 `.codexmonitor/`、`$CODEX_HOME`/`~/.codex` 解析。
+- 工作树智能体位于应用数据目录（`worktrees/<workspace-id>`）；旧版 `.codex-worktrees/` 路径仍受支持，应用不再编辑仓库 `.gitignore`。
+- UI 状态（面板尺寸、降低透明度开关、最近线程活动）存储在 `localStorage`。
+- 自定义提示词从 `$CODEX_HOME/prompts`（或 `~/.codex/prompts`）加载，支持可选 frontmatter 描述/参数提示。
+
+## Tauri IPC Surface
+
+前端调用位于 `src/services/tauri.ts`，并映射到 `src-tauri/src/lib.rs` 中的命令。当前 surface 包括：
+
+- 设置/配置/文件：`get_app_settings`、`update_app_settings`、`get_codex_config_path`、`get_config_model`、`file_read`、`file_write`、`codex_doctor`、`menu_set_accelerators`。
+- 工作区/工作树：`list_workspaces`、`is_workspace_path_dir`、`add_workspace`、`add_clone`、`add_worktree`、`worktree_setup_status`、`worktree_setup_mark_ran`、`rename_worktree`、`rename_worktree_upstream`、`apply_worktree_changes`、`update_workspace_settings`、`remove_workspace`、`remove_worktree`、`connect_workspace`、`list_workspace_files`、`read_workspace_file`、`open_workspace_in`、`get_open_app_icon`。
+- 线程/turn/评审：`start_thread`、`fork_thread`、`compact_thread`、`list_threads`、`resume_thread`、`archive_thread`、`set_thread_name`、`send_user_message`、`turn_interrupt`、`respond_to_server_request`、`start_review`、`remember_approval_rule`、`get_commit_message_prompt`、`generate_commit_message`、`generate_run_metadata`。
+- 账号/模型/协作：`model_list`、`account_rate_limits`、`account_read`、`skills_list`、`apps_list`、`collaboration_mode_list`、`codex_login`、`codex_login_cancel`、`list_mcp_server_status`。
+- Git/GitHub：`get_git_status`、`list_git_roots`、`get_git_diffs`、`get_git_log`、`get_git_commit_diff`、`get_git_remote`、`stage_git_file`、`stage_git_all`、`unstage_git_file`、`revert_git_file`、`revert_git_all`、`commit_git`、`push_git`、`pull_git`、`fetch_git`、`sync_git`、`list_git_branches`、`checkout_git_branch`、`create_git_branch`、`get_github_issues`、`get_github_pull_requests`、`get_github_pull_request_diff`、`get_github_pull_request_comments`。
+- 提示词：`prompts_list`、`prompts_create`、`prompts_update`、`prompts_delete`、`prompts_move`、`prompts_workspace_dir`、`prompts_global_dir`。
+- 终端/语音输入/通知/用量：`terminal_open`、`terminal_write`、`terminal_resize`、`terminal_close`、`dictation_model_status`、`dictation_download_model`、`dictation_cancel_download`、`dictation_remove_model`、`dictation_request_permission`、`dictation_start`、`dictation_stop`、`dictation_cancel`、`send_notification_fallback`、`is_macos_debug_build`、`local_usage_snapshot`。
+- 远程后端辅助：`tailscale_status`、`tailscale_daemon_command_preview`、`tailscale_daemon_start`、`tailscale_daemon_stop`、`tailscale_daemon_status`。
diff --git a/docs/codebase-map.md b/docs/codebase-map.md
index b8a2af842..0022f1dae 100644
--- a/docs/codebase-map.md
+++ b/docs/codebase-map.md
@@ -5,6 +5,7 @@ Canonical navigation guide for CodexMonitor. Use this as: "if you need X, edit Y
 Related docs:
 
 - Setup/build/release: `README.md`
+- Localization/i18n: `docs/i18n.md`
 - iOS remote over Tailscale (TCP): `docs/mobile-ios-tailscale-blueprint.md`
 
 ## Start Here: How Changes Flow
diff --git a/docs/i18n.md b/docs/i18n.md
new file mode 100644
index 000000000..ba97595e5
--- /dev/null
+++ b/docs/i18n.md
@@ -0,0 +1,206 @@
+# i18n 多语言说明
+
+CodexMonitor 的前端多语言逻辑集中在 `src/i18n/index.tsx`。当前支持英文和简体中文，语言偏好由应用设置持久化。
+
+## 当前语言
+
+- `system`：跟随系统语言。系统语言以 `zh` 开头时使用简体中文，否则使用英文。
+- `en`：英文。
+- `zh-CN`：简体中文。
+
+对应类型：
+
+- 前端：`src/types.ts` 中的 `AppLanguagePreference`
+- 后端设置模型：`src-tauri/src/types.rs` 中的 `appLanguage`
+- 默认值：`system`
+
+## 运行时入口
+
+应用入口通过 `I18nProvider` 注入语言上下文：
+
+- 主应用：`src/features/app/components/MainApp.tsx`
+- 独立关于窗口：`src/features/about/components/AboutView.tsx`
+
+语言选择位于：
+
+- `Settings > Display & Sound > Language`
+- 组件：`src/features/settings/components/sections/SettingsDisplaySection.tsx`
+
+`I18nProvider` 会根据偏好解析实际 locale，并同步设置 `document.documentElement.lang`。
+
+## 翻译 API
+
+从 `@/i18n` 引入：
+
+```tsx
+import { useI18n } from "@/i18n";
+
+const { t, tx } = useI18n();
+```
+
+### `t(key, values)`
+
+用于稳定的命名 key，适合设置导航、长期维护的共享文案。
+
+```tsx
+{t("settings.display.language.label")}
+```
+
+命名 key 定义在：
+
+- `enTranslations`
+- `zhCNTranslations`
+
+两个对象必须保持 key 完全一致，TypeScript 会校验缺失项。
+
+### `tx(source, values)`
+
+用于源字符串翻译，适合已有页面迁移和大量 UI 文案接入。
+
+```tsx
+{tx("Refresh {title}", { title })}
+```
+
+中文映射定义在：
+
+- `zhCNTextTranslations`
+- `zhCNAdditionalTextTranslations`
+
+英文 locale 会直接返回 source。简体中文 locale 会优先查中文映射，找不到时回退 source。
+
+## 插值规则
+
+插值使用 `{name}` 形式，值类型为 string 或 number：
+
+```tsx
+tx("Version {version}", { version })
+```
+
+翻译文本必须保留相同的占位符名称：
+
+```ts
+"Version {version}": "版本 {version}"
+```
+
+## 新增页面文案流程
+
+1. 在组件中引入 `useI18n`。
+2. 普通页面文案优先使用 `tx("English source")`。
+3. 设置导航和长期共享文案可使用 `t("namespace.key")`。
+4. 把简体中文翻译加入 `src/i18n/index.tsx`。
+5. 动态值使用 `{placeholder}`，不要手动拼接可翻译句子。
+6. 技术示例、命令、路径、URL 可以保留原样，例如 `pnpm install`、`https://github.com/org/repo.git`。
+
+推荐：
+
+```tsx
+aria-label={tx("Close {title}", { title })}
+title={tx("Refresh")}
+placeholder={tx("Ask Codex to do something...")}
+```
+
+避免：
+
+```tsx
+// 不利于翻译语序调整
+{tx("Close")} {title}
+```
+
+## 新增语言流程
+
+1. 扩展 `AppLanguagePreference` 和 `AppLocale` 相关类型。
+2. 在 `src/i18n/index.tsx` 增加 locale 翻译表。
+3. 更新 `translations` 映射。
+4. 更新 `normalizeLanguagePreference` 和 `resolveLocale`。
+5. 在设置页语言下拉中增加选项。
+6. 更新后端设置类型默认值和反序列化兼容逻辑。
+7. 添加或更新 i18n 测试。
+
+## 覆盖检查
+
+直接 `tx("...")` 源文案应有中文映射。可用以下脚本检查缺失项：
+
+```bash
+node <<'NODE'
+const fs = require('fs');
+const path = require('path');
+const root = process.cwd();
+const files = [];
+
+function walk(dir) {
+  for (const ent of fs.readdirSync(dir, { withFileTypes: true })) {
+    if (ent.name === 'node_modules' || ent.name.startsWith('.')) continue;
+    const p = path.join(dir, ent.name);
+    if (ent.isDirectory()) walk(p);
+    else if (/\.(tsx|ts)$/.test(ent.name) && !/\.test\.(tsx|ts)$/.test(ent.name)) files.push(p);
+  }
+}
+
+walk(path.join(root, 'src'));
+
+const used = new Set();
+for (const file of files) {
+  const source = fs.readFileSync(file, 'utf8');
+  const re = /\btx\(\s*(["'`])((?:\\.|(?!\1)[\s\S])*?)\1/g;
+  let match;
+  while ((match = re.exec(source))) {
+    const raw = match[2]
+      .replace(/\\n/g, '\n')
+      .replace(/\\"/g, '"')
+      .replace(/\\'/g, "'")
+      .replace(/\\`/g, '`');
+    if (!raw.includes('${')) used.add(raw);
+  }
+}
+
+const i18n = fs.readFileSync(path.join(root, 'src/i18n/index.tsx'), 'utf8');
+const dict = new Set();
+const keyRe = /(?:^|\n)\s*(?:([A-Za-z0-9_$][\w$]*)|(["'`])((?:\\.|(?!\2)[\s\S])*?)\2)\s*:/g;
+let match;
+while ((match = keyRe.exec(i18n))) {
+  if (match[1]) dict.add(match[1]);
+  else {
+    dict.add(
+      match[3]
+        .replace(/\\n/g, '\n')
+        .replace(/\\"/g, '"')
+        .replace(/\\'/g, "'")
+        .replace(/\\`/g, '`'),
+    );
+  }
+}
+
+const missing = [...used].filter((entry) => !dict.has(entry)).sort();
+console.log(`missing ${missing.length}`);
+for (const entry of missing) console.log(JSON.stringify(entry));
+NODE
+```
+
+## 验证命令
+
+涉及 i18n、设置模型或页面文案时至少运行：
+
+```bash
+npm run typecheck
+npm run test -- src/i18n/i18n.test.ts
+```
+
+大范围页面接入后运行：
+
+```bash
+npm run test
+```
+
+如果修改了 Rust 设置类型，运行：
+
+```bash
+cd src-tauri && cargo check
+```
+
+## 维护约定
+
+- 不翻译用户生成内容、模型名、文件路径、命令输出、Git 分支名、远程 URL。
+- 翻译按钮、菜单、placeholder、title、aria-label、toast、空状态和设置说明。
+- 不把一句可翻译的话拆成多个零散片段，除非中间必须插入代码元素。
+- 复用已有翻译源字符串，避免同义英文重复。
+- 新增设置项时同步更新 `src/types.ts`、`src-tauri/src/types.rs`、默认设置和相关测试。