diff --git a/src/components/ChatBox/BottomInput.tsx b/src/components/ChatBox/BottomInput.tsx
index 34327f11e..d276dab8b 100644
--- a/src/components/ChatBox/BottomInput.tsx
+++ b/src/components/ChatBox/BottomInput.tsx
@@ -324,7 +324,7 @@ export const BottomInput = ({
 							fontFamily: "Inter",
 						}}
 						rows={1}
-						placeholder={t("ask-placeholder")}
+						placeholder={t("chat.ask-placeholder")}
 						onInput={(e) => {
 							const el = e.currentTarget;
 							el.style.height = "auto";
diff --git a/src/components/ChatBox/index.tsx b/src/components/ChatBox/index.tsx
index 006eb1fdd..c6724da19 100644
--- a/src/components/ChatBox/index.tsx
+++ b/src/components/ChatBox/index.tsx
@@ -520,10 +520,10 @@ export default function ChatBox(): JSX.Element {
 					<div className=" w-full flex flex-col relative z-10">
 						<div className="flex flex-col items-center gap-1 h-[210px] justify-end">
 							<div className="text-xl leading-[30px] text-zinc-800 text-center font-bold">
-								{t("welcome-to-eigent")}
+								{t("chat.welcome-to-eigent")}
 							</div>
 							<div className="text-lg leading-7 text-zinc-500 text-center mb-5">
-								{t("how-can-i-help-you")}
+								{t("chat.how-can-i-help-you")}
 							</div>
 						</div>
 
diff --git a/src/components/HistorySidebar/SearchInput.tsx b/src/components/HistorySidebar/SearchInput.tsx
index 386f50304..e0b68bf40 100644
--- a/src/components/HistorySidebar/SearchInput.tsx
+++ b/src/components/HistorySidebar/SearchInput.tsx
@@ -28,7 +28,7 @@ export default function SearchInput({ value, onChange }: SearchInputProps) {
 			{!value && !isFocused && (
 				<span className="pointer-events-none absolute inset-0 flex items-center justify-center text-sm text-text-label select-none cursor-text">
 					<Search className="w-4 h-4 mr-1 text-icon-secondary" />
-					{t("search")}
+					{t("task-hub.search")}
 				</span>
 			)}
 			
diff --git a/src/components/HistorySidebar/index.tsx b/src/components/HistorySidebar/index.tsx
index 5fde933c8..1f8917312 100644
--- a/src/components/HistorySidebar/index.tsx
+++ b/src/components/HistorySidebar/index.tsx
@@ -241,7 +241,7 @@ export default function HistorySidebar() {
 							>
 								<ArrowLeft size={16} />
 								<span className="text-text-primary text-sm font-bold leading-13">
-									{t("task-hub")}
+									{t("task-hub.task-hub")}
 								</span>
 							</Button>
 							<Button
@@ -265,7 +265,7 @@ export default function HistorySidebar() {
 								>
 									<Plus className="w-8 h-8 text-icon-tertiary group-hover:text-icon-primary transition-all duration-300" />
 									<span className="text-text-tertiary font-bold text-[14px] leading-9 group-hover:text-text-body transition-all duration-300">
-										{t("new-project")}
+										{t("task-hub.new-project")}
 									</span>
 								</div>
 								{history_type === "table" ? (
@@ -299,7 +299,7 @@ export default function HistorySidebar() {
 																	/>
 																</div>
 																<div className="text-left text-[14px] text-text-primary font-bold leading-9 overflow-hidden text-ellipsis break-words line-clamp-3">
-																	{task?.messages[0]?.content || t("new-project")}
+																	{task?.messages[0]?.content || t("task-hub.new-project")}
 																</div>
 																<div className="w-full">
 																	<Progress
@@ -399,13 +399,13 @@ export default function HistorySidebar() {
 																<TooltipTrigger asChild>
 																	<span>
 																		{task?.messages[0]?.content ||
-																			t("new-project")}
+																			t("task-hub.new-project")}
 																	</span>
 																</TooltipTrigger>
 																<TooltipContent className="w-[200px] bg-white-100% p-2 text-wrap break-words text-xs select-text pointer-events-auto !fixed ">
 																	<p>
 																		{task?.messages[0]?.content ||
-																			t("new-project")}
+																			t("task-hub.new-project")}
 																	</p>
 																</TooltipContent>
 															</Tooltip>
@@ -421,7 +421,7 @@ export default function HistorySidebar() {
 							<div className="px-sm py-4 flex flex-col gap-2">
 								<div className="flex justify-between items-center">
 									<div className="text-text-primary text-base font-bold leading-9">
-										{t("project-archives")}
+										{t("task-hub.project-archives")}
 									</div>
 									<Button
 										variant="ghost"
@@ -481,11 +481,11 @@ export default function HistorySidebar() {
 
 																	<div className="text-[14px] text-text-primary font-bold leading-9 overflow-hidden text-ellipsis whitespace-nowrap">
 																		{task?.question.split("|")[0] ||
-																			t("new-project")}
+																			t("task-hub.new-project")}
 																	</div>
 																	<div className="text-xs text-black leading-17  overflow-hidden text-ellipsis break-words line-clamp-2">
 																		{task?.question.split("|")[1] ||
-																			t("new-project")}
+																			t("task-hub.new-project")}
 																	</div>
 																</div>
 															);
@@ -514,7 +514,7 @@ export default function HistorySidebar() {
 																	<TooltipTrigger asChild>
 																		<span>
 																			{" "}
-																			{task?.question.split("|")[0] || t("new-project")}
+																			{task?.question.split("|")[0] || t("task-hub.new-project")}
 																		</span>
 																	</TooltipTrigger>
 																	<TooltipContent
@@ -523,7 +523,7 @@ export default function HistorySidebar() {
 																	>
 																		<div>
 																			{" "}
-																			{task?.question.split("|")[0] || t("new-project")}
+																			{task?.question.split("|")[0] || t("task-hub.new-project")}
 																		</div>
 																	</TooltipContent>
 																</Tooltip>
@@ -558,7 +558,7 @@ export default function HistorySidebar() {
 																				}}
 																			>
 																				<Share size={16} />
-																				{t("share")}
+																				{t("task-hub.share")}
 																			</Button>
 																		</PopoverClose>
 						
@@ -576,7 +576,7 @@ export default function HistorySidebar() {
 																					size={16}
 																					className="text-icon-primary group-hover:text-icon-cuation"
 																				/>
-																				{t("delete")}
+																				{t("task-hub.delete")}
 																			</Button>
 																		</PopoverClose>
 																	</div>
diff --git a/src/components/InstallStep/InstallDependencies.tsx b/src/components/InstallStep/InstallDependencies.tsx
index 48ddc85b1..f5ddee631 100644
--- a/src/components/InstallStep/InstallDependencies.tsx
+++ b/src/components/InstallStep/InstallDependencies.tsx
@@ -211,10 +211,10 @@ export const InstallDependencies: React.FC<{
 							className="mr-2 no-drag leading-tight"
 						>
 							<FileDown className="w-4 h-4" />
-							{t("report-bug")}
+							{t("layout.report-bug")}
 						</Button>
 						<Button size="sm" onClick={handleInstall}>
-							Retry
+							{t("layout.retry")}
 						</Button>
 					</DialogFooter>
 				</DialogContent>
diff --git a/src/components/SearchHistoryDialog.tsx b/src/components/SearchHistoryDialog.tsx
index 8dd0ea31c..7808c73f7 100644
--- a/src/components/SearchHistoryDialog.tsx
+++ b/src/components/SearchHistoryDialog.tsx
@@ -73,15 +73,15 @@ export function SearchHistoryDialog() {
 				onClick={() => setOpen(true)}
 			>
 				<Search className="text-menutabs-icon-active" size={16} />
-				<span>{t("search")}</span>
+				<span>{t("task-hub.search")}</span>
 			</Button>
 			<CommandDialog open={open} onOpenChange={setOpen}>
 				<DialogTitle asChild>
-					<VisuallyHidden>{t("search-dialog")}</VisuallyHidden>
+					<VisuallyHidden>{t("task-hub.search-dialog")}</VisuallyHidden>
 				</DialogTitle>
-				<CommandInput placeholder={t("search-dialog-placeholder")} />
+				<CommandInput placeholder={t("task-hub.search-dialog-placeholder")} />
 				<CommandList>
-					<CommandEmpty>{t("no-results")}</CommandEmpty>
+					<CommandEmpty>{t("task-hub.no-results")}</CommandEmpty>
 					<CommandGroup heading="Today">
 						{historyTasks.map((task) => (
 							<CommandItem
diff --git a/src/components/TopBar/index.tsx b/src/components/TopBar/index.tsx
index aae296842..7fd20e9e4 100644
--- a/src/components/TopBar/index.tsx
+++ b/src/components/TopBar/index.tsx
@@ -182,7 +182,7 @@ function HeaderWin() {
 						className="mr-2 no-drag leading-tight"
 					>
 						<FileDown className="w-4 h-4" />
-						{t("report-bug")}
+						{t("layout.report-bug")}
 					</Button>
 					<Button
 						onClick={() => {
@@ -197,7 +197,7 @@ function HeaderWin() {
 							alt="chevron_left"
 							className="w-4 h-4 text-button-primary-icon-default"
 						/>
-						{t("refer-friends")}
+						{t("layout.refer-friends")}
 					</Button>
 					<Button
 						onClick={() => navigate("/setting")}
diff --git a/src/components/WorkFlow/index.tsx b/src/components/WorkFlow/index.tsx
index 6fa4c3db5..353a1c6b9 100644
--- a/src/components/WorkFlow/index.tsx
+++ b/src/components/WorkFlow/index.tsx
@@ -301,7 +301,7 @@ export default function Workflow({
 		<div className="w-full h-full flex flex-col items-center justify-center">
 			<div className="flex items-center justify-between w-full ">
 				<div className="text-text-body font-bold text-lg leading-relaxed">
-					{t("your-ai-workforce")}
+					{t("workforce.your-ai-workforce")}
 				</div>
 				<div className="flex items-center justify-center gap-sm ">
 					{/* <Button
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
deleted file mode 100644
index 4c335f526..000000000
--- a/src/i18n/locales/en-US.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "new-project": "New Project",
-    "task-hub": "Task Hub",
-    "search": "Search",
-    "project-archives": "Project Archives",
-    "ongoing-tasks": "Ongoing Tasks",
-    "share": "Share",
-    "delete": "Delete",
-    "table": "Table",
-    "list": "List",
-    "search-dialog": "Search Dialog",
-    "search-dialog-placeholder": "Search or ask a question",
-    "no-results": "No results found.",
-    "welcome-to-eigent": "Welcome to Eigent",
-    "how-can-i-help-you": "How can I help you today?",
-    "ask-placeholder": "What do you need to achieve today?",
-    "report-bug": "Report a bug",
-    "refer-friends": "Refer friends",
-    "your-ai-workforce": "Your AI Workforce"
-}
\ No newline at end of file
diff --git a/src/i18n/locales/en/chat.json b/src/i18n/locales/en/chat.json
new file mode 100644
index 000000000..36e57cf48
--- /dev/null
+++ b/src/i18n/locales/en/chat.json
@@ -0,0 +1,5 @@
+{
+	"welcome-to-eigent": "Welcome to Eigent",
+	"how-can-i-help-you": "How can I help you today?",
+	"ask-placeholder": "What do you need to achieve today?"
+}
diff --git a/src/i18n/locales/en/general.json b/src/i18n/locales/en/general.json
new file mode 100644
index 000000000..6db6fb28a
--- /dev/null
+++ b/src/i18n/locales/en/general.json
@@ -0,0 +1,12 @@
+{
+	"account": "Account",
+	"you-are-currently-signed-in-with": "You are currently signed in with {{email}}",
+	"manage": "Manage",
+	"log-out": "Log out",
+	"language": "Language",
+	"select-language": "Select language",
+	"system-default": "System Default",
+	"appearance": "Appearance",
+	"light": "Light",
+	"transparent": "Transparent"
+}
\ No newline at end of file
diff --git a/src/i18n/locales/en/index.ts b/src/i18n/locales/en/index.ts
new file mode 100644
index 000000000..5a9c751ac
--- /dev/null
+++ b/src/i18n/locales/en/index.ts
@@ -0,0 +1,12 @@
+import general from "./general.json";
+import layout from "./layout.json";
+import taskHub from "./taskHub.json";
+import workforce from "./workforce.json";
+import chat from "./chat.json";
+export default {
+	general,
+	layout,	
+	taskHub,
+	workforce,
+	chat,
+};
diff --git a/src/i18n/locales/en/layout.json b/src/i18n/locales/en/layout.json
new file mode 100644
index 000000000..7e27cf5f5
--- /dev/null
+++ b/src/i18n/locales/en/layout.json
@@ -0,0 +1,5 @@
+{
+	"report-bug": "Report a bug",
+	"refer-friends": "Refer friends",
+	"retry": "Retry"
+}
diff --git a/src/i18n/locales/en/taskHub.json b/src/i18n/locales/en/taskHub.json
new file mode 100644
index 000000000..2a5c36a92
--- /dev/null
+++ b/src/i18n/locales/en/taskHub.json
@@ -0,0 +1,14 @@
+{
+	"task-hub": "Task Hub",
+	"new-project": "New Project",
+	"search": "Search",
+	"project-archives": "Project Archives",
+	"ongoing-tasks": "Ongoing Tasks",
+	"share": "Share",
+	"delete": "Delete",
+	"table": "Table",
+	"list": "List",
+	"search-dialog": "Search Dialog",
+	"search-dialog-placeholder": "Search or ask a question",
+	"no-results": "No results found."
+}
diff --git a/src/i18n/locales/en/workforce.json b/src/i18n/locales/en/workforce.json
new file mode 100644
index 000000000..c4b508c89
--- /dev/null
+++ b/src/i18n/locales/en/workforce.json
@@ -0,0 +1,3 @@
+{
+	"your-ai-workforce": "Your AI Workforce"
+}
diff --git a/src/i18n/locales/index.ts b/src/i18n/locales/index.ts
index 0f5b4dc08..3eedecf79 100644
--- a/src/i18n/locales/index.ts
+++ b/src/i18n/locales/index.ts
@@ -1,5 +1,5 @@
-import en from "./en-US.json";
-import zh from "./zh-CN.json";
+import zh from './zh-cn/index'
+import en from './en/index'
 
 export const resources = {
   "en-US": {
diff --git a/src/i18n/locales/zh-cn/chat.json b/src/i18n/locales/zh-cn/chat.json
new file mode 100644
index 000000000..26cda4c21
--- /dev/null
+++ b/src/i18n/locales/zh-cn/chat.json
@@ -0,0 +1,5 @@
+{
+	"welcome-to-eigent": "欢迎使用Eigent",
+	"how-can-i-help-you": "今天有什么可以帮你的吗？",
+	"ask-placeholder": "What do you need to achieve today?"
+}
diff --git a/src/i18n/locales/zh-cn/general.json b/src/i18n/locales/zh-cn/general.json
new file mode 100644
index 000000000..d07bc1047
--- /dev/null
+++ b/src/i18n/locales/zh-cn/general.json
@@ -0,0 +1,12 @@
+{
+	"account": "账户",
+	"you-are-currently-signed-in-with": "你当前使用的是 {{email}} 账户",
+	"manage": "管理",
+	"log-out": "退出",
+	"language": "语言",
+	"select-language": "选择语言",
+	"system-default": "系统默认",
+	"appearance": "外观",
+	"light": "亮色",
+	"transparent": "透明"
+}
\ No newline at end of file
diff --git a/src/i18n/locales/zh-cn/index.ts b/src/i18n/locales/zh-cn/index.ts
new file mode 100644
index 000000000..5a9c751ac
--- /dev/null
+++ b/src/i18n/locales/zh-cn/index.ts
@@ -0,0 +1,12 @@
+import general from "./general.json";
+import layout from "./layout.json";
+import taskHub from "./taskHub.json";
+import workforce from "./workforce.json";
+import chat from "./chat.json";
+export default {
+	general,
+	layout,	
+	taskHub,
+	workforce,
+	chat,
+};
diff --git a/src/i18n/locales/zh-cn/layout.json b/src/i18n/locales/zh-cn/layout.json
new file mode 100644
index 000000000..df677cecf
--- /dev/null
+++ b/src/i18n/locales/zh-cn/layout.json
@@ -0,0 +1,5 @@
+{
+	"report-bug": "报告bug",
+	"refer-friends": "推荐朋友",
+	"retry": "重试"
+}
diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-cn/taskHub.json
similarity index 51%
rename from src/i18n/locales/zh-CN.json
rename to src/i18n/locales/zh-cn/taskHub.json
index 65450c7d2..d1aeca651 100644
--- a/src/i18n/locales/zh-CN.json
+++ b/src/i18n/locales/zh-cn/taskHub.json
@@ -1,6 +1,6 @@
 {
-	"new-project": "新项目",
 	"task-hub": "任务中心",
+	"new-project": "新项目",
 	"search": "搜索",
 	"project-archives": "项目归档",
 	"ongoing-tasks": "进行中的任务",
@@ -10,11 +10,5 @@
 	"list": "列表",
 	"search-dialog": "搜索对话",
 	"search-dialog-placeholder": "搜索或提问",
-	"no-results": "没有结果",
-	"welcome-to-eigent": "欢迎使用Eigent",
-	"how-can-i-help-you": "今天有什么可以帮你的吗？",
-	"ask-placeholder": "What do you need to achieve today?",
-	"report-bug": "报告bug",
-	"refer-friends": "推荐朋友",
-	"your-ai-workforce": "你的AI workforce"
-}
\ No newline at end of file
+	"no-results": "没有结果"
+}
diff --git a/src/i18n/locales/zh-cn/workforce.json b/src/i18n/locales/zh-cn/workforce.json
new file mode 100644
index 000000000..33dba06ff
--- /dev/null
+++ b/src/i18n/locales/zh-cn/workforce.json
@@ -0,0 +1,3 @@
+{
+	"your-ai-workforce": "你的AI workforce"
+}
diff --git a/src/pages/History.tsx b/src/pages/History.tsx
index 029c2467e..4604b2d79 100644
--- a/src/pages/History.tsx
+++ b/src/pages/History.tsx
@@ -249,7 +249,7 @@ export default function Home() {
 			/>
 			<div>
 				<div className="px-6 py-4 flex justify-between items-center">
-					<div className="text-2xl font-bold leading-4">{t("ongoing-tasks")}</div>
+					<div className="text-2xl font-bold leading-4">{t("task-hub.ongoing-tasks")}</div>
 
 					<div className="flex items-center gap-md">
 						<SearchHistoryDialog />
@@ -260,7 +260,7 @@ export default function Home() {
 							onClick={createChat}
 						>
 							<Plus size={16} />
-							<span>{t("new-project")}</span>
+							<span>{t("task-hub.new-project")}</span>
 						</Button>
 						<Tabs
 							value={history_type}
@@ -271,11 +271,11 @@ export default function Home() {
 							<TabsList className="p-1 h-[28px] ">
 								<TabsTrigger value="table">
 									<Table size={16} />
-									<div>{t("table")}</div>
+									<div>{t("task-hub.table")}</div>
 								</TabsTrigger>
 								<TabsTrigger value="list">
 									<List size={16} />
-									<div>{t("list")}</div>
+									<div>{t("task-hub.list")}</div>
 								</TabsTrigger>
 							</TabsList>
 						</Tabs>
@@ -306,7 +306,7 @@ export default function Home() {
 											/>
 										</div>
 										<div className="text-[14px] text-text-primary font-bold leading-9 overflow-hidden text-ellipsis whitespace-nowrap">
-											{task.summaryTask || t("new-project")}
+											{task.summaryTask || t("task-hub.new-project")}
 										</div>
 										<div className="w-full">
 											<Progress
@@ -396,10 +396,10 @@ export default function Home() {
 									<div className=" flex-1 text-[14px] text-text-primary font-bold leading-9 overflow-hidden text-ellipsis whitespace-nowrap">
 										<Tooltip>
 											<TooltipTrigger asChild>
-												<span> {task.summaryTask || t("new-project")}</span>
+												<span> {task.summaryTask || t("task-hub.new-project")}</span>
 											</TooltipTrigger>
 											<TooltipContent>
-												<p> {task.summaryTask || t("new-project")}</p>
+												<p> {task.summaryTask || t("task-hub.new-project")}</p>
 											</TooltipContent>
 										</Tooltip>
 									</div>
@@ -532,11 +532,11 @@ export default function Home() {
 								<TabsList>
 									<TabsTrigger value="table">
 										<Table size={16} />
-										<div>{t("table")}</div>
+										<div>{t("task-hub.table")}</div>
 									</TabsTrigger>
 									<TabsTrigger value="list">
 										<List size={16} />
-										<div>{t("list")}</div>
+										<div>{t("task-hub.list")}</div>
 									</TabsTrigger>
 								</TabsList>
 							</Tabs>
@@ -577,7 +577,7 @@ export default function Home() {
 									</div>
 									<div className="flex-1 flex flex-col gap-1 w-full">
 										<div className="text-[14px] text-text-primary font-bold leading-9 overflow-hidden text-ellipsis whitespace-nowrap">
-											{task?.question || t("new-project")}
+											{task?.question || t("task-hub.new-project")}
 										</div>
 									</div>
 								</div>
@@ -609,7 +609,7 @@ export default function Home() {
 											<TooltipTrigger asChild>
 												<span>
 													{" "}
-													{task?.question.split("|")[0] || t("new-project")}
+													{task?.question.split("|")[0] || t("task-hub.new-project")}
 												</span>
 											</TooltipTrigger>
 											<TooltipContent
@@ -618,7 +618,7 @@ export default function Home() {
 											>
 												<div>
 													{" "}
-													{task?.question.split("|")[0] || t("new-project")}
+													{task?.question.split("|")[0] || t("task-hub.new-project")}
 												</div>
 											</TooltipContent>
 										</Tooltip>
@@ -653,7 +653,7 @@ export default function Home() {
 														}}
 													>
 														<Share size={16} />
-														{t("share")}
+														{t("task-hub.share")}
 													</Button>
 												</PopoverClose>
 
@@ -671,7 +671,7 @@ export default function Home() {
 															size={16}
 															className="text-icon-primary group-hover:text-icon-cuation"
 														/>
-														{t("delete")}
+														{t("task-hub.delete")}
 													</Button>
 												</PopoverClose>
 											</div>
diff --git a/src/pages/Setting/General.tsx b/src/pages/Setting/General.tsx
index f718f8497..e7ef2d847 100644
--- a/src/pages/Setting/General.tsx
+++ b/src/pages/Setting/General.tsx
@@ -11,7 +11,8 @@ import { proxyFetchPut, proxyFetchGet } from "@/api/http";
 import { createRef, RefObject } from "react";
 import { useEffect, useState } from "react";
 import { useChatStore } from "@/store/chatStore";
-import {LocaleEnum, switchLanguage} from "@/i18n";
+import { LocaleEnum, switchLanguage } from "@/i18n";
+import { useTranslation } from "react-i18next";
 
 import {
 	Select,
@@ -24,6 +25,7 @@ import {
 } from "@/components/ui/select";
 
 export default function SettingGeneral() {
+	const { t } = useTranslation();
 	const authStore = useAuthStore();
 	const navigate = useNavigate();
 	const [isLoading, setIsLoading] = useState(false);
@@ -39,12 +41,12 @@ export default function SettingGeneral() {
 	const [themeList, setThemeList] = useState<any>([
 		{
 			img: light,
-			label: "Light",
+			label: "general.light",
 			value: "light",
 		},
 		{
 			img: transparent,
-			label: "Transparent",
+			label: "general.transparent",
 			value: "transparent",
 		},
 	]);
@@ -91,12 +93,12 @@ export default function SettingGeneral() {
 			setThemeList([
 				{
 					img: light,
-					label: "Light",
+					label: "general.light",
 					value: "light",
 				},
 				{
 					img: transparent,
-					label: "Transparent",
+					label: "general.transparent",
 					value: "transparent",
 				},
 			]);
@@ -104,7 +106,7 @@ export default function SettingGeneral() {
 			setThemeList([
 				{
 					img: light,
-					label: "Light",
+					label: "general.light",
 					value: "light",
 				},
 			]);
@@ -115,10 +117,12 @@ export default function SettingGeneral() {
 		<div className="space-y-8">
 			<div className="px-6 py-4 bg-surface-secondary rounded-2xl">
 				<div className="text-base font-bold leading-12 text-text-body">
-					Account
+					{t("general.account")}
 				</div>
 				<div className="text-sm leading-13 mb-4">
-					You are currently signed in with {authStore.email}
+					{t("general.you-are-currently-signed-in-with", {
+						email: authStore.email,
+					})}
 				</div>
 				<div className="flex items-center gap-sm">
 					<Button
@@ -129,7 +133,7 @@ export default function SettingGeneral() {
 						size="xs"
 					>
 						<Settings className="w-4 h-4 text-button-primary-icon-default" />
-						Manage
+						{t("general.manage")}
 					</Button>
 					<Button
 						variant="outline"
@@ -141,22 +145,24 @@ export default function SettingGeneral() {
 						}}
 					>
 						<LogOut className="w-4 h-4 text-button-tertiery-text-default" />
-						Log out
+						{t("general.log-out")}
 					</Button>
 				</div>
 			</div>
 			<div className="px-6 py-4 bg-surface-secondary rounded-2xl">
 				<div className="text-base font-bold leading-12 text-text-primary">
-					Language
+					{t("general.language")}
 				</div>
 				<div className="mt-md">
 					<Select value={language} onValueChange={switchLanguage}>
 						<SelectTrigger>
-							<SelectValue placeholder="Select a fruit" />
+							<SelectValue placeholder={t("general.select-language")} />
 						</SelectTrigger>
 						<SelectContent className="bg-input-bg-default border">
 							<SelectGroup>
-								<SelectItem value="system">System Default</SelectItem>
+								<SelectItem value="system">
+									{t("general.system-default")}
+								</SelectItem>
 								{languageList.map((item) => (
 									<SelectItem key={item.key} value={item.key}>
 										{item.label}
@@ -169,7 +175,7 @@ export default function SettingGeneral() {
 			</div>
 			<div className="px-6 py-4 bg-surface-secondary rounded-2xl">
 				<div className="text-base font-bold leading-12 text-text-primary">
-					Appearance
+					{t("general.appearance")}
 				</div>
 				<div className="flex items-center gap-md mt-md">
 					{themeList.map((item: any) => (
@@ -190,7 +196,7 @@ export default function SettingGeneral() {
 									item.value == appearance ? "underline" : ""
 								}`}
 							>
-								{item.label}
+								{t(item.label)}
 							</div>
 						</div>
 					))}