diff --git a/windows/tauri/package.json b/windows/tauri/package.json
index dceed09f3..93ac9b31f 100644
--- a/windows/tauri/package.json
+++ b/windows/tauri/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "dev": "bunx vp dev",
+    "dev": "bun ./node_modules/vite-plus/bin/vp dev",
     "build": "bunx vp build",
     "preview": "bunx vp preview",
     "tauri": "tauri",
diff --git a/windows/tauri/src-tauri/Cargo.lock b/windows/tauri/src-tauri/Cargo.lock
index 268a1486f..8fc75becd 100644
--- a/windows/tauri/src-tauri/Cargo.lock
+++ b/windows/tauri/src-tauri/Cargo.lock
@@ -267,6 +267,12 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
+[[package]]
+name = "base64ct"
+version = "1.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
+
 [[package]]
 name = "bit-set"
 version = "0.8.0"
@@ -530,7 +536,7 @@ checksum = "d524456ba66e72eb8b115ff89e01e497f8e6d11d78b70b1aa13c0fbd97540a81"
 dependencies = [
  "cfg-if",
  "cpufeatures 0.3.0",
- "rand_core",
+ "rand_core 0.10.1",
 ]
 
 [[package]]
@@ -591,6 +597,12 @@ dependencies = [
  "crossbeam-utils",
 ]
 
+[[package]]
+name = "const-oid"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
+
 [[package]]
 name = "const-random"
 version = "0.1.18"
@@ -880,6 +892,17 @@ dependencies = [
  "thiserror 2.0.20",
 ]
 
+[[package]]
+name = "der"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
+dependencies = [
+ "const-oid",
+ "pem-rfc7468",
+ "zeroize",
+]
+
 [[package]]
 name = "deranged"
 version = "0.5.8"
@@ -928,6 +951,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
  "block-buffer",
+ "const-oid",
  "crypto-common",
 ]
 
@@ -1383,6 +1407,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1f9e3d69d39e4862ffed03ed071a76f9a13ba1d9109d355b0f0aa6b15e393c4"
 dependencies = [
  "futures-core",
+ "futures-sink",
 ]
 
 [[package]]
@@ -1614,7 +1639,7 @@ dependencies = [
  "js-sys",
  "libc",
  "r-efi 6.0.0",
- "rand_core",
+ "rand_core 0.10.1",
  "wasm-bindgen",
 ]
 
@@ -2452,6 +2477,9 @@ name = "lazy_static"
 version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+dependencies = [
+ "spin",
+]
 
 [[package]]
 name = "libappindicator"
@@ -2502,6 +2530,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "libm"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
+
 [[package]]
 name = "libredox"
 version = "0.1.19"
@@ -2528,14 +2562,21 @@ name = "lithe-core"
 version = "0.1.0"
 dependencies = [
  "ammonia",
+ "base64 0.22.1",
  "comrak",
  "quick-xml 0.37.5",
+ "rand 0.8.7",
  "regex",
+ "reqwest 0.12.28",
+ "rsa",
  "serde",
  "serde_json",
  "serde_yaml_ng",
+ "sha1",
  "sha2",
  "toml 1.1.4+spec-1.1.0",
+ "url",
+ "zip 2.4.2",
 ]
 
 [[package]]
@@ -2828,12 +2869,47 @@ dependencies = [
  "bitflags 2.13.1",
 ]
 
+[[package]]
+name = "num-bigint-dig"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e661dda6640fad38e827a6d4a310ff4763082116fe217f279885c97f511bb0b7"
+dependencies = [
+ "lazy_static",
+ "libm",
+ "num-integer",
+ "num-iter",
+ "num-traits",
+ "rand 0.8.7",
+ "smallvec",
+ "zeroize",
+]
+
 [[package]]
 name = "num-conv"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441"
 
+[[package]]
+name = "num-integer"
+version = "0.1.47"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ce2d95d4b3734dc35aa2f45e1aa22cd416814592a4f9d9205e11affd5b8e10b"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-iter"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c92800bd69a1eac91786bcfe9da64a897eb72911b8dc3095decbd07429e8048b"
+dependencies = [
+ "num-integer",
+ "num-traits",
+]
+
 [[package]]
 name = "num-traits"
 version = "0.2.19"
@@ -2841,6 +2917,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
+ "libm",
 ]
 
 [[package]]
@@ -3217,6 +3294,15 @@ dependencies = [
  "windows-link 0.2.1",
 ]
 
+[[package]]
+name = "pem-rfc7468"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
+dependencies = [
+ "base64ct",
+]
+
 [[package]]
 name = "percent-encoding"
 version = "2.3.2"
@@ -3304,6 +3390,27 @@ dependencies = [
  "futures-io",
 ]
 
+[[package]]
+name = "pkcs1"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
+dependencies = [
+ "der",
+ "pkcs8",
+ "spki",
+]
+
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der",
+ "spki",
+]
+
 [[package]]
 name = "pkg-config"
 version = "0.3.34"
@@ -3414,6 +3521,15 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
+[[package]]
+name = "ppv-lite86"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
+
 [[package]]
 name = "precomputed-hash"
 version = "0.1.1"
@@ -3557,7 +3673,7 @@ dependencies = [
  "bytes",
  "getrandom 0.4.3",
  "lru-slab",
- "rand",
+ "rand 0.10.2",
  "rand_pcg",
  "ring",
  "rustc-hash",
@@ -3605,6 +3721,17 @@ version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
 
+[[package]]
+name = "rand"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22f6172bdec972074665ed81ed53b71da00bfc44b65a753cfde883ec4c702a1a"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core 0.6.4",
+]
+
 [[package]]
 name = "rand"
 version = "0.10.2"
@@ -3613,7 +3740,26 @@ checksum = "c7f5fa3a058cd35567ef9bfa5e75732bee0f9e4c55fa90477bef2dfcdbc4be80"
 dependencies = [
  "chacha20",
  "getrandom 0.4.3",
- "rand_core",
+ "rand_core 0.10.1",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom 0.2.17",
 ]
 
 [[package]]
@@ -3628,7 +3774,7 @@ version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "caa0f4137e1c0a72f4c651489402276c8e8e1cf081f3b0ba156d2cbeef09e86a"
 dependencies = [
- "rand_core",
+ "rand_core 0.10.1",
 ]
 
 [[package]]
@@ -3728,7 +3874,9 @@ dependencies = [
  "cookie",
  "cookie_store",
  "encoding_rs",
+ "futures-channel",
  "futures-core",
+ "futures-util",
  "h2",
  "http",
  "http-body",
@@ -3837,6 +3985,26 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "rsa"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8573f03f5883dcaebdfcf4725caa1ecb9c15b2ef50c43a07b816e06799bb12d"
+dependencies = [
+ "const-oid",
+ "digest",
+ "num-bigint-dig",
+ "num-integer",
+ "num-traits",
+ "pkcs1",
+ "pkcs8",
+ "rand_core 0.6.4",
+ "signature",
+ "spki",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "rust-ini"
 version = "0.21.3"
@@ -4283,6 +4451,17 @@ dependencies = [
  "stable_deref_trait",
 ]
 
+[[package]]
+name = "sha1"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a978451301f4db1d02937a4ab3ccce137717b81826e79b7d49ffe3244a13c3b8"
+dependencies = [
+ "cfg-if",
+ "cpufeatures 0.2.17",
+ "digest",
+]
+
 [[package]]
 name = "sha2"
 version = "0.10.9"
@@ -4358,6 +4537,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "signature"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
+dependencies = [
+ "digest",
+ "rand_core 0.6.4",
+]
+
 [[package]]
 name = "simd-adler32"
 version = "0.3.10"
@@ -4456,6 +4645,22 @@ dependencies = [
  "system-deps",
 ]
 
+[[package]]
+name = "spin"
+version = "0.9.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3763264f6b73151db08c50ff20d7d8a0b8796e021cdea7ceedad07b80155fa0e"
+
+[[package]]
+name = "spki"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
+dependencies = [
+ "base64ct",
+ "der",
+]
+
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.1"
@@ -5037,7 +5242,7 @@ dependencies = [
  "tokio",
  "url",
  "windows-sys 0.60.2",
- "zip",
+ "zip 4.6.1",
 ]
 
 [[package]]
@@ -6926,6 +7131,23 @@ dependencies = [
  "syn 3.0.3",
 ]
 
+[[package]]
+name = "zip"
+version = "2.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fabe6324e908f85a1c52063ce7aa26b68dcb7eb6dbc83a2d148403c9bc3eba50"
+dependencies = [
+ "arbitrary",
+ "crc32fast",
+ "crossbeam-utils",
+ "displaydoc",
+ "flate2",
+ "indexmap 2.14.0",
+ "memchr",
+ "thiserror 2.0.20",
+ "zopfli",
+]
+
 [[package]]
 name = "zip"
 version = "4.6.1"
@@ -6944,6 +7166,18 @@ version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"
 
+[[package]]
+name = "zopfli"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f05cd8797d63865425ff89b5c4a48804f35ba0ce8d125800027ad6017d2b5249"
+dependencies = [
+ "bumpalo",
+ "crc32fast",
+ "log",
+ "simd-adler32",
+]
+
 [[package]]
 name = "zune-core"
 version = "0.5.3"
diff --git a/windows/tauri/src-tauri/icons/icon.ico b/windows/tauri/src-tauri/icons/icon.ico
index 26418f0dd..a76d1c206 100644
Binary files a/windows/tauri/src-tauri/icons/icon.ico and b/windows/tauri/src-tauri/icons/icon.ico differ
diff --git a/windows/tauri/src-tauri/src/host.rs b/windows/tauri/src-tauri/src/host.rs
index 486f776b5..bb1a64f56 100644
--- a/windows/tauri/src-tauri/src/host.rs
+++ b/windows/tauri/src-tauri/src/host.rs
@@ -9,6 +9,16 @@ use tauri_plugin_opener::OpenerExt;
 
 static WINDOW_ID: AtomicU64 = AtomicU64::new(1);
 
+// Windows 11 taskbar downscales a 256-only ICO into an empty pill. Use the 32px
+// asset after window creation so frameless windows keep a readable app icon.
+const WINDOW_TASKBAR_ICON: tauri::image::Image<'_> = tauri::include_image!("./icons/32x32.png");
+
+pub fn apply_window_taskbar_icon(window: &WebviewWindow) {
+    if let Err(error) = window.set_icon(WINDOW_TASKBAR_ICON.clone()) {
+        eprintln!("[host] failed to set window icon: {error}");
+    }
+}
+
 #[derive(Debug, Serialize)]
 pub struct FontInfo {
     name: String,
@@ -273,13 +283,16 @@ pub fn create_app_window(app: AppHandle, request: Option<Value>) -> Result<Strin
     } else {
         format!("index.html?{query}")
     };
-    WebviewWindowBuilder::new(&app, &label, WebviewUrl::App(path.into()))
+    let window = WebviewWindowBuilder::new(&app, &label, WebviewUrl::App(path.into()))
         .title("Lithe")
         .decorations(false)
         .inner_size(1280.0, 800.0)
         .min_inner_size(720.0, 480.0)
+        .icon(WINDOW_TASKBAR_ICON)
+        .map_err(|error| error.to_string())?
         .build()
         .map_err(|error| error.to_string())?;
+    apply_window_taskbar_icon(&window);
     Ok(label)
 }
 
@@ -287,6 +300,7 @@ pub fn create_app_window(app: AppHandle, request: Option<Value>) -> Result<Strin
 mod tests {
     use super::{cli_payloads, copy_path, unique_destination};
     use std::fs;
+    use std::path::PathBuf;
 
     #[test]
     fn parses_path_and_web_cli_arguments() {
@@ -323,6 +337,27 @@ mod tests {
 
         fs::remove_dir_all(root).unwrap();
     }
+
+    #[test]
+    fn bundled_windows_icon_includes_taskbar_sizes() {
+        let path = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("icons/icon.ico");
+        let data = fs::read(path).unwrap();
+        assert!(data.len() >= 6);
+        let count = u16::from_le_bytes(data[4..6].try_into().unwrap()) as usize;
+        let mut widths = Vec::new();
+        let mut offset = 6usize;
+        for _ in 0..count {
+            let width = match data[offset] {
+                0 => 256,
+                value => u32::from(value),
+            };
+            widths.push(width);
+            offset += 16;
+        }
+        assert!(widths.contains(&16), "{widths:?}");
+        assert!(widths.contains(&32), "{widths:?}");
+        assert!(widths.contains(&256), "{widths:?}");
+    }
 }
 
 #[tauri::command]
diff --git a/windows/tauri/src-tauri/src/main.rs b/windows/tauri/src-tauri/src/main.rs
index d2dc1531f..893a8fefa 100644
--- a/windows/tauri/src-tauri/src/main.rs
+++ b/windows/tauri/src-tauri/src/main.rs
@@ -48,6 +48,9 @@ fn main() {
             ));
             app.manage(host::FileClipboard::default());
             app.manage(run::RunProcessManager::default());
+            if let Some(window) = app.get_webview_window("main") {
+                host::apply_window_taskbar_icon(&window);
+            }
             Ok(())
         })
         .invoke_handler(tauri::generate_handler![
diff --git a/windows/tauri/src/features/command-palette/constants/git-actions.tsx b/windows/tauri/src/features/command-palette/constants/git-actions.tsx
index af519e92c..500b3e79f 100644
--- a/windows/tauri/src/features/command-palette/constants/git-actions.tsx
+++ b/windows/tauri/src/features/command-palette/constants/git-actions.tsx
@@ -5,6 +5,7 @@ import {
   FolderOpenIcon as FolderOpen,
   GitBranchIcon as GitBranch,
   GitCommitIcon as GitCommit,
+  GitGraphIcon as GitGraph,
   HardDrivesIcon as Server,
   NodesIcon as Nodes,
   TagIcon as Tag,
@@ -163,7 +164,7 @@ export const createGitActions = (params: GitActionsParams): Action[] => {
       id: "git-open-log",
       label: "Git: Open Log",
       description: "Open the full Git Log tool window",
-      icon: <ClockCounterClockwise />,
+      icon: <GitGraph />,
       category: "Git",
       action: () => {
         setBottomPaneActiveTab("gitLog");
diff --git a/windows/tauri/src/features/diagnostics/components/diagnostics-pane.tsx b/windows/tauri/src/features/diagnostics/components/diagnostics-pane.tsx
index f744ca379..5260b13c2 100644
--- a/windows/tauri/src/features/diagnostics/components/diagnostics-pane.tsx
+++ b/windows/tauri/src/features/diagnostics/components/diagnostics-pane.tsx
@@ -17,6 +17,7 @@ import {
   XIcon as X,
 } from "@/ui/icons";
 import { type ReactNode, useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useTranslation } from "@/i18n/locale-provider";
 import { LspClient } from "@/features/editor/lsp/lsp-client";
 import { useBufferStore } from "@/features/editor/stores/buffer.store";
 import {
@@ -84,16 +85,16 @@ const DEFAULT_PREFERENCES: PanePreferences = {
   fileNavigatorViewMode: "flat",
 };
 
-const GROUP_OPTIONS: Array<{ value: GroupBy; label: string }> = [
-  { value: "file", label: "File" },
-  { value: "severity", label: "Severity" },
-  { value: "none", label: "None" },
+const GROUP_OPTIONS: Array<{ value: GroupBy; labelKey: string }> = [
+  { value: "file", labelKey: "diagnostics.groupByFile" },
+  { value: "severity", labelKey: "diagnostics.groupBySeverity" },
+  { value: "none", labelKey: "diagnostics.groupByNone" },
 ];
 
-const SORT_OPTIONS: Array<{ value: SortBy; label: string }> = [
-  { value: "severity", label: "Severity" },
-  { value: "file", label: "File" },
-  { value: "position", label: "Position" },
+const SORT_OPTIONS: Array<{ value: SortBy; labelKey: string }> = [
+  { value: "severity", labelKey: "diagnostics.sortBySeverity" },
+  { value: "file", labelKey: "diagnostics.sortByFile" },
+  { value: "position", labelKey: "diagnostics.sortByPosition" },
 ];
 
 const SEVERITY_ORDER: Record<Diagnostic["severity"], number> = {
@@ -102,10 +103,10 @@ const SEVERITY_ORDER: Record<Diagnostic["severity"], number> = {
   info: 2,
 };
 
-const SEVERITY_LABEL: Record<Diagnostic["severity"], string> = {
-  error: "Errors",
-  warning: "Warnings",
-  info: "Info",
+const SEVERITY_LABEL_KEY: Record<Diagnostic["severity"], string> = {
+  error: "diagnostics.errors",
+  warning: "diagnostics.warnings",
+  info: "diagnostics.info",
 };
 
 const SEVERITY_TEXT_CLASS: Record<Diagnostic["severity"], string> = {
@@ -216,6 +217,7 @@ const DiagnosticsPane = ({
   onFullScreen,
   isFullScreen = false,
 }: DiagnosticsPaneProps) => {
+  const { t } = useTranslation();
   const { showToast } = useToast();
   const lspClient = useMemo(() => LspClient.getInstance(), []);
   const widthMode = useTerminalStore((state) => state.widthMode);
@@ -371,7 +373,7 @@ const DiagnosticsPane = ({
       return [
         {
           id: "all",
-          label: "All Diagnostics",
+          label: t("diagnostics.all"),
           items: filteredDiagnostics,
         },
       ];
@@ -385,7 +387,7 @@ const DiagnosticsPane = ({
           );
           return {
             id: `severity-${severity}`,
-            label: SEVERITY_LABEL[severity as Diagnostic["severity"]],
+            label: t(SEVERITY_LABEL_KEY[severity as Diagnostic["severity"]]),
             items,
             severity: severity as Diagnostic["severity"],
           };
@@ -407,7 +409,7 @@ const DiagnosticsPane = ({
         label: filePath,
         items,
       }));
-  }, [filteredDiagnostics, preferences.groupBy]);
+  }, [filteredDiagnostics, preferences.groupBy, t]);
 
   const totalBySeverity = useMemo(() => {
     return diagnostics.reduce(
@@ -565,18 +567,18 @@ const DiagnosticsPane = ({
   const copyDiagnosticMessage = useCallback(
     async (diagnostic: Diagnostic) => {
       await copyToClipboard(diagnostic.message);
-      showToast({ message: "Diagnostic message copied", type: "success" });
+      showToast({ message: t("diagnostics.messageCopied"), type: "success" });
     },
-    [showToast],
+    [showToast, t],
   );
 
   const copyDiagnosticLocation = useCallback(
     async (diagnostic: Diagnostic) => {
       const text = `${diagnostic.filePath}:${diagnostic.line + 1}:${diagnostic.column + 1}`;
       await copyToClipboard(text);
-      showToast({ message: "Diagnostic location copied", type: "success" });
+      showToast({ message: t("diagnostics.locationCopied"), type: "success" });
     },
-    [showToast],
+    [showToast, t],
   );
 
   const copyDiagnosticDetails = useCallback(
@@ -592,9 +594,9 @@ const DiagnosticsPane = ({
         .join(" | ");
 
       await copyToClipboard(details);
-      showToast({ message: "Diagnostic details copied", type: "success" });
+      showToast({ message: t("diagnostics.detailsCopied"), type: "success" });
     },
-    [showToast],
+    [showToast, t],
   );
 
   const diagnosticContextMenuItems = useMemo<MenuItem[]>(() => {
@@ -610,7 +612,7 @@ const DiagnosticsPane = ({
     if (isLoading) {
       items.push({
         id: "loading-actions",
-        label: "Loading quick fixes...",
+        label: t("diagnostics.loadingFixes"),
         icon: <WandSparkles />,
         onClick: () => {},
         disabled: true,
@@ -633,7 +635,7 @@ const DiagnosticsPane = ({
     } else {
       items.push({
         id: "no-actions",
-        label: "No quick fixes available",
+        label: t("diagnostics.noFixes"),
         icon: <WandSparkles />,
         onClick: () => {},
         disabled: true,
@@ -645,12 +647,12 @@ const DiagnosticsPane = ({
     items.push(
       {
         id: "go-to-problem",
-        label: "Go to Problem",
+        label: t("diagnostics.goToProblem"),
         onClick: () => onDiagnosticClick?.(diagnostic),
       },
       {
         id: "copy-message",
-        label: "Copy Message",
+        label: t("diagnostics.copyMessage"),
         icon: <Copy />,
         onClick: () => {
           void copyDiagnosticMessage(diagnostic);
@@ -658,7 +660,7 @@ const DiagnosticsPane = ({
       },
       {
         id: "copy-location",
-        label: "Copy Location",
+        label: t("diagnostics.copyLocation"),
         icon: <Copy />,
         onClick: () => {
           void copyDiagnosticLocation(diagnostic);
@@ -666,7 +668,7 @@ const DiagnosticsPane = ({
       },
       {
         id: "copy-details",
-        label: "Copy Full Details",
+        label: t("diagnostics.copyDetails"),
         icon: <Copy />,
         onClick: () => {
           void copyDiagnosticDetails(diagnostic);
@@ -679,14 +681,14 @@ const DiagnosticsPane = ({
       if (sourceFilter?.toLowerCase() === source.toLowerCase()) {
         items.push({
           id: "clear-source-filter",
-          label: "Clear Source Filter",
+          label: t("diagnostics.clearSourceFilterSimple"),
           icon: <Filter />,
           onClick: () => setSourceFilter(null),
         });
       } else {
         items.push({
           id: "filter-by-source",
-          label: `Filter by Source: ${source}`,
+          label: t("diagnostics.filterBySource", { source }),
           icon: <Filter />,
           onClick: () => setSourceFilter(source),
         });
@@ -697,7 +699,9 @@ const DiagnosticsPane = ({
 
     items.push({
       id: "toggle-wrap",
-      label: preferences.wrapMessages ? "Disable Message Wrap" : "Enable Message Wrap",
+      label: preferences.wrapMessages
+        ? t("diagnostics.disableWrap")
+        : t("diagnostics.enableWrap"),
       onClick: () => togglePreference("wrapMessages"),
     });
 
@@ -714,6 +718,7 @@ const DiagnosticsPane = ({
     preferences.wrapMessages,
     sourceFilter,
     togglePreference,
+    t,
   ]);
 
   const hasNonDefaultPreferences =
@@ -742,7 +747,10 @@ const DiagnosticsPane = ({
   const hasSearch = Boolean(searchQuery.trim());
   const visibleProblemCount = filteredDiagnostics.length;
   const hasDiagnosticFiles = diagnosticFileItems.length > 0;
-  const problemSummary = `${visibleProblemCount} problem${visibleProblemCount === 1 ? "" : "s"}`;
+  const problemSummary =
+    visibleProblemCount === 1
+      ? t("diagnostics.problemCountOne", { count: visibleProblemCount })
+      : t("diagnostics.problemCount", { count: visibleProblemCount });
   const problemSummaryTone =
     visibleBySeverity.error > 0
       ? "text-destructive"
@@ -760,7 +768,7 @@ const DiagnosticsPane = ({
     items.push(
       ...GROUP_OPTIONS.map((option) => ({
         id: `group-${option.value}`,
-        label: `Group by: ${option.label}`,
+        label: t(option.labelKey),
         icon: preferences.groupBy === option.value ? <Check /> : undefined,
         onClick: () => {
           setPreferences((prev) => ({
@@ -776,7 +784,7 @@ const DiagnosticsPane = ({
     items.push(
       ...SORT_OPTIONS.map((option) => ({
         id: `sort-${option.value}`,
-        label: `Sort by: ${option.label}`,
+        label: t(option.labelKey),
         icon: preferences.sortBy === option.value ? <Check /> : undefined,
         onClick: () => {
           setPreferences((prev) => ({
@@ -792,7 +800,11 @@ const DiagnosticsPane = ({
     for (const severity of ["error", "warning", "info"] as Diagnostic["severity"][]) {
       items.push({
         id: `severity-${severity}`,
-        label: `${SEVERITY_LABEL[severity]} (${visibleBySeverity[severity]}/${totalBySeverity[severity]})`,
+        label: t("diagnostics.severityCount", {
+          label: t(SEVERITY_LABEL_KEY[severity]),
+          visible: visibleBySeverity[severity],
+          total: totalBySeverity[severity],
+        }),
         icon: severityFilter[severity] ? <Check /> : undefined,
         onClick: () => toggleSeverity(severity),
       });
@@ -801,7 +813,7 @@ const DiagnosticsPane = ({
     if (activeFilePath) {
       items.push({
         id: "only-current-file",
-        label: "Only Current File",
+        label: t("diagnostics.onlyCurrentFile"),
         icon: preferences.onlyCurrentFile ? <Check /> : undefined,
         onClick: () => togglePreference("onlyCurrentFile"),
       });
@@ -810,7 +822,7 @@ const DiagnosticsPane = ({
     if (sourceFilter) {
       items.push({
         id: "clear-source-filter",
-        label: `Clear Source Filter (${sourceFilter})`,
+        label: t("diagnostics.clearSourceFilter", { source: sourceFilter }),
         onClick: () => setSourceFilter(null),
       });
     }
@@ -819,7 +831,7 @@ const DiagnosticsPane = ({
       items.push({ id: "sep-reset", label: "", separator: true, onClick: () => {} });
       items.push({
         id: "reset-filters",
-        label: "Reset All Filters",
+        label: t("diagnostics.resetAllFilters"),
         onClick: resetFilters,
       });
     }
@@ -839,14 +851,15 @@ const DiagnosticsPane = ({
     toggleSeverity,
     totalBySeverity,
     visibleBySeverity,
+    t,
   ]);
 
   const headerContextMenuItems = useMemo<MenuItem[]>(() => {
     if (!headerContextMenu.data) return [];
 
     const widthModes: { value: TerminalWidthMode; label: string; icon: ReactNode }[] = [
-      { value: "full", label: "Full Width", icon: <Maximize /> },
-      { value: "editor", label: "Editor Width", icon: <AlignCenter /> },
+      { value: "full", label: t("diagnostics.fullWidth"), icon: <Maximize /> },
+      { value: "editor", label: t("diagnostics.editorWidth"), icon: <AlignCenter /> },
     ];
 
     const items: MenuItem[] = widthModes.map((mode) => ({
@@ -862,7 +875,7 @@ const DiagnosticsPane = ({
         { id: "sep-fullscreen", label: "", separator: true, onClick: () => {} },
         {
           id: "toggle-fullscreen",
-          label: isFullScreen ? "Exit Full Screen" : "Full Screen",
+          label: isFullScreen ? t("diagnostics.exitFullScreen") : t("diagnostics.fullScreen"),
           icon: isFullScreen ? <Minimize2 /> : <Maximize2 />,
           onClick: onFullScreen,
         },
@@ -870,7 +883,7 @@ const DiagnosticsPane = ({
     }
 
     return items;
-  }, [headerContextMenu.data, widthMode, setWidthMode, onFullScreen, isFullScreen]);
+  }, [headerContextMenu.data, widthMode, setWidthMode, onFullScreen, isFullScreen, t]);
 
   if (!isVisible) return null;
 
@@ -894,8 +907,12 @@ const DiagnosticsPane = ({
                 className={cn(
                   isFileNavigatorVisible && "border-border/70 bg-accent text-foreground",
                 )}
-                tooltip={isFileNavigatorVisible ? "Hide files" : "Show files"}
-                aria-label={isFileNavigatorVisible ? "Hide files" : "Show files"}
+                tooltip={
+                  isFileNavigatorVisible ? t("diagnostics.hideFiles") : t("diagnostics.showFiles")
+                }
+                aria-label={
+                  isFileNavigatorVisible ? t("diagnostics.hideFiles") : t("diagnostics.showFiles")
+                }
               >
                 <ListBullets />
               </PaneIconButton>
@@ -914,7 +931,7 @@ const DiagnosticsPane = ({
               className={cn(
                 (isSearchVisible || hasSearch) && "border-border/70 bg-accent text-foreground",
               )}
-              tooltip="Search problems"
+              tooltip={t("diagnostics.search")}
             >
               <Search />
             </PaneIconButton>
@@ -925,7 +942,7 @@ const DiagnosticsPane = ({
                 filterContextMenu.open(event, "filters");
               }}
               className={cn("relative", hasFilterSettings && "text-primary")}
-              tooltip="Filter problems"
+              tooltip={t("diagnostics.filter")}
             >
               <Filter />
               {activeFilterCount > 0 && (
@@ -943,16 +960,18 @@ const DiagnosticsPane = ({
               <PaneIconButton
                 type="button"
                 onClick={onFullScreen}
-                tooltip={isFullScreen ? "Exit Full Screen" : "Full Screen"}
+                tooltip={isFullScreen ? t("diagnostics.exitFullScreen") : t("diagnostics.fullScreen")}
                 tooltipSide="bottom"
-                aria-label={isFullScreen ? "Exit full screen" : "Full screen"}
+                aria-label={
+                  isFullScreen ? t("diagnostics.exitFullScreen") : t("diagnostics.fullScreen")
+                }
               >
                 {isFullScreen ? <Minimize2 /> : <Maximize2 />}
               </PaneIconButton>
             )}
 
             {!isEmbedded && (
-              <PaneIconButton type="button" onClick={onClose} tooltip="Close problems pane">
+              <PaneIconButton type="button" onClick={onClose} tooltip={t("diagnostics.closePane")}>
                 <X />
               </PaneIconButton>
             )}
@@ -979,7 +998,7 @@ const DiagnosticsPane = ({
                     }
                   }
                 }}
-                placeholder="Search problems"
+                placeholder={t("diagnostics.search")}
                 inputRef={searchInputRef}
                 extraActions={
                   <PaneIconButton
@@ -988,7 +1007,7 @@ const DiagnosticsPane = ({
                       filterContextMenu.open(event, "filters");
                     }}
                     className={cn("relative", hasFilterSettings && "text-primary")}
-                    tooltip="Filter problems"
+                    tooltip={t("diagnostics.filter")}
                   >
                     <Filter />
                     {activeFilterCount > 0 && (
@@ -1014,7 +1033,7 @@ const DiagnosticsPane = ({
             items={diagnosticFileItems}
             selectedKey={selectedFileNavigatorKey}
             onSelect={selectDiagnosticFile}
-            ariaLabel="Diagnostic files"
+            ariaLabel={t("diagnostics.filesAria")}
             viewMode={preferences.fileNavigatorViewMode}
             onViewModeChange={(fileNavigatorViewMode) =>
               setPreferences((prev) => ({
@@ -1027,11 +1046,15 @@ const DiagnosticsPane = ({
 
         <ScrollArea className="min-h-0 flex-1" contentClassName="px-1.5 py-1.5">
           {diagnostics.length === 0 ? (
-            <EmptyState message="No problems detected" />
+            <EmptyState message={t("diagnostics.empty")} />
           ) : filteredDiagnostics.length === 0 ? (
             <EmptyState
-              message="No problems match the current filters"
-              action={hasFilters ? { label: "Reset filters", onClick: resetFilters } : undefined}
+              message={t("diagnostics.noMatch")}
+              action={
+                hasFilters
+                  ? { label: t("diagnostics.resetFilters"), onClick: resetFilters }
+                  : undefined
+              }
             />
           ) : (
             <div className="space-y-1.5">
diff --git a/windows/tauri/src/features/editor/components/code-editor.tsx b/windows/tauri/src/features/editor/components/code-editor.tsx
index 3a4545c88..1cd9c7557 100644
--- a/windows/tauri/src/features/editor/components/code-editor.tsx
+++ b/windows/tauri/src/features/editor/components/code-editor.tsx
@@ -514,6 +514,7 @@ const CodeEditor = ({
             editorViewKey={editorViewKey}
             bufferId={activeBufferId ?? undefined}
             filePathOverride={breadcrumbProps?.filePathOverride ?? filePath}
+            showFilePath={breadcrumbProps?.showFilePath ?? false}
           />
         )}
 
diff --git a/windows/tauri/src/features/editor/components/toolbar/breadcrumb.tsx b/windows/tauri/src/features/editor/components/toolbar/breadcrumb.tsx
index 5e76df993..8e44f2cb7 100644
--- a/windows/tauri/src/features/editor/components/toolbar/breadcrumb.tsx
+++ b/windows/tauri/src/features/editor/components/toolbar/breadcrumb.tsx
@@ -11,6 +11,7 @@ import { useExtensionActions } from "@/extensions/ui/hooks/use-extension-actions
 import { ExtensionToolbarAction } from "@/extensions/ui/components/extension-toolbar-action";
 import { isMarkdownPreviewableFile } from "@/features/editor/markdown/previewable";
 import { useSettingsStore } from "@/features/settings/stores/settings.store";
+import { useTranslation } from "@/i18n/locale-provider";
 import { Button, type ButtonProps } from "@/ui/button";
 import { Dropdown, type MenuItem } from "@/ui/dropdown";
 import { cn } from "@/utils/cn";
@@ -26,6 +27,7 @@ export interface BreadcrumbProps {
   showDefaultActions?: boolean;
   interactive?: boolean;
   showPath?: boolean;
+  showFilePath?: boolean;
 }
 
 type BreadcrumbActionButtonProps = Omit<ButtonProps, "variant" | "size">;
@@ -50,7 +52,9 @@ export default function Breadcrumb({
   showDefaultActions = true,
   interactive = true,
   showPath = true,
+  showFilePath = true,
 }: BreadcrumbProps = {}) {
+  const { t } = useTranslation();
   const resolvedBufferId = useBufferStore((state) => bufferId ?? state.activeBufferId);
   const activeBuffer = useBufferStore(
     useShallow((state) => {
@@ -149,19 +153,19 @@ export default function Breadcrumb({
       ? [
           {
             id: "preview",
-            label: "Preview",
+            label: t("editor.preview"),
             onClick: handlePreviewClick,
           },
         ]
       : []),
     {
       id: "inline-edit",
-      label: "AI inline edit",
+      label: t("editor.aiInlineEdit"),
       onClick: handleInlineEditClick,
     },
     {
       id: "find",
-      label: "Find in file",
+      label: t("editor.findInFile"),
       onClick: onSearchClick,
     },
   ];
@@ -177,7 +181,7 @@ export default function Breadcrumb({
           ref={actionsButtonRef}
           onClick={() => setIsActionsMenuOpen((open) => !open)}
           active={isActionsMenuOpen}
-          tooltip="Editor actions"
+          tooltip={t("editor.actions")}
           tooltipSide="bottom"
         >
           <MoreHorizontal />
@@ -202,10 +206,12 @@ export default function Breadcrumb({
         <div className="font-sans flex min-w-0 items-center gap-2 text-subtle-foreground ui-text-sm">
           {showPath && showBreadcrumbPath ? (
             <>
-              <FilePathBreadcrumb
-                filePath={filePath}
-                interactive={interactive && !isLocalHistorySnapshot}
-              />
+              {showFilePath ? (
+                <FilePathBreadcrumb
+                  filePath={filePath}
+                  interactive={interactive && !isLocalHistorySnapshot}
+                />
+              ) : null}
               <SymbolBreadcrumb
                 bufferId={resolvedBufferId ?? undefined}
                 editorViewKey={editorViewKey}
diff --git a/windows/tauri/src/features/editor/components/toolbar/editor-status-actions.tsx b/windows/tauri/src/features/editor/components/toolbar/editor-status-actions.tsx
index 3305e7d6b..1b2bdd100 100644
--- a/windows/tauri/src/features/editor/components/toolbar/editor-status-actions.tsx
+++ b/windows/tauri/src/features/editor/components/toolbar/editor-status-actions.tsx
@@ -26,6 +26,7 @@ import {
 } from "@/features/editor/utils/language-id";
 import { hasTextContent } from "@/features/panes/types/pane-content.types";
 import { useSettingsStore } from "@/features/settings/stores/settings.store";
+import { useTranslation } from "@/i18n/locale-provider";
 import { Button } from "@/ui/button";
 import { Empty, EmptyDescription, EmptyHeader, EmptyTitle } from "@/ui/empty";
 import {
@@ -72,7 +73,7 @@ interface EditorStatusActionsProps {
 
 type LanguageOption = ReturnType<typeof getAllLanguages>[number];
 
-function CursorPositionChip({ editorViewKey }: { editorViewKey?: string | null }) {
+export function CursorPositionChip({ editorViewKey }: { editorViewKey?: string | null }) {
   const activeEditorViewKey = useEditorStateStore.use.activeEditorViewKey();
   const cursorPosition = useEditorStateStore.use.cursorPosition();
   const [isEditing, setIsEditing] = useState(false);
@@ -157,7 +158,8 @@ function CursorPositionChip({ editorViewKey }: { editorViewKey?: string | null }
   );
 }
 
-export function EditorStatusActions({ bufferId, editorViewKey }: EditorStatusActionsProps = {}) {
+export function EditorStatusActions({ bufferId }: EditorStatusActionsProps = {}) {
+  const { t } = useTranslation();
   const rootFolderPath = useFileSystemStore((state) => state.rootFolderPath);
   const resolvedBufferId = useBufferStore((state) => bufferId ?? state.activeBufferId);
   const breadcrumbsEnabled = useSettingsStore((state) => state.settings.coreFeatures.breadcrumbs);
@@ -190,25 +192,25 @@ export function EditorStatusActions({ bufferId, editorViewKey }: EditorStatusAct
         return {
           icon: <Zap className="[&_path]:fill-current" weight="fill" />,
           color: "text-success",
-          title: "Language Servers Active",
+          title: t("lsp.active"),
         };
       case "connecting":
         return {
-          icon: <Spinner label="Connecting" compact />,
+          icon: <Spinner label={t("lsp.connectingShort")} compact />,
           color: "text-warning",
-          title: "Connecting to Language Server...",
+          title: t("lsp.connecting"),
         };
       case "error":
         return {
           icon: <ZapOff weight="duotone" />,
           color: "text-destructive",
-          title: "Language server issue",
+          title: t("lsp.issue"),
         };
       default:
         return {
           icon: <ZapOff weight="duotone" />,
           color: "text-subtle-foreground opacity-50",
-          title: "No active language servers",
+          title: t("lsp.noActive"),
         };
     }
   };
@@ -216,7 +218,7 @@ export function EditorStatusActions({ bufferId, editorViewKey }: EditorStatusAct
   const config = getStatusConfig(lspStatus.status);
   const activeServers = lspStatus.supportedLanguages || [];
   const hasActiveServers = lspStatus.status === "connected" && activeServers.length > 0;
-  const projectName = rootFolderPath ? getFilenameFromPath(rootFolderPath) : "No Project";
+  const projectName = rootFolderPath ? getFilenameFromPath(rootFolderPath) : t("lsp.noProject");
   const activeBuffer = useBufferStore(
     useShallow((state) => {
       const buffer = getBufferById(state.buffers, resolvedBufferId);
@@ -384,7 +386,7 @@ export function EditorStatusActions({ bufferId, editorViewKey }: EditorStatusAct
   const displayOptions = [
     {
       id: "breadcrumbs",
-      label: "Breadcrumbs",
+      label: t("settings.advanced.feature.breadcrumbs.name"),
       checked: breadcrumbsEnabled,
       shortcut: null,
       onToggle: () => {
@@ -397,14 +399,14 @@ export function EditorStatusActions({ bufferId, editorViewKey }: EditorStatusAct
     },
     {
       id: "minimap",
-      label: "Minimap",
+      label: t("editor.minimap"),
       checked: showMinimap,
       shortcut: minimapShortcut,
       onToggle: () => updateSetting("showMinimap", !showMinimap),
     },
     {
       id: "line-numbers",
-      label: "Line Numbers",
+      label: t("settings.editor.lineNumbers"),
       checked: lineNumbers,
       shortcut: null,
       onToggle: () => updateSetting("lineNumbers", !lineNumbers),
@@ -412,7 +414,7 @@ export function EditorStatusActions({ bufferId, editorViewKey }: EditorStatusAct
     },
     {
       id: "relative-line-numbers",
-      label: "Relative Line Numbers",
+      label: t("settings.editor.relativeLineNumbers"),
       checked: vimRelativeLineNumbers,
       shortcut: null,
       onToggle: () => updateSetting("vimRelativeLineNumbers", !vimRelativeLineNumbers),
@@ -420,7 +422,7 @@ export function EditorStatusActions({ bufferId, editorViewKey }: EditorStatusAct
     },
     {
       id: "word-wrap",
-      label: "Word Wrap",
+      label: t("settings.editor.wordWrap"),
       checked: wordWrap,
       shortcut: null,
       onToggle: () => updateSetting("wordWrap", !wordWrap),
@@ -428,7 +430,7 @@ export function EditorStatusActions({ bufferId, editorViewKey }: EditorStatusAct
     },
     {
       id: "parameter-hints",
-      label: "Parameter Hints",
+      label: t("settings.editor.parameterHints"),
       checked: parameterHints,
       shortcut: null,
       onToggle: () => updateSetting("parameterHints", !parameterHints),
@@ -436,7 +438,7 @@ export function EditorStatusActions({ bufferId, editorViewKey }: EditorStatusAct
     },
     {
       id: "auto-completion",
-      label: "Auto Completion",
+      label: t("settings.editor.autoCompletion"),
       checked: autoCompletion,
       shortcut: null,
       onToggle: () => updateSetting("autoCompletion", !autoCompletion),
@@ -444,7 +446,7 @@ export function EditorStatusActions({ bufferId, editorViewKey }: EditorStatusAct
     },
     {
       id: "inlay-hints",
-      label: "Inlay Hints",
+      label: t("settings.editor.inlayHints"),
       checked: inlayHints,
       shortcut: null,
       onToggle: () => updateSetting("inlayHints", !inlayHints),
@@ -452,7 +454,7 @@ export function EditorStatusActions({ bufferId, editorViewKey }: EditorStatusAct
     },
     {
       id: "code-lens",
-      label: "Code Lens",
+      label: t("settings.editor.codeLens"),
       checked: codeLens,
       shortcut: null,
       onToggle: () => updateSetting("codeLens", !codeLens),
@@ -460,7 +462,7 @@ export function EditorStatusActions({ bufferId, editorViewKey }: EditorStatusAct
     },
     {
       id: "semantic-tokens",
-      label: "Semantic Tokens",
+      label: t("settings.editor.semanticTokens"),
       checked: semanticTokens,
       shortcut: null,
       onToggle: () => updateSetting("semanticTokens", !semanticTokens),
@@ -468,7 +470,7 @@ export function EditorStatusActions({ bufferId, editorViewKey }: EditorStatusAct
     },
     {
       id: "vim-mode",
-      label: "Vim Mode",
+      label: t("settings.keyboard.vimMode"),
       checked: vimMode,
       shortcut: null,
       onToggle: () => updateSetting("vimMode", !vimMode),
@@ -476,7 +478,7 @@ export function EditorStatusActions({ bufferId, editorViewKey }: EditorStatusAct
     },
     {
       id: "inline-git-blame",
-      label: "Inline Git Blame",
+      label: t("editor.inlineGitBlame"),
       checked: enableInlineGitBlame,
       shortcut: null,
       onToggle: () => updateSetting("enableInlineGitBlame", !enableInlineGitBlame),
@@ -486,8 +488,6 @@ export function EditorStatusActions({ bufferId, editorViewKey }: EditorStatusAct
 
   return (
     <>
-      <CursorPositionChip editorViewKey={editorViewKey} />
-
       {activeBuffer?.type === "editor" && (
         <div className="flex h-5 items-center self-center">
           <Combobox
@@ -504,8 +504,8 @@ export function EditorStatusActions({ bufferId, editorViewKey }: EditorStatusAct
             filter={filterLanguages}
           >
             <ComboboxInput
-              aria-label="Select language mode"
-              placeholder={currentFileDisplayName || "Plain Text"}
+              aria-label={t("editor.selectLanguage")}
+              placeholder={currentFileDisplayName || t("editor.plainText")}
               size="xs"
               variant="ghost"
               showClear={false}
@@ -533,7 +533,7 @@ export function EditorStatusActions({ bufferId, editorViewKey }: EditorStatusAct
                     <span className="truncate">{lang.displayName}</span>
                   </ComboboxItem>
                 ))}
-                <ComboboxEmpty className="ui-text-sm">No languages found</ComboboxEmpty>
+                <ComboboxEmpty className="ui-text-sm">{t("editor.noLanguages")}</ComboboxEmpty>
               </ComboboxList>
             </ComboboxContent>
           </Combobox>
@@ -554,7 +554,7 @@ export function EditorStatusActions({ bufferId, editorViewKey }: EditorStatusAct
             config.color,
             isLspOpen && "bg-accent text-foreground",
           )}
-          aria-label="Language server status"
+          aria-label={t("lsp.status")}
           tooltip={config.title}
           tooltipSide="bottom"
         >
@@ -584,7 +584,7 @@ export function EditorStatusActions({ bufferId, editorViewKey }: EditorStatusAct
                       size="xs"
                       className={cn(editorMenuActionButtonClass, "flex-1")}
                     >
-                      {bulkLspAction === "restart" ? "Restarting..." : "Restart all"}
+                      {bulkLspAction === "restart" ? t("lsp.restarting") : t("lsp.restartAll")}
                     </Button>
                     <Button
                       type="button"
@@ -594,7 +594,7 @@ export function EditorStatusActions({ bufferId, editorViewKey }: EditorStatusAct
                       size="xs"
                       className={cn(editorMenuActionButtonClass, "flex-1")}
                     >
-                      {bulkLspAction === "stop" ? "Stopping..." : "Stop all"}
+                      {bulkLspAction === "stop" ? t("lsp.stopping") : t("lsp.stopAll")}
                     </Button>
                   </div>
                 )}
@@ -617,7 +617,7 @@ export function EditorStatusActions({ bufferId, editorViewKey }: EditorStatusAct
                           size="xs"
                           className={editorMenuActionButtonClass}
                         >
-                          {isBusy ? "..." : "Restart"}
+                          {isBusy ? "..." : t("lsp.restart")}
                         </Button>
                         <Button
                           type="button"
@@ -651,7 +651,7 @@ export function EditorStatusActions({ bufferId, editorViewKey }: EditorStatusAct
                         size="xs"
                         className={editorMenuActionButtonClass}
                       >
-                        {isRestartingCurrent ? "Starting..." : "Start"}
+                        {isRestartingCurrent ? t("lsp.starting") : t("lsp.start")}
                       </Button>
                     </div>
                   </div>
@@ -660,7 +660,7 @@ export function EditorStatusActions({ bufferId, editorViewKey }: EditorStatusAct
             ) : lspStatus.status === "connecting" ? (
               <Empty className="min-h-0 flex-none items-start rounded-lg px-2 py-2 text-left">
                 <EmptyDescription>
-                  <Spinner label="Connecting" showLabel compact />
+                  <Spinner label={t("lsp.connectingShort")} showLabel compact />
                 </EmptyDescription>
               </Empty>
             ) : lspStatus.status === "error" ? (
@@ -672,19 +672,16 @@ export function EditorStatusActions({ bufferId, editorViewKey }: EditorStatusAct
                 <EmptyHeader className="items-start">
                   <EmptyTitle className="flex items-center gap-2">
                     <ZapOff weight="duotone" />
-                    Language server issue
+                    {t("lsp.issue")}
                   </EmptyTitle>
-                  <EmptyDescription>
-                    Check notifications for the latest error. Reinstall the affected language tools
-                    from Extensions if the server binary is missing or failed to launch.
-                  </EmptyDescription>
+                  <EmptyDescription>{t("lsp.issueHint")}</EmptyDescription>
                 </EmptyHeader>
               </Empty>
             ) : (
               <Empty className="min-h-0 flex-none items-start rounded-lg px-2 py-2 text-left">
                 <EmptyDescription className="flex items-center gap-2">
                   <ZapOff className="opacity-50" weight="duotone" />
-                  No active language servers
+                  {t("lsp.noActive")}
                 </EmptyDescription>
               </Empty>
             )}
@@ -703,7 +700,7 @@ export function EditorStatusActions({ bufferId, editorViewKey }: EditorStatusAct
             "text-subtle-foreground",
             isViewMenuOpen && "border-border/60 bg-accent/80 text-foreground",
           )}
-          tooltip="Editor preferences"
+          tooltip={t("editor.preferences")}
           tooltipSide="bottom"
         >
           <span className="flex size-full items-center justify-center">
diff --git a/windows/tauri/src/features/editor/components/toolbar/file-path-breadcrumb.tsx b/windows/tauri/src/features/editor/components/toolbar/file-path-breadcrumb.tsx
index 6e7b6ed00..84eac6cc5 100644
--- a/windows/tauri/src/features/editor/components/toolbar/file-path-breadcrumb.tsx
+++ b/windows/tauri/src/features/editor/components/toolbar/file-path-breadcrumb.tsx
@@ -23,12 +23,14 @@ interface DirectoryEntry {
 interface FilePathBreadcrumbProps {
   filePath: string;
   interactive?: boolean;
+  menuSide?: "top" | "bottom";
   className?: string;
 }
 
 export function FilePathBreadcrumb({
   filePath,
   interactive = true,
+  menuSide = "bottom",
   className,
 }: FilePathBreadcrumbProps) {
   const rootFolderPath = useFileSystemStore((state) => state.rootFolderPath);
@@ -162,7 +164,7 @@ export function FilePathBreadcrumb({
       setDropdown({
         segmentIndex,
         x: rect.left,
-        y: rect.bottom + 2,
+        y: menuSide === "top" ? rect.top : rect.bottom + 2,
         items,
         currentPath: dirPath,
         navigationStack: [],
@@ -187,6 +189,13 @@ export function FilePathBreadcrumb({
               }
             : undefined
         }
+        lastSegmentLeading={
+          <ThemedFileIcon
+            fileName={segments[segments.length - 1] ?? ""}
+            isDir={false}
+            className="size-3.5 shrink-0 text-subtle-foreground"
+          />
+        }
         className={className}
       />
 
diff --git a/windows/tauri/src/features/editor/components/toolbar/path-breadcrumb.tsx b/windows/tauri/src/features/editor/components/toolbar/path-breadcrumb.tsx
index 2e5d5d89e..85fcf794e 100644
--- a/windows/tauri/src/features/editor/components/toolbar/path-breadcrumb.tsx
+++ b/windows/tauri/src/features/editor/components/toolbar/path-breadcrumb.tsx
@@ -1,4 +1,4 @@
-import { Fragment, type MouseEvent } from "react";
+import { Fragment, type MouseEvent, type ReactNode } from "react";
 import { Button } from "@/ui/button";
 import {
   Breadcrumb,
@@ -15,6 +15,7 @@ interface PathBreadcrumbProps {
   interactive?: boolean;
   onSegmentClick?: (index: number, event: MouseEvent<HTMLButtonElement>) => void;
   setSegmentRef?: (index: number, element: HTMLButtonElement | null) => void;
+  lastSegmentLeading?: ReactNode;
   className?: string;
 }
 
@@ -23,6 +24,7 @@ export function PathBreadcrumb({
   interactive = false,
   onSegmentClick,
   setSegmentRef,
+  lastSegmentLeading,
   className,
 }: PathBreadcrumbProps) {
   if (segments.length === 0) return null;
@@ -52,16 +54,25 @@ export function PathBreadcrumb({
                       />
                     }
                     className={cn(
-                      "min-w-0 whitespace-nowrap",
+                      "min-w-0 items-center gap-1 whitespace-nowrap",
                       isLast
                         ? "font-medium text-foreground hover:text-foreground"
                         : "text-subtle-foreground hover:text-foreground",
                     )}
                   >
+                    {isLast && lastSegmentLeading ? (
+                      <span className="flex shrink-0 items-center">{lastSegmentLeading}</span>
+                    ) : null}
                     {segment}
                   </BreadcrumbLink>
                 ) : isLast ? (
-                  <BreadcrumbPage data-slot="breadcrumb-segment" className="truncate px-1.5">
+                  <BreadcrumbPage
+                    data-slot="breadcrumb-segment"
+                    className="inline-flex items-center gap-1 truncate px-1.5"
+                  >
+                    {lastSegmentLeading ? (
+                      <span className="flex shrink-0 items-center">{lastSegmentLeading}</span>
+                    ) : null}
                     {segment}
                   </BreadcrumbPage>
                 ) : (
diff --git a/windows/tauri/src/features/editor/context-menu/context-menu.tsx b/windows/tauri/src/features/editor/context-menu/context-menu.tsx
index 5448ed9a3..2e9a21ad3 100644
--- a/windows/tauri/src/features/editor/context-menu/context-menu.tsx
+++ b/windows/tauri/src/features/editor/context-menu/context-menu.tsx
@@ -1,5 +1,6 @@
 import { EDITOR_CONSTANTS } from "@/features/editor/config/constants";
 import { useEditorStateStore } from "@/features/editor/stores/state.store";
+import { useTranslation } from "@/i18n/locale-provider";
 import { Dropdown } from "@/ui/dropdown";
 import { IS_MAC } from "@/utils/platform";
 import {
@@ -14,6 +15,7 @@ interface EditorContextMenuProps extends EditorContextMenuHandlers {
 }
 
 const EditorContextMenu = ({ isOpen, position, onClose, ...handlers }: EditorContextMenuProps) => {
+  const { t } = useTranslation();
   const hasSelection = (() => {
     if (!isOpen) return false;
     const selection = useEditorStateStore.getState().selection;
@@ -28,6 +30,7 @@ const EditorContextMenu = ({ isOpen, position, onClose, ...handlers }: EditorCon
     hasSelection,
     modifierKey,
     altKey,
+    t,
     ...handlers,
   });
 
diff --git a/windows/tauri/src/features/editor/context-menu/editor-context-menu-items.tsx b/windows/tauri/src/features/editor/context-menu/editor-context-menu-items.tsx
index 8ad20a56b..bb45e9a09 100644
--- a/windows/tauri/src/features/editor/context-menu/editor-context-menu-items.tsx
+++ b/windows/tauri/src/features/editor/context-menu/editor-context-menu-items.tsx
@@ -53,6 +53,7 @@ export interface EditorContextMenuItemOptions extends EditorContextMenuHandlers
   hasSelection: boolean;
   modifierKey: string;
   altKey: string;
+  t: (key: string) => string;
 }
 
 const noop = () => {};
@@ -69,6 +70,7 @@ export function buildEditorContextMenuItems({
   hasSelection,
   modifierKey,
   altKey,
+  t,
   onCopy,
   onCut,
   onPaste,
@@ -99,7 +101,7 @@ export function buildEditorContextMenuItems({
   return [
     {
       id: "copy",
-      label: "Copy",
+      label: t("files.copy"),
       icon: <Copy />,
       keybinding: <Keybinding keys={[modifierKey, "C"]} className="opacity-60" />,
       disabled: isDisabled(onCopy, !hasSelection),
@@ -107,7 +109,7 @@ export function buildEditorContextMenuItems({
     },
     {
       id: "cut",
-      label: "Cut",
+      label: t("files.cut"),
       icon: <Scissors />,
       keybinding: <Keybinding keys={[modifierKey, "X"]} className="opacity-60" />,
       disabled: isDisabled(onCut, !hasSelection),
@@ -115,7 +117,7 @@ export function buildEditorContextMenuItems({
     },
     {
       id: "paste",
-      label: "Paste",
+      label: t("files.paste"),
       icon: <ClipboardPaste />,
       keybinding: <Keybinding keys={[modifierKey, "V"]} className="opacity-60" />,
       disabled: isDisabled(onPaste),
@@ -123,7 +125,7 @@ export function buildEditorContextMenuItems({
     },
     {
       id: "delete",
-      label: "Delete",
+      label: t("files.delete"),
       icon: <Trash2 />,
       keybinding: <Keybinding keys={["Del"]} className="opacity-60" />,
       disabled: isDisabled(onDelete, !hasSelection),
@@ -132,7 +134,7 @@ export function buildEditorContextMenuItems({
     separator("sep-1"),
     {
       id: "select-all",
-      label: "Select All",
+      label: t("editor.selectAll"),
       icon: <Type />,
       keybinding: <Keybinding keys={[modifierKey, "A"]} className="opacity-60" />,
       disabled: isDisabled(onSelectAll),
@@ -140,14 +142,14 @@ export function buildEditorContextMenuItems({
     },
     {
       id: "duplicate",
-      label: "Duplicate Line",
+      label: t("editor.duplicateLine"),
       icon: <FileText />,
       disabled: isDisabled(onDuplicate),
       onClick: onDuplicate ?? noop,
     },
     {
       id: "select-next-occurrence",
-      label: "Add Selection to Next Match",
+      label: t("editor.addSelectionToNextMatch"),
       icon: <Search />,
       keybinding: <Keybinding keys={[modifierKey, "D"]} className="opacity-60" />,
       disabled: isDisabled(onSelectNextOccurrence),
@@ -155,7 +157,7 @@ export function buildEditorContextMenuItems({
     },
     {
       id: "select-all-occurrences",
-      label: "Select All Occurrences",
+      label: t("editor.selectAllOccurrences"),
       icon: <Search />,
       keybinding: <Keybinding keys={[modifierKey, "Shift", "L"]} className="opacity-60" />,
       disabled: isDisabled(onSelectAllOccurrences),
@@ -164,7 +166,7 @@ export function buildEditorContextMenuItems({
     separator("sep-2"),
     {
       id: "toggle-comment",
-      label: "Toggle Comment",
+      label: t("editor.toggleComment"),
       icon: <Code />,
       keybinding: <Keybinding keys={[modifierKey, "/"]} className="opacity-60" />,
       disabled: isDisabled(onToggleComment),
@@ -172,7 +174,7 @@ export function buildEditorContextMenuItems({
     },
     {
       id: "indent",
-      label: "Indent",
+      label: t("editor.indent"),
       icon: <Indent />,
       keybinding: <Keybinding keys={["Tab"]} className="opacity-60" />,
       disabled: isDisabled(onIndent),
@@ -180,7 +182,7 @@ export function buildEditorContextMenuItems({
     },
     {
       id: "outdent",
-      label: "Outdent",
+      label: t("editor.outdent"),
       icon: <Outdent />,
       keybinding: <Keybinding keys={["Shift", "Tab"]} className="opacity-60" />,
       disabled: isDisabled(onOutdent),
@@ -188,7 +190,7 @@ export function buildEditorContextMenuItems({
     },
     {
       id: "format",
-      label: "Format Document",
+      label: t("editor.formatDocument"),
       icon: <AlignLeft />,
       keybinding: <Keybinding keys={["Shift", altKey, "F"]} className="opacity-60" />,
       disabled: isDisabled(onFormat),
@@ -196,7 +198,7 @@ export function buildEditorContextMenuItems({
     },
     {
       id: "format-selection",
-      label: "Format Selection",
+      label: t("editor.formatSelection"),
       icon: <AlignLeft />,
       keybinding: <Keybinding keys={[modifierKey, "K", modifierKey, "F"]} className="opacity-60" />,
       disabled: isDisabled(onFormatSelection, !hasSelection),
@@ -205,7 +207,7 @@ export function buildEditorContextMenuItems({
     separator("sep-3"),
     {
       id: "move-up",
-      label: "Move Line Up",
+      label: t("editor.moveLineUp"),
       icon: <ChevronUp />,
       keybinding: <Keybinding keys={[altKey, "Up"]} className="opacity-60" />,
       disabled: isDisabled(onMoveLineUp),
@@ -213,7 +215,7 @@ export function buildEditorContextMenuItems({
     },
     {
       id: "move-down",
-      label: "Move Line Down",
+      label: t("editor.moveLineDown"),
       icon: <ChevronDown />,
       keybinding: <Keybinding keys={[altKey, "Down"]} className="opacity-60" />,
       disabled: isDisabled(onMoveLineDown),
@@ -221,7 +223,7 @@ export function buildEditorContextMenuItems({
     },
     {
       id: "toggle-case",
-      label: "Toggle Case",
+      label: t("editor.toggleCase"),
       icon: <CaseSensitive />,
       disabled: isDisabled(onToggleCase, !hasSelection),
       onClick: onToggleCase ?? noop,
@@ -229,7 +231,7 @@ export function buildEditorContextMenuItems({
     separator("sep-4"),
     {
       id: "go-to-definition",
-      label: "Go to Definition",
+      label: t("editor.goToDefinition"),
       icon: <Code />,
       keybinding: <Keybinding keys={["F12"]} className="opacity-60" />,
       disabled: isDisabled(onGoToDefinition),
@@ -237,7 +239,7 @@ export function buildEditorContextMenuItems({
     },
     {
       id: "find-references",
-      label: "Find All References",
+      label: t("editor.findAllReferences"),
       icon: <Search />,
       keybinding: <Keybinding keys={["Shift", "F12"]} className="opacity-60" />,
       disabled: isDisabled(onFindReferences),
@@ -245,14 +247,14 @@ export function buildEditorContextMenuItems({
     },
     {
       id: "go-to-type-definition",
-      label: "Go to Type Definition",
+      label: t("editor.goToTypeDefinition"),
       icon: <Code />,
       disabled: isDisabled(onGoToTypeDefinition),
       onClick: onGoToTypeDefinition ?? noop,
     },
     {
       id: "rename-symbol",
-      label: "Rename Symbol",
+      label: t("editor.renameSymbol"),
       icon: <PenLine />,
       keybinding: <Keybinding keys={["F2"]} className="opacity-60" />,
       disabled: isDisabled(onRenameSymbol),
@@ -260,7 +262,7 @@ export function buildEditorContextMenuItems({
     },
     {
       id: "quick-fix",
-      label: "Quick Fix...",
+      label: t("editor.quickFix"),
       icon: <PenLine />,
       keybinding: <Keybinding keys={[modifierKey, "."]} className="opacity-60" />,
       disabled: isDisabled(onQuickFix),
@@ -268,7 +270,7 @@ export function buildEditorContextMenuItems({
     },
     {
       id: "show-hover",
-      label: "Show Hover",
+      label: t("editor.showHover"),
       icon: <Code />,
       keybinding: <Keybinding keys={[modifierKey, "K", modifierKey, "I"]} className="opacity-60" />,
       disabled: isDisabled(onShowHover),
@@ -276,7 +278,7 @@ export function buildEditorContextMenuItems({
     },
     {
       id: "trigger-suggest",
-      label: "Trigger Suggest",
+      label: t("editor.triggerSuggest"),
       icon: <Code />,
       keybinding: <Keybinding keys={["Ctrl", "Space"]} className="opacity-60" />,
       disabled: isDisabled(onTriggerSuggest),
@@ -285,7 +287,7 @@ export function buildEditorContextMenuItems({
     separator("sep-5"),
     {
       id: "find",
-      label: "Find",
+      label: t("editor.find"),
       icon: <Search />,
       keybinding: <Keybinding keys={[modifierKey, "F"]} className="opacity-60" />,
       disabled: isDisabled(onFind),
@@ -293,7 +295,7 @@ export function buildEditorContextMenuItems({
     },
     {
       id: "go-to-line",
-      label: "Go to Line",
+      label: t("editor.goToLine"),
       icon: <RotateCcw />,
       keybinding: <Keybinding keys={[modifierKey, "G"]} className="opacity-60" />,
       disabled: isDisabled(onGoToLine),
@@ -301,7 +303,7 @@ export function buildEditorContextMenuItems({
     },
     {
       id: "bookmark",
-      label: "Toggle Bookmark",
+      label: t("editor.toggleBookmark"),
       icon: <Bookmark />,
       keybinding: <Keybinding keys={[modifierKey, "K", modifierKey, "K"]} className="opacity-60" />,
       disabled: isDisabled(onToggleBookmark),
diff --git a/windows/tauri/src/features/file-explorer/hooks/use-file-explorer-context-menu.tsx b/windows/tauri/src/features/file-explorer/hooks/use-file-explorer-context-menu.tsx
index 31ce5e2ba..89ca8b82f 100644
--- a/windows/tauri/src/features/file-explorer/hooks/use-file-explorer-context-menu.tsx
+++ b/windows/tauri/src/features/file-explorer/hooks/use-file-explorer-context-menu.tsx
@@ -38,6 +38,7 @@ import { Button } from "@/ui/button";
 import { Dropdown, type MenuItem } from "@/ui/dropdown";
 import Dialog from "@/ui/dialog";
 import { toast } from "sonner";
+import { useTranslation } from "@/i18n/locale-provider";
 import { getBaseName, getDirName, getRelativePath, joinPath } from "@/utils/path-helpers";
 
 interface UseFileExplorerContextMenuOptions {
@@ -77,9 +78,9 @@ interface PropertiesDialogState {
 
 const menuIconSpacer = <span aria-hidden="true" />;
 
-function formatFileSize(sizeHeader: string | null): string {
+function formatFileSize(sizeHeader: string | null, unknownLabel: string): string {
   const bytes = Number(sizeHeader);
-  if (!Number.isFinite(bytes) || bytes < 0) return "Unknown";
+  if (!Number.isFinite(bytes) || bytes < 0) return unknownLabel;
   if (bytes < 1024) return `${bytes} bytes`;
 
   const units = ["KB", "MB", "GB", "TB"];
@@ -112,6 +113,7 @@ export function useFileExplorerContextMenu({
   onStartInlineEditing,
   onOpenAllFilesInDirectory,
 }: UseFileExplorerContextMenuOptions) {
+  const { t } = useTranslation();
   const [contextMenu, setContextMenu] = useState<ContextMenuState | null>(null);
   const [envOverwriteDialog, setEnvOverwriteDialog] = useState<EnvOverwriteDialogState | null>(
     null,
@@ -159,15 +161,15 @@ export function useFileExplorerContextMenu({
         }
 
         onRefreshDirectory?.(directoryPath, { force: true });
-        toast.success(`Created ${targetFileName}`);
+        toast.success(t("files.created", { name: targetFileName }));
       } catch (error) {
         console.error("Failed to create env template file:", error);
-        toast.error(`Failed to create ${targetFileName}`, {
+        toast.error(t("files.createFailed", { name: targetFileName }), {
           description: error instanceof Error ? error.message : undefined,
         });
       }
     },
-    [onCreateNewFileInDirectory, onRefreshDirectory],
+    [onCreateNewFileInDirectory, onRefreshDirectory, t],
   );
 
   const handleEnvOverwriteConfirm = useCallback(() => {
@@ -201,13 +203,13 @@ export function useFileExplorerContextMenu({
       items.push(
         {
           id: "new-file",
-          label: "New File",
+          label: t("files.newFile"),
           icon: <FilePlus />,
           onClick: () => onStartInlineEditing(contextMenu.path, false),
         },
         {
           id: "new-folder",
-          label: "New Folder",
+          label: t("files.newFolder"),
           icon: <FolderPlus />,
           onClick: () => {
             if (onCreateNewFolderInDirectory) onStartInlineEditing(contextMenu.path, true);
@@ -215,19 +217,19 @@ export function useFileExplorerContextMenu({
         },
         {
           id: "upload-files",
-          label: "Upload Files",
+          label: t("files.uploadFiles"),
           icon: <Upload />,
           onClick: () => onUploadFile?.(contextMenu.path),
         },
         {
           id: "refresh",
-          label: "Refresh",
+          label: t("files.refresh"),
           icon: <RefreshCw />,
           onClick: () => onRefreshDirectory?.(contextMenu.path, { force: true }),
         },
         {
           id: "add-folder-to-workspace",
-          label: "Add Folder to Workspace",
+          label: t("files.addFolderToWorkspace"),
           icon: <FolderPlus />,
           onClick: () => onAddFolderToWorkspace?.(),
         },
@@ -235,7 +237,7 @@ export function useFileExplorerContextMenu({
           ? [
               {
                 id: "remove-folder-from-workspace",
-                label: "Remove Folder from Workspace",
+                label: t("files.removeFolderFromWorkspace"),
                 icon: <X />,
                 onClick: () => onRemoveFolderFromWorkspace?.(contextMenu.path),
               },
@@ -243,19 +245,19 @@ export function useFileExplorerContextMenu({
           : []),
         {
           id: "open-all-files",
-          label: "Open All Files",
+          label: t("files.openAllFiles"),
           icon: <FolderOpen />,
           onClick: () => void onOpenAllFilesInDirectory(contextMenu.path),
         },
         {
           id: "collapse-all",
-          label: "Collapse All",
+          label: t("files.collapseAll"),
           icon: <CaretDoubleUp />,
           onClick: () => useFileTreeStore.getState().actions.collapsePath(contextMenu.path),
         },
         {
           id: "open-terminal",
-          label: "Open in Terminal",
+          label: t("files.openInTerminal"),
           icon: <Terminal />,
           onClick: () => {
             const folderName = getBaseName(contextMenu.path, "terminal");
@@ -268,7 +270,7 @@ export function useFileExplorerContextMenu({
         },
         {
           id: "find-in-folder",
-          label: "Find in Folder",
+          label: t("files.findInFolder"),
           icon: <Search />,
           onClick: () => {},
         },
@@ -277,7 +279,7 @@ export function useFileExplorerContextMenu({
       if (onGenerateImage) {
         items.push({
           id: "generate-image",
-          label: "Generate Image",
+          label: t("files.generateImage"),
           icon: <ImageIcon />,
           onClick: () => onGenerateImage(contextMenu.path),
         });
@@ -294,13 +296,13 @@ export function useFileExplorerContextMenu({
       items.push(
         {
           id: "open",
-          label: "Open",
+          label: t("files.open"),
           icon: <FolderOpen />,
           onClick: () => onFileSelect(contextMenu.path, false),
         },
         {
           id: "copy-content",
-          label: "Copy Content",
+          label: t("files.copyContent"),
           icon: <Copy />,
           onClick: async () => {
             try {
@@ -312,13 +314,13 @@ export function useFileExplorerContextMenu({
         },
         {
           id: "duplicate-file",
-          label: "Duplicate",
+          label: t("files.duplicate"),
           icon: <FileText />,
           onClick: () => onDuplicatePath?.(contextMenu.path),
         },
         {
           id: "local-history",
-          label: "Local History",
+          label: t("files.localHistory"),
           icon: <ClockCounterClockwise />,
           onClick: () => openLocalHistoryForPath(contextMenu.path),
         },
@@ -335,23 +337,23 @@ export function useFileExplorerContextMenu({
           : []),
         {
           id: "properties",
-          label: "Properties",
+          label: t("files.properties"),
           icon: <Info />,
           onClick: async () => {
             const fileName = getBaseName(contextMenu.path, "");
             const extension = fileName.includes(".") ? fileName.split(".").pop() : undefined;
-            let size = "Unknown";
+            let size = t("files.sizeUnknown");
 
             try {
               const stats = await fetch(`file://${contextMenu.path}`, { method: "HEAD" });
-              size = formatFileSize(stats.headers.get("content-length"));
+              size = formatFileSize(stats.headers.get("content-length"), t("files.sizeUnknown"));
             } catch {}
 
             setPropertiesDialog({
               fileName,
               path: contextMenu.path,
               size,
-              type: extension || "No extension",
+              type: extension || t("files.noExtension"),
             });
           },
         },
@@ -365,7 +367,7 @@ export function useFileExplorerContextMenu({
     items.push(
       {
         id: "copy-path",
-        label: "Copy Path",
+        label: t("files.copyPath"),
         icon: <Link />,
         onClick: async () => {
           try {
@@ -375,7 +377,7 @@ export function useFileExplorerContextMenu({
       },
       {
         id: "copy-relative-path",
-        label: "Copy Relative Path",
+        label: t("files.copyRelativePath"),
         icon: <FileText />,
         onClick: async () => {
           try {
@@ -386,14 +388,14 @@ export function useFileExplorerContextMenu({
       },
       {
         id: "copy",
-        label: "Copy",
+        label: t("files.copy"),
         icon: <Copy />,
         onClick: () =>
           clipboardActions.copy([{ path: contextMenu.path, is_dir: contextMenu.isDir }]),
       },
       {
         id: "cut",
-        label: "Cut",
+        label: t("files.cut"),
         icon: <Scissors />,
         onClick: () =>
           clipboardActions.cut([{ path: contextMenu.path, is_dir: contextMenu.isDir }]),
@@ -403,7 +405,7 @@ export function useFileExplorerContextMenu({
     if (clipboard && contextMenu.isDir) {
       items.push({
         id: "paste",
-        label: "Paste",
+        label: t("files.paste"),
         icon: <Clipboard />,
         onClick: () => {
           clipboardActions.paste(contextMenu.path).then(() => {
@@ -417,13 +419,13 @@ export function useFileExplorerContextMenu({
       items.push(
         {
           id: "rename",
-          label: "Rename",
+          label: t("files.rename"),
           icon: <Edit />,
           onClick: () => onRenamePath?.(contextMenu.path),
         },
         {
           id: "reveal",
-          label: "Reveal in Finder",
+          label: t("files.reveal"),
           icon: <Eye />,
           onClick: () => {
             if (onRevealInFinder) onRevealInFinder(contextMenu.path);
@@ -437,7 +439,7 @@ export function useFileExplorerContextMenu({
         { id: "sep-end", label: "", separator: true, onClick: () => {} },
         {
           id: "delete",
-          label: "Delete",
+          label: t("files.delete"),
           icon: <Trash />,
           className: "text-destructive",
           onClick: () => onDeleteRequested({ path: contextMenu.path, isDir: contextMenu.isDir }),
@@ -446,7 +448,7 @@ export function useFileExplorerContextMenu({
     } else {
       items.push({
         id: "reveal",
-        label: "Reveal in Finder",
+        label: t("files.reveal"),
         icon: <Eye />,
         onClick: () => onRevealInFinder?.(contextMenu.path),
       });
@@ -475,6 +477,7 @@ export function useFileExplorerContextMenu({
     onUploadFile,
     isWorkspaceRootPath,
     rootFolderPath,
+    t,
   ]);
 
   const hasDialog = Boolean(envOverwriteDialog || propertiesDialog);
@@ -492,7 +495,7 @@ export function useFileExplorerContextMenu({
 
         {envOverwriteDialog && (
           <Dialog
-            title="Overwrite Env File"
+            title={t("files.overwriteEnvTitle")}
             icon={Warning}
             onClose={() => setEnvOverwriteDialog(null)}
             footer={
@@ -502,7 +505,7 @@ export function useFileExplorerContextMenu({
                   onClick={() => setEnvOverwriteDialog(null)}
                   className="ui-text-base"
                 >
-                  Cancel
+                  {t("files.cancel")}
                 </Button>
                 <Button
                   variant="danger"
@@ -510,29 +513,29 @@ export function useFileExplorerContextMenu({
                   size="xs"
                   className="ui-text-base"
                 >
-                  Overwrite
+                  {t("files.overwrite")}
                 </Button>
               </>
             }
           >
             <p className="font-sans ui-text-base text-foreground">
-              {envOverwriteDialog.targetFileName} already exists. Overwrite it?
+              {t("files.overwriteEnvMessage", { name: envOverwriteDialog.targetFileName })}
             </p>
           </Dialog>
         )}
 
         {propertiesDialog && (
-          <Dialog title="Properties" icon={Info} onClose={() => setPropertiesDialog(null)}>
+          <Dialog title={t("files.properties")} icon={Info} onClose={() => setPropertiesDialog(null)}>
             <dl className="grid grid-cols-[72px_1fr] gap-x-3 gap-y-2 font-sans ui-text-base">
-              <dt className="text-subtle-foreground">File</dt>
+              <dt className="text-subtle-foreground">{t("files.propertiesFile")}</dt>
               <dd className="min-w-0 wrap-break-word text-foreground">
                 {propertiesDialog.fileName}
               </dd>
-              <dt className="text-subtle-foreground">Path</dt>
+              <dt className="text-subtle-foreground">{t("files.propertiesPath")}</dt>
               <dd className="min-w-0 wrap-break-word text-foreground">{propertiesDialog.path}</dd>
-              <dt className="text-subtle-foreground">Size</dt>
+              <dt className="text-subtle-foreground">{t("files.propertiesSize")}</dt>
               <dd className="text-foreground">{propertiesDialog.size}</dd>
-              <dt className="text-subtle-foreground">Type</dt>
+              <dt className="text-subtle-foreground">{t("files.propertiesType")}</dt>
               <dd className="text-foreground">{propertiesDialog.type}</dd>
             </dl>
           </Dialog>
diff --git a/windows/tauri/src/features/git/components/diff/git-diff-editor-stack.tsx b/windows/tauri/src/features/git/components/diff/git-diff-editor-stack.tsx
index addcf4cfb..a41c1b0c8 100644
--- a/windows/tauri/src/features/git/components/diff/git-diff-editor-stack.tsx
+++ b/windows/tauri/src/features/git/components/diff/git-diff-editor-stack.tsx
@@ -35,6 +35,7 @@ import {
 } from "@/features/editor/utils/search";
 import { formatRelativeDate } from "@/utils/date";
 import { cn } from "@/utils/cn";
+import { useTranslation } from "@/i18n/locale-provider";
 import { joinPath } from "@/utils/path-helpers";
 import { Avatar } from "@/ui/avatar";
 import { Button } from "@/ui/button";
@@ -647,6 +648,7 @@ const GitDiffEditorStack = memo(function GitDiffEditorStack({
 }: {
   multiDiff: MultiFileDiff;
 }) {
+  const { t } = useTranslation();
   const activeBuffer = useBufferStore((state) => {
     return getBufferById(state.buffers, state.activeBufferId);
   });
@@ -769,12 +771,12 @@ const GitDiffEditorStack = memo(function GitDiffEditorStack({
   const selectedFileStatus = selectedDiffFile ? getFileStatus(selectedDiffFile.diff) : null;
   const selectedStatusLabel = selectedFileStatus
     ? selectedFileStatus === "added"
-      ? "ADDED"
+      ? t("git.diff.statusAdded")
       : selectedFileStatus === "deleted"
-        ? "DELETED"
+        ? t("git.diff.statusDeleted")
         : selectedFileStatus === "renamed"
-          ? "RENAMED"
-          : "MODIFIED"
+          ? t("git.diff.statusRenamed")
+          : t("git.diff.statusModified")
     : null;
   const handleToggleSection = useCallback((sectionKey: string) => {
     setExpandedFiles((prev) => {
@@ -1054,7 +1056,7 @@ const GitDiffEditorStack = memo(function GitDiffEditorStack({
   return (
     <div className="relative flex h-full flex-col overflow-hidden bg-background">
       <Breadcrumb
-        filePathOverride={multiDiff.title || "Uncommitted Changes"}
+        filePathOverride={multiDiff.title || t("git.diff.uncommitted")}
         interactive={false}
         showPath={false}
         showDefaultActions={false}
@@ -1076,13 +1078,13 @@ const GitDiffEditorStack = memo(function GitDiffEditorStack({
                   {selectedStatusLabel}
                 </span>
                 <span className="rounded-md bg-accent/70 px-1.5 py-0.5 font-medium text-muted-foreground">
-                  WORKTREE
+                  {t("git.diff.worktree")}
                 </span>
               </>
             ) : (
               <>
                 <span className="shrink-0 font-medium text-foreground">
-                  {multiDiff.title || "Uncommitted Changes"}
+                  {multiDiff.title || t("git.diff.uncommitted")}
                 </span>
                 <span className="truncate">{indexedFileLabel}</span>
               </>
@@ -1102,9 +1104,9 @@ const GitDiffEditorStack = memo(function GitDiffEditorStack({
               type="button"
               active={isFindVisible}
               onClick={() => setIsFindVisible(!isFindVisible)}
-              tooltip="Search changes"
+              tooltip={t("git.diff.searchChanges")}
               tooltipSide="bottom"
-              aria-label="Search changes"
+              aria-label={t("git.diff.searchChanges")}
             >
               <Search />
             </BreadcrumbActionButton>
@@ -1126,9 +1128,9 @@ const GitDiffEditorStack = memo(function GitDiffEditorStack({
                 type="button"
                 active={selectedDisplayViewMode === "unified"}
                 onClick={() => setViewMode("unified")}
-                tooltip="Unified view"
+                tooltip={t("git.diff.unified")}
                 tooltipSide="bottom"
-                aria-label="Unified view"
+                aria-label={t("git.diff.unified")}
               >
                 <Rows3 weight="duotone" />
               </BreadcrumbActionButton>
@@ -1170,7 +1172,7 @@ const GitDiffEditorStack = memo(function GitDiffEditorStack({
                   </DropdownMenuItem>
                 ) : null}
                 <DropdownMenuItem onClick={() => setShowWhitespace((current) => !current)}>
-                  {showWhitespace ? "Hide whitespace" : "Show whitespace"}
+                  {showWhitespace ? t("git.diff.hideWhitespace") : t("git.diff.showWhitespace")}
                 </DropdownMenuItem>
               </DropdownMenuContent>
             </DropdownMenu>
@@ -1190,7 +1192,7 @@ const GitDiffEditorStack = memo(function GitDiffEditorStack({
               )}
             >
               <Search className="shrink-0" />
-              <span className="flex-1">Search Diff</span>
+              <span className="flex-1">{t("git.diff.search")}</span>
             </button>
 
             <div className="h-5 w-px bg-border/70" />
@@ -1206,7 +1208,7 @@ const GitDiffEditorStack = memo(function GitDiffEditorStack({
                 aria-pressed={selectedDisplayViewMode === "unified"}
               >
                 <Rows3 weight="duotone" />
-                Unified
+                {t("git.diff.unified")}
               </button>
               <button
                 type="button"
@@ -1219,7 +1221,7 @@ const GitDiffEditorStack = memo(function GitDiffEditorStack({
                 aria-pressed={selectedDisplayViewMode === "split"}
               >
                 <Columns2 weight="duotone" />
-                Side-by-side
+                {t("git.diff.split")}
               </button>
             </div>
 
@@ -1232,7 +1234,7 @@ const GitDiffEditorStack = memo(function GitDiffEditorStack({
               )}
               aria-pressed={showWhitespace}
             >
-              {showWhitespace ? "Hide whitespace" : "Show whitespace"}
+              {showWhitespace ? t("git.diff.hideWhitespace") : t("git.diff.showWhitespace")}
             </button>
 
             <span className="ml-auto min-w-0 truncate text-right ui-text-sm text-subtle-foreground">
@@ -1252,13 +1254,17 @@ const GitDiffEditorStack = memo(function GitDiffEditorStack({
               <>
                 <div className="ui-text-sm flex min-w-0 items-center gap-2 border-border/70 border-r px-3">
                   <Lock className="shrink-0 text-subtle-foreground" />
-                  <span className="shrink-0 font-medium text-foreground">Index version</span>
+                  <span className="shrink-0 font-medium text-foreground">
+                    {t("git.diff.indexVersion")}
+                  </span>
                   <span className="truncate text-subtle-foreground">{selectedFilePath}</span>
                 </div>
                 <div className="border-border/70 border-r bg-surface/50" />
                 <div className="ui-text-sm flex min-w-0 items-center gap-2 px-3">
                   <FileText className="shrink-0 text-git-added" />
-                  <span className="shrink-0 font-medium text-foreground">Current version</span>
+                  <span className="shrink-0 font-medium text-foreground">
+                    {t("git.diff.currentVersion")}
+                  </span>
                   <span className="truncate text-subtle-foreground">{selectedFilePath}</span>
                 </div>
               </>
@@ -1272,10 +1278,10 @@ const GitDiffEditorStack = memo(function GitDiffEditorStack({
                 />
                 <span className="shrink-0 font-medium text-foreground">
                   {selectedFileStatus === "added"
-                    ? "Added version"
+                    ? t("git.diff.addedVersion")
                     : selectedFileStatus === "deleted"
-                      ? "Deleted version"
-                      : "Current version"}
+                      ? t("git.diff.deletedVersion")
+                      : t("git.diff.currentVersion")}
                 </span>
                 <span className="truncate text-subtle-foreground">{selectedFilePath}</span>
               </div>
diff --git a/windows/tauri/src/features/git/components/diff/git-diff-header.tsx b/windows/tauri/src/features/git/components/diff/git-diff-header.tsx
index 5c0687146..d56886aae 100644
--- a/windows/tauri/src/features/git/components/diff/git-diff-header.tsx
+++ b/windows/tauri/src/features/git/components/diff/git-diff-header.tsx
@@ -13,6 +13,7 @@ import Breadcrumb, {
 } from "@/features/editor/components/toolbar/breadcrumb";
 import { useBufferStore } from "@/features/editor/stores/buffer.store";
 import { cn } from "@/utils/cn";
+import { useTranslation } from "@/i18n/locale-provider";
 import type { DiffHeaderProps } from "../../types/git-diff.types";
 import { countDiffStats, getFileStatus } from "../../utils/git-diff-helpers";
 
@@ -31,6 +32,7 @@ const DiffHeader = memo(
     onClose,
     showDisplayControls = true,
   }: DiffHeaderProps) => {
+    const { t } = useTranslation();
     const { closeBuffer } = useBufferStore.use.actions();
     const activeBufferId = useBufferStore.use.activeBufferId();
 
@@ -128,8 +130,12 @@ const DiffHeader = memo(
                     onClick={() => onShowWhitespaceChange?.(!showWhitespace)}
                     active={showWhitespace}
                     className="gap-1"
-                    tooltip={showWhitespace ? "Hide whitespace" : "Show whitespace"}
-                    aria-label={showWhitespace ? "Hide whitespace" : "Show whitespace"}
+                    tooltip={
+                      showWhitespace ? t("git.diff.hideWhitespace") : t("git.diff.showWhitespace")
+                    }
+                    aria-label={
+                      showWhitespace ? t("git.diff.hideWhitespace") : t("git.diff.showWhitespace")
+                    }
                   >
                     <Trash2 weight="duotone" />
                     {showWhitespace && <Check weight="duotone" />}
diff --git a/windows/tauri/src/features/git/components/diff/git-diff-hunk-header.tsx b/windows/tauri/src/features/git/components/diff/git-diff-hunk-header.tsx
index 1c343e655..38a23246e 100644
--- a/windows/tauri/src/features/git/components/diff/git-diff-hunk-header.tsx
+++ b/windows/tauri/src/features/git/components/diff/git-diff-hunk-header.tsx
@@ -11,6 +11,7 @@ import { calculateLineHeight } from "@/features/editor/utils/lines";
 import { useFileSystemStore } from "@/features/file-system/stores/file-system.store";
 import { useZoomStore } from "@/features/window/stores/zoom.store";
 import { cn } from "@/utils/cn";
+import { useTranslation } from "@/i18n/locale-provider";
 import { stageHunk, unstageHunk } from "../../api/git-status-api";
 import type { DiffHunkHeaderProps } from "../../types/git-diff.types";
 import { createGitHunk, parseDiffHunkRange } from "../../utils/git-diff-helpers";
@@ -28,6 +29,7 @@ const DiffHunkHeader = memo(
     onUnstageHunk,
     isInMultiFileView = false,
   }: DiffHunkHeaderProps) => {
+    const { t } = useTranslation();
     const rootFolderPath = useFileSystemStore.use.rootFolderPath?.();
     const editorFontSize = useEditorSettingsStore.use.fontSize();
     const editorFontFamily = useEditorSettingsStore.use.fontFamily();
@@ -138,11 +140,11 @@ const DiffHunkHeader = memo(
                     ? "bg-git-deleted/20 text-git-deleted hover:bg-git-deleted/30"
                     : "bg-git-added/20 text-git-added hover:bg-git-added/30",
                 )}
-                title={isStaged ? "Unstage hunk" : "Stage hunk"}
-                aria-label={isStaged ? "Unstage hunk" : "Stage hunk"}
+                title={isStaged ? t("git.diff.unstage") : t("git.diff.stage")}
+                aria-label={isStaged ? t("git.diff.unstage") : t("git.diff.stage")}
               >
                 {isStaged ? <Minus size={iconSize} /> : <Plus size={iconSize} />}
-                <span>{isStaged ? "Unstage" : "Stage"}</span>
+                <span>{isStaged ? t("git.diff.unstage") : t("git.diff.stage")}</span>
               </button>
             )}
           </div>
diff --git a/windows/tauri/src/features/git/components/git-actions-menu.tsx b/windows/tauri/src/features/git/components/git-actions-menu.tsx
index e01fe4738..141225aa7 100644
--- a/windows/tauri/src/features/git/components/git-actions-menu.tsx
+++ b/windows/tauri/src/features/git/components/git-actions-menu.tsx
@@ -17,6 +17,7 @@ import { Dropdown, type MenuItem } from "@/ui/dropdown";
 import { Spinner } from "@/ui/spinner";
 import { showConfirmDialog } from "@/ui/dialog";
 import { toast } from "sonner";
+import { useTranslation } from "@/i18n/locale-provider";
 import {
   fetchChanges,
   pullChanges,
@@ -62,6 +63,7 @@ const GitActionsMenu = ({
   onInitializeRepository,
   isInitializingRepository,
 }: GitActionsMenuProps) => {
+  const { t } = useTranslation();
   const [isLoading, setIsLoading] = useState(false);
   const isRefreshing = useGitStore((state) => state.isRefreshing);
   const confirmBeforeDiscard = useSettingsStore((state) => state.settings.confirmBeforeDiscard);
@@ -201,7 +203,7 @@ const GitActionsMenu = ({
     ? [
         {
           id: "select-repository",
-          label: isSelectingRepository ? "Selecting..." : "Select Repository",
+          label: isSelectingRepository ? t("git.selecting") : t("git.selectRepository"),
           icon: <FolderOpen />,
           disabled: isSelectingRepository,
           onClick: () => void handleSelectRepository(),
@@ -209,20 +211,20 @@ const GitActionsMenu = ({
         { id: "sep-1", label: "", separator: true, onClick: () => {} },
         {
           id: "manage-branches",
-          label: "Manage Branches",
+          label: t("git.manageBranches"),
           icon: <GitBranch />,
           onClick: handleBranchManager,
         },
         {
           id: "show-branch-diff",
-          label: "Show Branch Diff",
+          label: t("git.showBranchDiff"),
           icon: <GitPullRequest />,
           onClick: handleShowBranchDiff,
         },
         { id: "sep-branches", label: "", separator: true, onClick: () => {} },
         {
           id: "push",
-          label: "Push Changes",
+          label: t("git.pushChanges"),
           icon: <Upload />,
           disabled: isLoading,
           onClick: handlePush,
@@ -230,14 +232,14 @@ const GitActionsMenu = ({
         { id: "sep-2", label: "", separator: true, onClick: () => {} },
         {
           id: "pull",
-          label: "Pull Changes",
+          label: t("git.pullChanges"),
           icon: <Download weight="fill" />,
           disabled: isLoading,
           onClick: handlePull,
         },
         {
           id: "fetch",
-          label: "Fetch",
+          label: t("git.fetch"),
           icon: <GitPullRequest />,
           disabled: isLoading,
           onClick: handleFetch,
@@ -245,34 +247,34 @@ const GitActionsMenu = ({
         { id: "sep-3", label: "", separator: true, onClick: () => {} },
         {
           id: "manage-remotes",
-          label: "Manage Remotes",
+          label: t("git.manageRemotes"),
           icon: <Server />,
           onClick: handleRemoteManager,
         },
         {
           id: "manage-tags",
-          label: "Manage Tags",
+          label: t("git.manageTags"),
           icon: <Tag />,
           onClick: handleTagManager,
         },
         {
           id: "view-stashes",
-          label: "View Stashes",
+          label: t("git.viewStashes"),
           icon: <Archive />,
           onClick: handleViewStashes,
         },
         { id: "sep-4", label: "", separator: true, onClick: () => {} },
         {
           id: "refresh",
-          label: "Refresh Status",
-          icon: isRefreshing ? <Spinner label="Refreshing status" compact /> : <RefreshCw />,
+          label: t("git.refreshStatus"),
+          icon: isRefreshing ? <Spinner label={t("git.refreshStatus")} compact /> : <RefreshCw />,
           disabled: isRefreshing,
           onClick: () => void handleRefresh(),
         },
         { id: "sep-5", label: "", separator: true, onClick: () => {} },
         {
           id: "discard-all",
-          label: "Discard All Changes",
+          label: t("git.discardAllChanges"),
           icon: <RotateCcw />,
           disabled: isLoading,
           className: "text-destructive",
@@ -290,8 +292,8 @@ const GitActionsMenu = ({
         { id: "sep-1", label: "", separator: true, onClick: () => {} },
         {
           id: "refresh",
-          label: "Refresh Status",
-          icon: isRefreshing ? <Spinner label="Refreshing status" compact /> : <RefreshCw />,
+          label: t("git.refreshStatus"),
+          icon: isRefreshing ? <Spinner label={t("git.refreshStatus")} compact /> : <RefreshCw />,
           disabled: isRefreshing,
           onClick: () => void handleRefresh(),
         },
diff --git a/windows/tauri/src/features/git/components/git-branch-manager.tsx b/windows/tauri/src/features/git/components/git-branch-manager.tsx
index dd8e4d5c7..d7e2b6c28 100644
--- a/windows/tauri/src/features/git/components/git-branch-manager.tsx
+++ b/windows/tauri/src/features/git/components/git-branch-manager.tsx
@@ -6,6 +6,7 @@ import {
   TrashIcon as Trash2,
 } from "@/ui/icons";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useTranslation } from "@/i18n/locale-provider";
 import { useToast } from "@/features/layout/contexts/toast-context";
 import { useUIState } from "@/features/window/stores/ui-state.store";
 import { Button } from "@/ui/button";
@@ -80,8 +81,11 @@ function getCreateBranchName(branches: string[], currentBranch: string, query: s
   return trimmedQuery;
 }
 
-function getBranchLabel(worktree: GitWorktree) {
-  return worktree.branch || (worktree.is_detached ? "Detached HEAD" : "No branch");
+function getBranchLabel(
+  worktree: GitWorktree,
+  translate: (key: string) => string,
+) {
+  return worktree.branch || (worktree.is_detached ? translate("git.detachedHead") : translate("git.noBranch"));
 }
 
 function getFilteredWorktrees(worktrees: GitWorktree[], repoPath: string, query: string) {
@@ -141,6 +145,7 @@ const GitBranchManager = ({
   openEventName = "lithe:open-branch-manager",
   triggerSurface = "default",
 }: GitBranchManagerProps) => {
+  const { t } = useTranslation();
   const [branches, setBranches] = useState<string[]>([]);
   const [worktrees, setWorktrees] = useState<GitWorktree[]>([]);
   const [branchQuery, setBranchQuery] = useState("");
@@ -280,12 +285,12 @@ const GitBranchManager = ({
           type: "warning",
           duration: 0,
           action: {
-            label: "Stash Changes",
+            label: t("git.stashChanges"),
             onClick: async () => {
               try {
                 const stashSuccess = await createStash(
                   repoPath,
-                  `Switching to ${branchName}`,
+                  t("git.switchingTo", { branch: branchName }),
                   true,
                 );
                 if (stashSuccess) {
@@ -293,21 +298,21 @@ const GitBranchManager = ({
                   if (retryResult.success) {
                     useGitBlameStore.getState().actions.clearAllBlame();
                     showToast({
-                      message: "Changes stashed and branch switched successfully",
+                      message: t("git.stashAndSwitchSuccess"),
                       type: "success",
                     });
                     setIsDropdownOpen(false);
                     onBranchChange?.();
                   } else {
                     showToast({
-                      message: "Failed to switch branch after stashing",
+                      message: t("git.stashAndSwitchFailed"),
                       type: "error",
                     });
                   }
                 }
               } catch {
                 showToast({
-                  message: "Failed to stash changes",
+                  message: t("git.stashFailed"),
                   type: "error",
                 });
               }
@@ -335,8 +340,8 @@ const GitBranchManager = ({
     if (!repoPath || !branchName || branchName === currentBranch) return;
 
     const confirmed = await showConfirmDialog(
-      `Are you sure you want to delete branch "${branchName}"?`,
-      { title: "Delete Branch", confirmLabel: "Delete" },
+      t("git.deleteBranchConfirm", { branch: branchName }),
+      { title: t("git.deleteBranch"), confirmLabel: t("git.delete") },
     );
     if (!confirmed) return;
 
@@ -353,18 +358,19 @@ const GitBranchManager = ({
 
   const reportIntegrationOutcome = (branchName: string, outcome: IntegrationOutcome) => {
     if (outcome.status === "clean") {
-      showToast({ message: `Merged ${branchName} successfully.`, type: "success" });
+      showToast({ message: t("git.mergeSuccess", { branch: branchName }), type: "success" });
     } else if (outcome.status === "conflicts") {
       showToast({
-        message: `Stopped with ${outcome.conflictedPaths.length} conflicted file${
-          outcome.conflictedPaths.length === 1 ? "" : "s"
-        }. Resolve them in the changes list, then continue.`,
+        message: t(
+          outcome.conflictedPaths.length === 1 ? "git.conflictedFile" : "git.conflictedFiles",
+          { count: outcome.conflictedPaths.length },
+        ),
         type: "warning",
         duration: 6000,
       });
     } else if (outcome.status === "stopped") {
       showToast({
-        message: `${branchName} stopped before completion. Continue, skip, or abort from the changes list.`,
+        message: t("git.stoppedBeforeCompletion", { branch: branchName }),
         type: "warning",
         duration: 6000,
       });
@@ -372,9 +378,10 @@ const GitBranchManager = ({
       const listed = outcome.blockingPaths.slice(0, 3).join(", ");
       const remaining = outcome.blockingPaths.length - Math.min(outcome.blockingPaths.length, 3);
       showToast({
-        message: `Uncommitted changes would be overwritten: ${listed}${
-          remaining > 0 ? ` (+${remaining} more)`
-        : ""}. Stash or commit them first.`,
+        message: t("git.uncommittedWouldOverwrite", {
+          listed,
+          more: remaining > 0 ? t("git.moreFiles", { count: remaining }) : "",
+        }),
         type: "warning",
         duration: 6000,
       });
@@ -384,15 +391,15 @@ const GitBranchManager = ({
   };
 
   const handleIntegration = async (branchName: string, operation: "merge" | "rebase") => {
-    if (!repoPath || !branchName || branchName === currentBranch) return;
+    if (!repoPath || !currentBranch || !branchName || branchName === currentBranch) return;
 
-    const action = operation === "merge" ? "Merge" : "Rebase";
+    const action = operation === "merge" ? t("git.merge") : t("git.rebase");
     const message =
       operation === "merge"
-        ? `Merge branch "${branchName}" into "${currentBranch}"? Conflicts may require resolution.`
-        : `Rebase "${currentBranch}" onto "${branchName}"? Conflicts may require resolution.`;
+        ? t("git.mergeConfirm", { branch: branchName, current: currentBranch })
+        : t("git.rebaseConfirm", { branch: branchName, current: currentBranch });
     const confirmed = await showConfirmDialog(message, {
-      title: `${action} Branch`,
+      title: operation === "merge" ? t("git.mergeBranchTitle") : t("git.rebaseBranchTitle"),
       confirmLabel: action,
     });
     if (!confirmed) return;
@@ -413,7 +420,7 @@ const GitBranchManager = ({
       }
     } catch (error) {
       showToast({
-        message: error instanceof Error ? error.message : `${action} failed.`,
+        message: error instanceof Error ? error.message : operation === "merge" ? t("git.mergeFailed") : t("git.rebaseFailed"),
         type: "error",
       });
     } finally {
@@ -482,7 +489,7 @@ const GitBranchManager = ({
 
       const resolvedRepoPath = await resolveRepositoryPath(selected);
       if (!resolvedRepoPath) {
-        setSelectionError("Selected folder is not inside a Git repository.");
+        setSelectionError(t("git.selectedFolderNotRepo"));
         return;
       }
 
@@ -492,11 +499,13 @@ const GitBranchManager = ({
       onRepositoryChange?.(resolvedRepoPath);
     } catch (error) {
       console.error("Failed to select repository:", error);
-      setSelectionError(error instanceof Error ? error.message : "Failed to select repository.");
+      setSelectionError(
+        error instanceof Error ? error.message : t("git.failedToSelectRepository"),
+      );
     } finally {
       setIsSelectingRepo(false);
     }
-  }, [onRepositoryChange, setManualRepository]);
+  }, [onRepositoryChange, setManualRepository, t]);
 
   const handleClearAddedRepositories = () => {
     clearManualRepository();
@@ -601,21 +610,21 @@ const GitBranchManager = ({
   const tabItems = [
     {
       id: "repositories",
-      label: "Repositories",
+      label: t("git.repositories"),
       icon: <FolderOpenIcon className={gitCommandIconClassName} />,
       isActive: activeTab === "repositories",
       onSelect: () => handleTabChange("repositories"),
     },
     {
       id: "branches",
-      label: "Branches",
+      label: t("git.branches"),
       icon: <GitBranchIcon className={gitCommandIconClassName} />,
       isActive: activeTab === "branches",
       onSelect: () => handleTabChange("branches"),
     },
     {
       id: "worktrees",
-      label: "Worktrees",
+      label: t("git.worktrees"),
       icon: <NodesIcon className={gitCommandIconClassName} />,
       isActive: activeTab === "worktrees",
       onSelect: () => handleTabChange("worktrees"),
@@ -635,7 +644,7 @@ const GitBranchManager = ({
           triggerSurface === "footer" && "font-medium",
           isDropdownOpen ? "bg-accent/80" : "cursor-pointer",
         )}
-        aria-label="Search branches"
+        aria-label={t("git.searchBranchesAria")}
       >
         <GitBranchIcon className="shrink-0" />
         <span
@@ -655,26 +664,31 @@ const GitBranchManager = ({
         inputRef={commandInputRef}
         placeholder={
           activeTab === "branches"
-            ? "Search branches..."
+            ? t("git.searchBranches")
             : activeTab === "worktrees"
-              ? "Search worktrees..."
-              : "Filter repositories..."
+              ? t("git.searchWorktrees")
+              : t("git.filterRepositories")
         }
         meta={
           activeTab === "branches"
-            ? `${branches.length} branch${branches.length === 1 ? "" : "es"}`
+            ? t(branches.length === 1 ? "git.branchCount" : "git.branchesCount", {
+                count: branches.length,
+              })
             : activeTab === "worktrees"
-              ? `${worktrees.length} worktree${worktrees.length === 1 ? "" : "s"}`
-              : `${availableRepoPaths.length} repositor${
-                  availableRepoPaths.length === 1 ? "y" : "ies"
-                }`
+              ? t(worktrees.length === 1 ? "git.worktreeCount" : "git.worktreesCount", {
+                  count: worktrees.length,
+                })
+              : t(
+                  availableRepoPaths.length === 1 ? "git.repositoryCount" : "git.repositoriesCount",
+                  { count: availableRepoPaths.length },
+                )
         }
-        headerAddon={<CommandTabs items={tabItems} ariaLabel="Git selector sections" />}
+        headerAddon={<CommandTabs items={tabItems} ariaLabel={t("git.selectorSections")} />}
       >
         <CommandList>
           {activeTab === "branches" && !createBranchName && filteredBranches.length === 0 ? (
             <CommandEmpty>
-              {branchQuery.trim() ? "No matching branches" : "No branches found"}
+              {branchQuery.trim() ? t("git.noMatchingBranches") : t("git.noBranchesFound")}
             </CommandEmpty>
           ) : null}
           {activeTab === "branches" && (createBranchName || filteredBranches.length > 0) ? (
@@ -683,7 +697,7 @@ const GitBranchManager = ({
                 <CommandItemRow
                   as="div"
                   icon={<Plus className={cn(gitCommandIconClassName, "text-subtle-foreground")} />}
-                  title={`Create new branch "${createBranchName}"`}
+                  title={t("git.createNewBranch", { name: createBranchName })}
                   onClick={() => void handleCreateBranch(createBranchName)}
                   disabled={isLoading}
                   isSelected={selectedIndex === 0}
@@ -710,10 +724,10 @@ const GitBranchManager = ({
           {activeTab === "worktrees" && !createWorktreePath && filteredWorktrees.length === 0 ? (
             <CommandEmpty>
               {isLoadingWorktrees
-                ? "Loading worktrees..."
+                ? t("git.loadingWorktrees")
                 : branchQuery.trim()
-                  ? "No matching worktrees"
-                  : "No worktrees found"}
+                  ? t("git.noMatchingWorktrees")
+                  : t("git.noWorktreesFound")}
             </CommandEmpty>
           ) : null}
           {activeTab === "worktrees" && (createWorktreePath || filteredWorktrees.length > 0) ? (
@@ -722,7 +736,7 @@ const GitBranchManager = ({
                 <CommandItemRow
                   as="div"
                   icon={<Plus className={cn(gitCommandIconClassName, "text-subtle-foreground")} />}
-                  title={`Create worktree "${createWorktreePath}"`}
+                  title={t("git.createWorktree", { path: createWorktreePath })}
                   onClick={() => void handleCreateWorktree(createWorktreePath)}
                   disabled={isLoadingWorktrees}
                   isSelected={selectedIndex === 0}
@@ -743,11 +757,11 @@ const GitBranchManager = ({
             </div>
           ) : null}
           {activeTab === "repositories" && isDiscoveringRepos && availableRepoPaths.length === 0 ? (
-            <CommandEmpty>Detecting repositories...</CommandEmpty>
+            <CommandEmpty>{t("git.detectingRepositories")}</CommandEmpty>
           ) : null}
           {activeTab === "repositories" && !isDiscoveringRepos && filteredRepoPaths.length === 0 ? (
             <CommandEmpty>
-              {branchQuery.trim() ? "No matching repositories" : "No repositories found"}
+              {branchQuery.trim() ? t("git.noMatchingRepositories") : t("git.noRepositoriesFound")}
             </CommandEmpty>
           ) : null}
           {activeTab === "repositories" && filteredRepoPaths.length > 0 ? (
@@ -776,7 +790,7 @@ const GitBranchManager = ({
                 disabled={!createBranchName || isLoading}
               >
                 <Plus />
-                New Branch
+                {t("git.newBranch")}
               </CommandFooterAction>
               <CommandFooterAction
                 type="button"
@@ -784,7 +798,7 @@ const GitBranchManager = ({
                 disabled={isLoading}
               >
                 <RefreshCw />
-                Refresh
+                {t("git.refresh")}
               </CommandFooterAction>
             </>
           ) : null}
@@ -796,7 +810,7 @@ const GitBranchManager = ({
                 disabled={!createWorktreePath || isLoadingWorktrees}
               >
                 <Plus />
-                {isLoadingWorktrees ? "Adding..." : "Add"}
+                {isLoadingWorktrees ? t("git.adding") : t("git.add")}
               </CommandFooterAction>
               <CommandFooterAction
                 type="button"
@@ -804,7 +818,7 @@ const GitBranchManager = ({
                 disabled={isLoadingWorktrees}
               >
                 <RefreshCw />
-                Refresh
+                {t("git.refresh")}
               </CommandFooterAction>
             </>
           ) : null}
@@ -816,7 +830,7 @@ const GitBranchManager = ({
                 disabled={isSelectingRepo}
               >
                 <Plus />
-                {isSelectingRepo ? "Adding..." : "Add"}
+                {isSelectingRepo ? t("git.adding") : t("git.add")}
               </CommandFooterAction>
               <CommandFooterAction
                 type="button"
@@ -824,11 +838,11 @@ const GitBranchManager = ({
                 disabled={isDiscoveringRepos}
               >
                 <RefreshCw />
-                Refresh
+                {t("git.refresh")}
               </CommandFooterAction>
               {manualRepoPaths.length > 0 ? (
                 <CommandFooterAction type="button" onClick={handleClearAddedRepositories}>
-                  Clear Added
+                  {t("git.clearAdded")}
                 </CommandFooterAction>
               ) : null}
               {selectionError ? (
@@ -865,6 +879,7 @@ function BranchRow({
   onMerge: () => void;
   onRebase: () => void;
 }) {
+  const { t } = useTranslation();
   return (
     <CommandItemRow
       as="div"
@@ -884,7 +899,7 @@ function BranchRow({
         "min-h-9",
         isCurrent ? "text-foreground" : "text-subtle-foreground hover:text-foreground",
       )}
-      accessory={isCurrent ? <CommandItemBadge variant="success">current</CommandItemBadge> : null}
+      accessory={isCurrent ? <CommandItemBadge variant="success">{t("git.current")}</CommandItemBadge> : null}
       action={
         !isCurrent ? (
           <div
@@ -901,7 +916,7 @@ function BranchRow({
                     variant="ghost"
                     size="icon-xs"
                     disabled={isLoading}
-                    aria-label={`Branch actions for ${branch}`}
+                    aria-label={t("git.branchActions", { branch })}
                     type="button"
                   />
                 }
@@ -911,16 +926,16 @@ function BranchRow({
               <DropdownMenuContent className="min-w-64">
                 <DropdownMenuItem onClick={onMerge}>
                   <GitMergeIcon className="size-3.5" />
-                  Merge into Current Branch
+                  {t("git.mergeIntoCurrent")}
                 </DropdownMenuItem>
                 <DropdownMenuItem onClick={onRebase}>
                   <NodesIcon className="size-3.5" />
-                  Rebase Current Branch onto This
+                  {t("git.rebaseOntoThis")}
                 </DropdownMenuItem>
                 <DropdownMenuSeparator />
                 <DropdownMenuItem onClick={onDelete} className="text-git-deleted">
                   <Trash2 className="size-3.5" />
-                  Delete Branch
+                  {t("git.deleteBranch")}
                 </DropdownMenuItem>
               </DropdownMenuContent>
             </DropdownMenu>
@@ -948,6 +963,7 @@ function RepositoryRow({
   onMouseEnter: () => void;
   onSelect: () => void;
 }) {
+  const { t } = useTranslation();
   const relativePath = workspaceRootPath ? getRelativePath(repoPath, workspaceRootPath) : repoPath;
 
   return (
@@ -971,8 +987,8 @@ function RepositoryRow({
       )}
       accessory={
         <>
-          {isCurrent ? <CommandItemBadge variant="success">current</CommandItemBadge> : null}
-          {isAdded ? <CommandItemBadge>added</CommandItemBadge> : null}
+          {isCurrent ? <CommandItemBadge variant="success">{t("git.current")}</CommandItemBadge> : null}
+          {isAdded ? <CommandItemBadge>{t("git.added")}</CommandItemBadge> : null}
         </>
       }
     />
@@ -992,6 +1008,7 @@ function WorktreeRow({
   onMouseEnter: () => void;
   onSelect: () => void;
 }) {
+  const { t } = useTranslation();
   return (
     <CommandItemRow
       as="div"
@@ -1006,7 +1023,7 @@ function WorktreeRow({
       description={
         <>
           <GitBranchIcon className={gitCommandIconClassName} />
-          <span className="truncate">{getBranchLabel(worktree)}</span>
+          <span className="truncate">{getBranchLabel(worktree, t)}</span>
         </>
       }
       isSelected={isSelected}
@@ -1016,7 +1033,7 @@ function WorktreeRow({
         "min-h-9",
         isCurrent ? "text-foreground" : "text-subtle-foreground hover:text-foreground",
       )}
-      accessory={isCurrent ? <CommandItemBadge variant="success">current</CommandItemBadge> : null}
+      accessory={isCurrent ? <CommandItemBadge variant="success">{t("git.current")}</CommandItemBadge> : null}
     />
   );
 }
diff --git a/windows/tauri/src/features/git/components/git-commit-history.tsx b/windows/tauri/src/features/git/components/git-commit-history.tsx
index b3f15c983..ce5cd4e96 100644
--- a/windows/tauri/src/features/git/components/git-commit-history.tsx
+++ b/windows/tauri/src/features/git/components/git-commit-history.tsx
@@ -17,6 +17,7 @@ import type { AuthUser } from "@/features/window/services/auth-api";
 import { formatRelativeDate } from "@/utils/date";
 import { matchesSearchQuery } from "@/utils/search-match";
 import { cn } from "@/utils/cn";
+import { useTranslation } from "@/i18n/locale-provider";
 import type { GitCommit } from "../types/git.types";
 import { useGitStore } from "../stores/git.store";
 import { getGitAuthorAvatarUrl } from "../utils/git-author-avatar";
@@ -39,11 +40,11 @@ interface CommitItemProps {
 
 type HistorySearchScope = "all" | "message" | "author" | "hash";
 
-const HISTORY_SEARCH_SCOPE_LABELS: Record<HistorySearchScope, string> = {
-  all: "All Fields",
-  message: "Message",
-  author: "Author",
-  hash: "Hash",
+const HISTORY_SEARCH_SCOPE_KEYS: Record<HistorySearchScope, string> = {
+  all: "git.historyFilterAll",
+  message: "git.historyFilterMessage",
+  author: "git.historyFilterAuthor",
+  hash: "git.historyFilterHash",
 };
 
 function getCommitSearchFields(commit: GitCommit, scope: HistorySearchScope) {
@@ -126,6 +127,7 @@ const GitCommitHistory = ({
   ahead = 0,
   behind = 0,
 }: GitCommitHistoryProps) => {
+  const { t } = useTranslation();
   const commits = useGitStore((state) => state.commits);
   const hasMoreCommits = useGitStore((state) => state.hasMoreCommits);
   const isLoadingMoreCommits = useGitStore((state) => state.isLoadingMoreCommits);
@@ -253,17 +255,17 @@ const GitCommitHistory = ({
         <SidebarSearchPopover
           value={historySearchQuery}
           onChange={setHistorySearchQuery}
-          placeholder="Search history"
-          aria-label="Search history"
+          placeholder={t("git.historySearch")}
+          aria-label={t("git.historySearch")}
         />
         <DropdownMenu>
           <DropdownMenuTrigger
             render={
               <SidebarHeaderIconButton
                 active={hasHistoryFilter}
-                tooltip={`Filter: ${HISTORY_SEARCH_SCOPE_LABELS[historySearchScope]}`}
+                tooltip={t("git.historyFilter")}
                 tooltipSide="bottom"
-                aria-label="Filter history"
+                aria-label={t("git.historyFilter")}
               />
             }
           >
@@ -274,9 +276,9 @@ const GitCommitHistory = ({
               value={historySearchScope}
               onValueChange={(scope) => setHistorySearchScope(scope as HistorySearchScope)}
             >
-              {(Object.keys(HISTORY_SEARCH_SCOPE_LABELS) as HistorySearchScope[]).map((scope) => (
+              {(Object.keys(HISTORY_SEARCH_SCOPE_KEYS) as HistorySearchScope[]).map((scope) => (
                 <DropdownMenuRadioItem key={scope} value={scope} closeOnClick>
-                  {HISTORY_SEARCH_SCOPE_LABELS[scope]}
+                  {t(HISTORY_SEARCH_SCOPE_KEYS[scope])}
                 </DropdownMenuRadioItem>
               ))}
             </DropdownMenuRadioGroup>
@@ -306,9 +308,9 @@ const GitCommitHistory = ({
         ref={scrollContainerRef}
       >
         {!hasHistoryRows ? (
-          <EmptyState message="No commits" />
+          <EmptyState message={t("git.historyNoCommits")} />
         ) : filteredCommits.length === 0 ? (
-          <EmptyState message="No commits match the current filters" />
+          <EmptyState message={t("git.historyNoMatch")} />
         ) : (
           <>
             {filteredCommits.map((commit) => (
@@ -325,13 +327,13 @@ const GitCommitHistory = ({
 
             {isLoadingMoreCommits && (
               <div className="flex justify-center px-3 py-1.5 text-subtle-foreground">
-                <Spinner label="Loading commits" showLabel compact />
+                <Spinner label={t("git.log.loadingCommits")} showLabel compact />
               </div>
             )}
 
             {!hasMoreCommits && commits.length > 0 && (
               <div className="ui-text-sm px-3 py-1.5 text-center text-subtle-foreground">
-                end of history
+                {t("git.historyEnd")}
               </div>
             )}
           </>
diff --git a/windows/tauri/src/features/git/components/git-commit-panel.tsx b/windows/tauri/src/features/git/components/git-commit-panel.tsx
index a080e6bce..d51e02f4e 100644
--- a/windows/tauri/src/features/git/components/git-commit-panel.tsx
+++ b/windows/tauri/src/features/git/components/git-commit-panel.tsx
@@ -11,6 +11,7 @@ import { useLayoutEffect, useRef, useState } from "react";
 import { useSettingsStore } from "@/features/settings/stores/settings.store";
 import { useAuthStore } from "@/features/window/stores/auth.store";
 import { hasProductCapability } from "@/features/window/lib/product-capabilities";
+import { useTranslation } from "@/i18n/locale-provider";
 import { Button } from "@/ui/button";
 import { ButtonGroup, ButtonGroupSeparator } from "@/ui/button-group";
 import { Dropdown, type MenuItem } from "@/ui/dropdown";
@@ -191,6 +192,7 @@ const GitCommitPanel = ({
   behind = 0,
   onCommitSuccess,
 }: GitCommitPanelProps) => {
+  const { t } = useTranslation();
   const isAuthenticated = useAuthStore((state) => state.isAuthenticated);
   const subscription = useAuthStore((state) => state.subscription);
   const aiAutocompleteModelId = useSettingsStore((state) => state.settings.aiAutocompleteModelId);
@@ -390,13 +392,13 @@ const GitCommitPanel = ({
   const generateModeItems: MenuItem[] = [
     {
       id: "title",
-      label: "Title only",
+      label: t("git.commitMessageTitleOnly"),
       icon: commitMessageMode === "title" ? <Check /> : undefined,
       onClick: () => setCommitMessageMode("title"),
     },
     {
       id: "body",
-      label: "Title + body",
+      label: t("git.commitMessageTitleAndBody"),
       icon: commitMessageMode === "body" ? <Check /> : undefined,
       onClick: () => setCommitMessageMode("body"),
     },
@@ -422,7 +424,7 @@ const GitCommitPanel = ({
           value={commitMessage}
           onChange={(e) => setCommitMessage(e.target.value)}
           onKeyDown={handleKeyDown}
-          placeholder="Commit message..."
+          placeholder={t("git.commitMessagePlaceholder")}
           variant="ghost"
           className={cn(
             "max-h-32 min-h-16 w-full resize-none overflow-x-hidden bg-transparent",
@@ -438,8 +440,10 @@ const GitCommitPanel = ({
         <div className="flex min-w-0 flex-1 flex-wrap items-center gap-1">
           <span className="px-1 ui-text-sm text-subtle-foreground">
             {stagedFilesCount > 0
-              ? `${stagedFilesCount} file${stagedFilesCount !== 1 ? "s" : ""} staged`
-              : "No files staged"}
+              ? t(stagedFilesCount === 1 ? "git.fileStaged" : "git.filesStaged", {
+                  count: stagedFilesCount,
+                })
+              : t("git.noFilesStaged")}
           </span>
 
           {hasRemoteChanges && (
@@ -485,8 +489,8 @@ const GitCommitPanel = ({
               size="xs"
               onClick={() => void handleGenerateCommitMessage()}
               disabled={isGenerateDisabled}
-              tooltip="Generate commit message with AI"
-              aria-label="Generate commit message with AI"
+              tooltip={t("git.generateCommitMessageWithAI")}
+              aria-label={t("git.generateCommitMessageWithAI")}
             >
               <Sparkles />
             </Button>
@@ -498,8 +502,8 @@ const GitCommitPanel = ({
               onClick={() => setIsGenerateModeMenuOpen((open) => !open)}
               disabled={isGenerating || isCommitting}
               active={isGenerateModeMenuOpen}
-              tooltip="Commit message format"
-              aria-label="Commit message format"
+              tooltip={t("git.commitMessageFormat")}
+              aria-label={t("git.commitMessageFormat")}
               aria-haspopup="menu"
               aria-expanded={isGenerateModeMenuOpen}
             >
@@ -528,7 +532,7 @@ const GitCommitPanel = ({
                 : "text-primary hover:bg-primary/8 hover:text-primary/80",
             )}
           >
-            {isCommitting ? "Committing..." : "Commit"}
+            {isCommitting ? t("git.committing") : t("git.commit")}
           </Button>
         </div>
       </div>
diff --git a/windows/tauri/src/features/git/components/git-view.tsx b/windows/tauri/src/features/git/components/git-view.tsx
index 63b49842c..ca914ef6b 100644
--- a/windows/tauri/src/features/git/components/git-view.tsx
+++ b/windows/tauri/src/features/git/components/git-view.tsx
@@ -12,6 +12,7 @@ import {
   UploadIcon as Upload,
 } from "@/ui/icons";
 import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useTranslation } from "@/i18n/locale-provider";
 import { useSettingsStore } from "@/features/settings/stores/settings.store";
 import { Button } from "@/ui/button";
 import { ButtonGroup, ButtonGroupSeparator } from "@/ui/button-group";
@@ -94,6 +95,7 @@ type GitPaletteAction =
   | { type: "refresh" };
 
 const GitView = ({ repoPath, onFileSelect, isActive }: GitViewProps) => {
+  const { t } = useTranslation();
   const gitStatus = useGitStore((state) => state.gitStatus);
   const isLoadingGitData = useGitStore((state) => state.isLoadingGitData);
   const isRefreshing = useGitStore((state) => state.isRefreshing);
@@ -331,19 +333,24 @@ const GitView = ({ repoPath, onFileSelect, isActive }: GitViewProps) => {
     aheadCount > 0 ? "push" : behindCount > 0 ? "pull" : "fetch";
   const syncActionLabel =
     remoteAction !== null
-      ? REMOTE_ACTION_LABELS[remoteAction].present
+      ? t(`git.${remoteAction}ing`)
       : primaryRemoteAction === "push"
-        ? `Push ${aheadCount}`
+        ? t("git.pushCount", { count: aheadCount })
         : primaryRemoteAction === "pull"
-          ? `Pull ${behindCount}`
-          : "Fetch";
+          ? t("git.pullCount", { count: behindCount })
+          : t("git.fetch");
   const isRemoteActionLoading = remoteAction !== null;
 
   const syncMenuItems = useMemo<MenuItem[]>(
     () => [
       {
         id: "push",
-        label: aheadCount > 0 ? `Push ${aheadCount} commit${aheadCount !== 1 ? "s" : ""}` : "Push",
+        label:
+          aheadCount > 0
+            ? aheadCount === 1
+              ? t("git.pushCommit", { count: aheadCount })
+              : t("git.pushCommits", { count: aheadCount })
+            : t("git.push"),
         icon: <Upload />,
         disabled: isRemoteActionLoading,
         onClick: () => void handleRemoteAction("push"),
@@ -351,20 +358,24 @@ const GitView = ({ repoPath, onFileSelect, isActive }: GitViewProps) => {
       {
         id: "pull",
         label:
-          behindCount > 0 ? `Pull ${behindCount} commit${behindCount !== 1 ? "s" : ""}` : "Pull",
+          behindCount > 0
+            ? behindCount === 1
+              ? t("git.pullCommit", { count: behindCount })
+              : t("git.pullCommits", { count: behindCount })
+            : t("git.pull"),
         icon: <Download weight="fill" />,
         disabled: isRemoteActionLoading,
         onClick: () => void handleRemoteAction("pull"),
       },
       {
         id: "fetch",
-        label: "Fetch",
+        label: t("git.fetch"),
         icon: <RefreshCw />,
         disabled: isRemoteActionLoading,
         onClick: () => void handleRemoteAction("fetch"),
       },
     ],
-    [aheadCount, behindCount, handleRemoteAction, isRemoteActionLoading],
+    [aheadCount, behindCount, handleRemoteAction, isRemoteActionLoading, t],
   );
 
   useEffect(() => {
@@ -574,7 +585,7 @@ const GitView = ({ repoPath, onFileSelect, isActive }: GitViewProps) => {
         setShowGitActionsMenu(!showGitActionsMenu);
         setShowStashList(false);
       }}
-      tooltip="Git Actions"
+      tooltip={t("git.actions")}
     >
       <MoreHorizontal />
     </SidebarHeaderIconButton>
@@ -584,11 +595,11 @@ const GitView = ({ repoPath, onFileSelect, isActive }: GitViewProps) => {
     <SidebarHeaderIconButton
       onClick={handleManualRefresh}
       disabled={isLoadingGitData || isRefreshing}
-      tooltip="Refresh"
-      aria-label="Refresh git status"
+      tooltip={t("git.refresh")}
+      aria-label={t("git.refreshAria")}
     >
       {isLoadingGitData || isRefreshing ? (
-        <Spinner label="Refreshing git status" compact />
+        <Spinner label={t("git.refreshAria")} compact />
       ) : (
         <RefreshCw />
       )}
@@ -720,11 +731,11 @@ const GitView = ({ repoPath, onFileSelect, isActive }: GitViewProps) => {
       const tabMap: Record<GitSidebarTab, { id: GitSidebarTab; label: string }> = {
         changes: {
           id: "changes",
-          label: "Changes",
+          label: t("workbench.changes"),
         },
         history: {
           id: "history",
-          label: "History",
+          label: t("git.history"),
         },
       };
 
@@ -736,7 +747,7 @@ const GitView = ({ repoPath, onFileSelect, isActive }: GitViewProps) => {
     return (
       <>
         <SidebarPanel>
-          <SidebarTitleBar title="Source Control">{renderActionsButton()}</SidebarTitleBar>
+          <SidebarTitleBar title={t("workbench.sourceControl")}>{renderActionsButton()}</SidebarTitleBar>
           <Empty className="h-full">
             <EmptyHeader>
               <EmptyTitle>No repository selected</EmptyTitle>
@@ -758,7 +769,7 @@ const GitView = ({ repoPath, onFileSelect, isActive }: GitViewProps) => {
     return (
       <>
         <SidebarPanel>
-          <SidebarTitleBar title="Source Control">{renderActionsButton()}</SidebarTitleBar>
+          <SidebarTitleBar title={t("workbench.sourceControl")}>{renderActionsButton()}</SidebarTitleBar>
           <Spinner label="Loading Git status" showLabel compact className="m-auto" />
         </SidebarPanel>
         {renderGitActionsMenu({ hasGitRepo: false, onRefresh: handleManualRefresh })}
@@ -770,7 +781,7 @@ const GitView = ({ repoPath, onFileSelect, isActive }: GitViewProps) => {
     return (
       <>
         <SidebarPanel>
-          <SidebarTitleBar title="Source Control">{renderActionsButton()}</SidebarTitleBar>
+          <SidebarTitleBar title={t("workbench.sourceControl")}>{renderActionsButton()}</SidebarTitleBar>
           <Empty className="h-full">
             <EmptyHeader>
               <EmptyTitle>Not a Git repository</EmptyTitle>
@@ -794,11 +805,12 @@ const GitView = ({ repoPath, onFileSelect, isActive }: GitViewProps) => {
   return (
     <>
       <SidebarPanel className="font-sans ui-text-sm select-none">
-        <SidebarTitleBar title="Source Control">
+        <SidebarTitleBar title={t("workbench.sourceControl")}>
           {renderRefreshButton()}
           {renderActionsButton()}
         </SidebarTitleBar>
         <SidebarTabBar items={gitTabs} value={activeTab} onChange={setActiveTab}>
+          <div className="flex min-h-0 flex-1 flex-col overflow-hidden isolate">
           <SidebarToolbar className="overflow-hidden">
             <div className="flex min-w-0 flex-1">
               <GitBranchManager
@@ -857,7 +869,7 @@ const GitView = ({ repoPath, onFileSelect, isActive }: GitViewProps) => {
               {
                 id: "changes",
                 content: (
-                  <div className="flex min-h-0 flex-1 flex-col">
+                  <div className="flex h-full min-h-0 flex-1 flex-col overflow-hidden">
                     <GitOperationBanner repoPath={activeRepoPath} />
                     <GitStatusPanel
                       files={visibleGitFiles}
@@ -902,6 +914,7 @@ const GitView = ({ repoPath, onFileSelect, isActive }: GitViewProps) => {
               onCommitSuccess={refreshAfterAction}
             />
           </SidebarFooter>
+          </div>
         </SidebarTabBar>
       </SidebarPanel>
 
@@ -914,13 +927,15 @@ const GitView = ({ repoPath, onFileSelect, isActive }: GitViewProps) => {
         }}
         query={commitDiffSearchQuery}
         onQueryChange={setCommitDiffSearchQuery}
-        placeholder="Search commits..."
-        meta={`${commits.length} commit${commits.length === 1 ? "" : "s"}`}
+        placeholder={t("git.searchCommits")}
+        meta={t(commits.length === 1 ? "git.commitCount" : "git.commitsCount", {
+          count: commits.length,
+        })}
       >
         <CommandList>
           {filteredDiffCommits.length === 0 ? (
             <CommandEmpty>
-              {commitDiffSearchQuery.trim() ? "No matching commits" : "No commits"}
+              {commitDiffSearchQuery.trim() ? t("git.noMatchingCommits") : t("git.noCommits")}
             </CommandEmpty>
           ) : (
             <div className="space-y-1">
@@ -956,13 +971,18 @@ const GitView = ({ repoPath, onFileSelect, isActive }: GitViewProps) => {
         }}
         query={branchDiffSearchQuery}
         onQueryChange={setBranchDiffSearchQuery}
-        placeholder="Compare current branch with..."
-        meta={`${branchDiffBranches.length} branch${branchDiffBranches.length === 1 ? "" : "es"}`}
+        placeholder={t("git.compareBranchPlaceholder")}
+        meta={t(
+          branchDiffBranches.length === 1 ? "git.branchCount" : "git.branchesCount",
+          { count: branchDiffBranches.length },
+        )}
       >
         <CommandList>
           {filteredBranchDiffBranches.length === 0 ? (
             <CommandEmpty>
-              {branchDiffSearchQuery.trim() ? "No matching branches" : "No other branches"}
+              {branchDiffSearchQuery.trim()
+                ? t("git.noMatchingBranches")
+                : t("git.noOtherBranches")}
             </CommandEmpty>
           ) : (
             <div className="space-y-1">
@@ -972,7 +992,7 @@ const GitView = ({ repoPath, onFileSelect, isActive }: GitViewProps) => {
                   type="button"
                   icon={<GitBranch size={14} className="text-subtle-foreground" />}
                   title={branch}
-                  description={`compare with ${gitStatus.branch}`}
+                  description={t("git.compareWithBranch", { branch: gitStatus.branch })}
                   onClick={() => void handleViewBranchDiff(branch)}
                   disabled={isLoadingBranchDiff}
                   className="min-h-9"
@@ -990,13 +1010,15 @@ const GitView = ({ repoPath, onFileSelect, isActive }: GitViewProps) => {
         }}
         query={stashSearchQuery}
         onQueryChange={setStashSearchQuery}
-        placeholder="Search stashes..."
-        meta={`${stashes.length} stash${stashes.length === 1 ? "" : "es"}`}
+        placeholder={t("git.searchStashes")}
+        meta={t(stashes.length === 1 ? "git.stashCount" : "git.stashesCount", {
+          count: stashes.length,
+        })}
       >
         <CommandList>
           {filteredStashes.length === 0 ? (
             <CommandEmpty>
-              {stashSearchQuery.trim() ? "No matching stashes" : "No stashes"}
+              {stashSearchQuery.trim() ? t("git.noMatchingStashes") : t("git.noStashes")}
             </CommandEmpty>
           ) : (
             filteredStashes.map((stash) => {
diff --git a/windows/tauri/src/features/git/components/log/git-commit-file-tree.tsx b/windows/tauri/src/features/git/components/log/git-commit-file-tree.tsx
index 3213138f4..427e97838 100644
--- a/windows/tauri/src/features/git/components/log/git-commit-file-tree.tsx
+++ b/windows/tauri/src/features/git/components/log/git-commit-file-tree.tsx
@@ -1,5 +1,6 @@
 import { CaretDownIcon, CaretRightIcon, FileIcon, FolderIcon } from "@/ui/icons";
 import { useMemo, useState } from "react";
+import { useTranslation } from "@/i18n/locale-provider";
 import { cn } from "@/utils/cn";
 import type { GitCommitFile } from "../../types/git.types";
 
@@ -69,6 +70,7 @@ function FileNode({
   onSelect: (path: string) => void;
   onOpen: (path: string) => void;
 }) {
+  const { t } = useTranslation();
   const isDirectory = node.children.length > 0 && !node.file;
   const isCollapsed = collapsed.has(node.path);
 
@@ -83,7 +85,7 @@ function FileNode({
         style={{ paddingLeft: 7 + depth * 14 }}
         onClick={() => (node.file ? onSelect(node.path) : onToggle(node.path))}
         onDoubleClick={() => node.file && onOpen(node.path)}
-        title={node.file ? "Double-click to open file diff" : node.path}
+        title={node.file ? t("git.log.openFileDiff") : node.path}
       >
         {isDirectory ? (
           isCollapsed ? (
diff --git a/windows/tauri/src/features/git/components/log/git-commit-inspector.tsx b/windows/tauri/src/features/git/components/log/git-commit-inspector.tsx
index 35a2a728b..a77ef87c3 100644
--- a/windows/tauri/src/features/git/components/log/git-commit-inspector.tsx
+++ b/windows/tauri/src/features/git/components/log/git-commit-inspector.tsx
@@ -2,6 +2,7 @@ import { useEffect, useRef, useState } from "react";
 import { GitDiffIcon } from "@/ui/icons";
 import { Button } from "@/ui/button";
 import { ResizableHandle, ResizablePanel, ResizablePanelGroup } from "@/ui/resizable";
+import { useTranslation } from "@/i18n/locale-provider";
 import { getCommitFiles } from "../../api/git-commits-api";
 import { useGitLogPreferencesStore } from "../../stores/git-log-preferences.store";
 import type { GitCommit, GitCommitFile } from "../../types/git.types";
@@ -18,6 +19,7 @@ export function GitCommitInspector({
   commit: GitCommit | null;
   onOpenDiff: (commit: GitCommit, filePath?: string) => void;
 }) {
+  const { t } = useTranslation();
   const [files, setFiles] = useState<GitCommitFile[]>([]);
   const [loadState, setLoadState] = useState<FilesLoadState>("idle");
   const [selectedPath, setSelectedPath] = useState<string | null>(null);
@@ -62,9 +64,11 @@ export function GitCommitInspector({
         <ResizablePanel id="files" defaultSize="62" minSize={90}>
           <div className="flex h-full min-h-0 flex-col">
             <div className="flex h-8 shrink-0 items-center gap-2 border-border border-b bg-surface px-2 text-subtle-foreground">
-              <span>Commit files</span>
+              <span>{t("git.log.commitFiles")}</span>
               <span className="ml-auto tabular-nums">
-                {loadState === "loading" ? "Loading…" : `${files.length} files`}
+                {loadState === "loading"
+                  ? t("git.log.loadingShort")
+                  : t("git.log.filesCount", { count: files.length })}
               </span>
               <Button
                 type="button"
@@ -72,27 +76,27 @@ export function GitCommitInspector({
                 size="icon-xs"
                 disabled={!commit}
                 onClick={() => commit && onOpenDiff(commit)}
-                tooltip="Open commit diff"
-                aria-label="Open commit diff"
+                tooltip={t("git.log.openCommitDiff")}
+                aria-label={t("git.log.openCommitDiff")}
               >
                 <GitDiffIcon />
               </Button>
             </div>
             {!commit ? (
               <div className="flex min-h-0 flex-1 items-center justify-center text-subtle-foreground">
-                Select a commit
+                {t("git.log.selectCommit")}
               </div>
             ) : loadState === "loading" ? (
               <div className="flex min-h-0 flex-1 items-center justify-center text-subtle-foreground">
-                Loading changed files…
+                {t("git.log.loadingChangedFiles")}
               </div>
             ) : loadState === "failed" ? (
               <div className="flex min-h-0 flex-1 items-center justify-center px-4 text-center text-destructive">
-                Unable to load changed files
+                {t("git.log.unableToLoadFiles")}
               </div>
             ) : files.length === 0 ? (
               <div className="flex min-h-0 flex-1 items-center justify-center text-subtle-foreground">
-                No changed files
+                {t("git.log.noChangedFiles")}
               </div>
             ) : (
               <GitCommitFileTree
@@ -129,7 +133,7 @@ export function GitCommitInspector({
               </div>
             ) : (
               <div className="flex h-full items-center justify-center text-subtle-foreground">
-                Commit details
+                {t("git.log.commitDetails")}
               </div>
             )}
           </div>
diff --git a/windows/tauri/src/features/git/components/log/git-commit-table.tsx b/windows/tauri/src/features/git/components/log/git-commit-table.tsx
index 4681f96df..f4cc34434 100644
--- a/windows/tauri/src/features/git/components/log/git-commit-table.tsx
+++ b/windows/tauri/src/features/git/components/log/git-commit-table.tsx
@@ -19,6 +19,7 @@ import {
 } from "@/ui/icons";
 import { Button } from "@/ui/button";
 import { cn } from "@/utils/cn";
+import { useTranslation } from "@/i18n/locale-provider";
 import {
   type GitLogFilterScope,
   useGitLogPreferencesStore,
@@ -53,6 +54,7 @@ export function GitCommitTable({
   onCopyMessage: (commit: GitCommit) => void;
   onLoadMore: () => void;
 }) {
+  const { t } = useTranslation();
   const query = useGitLogPreferencesStore.use.filterQuery();
   const scope = useGitLogPreferencesStore.use.filterScope();
   const showDecorations = useGitLogPreferencesStore.use.showDecorations();
@@ -127,15 +129,23 @@ export function GitCommitTable({
             value={query}
             onChange={(event) => setFilterQuery(event.target.value)}
             className="min-w-0 flex-1 bg-transparent outline-none placeholder:text-subtle-foreground"
-            placeholder={`${scope[0].toUpperCase()}${scope.slice(1)} filter`}
-            aria-label="Filter Git log"
+            placeholder={t("git.log.filterPlaceholder", {
+              field: t(
+                scope === "author"
+                  ? "git.log.filterAuthor"
+                  : scope === "branch"
+                    ? "git.log.filterBranch"
+                    : "git.log.filterText",
+              ),
+            })}
+            aria-label={t("git.log.filter")}
           />
           {query ? (
             <button
               type="button"
               onClick={() => setFilterQuery("")}
               className="text-subtle-foreground hover:text-foreground"
-              aria-label="Clear Git log filter"
+              aria-label={t("git.log.clearFilter")}
             >
               <XIcon className="size-3" />
             </button>
@@ -145,19 +155,19 @@ export function GitCommitTable({
           value={scope}
           onChange={(event) => setFilterScope(event.target.value as GitLogFilterScope)}
           className="h-6 rounded border border-border bg-background px-1.5 text-subtle-foreground outline-none"
-          aria-label="Git log filter field"
+          aria-label={t("git.log.filterField")}
         >
-          <option value="text">Text</option>
-          <option value="author">Author</option>
-          <option value="branch">Branch</option>
+          <option value="text">{t("git.log.filterText")}</option>
+          <option value="author">{t("git.log.filterAuthor")}</option>
+          <option value="branch">{t("git.log.filterBranch")}</option>
         </select>
         <Button
           type="button"
           variant="ghost"
           size="icon-xs"
           onClick={() => setShowDecorations(!showDecorations)}
-          tooltip={showDecorations ? "Hide branch and tag labels" : "Show branch and tag labels"}
-          aria-label={showDecorations ? "Hide Git decorations" : "Show Git decorations"}
+          tooltip={showDecorations ? t("git.log.hideDecorations") : t("git.log.showDecorations")}
+          aria-label={showDecorations ? t("git.log.hideDecorations") : t("git.log.showDecorations")}
           aria-pressed={showDecorations}
         >
           {showDecorations ? <Eye /> : <EyeSlash />}
@@ -168,15 +178,15 @@ export function GitCommitTable({
       </div>
 
       <div className="flex h-6 shrink-0 items-center border-border border-b bg-surface/70 px-2 text-subtle-foreground">
-        <span className="min-w-0 flex-1">Commit</span>
-        <span className="w-28 shrink-0">Author</span>
-        <span className="w-32 shrink-0 text-right">Date</span>
+        <span className="min-w-0 flex-1">{t("git.log.commit")}</span>
+        <span className="w-28 shrink-0">{t("git.log.author")}</span>
+        <span className="w-32 shrink-0 text-right">{t("git.log.date")}</span>
       </div>
 
       <div ref={scrollRef} className="min-h-0 flex-1 overflow-auto">
         {visibleRows.length === 0 ? (
           <div className="flex h-full items-center justify-center text-subtle-foreground">
-            {query ? "No commits match this filter" : "No commits in this view"}
+            {query ? t("git.log.noMatch") : t("git.log.noCommits")}
           </div>
         ) : (
           <>
@@ -203,7 +213,7 @@ export function GitCommitTable({
                       onDoubleClick={() => onOpenDiff(row.commit)}
                       onContextMenu={() => onSelect(row.commit)}
                       onKeyDown={(event) => handleRowKeyDown(event, row.commit)}
-                      title="Double-click or press Enter to open commit diff"
+                      title={t("git.log.openDiffHint")}
                     >
                       <GitGraphRow row={row} showDecorations={showDecorations} />
                       <span className="w-28 shrink-0 truncate px-2 text-subtle-foreground">
@@ -216,21 +226,21 @@ export function GitCommitTable({
                     <ContextMenuContent>
                       <ContextMenuItem onClick={() => onOpenDiff(row.commit)}>
                         <GitDiff />
-                        Open Commit Diff
+                        {t("git.log.openCommitDiff")}
                         <ContextMenuShortcut>Enter</ContextMenuShortcut>
                       </ContextMenuItem>
                       <ContextMenuItem onClick={() => onCompareWithHead(row.commit)}>
                         <GitBranch />
-                        Compare with HEAD
+                        {t("git.log.compareWithHead")}
                       </ContextMenuItem>
                       <ContextMenuSeparator />
                       <ContextMenuItem onClick={() => onCopyHash(row.commit)}>
                         <Copy />
-                        Copy Commit Hash
+                        {t("git.log.copyCommitHash")}
                       </ContextMenuItem>
                       <ContextMenuItem onClick={() => onCopyMessage(row.commit)}>
                         <Copy />
-                        Copy Commit Message
+                        {t("git.log.copyCommitMessage")}
                       </ContextMenuItem>
                     </ContextMenuContent>
                   </ContextMenu>
@@ -246,7 +256,7 @@ export function GitCommitTable({
                   disabled={isLoadingMore}
                   onClick={onLoadMore}
                 >
-                  {isLoadingMore ? "Loading commits…" : "Load more commits"}
+                  {isLoadingMore ? t("git.log.loadingCommits") : t("git.log.loadMore")}
                 </Button>
               </div>
             ) : null}
diff --git a/windows/tauri/src/features/git/components/log/git-graph-row.test.ts b/windows/tauri/src/features/git/components/log/git-graph-row.test.ts
new file mode 100644
index 000000000..12941c2bd
--- /dev/null
+++ b/windows/tauri/src/features/git/components/log/git-graph-row.test.ts
@@ -0,0 +1,13 @@
+import { describe, expect, test } from "bun:test";
+import { gitGraphLabelClassName } from "./git-graph-row";
+
+describe("git graph decoration labels", () => {
+  test("uses dark text on light theme so branch pills stay readable", () => {
+    expect(gitGraphLabelClassName({ title: "HEAD", kind: "head" })).toContain("text-sky-800");
+    expect(gitGraphLabelClassName({ title: "master", kind: "branch" })).toContain("text-emerald-800");
+    expect(gitGraphLabelClassName({ title: "origin/master", kind: "remote" })).toContain(
+      "text-indigo-800",
+    );
+    expect(gitGraphLabelClassName({ title: "v1.0.0", kind: "tag" })).toContain("text-amber-900");
+  });
+});
diff --git a/windows/tauri/src/features/git/components/log/git-graph-row.tsx b/windows/tauri/src/features/git/components/log/git-graph-row.tsx
index 58543276c..eccda475b 100644
--- a/windows/tauri/src/features/git/components/log/git-graph-row.tsx
+++ b/windows/tauri/src/features/git/components/log/git-graph-row.tsx
@@ -10,16 +10,16 @@ function graphColor(index: number) {
   return GRAPH_COLORS[index % GRAPH_COLORS.length];
 }
 
-function labelClassName(label: GitGraphLabel) {
+export function gitGraphLabelClassName(label: GitGraphLabel) {
   switch (label.kind) {
     case "head":
-      return "border-sky-500/40 bg-sky-500/18 text-sky-300";
+      return "border-sky-700/35 bg-sky-500/18 text-sky-800 dark:border-sky-400/45 dark:bg-sky-500/20 dark:text-sky-200";
     case "remote":
-      return "border-indigo-500/40 bg-indigo-500/18 text-indigo-300";
+      return "border-indigo-700/35 bg-indigo-500/18 text-indigo-800 dark:border-indigo-400/45 dark:bg-indigo-500/20 dark:text-indigo-200";
     case "tag":
-      return "border-amber-500/40 bg-amber-500/18 text-amber-300";
+      return "border-amber-700/40 bg-amber-500/20 text-amber-900 dark:border-amber-400/45 dark:bg-amber-500/20 dark:text-amber-200";
     default:
-      return "border-emerald-500/40 bg-emerald-500/18 text-emerald-300";
+      return "border-emerald-700/35 bg-emerald-500/18 text-emerald-800 dark:border-emerald-400/45 dark:bg-emerald-500/20 dark:text-emerald-200";
   }
 }
 
@@ -85,7 +85,7 @@ export function GitGraphRow({ row, showDecorations }: { row: GraphRow; showDecor
               key={`${label.kind}:${label.title}:${index}`}
               className={cn(
                 "max-w-28 shrink-0 truncate rounded border px-1.5 py-0.5 font-medium text-[10px] leading-none",
-                labelClassName(label),
+                gitGraphLabelClassName(label),
               )}
               title={label.title}
             >
diff --git a/windows/tauri/src/features/git/components/log/git-log-title-bar.tsx b/windows/tauri/src/features/git/components/log/git-log-title-bar.tsx
index c40690c2c..9d2368eda 100644
--- a/windows/tauri/src/features/git/components/log/git-log-title-bar.tsx
+++ b/windows/tauri/src/features/git/components/log/git-log-title-bar.tsx
@@ -6,6 +6,7 @@ import {
   MinusIcon,
 } from "@/ui/icons";
 import { Button } from "@/ui/button";
+import { useTranslation } from "@/i18n/locale-provider";
 
 export function GitLogTitleBar({
   referenceName,
@@ -34,18 +35,20 @@ export function GitLogTitleBar({
   onCopyHash: () => void;
   onClose: () => void;
 }) {
+  const { t } = useTranslation();
+
   return (
     <div className="shrink-0 border-border border-b bg-surface font-sans ui-text-sm">
       <div className="flex h-8 items-center gap-2 px-2">
         <GitBranchIcon className="size-3.5 text-subtle-foreground" />
-        <span className="font-medium">Git</span>
+        <span className="font-medium">{t("workbench.gitLog")}</span>
         <button
           type="button"
           onClick={onShowAll}
           className="h-6 max-w-60 truncate rounded border border-border-strong/60 bg-background px-2 text-left font-medium hover:bg-accent"
-          title="Show all references"
+          title={t("git.log.showAll")}
         >
-          Log: {referenceName}
+          {t("git.log.logLabel", { name: referenceName })}
         </button>
         <Button
           type="button"
@@ -53,19 +56,19 @@ export function GitLogTitleBar({
           size="icon-xs"
           onClick={onRefresh}
           disabled={isRefreshing}
-          tooltip="Refresh Git log"
-          aria-label="Refresh Git log"
+          tooltip={t("git.log.refresh")}
+          aria-label={t("git.log.refresh")}
         >
           <Refresh className={isRefreshing ? "animate-spin" : undefined} />
         </Button>
-        <span className="ml-auto text-subtle-foreground">Read-only</span>
+        <span className="ml-auto text-subtle-foreground">{t("footer.readOnly")}</span>
         <Button
           type="button"
           variant="ghost"
           size="icon-xs"
           onClick={onClose}
-          tooltip="Hide Git Log"
-          aria-label="Hide Git Log"
+          tooltip={t("git.log.hide")}
+          aria-label={t("git.log.hide")}
         >
           <MinusIcon />
         </Button>
@@ -79,7 +82,7 @@ export function GitLogTitleBar({
           onClick={onOpenDiff}
         >
           <GitDiff />
-          Open Diff
+          {t("git.log.openDiff")}
         </Button>
         <Button
           type="button"
@@ -89,7 +92,7 @@ export function GitLogTitleBar({
           onClick={onCompareWithHead}
         >
           <GitBranchIcon />
-          Compare with HEAD
+          {t("git.log.compareWithHead")}
         </Button>
         <Button
           type="button"
@@ -99,7 +102,7 @@ export function GitLogTitleBar({
           onClick={onCopyHash}
         >
           <Copy />
-          Copy Hash
+          {t("git.log.copyHash")}
         </Button>
       </div>
     </div>
diff --git a/windows/tauri/src/features/git/components/log/git-log-tool-window.tsx b/windows/tauri/src/features/git/components/log/git-log-tool-window.tsx
index 87fcbc8f9..71867bdf6 100644
--- a/windows/tauri/src/features/git/components/log/git-log-tool-window.tsx
+++ b/windows/tauri/src/features/git/components/log/git-log-tool-window.tsx
@@ -3,6 +3,7 @@ import { toast } from "sonner";
 import { Button } from "@/ui/button";
 import { ResizableHandle, ResizablePanel, ResizablePanelGroup } from "@/ui/resizable";
 import { tryWriteClipboardText } from "@/utils/clipboard";
+import { useTranslation } from "@/i18n/locale-provider";
 import { useProjectStore } from "@/features/window/stores/project.store";
 import { useUIState } from "@/features/window/stores/ui-state.store";
 import { useGitLogController } from "../../hooks/use-git-log-controller";
@@ -20,6 +21,7 @@ import { GitLogTitleBar } from "./git-log-title-bar";
 import { GitReferenceTree } from "./git-reference-tree";
 
 export function GitLogToolWindow() {
+  const { t } = useTranslation();
   const activeRepoPath = useRepositoryStore.use.activeRepoPath();
   const rootFolderPath = useProjectStore((state) => state.rootFolderPath);
   const repoPath = activeRepoPath ?? rootFolderPath ?? null;
@@ -77,10 +79,10 @@ export function GitLogToolWindow() {
 
   const copyCommitText = async (text: string, label: string) => {
     if (await tryWriteClipboardText(text)) {
-      toast.success(`${label} copied`);
+      toast.success(t("git.log.copied", { label }));
       return;
     }
-    toast.error(`Unable to copy ${label.toLocaleLowerCase()}`);
+    toast.error(t("git.log.copyFailed", { label: label.toLocaleLowerCase() }));
   };
 
   const comparisonBaseRef =
@@ -91,7 +93,7 @@ export function GitLogToolWindow() {
   return (
     <div className="flex h-full min-h-0 flex-col overflow-hidden bg-background text-foreground">
       <GitLogTitleBar
-        referenceName={selectedReference?.shortName ?? "All"}
+        referenceName={selectedReference?.shortName ?? t("git.log.all")}
         isRefreshing={loadState === "loading"}
         isOpeningDiff={isLoadingCommitDiff}
         isComparing={isLoadingBranchDiff}
@@ -109,38 +111,38 @@ export function GitLogToolWindow() {
           if (comparisonBaseRef) void viewBranchDiff(comparisonBaseRef);
         }}
         onCopyHash={() => {
-          if (selectedCommit) void copyCommitText(selectedCommit.hash, "Commit hash");
+          if (selectedCommit) void copyCommitText(selectedCommit.hash, t("git.log.commitHash"));
         }}
         onClose={() => setIsBottomPaneVisible(false)}
       />
 
       {loadState === "failed" && history.commits.length > 0 ? (
         <div className="flex h-7 shrink-0 items-center gap-2 border-destructive/30 border-b bg-destructive/10 px-2 font-sans ui-text-sm text-destructive">
-          <span className="min-w-0 flex-1 truncate">{error ?? "Unable to refresh Git log."}</span>
+          <span className="min-w-0 flex-1 truncate">{error ?? t("git.log.unableToRefresh")}</span>
           <button
             type="button"
             className="font-medium hover:underline"
             onClick={() => void refresh()}
           >
-            Retry
+            {t("git.log.retry")}
           </button>
         </div>
       ) : null}
 
       {!repoPath ? (
         <div className="flex min-h-0 flex-1 flex-col items-center justify-center gap-2 text-subtle-foreground">
-          <div className="font-medium text-foreground">No repository open</div>
-          <div>Open a Git workspace to view its log.</div>
+          <div className="font-medium text-foreground">{t("git.log.noRepository")}</div>
+          <div>{t("git.log.openWorkspace")}</div>
         </div>
       ) : loadState === "loading" && history.commits.length === 0 ? (
         <div className="flex min-h-0 flex-1 items-center justify-center text-subtle-foreground">
-          Loading Git log…
+          {t("git.log.loading")}
         </div>
       ) : loadState === "failed" && history.commits.length === 0 ? (
         <div className="flex min-h-0 flex-1 flex-col items-center justify-center gap-3 px-6 text-center">
-          <div className="text-destructive">{error ?? "Unable to load Git log."}</div>
+          <div className="text-destructive">{error ?? t("git.log.unableToLoad")}</div>
           <Button type="button" variant="ghost" size="xs" onClick={() => void refresh()}>
-            Try again
+            {t("git.log.tryAgain")}
           </Button>
         </div>
       ) : (
@@ -172,11 +174,11 @@ export function GitLogToolWindow() {
               onSelect={setSelectedCommit}
               onOpenDiff={(commit) => openDiff(commit)}
               onCompareWithHead={(commit) => void viewBranchDiff(commit.hash)}
-              onCopyHash={(commit) => void copyCommitText(commit.hash, "Commit hash")}
+              onCopyHash={(commit) => void copyCommitText(commit.hash, t("git.log.commitHash"))}
               onCopyMessage={(commit) =>
                 void copyCommitText(
                   [commit.message, commit.description].filter(Boolean).join("\n\n"),
-                  "Commit message",
+                  t("git.log.commitMessage"),
                 )
               }
               onLoadMore={() => void loadMore()}
diff --git a/windows/tauri/src/features/git/components/log/git-reference-tree.tsx b/windows/tauri/src/features/git/components/log/git-reference-tree.tsx
index 0f1117538..fc76b9f57 100644
--- a/windows/tauri/src/features/git/components/log/git-reference-tree.tsx
+++ b/windows/tauri/src/features/git/components/log/git-reference-tree.tsx
@@ -8,14 +8,15 @@ import {
 } from "@/ui/icons";
 import { useMemo } from "react";
 import { cn } from "@/utils/cn";
+import { useTranslation } from "@/i18n/locale-provider";
 import { useGitLogPreferencesStore } from "../../stores/git-log-preferences.store";
 import type { GitReference, GitReferenceKind } from "../../types/git.types";
 import { buildGitReferenceTree, type GitReferenceTreeNode } from "../../utils/git-reference-tree";
 
-const SECTIONS: Array<{ kind: GitReferenceKind; title: string }> = [
-  { kind: "local", title: "Local" },
-  { kind: "remote", title: "Remote" },
-  { kind: "tag", title: "Tags" },
+const SECTION_KEYS: Array<{ kind: GitReferenceKind; titleKey: string }> = [
+  { kind: "local", titleKey: "git.log.local" },
+  { kind: "remote", titleKey: "git.log.remote" },
+  { kind: "tag", titleKey: "git.log.tags" },
 ];
 
 function ReferenceIcon({ kind }: { kind: GitReferenceKind }) {
@@ -41,6 +42,7 @@ function ReferenceNode({
   onToggleGroup: (id: string) => void;
   onSelect: (reference: GitReference) => void;
 }) {
+  const { t } = useTranslation();
   const isGroup = node.children.length > 0;
   const isCollapsed = collapsedGroups.has(node.id);
   const left = 10 + depth * 14;
@@ -59,7 +61,7 @@ function ReferenceNode({
             type="button"
             className="flex size-3.5 shrink-0 items-center justify-center"
             onClick={() => onToggleGroup(node.id)}
-            aria-label={`${isCollapsed ? "Expand" : "Collapse"} ${node.path}`}
+            aria-label={t(isCollapsed ? "git.log.expand" : "git.log.collapse", { name: node.path })}
           >
             {isCollapsed ? <CaretRightIcon /> : <CaretDownIcon />}
           </button>
@@ -109,6 +111,7 @@ export function GitReferenceTree({
   selectedReference: GitReference | null;
   onSelect: (reference: GitReference | null) => void;
 }) {
+  const { t } = useTranslation();
   const collapsedSectionIds = useGitLogPreferencesStore.use.collapsedReferenceSections();
   const collapsedGroupIds = useGitLogPreferencesStore.use.collapsedReferenceGroups();
   const { toggleReferenceSection, toggleReferenceGroup } = useGitLogPreferencesStore.use.actions();
@@ -116,14 +119,14 @@ export function GitReferenceTree({
   const collapsedGroups = useMemo(() => new Set(collapsedGroupIds), [collapsedGroupIds]);
   const currentReference = references.find((reference) => reference.isCurrent) ?? null;
   const trees = useMemo(
-    () => new Map(SECTIONS.map(({ kind }) => [kind, buildGitReferenceTree(references, kind)])),
+    () => new Map(SECTION_KEYS.map(({ kind }) => [kind, buildGitReferenceTree(references, kind)])),
     [references],
   );
 
   return (
     <div className="flex h-full min-h-0 flex-col bg-surface/45 font-sans ui-text-sm select-none">
       <div className="flex h-8 shrink-0 items-center border-border border-b px-2 text-subtle-foreground">
-        References
+        {t("git.log.references")}
         <span className="ml-auto tabular-nums">{references.length}</span>
       </div>
       <div className="min-h-0 flex-1 overflow-auto p-1.5">
@@ -137,7 +140,7 @@ export function GitReferenceTree({
           )}
         >
           <span className="text-primary">→</span>
-          <span className="truncate">HEAD (Current Branch)</span>
+          <span className="truncate">{t("git.log.headCurrentBranch")}</span>
           {currentReference ? (
             <span className="ml-auto max-w-24 truncate text-subtle-foreground">
               {currentReference.shortName}
@@ -145,7 +148,7 @@ export function GitReferenceTree({
           ) : null}
         </button>
 
-        {SECTIONS.map(({ kind, title }) => {
+        {SECTION_KEYS.map(({ kind, titleKey }) => {
           const collapsed = collapsedSections.has(kind);
           const nodes = trees.get(kind) ?? [];
           return (
@@ -161,7 +164,7 @@ export function GitReferenceTree({
                   <CaretDownIcon className="size-3" />
                 )}
                 <FolderIcon className="size-3.5 text-subtle-foreground" />
-                {title}
+                {t(titleKey)}
                 <span className="ml-auto text-subtle-foreground tabular-nums">{nodes.length}</span>
               </button>
               {!collapsed &&
@@ -179,7 +182,7 @@ export function GitReferenceTree({
                     />
                   ))
                 ) : (
-                  <div className="h-6 pl-8 leading-6 text-subtle-foreground">None</div>
+                  <div className="h-6 pl-8 leading-6 text-subtle-foreground">{t("git.log.none")}</div>
                 ))}
             </div>
           );
diff --git a/windows/tauri/src/features/git/components/stash/git-stash-modal.tsx b/windows/tauri/src/features/git/components/stash/git-stash-modal.tsx
index b166fbc5e..67abed5a9 100644
--- a/windows/tauri/src/features/git/components/stash/git-stash-modal.tsx
+++ b/windows/tauri/src/features/git/components/stash/git-stash-modal.tsx
@@ -3,6 +3,7 @@ import { Button } from "@/ui/button";
 import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/ui/dialog";
 import Input from "@/ui/input";
 import { cn } from "@/utils/cn";
+import { useTranslation } from "@/i18n/locale-provider";
 
 interface StashMessageModalProps {
   isOpen: boolean;
@@ -44,6 +45,7 @@ const StashMessageModalContent = ({
   title,
   placeholder,
 }: Omit<StashMessageModalProps, "isOpen">) => {
+  const { t } = useTranslation();
   const [message, setMessage] = useState("");
   const [isLoading, setIsLoading] = useState(false);
 
@@ -89,7 +91,7 @@ const StashMessageModalContent = ({
           className="text-subtle-foreground ui-text-sm hover:text-foreground"
           size="xs"
         >
-          Cancel
+          {t("files.cancel")}
         </Button>
         <Button
           onClick={() => void handleConfirm()}
@@ -98,7 +100,7 @@ const StashMessageModalContent = ({
           className="ui-text-sm disabled:opacity-50"
           size="xs"
         >
-          {isLoading ? "Stashing..." : "Stash"}
+          {isLoading ? t("git.stashing") : t("git.stash")}
         </Button>
       </DialogFooter>
     </DialogContent>
diff --git a/windows/tauri/src/features/git/components/status/git-status-panel.tsx b/windows/tauri/src/features/git/components/status/git-status-panel.tsx
index d5b154f77..c51ba7a6c 100644
--- a/windows/tauri/src/features/git/components/status/git-status-panel.tsx
+++ b/windows/tauri/src/features/git/components/status/git-status-panel.tsx
@@ -13,6 +13,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { ThemedFileIcon } from "@/extensions/icon-themes/components/themed-file-icon";
 import { writeSidebarResourceDragData } from "@/features/sidebar/utils/sidebar-resource-drag";
 import { useSettingsStore } from "@/features/settings/stores/settings.store";
+import { useTranslation } from "@/i18n/locale-provider";
 import Badge from "@/ui/badge";
 import { Button } from "@/ui/button";
 import { ButtonGroup, ButtonGroupSeparator } from "@/ui/button-group";
@@ -73,11 +74,6 @@ interface ContextMenuState {
 type StatusSection = "tracked" | "untracked";
 type GitStatusDiffScope = "all" | "unstaged" | "staged";
 
-const SECTION_LABELS = {
-  tracked: "Tracked",
-  untracked: "Untracked",
-} as const;
-
 const GitStatusPanel = ({
   files,
   fileDiffStats,
@@ -90,6 +86,7 @@ const GitStatusPanel = ({
   onRefresh,
   repoPath,
 }: GitStatusPanelProps) => {
+  const { t } = useTranslation();
   const gitChangesFolderView = useSettingsStore((state) => state.settings.gitChangesFolderView);
   const confirmBeforeDiscard = useSettingsStore((state) => state.settings.confirmBeforeDiscard);
   const contextMenu = useDropdownMenu<ContextMenuState>();
@@ -510,34 +507,34 @@ const GitStatusPanel = ({
     () => [
       {
         id: "unstaged",
-        label: "Unstaged",
+        label: t("git.unstaged"),
         disabled: !hasUnstagedDiffableFiles || isLoading,
         onClick: () => openScopedDiff("unstaged"),
       },
       {
         id: "staged",
-        label: "Staged",
+        label: t("git.staged"),
         disabled: !hasStagedDiffableFiles || isLoading,
         onClick: () => openScopedDiff("staged"),
       },
       { id: "sep-working-tree", label: "", separator: true, onClick: () => {} },
       {
         id: "commit",
-        label: "Commit",
+        label: t("git.commit"),
         disabled: !onShowCommitDiffPicker,
         keybinding: <CaretRight className="size-3 text-subtle-foreground" />,
         onClick: () => openDiffPicker(onShowCommitDiffPicker),
       },
       {
         id: "branch",
-        label: "Branch",
+        label: t("git.branch"),
         disabled: !onShowBranchDiffPicker,
         keybinding: <CaretRight className="size-3 text-subtle-foreground" />,
         onClick: () => openDiffPicker(onShowBranchDiffPicker),
       },
       {
         id: "stash",
-        label: "Stash",
+        label: t("git.stash"),
         disabled: !onShowStashDiffPicker,
         keybinding: <CaretRight className="size-3 text-subtle-foreground" />,
         onClick: () => openDiffPicker(onShowStashDiffPicker),
@@ -552,6 +549,7 @@ const GitStatusPanel = ({
       onShowStashDiffPicker,
       openDiffPicker,
       openScopedDiff,
+      t,
     ],
   );
 
@@ -568,9 +566,9 @@ const GitStatusPanel = ({
                   size="xs"
                   onClick={() => openScopedDiff("all")}
                   disabled={!onViewDiff || isLoading}
-                  aria-label="View all diffs"
+                  aria-label={t("git.viewDiff")}
                 >
-                  View Diff
+                  {t("git.viewDiff")}
                 </Button>
                 <ButtonGroupSeparator />
                 <Button
@@ -603,9 +601,9 @@ const GitStatusPanel = ({
                   onClick={handleStashAllUnstaged}
                   disabled={isLoading}
                   className="disabled:opacity-50"
-                  tooltip="Stash all unstaged changes"
+                  tooltip={t("git.stashAllUnstaged")}
                   tooltipSide="bottom"
-                  aria-label="Stash all unstaged changes"
+                  aria-label={t("git.stashAllUnstaged")}
                 >
                   <Archive />
                 </SidebarHeaderIconButton>
@@ -643,7 +641,7 @@ const GitStatusPanel = ({
           >
             {trackedFiles.length > 0 && (
               <section className="space-y-0.5">
-                {renderSectionHeader("tracked", SECTION_LABELS.tracked, trackedFiles.length)}
+                {renderSectionHeader("tracked", t("git.tracked"), trackedFiles.length)}
                 {!collapsedSections.has("tracked") ? (
                   <SidebarTree label="Tracked files">
                     {gitChangesFolderView
@@ -655,7 +653,7 @@ const GitStatusPanel = ({
             )}
             {untrackedFiles.length > 0 && (
               <section className="space-y-0.5 pt-2">
-                {renderSectionHeader("untracked", SECTION_LABELS.untracked, untrackedFiles.length)}
+                {renderSectionHeader("untracked", t("git.untracked"), untrackedFiles.length)}
                 {!collapsedSections.has("untracked") ? (
                   <SidebarTree label="Untracked files">
                     {gitChangesFolderView
@@ -735,11 +733,13 @@ const GitStatusPanel = ({
         isOpen={stashModal.isOpen}
         onClose={() => setStashModal((prev) => ({ ...prev, isOpen: false }))}
         onConfirm={handleConfirmStash}
-        title={stashModal.type === "file" ? "Stash File" : "Stash All Unstaged"}
+        title={stashModal.type === "file" ? t("git.stashFile") : t("git.stashAllUnstaged")}
         placeholder={
           stashModal.type === "file"
-            ? `Message (default: Stash ${stashModal.filePath?.split("/").pop()})`
-            : "Message (default: Stash all unstaged changes)"
+            ? t("git.stashMessageDefaultFile", {
+                name: stashModal.filePath?.split("/").pop() ?? "",
+              })
+            : t("git.stashMessageDefaultAll")
         }
       />
     </div>
diff --git a/windows/tauri/src/features/global-search/components/global-search-state.tsx b/windows/tauri/src/features/global-search/components/global-search-state.tsx
index 2122bdd73..b2552cff2 100644
--- a/windows/tauri/src/features/global-search/components/global-search-state.tsx
+++ b/windows/tauri/src/features/global-search/components/global-search-state.tsx
@@ -8,6 +8,7 @@ import {
   EmptyMedia,
   EmptyTitle,
 } from "@/ui/empty";
+import { useTranslation } from "@/i18n/locale-provider";
 import type { ContentSearchAvailability } from "../hooks/use-content-search";
 
 interface GlobalSearchStateProps {
@@ -45,11 +46,13 @@ export function GlobalSearchState({
   hasFileFilters,
   onRetry,
 }: GlobalSearchStateProps) {
+  const { t } = useTranslation();
+
   if (availability === "no-workspace") {
     return (
       <SearchIntroduction
-        title="Open a project to search"
-        description="Global search needs an open project folder."
+        title={t("search.openProjectTitle")}
+        description={t("search.openProjectDescription")}
       />
     );
   }
@@ -57,9 +60,7 @@ export function GlobalSearchState({
   if (availability === "unsupported") {
     return (
       <Empty className="min-h-60 px-6">
-        <EmptyDescription className="ui-text-base">
-          Global search is not available for this workspace type.
-        </EmptyDescription>
+        <EmptyDescription className="ui-text-base">{t("search.unsupported")}</EmptyDescription>
       </Empty>
     );
   }
@@ -67,8 +68,8 @@ export function GlobalSearchState({
   if (!query.trim()) {
     return (
       <SearchIntroduction
-        title="Search across your project"
-        description="Type a query to see matching files and lines in a project-wide result buffer."
+        title={t("search.emptyTitle")}
+        description={t("search.emptyDescription")}
       />
     );
   }
@@ -85,12 +86,12 @@ export function GlobalSearchState({
     return (
       <Empty className="min-h-60 px-6" role="alert">
         <EmptyHeader>
-          <EmptyTitle>Search failed</EmptyTitle>
+          <EmptyTitle>{t("search.failed")}</EmptyTitle>
           <EmptyDescription className="ui-text-base text-destructive">{error}</EmptyDescription>
         </EmptyHeader>
         <EmptyContent>
           <Button type="button" variant="default" onClick={onRetry}>
-            Try again
+            {t("search.retry")}
           </Button>
         </EmptyContent>
       </Empty>
@@ -101,10 +102,11 @@ export function GlobalSearchState({
     return (
       <Empty className="min-h-60" role="status">
         <EmptyHeader>
-          <EmptyTitle>No results found</EmptyTitle>
+          <EmptyTitle>{t("search.noResults")}</EmptyTitle>
           <EmptyDescription className="ui-text-base">
-            No results found for "{debouncedQuery}"
-            {hasFileFilters ? " with the current file filters" : ""}
+            {t(hasFileFilters ? "search.noResultsForWithFilters" : "search.noResultsFor", {
+              query: debouncedQuery,
+            })}
           </EmptyDescription>
         </EmptyHeader>
       </Empty>
diff --git a/windows/tauri/src/features/global-search/components/global-search-toolbar.tsx b/windows/tauri/src/features/global-search/components/global-search-toolbar.tsx
index ef8a300b7..fbf51cdaf 100644
--- a/windows/tauri/src/features/global-search/components/global-search-toolbar.tsx
+++ b/windows/tauri/src/features/global-search/components/global-search-toolbar.tsx
@@ -3,6 +3,7 @@ import { MagnifyingGlassIcon as MagnifyingGlass, XIcon as X } from "@/ui/icons";
 import Badge from "@/ui/badge";
 import { Button } from "@/ui/button";
 import { CommandInput } from "@/ui/command";
+import { useTranslation } from "@/i18n/locale-provider";
 import { SEARCH_TOGGLE_ICONS, SearchReplaceRow, SearchReplaceToggle } from "@/ui/search";
 import { ToggleGroup, type ToggleGroupOption } from "@/ui/toggle-group";
 import type { ContentSearchOptions } from "../types/global-search.types";
@@ -64,20 +65,22 @@ export const GlobalSearchToolbar = memo(function GlobalSearchToolbar({
   excludeQuery,
   onExcludeQueryChange,
 }: GlobalSearchToolbarProps) {
+  const { t } = useTranslation();
+  const searchInFilesLabel = t("workbench.searchInFiles");
   const searchOptionButtons: ToggleGroupOption<SearchOptionValue>[] = [
     {
       value: "case-sensitive",
-      label: "Match case",
+      label: t("search.matchCase"),
       icon: SEARCH_TOGGLE_ICONS.caseSensitive,
     },
     {
       value: "whole-word",
-      label: "Match whole word",
+      label: t("search.matchWholeWord"),
       icon: SEARCH_TOGGLE_ICONS.wholeWord,
     },
     {
       value: "regex",
-      label: "Use regular expression",
+      label: t("search.useRegex"),
       icon: SEARCH_TOGGLE_ICONS.regex,
     },
   ];
@@ -89,8 +92,8 @@ export const GlobalSearchToolbar = memo(function GlobalSearchToolbar({
         <SearchReplaceToggle
           isExpanded={detailsVisible}
           onToggle={() => onDetailsVisibleChange(!detailsVisible)}
-          expandedLabel="Hide details"
-          collapsedLabel="Show details"
+          expandedLabel={t("search.hideDetails")}
+          collapsedLabel={t("search.showDetails")}
         />
         <div className="flex h-7 min-w-0 flex-1 items-center gap-2 rounded-lg border border-border/70 bg-background/65 px-2">
           <MagnifyingGlass className="size-4 shrink-0 text-subtle-foreground" weight="duotone" />
@@ -99,9 +102,9 @@ export const GlobalSearchToolbar = memo(function GlobalSearchToolbar({
             value={query}
             onChange={onQueryChange}
             onKeyDown={onSearchKeyDown}
-            placeholder="Search in files..."
+            placeholder={searchInFilesLabel}
             className="font-sans min-w-0"
-            aria-label="Search in files"
+            aria-label={searchInFilesLabel}
             autoComplete="off"
             spellCheck={false}
           />
@@ -114,7 +117,7 @@ export const GlobalSearchToolbar = memo(function GlobalSearchToolbar({
                 onQueryChange("");
                 inputRef.current?.focus();
               }}
-              aria-label="Clear search"
+              aria-label={t("search.clear")}
               className="shrink-0 text-subtle-foreground"
             >
               <X />
@@ -131,7 +134,7 @@ export const GlobalSearchToolbar = memo(function GlobalSearchToolbar({
             setSearchOption("wholeWord", next.wholeWord);
             setSearchOption("useRegex", next.useRegex);
           }}
-          ariaLabel="Search options"
+          ariaLabel={t("search.options")}
           variant="segmented"
           size="xs"
           wrap={false}
@@ -176,18 +179,18 @@ export const GlobalSearchToolbar = memo(function GlobalSearchToolbar({
             <CommandInput
               value={includeQuery}
               onChange={onIncludeQueryChange}
-              placeholder="Files to include"
+              placeholder={t("search.filesToInclude")}
               className="font-sans h-7 rounded-md border border-border/70 bg-background/65 px-2"
-              aria-label="Files to include"
+              aria-label={t("search.filesToInclude")}
               autoComplete="off"
               spellCheck={false}
             />
             <CommandInput
               value={excludeQuery}
               onChange={onExcludeQueryChange}
-              placeholder="Files to exclude"
+              placeholder={t("search.filesToExclude")}
               className="font-sans h-7 rounded-md border border-border/70 bg-background/65 px-2"
-              aria-label="Files to exclude"
+              aria-label={t("search.filesToExclude")}
               autoComplete="off"
               spellCheck={false}
             />
diff --git a/windows/tauri/src/features/keymaps/commands/command-registry.ts b/windows/tauri/src/features/keymaps/commands/command-registry.ts
index b33b81d22..352194081 100644
--- a/windows/tauri/src/features/keymaps/commands/command-registry.ts
+++ b/windows/tauri/src/features/keymaps/commands/command-registry.ts
@@ -632,6 +632,12 @@ const viewCommands: Command[] = [
     keybinding: "cmd+shift+f",
     execute: openGlobalSearchBuffer,
   },
+  {
+    id: "workbench.searchEverywhere",
+    title: "Search Everywhere",
+    category: "View",
+    execute: openQuickOpen,
+  },
   {
     id: "workbench.showProjectSearch",
     title: "Project Search",
diff --git a/windows/tauri/src/features/keymaps/defaults/default-keymaps.git-log.test.ts b/windows/tauri/src/features/keymaps/defaults/default-keymaps.git-log.test.ts
index dbce7746a..c126fb92d 100644
--- a/windows/tauri/src/features/keymaps/defaults/default-keymaps.git-log.test.ts
+++ b/windows/tauri/src/features/keymaps/defaults/default-keymaps.git-log.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test";
-import { FOOTER_LEADING_ITEM_IDS, normalizeItemOrder } from "@/features/layout/config/item-order";
+import { SIDEBAR_BOTTOM_ACTIVITY_ITEM_IDS } from "@/features/layout/config/item-order";
 import { defaultKeymaps } from "./default-keymaps";
 
 describe("Git Log workbench entry points", () => {
@@ -11,9 +11,12 @@ describe("Git Log workbench entry points", () => {
     });
   });
 
-  test("adds the Git button to an existing persisted footer order", () => {
-    expect(
-      normalizeItemOrder(["branch", "terminal", "diagnostics"], FOOTER_LEADING_ITEM_IDS),
-    ).toEqual(["branch", "terminal", "diagnostics", "gitLog"]);
+  test("places Git Log on the bottom activity rail above Settings", () => {
+    expect(SIDEBAR_BOTTOM_ACTIVITY_ITEM_IDS.indexOf("run")).toBeLessThan(
+      SIDEBAR_BOTTOM_ACTIVITY_ITEM_IDS.indexOf("gitLog"),
+    );
+    expect(SIDEBAR_BOTTOM_ACTIVITY_ITEM_IDS.indexOf("gitLog")).toBeLessThan(
+      SIDEBAR_BOTTOM_ACTIVITY_ITEM_IDS.indexOf("settings"),
+    );
   });
 });
diff --git a/windows/tauri/src/features/keymaps/hooks/use-keymaps.ts b/windows/tauri/src/features/keymaps/hooks/use-keymaps.ts
index 0a77b110a..35f0046d2 100644
--- a/windows/tauri/src/features/keymaps/hooks/use-keymaps.ts
+++ b/windows/tauri/src/features/keymaps/hooks/use-keymaps.ts
@@ -25,6 +25,11 @@ import { parseKeybinding } from "../utils/parser";
 import type { ParsedKey } from "../utils/parser";
 import { keymapRegistry } from "../utils/registry";
 import { isVimOwnedShortcut } from "../utils/vim-shortcuts";
+import {
+  DoubleShiftGestureRecognizer,
+  isShiftOnlyKey,
+  keyboardEventHasNonShiftModifiers,
+} from "../utils/double-shift-recognizer";
 
 const CHORD_TIMEOUT = 1000; // 1 second to complete chord
 const CLOSE_TAB_CLOSE_REQUEST_WINDOW_MS = 1000;
@@ -45,6 +50,7 @@ export function useKeymaps() {
   const [chordState, setChordState] = useState<ParsedKey[]>([]);
   const chordTimeoutRef = useRef<NodeJS.Timeout | null>(null);
   const lastCloseTabShortcutAtRef = useRef(0);
+  const doubleShiftRecognizerRef = useRef(new DoubleShiftGestureRecognizer());
 
   useEffect(() => {
     if (!IS_LINUX || typeof window === "undefined") return;
@@ -82,6 +88,52 @@ export function useKeymaps() {
     };
   }, []);
 
+  useEffect(() => {
+    const recognizer = doubleShiftRecognizerRef.current;
+
+    const handleShiftKeyDown = (event: KeyboardEvent) => {
+      if (contexts.isRecordingKeybinding) {
+        recognizer.reset();
+        return;
+      }
+
+      if (isShiftOnlyKey(event)) {
+        if (!event.repeat) {
+          recognizer.handleFlagsChanged(
+            true,
+            keyboardEventHasNonShiftModifiers(event),
+            performance.now() / 1000,
+          );
+        }
+        return;
+      }
+
+      recognizer.handleKeyDown();
+    };
+
+    const handleShiftKeyUp = (event: KeyboardEvent) => {
+      if (contexts.isRecordingKeybinding || !isShiftOnlyKey(event)) return;
+
+      const shouldOpenSearch = recognizer.handleFlagsChanged(
+        false,
+        keyboardEventHasNonShiftModifiers(event),
+        performance.now() / 1000,
+      );
+      if (!shouldOpenSearch) return;
+
+      event.preventDefault();
+      event.stopPropagation();
+      keymapRegistry.executeCommand("workbench.searchEverywhere");
+    };
+
+    window.addEventListener("keydown", handleShiftKeyDown, true);
+    window.addEventListener("keyup", handleShiftKeyUp, true);
+    return () => {
+      window.removeEventListener("keydown", handleShiftKeyDown, true);
+      window.removeEventListener("keyup", handleShiftKeyUp, true);
+    };
+  }, [contexts.isRecordingKeybinding]);
+
   useEffect(() => {
     const handleKeyDown = (e: KeyboardEvent) => {
       // Skip all keybinding handling when recording a new keybinding
diff --git a/windows/tauri/src/features/keymaps/utils/double-shift-recognizer.test.ts b/windows/tauri/src/features/keymaps/utils/double-shift-recognizer.test.ts
new file mode 100644
index 000000000..356a069ce
--- /dev/null
+++ b/windows/tauri/src/features/keymaps/utils/double-shift-recognizer.test.ts
@@ -0,0 +1,40 @@
+import { describe, expect, test } from "bun:test";
+import { DoubleShiftGestureRecognizer } from "./double-shift-recognizer";
+
+describe("double Shift search everywhere", () => {
+  test("requires two standalone taps within the threshold", () => {
+    const recognizer = new DoubleShiftGestureRecognizer(0.35);
+
+    expect(recognizer.handleFlagsChanged(true, false, 1.0)).toBe(false);
+    expect(recognizer.handleFlagsChanged(false, false, 1.05)).toBe(false);
+    expect(recognizer.handleFlagsChanged(true, false, 1.2)).toBe(false);
+    expect(recognizer.handleFlagsChanged(false, false, 1.25)).toBe(true);
+  });
+
+  test("rejects Shift used for uppercase typing and keys between taps", () => {
+    const recognizer = new DoubleShiftGestureRecognizer(0.35);
+
+    recognizer.handleFlagsChanged(true, false, 1.0);
+    recognizer.handleKeyDown();
+    expect(recognizer.handleFlagsChanged(false, false, 1.05)).toBe(false);
+
+    recognizer.handleFlagsChanged(true, false, 1.2);
+    recognizer.handleKeyDown();
+    expect(recognizer.handleFlagsChanged(false, false, 1.25)).toBe(false);
+
+    recognizer.handleFlagsChanged(true, false, 2.0);
+    recognizer.handleFlagsChanged(false, false, 2.05);
+    recognizer.handleKeyDown();
+    recognizer.handleFlagsChanged(true, false, 2.2);
+    expect(recognizer.handleFlagsChanged(false, false, 2.25)).toBe(false);
+  });
+
+  test("ignores a second tap after the threshold", () => {
+    const recognizer = new DoubleShiftGestureRecognizer(0.35);
+
+    recognizer.handleFlagsChanged(true, false, 1.0);
+    recognizer.handleFlagsChanged(false, false, 1.05);
+    recognizer.handleFlagsChanged(true, false, 1.5);
+    expect(recognizer.handleFlagsChanged(false, false, 1.55)).toBe(false);
+  });
+});
diff --git a/windows/tauri/src/features/keymaps/utils/double-shift-recognizer.ts b/windows/tauri/src/features/keymaps/utils/double-shift-recognizer.ts
new file mode 100644
index 000000000..7148ad983
--- /dev/null
+++ b/windows/tauri/src/features/keymaps/utils/double-shift-recognizer.ts
@@ -0,0 +1,76 @@
+export const DOUBLE_SHIFT_THRESHOLD_SECONDS = 0.35;
+
+export class DoubleShiftGestureRecognizer {
+  readonly threshold: number;
+  private shiftWasDown = false;
+  private currentPressIsStandalone = false;
+  private lastStandaloneTap: number | null = null;
+
+  constructor(threshold = DOUBLE_SHIFT_THRESHOLD_SECONDS) {
+    this.threshold = threshold;
+  }
+
+  handleKeyDown() {
+    this.currentPressIsStandalone = false;
+    this.lastStandaloneTap = null;
+  }
+
+  reset() {
+    this.shiftWasDown = false;
+    this.currentPressIsStandalone = false;
+    this.lastStandaloneTap = null;
+  }
+
+  handleFlagsChanged(
+    isShiftDown: boolean,
+    hasOtherModifiers: boolean,
+    timestamp: number,
+  ): boolean {
+    if (isShiftDown && !this.shiftWasDown) {
+      this.currentPressIsStandalone = !hasOtherModifiers;
+      this.shiftWasDown = true;
+      return false;
+    }
+
+    if (isShiftDown && this.shiftWasDown) {
+      if (hasOtherModifiers) {
+        this.currentPressIsStandalone = false;
+        this.lastStandaloneTap = null;
+      }
+      return false;
+    }
+
+    if (!isShiftDown && this.shiftWasDown) {
+      this.shiftWasDown = false;
+      const wasStandalone = this.currentPressIsStandalone;
+      this.currentPressIsStandalone = false;
+      if (!wasStandalone || hasOtherModifiers) {
+        this.lastStandaloneTap = null;
+        return false;
+      }
+      if (
+        this.lastStandaloneTap !== null &&
+        timestamp - this.lastStandaloneTap >= 0 &&
+        timestamp - this.lastStandaloneTap < this.threshold
+      ) {
+        this.lastStandaloneTap = null;
+        return true;
+      }
+      this.lastStandaloneTap = timestamp;
+      return false;
+    }
+
+    if (hasOtherModifiers) {
+      this.lastStandaloneTap = null;
+    }
+    return false;
+  }
+}
+
+export function isShiftOnlyKey(event: KeyboardEvent) {
+  return event.key === "Shift" || event.code === "ShiftLeft" || event.code === "ShiftRight";
+}
+
+export function keyboardEventHasNonShiftModifiers(event: KeyboardEvent) {
+  return event.ctrlKey || event.metaKey || event.altKey;
+}
diff --git a/windows/tauri/src/features/layout/components/footer/footer-editor-status.tsx b/windows/tauri/src/features/layout/components/footer/footer-editor-status.tsx
new file mode 100644
index 000000000..e859d7a97
--- /dev/null
+++ b/windows/tauri/src/features/layout/components/footer/footer-editor-status.tsx
@@ -0,0 +1,123 @@
+import { useEffect, useState } from "react";
+import { CursorPositionChip } from "@/features/editor/components/toolbar/editor-status-actions";
+import { useBufferStore } from "@/features/editor/stores/buffer.store";
+import { useEditorStateStore } from "@/features/editor/stores/state.store";
+import { getBufferById } from "@/features/editor/utils/buffer-index";
+import { useGitStore } from "@/features/git/stores/git.store";
+import { useSidebarPaneController } from "@/features/layout/hooks/use-sidebar-pane-controller";
+import type { FooterTrailingItemId } from "@/features/layout/config/item-order";
+import {
+  countUniqueGitChanges,
+  formatMemoryMegabytes,
+  readJsHeapMemory,
+  TEXT_FILE_ENCODING,
+} from "@/features/layout/utils/footer-status";
+import type { ChromeItem } from "@/features/layout/utils/chrome-items";
+import { useSettingsStore } from "@/features/settings/stores/settings.store";
+import { useTranslation } from "@/i18n/locale-provider";
+import { CheckCircleIcon, HardDrivesIcon, LockIcon, LockOpenIcon } from "@/ui/icons";
+import { FooterStatusChip, FooterStatusLabel } from "./footer-status-chip";
+
+const MEMORY_POLL_INTERVAL_MS = 2000;
+
+export function useFooterEditorStatusItems(): Array<ChromeItem<FooterTrailingItemId> | null> {
+  const { t } = useTranslation();
+  const { openSidebarView } = useSidebarPaneController();
+  const tabSize = useSettingsStore((state) => state.settings.tabSize);
+  const activeEditorViewKey = useEditorStateStore.use.activeEditorViewKey();
+  const gitFiles = useGitStore((state) => state.gitStatus?.files ?? state.workspaceGitStatus?.files);
+  const activeBuffer = useBufferStore((state) => {
+    const buffer = getBufferById(state.buffers, state.activeBufferId);
+    return buffer
+      ? {
+          type: buffer.type,
+          readOnly: buffer.type === "editor" && buffer.readOnly === true,
+        }
+      : null;
+  });
+  const [memoryUsage, setMemoryUsage] = useState(() => readJsHeapMemory());
+  const changeCount = countUniqueGitChanges(gitFiles);
+  const isEditorBuffer = activeBuffer?.type === "editor";
+
+  useEffect(() => {
+    const updateMemory = () => setMemoryUsage(readJsHeapMemory());
+    updateMemory();
+    const intervalId = window.setInterval(updateMemory, MEMORY_POLL_INTERVAL_MS);
+    return () => window.clearInterval(intervalId);
+  }, []);
+
+  return [
+    isEditorBuffer
+      ? {
+          id: "cursor",
+          label: t("footer.cursor"),
+          content: <CursorPositionChip editorViewKey={activeEditorViewKey} />,
+        }
+      : null,
+    isEditorBuffer
+      ? {
+          id: "encoding",
+          label: t("footer.encoding"),
+          content: <FooterStatusLabel>{TEXT_FILE_ENCODING}</FooterStatusLabel>,
+        }
+      : null,
+    isEditorBuffer
+      ? {
+          id: "indent",
+          label: t("footer.indent"),
+          content: (
+            <FooterStatusLabel>{t("footer.spaces", { count: tabSize })}</FooterStatusLabel>
+          ),
+        }
+      : null,
+    isEditorBuffer
+      ? {
+          id: "readOnly",
+          label: activeBuffer.readOnly ? t("footer.readOnly") : t("footer.writable"),
+          content: (
+            <FooterStatusLabel
+              className="px-1"
+              aria-label={activeBuffer.readOnly ? t("footer.readOnly") : t("footer.writable")}
+            >
+              {activeBuffer.readOnly ? <LockIcon /> : <LockOpenIcon />}
+            </FooterStatusLabel>
+          ),
+        }
+      : null,
+    memoryUsage
+      ? {
+          id: "memory",
+          label: t("footer.memory"),
+          content: (
+            <FooterStatusLabel className="max-w-none whitespace-nowrap">
+              <HardDrivesIcon />
+              {t("footer.memoryUsage", {
+                total: formatMemoryMegabytes(memoryUsage.totalBytes),
+                used: formatMemoryMegabytes(memoryUsage.usedBytes),
+              })}
+            </FooterStatusLabel>
+          ),
+        }
+      : null,
+    {
+      id: "gitChanges",
+      label: t("workbench.changes"),
+      content: (
+        <FooterStatusChip
+          onClick={() => openSidebarView("git")}
+          aria-label={
+            changeCount === 0
+              ? t("footer.noChanges")
+              : t(changeCount === 1 ? "footer.change" : "footer.changes", { count: changeCount })
+          }
+        >
+          {changeCount === 0 ? (
+            <CheckCircleIcon className="text-success" />
+          ) : (
+            t(changeCount === 1 ? "footer.change" : "footer.changes", { count: changeCount })
+          )}
+        </FooterStatusChip>
+      ),
+    },
+  ];
+}
diff --git a/windows/tauri/src/features/layout/components/footer/footer-file-path-item.tsx b/windows/tauri/src/features/layout/components/footer/footer-file-path-item.tsx
new file mode 100644
index 000000000..b84335728
--- /dev/null
+++ b/windows/tauri/src/features/layout/components/footer/footer-file-path-item.tsx
@@ -0,0 +1,37 @@
+import { FilePathBreadcrumb } from "@/features/editor/components/toolbar/file-path-breadcrumb";
+import { useBufferStore } from "@/features/editor/stores/buffer.store";
+import { getBufferById } from "@/features/editor/utils/buffer-index";
+import { useSettingsStore } from "@/features/settings/stores/settings.store";
+import type { FooterLeadingItemId } from "@/features/layout/config/item-order";
+import type { ChromeItem } from "@/features/layout/utils/chrome-items";
+import { useShallow } from "zustand/react/shallow";
+
+export function useFooterFilePathItem(): ChromeItem<FooterLeadingItemId> | null {
+  const breadcrumbsEnabled = useSettingsStore((state) => state.settings.coreFeatures.breadcrumbs);
+  const activeBuffer = useBufferStore(
+    useShallow((state) => {
+      const buffer = getBufferById(state.buffers, state.activeBufferId);
+      return buffer
+        ? {
+            path: buffer.path,
+            type: buffer.type,
+          }
+        : null;
+    }),
+  );
+
+  if (!breadcrumbsEnabled || !activeBuffer?.path) return null;
+
+  return {
+    id: "filePath",
+    label: "File path",
+    content: (
+      <FilePathBreadcrumb
+        filePath={activeBuffer.path}
+        interactive={!activeBuffer.path.includes("://") || activeBuffer.path.startsWith("remote://")}
+        menuSide="top"
+        className="max-w-full"
+      />
+    ),
+  };
+}
diff --git a/windows/tauri/src/features/layout/components/footer/footer-status-chip.tsx b/windows/tauri/src/features/layout/components/footer/footer-status-chip.tsx
new file mode 100644
index 000000000..b8e8d162d
--- /dev/null
+++ b/windows/tauri/src/features/layout/components/footer/footer-status-chip.tsx
@@ -0,0 +1,36 @@
+import type { ButtonHTMLAttributes, ComponentProps, ReactNode } from "react";
+import { cn } from "@/utils/cn";
+
+const footerStatusChipClassName =
+  "font-sans inline-flex h-(--lithe-chrome-control-height) max-w-50 shrink-0 items-center gap-1 rounded-md border-0 px-1.5 ui-text-chrome leading-none text-subtle-foreground transition-colors hover:bg-accent hover:text-foreground";
+
+export function FooterStatusChip({
+  className,
+  children,
+  ...props
+}: ButtonHTMLAttributes<HTMLButtonElement> & { children: ReactNode }) {
+  return (
+    <button type="button" className={cn(footerStatusChipClassName, className)} {...props}>
+      {children}
+    </button>
+  );
+}
+
+export function FooterStatusLabel({
+  className,
+  children,
+  ...props
+}: ComponentProps<"span"> & { children: ReactNode }) {
+  return (
+    <span
+      className={cn(
+        footerStatusChipClassName,
+        "hover:bg-transparent hover:text-subtle-foreground",
+        className,
+      )}
+      {...props}
+    >
+      {children}
+    </span>
+  );
+}
diff --git a/windows/tauri/src/features/layout/components/footer/footer.tsx b/windows/tauri/src/features/layout/components/footer/footer.tsx
index acf625c44..6aff08ba7 100644
--- a/windows/tauri/src/features/layout/components/footer/footer.tsx
+++ b/windows/tauri/src/features/layout/components/footer/footer.tsx
@@ -1,12 +1,5 @@
 import { useMemo } from "react";
-import {
-  BACKEND_UNAVAILABLE_TOOLTIP,
-  isBackendCapabilityAvailable,
-} from "@/config/backend-capabilities";
-import { useDiagnosticsStore } from "@/features/diagnostics/stores/diagnostics.store";
-import { useBufferStore } from "@/features/editor/stores/buffer.store";
 import { useSettingsStore } from "@/features/settings/stores/settings.store";
-import { useUIState } from "@/features/window/stores/ui-state.store";
 import { NotificationsTrigger } from "@/features/notifications/components/notifications-trigger";
 import {
   FOOTER_TRAILING_ITEM_IDS,
@@ -15,118 +8,30 @@ import {
   type FooterTrailingItemId,
 } from "@/features/layout/config/item-order";
 import { orderChromeItems, type ChromeItem } from "@/features/layout/utils/chrome-items";
+import { useTranslation } from "@/i18n/locale-provider";
 import { useFooterGitBranchItem } from "./footer-git-branch-item";
-import { FooterTabControl } from "./footer-tab-control";
-import {
-  ClockCounterClockwiseIcon,
-  DatabaseIcon,
-  TerminalWindowIcon,
-  WarningIcon,
-} from "@/ui/icons";
+import { useFooterFilePathItem } from "./footer-file-path-item";
+import { useFooterEditorStatusItems } from "./footer-editor-status";
 import { ChromeBar, ChromeGroup } from "@/ui/chrome";
 
 const Footer = () => {
-  const terminalEnabled = useSettingsStore((state) => state.settings.coreFeatures.terminal);
-  const diagnosticsEnabled = useSettingsStore((state) => state.settings.coreFeatures.diagnostics);
+  const { t } = useTranslation();
   const footerLeadingItemsOrder = useSettingsStore(
     (state) => state.settings.footerLeadingItemsOrder,
   );
   const footerTrailingItemsOrder = useSettingsStore(
     (state) => state.settings.footerTrailingItemsOrder,
   );
-  const isCommandPaletteVisible = useUIState((state) => state.isCommandPaletteVisible);
-  const commandPaletteInitialView = useUIState((state) => state.commandPaletteInitialView);
-  const isBottomPaneVisible = useUIState((state) => state.isBottomPaneVisible);
-  const bottomPaneActiveTab = useUIState((state) => state.bottomPaneActiveTab);
-  const setIsBottomPaneVisible = useUIState((state) => state.setIsBottomPaneVisible);
-  const setBottomPaneActiveTab = useUIState((state) => state.setBottomPaneActiveTab);
-  const openCommandPaletteView = useUIState((state) => state.openCommandPaletteView);
-  const isDiagnosticsBufferActive = useBufferStore((state) => {
-    if (!state.activeBufferId) return false;
-    return state.buffers.some(
-      (buffer) => buffer.id === state.activeBufferId && buffer.type === "diagnostics",
-    );
-  });
-  const openDiagnosticsBuffer = useBufferStore.use.actions().openDiagnosticsBuffer;
+  const filePathItem = useFooterFilePathItem();
   const branchItem = useFooterGitBranchItem();
-  const diagnosticsByFile = useDiagnosticsStore.use.diagnosticsByFile();
-  const diagnosticsCount = Array.from(diagnosticsByFile.values()).reduce(
-    (total, diagnostics) => total + diagnostics.length,
-    0,
-  );
+  const editorStatusItems = useFooterEditorStatusItems();
   const footerLeadingItemsSource: Array<ChromeItem<FooterLeadingItemId> | null> = [
+    filePathItem,
     branchItem,
-    {
-      id: "gitLog",
-      label: "Git",
-      content: (
-        <FooterTabControl
-          tooltip="Toggle Git Log"
-          active={isBottomPaneVisible && bottomPaneActiveTab === "gitLog"}
-          commandId="workbench.toggleGitLog"
-          onClick={() => {
-            const showingGitLog = !isBottomPaneVisible || bottomPaneActiveTab !== "gitLog";
-            setBottomPaneActiveTab("gitLog");
-            setIsBottomPaneVisible(showingGitLog);
-          }}
-        >
-          <ClockCounterClockwiseIcon />
-          <span>Git</span>
-        </FooterTabControl>
-      ),
-    },
-    terminalEnabled
-      ? {
-          id: "terminal",
-          label: "Terminal",
-          content: (
-            <FooterTabControl
-              tooltip={
-                isBackendCapabilityAvailable("terminal")
-                  ? "Toggle Terminal"
-                  : BACKEND_UNAVAILABLE_TOOLTIP
-              }
-              disabled={!isBackendCapabilityAvailable("terminal")}
-              active={isBottomPaneVisible && bottomPaneActiveTab === "terminal"}
-              commandId="workbench.toggleTerminal"
-              onClick={() => {
-                setBottomPaneActiveTab("terminal");
-                const showingTerminal = !isBottomPaneVisible || bottomPaneActiveTab !== "terminal";
-                setIsBottomPaneVisible(showingTerminal);
-              }}
-            >
-              <TerminalWindowIcon />
-            </FooterTabControl>
-          ),
-        }
-      : null,
-    diagnosticsEnabled
-      ? {
-          id: "diagnostics",
-          label: "Diagnostics",
-          content: (
-            <FooterTabControl
-              tooltip={
-                diagnosticsCount > 0
-                  ? `${diagnosticsCount} diagnostic${diagnosticsCount === 1 ? "" : "s"}`
-                  : "Open Diagnostics"
-              }
-              active={isDiagnosticsBufferActive}
-              tone={!isDiagnosticsBufferActive && diagnosticsCount > 0 ? "warning" : "default"}
-              commandId="workbench.toggleDiagnostics"
-              onClick={() => openDiagnosticsBuffer()}
-            >
-              <WarningIcon />
-              {diagnosticsCount > 0 && <span className="tabular-nums">{diagnosticsCount}</span>}
-            </FooterTabControl>
-          ),
-        }
-      : null,
   ];
   const footerLeadingItems = footerLeadingItemsSource.filter(
     (item): item is ChromeItem<FooterLeadingItemId> => item !== null,
   );
-  const isDatabasesActive = isCommandPaletteVisible && commandPaletteInitialView === "databases";
   const footerTrailingOrder = useMemo<FooterTrailingItemId[]>(() => {
     return normalizeItemOrder(
       footerTrailingItemsOrder,
@@ -134,49 +39,42 @@ const Footer = () => {
     ) as FooterTrailingItemId[];
   }, [footerTrailingItemsOrder]);
 
-  const footerTrailingItems: Array<ChromeItem<FooterTrailingItemId>> = [
-    {
-      id: "databases",
-      label: "Databases",
-      content: (
-        <FooterTabControl
-          tooltip={
-            isBackendCapabilityAvailable("database") ? "Databases" : BACKEND_UNAVAILABLE_TOOLTIP
-          }
-          disabled={!isBackendCapabilityAvailable("database")}
-          active={isDatabasesActive}
-          commandId="database.connect"
-          onClick={() => {
-            openCommandPaletteView("databases");
-          }}
-        >
-          <DatabaseIcon />
-        </FooterTabControl>
-      ),
-    },
+  const footerTrailingItems: Array<ChromeItem<FooterTrailingItemId> | null> = [
+    ...editorStatusItems,
     {
       id: "notifications",
-      label: "Notifications",
+      label: t("notifications.title"),
       content: <NotificationsTrigger />,
     },
   ];
+  const visibleTrailingItems = footerTrailingItems.filter(
+    (item): item is ChromeItem<FooterTrailingItemId> => item !== null,
+  );
 
   return (
     <ChromeBar
       region="footer"
-      className="lithe-footer-bar relative z-20 justify-between"
+      className="lithe-footer-bar relative z-20 justify-between gap-2"
       aria-label="Status bar"
     >
-      <ChromeGroup gap="tight">
-        {orderChromeItems(footerLeadingItems, footerLeadingItemsOrder).map((item) => (
-          <div key={item.id} className="flex min-h-(--lithe-chrome-control-height) items-center">
+      <ChromeGroup gap="tight" grow className="min-w-0">
+        {filePathItem ? (
+          <div className="flex min-h-(--lithe-chrome-control-height) min-w-0 flex-1 items-center overflow-hidden">
+            {filePathItem.content}
+          </div>
+        ) : null}
+        {orderChromeItems(
+          footerLeadingItems.filter((item) => item.id !== "filePath"),
+          footerLeadingItemsOrder,
+        ).map((item) => (
+          <div key={item.id} className="flex min-h-(--lithe-chrome-control-height) shrink-0 items-center">
             {item.content}
           </div>
         ))}
       </ChromeGroup>
 
-      <ChromeGroup gap="tight">
-        {orderChromeItems(footerTrailingItems, footerTrailingOrder).map((item) => (
+      <ChromeGroup gap="tight" align="end" className="shrink-0">
+        {orderChromeItems(visibleTrailingItems, footerTrailingOrder).map((item) => (
           <div key={item.id} className="flex min-h-(--lithe-chrome-control-height) items-center">
             {item.content}
           </div>
diff --git a/windows/tauri/src/features/layout/components/sidebar/main-sidebar.tsx b/windows/tauri/src/features/layout/components/sidebar/main-sidebar.tsx
index dedb1c1ec..d7b189373 100644
--- a/windows/tauri/src/features/layout/components/sidebar/main-sidebar.tsx
+++ b/windows/tauri/src/features/layout/components/sidebar/main-sidebar.tsx
@@ -31,6 +31,13 @@ import type { SidebarView } from "@/features/layout/utils/sidebar-pane-utils";
 import { RunIcon } from "@/features/run/components/run-icon";
 import { useSettingsStore } from "@/features/settings/stores/settings.store";
 import { useBufferStore } from "@/features/editor/stores/buffer.store";
+import {
+  openDiagnosticsBuffer,
+  toggleGitLogPane,
+  toggleRunPane,
+  toggleTerminalPane,
+} from "@/features/keymaps/commands/view-command-actions";
+import { useTranslation } from "@/i18n/locale-provider";
 import { workspaceRuntimeRegistry } from "@/features/workspace/runtime/workspace-runtime-registry";
 import { useUIState } from "@/features/window/stores/ui-state.store";
 import {
@@ -61,7 +68,10 @@ import {
   FolderOpenIcon,
   GearIcon,
   GitBranchIcon,
+  GitGraphIcon,
   MagnifyingGlassIcon,
+  TerminalWindowIcon,
+  WarningIcon,
 } from "@/ui/icons";
 
 interface MainSidebarProps {
@@ -102,6 +112,7 @@ const waitForProjectCarouselPaint = () =>
   });
 
 export const SidebarActivityRail = memo(({ expanded = false }: SidebarActivityRailProps) => {
+  const { t } = useTranslation();
   const { openSidebarView } = useSidebarPaneController();
   const isGitViewActive = useUIState((state) => state.isGitViewActive);
   const isSidebarVisible = useUIState((state) => state.isSidebarVisible);
@@ -110,9 +121,13 @@ export const SidebarActivityRail = memo(({ expanded = false }: SidebarActivityRa
   const openSettingsDialog = useUIState((state) => state.openSettingsDialog);
   const isBottomPaneVisible = useUIState((state) => state.isBottomPaneVisible);
   const bottomPaneActiveTab = useUIState((state) => state.bottomPaneActiveTab);
-  const setIsBottomPaneVisible = useUIState((state) => state.setIsBottomPaneVisible);
-  const setBottomPaneActiveTab = useUIState((state) => state.setBottomPaneActiveTab);
   const openGlobalSearchBuffer = useBufferStore.use.actions().openGlobalSearchBuffer;
+  const isDiagnosticsBufferActive = useBufferStore((state) => {
+    if (!state.activeBufferId) return false;
+    return state.buffers.some(
+      (buffer) => buffer.id === state.activeBufferId && buffer.type === "diagnostics",
+    );
+  });
   const configuredActivityRailWidth = useSettingsStore((state) => state.settings.activityRailWidth);
   const openFoldersInNewWindow = useSettingsStore((state) => state.settings.openFoldersInNewWindow);
   const hiddenSidebarActivityItems = useSettingsStore(
@@ -174,14 +189,14 @@ export const SidebarActivityRail = memo(({ expanded = false }: SidebarActivityRa
     () => [
       {
         id: "files",
-        label: "Project",
+        label: t("workbench.project"),
         icon: <FilesIcon />,
       },
       ...(coreFeatures.search
         ? [
             {
               id: "search",
-              label: "Search",
+              label: t("workbench.search"),
               icon: <MagnifyingGlassIcon />,
             },
           ]
@@ -190,28 +205,51 @@ export const SidebarActivityRail = memo(({ expanded = false }: SidebarActivityRa
         ? [
             {
               id: "git",
-              label: "Changes",
+              label: t("workbench.changes"),
               icon: <GitBranchIcon />,
             },
+            {
+              id: "gitLog",
+              label: t("workbench.gitLog"),
+              icon: <GitGraphIcon />,
+            },
           ]
         : []),
       {
         id: "database",
-        label: "Database",
+        label: t("workbench.database"),
         icon: <DatabaseIcon />,
       },
+      ...(coreFeatures.terminal
+        ? [
+            {
+              id: "terminal",
+              label: t("workbench.terminal"),
+              icon: <TerminalWindowIcon />,
+            },
+          ]
+        : []),
+      ...(coreFeatures.diagnostics
+        ? [
+            {
+              id: "diagnostics",
+              label: t("workbench.diagnostics"),
+              icon: <WarningIcon />,
+            },
+          ]
+        : []),
       {
         id: "run",
-        label: "Run",
+        label: t("workbench.run"),
         icon: <RunIcon />,
       },
       {
         id: "settings",
-        label: "Settings",
+        label: t("workbench.settings"),
         icon: <GearIcon />,
       },
     ],
-    [coreFeatures.git, coreFeatures.search],
+    [coreFeatures.diagnostics, coreFeatures.git, coreFeatures.search, coreFeatures.terminal, t],
   );
 
   const setActivityRailItemVisible = useCallback(
@@ -648,15 +686,14 @@ export const SidebarActivityRail = memo(({ expanded = false }: SidebarActivityRa
                   coreFeatures={coreFeatures}
                   onViewChange={handleSidebarViewChange}
                   onSearchClick={() => openGlobalSearchBuffer()}
+                  onGitLogClick={() => toggleGitLogPane()}
+                  isGitLogActive={isBottomPaneVisible && bottomPaneActiveTab === "gitLog"}
                   onSettingsClick={() => openSettingsDialog()}
-                  onRunClick={() => {
-                    if (isBottomPaneVisible && bottomPaneActiveTab === "run") {
-                      setIsBottomPaneVisible(false);
-                    } else {
-                      setBottomPaneActiveTab("run");
-                      setIsBottomPaneVisible(true);
-                    }
-                  }}
+                  onTerminalClick={() => toggleTerminalPane()}
+                  isTerminalActive={isBottomPaneVisible && bottomPaneActiveTab === "terminal"}
+                  onDiagnosticsClick={() => openDiagnosticsBuffer()}
+                  isDiagnosticsActive={isDiagnosticsBufferActive}
+                  onRunClick={() => toggleRunPane()}
                   isRunActive={isBottomPaneVisible && bottomPaneActiveTab === "run"}
                   compact={!expanded}
                   showLabels={expanded}
@@ -724,7 +761,7 @@ export const SidebarActivityRail = memo(({ expanded = false }: SidebarActivityRa
           </ContextMenuItem>
           <ContextMenuItem onClick={() => openGlobalSearchBuffer()}>
             <MagnifyingGlassIcon />
-            Search
+            {t("workbench.search")}
           </ContextMenuItem>
         </ContextMenuGroup>
         <ContextMenuSeparator />
diff --git a/windows/tauri/src/features/layout/components/sidebar/sidebar-pane-selector.tsx b/windows/tauri/src/features/layout/components/sidebar/sidebar-pane-selector.tsx
index 3af81ac14..a6a8ac700 100644
--- a/windows/tauri/src/features/layout/components/sidebar/sidebar-pane-selector.tsx
+++ b/windows/tauri/src/features/layout/components/sidebar/sidebar-pane-selector.tsx
@@ -1,8 +1,14 @@
 import { useMemo, type ReactNode } from "react";
-import { BACKEND_UNAVAILABLE_TOOLTIP } from "@/config/backend-capabilities";
+import {
+  BACKEND_UNAVAILABLE_TOOLTIP,
+  isBackendCapabilityAvailable,
+} from "@/config/backend-capabilities";
 import { useTranslation } from "@/i18n/locale-provider";
 import type { CoreFeaturesState } from "@/features/settings/types/feature.types";
-import { normalizeItemOrder } from "@/features/layout/config/item-order";
+import {
+  SIDEBAR_BOTTOM_ACTIVITY_ITEM_IDS,
+  normalizeItemOrder,
+} from "@/features/layout/config/item-order";
 import { RunIcon } from "@/features/run/components/run-icon";
 import { useSettingsStore } from "@/features/settings/stores/settings.store";
 import { SidebarListItem } from "@/ui/sidebar";
@@ -11,15 +17,16 @@ import {
   DatabaseIcon,
   GearIcon,
   GitBranchIcon,
+  GitGraphIcon,
   FilesIcon,
   MagnifyingGlassIcon,
+  TerminalWindowIcon,
+  WarningIcon,
 } from "@/ui/icons";
 import Tooltip from "@/ui/tooltip";
 import { cn } from "@/utils/cn";
 import type { SidebarView } from "../../utils/sidebar-pane-utils";
 
-const BOTTOM_ACTIVITY_ITEM_IDS = ["run", "settings"] as const;
-
 interface SidebarPaneItem {
   id: string;
   label?: ReactNode;
@@ -55,7 +62,13 @@ interface SidebarPaneSelectorProps {
   onViewChange: (view: SidebarView) => void;
   onSearchClick?: () => void;
   isSearchActive?: boolean;
+  onGitLogClick?: () => void;
+  isGitLogActive?: boolean;
   onSettingsClick?: () => void;
+  onTerminalClick?: () => void;
+  isTerminalActive?: boolean;
+  onDiagnosticsClick?: () => void;
+  isDiagnosticsActive?: boolean;
   onRunClick?: () => void;
   isRunActive?: boolean;
   compact?: boolean;
@@ -71,7 +84,13 @@ export const SidebarPaneSelector = ({
   onViewChange,
   onSearchClick,
   isSearchActive = false,
+  onGitLogClick,
+  isGitLogActive = false,
   onSettingsClick,
+  onTerminalClick,
+  isTerminalActive = false,
+  onDiagnosticsClick,
+  isDiagnosticsActive = false,
   onRunClick,
   isRunActive = false,
   compact = false,
@@ -144,6 +163,23 @@ export const SidebarPaneSelector = ({
             } satisfies SidebarPaneItem,
           ]
         : []),
+      ...(coreFeatures.git && onGitLogClick
+        ? [
+            {
+              id: "gitLog",
+              label: showLabels ? t("workbench.gitLog") : undefined,
+              icon: <GitGraphIcon className={iconClassName} />,
+              isActive: isGitLogActive,
+              onClick: onGitLogClick,
+              ariaLabel: t("workbench.gitLog"),
+              tooltip: {
+                content: t("workbench.gitLog"),
+                shortcut: "Alt+9",
+                side: tooltipSide,
+              },
+            } satisfies SidebarPaneItem,
+          ]
+        : []),
       {
         id: "database",
         label: showLabels ? t("workbench.database") : undefined,
@@ -155,6 +191,43 @@ export const SidebarPaneSelector = ({
           side: tooltipSide,
         },
       },
+      ...(coreFeatures.terminal && onTerminalClick
+        ? [
+            {
+              id: "terminal",
+              label: showLabels ? t("workbench.terminal") : undefined,
+              icon: <TerminalWindowIcon className={iconClassName} />,
+              isActive: isTerminalActive,
+              onClick: onTerminalClick,
+              disabled: !isBackendCapabilityAvailable("terminal"),
+              ariaLabel: t("workbench.terminal"),
+              tooltip: {
+                content: isBackendCapabilityAvailable("terminal")
+                  ? t("workbench.terminal")
+                  : BACKEND_UNAVAILABLE_TOOLTIP,
+                shortcut: isBackendCapabilityAvailable("terminal") ? "Mod+J" : undefined,
+                side: tooltipSide,
+              },
+            } satisfies SidebarPaneItem,
+          ]
+        : []),
+      ...(coreFeatures.diagnostics && onDiagnosticsClick
+        ? [
+            {
+              id: "diagnostics",
+              label: showLabels ? t("workbench.diagnostics") : undefined,
+              icon: <WarningIcon className={iconClassName} />,
+              isActive: isDiagnosticsActive,
+              onClick: onDiagnosticsClick,
+              ariaLabel: t("workbench.diagnostics"),
+              tooltip: {
+                content: t("workbench.diagnostics"),
+                shortcut: "Mod+Shift+J",
+                side: tooltipSide,
+              },
+            } satisfies SidebarPaneItem,
+          ]
+        : []),
       ...(onRunClick
         ? [
             {
@@ -189,14 +262,22 @@ export const SidebarPaneSelector = ({
         : []),
     ],
     [
+      coreFeatures.diagnostics,
       coreFeatures.git,
       coreFeatures.search,
+      coreFeatures.terminal,
       iconClassName,
       isFilesActive,
       isPrimarySidebarItemActive,
       isGitViewActive,
       isSearchActive,
       onSearchClick,
+      onGitLogClick,
+      isGitLogActive,
+      onTerminalClick,
+      isTerminalActive,
+      onDiagnosticsClick,
+      isDiagnosticsActive,
       onRunClick,
       onSettingsClick,
       isRunActive,
@@ -219,9 +300,12 @@ export const SidebarPaneSelector = ({
   const orderedItems = orderItems(items, orderedIds);
   const visibleItems = orderedItems.filter((item) => !hiddenSidebarActivityItems.includes(item.id));
   const topItems = visibleItems.filter(
-    (item) => !BOTTOM_ACTIVITY_ITEM_IDS.includes(item.id as (typeof BOTTOM_ACTIVITY_ITEM_IDS)[number]),
+    (item) =>
+      !SIDEBAR_BOTTOM_ACTIVITY_ITEM_IDS.includes(
+        item.id as (typeof SIDEBAR_BOTTOM_ACTIVITY_ITEM_IDS)[number],
+      ),
   );
-  const bottomItems = BOTTOM_ACTIVITY_ITEM_IDS.map((id) =>
+  const bottomItems = SIDEBAR_BOTTOM_ACTIVITY_ITEM_IDS.map((id) =>
     visibleItems.find((item) => item.id === id),
   ).filter((item): item is SidebarPaneItem => Boolean(item));
 
diff --git a/windows/tauri/src/features/layout/config/item-order.test.ts b/windows/tauri/src/features/layout/config/item-order.test.ts
new file mode 100644
index 000000000..a6c33adc3
--- /dev/null
+++ b/windows/tauri/src/features/layout/config/item-order.test.ts
@@ -0,0 +1,34 @@
+import { describe, expect, test } from "bun:test";
+import {
+  FOOTER_TRAILING_ITEM_IDS,
+  SIDEBAR_BOTTOM_ACTIVITY_ITEM_IDS,
+  normalizeItemOrder,
+} from "./item-order";
+
+describe("footer item order", () => {
+  test("keeps editor status chips on the trailing status row without Database or Git Log", () => {
+    const ordered = normalizeItemOrder(["notifications"], FOOTER_TRAILING_ITEM_IDS);
+
+    expect(ordered).not.toContain("terminal");
+    expect(ordered).not.toContain("diagnostics");
+    expect(ordered).not.toContain("run");
+    expect(ordered).not.toContain("gitLog");
+    expect(ordered).not.toContain("databases");
+    expect(ordered).toContain("gitChanges");
+    expect(ordered).toContain("cursor");
+    expect(ordered).toContain("memory");
+    expect(ordered).toContain("notifications");
+  });
+});
+
+describe("sidebar activity order", () => {
+  test("places Run, Terminal, Diagnostics, Git Log, then Settings", () => {
+    expect([...SIDEBAR_BOTTOM_ACTIVITY_ITEM_IDS]).toEqual([
+      "run",
+      "terminal",
+      "diagnostics",
+      "gitLog",
+      "settings",
+    ]);
+  });
+});
diff --git a/windows/tauri/src/features/layout/config/item-order.ts b/windows/tauri/src/features/layout/config/item-order.ts
index 78dd71730..11f2ca4fd 100644
--- a/windows/tauri/src/features/layout/config/item-order.ts
+++ b/windows/tauri/src/features/layout/config/item-order.ts
@@ -5,16 +5,26 @@ export const SIDEBAR_ACTIVITY_ITEM_IDS = [
   "search",
   "database",
   "run",
+  "terminal",
+  "diagnostics",
+  "gitLog",
   "settings",
 ] as const;
-export const FOOTER_LEADING_ITEM_IDS = [
-  "branch",
-  "gitLog",
+export const SIDEBAR_BOTTOM_ACTIVITY_ITEM_IDS = [
+  "run",
   "terminal",
   "diagnostics",
+  "gitLog",
+  "settings",
 ] as const;
+export const FOOTER_LEADING_ITEM_IDS = ["filePath", "branch"] as const;
 export const FOOTER_TRAILING_ITEM_IDS = [
-  "databases",
+  "cursor",
+  "encoding",
+  "indent",
+  "readOnly",
+  "memory",
+  "gitChanges",
   "notifications",
 ] as const;
 
diff --git a/windows/tauri/src/features/layout/utils/footer-status.test.ts b/windows/tauri/src/features/layout/utils/footer-status.test.ts
new file mode 100644
index 000000000..22ececabe
--- /dev/null
+++ b/windows/tauri/src/features/layout/utils/footer-status.test.ts
@@ -0,0 +1,20 @@
+import { describe, expect, test } from "bun:test";
+import { countUniqueGitChanges, formatMemoryMegabytes } from "./footer-status";
+
+describe("footer status helpers", () => {
+  test("formats heap sizes in megabytes", () => {
+    expect(formatMemoryMegabytes(213.7 * 1024 * 1024)).toBe("213.7 MB");
+    expect(formatMemoryMegabytes(0)).toBe("0.0 MB");
+  });
+
+  test("counts unique Git paths", () => {
+    expect(countUniqueGitChanges(undefined)).toBe(0);
+    expect(
+      countUniqueGitChanges([
+        { path: "src/a.ts" },
+        { path: "src/a.ts" },
+        { path: "src/b.ts" },
+      ]),
+    ).toBe(2);
+  });
+});
diff --git a/windows/tauri/src/features/layout/utils/footer-status.ts b/windows/tauri/src/features/layout/utils/footer-status.ts
new file mode 100644
index 000000000..19958b994
--- /dev/null
+++ b/windows/tauri/src/features/layout/utils/footer-status.ts
@@ -0,0 +1,35 @@
+export const TEXT_FILE_ENCODING = "UTF-8";
+
+const BYTES_PER_MEGABYTE = 1024 * 1024;
+
+interface JsHeapMemory {
+  usedJSHeapSize: number;
+  totalJSHeapSize: number;
+}
+
+export interface FooterMemoryUsage {
+  usedBytes: number;
+  totalBytes: number;
+}
+
+export function formatMemoryMegabytes(bytes: number): string {
+  const megabytes = bytes / BYTES_PER_MEGABYTE;
+  return `${megabytes.toFixed(1)} MB`;
+}
+
+export function readJsHeapMemory(): FooterMemoryUsage | null {
+  const memory = (performance as Performance & { memory?: JsHeapMemory }).memory;
+  if (!memory || !Number.isFinite(memory.usedJSHeapSize) || !Number.isFinite(memory.totalJSHeapSize)) {
+    return null;
+  }
+
+  return {
+    usedBytes: memory.usedJSHeapSize,
+    totalBytes: memory.totalJSHeapSize,
+  };
+}
+
+export function countUniqueGitChanges(files: Array<{ path: string }> | undefined): number {
+  if (!files || files.length === 0) return 0;
+  return new Set(files.map((file) => file.path)).size;
+}
diff --git a/windows/tauri/src/features/notifications/components/notifications-command.tsx b/windows/tauri/src/features/notifications/components/notifications-command.tsx
index ce692e8c9..d85439b88 100644
--- a/windows/tauri/src/features/notifications/components/notifications-command.tsx
+++ b/windows/tauri/src/features/notifications/components/notifications-command.tsx
@@ -39,6 +39,7 @@ import { ItemGroup } from "@/ui/item";
 import Tooltip from "@/ui/tooltip";
 import { writeClipboardText } from "@/utils/clipboard";
 import { cn } from "@/utils/cn";
+import { useTranslation } from "@/i18n/locale-provider";
 
 interface NotificationsCommandProps {
   isVisible: boolean;
@@ -46,6 +47,7 @@ interface NotificationsCommandProps {
 }
 
 export function NotificationsCommand({ isVisible, onClose }: NotificationsCommandProps) {
+  const { t } = useTranslation();
   const notifications = useNotificationsStore.use.notifications();
   const markAllNotificationsRead = useNotificationsStore((state) => state.actions.markAllRead);
   const removeNotification = useNotificationsStore((state) => state.actions.remove);
@@ -107,7 +109,7 @@ export function NotificationsCommand({ isVisible, onClose }: NotificationsComman
     return [
       {
         id: "copy-message",
-        label: "Copy Message",
+        label: t("notifications.copyMessage"),
         icon: <Copy />,
         onClick: () => void copyText(notification.message),
       },
@@ -115,7 +117,7 @@ export function NotificationsCommand({ isVisible, onClose }: NotificationsComman
         ? [
             {
               id: "copy-details",
-              label: "Copy Details",
+              label: t("notifications.copyDetails"),
               icon: <ClipboardText />,
               onClick: () => void copyText(notification.description || ""),
             },
@@ -123,54 +125,54 @@ export function NotificationsCommand({ isVisible, onClose }: NotificationsComman
         : []),
       {
         id: "copy-notification",
-        label: "Copy Notification",
+        label: t("notifications.copyNotification"),
         icon: <ClipboardText />,
         onClick: () => void copyText(formatNotificationText(notification)),
       },
       { id: "sep-delete", label: "", separator: true, onClick: () => {} },
       {
         id: "delete-notification",
-        label: "Delete",
+        label: t("notifications.delete"),
         icon: <Trash />,
         onClick: () => removeNotification(notification.id),
       },
       {
         id: "clear-all",
-        label: "Clear All",
+        label: t("notifications.clearAll"),
         icon: <Trash />,
         onClick: () => clearNotifications(),
       },
     ];
-  }, [clearNotifications, notificationContextMenu.data, removeNotification]);
+  }, [clearNotifications, notificationContextMenu.data, removeNotification, t]);
 
   const panelContextMenuItems = useMemo<MenuItem[]>(
     () => [
       {
         id: "copy-all",
-        label: "Copy All",
+        label: t("notifications.copyAll"),
         icon: <ClipboardText />,
         disabled: notifications.length === 0,
         onClick: () => void copyText(notifications.map(formatNotificationText).join("\n\n---\n\n")),
       },
       {
         id: "clear-all",
-        label: "Clear All",
+        label: t("notifications.clearAll"),
         icon: <Trash />,
         disabled: notifications.length === 0,
         onClick: () => clearNotifications(),
       },
     ],
-    [clearNotifications, notifications],
+    [clearNotifications, notifications, t],
   );
 
   const filterMenuItems = useMemo<MenuItem[]>(
     () =>
       [
-        { id: "all", label: "All", icon: <Funnel />, value: "all" },
-        { id: "info", label: "Info", icon: <Info />, value: "info" },
-        { id: "success", label: "Success", icon: <Check />, value: "success" },
-        { id: "warning", label: "Warnings", icon: <WarningCircle />, value: "warning" },
-        { id: "error", label: "Errors", icon: <XCircle />, value: "error" },
+        { id: "all", label: t("notifications.filterAll"), icon: <Funnel />, value: "all" },
+        { id: "info", label: t("notifications.filterInfo"), icon: <Info />, value: "info" },
+        { id: "success", label: t("notifications.filterSuccess"), icon: <Check />, value: "success" },
+        { id: "warning", label: t("notifications.filterWarnings"), icon: <WarningCircle />, value: "warning" },
+        { id: "error", label: t("notifications.filterErrors"), icon: <XCircle />, value: "error" },
       ].map((item) => ({
         id: item.id,
         label: item.label,
@@ -178,7 +180,7 @@ export function NotificationsCommand({ isVisible, onClose }: NotificationsComman
         onClick: () => setNotificationFilter(item.value as NotificationFilter),
         className: notificationFilter === item.value ? "bg-accent text-foreground" : undefined,
       })),
-    [notificationFilter],
+    [notificationFilter, t],
   );
 
   const filteredNotifications = useMemo(() => {
@@ -326,7 +328,7 @@ export function NotificationsCommand({ isVisible, onClose }: NotificationsComman
 
   return (
     <>
-      <Command isVisible={isVisible} onClose={onClose} title="Notifications">
+      <Command isVisible={isVisible} onClose={onClose} title={t("notifications.title")}>
         <div
           className="flex h-full min-h-0 flex-col"
           onKeyDownCapture={handleNotificationsKeyDown}
@@ -342,7 +344,7 @@ export function NotificationsCommand({ isVisible, onClose }: NotificationsComman
                 ref={searchInputRef}
                 value={searchQuery}
                 onChange={setSearchQuery}
-                placeholder="Search notifications"
+                placeholder={t("notifications.search")}
                 onKeyDown={(event) => {
                   if (event.key === "ArrowDown" && visibleNotifications.length > 0) {
                     event.preventDefault();
@@ -351,12 +353,12 @@ export function NotificationsCommand({ isVisible, onClose }: NotificationsComman
                 }}
               />
             </div>
-            <Tooltip content="Filter Notifications" side="bottom" triggerClassName="size-7">
+            <Tooltip content={t("notifications.filter")} side="bottom" triggerClassName="size-7">
               <CommandHeaderAction
                 ref={filterButtonRef}
                 type="button"
                 active={notificationFilter !== "all"}
-                aria-label="Filter Notifications"
+                aria-label={t("notifications.filter")}
                 onClick={() => setIsFilterMenuOpen(true)}
               >
                 <Funnel />
@@ -364,9 +366,9 @@ export function NotificationsCommand({ isVisible, onClose }: NotificationsComman
             </Tooltip>
           </CommandHeader>
           {notifications.length === 0 ? (
-            <CommandEmpty>No notifications yet.</CommandEmpty>
+            <CommandEmpty>{t("notifications.empty")}</CommandEmpty>
           ) : filteredNotifications.length === 0 ? (
-            <CommandEmpty>No matching notifications.</CommandEmpty>
+            <CommandEmpty>{t("notifications.noMatch")}</CommandEmpty>
           ) : (
             <CommandList>
               <div className="flex min-h-0 flex-1 flex-col gap-1.5">
@@ -410,7 +412,7 @@ export function NotificationsCommand({ isVisible, onClose }: NotificationsComman
                             actions={[
                               {
                                 id: "delete-notification",
-                                label: "Delete Notification",
+                                label: t("notifications.deleteNotification"),
                                 icon: <Trash className="size-3.5" />,
                                 onSelect: () => removeNotification(notification.id),
                                 variant: "danger",
@@ -470,7 +472,7 @@ export function NotificationsCommand({ isVisible, onClose }: NotificationsComman
           setActiveNotification(null);
           setCopiedNotificationId(null);
         }}
-        title="Notification details"
+        title={t("notifications.details")}
       >
         {activeNotification ? (
           <>
@@ -513,7 +515,9 @@ export function NotificationsCommand({ isVisible, onClose }: NotificationsComman
                   onClick={() => void copyActiveNotification(activeNotification)}
                 >
                   <Copy className="size-3.5" />
-                  {copiedNotificationId === activeNotification.id ? "Copied" : "Copy"}
+                  {copiedNotificationId === activeNotification.id
+                    ? t("notifications.copied")
+                    : t("notifications.copy")}
                 </Button>
                 <Button
                   type="button"
@@ -526,7 +530,7 @@ export function NotificationsCommand({ isVisible, onClose }: NotificationsComman
                   }}
                 >
                   <Trash className="size-3.5" />
-                  Delete
+                  {t("notifications.delete")}
                 </Button>
               </div>
             </CommandList>
diff --git a/windows/tauri/src/features/notifications/components/notifications-trigger.tsx b/windows/tauri/src/features/notifications/components/notifications-trigger.tsx
index d53bf5b08..d3ce253ff 100644
--- a/windows/tauri/src/features/notifications/components/notifications-trigger.tsx
+++ b/windows/tauri/src/features/notifications/components/notifications-trigger.tsx
@@ -7,12 +7,14 @@ import { Button } from "@/ui/button";
 import { BellIcon } from "@/ui/icons";
 import Tooltip from "@/ui/tooltip";
 import { cn } from "@/utils/cn";
+import { useTranslation } from "@/i18n/locale-provider";
 
 interface NotificationsTriggerProps {
   className?: string;
 }
 
 export const NotificationsTrigger = ({ className }: NotificationsTriggerProps) => {
+  const { t } = useTranslation();
   const notifications = useNotificationsStore.use.notifications();
   const [isCommandVisible, setIsCommandVisible] = useState(false);
   const shortcut = useCommandShortcut("workbench.showNotifications");
@@ -34,7 +36,7 @@ export const NotificationsTrigger = ({ className }: NotificationsTriggerProps) =
 
   return (
     <>
-      <Tooltip content="Notifications" shortcut={shortcut} side="top">
+      <Tooltip content={t("notifications.title")} shortcut={shortcut} side="top">
         <Button
           onClick={() => {
             window.dispatchEvent(new CustomEvent(OPEN_NOTIFICATIONS_COMMAND_EVENT));
@@ -44,7 +46,7 @@ export const NotificationsTrigger = ({ className }: NotificationsTriggerProps) =
           size="xs"
           active={isCommandVisible}
           className={cn(className, unreadCount > 0 && "w-auto gap-1.5")}
-          aria-label="Notifications"
+          aria-label={t("notifications.title")}
         >
           <BellIcon />
           {unreadCount > 0 && (
diff --git a/windows/tauri/src/features/quick-open/components/empty-state.tsx b/windows/tauri/src/features/quick-open/components/empty-state.tsx
index 76606a1f0..49282f613 100644
--- a/windows/tauri/src/features/quick-open/components/empty-state.tsx
+++ b/windows/tauri/src/features/quick-open/components/empty-state.tsx
@@ -1,4 +1,5 @@
 import { CommandEmpty } from "@/ui/command";
+import { useTranslation } from "@/i18n/locale-provider";
 import { Spinner } from "@/ui/spinner";
 
 interface EmptyStateProps {
@@ -18,29 +19,30 @@ export const EmptyState = ({
   filesLength,
   hasRootFolder,
 }: EmptyStateProps) => {
+  const { t } = useTranslation();
   const getMessage = () => {
     if (!hasRootFolder) {
-      return "Open a folder to start searching files";
+      return t("quickOpen.openFolder");
     }
     if (debouncedQuery) {
-      return "No matching files found";
+      return t("quickOpen.noMatch");
     }
     if (query) {
-      return "Searching...";
+      return t("quickOpen.searching");
     }
     if (filesLength === 0) {
-      return "No files found in project";
+      return t("quickOpen.noFilesInProject");
     }
-    return "No files available";
+    return t("quickOpen.noFiles");
   };
 
   return (
     <CommandEmpty>
       <div className="font-sans text-subtle-foreground">
         {isIndexing ? (
-          <Spinner label="Indexing project files" showLabel compact />
+          <Spinner label={t("quickOpen.indexing")} showLabel compact />
         ) : isLoadingFiles ? (
-          <Spinner label="Loading files" showLabel compact />
+          <Spinner label={t("quickOpen.loadingFiles")} showLabel compact />
         ) : (
           getMessage()
         )}
diff --git a/windows/tauri/src/features/quick-open/components/file-count-badge.tsx b/windows/tauri/src/features/quick-open/components/file-count-badge.tsx
index 86b5ddece..c6b23ed1f 100644
--- a/windows/tauri/src/features/quick-open/components/file-count-badge.tsx
+++ b/windows/tauri/src/features/quick-open/components/file-count-badge.tsx
@@ -1,4 +1,5 @@
 import { CommandHeaderBadge } from "@/ui/command";
+import { useTranslation } from "@/i18n/locale-provider";
 
 interface FileCountBadgeProps {
   totalFiles: number;
@@ -13,11 +14,14 @@ export const FileCountBadge = ({
   hasQuery,
   isLoading,
 }: FileCountBadgeProps) => {
+  const { t } = useTranslation();
   if (isLoading || totalFiles === 0) return null;
 
   const displayText = hasQuery
     ? `${resultCount} / ${totalFiles}`
-    : `${totalFiles} ${totalFiles === 1 ? "file" : "files"}`;
+    : totalFiles === 1
+      ? t("quickOpen.fileCountOne", { count: totalFiles })
+      : t("quickOpen.filesCount", { count: totalFiles });
 
   return <CommandHeaderBadge>{displayText}</CommandHeaderBadge>;
 };
diff --git a/windows/tauri/src/features/quick-open/components/quick-open.tsx b/windows/tauri/src/features/quick-open/components/quick-open.tsx
index 6190c86bb..b76ba86a4 100644
--- a/windows/tauri/src/features/quick-open/components/quick-open.tsx
+++ b/windows/tauri/src/features/quick-open/components/quick-open.tsx
@@ -5,6 +5,7 @@ import Command, {
   CommandInput,
   CommandList,
 } from "@/ui/command";
+import { useTranslation } from "@/i18n/locale-provider";
 import { useQuickOpen } from "../hooks/use-quick-open";
 import { getWorkspaceSymbolKey } from "../hooks/use-workspace-symbol-search";
 import { EmptyState } from "./empty-state";
@@ -13,6 +14,7 @@ import { FileListItem } from "./file-list-item";
 import { SymbolListItem } from "./symbol-list-item";
 
 const QuickOpen = () => {
+  const { t } = useTranslation();
   const {
     isVisible,
     query,
@@ -62,20 +64,24 @@ const QuickOpen = () => {
           onKeyDown={handleInputKeyDown}
           placeholder={
             isSymbolMode
-              ? "Type to filter symbols..."
+              ? t("quickOpen.searchSymbols")
               : isWorkspaceSymbolMode
-                ? "Type to search symbols across the project..."
-                : "Type to search files..."
+                ? t("quickOpen.searchWorkspaceSymbols")
+                : t("quickOpen.searchFiles")
           }
           className="font-sans"
         />
         {isSymbolMode ? (
           <CommandHeaderBadge>
-            {isLoadingSymbols ? "..." : `${symbols.length} symbols`}
+            {isLoadingSymbols
+              ? "..."
+              : t("quickOpen.symbolsCount", { count: symbols.length })}
           </CommandHeaderBadge>
         ) : isWorkspaceSymbolMode ? (
           <CommandHeaderBadge>
-            {isLoadingWorkspaceSymbols ? "..." : `${workspaceSymbols.length} symbols`}
+            {isLoadingWorkspaceSymbols
+              ? "..."
+              : t("quickOpen.symbolsCount", { count: workspaceSymbols.length })}
           </CommandHeaderBadge>
         ) : (
           <FileCountBadge
@@ -91,7 +97,7 @@ const QuickOpen = () => {
         {isSymbolMode ? (
           symbols.length === 0 ? (
             <CommandEmpty>
-              {isLoadingSymbols ? "Loading symbols..." : "No symbols found"}
+              {isLoadingSymbols ? t("quickOpen.loadingSymbols") : t("quickOpen.noSymbols")}
             </CommandEmpty>
           ) : (
             symbols.map((symbol, index) => (
@@ -109,7 +115,9 @@ const QuickOpen = () => {
         ) : isWorkspaceSymbolMode ? (
           workspaceSymbols.length === 0 ? (
             <CommandEmpty>
-              {isLoadingWorkspaceSymbols ? "Loading symbols..." : "No symbols found"}
+              {isLoadingWorkspaceSymbols
+                ? t("quickOpen.loadingSymbols")
+                : t("quickOpen.noSymbols")}
             </CommandEmpty>
           ) : (
             workspaceSymbols.map((symbol, index) => (
diff --git a/windows/tauri/src/features/tabs/components/tab-bar.tsx b/windows/tauri/src/features/tabs/components/tab-bar.tsx
index dc9f93c7d..9c849111f 100644
--- a/windows/tauri/src/features/tabs/components/tab-bar.tsx
+++ b/windows/tauri/src/features/tabs/components/tab-bar.tsx
@@ -25,6 +25,7 @@ import { splitEditorGroup } from "@/features/panes/utils/pane-command-actions";
 import { moveBufferToPaneDropTarget } from "@/features/panes/utils/pane-drop-actions";
 import { findPaneGroup } from "@/features/panes/utils/pane-tree";
 import { useSettingsStore } from "@/features/settings/stores/settings.store";
+import { useTranslation } from "@/i18n/locale-provider";
 import type { PaneContent } from "@/features/panes/types/pane-content.types";
 import { useEditorAppStore } from "@/features/editor/stores/editor-app.store";
 import { getChromeNavigationIndex } from "@/features/layout/utils/chrome-keyboard";
@@ -59,6 +60,7 @@ const TabBar = ({
   onTabClick: externalTabClick,
   disablePaneActions = false,
 }: TabBarProps) => {
+  const { t } = useTranslation();
   // Get everything from stores
   const pendingClose = useBufferStore.use.pendingClose();
   const paneRoot = usePaneStore.use.root();
@@ -321,13 +323,21 @@ const TabBar = ({
         if (dirLabel) return dirLabel;
       }
 
+      if (buffer.type === "globalSearch") {
+        return t("workbench.search");
+      }
+
+      if (buffer.type === "diagnostics") {
+        return t("workbench.diagnostics");
+      }
+
       if (buffer.type === "diff") {
         return formatDiffBufferLabel(displayNames.get(buffer.id) || buffer.name, buffer.path);
       }
 
       return displayNames.get(buffer.id) ?? buffer.name;
     },
-    [displayNames, getCommandLabel, getDirectoryLabel, isUsefulTerminalTitle, terminalSessions],
+    [displayNames, getCommandLabel, getDirectoryLabel, isUsefulTerminalTitle, t, terminalSessions],
   );
 
   useEffect(() => {
diff --git a/windows/tauri/src/features/tabs/components/tab-context-menu.tsx b/windows/tauri/src/features/tabs/components/tab-context-menu.tsx
index 9b8f22c2e..e6e255813 100644
--- a/windows/tauri/src/features/tabs/components/tab-context-menu.tsx
+++ b/windows/tauri/src/features/tabs/components/tab-context-menu.tsx
@@ -25,6 +25,7 @@ import type { MenuItem } from "@/ui/dropdown";
 import { writeClipboardText } from "@/utils/clipboard";
 import { getBaseName, getDirName } from "@/utils/path-helpers";
 import Keybinding from "@/features/keymaps/components/keybinding";
+import { useTranslation } from "@/i18n/locale-provider";
 import { IS_MAC } from "@/utils/platform";
 
 interface TabContextMenuProps {
@@ -64,11 +65,12 @@ const TabContextMenu = ({
   isPaneLocked = false,
   onTogglePaneLocked,
 }: TabContextMenuProps) => {
+  const { t } = useTranslation();
   const closeKeys = [IS_MAC ? "Cmd" : "Ctrl", "W"];
   const items: MenuItem[] = [
     {
       id: "pin",
-      label: buffer.isPinned ? "Unpin Tab" : "Pin Tab",
+      label: buffer.isPinned ? t("tabs.unpin") : t("tabs.pin"),
       icon: buffer.isPinned ? <PinOff /> : <Pin />,
       onClick: () => onPin(buffer.id),
     },
@@ -76,7 +78,7 @@ const TabContextMenu = ({
       ? [
           {
             id: "rename-terminal",
-            label: "Rename",
+            label: t("files.rename"),
             icon: <PencilSimpleLine />,
             onClick: () => onRename?.(buffer.id),
           },
@@ -87,7 +89,7 @@ const TabContextMenu = ({
       ? [
           {
             id: "split-right",
-            label: "Split Right",
+            label: t("tabs.splitRight"),
             icon: <Columns2 />,
             onClick: () => onSplitRight(paneId, buffer.id),
           },
@@ -97,7 +99,7 @@ const TabContextMenu = ({
       ? [
           {
             id: "split-down",
-            label: "Split Down",
+            label: t("tabs.splitDown"),
             icon: <Rows2 />,
             onClick: () => onSplitDown(paneId, buffer.id),
           },
@@ -110,7 +112,7 @@ const TabContextMenu = ({
       ? [
           {
             id: "toggle-editor-group-lock",
-            label: isPaneLocked ? "Unlock Editor Group" : "Lock Editor Group",
+            label: isPaneLocked ? t("tabs.unlockEditorGroup") : t("tabs.lockEditorGroup"),
             icon: isPaneLocked ? <LockOpen /> : <Lock />,
             onClick: onTogglePaneLocked,
           },
@@ -119,7 +121,7 @@ const TabContextMenu = ({
       : []),
     {
       id: "copy-path",
-      label: "Copy Path",
+      label: t("files.copyPath"),
       icon: <Copy />,
       onClick: async () => {
         if (onCopyPath) {
@@ -136,13 +138,13 @@ const TabContextMenu = ({
     },
     {
       id: "copy-relative-path",
-      label: "Copy Relative Path",
+      label: t("files.copyRelativePath"),
       icon: <Copy />,
       onClick: () => onCopyRelativePath?.(buffer.path),
     },
     {
       id: "reveal",
-      label: "Reveal in Finder",
+      label: t("files.reveal"),
       icon: <FolderOpen />,
       onClick: () => onRevealInFinder?.(buffer.path),
     },
@@ -150,7 +152,7 @@ const TabContextMenu = ({
       ? [
           {
             id: "terminal",
-            label: "Open in Terminal",
+            label: t("files.openInTerminal"),
             icon: <Terminal />,
             onClick: () => {
               const dirPath = getDirName(buffer.path);
@@ -168,7 +170,7 @@ const TabContextMenu = ({
       ? [
           {
             id: "reload",
-            label: "Reload",
+            label: t("tabs.reload"),
             icon: <RotateCcw />,
             onClick: () => onReload?.(buffer.id),
           },
@@ -177,24 +179,24 @@ const TabContextMenu = ({
     { id: "sep-3", label: "", separator: true, onClick: () => {} },
     {
       id: "close",
-      label: "Close",
+      label: t("tabs.close"),
       icon: <X />,
       keybinding: <Keybinding keys={closeKeys} className="opacity-60" />,
       onClick: () => onCloseTab(buffer.id),
     },
     {
       id: "close-others",
-      label: "Close Others",
+      label: t("tabs.closeOthers"),
       onClick: () => onCloseOthers(buffer.id),
     },
     {
       id: "close-right",
-      label: "Close to Right",
+      label: t("tabs.closeToRight"),
       onClick: () => onCloseToRight(buffer.id),
     },
     {
       id: "close-all",
-      label: "Close All",
+      label: t("tabs.closeAll"),
       onClick: onCloseAll,
     },
   ];
diff --git a/windows/tauri/src/features/window/components/new-project-content.tsx b/windows/tauri/src/features/window/components/new-project-content.tsx
index ef9498e42..7d3e31836 100644
--- a/windows/tauri/src/features/window/components/new-project-content.tsx
+++ b/windows/tauri/src/features/window/components/new-project-content.tsx
@@ -42,6 +42,7 @@ import {
   type NewProjectSource,
   type ProjectPackageManager,
 } from "../lib/new-project-model";
+import { useTranslation } from "@/i18n/locale-provider";
 
 interface NewProjectContentProps {
   onBack: () => void;
@@ -57,54 +58,14 @@ interface ProjectSourceOption {
   keywords: string[];
 }
 
-const projectSourceOptions: ProjectSourceOption[] = [
-  {
-    id: "empty",
-    label: "Empty Project",
-    description: "Create a clean folder and start from scratch.",
-    badge: "Built-in",
-    icon: FolderPlus,
-    keywords: ["blank", "folder", "local"],
-  },
-  {
-    id: "nextjs",
-    label: "Next.js",
-    description: "App Router, TypeScript, Tailwind CSS, ESLint, and a src directory.",
-    badge: "Web app",
-    icon: RocketLaunch,
-    keywords: ["react", "typescript", "tailwind", "frontend"],
-  },
-  {
-    id: "vite-react",
-    label: "Vite + React",
-    description: "A lightweight React and TypeScript starter.",
-    badge: "Web app",
-    icon: Code,
-    keywords: ["react", "typescript", "frontend"],
-  },
-  {
-    id: "clone",
-    label: "Clone Repository",
-    description: "Clone an existing Git repository into a new local project.",
-    badge: "Git",
-    icon: GitBranch,
-    keywords: ["github", "gitlab", "remote", "repository"],
-  },
-];
-
 const packageManagerOptions = [
   { value: "npm", label: "npm" },
   { value: "pnpm", label: "pnpm" },
   { value: "bun", label: "Bun" },
 ];
 
-function getCreationLabel(source: NewProjectSource) {
-  if (source === "clone") return "Clone Repository";
-  if (source === "empty") return "Create Project";
-  return "Create & Install";
-}
-
 export default function NewProjectContent({ onBack, onClose }: NewProjectContentProps) {
+  const { t } = useTranslation();
   const nameInputRef = useRef<HTMLInputElement>(null);
   const repositoryInputRef = useRef<HTMLInputElement>(null);
   const [step, setStep] = useState<"source" | "details" | "creating">("source");
@@ -118,6 +79,49 @@ export default function NewProjectContent({ onBack, onClose }: NewProjectContent
   const [nameWasEdited, setNameWasEdited] = useState(false);
   const [errorMessage, setErrorMessage] = useState("");
   const handleOpenFolderByPath = useFileSystemStore((state) => state.handleOpenFolderByPath);
+  const projectSourceOptions = useMemo<ProjectSourceOption[]>(
+    () => [
+      {
+        id: "empty",
+        label: t("welcome.emptyProject"),
+        description: t("welcome.emptyProjectDescription"),
+        badge: t("welcome.builtIn"),
+        icon: FolderPlus,
+        keywords: ["blank", "folder", "local", "empty"],
+      },
+      {
+        id: "nextjs",
+        label: "Next.js",
+        description: t("welcome.nextjsDescription"),
+        badge: t("welcome.webApp"),
+        icon: RocketLaunch,
+        keywords: ["react", "typescript", "tailwind", "frontend"],
+      },
+      {
+        id: "vite-react",
+        label: "Vite + React",
+        description: t("welcome.viteReactDescription"),
+        badge: t("welcome.webApp"),
+        icon: Code,
+        keywords: ["react", "typescript", "frontend"],
+      },
+      {
+        id: "clone",
+        label: t("welcome.cloneRepository"),
+        description: t("welcome.cloneRepositoryDescription"),
+        badge: t("welcome.gitBadge"),
+        icon: GitBranch,
+        keywords: ["github", "gitlab", "remote", "repository", "clone"],
+      },
+    ],
+    [t],
+  );
+
+  const getCreationLabel = (nextSource: NewProjectSource) => {
+    if (nextSource === "clone") return t("welcome.cloneRepository");
+    if (nextSource === "empty") return t("welcome.emptyProject");
+    return t("welcome.newProject");
+  };
 
   useEffect(() => {
     void homeDir()
@@ -145,7 +149,7 @@ export default function NewProjectContent({ onBack, onClose }: NewProjectContent
         value.toLowerCase().includes(normalizedQuery),
       ),
     );
-  }, [query]);
+  }, [projectSourceOptions, query]);
 
   useEffect(() => {
     setSelectedIndex(0);
@@ -269,20 +273,20 @@ export default function NewProjectContent({ onBack, onClose }: NewProjectContent
     return (
       <>
         <CommandHeader onClose={onClose}>
-          <CommandHeaderAction type="button" aria-label="Back to projects" onClick={onBack}>
+          <CommandHeaderAction type="button" aria-label={t("welcome.backToProjects")} onClick={onBack}>
             <ArrowLeft />
           </CommandHeaderAction>
           <CommandInput
             value={query}
             onChange={setQuery}
             onKeyDown={handleSourceKeyDown}
-            placeholder="Choose how to start..."
+            placeholder={t("welcome.chooseHowToStart")}
           />
         </CommandHeader>
 
         <CommandList>
           {filteredSourceOptions.length === 0 ? (
-            <CommandEmpty>No project starters match "{query}".</CommandEmpty>
+            <CommandEmpty>{t("welcome.noStarters", { query })}</CommandEmpty>
           ) : (
             filteredSourceOptions.map((option, index) => {
               const SourceIcon = option.icon;
diff --git a/windows/tauri/src/features/window/components/project-picker.tsx b/windows/tauri/src/features/window/components/project-picker.tsx
index bb5479ba7..8cd73791f 100644
--- a/windows/tauri/src/features/window/components/project-picker.tsx
+++ b/windows/tauri/src/features/window/components/project-picker.tsx
@@ -19,6 +19,7 @@ import { useWorkspaceTabsStore } from "@/features/window/stores/workspace-tabs.s
 import { memo, type KeyboardEvent, useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useRecentFoldersStore } from "@/features/file-system/stores/recent-folders.store";
 import { useFileSystemStore } from "@/features/file-system/stores/file-system.store";
+import { useTranslation } from "@/i18n/locale-provider";
 import type { RecentFolder } from "@/features/file-system/types/recent-folders.types";
 import { showPromptDialog } from "@/ui/dialog";
 import ConnectionForm from "@/features/remote/components/connection-form";
@@ -70,6 +71,7 @@ const createRemoteConnectionFormData = (): RemoteConnectionFormData => ({
 });
 
 const ProjectPicker = memo(({ isOpen, onClose }: ProjectPickerProps) => {
+  const { t } = useTranslation();
   const inputRef = useRef<HTMLInputElement>(null);
   const remoteNameInputRef = useRef<HTMLInputElement>(null);
   const [connections, setConnections] = useState<RemoteConnection[]>([]);
@@ -423,11 +425,11 @@ const ProjectPicker = memo(({ isOpen, onClose }: ProjectPickerProps) => {
         isVisible={isOpen}
         onClose={onClose}
         title={
-          commandStep === "addRemote"
-            ? "New Remote Connection"
-            : commandStep === "newProject"
-              ? "New Project"
-              : "Open Project"
+            commandStep === "addRemote"
+              ? t("welcome.newRemoteConnection")
+              : commandStep === "newProject"
+                ? t("welcome.newProject")
+                : t("welcome.openProject")
         }
         autoFocus={commandStep === "picker"}
       >
@@ -441,18 +443,18 @@ const ProjectPicker = memo(({ isOpen, onClose }: ProjectPickerProps) => {
               value={query}
               onChange={setQuery}
               onKeyDown={handleCommandKeyDown}
-              placeholder="Open project or remote connection"
+              placeholder={t("welcome.openProjectOrRemote")}
             />
           </CommandHeader>
         ) : (
           <CommandHeader onClose={onClose}>
-            <CommandHeaderAction aria-label="Back to projects" onClick={handleBackToPicker}>
+            <CommandHeaderAction aria-label={t("welcome.backToProjects")} onClick={handleBackToPicker}>
               <ArrowLeft />
             </CommandHeaderAction>
             <div className="flex min-w-0 flex-1 items-center gap-2">
               <Server className="shrink-0 text-subtle-foreground" />
               <span className="min-w-0 truncate font-sans ui-text-base font-medium text-foreground">
-                New Remote Connection
+                {t("welcome.newRemoteConnection")}
               </span>
             </div>
           </CommandHeader>
@@ -504,8 +506,8 @@ const ProjectPicker = memo(({ isOpen, onClose }: ProjectPickerProps) => {
                             event.stopPropagation();
                             handleRemoveRecentFolder(folder);
                           }}
-                          tooltip="Remove from recent projects"
-                          aria-label={`Remove ${folder.name} from recent projects`}
+                          tooltip={t("welcome.removeRecent", { name: folder.name })}
+                          aria-label={t("welcome.removeRecent", { name: folder.name })}
                         >
                           <X />
                         </CommandItemAction>
@@ -601,7 +603,7 @@ const ProjectPicker = memo(({ isOpen, onClose }: ProjectPickerProps) => {
             filteredConnections.length === 0 &&
             filteredWslDistributions.length === 0 ? (
               <CommandEmpty>
-                {normalizedQuery ? `No projects match "${query}".` : "No recent projects"}
+                {normalizedQuery ? `No projects match "${query}".` : t("welcome.noRecentProjects")}
               </CommandEmpty>
             ) : null}
           </CommandList>
@@ -630,21 +632,23 @@ const ProjectPicker = memo(({ isOpen, onClose }: ProjectPickerProps) => {
           <CommandFooter>
             <CommandFooterAction onClick={() => void handleOpenFolderClick()}>
               <FolderOpen />
-              Open Folder
+              {t("welcome.openFolder")}
             </CommandFooterAction>
             <CommandFooterAction onClick={handleNewProjectClick}>
               <Plus />
-              New Project
+              {t("welcome.newProject")}
             </CommandFooterAction>
             <CommandFooterAction
               onClick={handleAddRemoteConnectionClick}
               disabled={!isBackendCapabilityAvailable("remote")}
               tooltip={
-                isBackendCapabilityAvailable("remote") ? "Add Remote" : BACKEND_UNAVAILABLE_TOOLTIP
+                isBackendCapabilityAvailable("remote")
+                  ? t("welcome.addRemote")
+                  : BACKEND_UNAVAILABLE_TOOLTIP
               }
             >
               <Plus />
-              Add Remote
+              {t("welcome.addRemote")}
             </CommandFooterAction>
             {missingRecentFolderCount > 0 ? (
               <CommandFooterAction onClick={handleRemoveMissingRecentFolders}>
diff --git a/windows/tauri/src/i18n/locale.test.ts b/windows/tauri/src/i18n/locale.test.ts
index be4fc5427..6110a251c 100644
--- a/windows/tauri/src/i18n/locale.test.ts
+++ b/windows/tauri/src/i18n/locale.test.ts
@@ -6,13 +6,83 @@ describe("Windows display language", () => {
   test("uses Simplified Chinese strings and falls back to English", () => {
     const translate = createTranslator("zh-CN");
 
-    expect(translate("workbench.project")).toBe("项目");
-    expect(translate("workbench.run")).toBe("运行");
+    expect(translate("workbench.terminal")).toBe("终端");
+    expect(translate("footer.spaces", { count: 4 })).toBe("4 个空格");
+    expect(translate("footer.memoryUsage", { total: "213.7 MB", used: "213.7 MB" })).toBe(
+      "总计 213.7 MB · Lithe 213.7 MB",
+    );
+    expect(createTranslator("en-US")("footer.memoryUsage", { total: "213.7 MB", used: "131.2 MB" })).toBe(
+      "Total 213.7 MB · Lithe 131.2 MB",
+    );
+    expect(translate("notifications.search")).toBe("搜索通知");
+    expect(translate("notifications.empty")).toBe("暂无通知。");
+    expect(createTranslator("en-US")("notifications.search")).toBe("Search notifications");
+    expect(translate("workbench.changes")).toBe("更改");
+    expect(translate("footer.changes", { count: 5 })).toBe("5 个更改");
+    expect(translate("git.commit")).toBe("提交");
+    expect(translate("git.commitMessagePlaceholder")).toBe("提交说明...");
+    expect(translate("git.filesStaged", { count: 42 })).toBe("已暂存 42 个文件");
+    expect(createTranslator("en-US")("workbench.search")).toBe("Search");
+    expect(translate("search.emptyTitle")).toBe("在项目中搜索");
+    expect(createTranslator("en-US")("search.emptyTitle")).toBe("Search across your project");
+    expect(translate("search.emptyDescription")).toBe(
+      "输入关键词，即可在整个项目中查找匹配的文件和代码行。",
+    );
+    expect(createTranslator("en-US")("workbench.sourceControl")).toBe("Source Control");
+    expect(translate("workbench.gitLog")).toBe("提交记录");
+    expect(translate("git.branches")).toBe("分支");
+    expect(translate("git.searchBranches")).toBe("搜索分支...");
+    expect(translate("git.newBranch")).toBe("新建分支");
+    expect(translate("git.log.openDiff")).toBe("打开差异");
+    expect(translate("git.log.headCurrentBranch")).toBe("HEAD（当前分支）");
     expect(translate("run.identifyAndGenerate")).toBe("识别并生成");
     expect(createTranslator("en-US")("workbench.run")).toBe("Run");
     expect(translate("welcome.openProject")).toBe("打开项目");
+    expect(translate("workbench.diagnostics")).toBe("诊断");
+    expect(translate("diagnostics.empty")).toBe("未检测到问题");
+    expect(translate("diagnostics.search")).toBe("搜索问题");
+    expect(translate("diagnostics.groupByFile")).toBe("分组：文件");
+    expect(translate("diagnostics.problemCount", { count: 0 })).toBe("0 个问题");
+    expect(translate("files.open")).toBe("打开");
+    expect(translate("files.copyContent")).toBe("复制内容");
+    expect(translate("files.reveal")).toBe("在资源管理器中显示");
+    expect(createTranslator("en-US")("files.reveal")).toBe("Reveal in File Explorer");
+    expect(translate("quickOpen.searchFiles")).toBe("输入以搜索文件...");
+    expect(translate("quickOpen.filesCount", { count: 66 })).toBe("66 个文件");
+    expect(translate("tabs.pin")).toBe("固定标签页");
+    expect(translate("tabs.closeOthers")).toBe("关闭其他");
+    expect(translate("editor.aiInlineEdit")).toBe("AI 行内编辑");
+    expect(translate("editor.findInFile")).toBe("在文件中查找");
+    expect(translate("lsp.noActive")).toBe("没有活动的语言服务器");
+    expect(translate("editor.goToDefinition")).toBe("转到定义");
+    expect(translate("git.historySearch")).toBe("搜索历史");
+    expect(translate("git.historyFilterAll")).toBe("全部字段");
+    expect(translate("git.push")).toBe("推送");
+    expect(translate("git.selectRepository")).toBe("选择仓库");
+    expect(translate("git.stashAllUnstaged")).toBe("贮藏全部未暂存");
+    expect(translate("git.unstaged")).toBe("未暂存");
+    expect(translate("git.diff.search")).toBe("搜索差异");
+    expect(translate("git.searchStashes")).toBe("搜索贮藏...");
+    expect(translate("git.stashesCount", { count: 0 })).toBe("0 个贮藏");
+    expect(translate("git.noStashes")).toBe("暂无贮藏");
+    expect(translate("git.compareBranchPlaceholder")).toBe("将当前分支与...比较");
+    expect(translate("git.noOtherBranches")).toBe("没有其他分支");
+    expect(translate("git.searchCommits")).toBe("搜索提交...");
+    expect(translate("git.commitCount", { count: 1 })).toBe("1 个提交");
+    expect(translate("git.generateCommitMessageWithAI")).toBe("使用 AI 生成提交说明");
+    expect(translate("git.commitMessageTitleOnly")).toBe("仅标题");
+    expect(translate("git.commitMessageTitleAndBody")).toBe("标题 + 正文");
+    expect(translate("welcome.chooseHowToStart")).toBe("选择如何开始...");
+    expect(translate("welcome.openFolder")).toBe("打开文件夹");
     expect(translate("missing.key")).toBe("missing.key");
     expect(getLocaleCatalog("en-US")).toHaveProperty(["settings.displayLanguage"]);
     expect(defaultSettings.displayLanguage).toBe("en-US");
   });
+
+  test("keeps English and Simplified Chinese catalogs aligned", () => {
+    const englishKeys = Object.keys(getLocaleCatalog("en-US")).sort();
+    const chineseKeys = Object.keys(getLocaleCatalog("zh-CN")).sort();
+
+    expect(chineseKeys).toEqual(englishKeys);
+  });
 });
diff --git a/windows/tauri/src/i18n/locale.ts b/windows/tauri/src/i18n/locale.ts
index a877aac29..c43d77057 100644
--- a/windows/tauri/src/i18n/locale.ts
+++ b/windows/tauri/src/i18n/locale.ts
@@ -7,9 +7,35 @@ const catalogs = {
     "workbench.project": "Project",
     "workbench.changes": "Changes",
     "workbench.search": "Search",
+    "workbench.searchInFiles": "Search in files...",
+    "search.emptyTitle": "Search across your project",
+    "search.emptyDescription":
+      "Type a query to see matching files and lines in a project-wide result buffer.",
+    "search.openProjectTitle": "Open a project to search",
+    "search.openProjectDescription": "Global search needs an open project folder.",
+    "search.unsupported": "Global search is not available for this workspace type.",
+    "search.failed": "Search failed",
+    "search.retry": "Try again",
+    "search.noResults": "No results found",
+    "search.noResultsFor": "No results found for \"{query}\"",
+    "search.noResultsForWithFilters":
+      "No results found for \"{query}\" with the current file filters",
+    "search.matchCase": "Match case",
+    "search.matchWholeWord": "Match whole word",
+    "search.useRegex": "Use regular expression",
+    "search.hideDetails": "Hide details",
+    "search.showDetails": "Show details",
+    "search.clear": "Clear search",
+    "search.options": "Search options",
+    "search.filesToInclude": "Files to include",
+    "search.filesToExclude": "Files to exclude",
+    "workbench.sourceControl": "Source Control",
+    "workbench.gitLog": "Git Log",
     "workbench.database": "Database",
     "workbench.settings": "Settings",
     "workbench.run": "Run",
+    "workbench.terminal": "Terminal",
+    "workbench.diagnostics": "Diagnostics",
     "run.title": "Run",
     "run.run": "Run configuration",
     "run.stop": "Stop run",
@@ -618,14 +644,451 @@ const catalogs = {
       "The last used commands appear at the top of the command palette",
     "settings.common.json": "JSON",
     "settings.common.allFiles": "All Files",
+    "git.history": "History",
+    "git.fetch": "Fetch",
+    "git.viewDiff": "View Diff",
+    "git.tracked": "Tracked",
+    "git.untracked": "Untracked",
+    "git.commitMessagePlaceholder": "Commit message...",
+    "git.generateCommitMessageWithAI": "Generate commit message with AI",
+    "git.commitMessageTitleOnly": "Title only",
+    "git.commitMessageTitleAndBody": "Title + body",
+    "git.commitMessageFormat": "Commit message format",
+    "git.filesStaged": "{count} files staged",
+    "git.fileStaged": "{count} file staged",
+    "git.noFilesStaged": "No files staged",
+    "git.commit": "Commit",
+    "git.committing": "Committing...",
+    "git.repositories": "Repositories",
+    "git.branches": "Branches",
+    "git.worktrees": "Worktrees",
+    "git.searchBranches": "Search branches...",
+    "git.searchWorktrees": "Search worktrees...",
+    "git.filterRepositories": "Filter repositories...",
+    "git.branchCount": "{count} branch",
+    "git.branchesCount": "{count} branches",
+    "git.worktreeCount": "{count} worktree",
+    "git.worktreesCount": "{count} worktrees",
+    "git.repositoryCount": "{count} repository",
+    "git.repositoriesCount": "{count} repositories",
+    "git.selectorSections": "Git selector sections",
+    "git.searchBranchesAria": "Search branches",
+    "git.noMatchingBranches": "No matching branches",
+    "git.searchStashes": "Search stashes...",
+    "git.stashCount": "{count} stash",
+    "git.stashesCount": "{count} stashes",
+    "git.noStashes": "No stashes",
+    "git.noMatchingStashes": "No matching stashes",
+    "git.compareBranchPlaceholder": "Compare current branch with...",
+    "git.noOtherBranches": "No other branches",
+    "git.compareWithBranch": "compare with {branch}",
+    "git.searchCommits": "Search commits...",
+    "git.commitCount": "{count} commit",
+    "git.commitsCount": "{count} commits",
+    "git.noCommits": "No commits",
+    "git.noMatchingCommits": "No matching commits",
+    "git.noBranchesFound": "No branches found",
+    "git.createNewBranch": "Create new branch \"{name}\"",
+    "git.loadingWorktrees": "Loading worktrees...",
+    "git.noMatchingWorktrees": "No matching worktrees",
+    "git.noWorktreesFound": "No worktrees found",
+    "git.createWorktree": "Create worktree \"{path}\"",
+    "git.detectingRepositories": "Detecting repositories...",
+    "git.noMatchingRepositories": "No matching repositories",
+    "git.noRepositoriesFound": "No repositories found",
+    "git.newBranch": "New Branch",
+    "git.refresh": "Refresh",
+    "git.add": "Add",
+    "git.adding": "Adding...",
+    "git.clearAdded": "Clear Added",
+    "git.current": "current",
+    "git.added": "added",
+    "git.detachedHead": "Detached HEAD",
+    "git.noBranch": "No branch",
+    "git.branchActions": "Branch actions for {branch}",
+    "git.mergeIntoCurrent": "Merge into Current Branch",
+    "git.rebaseOntoThis": "Rebase Current Branch onto This",
+    "git.deleteBranch": "Delete Branch",
+    "git.delete": "Delete",
+    "git.deleteBranchConfirm": "Are you sure you want to delete branch \"{branch}\"?",
+    "git.stashChanges": "Stash Changes",
+    "git.stashAndSwitchSuccess": "Changes stashed and branch switched successfully",
+    "git.stashAndSwitchFailed": "Failed to switch branch after stashing",
+    "git.stashFailed": "Failed to stash changes",
+    "git.switchingTo": "Switching to {branch}",
+    "git.mergeSuccess": "Merged {branch} successfully.",
+    "git.conflictedFile":
+      "Stopped with {count} conflicted file. Resolve them in the changes list, then continue.",
+    "git.conflictedFiles":
+      "Stopped with {count} conflicted files. Resolve them in the changes list, then continue.",
+    "git.stoppedBeforeCompletion":
+      "{branch} stopped before completion. Continue, skip, or abort from the changes list.",
+    "git.uncommittedWouldOverwrite":
+      "Uncommitted changes would be overwritten: {listed}{more}. Stash or commit them first.",
+    "git.moreFiles": " (+{count} more)",
+    "git.merge": "Merge",
+    "git.rebase": "Rebase",
+    "git.mergeBranchTitle": "Merge Branch",
+    "git.rebaseBranchTitle": "Rebase Branch",
+    "git.mergeConfirm":
+      "Merge branch \"{branch}\" into \"{current}\"? Conflicts may require resolution.",
+    "git.rebaseConfirm":
+      "Rebase \"{current}\" onto \"{branch}\"? Conflicts may require resolution.",
+    "git.mergeFailed": "Merge failed.",
+    "git.rebaseFailed": "Rebase failed.",
+    "git.selectedFolderNotRepo": "Selected folder is not inside a Git repository.",
+    "git.failedToSelectRepository": "Failed to select repository.",
+    "git.log.all": "All",
+    "git.log.logLabel": "Log: {name}",
+    "git.log.showAll": "Show all references",
+    "git.log.refresh": "Refresh Git log",
+    "git.log.hide": "Hide Git Log",
+    "git.log.openDiff": "Open Diff",
+    "git.log.compareWithHead": "Compare with HEAD",
+    "git.log.copyHash": "Copy Hash",
+    "git.log.unableToRefresh": "Unable to refresh Git log.",
+    "git.log.retry": "Retry",
+    "git.log.noRepository": "No repository open",
+    "git.log.openWorkspace": "Open a Git workspace to view its log.",
+    "git.log.loading": "Loading Git log…",
+    "git.log.unableToLoad": "Unable to load Git log.",
+    "git.log.tryAgain": "Try again",
+    "git.log.copied": "{label} copied",
+    "git.log.copyFailed": "Unable to copy {label}",
+    "git.log.commitHash": "Commit hash",
+    "git.log.commitMessage": "Commit message",
+    "git.log.references": "References",
+    "git.log.headCurrentBranch": "HEAD (Current Branch)",
+    "git.log.local": "Local",
+    "git.log.remote": "Remote",
+    "git.log.tags": "Tags",
+    "git.log.none": "None",
+    "git.log.expand": "Expand {name}",
+    "git.log.collapse": "Collapse {name}",
+    "git.log.filter": "Filter Git log",
+    "git.log.clearFilter": "Clear Git log filter",
+    "git.log.filterField": "Git log filter field",
+    "git.log.filterText": "Text",
+    "git.log.filterAuthor": "Author",
+    "git.log.filterBranch": "Branch",
+    "git.log.filterPlaceholder": "{field} filter",
+    "git.log.hideDecorations": "Hide branch and tag labels",
+    "git.log.showDecorations": "Show branch and tag labels",
+    "git.log.commit": "Commit",
+    "git.log.author": "Author",
+    "git.log.date": "Date",
+    "git.log.noMatch": "No commits match this filter",
+    "git.log.noCommits": "No commits in this view",
+    "git.log.openDiffHint": "Double-click or press Enter to open commit diff",
+    "git.log.openCommitDiff": "Open Commit Diff",
+    "git.log.copyCommitHash": "Copy Commit Hash",
+    "git.log.copyCommitMessage": "Copy Commit Message",
+    "git.log.loadingCommits": "Loading commits…",
+    "git.log.loadMore": "Load more commits",
+    "git.log.commitFiles": "Commit files",
+    "git.log.filesCount": "{count} files",
+    "git.log.selectCommit": "Select a commit",
+    "git.log.loadingChangedFiles": "Loading changed files…",
+    "git.log.unableToLoadFiles": "Unable to load changed files",
+    "git.log.noChangedFiles": "No changed files",
+    "git.log.commitDetails": "Commit details",
+    "git.log.loadingShort": "Loading…",
+    "git.log.openFileDiff": "Double-click to open file diff",
+    "footer.cursor": "Go to line and column",
+    "footer.encoding": "File encoding",
+    "footer.indent": "Indentation",
+    "footer.spaces": "{count} spaces",
+    "footer.readOnly": "Read-only",
+    "footer.writable": "Writable",
+    "footer.memory": "Memory",
+    "footer.memoryUsage": "Total {total} · Lithe {used}",
+    "footer.changes": "{count} changes",
+    "footer.change": "{count} change",
+    "footer.noChanges": "No changes",
+    "notifications.title": "Notifications",
+    "notifications.search": "Search notifications",
+    "notifications.empty": "No notifications yet.",
+    "notifications.noMatch": "No matching notifications.",
+    "notifications.filter": "Filter Notifications",
+    "notifications.filterAll": "All",
+    "notifications.filterInfo": "Info",
+    "notifications.filterSuccess": "Success",
+    "notifications.filterWarnings": "Warnings",
+    "notifications.filterErrors": "Errors",
+    "notifications.copyMessage": "Copy Message",
+    "notifications.copyDetails": "Copy Details",
+    "notifications.copyNotification": "Copy Notification",
+    "notifications.delete": "Delete",
+    "notifications.clearAll": "Clear All",
+    "notifications.copyAll": "Copy All",
+    "notifications.deleteNotification": "Delete Notification",
+    "notifications.details": "Notification details",
+    "notifications.copy": "Copy",
+    "notifications.copied": "Copied",
+    "diagnostics.problemCount": "{count} problems",
+    "diagnostics.problemCountOne": "{count} problem",
+    "diagnostics.empty": "No problems detected",
+    "diagnostics.noMatch": "No problems match the current filters",
+    "diagnostics.resetFilters": "Reset filters",
+    "diagnostics.search": "Search problems",
+    "diagnostics.filter": "Filter problems",
+    "diagnostics.groupByFile": "Group by: File",
+    "diagnostics.groupBySeverity": "Group by: Severity",
+    "diagnostics.groupByNone": "Group by: None",
+    "diagnostics.sortBySeverity": "Sort by: Severity",
+    "diagnostics.sortByFile": "Sort by: File",
+    "diagnostics.sortByPosition": "Sort by: Position",
+    "diagnostics.severityCount": "{label} ({visible}/{total})",
+    "diagnostics.errors": "Errors",
+    "diagnostics.warnings": "Warnings",
+    "diagnostics.info": "Info",
+    "diagnostics.onlyCurrentFile": "Only Current File",
+    "diagnostics.clearSourceFilter": "Clear Source Filter ({source})",
+    "diagnostics.clearSourceFilterSimple": "Clear Source Filter",
+    "diagnostics.resetAllFilters": "Reset All Filters",
+    "diagnostics.hideFiles": "Hide files",
+    "diagnostics.showFiles": "Show files",
+    "diagnostics.closePane": "Close problems pane",
+    "diagnostics.filesAria": "Diagnostic files",
+    "diagnostics.all": "All Diagnostics",
+    "diagnostics.fullWidth": "Full Width",
+    "diagnostics.editorWidth": "Editor Width",
+    "diagnostics.fullScreen": "Full Screen",
+    "diagnostics.exitFullScreen": "Exit Full Screen",
+    "diagnostics.goToProblem": "Go to Problem",
+    "diagnostics.copyMessage": "Copy Message",
+    "diagnostics.copyLocation": "Copy Location",
+    "diagnostics.copyDetails": "Copy Full Details",
+    "diagnostics.filterBySource": "Filter by Source: {source}",
+    "diagnostics.enableWrap": "Enable Message Wrap",
+    "diagnostics.disableWrap": "Disable Message Wrap",
+    "diagnostics.loadingFixes": "Loading quick fixes...",
+    "diagnostics.noFixes": "No quick fixes available",
+    "diagnostics.messageCopied": "Diagnostic message copied",
+    "diagnostics.locationCopied": "Diagnostic location copied",
+    "diagnostics.detailsCopied": "Diagnostic details copied",
+    "files.open": "Open",
+    "files.copyContent": "Copy Content",
+    "files.duplicate": "Duplicate",
+    "files.localHistory": "Local History",
+    "files.properties": "Properties",
+    "files.copyPath": "Copy Path",
+    "files.copyRelativePath": "Copy Relative Path",
+    "files.copy": "Copy",
+    "files.cut": "Cut",
+    "files.paste": "Paste",
+    "files.rename": "Rename",
+    "files.reveal": "Reveal in File Explorer",
+    "files.delete": "Delete",
+    "files.newFile": "New File",
+    "files.newFolder": "New Folder",
+    "files.uploadFiles": "Upload Files",
+    "files.refresh": "Refresh",
+    "files.addFolderToWorkspace": "Add Folder to Workspace",
+    "files.removeFolderFromWorkspace": "Remove Folder from Workspace",
+    "files.openAllFiles": "Open All Files",
+    "files.collapseAll": "Collapse All",
+    "files.openInTerminal": "Open in Terminal",
+    "files.findInFolder": "Find in Folder",
+    "files.generateImage": "Generate Image",
+    "files.propertiesFile": "File",
+    "files.propertiesPath": "Path",
+    "files.propertiesSize": "Size",
+    "files.propertiesType": "Type",
+    "files.sizeUnknown": "Unknown",
+    "files.noExtension": "No extension",
+    "files.overwriteEnvTitle": "Overwrite Env File",
+    "files.cancel": "Cancel",
+    "files.overwrite": "Overwrite",
+    "files.overwriteEnvMessage": "{name} already exists. Overwrite it?",
+    "files.created": "Created {name}",
+    "files.createFailed": "Failed to create {name}",
+    "quickOpen.searchFiles": "Type to search files...",
+    "quickOpen.searchSymbols": "Type to filter symbols...",
+    "quickOpen.searchWorkspaceSymbols": "Type to search symbols across the project...",
+    "quickOpen.filesCount": "{count} files",
+    "quickOpen.fileCountOne": "{count} file",
+    "quickOpen.symbolsCount": "{count} symbols",
+    "quickOpen.openFolder": "Open a folder to start searching files",
+    "quickOpen.noMatch": "No matching files found",
+    "quickOpen.searching": "Searching...",
+    "quickOpen.noFilesInProject": "No files found in project",
+    "quickOpen.noFiles": "No files available",
+    "quickOpen.indexing": "Indexing project files",
+    "quickOpen.loadingFiles": "Loading files",
+    "quickOpen.loadingSymbols": "Loading symbols...",
+    "quickOpen.noSymbols": "No symbols found",
+    "tabs.pin": "Pin Tab",
+    "tabs.unpin": "Unpin Tab",
+    "tabs.splitRight": "Split Right",
+    "tabs.splitDown": "Split Down",
+    "tabs.lockEditorGroup": "Lock Editor Group",
+    "tabs.unlockEditorGroup": "Unlock Editor Group",
+    "tabs.reload": "Reload",
+    "tabs.close": "Close",
+    "tabs.closeOthers": "Close Others",
+    "tabs.closeToRight": "Close to Right",
+    "tabs.closeAll": "Close All",
+    "editor.preview": "Preview",
+    "editor.aiInlineEdit": "AI inline edit",
+    "editor.findInFile": "Find in file",
+    "editor.actions": "Editor actions",
+    "editor.preferences": "Editor preferences",
+    "editor.minimap": "Minimap",
+    "editor.inlineGitBlame": "Inline Git Blame",
+    "editor.selectAll": "Select All",
+    "editor.duplicateLine": "Duplicate Line",
+    "editor.addSelectionToNextMatch": "Add Selection to Next Match",
+    "editor.selectAllOccurrences": "Select All Occurrences",
+    "editor.toggleComment": "Toggle Comment",
+    "editor.indent": "Indent",
+    "editor.outdent": "Outdent",
+    "editor.formatDocument": "Format Document",
+    "editor.formatSelection": "Format Selection",
+    "editor.moveLineUp": "Move Line Up",
+    "editor.moveLineDown": "Move Line Down",
+    "editor.toggleCase": "Toggle Case",
+    "editor.goToDefinition": "Go to Definition",
+    "editor.findAllReferences": "Find All References",
+    "editor.goToTypeDefinition": "Go to Type Definition",
+    "editor.renameSymbol": "Rename Symbol",
+    "editor.quickFix": "Quick Fix...",
+    "editor.showHover": "Show Hover",
+    "editor.triggerSuggest": "Trigger Suggest",
+    "editor.find": "Find",
+    "editor.goToLine": "Go to Line",
+    "editor.toggleBookmark": "Toggle Bookmark",
+    "editor.selectLanguage": "Select language mode",
+    "editor.plainText": "Plain Text",
+    "editor.noLanguages": "No languages found",
+    "lsp.noActive": "No active language servers",
+    "lsp.active": "Language Servers Active",
+    "lsp.connecting": "Connecting to Language Server...",
+    "lsp.connectingShort": "Connecting",
+    "lsp.issue": "Language server issue",
+    "lsp.issueHint":
+      "Check notifications for the latest error. Reinstall the affected language tools from Extensions if the server binary is missing or failed to launch.",
+    "lsp.noProject": "No Project",
+    "lsp.status": "Language server status",
+    "lsp.start": "Start",
+    "lsp.starting": "Starting...",
+    "lsp.restart": "Restart",
+    "lsp.restartAll": "Restart all",
+    "lsp.restarting": "Restarting...",
+    "lsp.stopAll": "Stop all",
+    "lsp.stopping": "Stopping...",
+    "git.push": "Push",
+    "git.pull": "Pull",
+    "git.pushCount": "Push {count}",
+    "git.pullCount": "Pull {count}",
+    "git.pushCommit": "Push {count} commit",
+    "git.pushCommits": "Push {count} commits",
+    "git.pullCommit": "Pull {count} commit",
+    "git.pullCommits": "Pull {count} commits",
+    "git.pushing": "Pushing",
+    "git.pulling": "Pulling",
+    "git.fetching": "Fetching",
+    "git.historySearch": "Search history",
+    "git.historyEnd": "end of history",
+    "git.historyFilter": "Filter history",
+    "git.historyFilterAll": "All Fields",
+    "git.historyFilterMessage": "Message",
+    "git.historyFilterAuthor": "Author",
+    "git.historyFilterHash": "Hash",
+    "git.historyNoCommits": "No commits",
+    "git.historyNoMatch": "No commits match the current filters",
+    "git.selectRepository": "Select Repository",
+    "git.selecting": "Selecting...",
+    "git.manageBranches": "Manage Branches",
+    "git.showBranchDiff": "Show Branch Diff",
+    "git.pushChanges": "Push Changes",
+    "git.pullChanges": "Pull Changes",
+    "git.manageRemotes": "Manage Remotes",
+    "git.manageTags": "Manage Tags",
+    "git.viewStashes": "View Stashes",
+    "git.refreshStatus": "Refresh Status",
+    "git.discardAllChanges": "Discard All Changes",
+    "git.actions": "Git Actions",
+    "git.refreshAria": "Refresh git status",
+    "git.unstaged": "Unstaged",
+    "git.staged": "Staged",
+    "git.branch": "Branch",
+    "git.stash": "Stash",
+    "git.stashAllUnstaged": "Stash All Unstaged",
+    "git.stashFile": "Stash File",
+    "git.stashMessage": "Stash message...",
+    "git.stashMessageDefaultAll": "Message (default: Stash all unstaged changes)",
+    "git.stashMessageDefaultFile": "Message (default: Stash {name})",
+    "git.stashing": "Stashing...",
+    "git.diff.search": "Search Diff",
+    "git.diff.searchChanges": "Search changes",
+    "git.diff.unified": "Unified",
+    "git.diff.split": "Side-by-side",
+    "git.diff.showWhitespace": "Show whitespace",
+    "git.diff.hideWhitespace": "Hide whitespace",
+    "git.diff.addedVersion": "Added version",
+    "git.diff.deletedVersion": "Deleted version",
+    "git.diff.currentVersion": "Current version",
+    "git.diff.indexVersion": "Index version",
+    "git.diff.worktree": "WORKTREE",
+    "git.diff.statusAdded": "ADDED",
+    "git.diff.statusDeleted": "DELETED",
+    "git.diff.statusModified": "MODIFIED",
+    "git.diff.statusRenamed": "RENAMED",
+    "git.diff.stage": "Stage",
+    "git.diff.unstage": "Unstage",
+    "git.diff.uncommitted": "Uncommitted Changes",
+    "welcome.openProjectOrRemote": "Open project or remote connection",
+    "welcome.openFolder": "Open Folder",
+    "welcome.newProject": "New Project",
+    "welcome.addRemote": "Add Remote",
+    "welcome.newRemoteConnection": "New Remote Connection",
+    "welcome.chooseHowToStart": "Choose how to start...",
+    "welcome.emptyProject": "Empty Project",
+    "welcome.emptyProjectDescription": "Create a clean folder and start from scratch.",
+    "welcome.builtIn": "Built-in",
+    "welcome.webApp": "Web app",
+    "welcome.nextjsDescription":
+      "App Router, TypeScript, Tailwind CSS, ESLint, and a src directory.",
+    "welcome.viteReactDescription": "A lightweight React and TypeScript starter.",
+    "welcome.cloneRepository": "Clone Repository",
+    "welcome.cloneRepositoryDescription":
+      "Clone an existing Git repository into a new local project.",
+    "welcome.gitBadge": "Git",
+    "welcome.noStarters": "No project starters match \"{query}\".",
+    "welcome.backToProjects": "Back to projects",
   },
   "zh-CN": {
     "workbench.project": "项目",
     "workbench.changes": "更改",
     "workbench.search": "搜索",
+    "workbench.searchInFiles": "在文件中搜索...",
+    "search.emptyTitle": "在项目中搜索",
+    "search.emptyDescription": "输入关键词，即可在整个项目中查找匹配的文件和代码行。",
+    "search.openProjectTitle": "打开项目后再搜索",
+    "search.openProjectDescription": "全局搜索需要先打开一个项目文件夹。",
+    "search.unsupported": "当前工作区类型不支持全局搜索。",
+    "search.failed": "搜索失败",
+    "search.retry": "重试",
+    "search.noResults": "未找到结果",
+    "search.noResultsFor": "未找到 “{query}” 的结果",
+    "search.noResultsForWithFilters": "未找到 “{query}” 的结果（已应用当前文件筛选）",
+    "search.matchCase": "区分大小写",
+    "search.matchWholeWord": "全字匹配",
+    "search.useRegex": "使用正则表达式",
+    "search.hideDetails": "隐藏详细信息",
+    "search.showDetails": "显示详细信息",
+    "search.clear": "清除搜索",
+    "search.options": "搜索选项",
+    "search.filesToInclude": "要包含的文件",
+    "search.filesToExclude": "要排除的文件",
+    "workbench.sourceControl": "源代码管理",
+    "workbench.gitLog": "提交记录",
     "workbench.database": "数据库",
     "workbench.settings": "设置",
     "workbench.run": "运行",
+    "workbench.terminal": "终端",
+    "workbench.diagnostics": "诊断",
     "run.title": "运行",
     "run.run": "运行配置",
     "run.stop": "停止运行",
@@ -1175,6 +1638,412 @@ const catalogs = {
     "settings.advanced.feature.persistentCommands.description": "最近使用的命令显示在命令面板顶部",
     "settings.common.json": "JSON",
     "settings.common.allFiles": "所有文件",
+    "git.history": "历史记录",
+    "git.fetch": "获取",
+    "git.viewDiff": "查看差异",
+    "git.tracked": "已跟踪",
+    "git.untracked": "未跟踪",
+    "git.commitMessagePlaceholder": "提交说明...",
+    "git.generateCommitMessageWithAI": "使用 AI 生成提交说明",
+    "git.commitMessageTitleOnly": "仅标题",
+    "git.commitMessageTitleAndBody": "标题 + 正文",
+    "git.commitMessageFormat": "提交说明格式",
+    "git.filesStaged": "已暂存 {count} 个文件",
+    "git.fileStaged": "已暂存 {count} 个文件",
+    "git.noFilesStaged": "没有已暂存的文件",
+    "git.commit": "提交",
+    "git.committing": "正在提交...",
+    "git.repositories": "仓库",
+    "git.branches": "分支",
+    "git.worktrees": "工作树",
+    "git.searchBranches": "搜索分支...",
+    "git.searchWorktrees": "搜索工作树...",
+    "git.filterRepositories": "筛选仓库...",
+    "git.branchCount": "{count} 个分支",
+    "git.branchesCount": "{count} 个分支",
+    "git.worktreeCount": "{count} 个工作树",
+    "git.worktreesCount": "{count} 个工作树",
+    "git.repositoryCount": "{count} 个仓库",
+    "git.repositoriesCount": "{count} 个仓库",
+    "git.selectorSections": "Git 选择分区",
+    "git.searchBranchesAria": "搜索分支",
+    "git.noMatchingBranches": "没有匹配的分支",
+    "git.searchStashes": "搜索贮藏...",
+    "git.stashCount": "{count} 个贮藏",
+    "git.stashesCount": "{count} 个贮藏",
+    "git.noStashes": "暂无贮藏",
+    "git.noMatchingStashes": "没有匹配的贮藏",
+    "git.compareBranchPlaceholder": "将当前分支与...比较",
+    "git.noOtherBranches": "没有其他分支",
+    "git.compareWithBranch": "与 {branch} 比较",
+    "git.searchCommits": "搜索提交...",
+    "git.commitCount": "{count} 个提交",
+    "git.commitsCount": "{count} 个提交",
+    "git.noCommits": "暂无提交",
+    "git.noMatchingCommits": "没有匹配的提交",
+    "git.noBranchesFound": "未找到分支",
+    "git.createNewBranch": "创建新分支 “{name}”",
+    "git.loadingWorktrees": "正在加载工作树...",
+    "git.noMatchingWorktrees": "没有匹配的工作树",
+    "git.noWorktreesFound": "未找到工作树",
+    "git.createWorktree": "创建工作树 “{path}”",
+    "git.detectingRepositories": "正在检测仓库...",
+    "git.noMatchingRepositories": "没有匹配的仓库",
+    "git.noRepositoriesFound": "未找到仓库",
+    "git.newBranch": "新建分支",
+    "git.refresh": "刷新",
+    "git.add": "添加",
+    "git.adding": "正在添加...",
+    "git.clearAdded": "清除已添加",
+    "git.current": "当前",
+    "git.added": "已添加",
+    "git.detachedHead": "分离的 HEAD",
+    "git.noBranch": "无分支",
+    "git.branchActions": "{branch} 的分支操作",
+    "git.mergeIntoCurrent": "合并到当前分支",
+    "git.rebaseOntoThis": "将当前分支变基到此分支",
+    "git.deleteBranch": "删除分支",
+    "git.delete": "删除",
+    "git.deleteBranchConfirm": "确定要删除分支 “{branch}” 吗？",
+    "git.stashChanges": "贮藏更改",
+    "git.stashAndSwitchSuccess": "已贮藏更改并成功切换分支",
+    "git.stashAndSwitchFailed": "贮藏后切换分支失败",
+    "git.stashFailed": "贮藏更改失败",
+    "git.switchingTo": "正在切换到 {branch}",
+    "git.mergeSuccess": "已成功合并 {branch}。",
+    "git.conflictedFile": "已停止，有 {count} 个冲突文件。请在更改列表中解决后继续。",
+    "git.conflictedFiles": "已停止，有 {count} 个冲突文件。请在更改列表中解决后继续。",
+    "git.stoppedBeforeCompletion": "{branch} 在完成前已停止。请在更改列表中继续、跳过或中止。",
+    "git.uncommittedWouldOverwrite":
+      "未提交的更改会被覆盖：{listed}{more}。请先贮藏或提交。",
+    "git.moreFiles": "（另有 {count} 个）",
+    "git.merge": "合并",
+    "git.rebase": "变基",
+    "git.mergeBranchTitle": "合并分支",
+    "git.rebaseBranchTitle": "变基分支",
+    "git.mergeConfirm": "将分支 “{branch}” 合并到 “{current}”？冲突可能需要手动解决。",
+    "git.rebaseConfirm": "将 “{current}” 变基到 “{branch}”？冲突可能需要手动解决。",
+    "git.mergeFailed": "合并失败。",
+    "git.rebaseFailed": "变基失败。",
+    "git.selectedFolderNotRepo": "所选文件夹不在 Git 仓库内。",
+    "git.failedToSelectRepository": "选择仓库失败。",
+    "git.log.all": "全部",
+    "git.log.logLabel": "日志：{name}",
+    "git.log.showAll": "显示全部引用",
+    "git.log.refresh": "刷新 Git 日志",
+    "git.log.hide": "隐藏提交记录",
+    "git.log.openDiff": "打开差异",
+    "git.log.compareWithHead": "与 HEAD 比较",
+    "git.log.copyHash": "复制哈希",
+    "git.log.unableToRefresh": "无法刷新 Git 日志。",
+    "git.log.retry": "重试",
+    "git.log.noRepository": "未打开仓库",
+    "git.log.openWorkspace": "打开一个 Git 工作区以查看提交记录。",
+    "git.log.loading": "正在加载 Git 日志…",
+    "git.log.unableToLoad": "无法加载 Git 日志。",
+    "git.log.tryAgain": "重试",
+    "git.log.copied": "已复制{label}",
+    "git.log.copyFailed": "无法复制{label}",
+    "git.log.commitHash": "提交哈希",
+    "git.log.commitMessage": "提交说明",
+    "git.log.references": "引用",
+    "git.log.headCurrentBranch": "HEAD（当前分支）",
+    "git.log.local": "本地",
+    "git.log.remote": "远程",
+    "git.log.tags": "标签",
+    "git.log.none": "无",
+    "git.log.expand": "展开 {name}",
+    "git.log.collapse": "折叠 {name}",
+    "git.log.filter": "筛选 Git 日志",
+    "git.log.clearFilter": "清除 Git 日志筛选",
+    "git.log.filterField": "Git 日志筛选字段",
+    "git.log.filterText": "文本",
+    "git.log.filterAuthor": "作者",
+    "git.log.filterBranch": "分支",
+    "git.log.filterPlaceholder": "{field} 筛选",
+    "git.log.hideDecorations": "隐藏分支和标签",
+    "git.log.showDecorations": "显示分支和标签",
+    "git.log.commit": "提交",
+    "git.log.author": "作者",
+    "git.log.date": "日期",
+    "git.log.noMatch": "没有符合筛选条件的提交",
+    "git.log.noCommits": "此视图中没有提交",
+    "git.log.openDiffHint": "双击或按 Enter 打开提交差异",
+    "git.log.openCommitDiff": "打开提交差异",
+    "git.log.copyCommitHash": "复制提交哈希",
+    "git.log.copyCommitMessage": "复制提交说明",
+    "git.log.loadingCommits": "正在加载提交…",
+    "git.log.loadMore": "加载更多提交",
+    "git.log.commitFiles": "提交文件",
+    "git.log.filesCount": "{count} 个文件",
+    "git.log.selectCommit": "选择一个提交",
+    "git.log.loadingChangedFiles": "正在加载更改的文件…",
+    "git.log.unableToLoadFiles": "无法加载更改的文件",
+    "git.log.noChangedFiles": "没有更改的文件",
+    "git.log.commitDetails": "提交详情",
+    "git.log.loadingShort": "加载中…",
+    "git.log.openFileDiff": "双击打开文件差异",
+    "footer.cursor": "跳转到行和列",
+    "footer.encoding": "文件编码",
+    "footer.indent": "缩进",
+    "footer.spaces": "{count} 个空格",
+    "footer.readOnly": "只读",
+    "footer.writable": "可写",
+    "footer.memory": "内存",
+    "footer.memoryUsage": "总计 {total} · Lithe {used}",
+    "footer.changes": "{count} 个更改",
+    "footer.change": "{count} 个更改",
+    "footer.noChanges": "没有更改",
+    "notifications.title": "通知",
+    "notifications.search": "搜索通知",
+    "notifications.empty": "暂无通知。",
+    "notifications.noMatch": "没有匹配的通知。",
+    "notifications.filter": "筛选通知",
+    "notifications.filterAll": "全部",
+    "notifications.filterInfo": "信息",
+    "notifications.filterSuccess": "成功",
+    "notifications.filterWarnings": "警告",
+    "notifications.filterErrors": "错误",
+    "notifications.copyMessage": "复制消息",
+    "notifications.copyDetails": "复制详情",
+    "notifications.copyNotification": "复制通知",
+    "notifications.delete": "删除",
+    "notifications.clearAll": "全部清除",
+    "notifications.copyAll": "全部复制",
+    "notifications.deleteNotification": "删除通知",
+    "notifications.details": "通知详情",
+    "notifications.copy": "复制",
+    "notifications.copied": "已复制",
+    "diagnostics.problemCount": "{count} 个问题",
+    "diagnostics.problemCountOne": "{count} 个问题",
+    "diagnostics.empty": "未检测到问题",
+    "diagnostics.noMatch": "没有符合当前筛选条件的问题",
+    "diagnostics.resetFilters": "重置筛选",
+    "diagnostics.search": "搜索问题",
+    "diagnostics.filter": "筛选问题",
+    "diagnostics.groupByFile": "分组：文件",
+    "diagnostics.groupBySeverity": "分组：严重程度",
+    "diagnostics.groupByNone": "不分组",
+    "diagnostics.sortBySeverity": "排序：严重程度",
+    "diagnostics.sortByFile": "排序：文件",
+    "diagnostics.sortByPosition": "排序：位置",
+    "diagnostics.severityCount": "{label} ({visible}/{total})",
+    "diagnostics.errors": "错误",
+    "diagnostics.warnings": "警告",
+    "diagnostics.info": "信息",
+    "diagnostics.onlyCurrentFile": "仅当前文件",
+    "diagnostics.clearSourceFilter": "清除来源筛选（{source}）",
+    "diagnostics.clearSourceFilterSimple": "清除来源筛选",
+    "diagnostics.resetAllFilters": "重置全部筛选",
+    "diagnostics.hideFiles": "隐藏文件",
+    "diagnostics.showFiles": "显示文件",
+    "diagnostics.closePane": "关闭问题面板",
+    "diagnostics.filesAria": "诊断文件",
+    "diagnostics.all": "全部诊断",
+    "diagnostics.fullWidth": "全宽",
+    "diagnostics.editorWidth": "编辑器宽度",
+    "diagnostics.fullScreen": "全屏",
+    "diagnostics.exitFullScreen": "退出全屏",
+    "diagnostics.goToProblem": "转到问题",
+    "diagnostics.copyMessage": "复制消息",
+    "diagnostics.copyLocation": "复制位置",
+    "diagnostics.copyDetails": "复制完整详情",
+    "diagnostics.filterBySource": "按来源筛选：{source}",
+    "diagnostics.enableWrap": "启用消息换行",
+    "diagnostics.disableWrap": "禁用消息换行",
+    "diagnostics.loadingFixes": "正在加载快速修复...",
+    "diagnostics.noFixes": "没有可用的快速修复",
+    "diagnostics.messageCopied": "已复制诊断消息",
+    "diagnostics.locationCopied": "已复制诊断位置",
+    "diagnostics.detailsCopied": "已复制诊断详情",
+    "files.open": "打开",
+    "files.copyContent": "复制内容",
+    "files.duplicate": "创建副本",
+    "files.localHistory": "本地历史",
+    "files.properties": "属性",
+    "files.copyPath": "复制路径",
+    "files.copyRelativePath": "复制相对路径",
+    "files.copy": "复制",
+    "files.cut": "剪切",
+    "files.paste": "粘贴",
+    "files.rename": "重命名",
+    "files.reveal": "在资源管理器中显示",
+    "files.delete": "删除",
+    "files.newFile": "新建文件",
+    "files.newFolder": "新建文件夹",
+    "files.uploadFiles": "上传文件",
+    "files.refresh": "刷新",
+    "files.addFolderToWorkspace": "将文件夹添加到工作区",
+    "files.removeFolderFromWorkspace": "从工作区移除文件夹",
+    "files.openAllFiles": "打开全部文件",
+    "files.collapseAll": "全部折叠",
+    "files.openInTerminal": "在终端中打开",
+    "files.findInFolder": "在文件夹中查找",
+    "files.generateImage": "生成图片",
+    "files.propertiesFile": "文件",
+    "files.propertiesPath": "路径",
+    "files.propertiesSize": "大小",
+    "files.propertiesType": "类型",
+    "files.sizeUnknown": "未知",
+    "files.noExtension": "无扩展名",
+    "files.overwriteEnvTitle": "覆盖 Env 文件",
+    "files.cancel": "取消",
+    "files.overwrite": "覆盖",
+    "files.overwriteEnvMessage": "{name} 已存在。要覆盖吗？",
+    "files.created": "已创建 {name}",
+    "files.createFailed": "无法创建 {name}",
+    "quickOpen.searchFiles": "输入以搜索文件...",
+    "quickOpen.searchSymbols": "输入以筛选符号...",
+    "quickOpen.searchWorkspaceSymbols": "在项目中搜索符号...",
+    "quickOpen.filesCount": "{count} 个文件",
+    "quickOpen.fileCountOne": "{count} 个文件",
+    "quickOpen.symbolsCount": "{count} 个符号",
+    "quickOpen.openFolder": "打开文件夹后再搜索文件",
+    "quickOpen.noMatch": "未找到匹配的文件",
+    "quickOpen.searching": "正在搜索...",
+    "quickOpen.noFilesInProject": "项目中未找到文件",
+    "quickOpen.noFiles": "没有可用文件",
+    "quickOpen.indexing": "正在索引项目文件",
+    "quickOpen.loadingFiles": "正在加载文件",
+    "quickOpen.loadingSymbols": "正在加载符号...",
+    "quickOpen.noSymbols": "未找到符号",
+    "tabs.pin": "固定标签页",
+    "tabs.unpin": "取消固定标签页",
+    "tabs.splitRight": "向右拆分",
+    "tabs.splitDown": "向下拆分",
+    "tabs.lockEditorGroup": "锁定编辑器组",
+    "tabs.unlockEditorGroup": "解锁编辑器组",
+    "tabs.reload": "重新加载",
+    "tabs.close": "关闭",
+    "tabs.closeOthers": "关闭其他",
+    "tabs.closeToRight": "关闭右侧",
+    "tabs.closeAll": "全部关闭",
+    "editor.preview": "预览",
+    "editor.aiInlineEdit": "AI 行内编辑",
+    "editor.findInFile": "在文件中查找",
+    "editor.actions": "编辑器操作",
+    "editor.preferences": "编辑器首选项",
+    "editor.minimap": "缩略图",
+    "editor.inlineGitBlame": "行内 Git Blame",
+    "editor.selectAll": "全选",
+    "editor.duplicateLine": "复制行",
+    "editor.addSelectionToNextMatch": "将所选添加到下一处匹配",
+    "editor.selectAllOccurrences": "选择全部出现位置",
+    "editor.toggleComment": "切换注释",
+    "editor.indent": "增加缩进",
+    "editor.outdent": "减少缩进",
+    "editor.formatDocument": "格式化文档",
+    "editor.formatSelection": "格式化所选内容",
+    "editor.moveLineUp": "上移行",
+    "editor.moveLineDown": "下移行",
+    "editor.toggleCase": "切换大小写",
+    "editor.goToDefinition": "转到定义",
+    "editor.findAllReferences": "查找全部引用",
+    "editor.goToTypeDefinition": "转到类型定义",
+    "editor.renameSymbol": "重命名符号",
+    "editor.quickFix": "快速修复...",
+    "editor.showHover": "显示悬停信息",
+    "editor.triggerSuggest": "触发建议",
+    "editor.find": "查找",
+    "editor.goToLine": "转到行",
+    "editor.toggleBookmark": "切换书签",
+    "editor.selectLanguage": "选择语言模式",
+    "editor.plainText": "纯文本",
+    "editor.noLanguages": "未找到语言",
+    "lsp.noActive": "没有活动的语言服务器",
+    "lsp.active": "语言服务器运行中",
+    "lsp.connecting": "正在连接语言服务器...",
+    "lsp.connectingShort": "连接中",
+    "lsp.issue": "语言服务器异常",
+    "lsp.issueHint":
+      "请查看通知中的最新错误。如果服务器二进制文件缺失或启动失败，请从扩展中重新安装对应语言工具。",
+    "lsp.noProject": "无项目",
+    "lsp.status": "语言服务器状态",
+    "lsp.start": "启动",
+    "lsp.starting": "正在启动...",
+    "lsp.restart": "重启",
+    "lsp.restartAll": "全部重启",
+    "lsp.restarting": "正在重启...",
+    "lsp.stopAll": "全部停止",
+    "lsp.stopping": "正在停止...",
+    "git.push": "推送",
+    "git.pull": "拉取",
+    "git.pushCount": "推送 {count}",
+    "git.pullCount": "拉取 {count}",
+    "git.pushCommit": "推送 {count} 个提交",
+    "git.pushCommits": "推送 {count} 个提交",
+    "git.pullCommit": "拉取 {count} 个提交",
+    "git.pullCommits": "拉取 {count} 个提交",
+    "git.pushing": "正在推送",
+    "git.pulling": "正在拉取",
+    "git.fetching": "正在获取",
+    "git.historySearch": "搜索历史",
+    "git.historyEnd": "历史到底了",
+    "git.historyFilter": "筛选历史",
+    "git.historyFilterAll": "全部字段",
+    "git.historyFilterMessage": "说明",
+    "git.historyFilterAuthor": "作者",
+    "git.historyFilterHash": "哈希",
+    "git.historyNoCommits": "暂无提交",
+    "git.historyNoMatch": "没有符合当前筛选条件的提交",
+    "git.selectRepository": "选择仓库",
+    "git.selecting": "正在选择...",
+    "git.manageBranches": "管理分支",
+    "git.showBranchDiff": "显示分支差异",
+    "git.pushChanges": "推送更改",
+    "git.pullChanges": "拉取更改",
+    "git.manageRemotes": "管理远程",
+    "git.manageTags": "管理标签",
+    "git.viewStashes": "查看贮藏",
+    "git.refreshStatus": "刷新状态",
+    "git.discardAllChanges": "丢弃全部更改",
+    "git.actions": "Git 操作",
+    "git.refreshAria": "刷新 Git 状态",
+    "git.unstaged": "未暂存",
+    "git.staged": "已暂存",
+    "git.branch": "分支",
+    "git.stash": "贮藏",
+    "git.stashAllUnstaged": "贮藏全部未暂存",
+    "git.stashFile": "贮藏文件",
+    "git.stashMessage": "贮藏说明...",
+    "git.stashMessageDefaultAll": "说明（默认：贮藏全部未暂存更改）",
+    "git.stashMessageDefaultFile": "说明（默认：贮藏 {name}）",
+    "git.stashing": "正在贮藏...",
+    "git.diff.search": "搜索差异",
+    "git.diff.searchChanges": "搜索更改",
+    "git.diff.unified": "统一视图",
+    "git.diff.split": "并排视图",
+    "git.diff.showWhitespace": "显示空白字符",
+    "git.diff.hideWhitespace": "隐藏空白字符",
+    "git.diff.addedVersion": "新增版本",
+    "git.diff.deletedVersion": "删除版本",
+    "git.diff.currentVersion": "当前版本",
+    "git.diff.indexVersion": "暂存区版本",
+    "git.diff.worktree": "工作区",
+    "git.diff.statusAdded": "新增",
+    "git.diff.statusDeleted": "删除",
+    "git.diff.statusModified": "修改",
+    "git.diff.statusRenamed": "重命名",
+    "git.diff.stage": "暂存",
+    "git.diff.unstage": "取消暂存",
+    "git.diff.uncommitted": "未提交的更改",
+    "welcome.openProjectOrRemote": "打开项目或远程连接",
+    "welcome.openFolder": "打开文件夹",
+    "welcome.newProject": "新建项目",
+    "welcome.addRemote": "添加远程",
+    "welcome.newRemoteConnection": "新建远程连接",
+    "welcome.chooseHowToStart": "选择如何开始...",
+    "welcome.emptyProject": "空项目",
+    "welcome.emptyProjectDescription": "创建一个空白文件夹，从零开始。",
+    "welcome.builtIn": "内置",
+    "welcome.webApp": "Web 应用",
+    "welcome.nextjsDescription": "包含 App Router、TypeScript、Tailwind CSS、ESLint 和 src 目录。",
+    "welcome.viteReactDescription": "轻量的 React 和 TypeScript 起步模板。",
+    "welcome.cloneRepository": "克隆仓库",
+    "welcome.cloneRepositoryDescription": "将已有 Git 仓库克隆到本地新项目。",
+    "welcome.gitBadge": "Git",
+    "welcome.noStarters": "没有匹配 “{query}” 的项目模板。",
+    "welcome.backToProjects": "返回项目列表",
   },
 } as const;
 
diff --git a/windows/tauri/src/ui/icons.tsx b/windows/tauri/src/ui/icons.tsx
index 0af8d6cb4..42a5a30e6 100644
--- a/windows/tauri/src/ui/icons.tsx
+++ b/windows/tauri/src/ui/icons.tsx
@@ -365,6 +365,7 @@ export const GearIcon = createIconComponent(Nucleo.IconGearOutline18, "GearIcon"
 export const GearSixIcon = createIconComponent(Nucleo.IconGear2Outline18, "GearSixIcon");
 export const GitBranchIcon = createIconComponent(Nucleo.IconCodeBranchOutline18, "GitBranchIcon");
 export const GitCommitIcon = createIconComponent(Nucleo.IconCircleDotsOutline18, "GitCommitIcon");
+export const GitGraphIcon = createIconComponent(Nucleo.IconGitGraphOutline18, "GitGraphIcon");
 export const GitDiffIcon = createIconComponent(Nucleo.IconBranchMergeOutline18, "GitDiffIcon");
 export const GithubLogoIcon = createIconComponent(Nucleo.IconCodeBranchOutline18, "GithubLogoIcon");
 export const GitMergeIcon = createIconComponent(Nucleo.IconBranchMergeOutline18, "GitMergeIcon");
diff --git a/windows/tauri/src/ui/sidebar.tsx b/windows/tauri/src/ui/sidebar.tsx
index ae43781ca..82ce44d63 100644
--- a/windows/tauri/src/ui/sidebar.tsx
+++ b/windows/tauri/src/ui/sidebar.tsx
@@ -71,7 +71,7 @@ export const SidebarFooter = forwardRef<
     <div
       ref={ref}
       className={cn(
-        "ui-text-chrome mx-2 mb-2 shrink-0 rounded-xl border border-border/60 bg-[color-mix(in_srgb,var(--surface)_82%,var(--border)_18%)] p-0 pb-1 transition-[border-radius,background-color,border-color,box-shadow]",
+        "ui-text-chrome relative z-20 isolate mx-2 mb-2 shrink-0 rounded-xl border border-border/60 bg-background p-0 pb-1 transition-[border-radius,background-color,border-color,box-shadow]",
         className,
       )}
       {...props}
@@ -113,7 +113,7 @@ export function SidebarComposerBody({
       className={cn(
         "overflow-hidden",
         variant === "surface" &&
-          "rounded-xl border border-border/60 bg-[color-mix(in_srgb,var(--background)_96%,var(--surface)_4%)]",
+          "relative z-10 rounded-xl border border-border/60 bg-background",
         className,
       )}
       {...props}
@@ -437,7 +437,11 @@ export function SidebarTabPanels<TValue extends string>({
   return (
     <>
       {items.map((item) => (
-        <TabsContent key={item.id} value={item.id} className={className}>
+        <TabsContent
+          key={item.id}
+          value={item.id}
+          className={cn("flex min-h-0 flex-col overflow-hidden", className)}
+        >
           {item.content}
         </TabsContent>
       ))}