diff --git a/packages/app/src/app.tsx b/packages/app/src/app.tsx
index d03d10d0ea7..5d1cce43d47 100644
--- a/packages/app/src/app.tsx
+++ b/packages/app/src/app.tsx
@@ -12,6 +12,7 @@ import { ThemeProvider } from "@opencode-ai/ui/theme"
 import { GlobalSyncProvider } from "@/context/global-sync"
 import { PermissionProvider } from "@/context/permission"
 import { LayoutProvider } from "@/context/layout"
+import { LanguageProvider } from "@/context/language"
 import { GlobalSDKProvider } from "@/context/global-sdk"
 import { ServerProvider, useServer } from "@/context/server"
 import { TerminalProvider } from "@/context/terminal"
@@ -78,6 +79,7 @@ export function AppInterface(props: { defaultUrl?: string }) {
   return (
     <ServerProvider defaultUrl={defaultServerUrl()}>
       <ServerKey>
+        <LanguageProvider>
         <GlobalSDKProvider>
           <GlobalSyncProvider>
             <Router
@@ -121,6 +123,7 @@ export function AppInterface(props: { defaultUrl?: string }) {
             </Router>
           </GlobalSyncProvider>
         </GlobalSDKProvider>
+        </LanguageProvider>
       </ServerKey>
     </ServerProvider>
   )
diff --git a/packages/app/src/components/dialog-connect-provider.tsx b/packages/app/src/components/dialog-connect-provider.tsx
index 789a5d3b748..5437adb35c6 100644
--- a/packages/app/src/components/dialog-connect-provider.tsx
+++ b/packages/app/src/components/dialog-connect-provider.tsx
@@ -17,6 +17,7 @@ import { Link } from "@/components/link"
 import { useGlobalSDK } from "@/context/global-sdk"
 import { useGlobalSync } from "@/context/global-sync"
 import { usePlatform } from "@/context/platform"
+import { useLanguage } from "@/context/language"
 import { DialogSelectModel } from "./dialog-select-model"
 import { DialogSelectProvider } from "./dialog-select-provider"
 
@@ -25,13 +26,14 @@ export function DialogConnectProvider(props: { provider: string }) {
   const globalSync = useGlobalSync()
   const globalSDK = useGlobalSDK()
   const platform = usePlatform()
+  const language = useLanguage()
   const provider = createMemo(() => globalSync.data.provider.all.find((x) => x.id === props.provider)!)
   const methods = createMemo(
     () =>
       globalSync.data.provider_auth[props.provider] ?? [
         {
           type: "api",
-          label: "API key",
+          label: language.t("provider.apiKey"),
         },
       ],
   )
@@ -112,8 +114,8 @@ export function DialogConnectProvider(props: { provider: string }) {
     showToast({
       variant: "success",
       icon: "circle-check",
-      title: `${provider().name} connected`,
-      description: `${provider().name} models are now available to use.`,
+      title: language.t("provider.connectedTitle", { provider: provider().name }),
+      description: language.t("provider.connectedDescription", { provider: provider().name }),
     })
   }
 
@@ -142,16 +144,18 @@ export function DialogConnectProvider(props: { provider: string }) {
           <div class="text-16-medium text-text-strong">
             <Switch>
               <Match when={props.provider === "anthropic" && method()?.label?.toLowerCase().includes("max")}>
-                Login with Claude Pro/Max
+                {language.t("provider.loginClaude")}
               </Match>
-              <Match when={true}>Connect {provider().name}</Match>
+              <Match when={true}>{language.t("provider.connectTo", { provider: provider().name })}</Match>
             </Switch>
           </div>
         </div>
         <div class="px-2.5 pb-10 flex flex-col gap-6">
           <Switch>
             <Match when={store.methodIndex === undefined}>
-              <div class="text-14-regular text-text-base">Select login method for {provider().name}.</div>
+              <div class="text-14-regular text-text-base">
+                {language.t("provider.selectMethod", { provider: provider().name })}
+              </div>
               <div class="">
                 <List
                   ref={(ref) => {
@@ -179,7 +183,7 @@ export function DialogConnectProvider(props: { provider: string }) {
               <div class="text-14-regular text-text-base">
                 <div class="flex items-center gap-x-2">
                   <Spinner />
-                  <span>Authorization in progress...</span>
+                  <span>{language.t("provider.authInProgress")}</span>
                 </div>
               </div>
             </Match>
@@ -187,7 +191,7 @@ export function DialogConnectProvider(props: { provider: string }) {
               <div class="text-14-regular text-text-base">
                 <div class="flex items-center gap-x-2">
                   <Icon name="circle-ban-sign" class="text-icon-critical-base" />
-                  <span>Authorization failed: {store.error}</span>
+                  <span>{language.t("provider.authFailed", { error: store.error ?? "" })}</span>
                 </div>
               </div>
             </Match>
@@ -206,7 +210,7 @@ export function DialogConnectProvider(props: { provider: string }) {
                   const apiKey = formData.get("apiKey") as string
 
                   if (!apiKey?.trim()) {
-                    setFormStore("error", "API key is required")
+                    setFormStore("error", language.t("provider.apiKeyRequired"))
                     return
                   }
 
@@ -227,25 +231,23 @@ export function DialogConnectProvider(props: { provider: string }) {
                       <Match when={provider().id === "opencode"}>
                         <div class="flex flex-col gap-4">
                           <div class="text-14-regular text-text-base">
-                            OpenCode Zen gives you access to a curated set of reliable optimized models for coding
-                            agents.
+                            {language.t("provider.opencodeZenIntro")}
                           </div>
                           <div class="text-14-regular text-text-base">
-                            With a single API key you'll get access to models such as Claude, GPT, Gemini, GLM and more.
+                            {language.t("provider.opencodeZenModels")}
                           </div>
                           <div class="text-14-regular text-text-base">
-                            Visit{" "}
+                            {language.t("provider.opencodeZenVisit")}{" "}
                             <Link href="https://opencode.ai/zen" tabIndex={-1}>
                               opencode.ai/zen
                             </Link>{" "}
-                            to collect your API key.
+                            {language.t("provider.opencodeZenCollect")}
                           </div>
                         </div>
                       </Match>
                       <Match when={true}>
                         <div class="text-14-regular text-text-base">
-                          Enter your {provider().name} API key to connect your account and use {provider().name} models
-                          in OpenCode.
+                          {language.t("provider.enterApiKey", { provider: provider().name })}
                         </div>
                       </Match>
                     </Switch>
@@ -253,8 +255,8 @@ export function DialogConnectProvider(props: { provider: string }) {
                       <TextField
                         autofocus
                         type="text"
-                        label={`${provider().name} API key`}
-                        placeholder="API key"
+                        label={language.t("provider.apiKeyLabel", { provider: provider().name })}
+                        placeholder={language.t("provider.apiKey")}
                         name="apiKey"
                         value={formStore.value}
                         onChange={setFormStore.bind(null, "value")}
@@ -262,7 +264,7 @@ export function DialogConnectProvider(props: { provider: string }) {
                         error={formStore.error}
                       />
                       <Button class="w-auto" type="submit" size="large" variant="primary">
-                        Submit
+                        {language.t("common.submit")}
                       </Button>
                     </form>
                   </div>
@@ -292,7 +294,7 @@ export function DialogConnectProvider(props: { provider: string }) {
                       const code = formData.get("code") as string
 
                       if (!code?.trim()) {
-                        setFormStore("error", "Authorization code is required")
+                        setFormStore("error", language.t("provider.authCodeRequired"))
                         return
                       }
 
@@ -306,21 +308,22 @@ export function DialogConnectProvider(props: { provider: string }) {
                         await complete()
                         return
                       }
-                      setFormStore("error", "Invalid authorization code")
+                      setFormStore("error", language.t("provider.authCodeInvalid"))
                     }
 
                     return (
                       <div class="flex flex-col gap-6">
                         <div class="text-14-regular text-text-base">
-                          Visit <Link href={store.authorization!.url}>this link</Link> to collect your authorization
-                          code to connect your account and use {provider().name} models in OpenCode.
+                          {language.t("provider.visitLinkToAuthorize")}{" "}
+                          <Link href={store.authorization!.url}>{language.t("provider.thisLink")}</Link>{" "}
+                          {language.t("provider.collectAuthCode", { provider: provider().name })}
                         </div>
                         <form onSubmit={handleSubmit} class="flex flex-col items-start gap-4">
                           <TextField
                             autofocus
                             type="text"
-                            label={`${method()?.label} authorization code`}
-                            placeholder="Authorization code"
+                            label={language.t("provider.authCodeLabel", { method: method()?.label ?? "" })}
+                            placeholder={language.t("provider.authCode")}
                             name="code"
                             value={formStore.value}
                             onChange={setFormStore.bind(null, "value")}
@@ -328,7 +331,7 @@ export function DialogConnectProvider(props: { provider: string }) {
                             error={formStore.error}
                           />
                           <Button class="w-auto" type="submit" size="large" variant="primary">
-                            Submit
+                            {language.t("common.submit")}
                           </Button>
                         </form>
                       </div>
@@ -361,13 +364,20 @@ export function DialogConnectProvider(props: { provider: string }) {
                     return (
                       <div class="flex flex-col gap-6">
                         <div class="text-14-regular text-text-base">
-                          Visit <Link href={store.authorization!.url}>this link</Link> and enter the code below to
-                          connect your account and use {provider().name} models in OpenCode.
+                          {language.t("provider.visitLinkToAuthorize")}{" "}
+                          <Link href={store.authorization!.url}>{language.t("provider.thisLink")}</Link>{" "}
+                          {language.t("provider.enterCodeBelow", { provider: provider().name })}
                         </div>
-                        <TextField label="Confirmation code" class="font-mono" value={code()} readOnly copyable />
+                        <TextField
+                          label={language.t("provider.confirmationCode")}
+                          class="font-mono"
+                          value={code()}
+                          readOnly
+                          copyable
+                        />
                         <div class="text-14-regular text-text-base flex items-center gap-4">
                           <Spinner />
-                          <span>Waiting for authorization...</span>
+                          <span>{language.t("provider.waitingForAuth")}</span>
                         </div>
                       </div>
                     )
diff --git a/packages/app/src/components/dialog-edit-project.tsx b/packages/app/src/components/dialog-edit-project.tsx
index a2dc7b623c7..466c58809b8 100644
--- a/packages/app/src/components/dialog-edit-project.tsx
+++ b/packages/app/src/components/dialog-edit-project.tsx
@@ -9,12 +9,14 @@ import { useGlobalSDK } from "@/context/global-sdk"
 import { type LocalProject, getAvatarColors } from "@/context/layout"
 import { getFilename } from "@opencode-ai/util/path"
 import { Avatar } from "@opencode-ai/ui/avatar"
+import { useLanguage } from "@/context/language"
 
 const AVATAR_COLOR_KEYS = ["pink", "mint", "orange", "purple", "cyan", "lime"] as const
 
 export function DialogEditProject(props: { project: LocalProject }) {
   const dialog = useDialog()
   const globalSDK = useGlobalSDK()
+  const language = useLanguage()
 
   const folderName = createMemo(() => getFilename(props.project.worktree))
   const defaultName = createMemo(() => props.project.name || folderName())
@@ -81,20 +83,20 @@ export function DialogEditProject(props: { project: LocalProject }) {
   }
 
   return (
-    <Dialog title="Edit project" class="w-full max-w-[480px] mx-auto">
+    <Dialog title={language.t("dialog.editProject")} class="w-full max-w-[480px] mx-auto">
       <form onSubmit={handleSubmit} class="flex flex-col gap-6 p-6 pt-0">
         <div class="flex flex-col gap-4">
           <TextField
             autofocus
             type="text"
-            label="Name"
+            label={language.t("project.name")}
             placeholder={folderName()}
             value={store.name}
             onChange={(v) => setStore("name", v)}
           />
 
           <div class="flex flex-col gap-2">
-            <label class="text-12-medium text-text-weak">Icon</label>
+            <label class="text-12-medium text-text-weak">{language.t("project.icon")}</label>
             <div class="flex gap-3 items-start">
               <div class="relative" onMouseEnter={() => setIconHover(true)} onMouseLeave={() => setIconHover(false)}>
                 <div
@@ -127,7 +129,7 @@ export function DialogEditProject(props: { project: LocalProject }) {
                       </div>
                     }
                   >
-                    <img src={store.iconUrl} alt="Project icon" class="size-full object-cover" />
+                    <img src={store.iconUrl} alt={language.t("project.iconAlt")} class="size-full object-cover" />
                   </Show>
                 </div>
                 <div
@@ -178,7 +180,7 @@ export function DialogEditProject(props: { project: LocalProject }) {
 
           <Show when={!store.iconUrl}>
             <div class="flex flex-col gap-2">
-              <label class="text-12-medium text-text-weak">Color</label>
+              <label class="text-12-medium text-text-weak">{language.t("project.color")}</label>
               <div class="flex gap-1.5">
                 <For each={AVATAR_COLOR_KEYS}>
                   {(color) => (
@@ -208,10 +210,10 @@ export function DialogEditProject(props: { project: LocalProject }) {
 
         <div class="flex justify-end gap-2">
           <Button type="button" variant="ghost" size="large" onClick={() => dialog.close()}>
-            Cancel
+            {language.t("common.cancel")}
           </Button>
           <Button type="submit" variant="primary" size="large" disabled={store.saving}>
-            {store.saving ? "Saving..." : "Save"}
+            {store.saving ? language.t("common.saving") : language.t("common.save")}
           </Button>
         </div>
       </form>
diff --git a/packages/app/src/components/dialog-fork.tsx b/packages/app/src/components/dialog-fork.tsx
index 472a1994f13..4d1a853e3c5 100644
--- a/packages/app/src/components/dialog-fork.tsx
+++ b/packages/app/src/components/dialog-fork.tsx
@@ -9,6 +9,7 @@ import { List } from "@opencode-ai/ui/list"
 import { extractPromptFromParts } from "@/utils/prompt"
 import type { TextPart as SDKTextPart } from "@opencode-ai/sdk/v2/client"
 import { base64Encode } from "@opencode-ai/util/encode"
+import { useLanguage } from "@/context/language"
 
 interface ForkableMessage {
   id: string
@@ -27,6 +28,7 @@ export const DialogFork: Component = () => {
   const sdk = useSDK()
   const prompt = usePrompt()
   const dialog = useDialog()
+  const language = useLanguage()
 
   const messages = createMemo((): ForkableMessage[] => {
     const sessionID = params.id
@@ -73,11 +75,11 @@ export const DialogFork: Component = () => {
   }
 
   return (
-    <Dialog title="Fork from message">
+    <Dialog title={language.t("session.forkTitle")}>
       <List
         class="flex-1 min-h-0 [&_[data-slot=list-scroll]]:flex-1 [&_[data-slot=list-scroll]]:min-h-0"
-        search={{ placeholder: "Search", autofocus: true }}
-        emptyMessage="No messages to fork from"
+        search={{ placeholder: language.t("common.search"), autofocus: true }}
+        emptyMessage={language.t("session.noForkMessages")}
         key={(x) => x.id}
         items={messages}
         filterKeys={["text"]}
diff --git a/packages/app/src/components/dialog-manage-models.tsx b/packages/app/src/components/dialog-manage-models.tsx
index 66d12528891..b40f6a1a246 100644
--- a/packages/app/src/components/dialog-manage-models.tsx
+++ b/packages/app/src/components/dialog-manage-models.tsx
@@ -4,14 +4,16 @@ import { Switch } from "@opencode-ai/ui/switch"
 import type { Component } from "solid-js"
 import { useLocal } from "@/context/local"
 import { popularProviders } from "@/hooks/use-providers"
+import { useLanguage } from "@/context/language"
 
 export const DialogManageModels: Component = () => {
   const local = useLocal()
+  const language = useLanguage()
   return (
-    <Dialog title="Manage models" description="Customize which models appear in the model selector.">
+    <Dialog title={language.t("model.manageTitle")} description={language.t("model.manageDescription")}>
       <List
-        search={{ placeholder: "Search models", autofocus: true }}
-        emptyMessage="No model results"
+        search={{ placeholder: language.t("model.search"), autofocus: true }}
+        emptyMessage={language.t("model.empty")}
         key={(x) => `${x?.provider?.id}:${x?.id}`}
         items={local.model.list()}
         filterKeys={["provider.name", "name", "id"]}
diff --git a/packages/app/src/components/dialog-select-directory.tsx b/packages/app/src/components/dialog-select-directory.tsx
index bf4a1f9edd4..991f7276e46 100644
--- a/packages/app/src/components/dialog-select-directory.tsx
+++ b/packages/app/src/components/dialog-select-directory.tsx
@@ -6,6 +6,7 @@ import { getDirectory, getFilename } from "@opencode-ai/util/path"
 import { createMemo } from "solid-js"
 import { useGlobalSDK } from "@/context/global-sdk"
 import { useGlobalSync } from "@/context/global-sync"
+import { useLanguage } from "@/context/language"
 
 interface DialogSelectDirectoryProps {
   title?: string
@@ -17,6 +18,7 @@ export function DialogSelectDirectory(props: DialogSelectDirectoryProps) {
   const sync = useGlobalSync()
   const sdk = useGlobalSDK()
   const dialog = useDialog()
+  const language = useLanguage()
 
   const home = createMemo(() => sync.data.path.home)
   const root = createMemo(() => sync.data.path.home || sync.data.path.directory)
@@ -81,10 +83,10 @@ export function DialogSelectDirectory(props: DialogSelectDirectoryProps) {
   }
 
   return (
-    <Dialog title={props.title ?? "Open project"}>
+    <Dialog title={props.title ?? language.t("project.open")}>
       <List
-        search={{ placeholder: "Search folders", autofocus: true }}
-        emptyMessage="No folders found"
+        search={{ placeholder: language.t("dialog.searchFolders"), autofocus: true }}
+        emptyMessage={language.t("dialog.noFolders")}
         items={directories}
         key={(x) => x}
         onSelect={(path) => {
diff --git a/packages/app/src/components/dialog-select-file.tsx b/packages/app/src/components/dialog-select-file.tsx
index 0e8d69628bb..e4880eb3df2 100644
--- a/packages/app/src/components/dialog-select-file.tsx
+++ b/packages/app/src/components/dialog-select-file.tsx
@@ -9,6 +9,7 @@ import { createMemo, createSignal, onCleanup, Show } from "solid-js"
 import { formatKeybind, useCommand, type CommandOption } from "@/context/command"
 import { useLayout } from "@/context/layout"
 import { useFile } from "@/context/file"
+import { useLanguage } from "@/context/language"
 
 type EntryType = "command" | "file"
 
@@ -18,7 +19,7 @@ type Entry = {
   title: string
   description?: string
   keybind?: string
-  category: "Commands" | "Files"
+  category: string
   option?: CommandOption
   path?: string
 }
@@ -29,6 +30,7 @@ export function DialogSelectFile() {
   const file = useFile()
   const dialog = useDialog()
   const params = useParams()
+  const language = useLanguage()
   const sessionKey = createMemo(() => `${params.dir}${params.id ? "/" + params.id : ""}`)
   const tabs = createMemo(() => layout.tabs(sessionKey()))
   const view = createMemo(() => layout.view(sessionKey()))
@@ -49,7 +51,7 @@ export function DialogSelectFile() {
     title: option.title,
     description: option.description,
     keybind: option.keybind,
-    category: "Commands",
+    category: language.t("commandPalette.commands"),
     option,
   })
 
@@ -57,7 +59,7 @@ export function DialogSelectFile() {
     id: "file:" + path,
     type: "file",
     title: path,
-    category: "Files",
+    category: language.t("commandPalette.files"),
     path,
   })
 
@@ -136,8 +138,13 @@ export function DialogSelectFile() {
   return (
     <Dialog class="pt-3 pb-0 !max-h-[480px]">
       <List
-        search={{ placeholder: "Search files and commands", autofocus: true, hideIcon: true, class: "pl-3 pr-2 !mb-0" }}
-        emptyMessage="No results found"
+        search={{
+          placeholder: language.t("commandPalette.search"),
+          autofocus: true,
+          hideIcon: true,
+          class: "pl-3 pr-2 !mb-0",
+        }}
+        emptyMessage={language.t("commandPalette.empty")}
         items={items}
         key={(item) => item.id}
         filterKeys={["title", "description", "category"]}
diff --git a/packages/app/src/components/dialog-select-mcp.tsx b/packages/app/src/components/dialog-select-mcp.tsx
index c29cd827e3b..ffe0e512c3c 100644
--- a/packages/app/src/components/dialog-select-mcp.tsx
+++ b/packages/app/src/components/dialog-select-mcp.tsx
@@ -4,10 +4,12 @@ import { useSDK } from "@/context/sdk"
 import { Dialog } from "@opencode-ai/ui/dialog"
 import { List } from "@opencode-ai/ui/list"
 import { Switch } from "@opencode-ai/ui/switch"
+import { useLanguage } from "@/context/language"
 
 export const DialogSelectMcp: Component = () => {
   const sync = useSync()
   const sdk = useSDK()
+  const language = useLanguage()
   const [loading, setLoading] = createSignal<string | null>(null)
 
   const items = createMemo(() =>
@@ -34,10 +36,13 @@ export const DialogSelectMcp: Component = () => {
   const totalCount = createMemo(() => items().length)
 
   return (
-    <Dialog title="MCPs" description={`${enabledCount()} of ${totalCount()} enabled`}>
+    <Dialog
+      title={language.t("mcp.title")}
+      description={language.t("mcp.enabledCount", { enabled: enabledCount(), total: totalCount() })}
+    >
       <List
-        search={{ placeholder: "Search", autofocus: true }}
-        emptyMessage="No MCPs configured"
+        search={{ placeholder: language.t("common.search"), autofocus: true }}
+        emptyMessage={language.t("mcp.empty")}
         key={(x) => x?.name ?? ""}
         items={items}
         filterKeys={["name", "status"]}
@@ -60,16 +65,16 @@ export const DialogSelectMcp: Component = () => {
                 <div class="flex items-center gap-2">
                   <span class="truncate">{i.name}</span>
                   <Show when={status() === "connected"}>
-                    <span class="text-11-regular text-text-weaker">connected</span>
+                    <span class="text-11-regular text-text-weaker">{language.t("status.connected")}</span>
                   </Show>
                   <Show when={status() === "failed"}>
-                    <span class="text-11-regular text-text-weaker">failed</span>
+                    <span class="text-11-regular text-text-weaker">{language.t("status.failed")}</span>
                   </Show>
                   <Show when={status() === "needs_auth"}>
-                    <span class="text-11-regular text-text-weaker">needs auth</span>
+                    <span class="text-11-regular text-text-weaker">{language.t("status.needsAuth")}</span>
                   </Show>
                   <Show when={status() === "disabled"}>
-                    <span class="text-11-regular text-text-weaker">disabled</span>
+                    <span class="text-11-regular text-text-weaker">{language.t("status.disabled")}</span>
                   </Show>
                   <Show when={loading() === i.name}>
                     <span class="text-11-regular text-text-weak">...</span>
diff --git a/packages/app/src/components/dialog-select-model-unpaid.tsx b/packages/app/src/components/dialog-select-model-unpaid.tsx
index 24ec8092deb..ea0979a2a0c 100644
--- a/packages/app/src/components/dialog-select-model-unpaid.tsx
+++ b/packages/app/src/components/dialog-select-model-unpaid.tsx
@@ -10,11 +10,13 @@ import { useLocal } from "@/context/local"
 import { popularProviders, useProviders } from "@/hooks/use-providers"
 import { DialogConnectProvider } from "./dialog-connect-provider"
 import { DialogSelectProvider } from "./dialog-select-provider"
+import { useLanguage } from "@/context/language"
 
 export const DialogSelectModelUnpaid: Component = () => {
   const local = useLocal()
   const dialog = useDialog()
   const providers = useProviders()
+  const language = useLanguage()
 
   let listRef: ListRef | undefined
   const handleKey = (e: KeyboardEvent) => {
@@ -30,9 +32,9 @@ export const DialogSelectModelUnpaid: Component = () => {
   })
 
   return (
-    <Dialog title="Select model">
+    <Dialog title={language.t("dialog.selectModel")}>
       <div class="flex flex-col gap-3 px-2.5">
-        <div class="text-14-medium text-text-base px-2.5">Free models provided by OpenCode</div>
+        <div class="text-14-medium text-text-base px-2.5">{language.t("model.freeProvided")}</div>
         <List
           ref={(ref) => (listRef = ref)}
           items={local.model.list}
@@ -48,9 +50,9 @@ export const DialogSelectModelUnpaid: Component = () => {
           {(i) => (
             <div class="w-full flex items-center gap-x-2.5">
               <span>{i.name}</span>
-              <Tag>Free</Tag>
+              <Tag>{language.t("tag.free")}</Tag>
               <Show when={i.latest}>
-                <Tag>Latest</Tag>
+                <Tag>{language.t("tag.latest")}</Tag>
               </Show>
             </div>
           )}
@@ -61,7 +63,7 @@ export const DialogSelectModelUnpaid: Component = () => {
       <div class="px-1.5 pb-1.5">
         <div class="w-full rounded-sm border border-border-weak-base bg-surface-raised-base">
           <div class="w-full flex flex-col items-start gap-4 px-1.5 pt-4 pb-4">
-            <div class="px-2 text-14-medium text-text-base">Add more models from popular providers</div>
+            <div class="px-2 text-14-medium text-text-base">{language.t("model.addMore")}</div>
             <div class="w-full">
               <List
                 class="w-full px-0"
@@ -83,10 +85,10 @@ export const DialogSelectModelUnpaid: Component = () => {
                     <ProviderIcon data-slot="list-item-extra-icon" id={i.id as IconName} />
                     <span>{i.name}</span>
                     <Show when={i.id === "opencode"}>
-                      <Tag>Recommended</Tag>
+                      <Tag>{language.t("tag.recommended")}</Tag>
                     </Show>
                     <Show when={i.id === "anthropic"}>
-                      <div class="text-14-regular text-text-weak">Connect with Claude Pro/Max or API key</div>
+                      <div class="text-14-regular text-text-weak">{language.t("provider.connectClaude")}</div>
                     </Show>
                   </div>
                 )}
@@ -99,7 +101,7 @@ export const DialogSelectModelUnpaid: Component = () => {
                   dialog.show(() => <DialogSelectProvider />)
                 }}
               >
-                View all providers
+                {language.t("provider.viewAll")}
               </Button>
             </div>
           </div>
diff --git a/packages/app/src/components/dialog-select-model.tsx b/packages/app/src/components/dialog-select-model.tsx
index d54f9369af1..ecabf93274d 100644
--- a/packages/app/src/components/dialog-select-model.tsx
+++ b/packages/app/src/components/dialog-select-model.tsx
@@ -9,6 +9,7 @@ import { Dialog } from "@opencode-ai/ui/dialog"
 import { List } from "@opencode-ai/ui/list"
 import { DialogSelectProvider } from "./dialog-select-provider"
 import { DialogManageModels } from "./dialog-manage-models"
+import { useLanguage } from "@/context/language"
 
 const ModelList: Component<{
   provider?: string
@@ -16,6 +17,7 @@ const ModelList: Component<{
   onSelect: () => void
 }> = (props) => {
   const local = useLocal()
+  const language = useLanguage()
 
   const models = createMemo(() =>
     local.model
@@ -27,8 +29,8 @@ const ModelList: Component<{
   return (
     <List
       class={`flex-1 min-h-0 [&_[data-slot=list-scroll]]:flex-1 [&_[data-slot=list-scroll]]:min-h-0 ${props.class ?? ""}`}
-      search={{ placeholder: "Search models", autofocus: true }}
-      emptyMessage="No model results"
+      search={{ placeholder: language.t("model.search"), autofocus: true }}
+      emptyMessage={language.t("model.empty")}
       key={(x) => `${x.provider.id}:${x.id}`}
       items={models}
       current={local.model.current()}
@@ -55,10 +57,10 @@ const ModelList: Component<{
         <div class="w-full flex items-center gap-x-2 text-13-regular">
           <span class="truncate">{i.name}</span>
           <Show when={i.provider.id === "opencode" && (!i.cost || i.cost?.input === 0)}>
-            <Tag>Free</Tag>
+            <Tag>{language.t("tag.free")}</Tag>
           </Show>
           <Show when={i.latest}>
-            <Tag>Latest</Tag>
+            <Tag>{language.t("tag.latest")}</Tag>
           </Show>
         </div>
       )}
@@ -71,13 +73,14 @@ export const ModelSelectorPopover: Component<{
   children: JSX.Element
 }> = (props) => {
   const [open, setOpen] = createSignal(false)
+  const language = useLanguage()
 
   return (
     <Kobalte open={open()} onOpenChange={setOpen} placement="top-start" gutter={8}>
       <Kobalte.Trigger as="div">{props.children}</Kobalte.Trigger>
       <Kobalte.Portal>
         <Kobalte.Content class="w-72 h-80 flex flex-col rounded-md border border-border-base bg-surface-raised-stronger-non-alpha shadow-md z-50 outline-none overflow-hidden">
-          <Kobalte.Title class="sr-only">Select model</Kobalte.Title>
+          <Kobalte.Title class="sr-only">{language.t("dialog.selectModel")}</Kobalte.Title>
           <ModelList provider={props.provider} onSelect={() => setOpen(false)} class="p-1" />
         </Kobalte.Content>
       </Kobalte.Portal>
@@ -87,10 +90,11 @@ export const ModelSelectorPopover: Component<{
 
 export const DialogSelectModel: Component<{ provider?: string }> = (props) => {
   const dialog = useDialog()
+  const language = useLanguage()
 
   return (
     <Dialog
-      title="Select model"
+      title={language.t("dialog.selectModel")}
       action={
         <Button
           class="h-7 -my-1 text-14-medium"
@@ -98,7 +102,7 @@ export const DialogSelectModel: Component<{ provider?: string }> = (props) => {
           tabIndex={-1}
           onClick={() => dialog.show(() => <DialogSelectProvider />)}
         >
-          Connect provider
+          {language.t("provider.connect")}
         </Button>
       }
     >
@@ -108,7 +112,7 @@ export const DialogSelectModel: Component<{ provider?: string }> = (props) => {
         class="ml-3 mt-5 mb-6 text-text-base self-start"
         onClick={() => dialog.show(() => <DialogManageModels />)}
       >
-        Manage models
+        {language.t("model.manageTitle")}
       </Button>
     </Dialog>
   )
diff --git a/packages/app/src/components/dialog-select-provider.tsx b/packages/app/src/components/dialog-select-provider.tsx
index 5bbde5d41a2..61d342572d5 100644
--- a/packages/app/src/components/dialog-select-provider.tsx
+++ b/packages/app/src/components/dialog-select-provider.tsx
@@ -7,28 +7,35 @@ import { Tag } from "@opencode-ai/ui/tag"
 import { ProviderIcon } from "@opencode-ai/ui/provider-icon"
 import { IconName } from "@opencode-ai/ui/icons/provider"
 import { DialogConnectProvider } from "./dialog-connect-provider"
+import { useLanguage } from "@/context/language"
 
 export const DialogSelectProvider: Component = () => {
   const dialog = useDialog()
   const providers = useProviders()
+  const language = useLanguage()
+  const popularCategory = "popular"
+  const otherCategory = "other"
 
   return (
-    <Dialog title="Connect provider">
+    <Dialog title={language.t("provider.connect")}>
       <List
-        search={{ placeholder: "Search providers", autofocus: true }}
+        search={{ placeholder: language.t("provider.search"), autofocus: true }}
         activeIcon="plus-small"
         key={(x) => x?.id}
         items={providers.all}
         filterKeys={["id", "name"]}
-        groupBy={(x) => (popularProviders.includes(x.id) ? "Popular" : "Other")}
+        groupBy={(x) => (popularProviders.includes(x.id) ? popularCategory : otherCategory)}
+        groupLabel={(category) =>
+          category === popularCategory ? language.t("provider.popular") : language.t("provider.other")
+        }
         sortBy={(a, b) => {
           if (popularProviders.includes(a.id) && popularProviders.includes(b.id))
             return popularProviders.indexOf(a.id) - popularProviders.indexOf(b.id)
           return a.name.localeCompare(b.name)
         }}
         sortGroupsBy={(a, b) => {
-          if (a.category === "Popular" && b.category !== "Popular") return -1
-          if (b.category === "Popular" && a.category !== "Popular") return 1
+          if (a.category === popularCategory && b.category !== popularCategory) return -1
+          if (b.category === popularCategory && a.category !== popularCategory) return 1
           return 0
         }}
         onSelect={(x) => {
@@ -41,10 +48,10 @@ export const DialogSelectProvider: Component = () => {
             <ProviderIcon data-slot="list-item-extra-icon" id={i.id as IconName} />
             <span>{i.name}</span>
             <Show when={i.id === "opencode"}>
-              <Tag>Recommended</Tag>
+              <Tag>{language.t("tag.recommended")}</Tag>
             </Show>
             <Show when={i.id === "anthropic"}>
-              <div class="text-14-regular text-text-weak">Connect with Claude Pro/Max or API key</div>
+              <div class="text-14-regular text-text-weak">{language.t("provider.connectClaude")}</div>
             </Show>
           </div>
         )}
diff --git a/packages/app/src/components/dialog-select-server.tsx b/packages/app/src/components/dialog-select-server.tsx
index 90f37212888..3ebeff0e8dc 100644
--- a/packages/app/src/components/dialog-select-server.tsx
+++ b/packages/app/src/components/dialog-select-server.tsx
@@ -10,6 +10,7 @@ import { normalizeServerUrl, serverDisplayName, useServer } from "@/context/serv
 import { usePlatform } from "@/context/platform"
 import { createOpencodeClient } from "@opencode-ai/sdk/v2/client"
 import { useNavigate } from "@solidjs/router"
+import { useLanguage } from "@/context/language"
 
 type ServerStatus = { healthy: boolean; version?: string }
 
@@ -30,6 +31,7 @@ export function DialogSelectServer() {
   const dialog = useDialog()
   const server = useServer()
   const platform = usePlatform()
+  const language = useLanguage()
   const [store, setStore] = createStore({
     url: "",
     adding: false,
@@ -109,7 +111,7 @@ export function DialogSelectServer() {
     setStore("adding", false)
 
     if (!result.healthy) {
-      setStore("error", "Could not connect to server")
+      setStore("error", language.t("server.connectFailed"))
       return
     }
 
@@ -122,11 +124,11 @@ export function DialogSelectServer() {
   }
 
   return (
-    <Dialog title="Servers" description="Switch which OpenCode server this app connects to.">
+    <Dialog title={language.t("server.title")} description={language.t("server.description")}>
       <div class="flex flex-col gap-4 pb-4">
         <List
-          search={{ placeholder: "Search servers", autofocus: true }}
-          emptyMessage="No servers yet"
+          search={{ placeholder: language.t("server.search"), autofocus: true }}
+          emptyMessage={language.t("server.empty")}
           items={sortedItems}
           key={(x) => x}
           current={current()}
@@ -168,14 +170,14 @@ export function DialogSelectServer() {
 
         <div class="mt-6 px-3 flex flex-col gap-1.5">
           <div class="px-3">
-            <h3 class="text-14-regular text-text-weak">Add a server</h3>
+            <h3 class="text-14-regular text-text-weak">{language.t("server.add")}</h3>
           </div>
           <form onSubmit={handleSubmit}>
             <div class="flex items-start gap-2">
               <div class="flex-1 min-w-0 h-auto">
                 <TextField
                   type="text"
-                  label="Server URL"
+                  label={language.t("server.urlLabel")}
                   hideLabel
                   placeholder="http://localhost:4096"
                   value={store.url}
@@ -188,7 +190,7 @@ export function DialogSelectServer() {
                 />
               </div>
               <Button type="submit" variant="secondary" icon="plus-small" size="large" disabled={store.adding}>
-                {store.adding ? "Checking..." : "Add"}
+                {store.adding ? language.t("common.checking") : language.t("common.add")}
               </Button>
             </div>
           </form>
@@ -197,9 +199,9 @@ export function DialogSelectServer() {
         <Show when={isDesktop}>
           <div class="mt-6 px-3 flex flex-col gap-1.5">
             <div class="px-3">
-              <h3 class="text-14-regular text-text-weak">Default server</h3>
+              <h3 class="text-14-regular text-text-weak">{language.t("server.default")}</h3>
               <p class="text-12-regular text-text-weak mt-1">
-                Connect to this server on app launch instead of starting a local server. Requires restart.
+                {language.t("server.defaultDescription")}
               </p>
             </div>
             <div class="flex items-center gap-2 px-3 py-2">
@@ -208,7 +210,7 @@ export function DialogSelectServer() {
                 fallback={
                   <Show
                     when={server.url}
-                    fallback={<span class="text-14-regular text-text-weak">No server selected</span>}
+                    fallback={<span class="text-14-regular text-text-weak">{language.t("server.noneSelected")}</span>}
                   >
                     <Button
                       variant="secondary"
@@ -218,7 +220,7 @@ export function DialogSelectServer() {
                         defaultUrlActions.refetch(server.url)
                       }}
                     >
-                      Set current server as default
+                      {language.t("server.setDefault")}
                     </Button>
                   </Show>
                 }
@@ -234,7 +236,7 @@ export function DialogSelectServer() {
                     defaultUrlActions.refetch()
                   }}
                 >
-                  Clear
+                  {language.t("common.clear")}
                 </Button>
               </Show>
             </div>
diff --git a/packages/app/src/components/prompt-input.tsx b/packages/app/src/components/prompt-input.tsx
index 56bbdc8cb55..fbf4bdae41c 100644
--- a/packages/app/src/components/prompt-input.tsx
+++ b/packages/app/src/components/prompt-input.tsx
@@ -51,6 +51,7 @@ import { SessionContextUsage } from "@/components/session-context-usage"
 import { usePermission } from "@/context/permission"
 import { useGlobalSync } from "@/context/global-sync"
 import { usePlatform } from "@/context/platform"
+import { useLanguage } from "@/context/language"
 import { createOpencodeClient, type Message, type Part } from "@opencode-ai/sdk/v2/client"
 import { Binary } from "@opencode-ai/util/binary"
 import { showToast } from "@opencode-ai/ui/toast"
@@ -118,6 +119,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
   const providers = useProviders()
   const command = useCommand()
   const permission = usePermission()
+  const language = useLanguage()
   let editorRef!: HTMLDivElement
   let fileInputRef!: HTMLInputElement
   let scrollRef!: HTMLDivElement
@@ -998,8 +1000,8 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
     const currentAgent = local.agent.current()
     if (!currentModel || !currentAgent) {
       showToast({
-        title: "Select an agent and model",
-        description: "Choose an agent and model before sending a prompt.",
+        title: language.t("prompt.selectAgentModelTitle"),
+        description: language.t("prompt.selectAgentModelDescription"),
       })
       return
     }
@@ -1010,7 +1012,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
         if (data?.message) return data.message
       }
       if (err instanceof Error) return err.message
-      return "Request failed"
+      return language.t("common.requestFailed")
     }
 
     addToHistory(currentPrompt, mode)
@@ -1031,7 +1033,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
           .then((x) => x.data)
           .catch((err) => {
             showToast({
-              title: "Failed to create worktree",
+              title: language.t("prompt.failedCreateWorktree"),
               description: errorMessage(err),
             })
             return undefined
@@ -1039,8 +1041,8 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
 
         if (!createdWorktree?.directory) {
           showToast({
-            title: "Failed to create worktree",
-            description: "Request failed",
+            title: language.t("prompt.failedCreateWorktree"),
+            description: language.t("common.requestFailed"),
           })
           return
         }
@@ -1115,7 +1117,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
         })
         .catch((err) => {
           showToast({
-            title: "Failed to send shell command",
+            title: language.t("prompt.failedSendShell"),
             description: errorMessage(err),
           })
           restoreInput()
@@ -1147,7 +1149,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
           })
           .catch((err) => {
             showToast({
-              title: "Failed to send command",
+              title: language.t("prompt.failedSendCommand"),
               description: errorMessage(err),
             })
             restoreInput()
@@ -1315,7 +1317,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
       })
       .catch((err) => {
         showToast({
-          title: "Failed to send prompt",
+          title: language.t("prompt.failedSendPrompt"),
           description: errorMessage(err),
         })
         removeOptimisticMessage()
@@ -1339,7 +1341,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
             <Match when={store.popover === "at"}>
               <Show
                 when={atFlat().length > 0}
-                fallback={<div class="text-text-weak px-2 py-1">No matching results</div>}
+                fallback={<div class="text-text-weak px-2 py-1">{language.t("prompt.noMatches")}</div>}
               >
                 <For each={atFlat().slice(0, 10)}>
                   {(item) => (
@@ -1385,7 +1387,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
             <Match when={store.popover === "slash"}>
               <Show
                 when={slashFlat().length > 0}
-                fallback={<div class="text-text-weak px-2 py-1">No matching commands</div>}
+                fallback={<div class="text-text-weak px-2 py-1">{language.t("prompt.noCommands")}</div>}
               >
                 <For each={slashFlat()}>
                   {(cmd) => (
@@ -1407,7 +1409,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                       <div class="flex items-center gap-2 shrink-0">
                         <Show when={cmd.type === "custom"}>
                           <span class="text-11-regular text-text-subtle px-1.5 py-0.5 bg-surface-base rounded">
-                            custom
+                            {language.t("prompt.customCommand")}
                           </span>
                         </Show>
                         <Show when={command.keybind(cmd.id)}>
@@ -1436,7 +1438,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
           <div class="absolute inset-0 z-10 flex items-center justify-center bg-surface-raised-stronger-non-alpha/90 pointer-events-none">
             <div class="flex flex-col items-center gap-2 text-text-weak">
               <Icon name="photo" class="size-8" />
-              <span class="text-14-regular">Drop images or PDFs here</span>
+              <span class="text-14-regular">{language.t("prompt.dropFiles")}</span>
             </div>
           </div>
         </Show>
@@ -1449,7 +1451,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                   <div class="flex items-center text-12-regular min-w-0">
                     <span class="text-text-weak whitespace-nowrap truncate min-w-0">{getDirectory(path())}</span>
                     <span class="text-text-strong whitespace-nowrap">{getFilename(path())}</span>
-                    <span class="text-text-weak whitespace-nowrap ml-1">active</span>
+                    <span class="text-text-weak whitespace-nowrap ml-1">{language.t("prompt.active")}</span>
                   </div>
                   <IconButton
                     type="button"
@@ -1468,7 +1470,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                 onClick={() => prompt.context.addActive()}
               >
                 <Icon name="plus-small" size="small" />
-                <span>Include active file</span>
+                <span>{language.t("prompt.includeActiveFile")}</span>
               </button>
             </Show>
             <For each={prompt.context.items()}>
@@ -1561,8 +1563,8 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
           <Show when={!prompt.dirty()}>
             <div class="absolute top-0 inset-x-0 px-5 py-3 pr-12 text-14-regular text-text-weak pointer-events-none whitespace-nowrap truncate">
               {store.mode === "shell"
-                ? "Enter shell command..."
-                : `Ask anything... "${PLACEHOLDERS[store.placeholder]}"`}
+                ? language.t("prompt.shellPlaceholder")
+                : language.t("prompt.askAnything", { example: PLACEHOLDERS[store.placeholder] })}
             </div>
           </Show>
         </div>
@@ -1572,12 +1574,16 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
               <Match when={store.mode === "shell"}>
                 <div class="flex items-center gap-2 px-2 h-6">
                   <Icon name="console" size="small" class="text-icon-primary" />
-                  <span class="text-12-regular text-text-primary">Shell</span>
-                  <span class="text-12-regular text-text-weak">esc to exit</span>
+                  <span class="text-12-regular text-text-primary">{language.t("prompt.shellMode")}</span>
+                  <span class="text-12-regular text-text-weak">{language.t("prompt.shellExitHint")}</span>
                 </div>
               </Match>
               <Match when={store.mode === "normal"}>
-                <TooltipKeybind placement="top" title="Cycle agent" keybind={command.keybind("agent.cycle")}>
+                <TooltipKeybind
+                  placement="top"
+                  title={language.t("command.title.cycleAgent")}
+                  keybind={command.keybind("agent.cycle")}
+                >
                   <Select
                     options={local.agent.list().map((agent) => agent.name)}
                     current={local.agent.current()?.name ?? ""}
@@ -1589,24 +1595,32 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                 <Show
                   when={providers.paid().length > 0}
                   fallback={
-                    <TooltipKeybind placement="top" title="Choose model" keybind={command.keybind("model.choose")}>
+                    <TooltipKeybind
+                      placement="top"
+                      title={language.t("command.title.chooseModel")}
+                      keybind={command.keybind("model.choose")}
+                    >
                       <Button as="div" variant="ghost" onClick={() => dialog.show(() => <DialogSelectModelUnpaid />)}>
                         <Show when={local.model.current()?.provider?.id}>
                           <ProviderIcon id={local.model.current()!.provider.id as IconName} class="size-4 shrink-0" />
                         </Show>
-                        {local.model.current()?.name ?? "Select model"}
+                        {local.model.current()?.name ?? language.t("dialog.selectModel")}
                         <Icon name="chevron-down" size="small" />
                       </Button>
                     </TooltipKeybind>
                   }
                 >
                   <ModelSelectorPopover>
-                    <TooltipKeybind placement="top" title="Choose model" keybind={command.keybind("model.choose")}>
+                    <TooltipKeybind
+                      placement="top"
+                      title={language.t("command.title.chooseModel")}
+                      keybind={command.keybind("model.choose")}
+                    >
                       <Button as="div" variant="ghost">
                         <Show when={local.model.current()?.provider?.id}>
                           <ProviderIcon id={local.model.current()!.provider.id as IconName} class="size-4 shrink-0" />
                         </Show>
-                        {local.model.current()?.name ?? "Select model"}
+                        {local.model.current()?.name ?? language.t("dialog.selectModel")}
                         <Icon name="chevron-down" size="small" />
                       </Button>
                     </TooltipKeybind>
@@ -1615,7 +1629,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                 <Show when={local.model.variant.list().length > 0}>
                   <TooltipKeybind
                     placement="top"
-                    title="Thinking effort"
+                    title={language.t("command.title.cycleThinking")}
                     keybind={command.keybind("model.variant.cycle")}
                   >
                     <Button
@@ -1623,14 +1637,14 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                       class="text-text-base _hidden group-hover/prompt-input:inline-block capitalize text-12-regular"
                       onClick={() => local.model.variant.cycle()}
                     >
-                      {local.model.variant.current() ?? "Default"}
+                      {local.model.variant.current() ?? language.t("model.defaultVariant")}
                     </Button>
                   </TooltipKeybind>
                 </Show>
                 <Show when={permission.permissionsEnabled() && params.id}>
                   <TooltipKeybind
                     placement="top"
-                    title="Auto-accept edits"
+                    title={language.t("command.title.autoAcceptEdits")}
                     keybind={command.keybind("permissions.autoaccept")}
                   >
                     <Button
@@ -1668,7 +1682,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
             <div class="flex items-center gap-2">
               <SessionContextUsage />
               <Show when={store.mode === "normal"}>
-                <Tooltip placement="top" value="Attach file">
+                <Tooltip placement="top" value={language.t("prompt.attachFile")}>
                   <Button type="button" variant="ghost" class="size-6" onClick={() => fileInputRef.click()}>
                     <Icon name="photo" class="size-4.5" />
                   </Button>
@@ -1682,13 +1696,13 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                 <Switch>
                   <Match when={working()}>
                     <div class="flex items-center gap-2">
-                      <span>Stop</span>
+                      <span>{language.t("common.stop")}</span>
                       <span class="text-icon-base text-12-medium text-[10px]!">ESC</span>
                     </div>
                   </Match>
                   <Match when={true}>
                     <div class="flex items-center gap-2">
-                      <span>Send</span>
+                      <span>{language.t("common.send")}</span>
                       <Icon name="enter" size="small" class="text-icon-base" />
                     </div>
                   </Match>
diff --git a/packages/app/src/components/session-context-usage.tsx b/packages/app/src/components/session-context-usage.tsx
index 680f327130e..208a784d459 100644
--- a/packages/app/src/components/session-context-usage.tsx
+++ b/packages/app/src/components/session-context-usage.tsx
@@ -7,6 +7,7 @@ import { AssistantMessage } from "@opencode-ai/sdk/v2/client"
 
 import { useLayout } from "@/context/layout"
 import { useSync } from "@/context/sync"
+import { useLanguage } from "@/context/language"
 
 interface SessionContextUsageProps {
   variant?: "button" | "indicator"
@@ -16,6 +17,7 @@ export function SessionContextUsage(props: SessionContextUsageProps) {
   const sync = useSync()
   const params = useParams()
   const layout = useLayout()
+  const language = useLanguage()
 
   const variant = createMemo(() => props.variant ?? "button")
   const sessionKey = createMemo(() => `${params.dir}${params.id ? "/" + params.id : ""}`)
@@ -67,21 +69,21 @@ export function SessionContextUsage(props: SessionContextUsageProps) {
           <>
             <div class="flex items-center gap-2">
               <span class="text-text-invert-strong">{ctx().tokens}</span>
-              <span class="text-text-invert-base">Tokens</span>
+              <span class="text-text-invert-base">{language.t("context.tokens")}</span>
             </div>
             <div class="flex items-center gap-2">
               <span class="text-text-invert-strong">{ctx().percentage ?? 0}%</span>
-              <span class="text-text-invert-base">Usage</span>
+              <span class="text-text-invert-base">{language.t("context.usage")}</span>
             </div>
           </>
         )}
       </Show>
       <div class="flex items-center gap-2">
         <span class="text-text-invert-strong">{cost()}</span>
-        <span class="text-text-invert-base">Cost</span>
+        <span class="text-text-invert-base">{language.t("context.cost")}</span>
       </div>
       <Show when={variant() === "button"}>
-        <div class="text-11-regular text-text-invert-base mt-1">Click to view context</div>
+        <div class="text-11-regular text-text-invert-base mt-1">{language.t("context.clickToView")}</div>
       </Show>
     </div>
   )
diff --git a/packages/app/src/components/session-mcp-indicator.tsx b/packages/app/src/components/session-mcp-indicator.tsx
index 489223b9bf5..ecd0de78a17 100644
--- a/packages/app/src/components/session-mcp-indicator.tsx
+++ b/packages/app/src/components/session-mcp-indicator.tsx
@@ -3,10 +3,12 @@ import { Button } from "@opencode-ai/ui/button"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { useSync } from "@/context/sync"
 import { DialogSelectMcp } from "@/components/dialog-select-mcp"
+import { useLanguage } from "@/context/language"
 
 export function SessionMcpIndicator() {
   const sync = useSync()
   const dialog = useDialog()
+  const language = useLanguage()
 
   const mcpStats = createMemo(() => {
     const mcp = sync.data.mcp ?? {}
@@ -27,7 +29,9 @@ export function SessionMcpIndicator() {
             "bg-icon-success-base": !mcpStats().failed && mcpStats().enabled > 0,
           }}
         />
-        <span class="text-12-regular text-text-weak">{mcpStats().enabled} MCP</span>
+        <span class="text-12-regular text-text-weak">
+          {language.t("mcp.count", { count: mcpStats().enabled })}
+        </span>
       </Button>
     </Show>
   )
diff --git a/packages/app/src/components/session/session-context-tab.tsx b/packages/app/src/components/session/session-context-tab.tsx
index a975f9fa56f..69e89f94de0 100644
--- a/packages/app/src/components/session/session-context-tab.tsx
+++ b/packages/app/src/components/session/session-context-tab.tsx
@@ -11,6 +11,7 @@ import { StickyAccordionHeader } from "@opencode-ai/ui/sticky-accordion-header"
 import { Code } from "@opencode-ai/ui/code"
 import { Markdown } from "@opencode-ai/ui/markdown"
 import type { AssistantMessage, Message, Part, UserMessage } from "@opencode-ai/sdk/v2/client"
+import { useLanguage } from "@/context/language"
 
 interface SessionContextTabProps {
   messages: () => Message[]
@@ -22,6 +23,7 @@ interface SessionContextTabProps {
 export function SessionContextTab(props: SessionContextTabProps) {
   const params = useParams()
   const sync = useSync()
+  const language = useLanguage()
 
   const ctx = createMemo(() => {
     const last = props.messages().findLast((x) => {
@@ -172,7 +174,7 @@ export function SessionContextTab(props: SessionContextTabProps) {
           return [
             {
               key: "system",
-              label: "System",
+              label: language.t("context.system"),
               tokens: tokens.system,
               width: pct(tokens.system),
               percent: pctLabel(tokens.system),
@@ -180,7 +182,7 @@ export function SessionContextTab(props: SessionContextTabProps) {
             },
             {
               key: "user",
-              label: "User",
+              label: language.t("context.user"),
               tokens: tokens.user,
               width: pct(tokens.user),
               percent: pctLabel(tokens.user),
@@ -188,7 +190,7 @@ export function SessionContextTab(props: SessionContextTabProps) {
             },
             {
               key: "assistant",
-              label: "Assistant",
+              label: language.t("context.assistant"),
               tokens: tokens.assistant,
               width: pct(tokens.assistant),
               percent: pctLabel(tokens.assistant),
@@ -196,7 +198,7 @@ export function SessionContextTab(props: SessionContextTabProps) {
             },
             {
               key: "tool",
-              label: "Tool Calls",
+              label: language.t("context.toolCalls"),
               tokens: tokens.tool,
               width: pct(tokens.tool),
               percent: pctLabel(tokens.tool),
@@ -204,7 +206,7 @@ export function SessionContextTab(props: SessionContextTabProps) {
             },
             {
               key: "other",
-              label: "Other",
+              label: language.t("context.other"),
               tokens: tokens.other,
               width: pct(tokens.other),
               percent: pctLabel(tokens.other),
@@ -243,22 +245,22 @@ export function SessionContextTab(props: SessionContextTabProps) {
     const c = ctx()
     const count = counts()
     return [
-      { label: "Session", value: props.info()?.title ?? params.id ?? "—" },
-      { label: "Messages", value: count.all.toLocaleString() },
-      { label: "Provider", value: providerLabel() },
-      { label: "Model", value: modelLabel() },
-      { label: "Context Limit", value: number(c?.limit) },
-      { label: "Total Tokens", value: number(c?.total) },
-      { label: "Usage", value: percent(c?.usage) },
-      { label: "Input Tokens", value: number(c?.input) },
-      { label: "Output Tokens", value: number(c?.output) },
-      { label: "Reasoning Tokens", value: number(c?.reasoning) },
-      { label: "Cache Tokens (read/write)", value: `${number(c?.cacheRead)} / ${number(c?.cacheWrite)}` },
-      { label: "User Messages", value: count.user.toLocaleString() },
-      { label: "Assistant Messages", value: count.assistant.toLocaleString() },
-      { label: "Total Cost", value: cost() },
-      { label: "Session Created", value: time(props.info()?.time.created) },
-      { label: "Last Activity", value: time(c?.message.time.created) },
+      { label: language.t("context.session"), value: props.info()?.title ?? params.id ?? "—" },
+      { label: language.t("context.messages"), value: count.all.toLocaleString() },
+      { label: language.t("context.provider"), value: providerLabel() },
+      { label: language.t("context.model"), value: modelLabel() },
+      { label: language.t("context.contextLimit"), value: number(c?.limit) },
+      { label: language.t("context.totalTokens"), value: number(c?.total) },
+      { label: language.t("context.usage"), value: percent(c?.usage) },
+      { label: language.t("context.inputTokens"), value: number(c?.input) },
+      { label: language.t("context.outputTokens"), value: number(c?.output) },
+      { label: language.t("context.reasoningTokens"), value: number(c?.reasoning) },
+      { label: language.t("context.cacheTokens"), value: `${number(c?.cacheRead)} / ${number(c?.cacheWrite)}` },
+      { label: language.t("context.userMessages"), value: count.user.toLocaleString() },
+      { label: language.t("context.assistantMessages"), value: count.assistant.toLocaleString() },
+      { label: language.t("context.totalCost"), value: cost() },
+      { label: language.t("context.sessionCreated"), value: time(props.info()?.time.created) },
+      { label: language.t("context.lastActivity"), value: time(c?.message.time.created) },
     ] satisfies { label: string; value: JSX.Element }[]
   })
 
@@ -371,7 +373,7 @@ export function SessionContextTab(props: SessionContextTabProps) {
 
         <Show when={breakdown().length > 0}>
           <div class="flex flex-col gap-2">
-            <div class="text-12-regular text-text-weak">Context Breakdown</div>
+            <div class="text-12-regular text-text-weak">{language.t("context.breakdown")}</div>
             <div class="h-2 w-full rounded-full bg-surface-base overflow-hidden flex">
               <For each={breakdown()}>
                 {(segment) => (
@@ -397,7 +399,7 @@ export function SessionContextTab(props: SessionContextTabProps) {
               </For>
             </div>
             <div class="hidden text-11-regular text-text-weaker">
-              Approximate breakdown of input tokens. "Other" includes tool definitions and overhead.
+              {language.t("context.breakdownNote")}
             </div>
           </div>
         </Show>
@@ -405,7 +407,7 @@ export function SessionContextTab(props: SessionContextTabProps) {
         <Show when={systemPrompt()}>
           {(prompt) => (
             <div class="flex flex-col gap-2">
-              <div class="text-12-regular text-text-weak">System Prompt</div>
+              <div class="text-12-regular text-text-weak">{language.t("context.systemPrompt")}</div>
               <div class="border border-border-base rounded-md bg-surface-base px-3 py-2">
                 <Markdown text={prompt()} class="text-12-regular" />
               </div>
@@ -414,7 +416,7 @@ export function SessionContextTab(props: SessionContextTabProps) {
         </Show>
 
         <div class="flex flex-col gap-2">
-          <div class="text-12-regular text-text-weak">Raw messages</div>
+          <div class="text-12-regular text-text-weak">{language.t("context.rawMessages")}</div>
           <Accordion multiple>
             <For each={props.messages()}>{(message) => <RawMessage message={message} />}</For>
           </Accordion>
diff --git a/packages/app/src/components/session/session-header.tsx b/packages/app/src/components/session/session-header.tsx
index 7cded4bce29..a9964f64638 100644
--- a/packages/app/src/components/session/session-header.tsx
+++ b/packages/app/src/components/session/session-header.tsx
@@ -19,6 +19,7 @@ import { Tooltip, TooltipKeybind } from "@opencode-ai/ui/tooltip"
 import { Popover } from "@opencode-ai/ui/popover"
 import { TextField } from "@opencode-ai/ui/text-field"
 import { Keybind } from "@opencode-ai/ui/keybind"
+import { useLanguage } from "@/context/language"
 
 export function SessionHeader() {
   const globalSDK = useGlobalSDK()
@@ -29,6 +30,7 @@ export function SessionHeader() {
   // const dialog = useDialog()
   const sync = useSync()
   const platform = usePlatform()
+  const language = useLanguage()
 
   const projectDirectory = createMemo(() => base64Decode(params.dir ?? ""))
   const project = createMemo(() => {
@@ -136,7 +138,7 @@ export function SessionHeader() {
               <div class="flex min-w-0 flex-1 items-center gap-2 overflow-visible">
                 <Icon name="magnifying-glass" size="normal" class="icon-base shrink-0" />
                 <span class="flex-1 min-w-0 text-14-regular text-text-weak truncate h-4.5 flex items-center">
-                  Search {name()}
+                  {language.t("session.searchProject", { project: name() })}
                 </span>
               </div>
 
@@ -175,7 +177,7 @@ export function SessionHeader() {
                 <Show when={currentSession()?.summary?.files}>
                   <TooltipKeybind
                     class="hidden md:block shrink-0"
-                    title="Toggle review"
+                    title={language.t("review.toggle")}
                     keybind={command.keybind("review.toggle")}
                   >
                     <Button
@@ -205,7 +207,7 @@ export function SessionHeader() {
                 </Show>
                 <TooltipKeybind
                   class="hidden md:block shrink-0"
-                  title="Toggle terminal"
+                  title={language.t("terminal.toggle")}
                   keybind={command.keybind("terminal.toggle")}
                 >
                   <Button
@@ -236,20 +238,20 @@ export function SessionHeader() {
               <Show when={shareEnabled() && currentSession()}>
                 <div class="flex items-center">
                   <Popover
-                    title="Publish on web"
+                    title={language.t("session.shareDialogTitle")}
                     description={
                       shareUrl()
-                        ? "This session is public on the web. It is accessible to anyone with the link."
-                        : "Share session publicly on the web. It will be accessible to anyone with the link."
+                        ? language.t("session.shareDialogDescriptionPublic")
+                        : language.t("session.shareDialogDescriptionPrivate")
                     }
                     trigger={
-                      <Tooltip class="shrink-0" value="Share session">
+                      <Tooltip class="shrink-0" value={language.t("session.share")}>
                         <Button
                           variant="secondary"
                           classList={{ "rounded-r-none": shareUrl() !== undefined }}
                           style={{ scale: 1 }}
                         >
-                          Share
+                          {language.t("session.share")}
                         </Button>
                       </Tooltip>
                     }
@@ -266,7 +268,7 @@ export function SessionHeader() {
                               onClick={shareSession}
                               disabled={state.share}
                             >
-                              {state.share ? "Publishing..." : "Publish"}
+                              {state.share ? language.t("session.publishingAction") : language.t("session.publishAction")}
                             </Button>
                           </div>
                         }
@@ -281,7 +283,7 @@ export function SessionHeader() {
                               onClick={unshareSession}
                               disabled={state.unshare}
                             >
-                              {state.unshare ? "Unpublishing..." : "Unpublish"}
+                              {state.unshare ? language.t("session.unpublishingAction") : language.t("session.unpublishAction")}
                             </Button>
                             <Button
                               size="large"
@@ -290,7 +292,7 @@ export function SessionHeader() {
                               onClick={viewShare}
                               disabled={state.unshare}
                             >
-                              View
+                              {language.t("session.viewAction")}
                             </Button>
                           </div>
                         </div>
@@ -298,7 +300,7 @@ export function SessionHeader() {
                     </div>
                   </Popover>
                   <Show when={shareUrl()} fallback={<div class="size-6" aria-hidden="true" />}>
-                    <Tooltip value={state.copied ? "Copied" : "Copy link"} placement="top" gutter={8}>
+                    <Tooltip value={state.copied ? language.t("session.copied") : language.t("session.copyLink")} placement="top" gutter={8}>
                       <IconButton
                         icon={state.copied ? "check" : "copy"}
                         variant="secondary"
diff --git a/packages/app/src/components/session/session-new-view.tsx b/packages/app/src/components/session/session-new-view.tsx
index 68ef0cc1f2b..5a1fd861b2f 100644
--- a/packages/app/src/components/session/session-new-view.tsx
+++ b/packages/app/src/components/session/session-new-view.tsx
@@ -4,6 +4,7 @@ import { useSync } from "@/context/sync"
 import { Icon } from "@opencode-ai/ui/icon"
 import { getDirectory, getFilename } from "@opencode-ai/util/path"
 import { Select } from "@opencode-ai/ui/select"
+import { useLanguage } from "@/context/language"
 
 const MAIN_WORKTREE = "main"
 const CREATE_WORKTREE = "create"
@@ -15,6 +16,7 @@ interface NewSessionViewProps {
 
 export function NewSessionView(props: NewSessionViewProps) {
   const sync = useSync()
+  const language = useLanguage()
 
   const sandboxes = createMemo(() => sync.project?.sandboxes ?? [])
   const options = createMemo(() => [MAIN_WORKTREE, ...sandboxes(), CREATE_WORKTREE])
@@ -32,13 +34,13 @@ export function NewSessionView(props: NewSessionViewProps) {
 
   const label = (value: string) => {
     if (value === MAIN_WORKTREE) {
-      if (isWorktree()) return "Main branch"
+      if (isWorktree()) return language.t("session.mainBranch")
       const branch = sync.data.vcs?.branch
-      if (branch) return `Main branch (${branch})`
-      return "Main branch"
+      if (branch) return language.t("session.mainBranchWithName", { branch })
+      return language.t("session.mainBranch")
     }
 
-    if (value === CREATE_WORKTREE) return "Create new worktree"
+    if (value === CREATE_WORKTREE) return language.t("session.createWorktree")
 
     return getFilename(value)
   }
@@ -48,7 +50,7 @@ export function NewSessionView(props: NewSessionViewProps) {
       class="size-full flex flex-col pb-45 justify-end items-start gap-4 flex-[1_0_0] self-stretch max-w-200 mx-auto px-6"
       style={{ "padding-bottom": "calc(var(--prompt-height, 11.25rem) + 64px)" }}
     >
-      <div class="text-20-medium text-text-weaker">New session</div>
+      <div class="text-20-medium text-text-weaker">{language.t("session.new")}</div>
       <div class="flex justify-center items-center gap-3">
         <Icon name="folder" size="small" />
         <div class="text-12-medium text-text-weak">
@@ -76,7 +78,7 @@ export function NewSessionView(props: NewSessionViewProps) {
           <div class="flex justify-center items-center gap-3">
             <Icon name="pencil-line" size="small" />
             <div class="text-12-medium text-text-weak">
-              Last modified&nbsp;
+              {language.t("session.lastModified")}&nbsp;
               <span class="text-text-strong">
                 {DateTime.fromMillis(project().time.updated ?? project().time.created).toRelative()}
               </span>
diff --git a/packages/app/src/components/titlebar.tsx b/packages/app/src/components/titlebar.tsx
index 272f8514497..b030ebb142c 100644
--- a/packages/app/src/components/titlebar.tsx
+++ b/packages/app/src/components/titlebar.tsx
@@ -6,12 +6,14 @@ import { useTheme } from "@opencode-ai/ui/theme"
 import { useLayout } from "@/context/layout"
 import { usePlatform } from "@/context/platform"
 import { useCommand } from "@/context/command"
+import { useLanguage } from "@/context/language"
 
 export function Titlebar() {
   const layout = useLayout()
   const platform = usePlatform()
   const command = useCommand()
   const theme = useTheme()
+  const language = useLanguage()
 
   const mac = createMemo(() => platform.platform === "desktop" && platform.os === "macos")
   const reserve = createMemo(
@@ -93,7 +95,7 @@ export function Titlebar() {
         <TooltipKeybind
           class={web() ? "hidden xl:flex shrink-0 ml-14" : "hidden xl:flex shrink-0"}
           placement="bottom"
-          title="Toggle sidebar"
+          title={language.t("sidebar.toggle")}
           keybind={command.keybind("sidebar.toggle")}
         >
           <IconButton
diff --git a/packages/app/src/context/file.tsx b/packages/app/src/context/file.tsx
index 2cc0d62de76..9f66808ef29 100644
--- a/packages/app/src/context/file.tsx
+++ b/packages/app/src/context/file.tsx
@@ -7,6 +7,7 @@ import { useParams } from "@solidjs/router"
 import { getFilename } from "@opencode-ai/util/path"
 import { useSDK } from "./sdk"
 import { useSync } from "./sync"
+import { useLanguage } from "./language"
 import { Persist, persisted } from "@/utils/persist"
 
 export type FileSelection = {
@@ -186,6 +187,7 @@ export const { use: useFile, provider: FileProvider } = createSimpleContext({
     const sdk = useSDK()
     const sync = useSync()
     const params = useParams()
+    const language = useLanguage()
 
     const directory = createMemo(() => sync.data.path.directory)
 
@@ -323,7 +325,7 @@ export const { use: useFile, provider: FileProvider } = createSimpleContext({
           )
           showToast({
             variant: "error",
-            title: "Failed to load file",
+            title: language.t("file.loadFailed"),
             description: e.message,
           })
         })
diff --git a/packages/app/src/context/global-sync.tsx b/packages/app/src/context/global-sync.tsx
index 96f8c63eab2..d6a1227a157 100644
--- a/packages/app/src/context/global-sync.tsx
+++ b/packages/app/src/context/global-sync.tsx
@@ -24,6 +24,7 @@ import { Binary } from "@opencode-ai/util/binary"
 import { retry } from "@opencode-ai/util/retry"
 import { useGlobalSDK } from "./global-sdk"
 import { ErrorPage, type InitError } from "../pages/error"
+import { useLanguage } from "./language"
 import {
   batch,
   createContext,
@@ -91,6 +92,7 @@ type VcsCache = {
 function createGlobalSync() {
   const globalSDK = useGlobalSDK()
   const platform = usePlatform()
+  const language = useLanguage()
   const owner = getOwner()
   if (!owner) throw new Error("GlobalSync must be created within owner")
   const vcsCache = new Map<string, VcsCache>()
@@ -189,7 +191,10 @@ function createGlobalSync() {
       .catch((err) => {
         console.error("Failed to load sessions", err)
         const project = getFilename(directory)
-        showToast({ title: `Failed to load sessions for ${project}`, description: err.message })
+        showToast({
+          title: language.t("session.loadFailed", { project }),
+          description: err.message,
+        })
       })
   }
 
diff --git a/packages/app/src/context/language.tsx b/packages/app/src/context/language.tsx
new file mode 100644
index 00000000000..6755bbd2c72
--- /dev/null
+++ b/packages/app/src/context/language.tsx
@@ -0,0 +1,88 @@
+import { createContext, createSignal, useContext, type Accessor, type ParentProps } from "solid-js"
+import enTranslations from "@/locales/en.json"
+import zhTranslations from "@/locales/zh.json"
+
+export type Language = "en" | "zh"
+
+export interface LanguageContextType {
+  language: Accessor<Language>
+  setLanguage: (language: Language) => void
+  t: (key: string, params?: Record<string, string | number>) => string
+}
+
+const LanguageContext = createContext<LanguageContextType>()
+
+export function useLanguage(): LanguageContextType {
+  const context = useContext(LanguageContext)
+  if (!context) {
+    throw new Error("useLanguage must be used within a LanguageProvider")
+  }
+  return context
+}
+
+export function LanguageProvider(props: ParentProps) {
+  const [language, setLanguage] = createSignal<Language>(getStoredLanguage() ?? "en")
+
+  function setLanguageWithStorage(lang: Language) {
+    setLanguage(lang)
+    try {
+      if (typeof localStorage === "undefined") return
+      localStorage.setItem("opencode-language", lang)
+    } catch {
+      // Ignore storage failures (e.g. SSR or restricted environments).
+    }
+  }
+
+  function t(key: string, params?: Record<string, string | number>): string {
+    const lang = language()
+    const keys = key.split(".")
+    const translations: Record<Language, Record<string, any>> = {
+      en: enTranslations,
+      zh: zhTranslations,
+    }
+
+    let value: any = translations[lang]
+    for (const k of keys) {
+      value = value?.[k]
+    }
+
+    if (typeof value !== "string") {
+      // Fallback to English if translation not found
+      value = translations.en
+      for (const k of keys) {
+        value = value?.[k]
+      }
+    }
+
+    if (typeof value !== "string") {
+      return key // Return the key if no translation found
+    }
+
+    // Replace parameters in the translation
+    if (params) {
+      return value.replace(/\{(\w+)\}/g, (match: string, param: string) => {
+        return params[param]?.toString() || match
+      })
+    }
+
+    return value
+  }
+
+  const value: LanguageContextType = {
+    language,
+    setLanguage: setLanguageWithStorage,
+    t,
+  }
+
+  return <LanguageContext.Provider value={value}>{props.children}</LanguageContext.Provider>
+}
+
+function getStoredLanguage(): Language | null {
+  try {
+    if (typeof localStorage === "undefined") return null
+    const stored = localStorage.getItem("opencode-language")
+    return stored === "en" || stored === "zh" ? stored : null
+  } catch {
+    return null
+  }
+}
diff --git a/packages/app/src/context/local.tsx b/packages/app/src/context/local.tsx
index 2ed57234f29..60d3112b4dc 100644
--- a/packages/app/src/context/local.tsx
+++ b/packages/app/src/context/local.tsx
@@ -10,6 +10,7 @@ import { useProviders } from "@/hooks/use-providers"
 import { DateTime } from "luxon"
 import { Persist, persisted } from "@/utils/persist"
 import { showToast } from "@opencode-ai/ui/toast"
+import { useLanguage } from "./language"
 
 export type LocalFile = FileNode &
   Partial<{
@@ -42,6 +43,7 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
     const sdk = useSDK()
     const sync = useSync()
     const providers = useProviders()
+    const language = useLanguage()
 
     function isModelValid(model: ModelKey) {
       const provider = providers.all().find((x) => x.id === model.providerID)
@@ -409,7 +411,7 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
           .catch((e) => {
             showToast({
               variant: "error",
-              title: "Failed to load file",
+              title: language.t("file.loadFailed"),
               description: e.message,
             })
           })
diff --git a/packages/app/src/locales/en.json b/packages/app/src/locales/en.json
new file mode 100644
index 00000000000..5167dd95dd9
--- /dev/null
+++ b/packages/app/src/locales/en.json
@@ -0,0 +1,358 @@
+{
+  "common": {
+    "add": "Add",
+    "back": "Back",
+    "cancel": "Cancel",
+    "checking": "Checking",
+    "clear": "Clear",
+    "close": "Close",
+    "confirm": "Confirm",
+    "delete": "Delete",
+    "done": "Done",
+    "edit": "Edit",
+    "help": "Help",
+    "loading": "Loading...",
+    "loadMore": "Load more",
+    "new": "New",
+    "next": "Next",
+    "open": "Open",
+    "previous": "Previous",
+    "requestFailed": "Request failed",
+    "retry": "Retry",
+    "save": "Save",
+    "saving": "Saving...",
+    "search": "Search",
+    "send": "Send",
+    "settings": "Settings",
+    "stop": "Stop",
+    "submit": "Submit"
+  },
+  "sidebar": {
+    "toggle": "Toggle sidebar",
+    "openProject": "Open project",
+    "connectProvider": "Connect provider",
+    "shareFeedback": "Share feedback",
+    "newSession": "New session",
+    "archiveSession": "Archive session",
+    "editProject": "Edit project",
+    "closeProject": "Close project",
+    "gettingStarted": "Getting started",
+    "gettingStartedDesc1": "OpenCode includes free models so you can start immediately.",
+    "gettingStartedDesc2": "Connect any provider to use models, including Claude, GPT, Gemini, etc.",
+    "recentSessions": "Recent sessions",
+    "viewAllSessions": "View all sessions"
+  },
+  "session": {
+    "new": "New session",
+    "previous": "Previous session",
+    "next": "Next session",
+    "archive": "Archive session",
+    "noFiles": "No files changed",
+    "filesChangedLabel": "{count} Files Changed",
+    "loadingChanges": "Loading changes...",
+    "loadingEarlierMessages": "Loading earlier messages...",
+    "loadEarlierMessages": "Load earlier messages",
+    "loadingPrompt": "Loading prompt...",
+    "searchProject": "Search {project}",
+    "tab": "Session",
+    "reviewTab": "Review",
+    "share": "Share session",
+    "shareAction": "Share",
+    "shareDialogTitle": "Publish on web",
+    "shareDialogDescriptionPublic": "This session is public on the web. It is accessible to anyone with the link.",
+    "shareDialogDescriptionPrivate": "Share session publicly on the web. It will be accessible to anyone with the link.",
+    "publishAction": "Publish",
+    "publishingAction": "Publishing...",
+    "unpublishAction": "Unpublish",
+    "unpublishingAction": "Unpublishing...",
+    "viewAction": "View",
+    "copyLink": "Copy link",
+    "copied": "Copied",
+    "shareCommandTitle": "Share session",
+    "shareCommandDescription": "Share this session and copy the URL to clipboard",
+    "unshareCommandTitle": "Unshare session",
+    "unshareCommandDescription": "Stop sharing this session",
+    "shareCopyFailedTitle": "Failed to copy URL to clipboard",
+    "shareSuccessTitle": "Session shared",
+    "shareSuccessDescription": "Share URL copied to clipboard!",
+    "shareFailedTitle": "Failed to share session",
+    "shareFailedDescription": "An error occurred while sharing the session",
+    "unshareSuccessTitle": "Session unshared",
+    "unshareSuccessDescription": "Session unshared successfully!",
+    "unshareFailedTitle": "Failed to unshare session",
+    "unshareFailedDescription": "An error occurred while unsharing the session",
+    "mainBranch": "Main branch",
+    "mainBranchWithName": "Main branch ({branch})",
+    "createWorktree": "Create new worktree",
+    "lastModified": "Last modified",
+    "forkTitle": "Fork from message",
+    "noForkMessages": "No messages to fork from",
+    "loadFailed": "Failed to load sessions for {project}"
+  },
+  "theme": {
+    "switched": "Theme switched",
+    "colorScheme": "Color scheme",
+    "cycle": "Cycle theme",
+    "cycleColorScheme": "Cycle color scheme",
+    "scheme": {
+      "system": "System",
+      "light": "Light",
+      "dark": "Dark"
+    },
+    "useTheme": "Use theme: {theme}",
+    "useColorScheme": "Use color scheme: {scheme}"
+  },
+  "dialog": {
+    "selectDirectory": "Select directory",
+    "selectFile": "Select file",
+    "editProject": "Edit project",
+    "connectProvider": "Connect provider",
+    "selectServer": "Select server",
+    "selectModel": "Select model",
+    "searchFolders": "Search folders",
+    "noFolders": "No folders found"
+  },
+  "notification": {
+    "permissionRequired": "Permission required",
+    "updateAvailable": "Update available",
+    "updateDesc": "A new version of OpenCode ({version}) is now available to install.",
+    "installAndRestart": "Install and restart",
+    "notYet": "Not yet",
+    "goToSession": "Go to session",
+    "dismiss": "Dismiss",
+    "question": "Question",
+    "permissionNeeded": "{session} in {project} needs permission",
+    "questionAsked": "{session} in {project} has a question"
+  },
+  "server": {
+    "switch": "Switch server",
+    "title": "Servers",
+    "description": "Switch which OpenCode server this app connects to.",
+    "search": "Search servers",
+    "empty": "No servers yet",
+    "add": "Add a server",
+    "urlLabel": "Server URL",
+    "default": "Default server",
+    "defaultDescription": "Connect to this server on app launch instead of starting a local server. Requires restart.",
+    "noneSelected": "No server selected",
+    "setDefault": "Set current server as default",
+    "connectFailed": "Could not connect to server"
+  },
+  "provider": {
+    "connect": "Connect provider",
+    "apiKey": "API key",
+    "apiKeyLabel": "{provider} API key",
+    "apiKeyRequired": "API key is required",
+    "authCode": "Authorization code",
+    "authCodeLabel": "{method} authorization code",
+    "authCodeRequired": "Authorization code is required",
+    "authCodeInvalid": "Invalid authorization code",
+    "authFailed": "Authorization failed: {error}",
+    "authInProgress": "Authorization in progress...",
+    "confirmationCode": "Confirmation code",
+    "connectedTitle": "{provider} connected",
+    "connectedDescription": "{provider} models are now available to use.",
+    "connectTo": "Connect {provider}",
+    "enterApiKey": "Enter your {provider} API key to connect your account and use {provider} models in OpenCode.",
+    "visitLinkToAuthorize": "Visit",
+    "thisLink": "this link",
+    "collectAuthCode": "to collect your authorization code to connect your account and use {provider} models in OpenCode.",
+    "enterCodeBelow": "and enter the code below to connect your account and use {provider} models in OpenCode.",
+    "waitingForAuth": "Waiting for authorization...",
+    "loginClaude": "Login with Claude Pro/Max",
+    "selectMethod": "Select login method for {provider}.",
+    "opencodeZenIntro": "OpenCode Zen gives you access to a curated set of reliable optimized models for coding agents.",
+    "opencodeZenModels": "With a single API key you'll get access to models such as Claude, GPT, Gemini, GLM and more.",
+    "opencodeZenVisit": "Visit",
+    "opencodeZenCollect": "to collect your API key.",
+    "search": "Search providers",
+    "popular": "Popular",
+    "other": "Other",
+    "viewAll": "View all providers",
+    "connectClaude": "Connect with Claude Pro/Max or API key"
+  },
+  "project": {
+    "open": "Open project",
+    "name": "Name",
+    "icon": "Icon",
+    "iconAlt": "Project icon",
+    "color": "Color"
+  },
+  "language": {
+    "english": "English",
+    "chinese": "Chinese",
+    "use": "Use language: {language}",
+    "cycle": "Cycle language",
+    "switched": "Language switched"
+  },
+  "command": {
+    "category": {
+      "view": "View",
+      "project": "Project",
+      "provider": "Provider",
+      "server": "Server",
+      "session": "Session",
+      "theme": "Theme",
+      "language": "Language",
+      "file": "File",
+      "terminal": "Terminal",
+      "model": "Model",
+      "agent": "Agent",
+      "permissions": "Permissions",
+      "mcp": "MCP"
+    },
+    "title": {
+      "autoAcceptEdits": "Auto-accept edits",
+      "stopAutoAcceptEdits": "Stop auto-accepting edits",
+      "chooseModel": "Choose model",
+      "compactSession": "Compact session",
+      "cycleAgent": "Cycle agent",
+      "cycleAgentBack": "Cycle agent backwards",
+      "cycleThinking": "Cycle thinking effort",
+      "forkFromMessage": "Fork from message",
+      "nextMessage": "Next message",
+      "openFile": "Open file",
+      "previousMessage": "Previous message",
+      "redo": "Redo",
+      "toggleMcp": "Toggle MCPs",
+      "toggleSteps": "Toggle steps",
+      "undo": "Undo"
+    },
+    "description": {
+      "chooseModel": "Select a different model",
+      "compactSession": "Summarize the session to reduce context size",
+      "cycleAgent": "Switch to the next agent",
+      "cycleAgentBack": "Switch to the previous agent",
+      "cycleThinking": "Switch to the next effort level",
+      "forkFromMessage": "Create a new session from a previous message",
+      "newTerminal": "Create a new terminal tab",
+      "nextMessage": "Go to the next user message",
+      "openFile": "Search files and commands",
+      "previousMessage": "Go to the previous user message",
+      "redo": "Redo the last undone message",
+      "toggleMcp": "Toggle MCPs",
+      "toggleSteps": "Show or hide steps for the current message",
+      "undo": "Undo the last message"
+    },
+    "toast": {
+      "thinkingEffortChanged": "Thinking effort changed",
+      "thinkingEffortDescription": "The thinking effort has been changed to {effort}",
+      "noModelTitle": "No model selected",
+      "noModelDescription": "Connect a provider to summarize this session",
+      "autoAcceptOnTitle": "Auto-accepting edits",
+      "autoAcceptOffTitle": "Stopped auto-accepting edits",
+      "autoAcceptOnDescription": "Edit and write permissions will be automatically approved",
+      "autoAcceptOffDescription": "Edit and write permissions will require approval"
+    }
+  },
+  "commandPalette": {
+    "search": "Search files and commands",
+    "empty": "No results found",
+    "commands": "Commands",
+    "files": "Files"
+  },
+  "home": {
+    "recentProjects": "Recent projects",
+    "noRecentProjects": "No recent projects",
+    "getStarted": "Get started by opening a local project"
+  },
+  "context": {
+    "addToContext": "Add {selection} to context",
+    "assistant": "Assistant",
+    "assistantMessages": "Assistant Messages",
+    "breakdown": "Context Breakdown",
+    "breakdownNote": "Approximate breakdown of input tokens. \"Other\" includes tool definitions and overhead.",
+    "cacheTokens": "Cache Tokens (read/write)",
+    "clickToView": "Click to view context",
+    "contextLimit": "Context Limit",
+    "cost": "Cost",
+    "inputTokens": "Input Tokens",
+    "lastActivity": "Last Activity",
+    "messages": "Messages",
+    "model": "Model",
+    "other": "Other",
+    "outputTokens": "Output Tokens",
+    "provider": "Provider",
+    "rawMessages": "Raw messages",
+    "reasoningTokens": "Reasoning Tokens",
+    "session": "Session",
+    "sessionCreated": "Session Created",
+    "system": "System",
+    "systemPrompt": "System Prompt",
+    "tab": "Context",
+    "tokens": "Tokens",
+    "toolCalls": "Tool Calls",
+    "totalCost": "Total Cost",
+    "totalTokens": "Total Tokens",
+    "usage": "Usage",
+    "user": "User",
+    "userMessages": "User Messages"
+  },
+  "model": {
+    "addMore": "Add more models from popular providers",
+    "defaultVariant": "Default",
+    "empty": "No model results",
+    "freeProvided": "Free models provided by OpenCode",
+    "manageTitle": "Manage models",
+    "manageDescription": "Customize which models appear in the model selector.",
+    "search": "Search models"
+  },
+  "mcp": {
+    "title": "MCPs",
+    "enabledCount": "{enabled} of {total} enabled",
+    "empty": "No MCPs configured",
+    "count": "{count} MCP"
+  },
+  "prompt": {
+    "active": "active",
+    "askAnything": "Ask anything... \"{example}\"",
+    "attachFile": "Attach file",
+    "customCommand": "custom",
+    "dropFiles": "Drop images or PDFs here",
+    "failedCreateWorktree": "Failed to create worktree",
+    "failedSendCommand": "Failed to send command",
+    "failedSendPrompt": "Failed to send prompt",
+    "failedSendShell": "Failed to send shell command",
+    "includeActiveFile": "Include active file",
+    "noCommands": "No matching commands",
+    "noMatches": "No matching results",
+    "selectAgentModelTitle": "Select an agent and model",
+    "selectAgentModelDescription": "Choose an agent and model before sending a prompt.",
+    "shellExitHint": "esc to exit",
+    "shellMode": "Shell",
+    "shellPlaceholder": "Enter shell command..."
+  },
+  "file": {
+    "loadFailed": "Failed to load file"
+  },
+  "review": {
+    "toggle": "Toggle review"
+  },
+  "status": {
+    "connected": "connected",
+    "failed": "failed",
+    "needsAuth": "needs auth",
+    "disabled": "disabled"
+  },
+  "tabs": {
+    "close": "Close tab"
+  },
+  "tag": {
+    "free": "Free",
+    "latest": "Latest",
+    "recommended": "Recommended"
+  },
+  "terminal": {
+    "loading": "Loading terminal...",
+    "new": "New terminal",
+    "toggle": "Toggle terminal"
+  },
+  "workspace": {
+    "createFailed": "Failed to create workspace",
+    "disable": "Disable workspaces",
+    "enable": "Enable workspaces",
+    "local": "local",
+    "new": "New workspace",
+    "sandbox": "sandbox"
+  }
+}
diff --git a/packages/app/src/locales/zh.json b/packages/app/src/locales/zh.json
new file mode 100644
index 00000000000..21306e9b6d5
--- /dev/null
+++ b/packages/app/src/locales/zh.json
@@ -0,0 +1,358 @@
+{
+  "common": {
+    "add": "添加",
+    "back": "返回",
+    "cancel": "取消",
+    "checking": "检查中",
+    "clear": "清除",
+    "close": "关闭",
+    "confirm": "确认",
+    "delete": "删除",
+    "done": "完成",
+    "edit": "编辑",
+    "help": "帮助",
+    "loading": "加载中...",
+    "loadMore": "加载更多",
+    "new": "新建",
+    "next": "下一个",
+    "open": "打开",
+    "previous": "上一个",
+    "requestFailed": "请求失败",
+    "retry": "重试",
+    "save": "保存",
+    "saving": "保存中...",
+    "search": "搜索",
+    "send": "发送",
+    "settings": "设置",
+    "stop": "停止",
+    "submit": "提交"
+  },
+  "sidebar": {
+    "toggle": "切换侧边栏",
+    "openProject": "打开项目",
+    "connectProvider": "连接提供商",
+    "shareFeedback": "分享反馈",
+    "newSession": "新会话",
+    "archiveSession": "归档会话",
+    "editProject": "编辑项目",
+    "closeProject": "关闭项目",
+    "gettingStarted": "开始使用",
+    "gettingStartedDesc1": "OpenCode 包含免费模型，您可以立即开始使用。",
+    "gettingStartedDesc2": "连接任何提供商以使用模型，包括 Claude、GPT、Gemini 等。",
+    "recentSessions": "最近会话",
+    "viewAllSessions": "查看全部会话"
+  },
+  "session": {
+    "new": "新会话",
+    "previous": "上一个会话",
+    "next": "下一个会话",
+    "archive": "归档会话",
+    "noFiles": "无文件更改",
+    "filesChangedLabel": "已更改 {count} 个文件",
+    "loadingChanges": "正在加载更改...",
+    "loadingEarlierMessages": "正在加载更早的消息...",
+    "loadEarlierMessages": "加载更早的消息",
+    "loadingPrompt": "正在加载提示...",
+    "searchProject": "搜索 {project}",
+    "tab": "会话",
+    "reviewTab": "审阅",
+    "share": "分享会话",
+    "shareAction": "分享",
+    "shareDialogTitle": "发布到网页",
+    "shareDialogDescriptionPublic": "此会话已在网页公开，任何拥有链接的人都可访问。",
+    "shareDialogDescriptionPrivate": "在网页上公开分享此会话，任何拥有链接的人都可访问。",
+    "publishAction": "发布",
+    "publishingAction": "正在发布...",
+    "unpublishAction": "取消发布",
+    "unpublishingAction": "正在取消发布...",
+    "viewAction": "查看",
+    "copyLink": "复制链接",
+    "copied": "已复制",
+    "shareCommandTitle": "分享会话",
+    "shareCommandDescription": "分享此会话并将链接复制到剪贴板",
+    "unshareCommandTitle": "取消分享会话",
+    "unshareCommandDescription": "停止分享此会话",
+    "shareCopyFailedTitle": "复制链接到剪贴板失败",
+    "shareSuccessTitle": "会话已分享",
+    "shareSuccessDescription": "分享链接已复制到剪贴板！",
+    "shareFailedTitle": "分享会话失败",
+    "shareFailedDescription": "分享会话时发生错误",
+    "unshareSuccessTitle": "会话已取消分享",
+    "unshareSuccessDescription": "会话已成功取消分享！",
+    "unshareFailedTitle": "取消分享会话失败",
+    "unshareFailedDescription": "取消分享会话时发生错误",
+    "mainBranch": "主分支",
+    "mainBranchWithName": "主分支（{branch}）",
+    "createWorktree": "创建新工作树",
+    "lastModified": "上次修改",
+    "forkTitle": "从消息分叉",
+    "noForkMessages": "没有可分叉的消息",
+    "loadFailed": "加载 {project} 的会话失败"
+  },
+  "theme": {
+    "switched": "主题已切换",
+    "colorScheme": "配色方案",
+    "cycle": "循环切换主题",
+    "cycleColorScheme": "循环切换配色方案",
+    "scheme": {
+      "system": "系统",
+      "light": "浅色",
+      "dark": "深色"
+    },
+    "useTheme": "使用主题：{theme}",
+    "useColorScheme": "使用配色：{scheme}"
+  },
+  "dialog": {
+    "selectDirectory": "选择目录",
+    "selectFile": "选择文件",
+    "editProject": "编辑项目",
+    "connectProvider": "连接提供商",
+    "selectServer": "选择服务器",
+    "selectModel": "选择模型",
+    "searchFolders": "搜索文件夹",
+    "noFolders": "未找到文件夹"
+  },
+  "notification": {
+    "permissionRequired": "需要权限",
+    "updateAvailable": "有可用更新",
+    "updateDesc": "OpenCode 的新版本 ({version}) 现在可以安装。",
+    "installAndRestart": "安装并重启",
+    "notYet": "暂不",
+    "goToSession": "前往会话",
+    "dismiss": "忽略",
+    "question": "问题",
+    "permissionNeeded": "{project} 中的 {session} 需要权限",
+    "questionAsked": "{project} 中的 {session} 有问题"
+  },
+  "server": {
+    "switch": "切换服务器",
+    "title": "服务器",
+    "description": "切换此应用连接的 OpenCode 服务器。",
+    "search": "搜索服务器",
+    "empty": "暂无服务器",
+    "add": "添加服务器",
+    "urlLabel": "服务器地址",
+    "default": "默认服务器",
+    "defaultDescription": "应用启动时连接此服务器而不是启动本地服务器。需要重启。",
+    "noneSelected": "未选择服务器",
+    "setDefault": "设为默认服务器",
+    "connectFailed": "无法连接服务器"
+  },
+  "provider": {
+    "connect": "连接提供商",
+    "apiKey": "API 密钥",
+    "apiKeyLabel": "{provider} API 密钥",
+    "apiKeyRequired": "需要 API 密钥",
+    "authCode": "授权码",
+    "authCodeLabel": "{method} 授权码",
+    "authCodeRequired": "需要授权码",
+    "authCodeInvalid": "授权码无效",
+    "authFailed": "授权失败：{error}",
+    "authInProgress": "授权进行中...",
+    "confirmationCode": "确认码",
+    "connectedTitle": "{provider} 已连接",
+    "connectedDescription": "{provider} 模型已可用。",
+    "connectTo": "连接 {provider}",
+    "enterApiKey": "输入 {provider} 的 API 密钥以连接账户并在 OpenCode 中使用 {provider} 模型。",
+    "visitLinkToAuthorize": "访问",
+    "thisLink": "此链接",
+    "collectAuthCode": "以获取授权码，用于连接账户并在 OpenCode 中使用 {provider} 模型。",
+    "enterCodeBelow": "并在下方输入代码，以连接账户并在 OpenCode 中使用 {provider} 模型。",
+    "waitingForAuth": "等待授权中...",
+    "loginClaude": "使用 Claude Pro/Max 登录",
+    "selectMethod": "选择 {provider} 的登录方式。",
+    "opencodeZenIntro": "OpenCode Zen 提供一组经过优化的可靠编程模型。",
+    "opencodeZenModels": "通过一个 API 密钥即可访问 Claude、GPT、Gemini、GLM 等模型。",
+    "opencodeZenVisit": "访问",
+    "opencodeZenCollect": "以获取 API 密钥。",
+    "search": "搜索提供商",
+    "popular": "热门",
+    "other": "其他",
+    "viewAll": "查看全部提供商",
+    "connectClaude": "使用 Claude Pro/Max 或 API 密钥连接"
+  },
+  "project": {
+    "open": "打开项目",
+    "name": "名称",
+    "icon": "图标",
+    "iconAlt": "项目图标",
+    "color": "颜色"
+  },
+  "language": {
+    "english": "英语",
+    "chinese": "中文",
+    "use": "使用语言：{language}",
+    "cycle": "切换语言 Cycle language",
+    "switched": "语言已切换"
+  },
+  "command": {
+    "category": {
+      "view": "视图",
+      "project": "项目",
+      "provider": "提供商",
+      "server": "服务器",
+      "session": "会话",
+      "theme": "主题",
+      "language": "语言",
+      "file": "文件",
+      "terminal": "终端",
+      "model": "模型",
+      "agent": "代理",
+      "permissions": "权限",
+      "mcp": "MCP"
+    },
+    "title": {
+      "autoAcceptEdits": "自动接受编辑",
+      "stopAutoAcceptEdits": "停止自动接受编辑",
+      "chooseModel": "选择模型",
+      "compactSession": "压缩会话",
+      "cycleAgent": "切换代理",
+      "cycleAgentBack": "反向切换代理",
+      "cycleThinking": "切换思考力度",
+      "forkFromMessage": "从消息分叉",
+      "nextMessage": "下一条消息",
+      "openFile": "打开文件",
+      "previousMessage": "上一条消息",
+      "redo": "重做",
+      "toggleMcp": "切换 MCP",
+      "toggleSteps": "切换步骤",
+      "undo": "撤销"
+    },
+    "description": {
+      "chooseModel": "选择不同模型",
+      "compactSession": "总结会话以减少上下文",
+      "cycleAgent": "切换到下一个代理",
+      "cycleAgentBack": "切换到上一个代理",
+      "cycleThinking": "切换到下一档力度",
+      "forkFromMessage": "从先前消息创建新会话",
+      "newTerminal": "创建新的终端标签",
+      "nextMessage": "跳到下一条用户消息",
+      "openFile": "搜索文件和命令",
+      "previousMessage": "跳到上一条用户消息",
+      "redo": "重做上一次撤销",
+      "toggleMcp": "切换 MCP",
+      "toggleSteps": "显示或隐藏当前消息的步骤",
+      "undo": "撤销上一条消息"
+    },
+    "toast": {
+      "thinkingEffortChanged": "思考力度已更改",
+      "thinkingEffortDescription": "思考力度已更改为 {effort}",
+      "noModelTitle": "未选择模型",
+      "noModelDescription": "连接提供商以总结此会话",
+      "autoAcceptOnTitle": "正在自动接受编辑",
+      "autoAcceptOffTitle": "已停止自动接受编辑",
+      "autoAcceptOnDescription": "编辑和写入权限将自动批准",
+      "autoAcceptOffDescription": "编辑和写入权限需要审批"
+    }
+  },
+  "commandPalette": {
+    "search": "搜索文件和命令",
+    "empty": "未找到结果",
+    "commands": "命令",
+    "files": "文件"
+  },
+  "home": {
+    "recentProjects": "最近项目",
+    "noRecentProjects": "没有最近项目",
+    "getStarted": "通过打开本地项目开始"
+  },
+  "context": {
+    "addToContext": "将 {selection} 添加到上下文",
+    "assistant": "助手",
+    "assistantMessages": "助手消息",
+    "breakdown": "上下文构成",
+    "breakdownNote": "输入 Token 的大致构成。“其他”包含工具定义和额外开销。",
+    "cacheTokens": "缓存 Token（读/写）",
+    "clickToView": "点击查看上下文",
+    "contextLimit": "上下文上限",
+    "cost": "费用",
+    "inputTokens": "输入 Token",
+    "lastActivity": "最后活动",
+    "messages": "消息数",
+    "model": "模型",
+    "other": "其他",
+    "outputTokens": "输出 Token",
+    "provider": "提供商",
+    "rawMessages": "原始消息",
+    "reasoningTokens": "推理 Token",
+    "session": "会话",
+    "sessionCreated": "会话创建时间",
+    "system": "系统",
+    "systemPrompt": "系统提示",
+    "tab": "上下文",
+    "tokens": "Token",
+    "toolCalls": "工具调用",
+    "totalCost": "总费用",
+    "totalTokens": "总 Token",
+    "usage": "使用率",
+    "user": "用户",
+    "userMessages": "用户消息"
+  },
+  "model": {
+    "addMore": "从热门提供商添加更多模型",
+    "defaultVariant": "默认",
+    "empty": "没有模型结果",
+    "freeProvided": "OpenCode 提供的免费模型",
+    "manageTitle": "管理模型",
+    "manageDescription": "自定义模型选择器中显示的模型。",
+    "search": "搜索模型"
+  },
+  "mcp": {
+    "title": "MCP",
+    "enabledCount": "已启用 {enabled}/{total}",
+    "empty": "未配置 MCP",
+    "count": "{count} 个 MCP"
+  },
+  "prompt": {
+    "active": "当前",
+    "askAnything": "随便问点什么... \"{example}\"",
+    "attachFile": "附加文件",
+    "customCommand": "自定义",
+    "dropFiles": "将图片或 PDF 拖到这里",
+    "failedCreateWorktree": "创建工作树失败",
+    "failedSendCommand": "发送命令失败",
+    "failedSendPrompt": "发送提示失败",
+    "failedSendShell": "发送 Shell 命令失败",
+    "includeActiveFile": "包含当前文件",
+    "noCommands": "没有匹配的命令",
+    "noMatches": "没有匹配结果",
+    "selectAgentModelTitle": "选择代理和模型",
+    "selectAgentModelDescription": "在发送提示前请选择代理和模型。",
+    "shellExitHint": "按 Esc 退出",
+    "shellMode": "Shell",
+    "shellPlaceholder": "输入 Shell 命令..."
+  },
+  "file": {
+    "loadFailed": "加载文件失败"
+  },
+  "review": {
+    "toggle": "切换审阅"
+  },
+  "status": {
+    "connected": "已连接",
+    "failed": "失败",
+    "needsAuth": "需要授权",
+    "disabled": "已禁用"
+  },
+  "tabs": {
+    "close": "关闭标签"
+  },
+  "tag": {
+    "free": "免费",
+    "latest": "最新",
+    "recommended": "推荐"
+  },
+  "terminal": {
+    "loading": "正在加载终端...",
+    "new": "新终端",
+    "toggle": "切换终端"
+  },
+  "workspace": {
+    "createFailed": "创建工作区失败",
+    "disable": "禁用工作区",
+    "enable": "启用工作区",
+    "local": "本地",
+    "new": "新工作区",
+    "sandbox": "沙盒"
+  }
+}
diff --git a/packages/app/src/pages/home.tsx b/packages/app/src/pages/home.tsx
index a9e89a7f598..d953b9043af 100644
--- a/packages/app/src/pages/home.tsx
+++ b/packages/app/src/pages/home.tsx
@@ -12,6 +12,7 @@ import { DialogSelectDirectory } from "@/components/dialog-select-directory"
 import { DialogSelectServer } from "@/components/dialog-select-server"
 import { useServer } from "@/context/server"
 import { useGlobalSync } from "@/context/global-sync"
+import { useLanguage } from "@/context/language"
 
 export default function Home() {
   const sync = useGlobalSync()
@@ -20,6 +21,7 @@ export default function Home() {
   const dialog = useDialog()
   const navigate = useNavigate()
   const server = useServer()
+  const language = useLanguage()
   const homedir = createMemo(() => sync.data.path.home)
 
   function openProject(directory: string) {
@@ -41,7 +43,7 @@ export default function Home() {
 
     if (platform.openDirectoryPickerDialog && server.isLocal()) {
       const result = await platform.openDirectoryPickerDialog?.({
-        title: "Open project",
+        title: language.t("project.open"),
         multiple: true,
       })
       resolve(result)
@@ -76,9 +78,9 @@ export default function Home() {
         <Match when={sync.data.project.length > 0}>
           <div class="mt-20 w-full flex flex-col gap-4">
             <div class="flex gap-2 items-center justify-between pl-3">
-              <div class="text-14-medium text-text-strong">Recent projects</div>
+              <div class="text-14-medium text-text-strong">{language.t("home.recentProjects")}</div>
               <Button icon="folder-add-left" size="normal" class="pl-2 pr-3" onClick={chooseProject}>
-                Open project
+                {language.t("project.open")}
               </Button>
             </div>
             <ul class="flex flex-col gap-2">
@@ -108,12 +110,12 @@ export default function Home() {
           <div class="mt-30 mx-auto flex flex-col items-center gap-3">
             <Icon name="folder-add-left" size="large" />
             <div class="flex flex-col gap-1 items-center justify-center">
-              <div class="text-14-medium text-text-strong">No recent projects</div>
-              <div class="text-12-regular text-text-weak">Get started by opening a local project</div>
+              <div class="text-14-medium text-text-strong">{language.t("home.noRecentProjects")}</div>
+              <div class="text-12-regular text-text-weak">{language.t("home.getStarted")}</div>
             </div>
             <div />
             <Button class="px-3" onClick={chooseProject}>
-              Open project
+              {language.t("project.open")}
             </Button>
           </div>
         </Match>
diff --git a/packages/app/src/pages/layout.tsx b/packages/app/src/pages/layout.tsx
index 5f5954c9037..4c623652502 100644
--- a/packages/app/src/pages/layout.tsx
+++ b/packages/app/src/pages/layout.tsx
@@ -66,6 +66,7 @@ import { DialogSelectDirectory } from "@/components/dialog-select-directory"
 import { DialogEditProject } from "@/components/dialog-edit-project"
 import { Titlebar } from "@/components/titlebar"
 import { useServer } from "@/context/server"
+import { useLanguage, type Language } from "@/context/language"
 
 export default function Layout(props: ParentProps) {
   const [store, setStore, , ready] = persisted(
@@ -105,14 +106,22 @@ export default function Layout(props: ParentProps) {
   const dialog = useDialog()
   const command = useCommand()
   const theme = useTheme()
+  const language = useLanguage()
   const initialDir = params.dir
   const availableThemeEntries = createMemo(() => Object.entries(theme.themes()))
   const colorSchemeOrder: ColorScheme[] = ["system", "light", "dark"]
-  const colorSchemeLabel: Record<ColorScheme, string> = {
-    system: "System",
-    light: "Light",
-    dark: "Dark",
-  }
+  const colorSchemeLabel = (scheme: ColorScheme) =>
+    ({
+      system: language.t("theme.scheme.system"),
+      light: language.t("theme.scheme.light"),
+      dark: language.t("theme.scheme.dark"),
+    })[scheme]
+  const languages: Language[] = ["en", "zh"]
+  const languageLabel = (lang: Language) =>
+    ({
+      en: language.t("language.english"),
+      zh: language.t("language.chinese"),
+    })[lang]
 
   const [editor, setEditor] = createStore({
     active: "" as string,
@@ -235,7 +244,7 @@ export default function Layout(props: ParentProps) {
     theme.setTheme(nextThemeId)
     const nextTheme = theme.themes()[nextThemeId]
     showToast({
-      title: "Theme switched",
+      title: language.t("theme.switched"),
       description: nextTheme?.name ?? nextThemeId,
     })
   }
@@ -248,8 +257,8 @@ export default function Layout(props: ParentProps) {
     const next = colorSchemeOrder[nextIndex]
     theme.setColorScheme(next)
     showToast({
-      title: "Color scheme",
-      description: colorSchemeLabel[next],
+      title: language.t("theme.colorScheme"),
+      description: colorSchemeLabel(next),
     })
   }
 
@@ -264,18 +273,18 @@ export default function Layout(props: ParentProps) {
         toastId = showToast({
           persistent: true,
           icon: "download",
-          title: "Update available",
-          description: `A new version of OpenCode (${version}) is now available to install.`,
+          title: language.t("notification.updateAvailable"),
+          description: language.t("notification.updateDesc", { version: version || "" }),
           actions: [
             {
-              label: "Install and restart",
+              label: language.t("notification.installAndRestart"),
               onClick: async () => {
                 await platform.update!()
                 await platform.restart!()
               },
             },
             {
-              label: "Not yet",
+              label: language.t("notification.notYet"),
               onClick: "dismiss",
             },
           ],
@@ -291,15 +300,16 @@ export default function Layout(props: ParentProps) {
   onMount(() => {
     const alerts = {
       "permission.asked": {
-        title: "Permission required",
+        title: language.t("notification.permissionRequired"),
         icon: "checklist" as const,
         description: (sessionTitle: string, projectName: string) =>
-          `${sessionTitle} in ${projectName} needs permission`,
+          language.t("notification.permissionNeeded", { session: sessionTitle, project: projectName }),
       },
       "question.asked": {
-        title: "Question",
+        title: language.t("notification.question"),
         icon: "bubble-5" as const,
-        description: (sessionTitle: string, projectName: string) => `${sessionTitle} in ${projectName} has a question`,
+        description: (sessionTitle: string, projectName: string) =>
+          language.t("notification.questionAsked", { session: sessionTitle, project: projectName }),
       },
     }
 
@@ -318,7 +328,7 @@ export default function Layout(props: ParentProps) {
       const session = store.session.find((s) => s.id === props.sessionID)
       const sessionKey = `${directory}:${props.sessionID}`
 
-      const sessionTitle = session?.title ?? "New session"
+      const sessionTitle = session?.title ?? language.t("session.new")
       const projectName = getFilename(directory)
       const description = config.description(sessionTitle, projectName)
       const href = `/${base64Encode(directory)}/session/${props.sessionID}`
@@ -345,11 +355,11 @@ export default function Layout(props: ParentProps) {
         description,
         actions: [
           {
-            label: "Go to session",
+            label: language.t("notification.goToSession"),
             onClick: () => navigate(href),
           },
           {
-            label: "Dismiss",
+            label: language.t("notification.dismiss"),
             onClick: "dismiss",
           },
         ],
@@ -777,48 +787,48 @@ export default function Layout(props: ParentProps) {
     const commands: CommandOption[] = [
       {
         id: "sidebar.toggle",
-        title: "Toggle sidebar",
-        category: "View",
+        title: language.t("sidebar.toggle"),
+        category: language.t("command.category.view"),
         keybind: "mod+b",
         onSelect: () => layout.sidebar.toggle(),
       },
       {
         id: "project.open",
-        title: "Open project",
-        category: "Project",
+        title: language.t("project.open"),
+        category: language.t("command.category.project"),
         keybind: "mod+o",
         onSelect: () => chooseProject(),
       },
       {
         id: "provider.connect",
-        title: "Connect provider",
-        category: "Provider",
+        title: language.t("provider.connect"),
+        category: language.t("command.category.provider"),
         onSelect: () => connectProvider(),
       },
       {
         id: "server.switch",
-        title: "Switch server",
-        category: "Server",
+        title: language.t("server.switch"),
+        category: language.t("command.category.server"),
         onSelect: () => openServer(),
       },
       {
         id: "session.previous",
-        title: "Previous session",
-        category: "Session",
+        title: language.t("session.previous"),
+        category: language.t("command.category.session"),
         keybind: "alt+arrowup",
         onSelect: () => navigateSessionByOffset(-1),
       },
       {
         id: "session.next",
-        title: "Next session",
-        category: "Session",
+        title: language.t("session.next"),
+        category: language.t("command.category.session"),
         keybind: "alt+arrowdown",
         onSelect: () => navigateSessionByOffset(1),
       },
       {
         id: "session.archive",
-        title: "Archive session",
-        category: "Session",
+        title: language.t("session.archive"),
+        category: language.t("command.category.session"),
         keybind: "mod+shift+backspace",
         disabled: !params.dir || !params.id,
         onSelect: () => {
@@ -828,8 +838,8 @@ export default function Layout(props: ParentProps) {
       },
       {
         id: "theme.cycle",
-        title: "Cycle theme",
-        category: "Theme",
+        title: language.t("theme.cycle"),
+        category: language.t("command.category.theme"),
         keybind: "mod+shift+t",
         onSelect: () => cycleTheme(1),
       },
@@ -838,8 +848,8 @@ export default function Layout(props: ParentProps) {
     for (const [id, definition] of availableThemeEntries()) {
       commands.push({
         id: `theme.set.${id}`,
-        title: `Use theme: ${definition.name ?? id}`,
-        category: "Theme",
+        title: language.t("theme.useTheme", { theme: definition.name ?? id }),
+        category: language.t("command.category.theme"),
         onSelect: () => theme.commitPreview(),
         onHighlight: () => {
           theme.previewTheme(id)
@@ -850,8 +860,8 @@ export default function Layout(props: ParentProps) {
 
     commands.push({
       id: "theme.scheme.cycle",
-      title: "Cycle color scheme",
-      category: "Theme",
+      title: language.t("theme.cycleColorScheme"),
+      category: language.t("command.category.theme"),
       keybind: "mod+shift+s",
       onSelect: () => cycleColorScheme(1),
     })
@@ -859,8 +869,8 @@ export default function Layout(props: ParentProps) {
     for (const scheme of colorSchemeOrder) {
       commands.push({
         id: `theme.scheme.${scheme}`,
-        title: `Use color scheme: ${colorSchemeLabel[scheme]}`,
-        category: "Theme",
+        title: language.t("theme.useColorScheme", { scheme: colorSchemeLabel(scheme) }),
+        category: language.t("command.category.theme"),
         onSelect: () => theme.commitPreview(),
         onHighlight: () => {
           theme.previewColorScheme(scheme)
@@ -869,6 +879,33 @@ export default function Layout(props: ParentProps) {
       })
     }
 
+    // Add language switching commands
+    commands.push({
+      id: "language.cycle",
+      title: language.t("language.cycle"),
+      category: language.t("command.category.language"),
+      keybind: "mod+shift+l",
+      onSelect: () => {
+        const currentIndex = languages.indexOf(language.language())
+        const nextIndex = (currentIndex + 1) % languages.length
+        const nextLang = languages[nextIndex]
+        language.setLanguage(nextLang)
+        showToast({
+          title: language.t("language.switched"),
+          description: languageLabel(nextLang),
+        })
+      },
+    })
+
+    for (const lang of languages) {
+      commands.push({
+        id: `language.set.${lang}`,
+        title: language.t("language.use", { language: languageLabel(lang) }),
+        category: language.t("command.category.language"),
+        onSelect: () => language.setLanguage(lang),
+      })
+    }
+
     return commands
   })
 
@@ -946,7 +983,7 @@ export default function Layout(props: ParentProps) {
 
     if (platform.openDirectoryPickerDialog && server.isLocal()) {
       const result = await platform.openDirectoryPickerDialog?.({
-        title: "Open project",
+        title: language.t("project.open"),
         multiple: true,
       })
       resolve(result)
@@ -1480,7 +1517,7 @@ export default function Layout(props: ParentProps) {
         >
           <TooltipKeybind
             placement={props.mobile ? "bottom" : "right"}
-            title="Archive session"
+            title={language.t("session.archive")}
             keybind={command.keybind("session.archive")}
             gutter={8}
           >
@@ -1523,7 +1560,7 @@ export default function Layout(props: ParentProps) {
       if (!directory) return
 
       const [workspaceStore] = globalSync.child(directory)
-      const kind = directory === project.worktree ? "local" : "sandbox"
+      const kind = directory === project.worktree ? language.t("workspace.local") : language.t("workspace.sandbox")
       const name = workspaceLabel(directory, workspaceStore.vcs?.branch, project.id)
       return `${kind} : ${name}`
     })
@@ -1699,7 +1736,7 @@ export default function Layout(props: ParentProps) {
                 icon="edit"
                 class="hidden _flex w-full text-left justify-start text-text-base rounded-md px-3"
               >
-                New session
+                {language.t("session.new")}
               </Button>
               <Show when={loading()}>
                 <SessionSkeleton />
@@ -1718,7 +1755,7 @@ export default function Layout(props: ParentProps) {
                       ;(e.currentTarget as HTMLButtonElement).blur()
                     }}
                   >
-                    Load more
+                    {language.t("common.loadMore")}
                   </Button>
                 </div>
               </Show>
@@ -1742,7 +1779,7 @@ export default function Layout(props: ParentProps) {
 
     const label = (directory: string) => {
       const [data] = globalSync.child(directory)
-      const kind = directory === props.project.worktree ? "local" : "sandbox"
+      const kind = directory === props.project.worktree ? language.t("workspace.local") : language.t("workspace.sandbox")
       const name = workspaceLabel(directory, data.vcs?.branch, props.project.id)
       return `${kind} : ${name}`
     }
@@ -1794,7 +1831,7 @@ export default function Layout(props: ParentProps) {
         >
           <div class="-m-3 p-2 flex flex-col w-72">
             <div class="px-4 pt-2 pb-1 text-14-medium text-text-strong truncate">{displayName(props.project)}</div>
-            <div class="px-4 pb-2 text-12-medium text-text-weak">Recent sessions</div>
+            <div class="px-4 pb-2 text-12-medium text-text-weak">{language.t("sidebar.recentSessions")}</div>
             <div class="px-2 pb-2 flex flex-col gap-2">
               <Show
                 when={workspaceEnabled()}
@@ -1847,7 +1884,7 @@ export default function Layout(props: ParentProps) {
                     navigateToProject(props.project.worktree)
                   }}
                 >
-                  View all sessions
+                  {language.t("sidebar.viewAllSessions")}
                 </Button>
               </div>
             </Show>
@@ -1899,7 +1936,7 @@ export default function Layout(props: ParentProps) {
                   ;(e.currentTarget as HTMLButtonElement).blur()
                 }}
               >
-                Load more
+                {language.t("common.loadMore")}
               </Button>
             </div>
           </Show>
@@ -1930,7 +1967,7 @@ export default function Layout(props: ParentProps) {
         .then((x) => x.data)
         .catch((err) => {
           showToast({
-            title: "Failed to create workspace",
+            title: language.t("workspace.createFailed"),
             description: errorMessage(err),
           })
           return undefined
@@ -1966,7 +2003,7 @@ export default function Layout(props: ParentProps) {
                   placement={sidebarProps.mobile ? "bottom" : "right"}
                   value={
                     <div class="flex items-center gap-2">
-                      <span>Open project</span>
+                      <span>{language.t("project.open")}</span>
                       <Show when={!sidebarProps.mobile}>
                         <span class="text-icon-base text-12-medium">{command.keybind("project.open")}</span>
                       </Show>
@@ -1982,10 +2019,10 @@ export default function Layout(props: ParentProps) {
             </DragDropProvider>
           </div>
           <div class="shrink-0 w-full pt-3 pb-3 flex flex-col items-center gap-2">
-            <Tooltip placement={sidebarProps.mobile ? "bottom" : "right"} value="Settings" class="hidden">
+            <Tooltip placement={sidebarProps.mobile ? "bottom" : "right"} value={language.t("common.settings")} class="hidden">
               <IconButton disabled icon="settings-gear" variant="ghost" size="large" />
             </Tooltip>
-            <Tooltip placement={sidebarProps.mobile ? "bottom" : "right"} value="Help">
+            <Tooltip placement={sidebarProps.mobile ? "bottom" : "right"} value={language.t("common.help")}>
               <IconButton
                 icon="help"
                 variant="ghost"
@@ -2045,16 +2082,18 @@ export default function Layout(props: ParentProps) {
                         <DropdownMenu.Portal>
                           <DropdownMenu.Content class="mt-1">
                             <DropdownMenu.Item onSelect={() => dialog.show(() => <DialogEditProject project={p} />)}>
-                              <DropdownMenu.ItemLabel>Edit</DropdownMenu.ItemLabel>
+                              <DropdownMenu.ItemLabel>{language.t("common.edit")}</DropdownMenu.ItemLabel>
                             </DropdownMenu.Item>
                             <DropdownMenu.Item onSelect={() => layout.sidebar.toggleWorkspaces(p.worktree)}>
                               <DropdownMenu.ItemLabel>
-                                {layout.sidebar.workspaces(p.worktree)() ? "Disable workspaces" : "Enable workspaces"}
+                                {layout.sidebar.workspaces(p.worktree)()
+                                  ? language.t("workspace.disable")
+                                  : language.t("workspace.enable")}
                               </DropdownMenu.ItemLabel>
                             </DropdownMenu.Item>
                             <DropdownMenu.Separator />
                             <DropdownMenu.Item onSelect={() => closeProject(p.worktree)}>
-                              <DropdownMenu.ItemLabel>Close</DropdownMenu.ItemLabel>
+                              <DropdownMenu.ItemLabel>{language.t("common.close")}</DropdownMenu.ItemLabel>
                             </DropdownMenu.Item>
                           </DropdownMenu.Content>
                         </DropdownMenu.Portal>
@@ -2076,7 +2115,7 @@ export default function Layout(props: ParentProps) {
                               layout.mobileSidebar.hide()
                             }}
                           >
-                            New session
+                            {language.t("session.new")}
                           </Button>
                         </div>
                         <div class="flex-1 min-h-0">
@@ -2088,7 +2127,7 @@ export default function Layout(props: ParentProps) {
                     <>
                       <div class="py-4 px-3">
                         <Button size="large" icon="plus-small" class="w-full" onClick={createWorkspace}>
-                          New workspace
+                          {language.t("workspace.new")}
                         </Button>
                       </div>
                       <div class="relative flex-1 min-h-0">
@@ -2129,9 +2168,9 @@ export default function Layout(props: ParentProps) {
               <div class="shrink-0 px-2 py-3 border-t border-border-weak-base">
                 <div class="rounded-md bg-background-base shadow-xs-border-base">
                   <div class="p-3 flex flex-col gap-2">
-                    <div class="text-12-medium text-text-strong">Getting started</div>
-                    <div class="text-text-base">OpenCode includes free models so you can start immediately.</div>
-                    <div class="text-text-base">Connect any provider to use models, inc. Claude, GPT, Gemini etc.</div>
+                    <div class="text-12-medium text-text-strong">{language.t("sidebar.gettingStarted")}</div>
+                    <div class="text-text-base">{language.t("sidebar.gettingStartedDesc1")}</div>
+                    <div class="text-text-base">{language.t("sidebar.gettingStartedDesc2")}</div>
                   </div>
                   <Button
                     class="flex w-full text-left justify-start text-12-medium text-text-strong stroke-[1.5px] rounded-md rounded-t-none shadow-none border-t border-border-weak-base px-3"
@@ -2139,7 +2178,7 @@ export default function Layout(props: ParentProps) {
                     icon="plus"
                     onClick={connectProvider}
                   >
-                    Connect provider
+                    {language.t("provider.connect")}
                   </Button>
                 </div>
               </div>
diff --git a/packages/app/src/pages/session.tsx b/packages/app/src/pages/session.tsx
index 89d3ec77334..4dd75cdeae0 100644
--- a/packages/app/src/pages/session.tsx
+++ b/packages/app/src/pages/session.tsx
@@ -38,6 +38,7 @@ import { UserMessage } from "@opencode-ai/sdk/v2"
 import type { FileDiff } from "@opencode-ai/sdk/v2/client"
 import { useSDK } from "@/context/sdk"
 import { usePrompt } from "@/context/prompt"
+import { useLanguage } from "@/context/language"
 import { extractPromptFromParts } from "@/utils/prompt"
 import { ConstrainDragYAxis, getDraggableId } from "@/utils/solid-dnd"
 import { usePermission } from "@/context/permission"
@@ -162,6 +163,7 @@ export default function Page() {
   const codeComponent = useCodeComponent()
   const command = useCommand()
   const platform = usePlatform()
+  const language = useLanguage()
   const params = useParams()
   const navigate = useNavigate()
   const sdk = useSDK()
@@ -419,51 +421,51 @@ export default function Page() {
   command.register(() => [
     {
       id: "session.new",
-      title: "New session",
-      category: "Session",
+      title: language.t("session.new"),
+      category: language.t("command.category.session"),
       keybind: "mod+shift+s",
       slash: "new",
       onSelect: () => navigate(`/${params.dir}/session`),
     },
     {
       id: "file.open",
-      title: "Open file",
-      description: "Search files and commands",
-      category: "File",
+      title: language.t("command.title.openFile"),
+      description: language.t("command.description.openFile"),
+      category: language.t("command.category.file"),
       keybind: "mod+p",
       slash: "open",
       onSelect: () => dialog.show(() => <DialogSelectFile />),
     },
     {
       id: "terminal.toggle",
-      title: "Toggle terminal",
+      title: language.t("terminal.toggle"),
       description: "",
-      category: "View",
+      category: language.t("command.category.view"),
       keybind: "ctrl+`",
       slash: "terminal",
       onSelect: () => view().terminal.toggle(),
     },
     {
       id: "review.toggle",
-      title: "Toggle review",
+      title: language.t("review.toggle"),
       description: "",
-      category: "View",
+      category: language.t("command.category.view"),
       keybind: "mod+shift+r",
       onSelect: () => view().reviewPanel.toggle(),
     },
     {
       id: "terminal.new",
-      title: "New terminal",
-      description: "Create a new terminal tab",
-      category: "Terminal",
+      title: language.t("terminal.new"),
+      description: language.t("command.description.newTerminal"),
+      category: language.t("command.category.terminal"),
       keybind: "ctrl+shift+`",
       onSelect: () => terminal.new(),
     },
     {
       id: "steps.toggle",
-      title: "Toggle steps",
-      description: "Show or hide steps for the current message",
-      category: "View",
+      title: language.t("command.title.toggleSteps"),
+      description: language.t("command.description.toggleSteps"),
+      category: language.t("command.category.view"),
       keybind: "mod+e",
       slash: "steps",
       disabled: !params.id,
@@ -475,62 +477,62 @@ export default function Page() {
     },
     {
       id: "message.previous",
-      title: "Previous message",
-      description: "Go to the previous user message",
-      category: "Session",
+      title: language.t("command.title.previousMessage"),
+      description: language.t("command.description.previousMessage"),
+      category: language.t("command.category.session"),
       keybind: "mod+arrowup",
       disabled: !params.id,
       onSelect: () => navigateMessageByOffset(-1),
     },
     {
       id: "message.next",
-      title: "Next message",
-      description: "Go to the next user message",
-      category: "Session",
+      title: language.t("command.title.nextMessage"),
+      description: language.t("command.description.nextMessage"),
+      category: language.t("command.category.session"),
       keybind: "mod+arrowdown",
       disabled: !params.id,
       onSelect: () => navigateMessageByOffset(1),
     },
     {
       id: "model.choose",
-      title: "Choose model",
-      description: "Select a different model",
-      category: "Model",
+      title: language.t("command.title.chooseModel"),
+      description: language.t("command.description.chooseModel"),
+      category: language.t("command.category.model"),
       keybind: "mod+'",
       slash: "model",
       onSelect: () => dialog.show(() => <DialogSelectModel />),
     },
     {
       id: "mcp.toggle",
-      title: "Toggle MCPs",
-      description: "Toggle MCPs",
-      category: "MCP",
+      title: language.t("command.title.toggleMcp"),
+      description: language.t("command.description.toggleMcp"),
+      category: language.t("command.category.mcp"),
       keybind: "mod+;",
       slash: "mcp",
       onSelect: () => dialog.show(() => <DialogSelectMcp />),
     },
     {
       id: "agent.cycle",
-      title: "Cycle agent",
-      description: "Switch to the next agent",
-      category: "Agent",
+      title: language.t("command.title.cycleAgent"),
+      description: language.t("command.description.cycleAgent"),
+      category: language.t("command.category.agent"),
       keybind: "mod+.",
       slash: "agent",
       onSelect: () => local.agent.move(1),
     },
     {
       id: "agent.cycle.reverse",
-      title: "Cycle agent backwards",
-      description: "Switch to the previous agent",
-      category: "Agent",
+      title: language.t("command.title.cycleAgentBack"),
+      description: language.t("command.description.cycleAgentBack"),
+      category: language.t("command.category.agent"),
       keybind: "shift+mod+.",
       onSelect: () => local.agent.move(-1),
     },
     {
       id: "model.variant.cycle",
-      title: "Cycle thinking effort",
-      description: "Switch to the next effort level",
-      category: "Model",
+      title: language.t("command.title.cycleThinking"),
+      description: language.t("command.description.cycleThinking"),
+      category: language.t("command.category.model"),
       keybind: "shift+mod+d",
       onSelect: () => {
         local.model.variant.cycle()
@@ -540,9 +542,9 @@ export default function Page() {
       id: "permissions.autoaccept",
       title:
         params.id && permission.isAutoAccepting(params.id, sdk.directory)
-          ? "Stop auto-accepting edits"
-          : "Auto-accept edits",
-      category: "Permissions",
+          ? language.t("command.title.stopAutoAcceptEdits")
+          : language.t("command.title.autoAcceptEdits"),
+      category: language.t("command.category.permissions"),
       keybind: "mod+shift+a",
       disabled: !params.id || !permission.permissionsEnabled(),
       onSelect: () => {
@@ -551,19 +553,19 @@ export default function Page() {
         permission.toggleAutoAccept(sessionID, sdk.directory)
         showToast({
           title: permission.isAutoAccepting(sessionID, sdk.directory)
-            ? "Auto-accepting edits"
-            : "Stopped auto-accepting edits",
+            ? language.t("command.toast.autoAcceptOnTitle")
+            : language.t("command.toast.autoAcceptOffTitle"),
           description: permission.isAutoAccepting(sessionID, sdk.directory)
-            ? "Edit and write permissions will be automatically approved"
-            : "Edit and write permissions will require approval",
+            ? language.t("command.toast.autoAcceptOnDescription")
+            : language.t("command.toast.autoAcceptOffDescription"),
         })
       },
     },
     {
       id: "session.undo",
-      title: "Undo",
-      description: "Undo the last message",
-      category: "Session",
+      title: language.t("command.title.undo"),
+      description: language.t("command.description.undo"),
+      category: language.t("command.category.session"),
       slash: "undo",
       disabled: !params.id || visibleUserMessages().length === 0,
       onSelect: async () => {
@@ -590,9 +592,9 @@ export default function Page() {
     },
     {
       id: "session.redo",
-      title: "Redo",
-      description: "Redo the last undone message",
-      category: "Session",
+      title: language.t("command.title.redo"),
+      description: language.t("command.description.redo"),
+      category: language.t("command.category.session"),
       slash: "redo",
       disabled: !params.id || !info()?.revert?.messageID,
       onSelect: async () => {
@@ -619,9 +621,9 @@ export default function Page() {
     },
     {
       id: "session.compact",
-      title: "Compact session",
-      description: "Summarize the session to reduce context size",
-      category: "Session",
+      title: language.t("command.title.compactSession"),
+      description: language.t("command.description.compactSession"),
+      category: language.t("command.category.session"),
       slash: "compact",
       disabled: !params.id || visibleUserMessages().length === 0,
       onSelect: async () => {
@@ -630,8 +632,8 @@ export default function Page() {
         const model = local.model.current()
         if (!model) {
           showToast({
-            title: "No model selected",
-            description: "Connect a provider to summarize this session",
+            title: language.t("command.toast.noModelTitle"),
+            description: language.t("command.toast.noModelDescription"),
           })
           return
         }
@@ -644,9 +646,9 @@ export default function Page() {
     },
     {
       id: "session.fork",
-      title: "Fork from message",
-      description: "Create a new session from a previous message",
-      category: "Session",
+      title: language.t("command.title.forkFromMessage"),
+      description: language.t("command.description.forkFromMessage"),
+      category: language.t("command.category.session"),
       slash: "fork",
       disabled: !params.id || visibleUserMessages().length === 0,
       onSelect: () => dialog.show(() => <DialogFork />),
@@ -655,9 +657,9 @@ export default function Page() {
       ? [
           {
             id: "session.share",
-            title: "Share session",
-            description: "Share this session and copy the URL to clipboard",
-            category: "Session",
+            title: language.t("session.shareCommandTitle"),
+            description: language.t("session.shareCommandDescription"),
+            category: language.t("command.category.session"),
             slash: "share",
             disabled: !params.id || !!info()?.share?.url,
             onSelect: async () => {
@@ -667,22 +669,22 @@ export default function Page() {
                 .then((res) => {
                   navigator.clipboard.writeText(res.data!.share!.url).catch(() =>
                     showToast({
-                      title: "Failed to copy URL to clipboard",
+                      title: language.t("session.shareCopyFailedTitle"),
                       variant: "error",
                     }),
                   )
                 })
                 .then(() =>
                   showToast({
-                    title: "Session shared",
-                    description: "Share URL copied to clipboard!",
+                    title: language.t("session.shareSuccessTitle"),
+                    description: language.t("session.shareSuccessDescription"),
                     variant: "success",
                   }),
                 )
                 .catch(() =>
                   showToast({
-                    title: "Failed to share session",
-                    description: "An error occurred while sharing the session",
+                    title: language.t("session.shareFailedTitle"),
+                    description: language.t("session.shareFailedDescription"),
                     variant: "error",
                   }),
                 )
@@ -690,9 +692,9 @@ export default function Page() {
           },
           {
             id: "session.unshare",
-            title: "Unshare session",
-            description: "Stop sharing this session",
-            category: "Session",
+            title: language.t("session.unshareCommandTitle"),
+            description: language.t("session.unshareCommandDescription"),
+            category: language.t("command.category.session"),
             slash: "unshare",
             disabled: !params.id || !info()?.share?.url,
             onSelect: async () => {
@@ -701,15 +703,15 @@ export default function Page() {
                 .unshare({ sessionID: params.id })
                 .then(() =>
                   showToast({
-                    title: "Session unshared",
-                    description: "Session unshared successfully!",
+                    title: language.t("session.unshareSuccessTitle"),
+                    description: language.t("session.unshareSuccessDescription"),
                     variant: "success",
                   }),
                 )
                 .catch(() =>
                   showToast({
-                    title: "Failed to unshare session",
-                    description: "An error occurred while unsharing the session",
+                    title: language.t("session.unshareFailedTitle"),
+                    description: language.t("session.unshareFailedDescription"),
                     variant: "error",
                   }),
                 )
@@ -1200,7 +1202,7 @@ export default function Page() {
                 classes={{ button: "w-full" }}
                 onClick={() => setStore("mobileTab", "session")}
               >
-                Session
+                {language.t("session.tab")}
               </Tabs.Trigger>
               <Tabs.Trigger
                 value="review"
@@ -1209,7 +1211,7 @@ export default function Page() {
                 onClick={() => setStore("mobileTab", "review")}
               >
                 <Switch>
-                  <Match when={hasReview()}>{reviewCount()} Files Changed</Match>
+                  <Match when={hasReview()}>{language.t("session.filesChangedLabel", { count: reviewCount() })}</Match>
                   <Match when={true}>Review</Match>
                 </Switch>
               </Tabs.Trigger>
@@ -1240,7 +1242,7 @@ export default function Page() {
                           <Match when={hasReview()}>
                             <Show
                               when={diffsReady()}
-                              fallback={<div class="px-4 py-4 text-text-weak">Loading changes...</div>}
+                              fallback={<div class="px-4 py-4 text-text-weak">{language.t("session.loadingChanges")}</div>}
                             >
                               <SessionReviewTab
                                 diffs={diffs}
@@ -1331,7 +1333,9 @@ export default function Page() {
                                   sync.session.history.loadMore(id)
                                 }}
                               >
-                                {historyLoading() ? "Loading earlier messages..." : "Load earlier messages"}
+                                {historyLoading()
+                                  ? language.t("session.loadingEarlierMessages")
+                                  : language.t("session.loadEarlierMessages")}
                               </Button>
                             </div>
                           </Show>
@@ -1415,7 +1419,7 @@ export default function Page() {
                 when={prompt.ready()}
                 fallback={
                   <div class="w-full min-h-32 md:min-h-40 rounded-md border border-border-weak-base bg-background-base/50 px-4 py-3 text-text-weak whitespace-pre-wrap pointer-events-none">
-                    {handoff.prompt || "Loading prompt..."}
+                    {handoff.prompt || language.t("session.loadingPrompt")}
                   </div>
                 }
               >
@@ -1462,7 +1466,7 @@ export default function Page() {
                             <DiffChanges changes={diffs()} variant="bars" />
                           </Show>
                           <div class="flex items-center gap-1.5">
-                            <div>Review</div>
+                            <div>{language.t("session.reviewTab")}</div>
                             <Show when={info()?.summary?.files}>
                               <div class="text-12-medium text-text-strong h-4 px-2 flex flex-col items-center justify-center rounded-full bg-surface-base">
                                 {info()?.summary?.files ?? 0}
@@ -1476,7 +1480,7 @@ export default function Page() {
                       <Tabs.Trigger
                         value="context"
                         closeButton={
-                          <Tooltip value="Close tab" placement="bottom">
+                          <Tooltip value={language.t("tabs.close")} placement="bottom">
                             <IconButton icon="close" variant="ghost" onClick={() => tabs().close("context")} />
                           </Tooltip>
                         }
@@ -1485,7 +1489,7 @@ export default function Page() {
                       >
                         <div class="flex items-center gap-2">
                           <SessionContextUsage variant="indicator" />
-                          <div>Context</div>
+                          <div>{language.t("context.tab")}</div>
                         </div>
                       </Tabs.Trigger>
                     </Show>
@@ -1494,7 +1498,7 @@ export default function Page() {
                     </SortableProvider>
                     <div class="bg-background-base h-full flex items-center justify-center border-b border-border-weak-base px-3">
                       <TooltipKeybind
-                        title="Open file"
+                      title={language.t("command.title.openFile")}
                         keybind={command.keybind("file.open")}
                         class="flex items-center"
                       >
@@ -1516,7 +1520,7 @@ export default function Page() {
                           <Match when={hasReview()}>
                             <Show
                               when={diffsReady()}
-                              fallback={<div class="px-6 py-4 text-text-weak">Loading changes...</div>}
+                              fallback={<div class="px-6 py-4 text-text-weak">{language.t("session.loadingChanges")}</div>}
                             >
                               <SessionReviewTab
                                 diffs={diffs}
@@ -1714,7 +1718,7 @@ export default function Page() {
                                   }}
                                 >
                                   <Icon name="plus-small" size="small" />
-                                  <span>Add {selectionLabel()} to context</span>
+                                  <span>{language.t("context.addToContext", { selection: selectionLabel() ?? "" })}</span>
                                 </button>
                               </div>
                             )}
@@ -1771,7 +1775,7 @@ export default function Page() {
                               />
                             </Match>
                             <Match when={state()?.loading}>
-                              <div class="px-6 py-4 text-text-weak">Loading...</div>
+                              <div class="px-6 py-4 text-text-weak">{language.t("common.loading")}</div>
                             </Match>
                             <Match when={state()?.error}>
                               {(err) => <div class="px-6 py-4 text-text-weak">{err()}</div>}
@@ -1827,9 +1831,11 @@ export default function Page() {
                     )}
                   </For>
                   <div class="flex-1" />
-                  <div class="text-text-weak pr-2">Loading...</div>
+                  <div class="text-text-weak pr-2">{language.t("common.loading")}</div>
+                </div>
+                <div class="flex-1 flex items-center justify-center text-text-weak">
+                  {language.t("terminal.loading")}
                 </div>
-                <div class="flex-1 flex items-center justify-center text-text-weak">Loading terminal...</div>
               </div>
             }
           >
@@ -1848,7 +1854,7 @@ export default function Page() {
                   </SortableProvider>
                   <div class="h-full flex items-center justify-center">
                     <TooltipKeybind
-                      title="New terminal"
+                      title={language.t("terminal.new")}
                       keybind={command.keybind("terminal.new")}
                       class="flex items-center"
                     >
diff --git a/packages/app/tsconfig.json b/packages/app/tsconfig.json
index e2a27dd5d8a..54f62fc0e8e 100644
--- a/packages/app/tsconfig.json
+++ b/packages/app/tsconfig.json
@@ -21,6 +21,6 @@
       "@/*": ["./src/*"]
     }
   },
-  "include": ["src", "package.json"],
+  "include": ["src", "src/locales/**/*.json", "package.json"],
   "exclude": ["dist", "ts-dist"]
 }
diff --git a/packages/ui/src/components/list.tsx b/packages/ui/src/components/list.tsx
index 6929f6b7347..886b6075c18 100644
--- a/packages/ui/src/components/list.tsx
+++ b/packages/ui/src/components/list.tsx
@@ -21,6 +21,7 @@ export interface ListProps<T> extends FilteredListProps<T> {
   activeIcon?: IconProps["name"]
   filter?: string
   search?: ListSearchProps | boolean
+  groupLabel?: (category: string) => string
 }
 
 export interface ListRef {
@@ -166,9 +167,11 @@ export function List<T>(props: ListProps<T> & { ref?: (ref: ListRef) => void })
       onCleanup(() => scroll.removeEventListener("scroll", handler))
     })
 
+    const label = () => (props.groupLabel ? props.groupLabel(groupProps.category) : groupProps.category)
+
     return (
       <div data-slot="list-header" data-stuck={stuck()} ref={setHeader}>
-        {groupProps.category}
+        {label()}
       </div>
     )
   }