Based on the provided git diff, here is a suggested commit message:

Update language translations and fix UI issues

Author: smallstone

src/views/components/InputMessage/index.tsx

@@ -34,11 +34,7 @@ import Topic from "./Topic";
 import { observer } from "mobx-react-lite";
 import { useMst } from "@/views/stores/RootStore";
 import { ChatContext } from "@/views/stores/InputStore";
-<<<<<<< HEAD
 import { Trans, useTranslation } from "react-i18next";
-=======
-import { useTranslation } from "react-i18next";
->>>>>>> 36a272b (Update language translations and fix UI issues)
 
 const useStyles = createStyles((theme) => ({
   actionIcon: {
@@ -461,7 +457,10 @@ const InputMessage = observer((props: any) => {
           <Menu.Dropdown>
             {modelMenus.map((modelName) => {
               return (
-                <Menu.Item key={modelName} onClick={() => changeModel(modelName)}>
+                <Menu.Item
+                  key={modelName}
+                  onClick={() => changeModel(modelName)}
+                >
                   {getModelShowName(modelName)}
                 </Menu.Item>
               );

src/views/components/MessageBody/index.tsx

@@ -3,21 +3,14 @@ import React from "react";
 import { observer } from "mobx-react-lite";
 import MessageMarkdown from "@/views/components/MessageMarkdown";
 import { useMst } from "@/views/stores/RootStore";
-<<<<<<< HEAD
-import { Trans, useTranslation } from "react-i18next";
-=======
 import { useTranslation } from "react-i18next";
->>>>>>> 36a272b (Update language translations and fix UI issues)
 
 interface IProps {
   messageType: string;
   children: string;
   messageDone?: boolean;
-<<<<<<< HEAD
   activeStep?: boolean;
-=======
   temp?: boolean;
->>>>>>> 36a272b (Update language translations and fix UI issues)
 }
 
 const useStyles = createStyles((theme, options: any) => ({
@@ -39,29 +32,25 @@ const trasnlateKey = (children: string) => {
 };
 
 const MessageBody = observer((props: IProps) => {
-<<<<<<< HEAD
-  const { children, messageType, activeStep = false, messageDone } = props;
-=======
-  const { children, messageType, temp = false, messageDone } = props;
->>>>>>> 36a272b (Update language translations and fix UI issues)
+  const {
+    children,
+    messageType,
+    activeStep = false,
+    temp = false,
+    messageDone,
+  } = props;
   const { chat } = useMst();
   const { classes } = useStyles({
     chatPanelWidth: chat.chatPanelWidth,
   });
   const { t } = useTranslation();
-<<<<<<< HEAD
   const transkey = trasnlateKey(children);
-=======
->>>>>>> 36a272b (Update language translations and fix UI issues)
 
   return messageType === "bot" ? (
     <MessageMarkdown
       className={classes.bodyWidth}
-<<<<<<< HEAD
       activeStep={activeStep}
-=======
       temp={temp}
->>>>>>> 36a272b (Update language translations and fix UI issues)
       messageDone={messageDone}
     >
       {children}
@@ -74,11 +63,7 @@ const MessageBody = observer((props: IProps) => {
         width: chat.chatPanelWidth - 20,
       }}
     >
-<<<<<<< HEAD
-      <pre className={classes.userContent}>{children}</pre>
-=======
       <pre className={classes.userContent}>{t(children)}</pre>
->>>>>>> 36a272b (Update language translations and fix UI issues)
     </Container>
   );
 });

src/views/i18n/zh.json

@@ -17,41 +17,4 @@
   "commit changes with commit message in english.": "选择要提交的代码变更，总结英文提交消息，并提交到代码库。",
   "Generate a commit message for the given git diff.": "为给定的 git diff 生成提交消息。",
   "Generate a release note for the given commit log.": "为给定的提交日志生成发布说明。"
-=======
-  "Delete message": "删除",
-  "Copied": "已复制",
-  "Copy message": "复制回答",
-  "Refilled": "已重新填入",
-  "Refill prompt": "重新填进输入框",
-  "User": "用户",
-  "Ask DevChat a question or type ‘/’ for workflow": "向 DevChat 直接提问或输入 '/' 以查看可用的工作流",
-  "How do I use DevChat?": "如何使用 DevChat？",
-  "balance": "你的账户余额为 {{formatedCurrency}}，登录 <4>web.devchat.ai</4> 获得更多 tokens",
-  "devchat.help": "你想生成一些代码还是对这个项目有疑问？请首先右键单击相关的文件或代码片段，将它们添加到 DevChat 中作为上下文，然后在输入框中写下你的请求或问题，我将基于添加的上下文生成代码或回答你的问题。<br> <br> 你还可以点击输入框左侧的“+”按钮，查看更多添加上下文的快捷方法。此外，在输入框中键入“/”，DevChat 会列出可供使用的各类工作流，按 Tab 键或输入完整命令触发你需要的工作流。聊天愉快！ <br> <br>下面是一些工作流的示例：<br> <br> [/code: 基于你的提示词和上下文生成代码](#code) <br> [/commit_message: 根据加入上下文中的代码变更生成提交消息](#commit_message) <br> <br> [/release_note: 根据加入上下文中的提交历史生成提交说明](#release_note) <br> <br> [/ask-code: 询问任何关于当前代码库的信息，并从这位人工智能代理那里获得答案](#ask_code) <br> <br>你可以点击[设置](#settings)来配置 DevChat",
-  "devchat.setkey": "你的环境或设置中缺少 DevChat 访问密钥。请输入你的 DevChat 访问密钥，这样我就可以开始正常工作了。<br> <br> <button value=\"setting_devchat_key\">设置 DevChat 访问密钥</button>",
-  "Is DevChat Access Key ready?": "DevChat 访问密钥是否已经设置好？",
-  "Ask questions about the current project's codebase, which requires proactive acquisition of additional context information to answer.": "询问关于当前项目代码库的问题，我将主动获取相关的上下文信息来回答。",
-  "Generate code with a general template embedded into the prompt.": "使用隐式嵌入到提示词中的通用模板生成代码。",
-  "Generate code with a Python-specific template embedded into the prompt.": "使用隐式嵌入到提示词中的 Python 特定模板生成代码。",
-  "commit changes with commit message in english.": "选择要提交的代码变更，总结英文提交消息，并提交到代码库。",
-  "Generate a commit message for the given git diff.": "为给定的 git diff 生成提交消息。",
-  "Generate a release note for the given commit log.": "为给定的提交日志生成发布说明。",
-  "Delete message": "删除",
-  "Copied": "已复制",
-  "Copy message": "复制回答",
-  "Refilled": "已重新填入",
-  "Refill prompt": "重新填进输入框",
-  "User": "用户",
-  "Ask DevChat a question or type ‘/’ for workflow": "向 DevChat 直接提问或输入 '/' 以查看可用的工作流",
-  "How do I use DevChat?": "如何使用 DevChat？",
-  "balance": "你的账户余额为 {{formatedCurrency}}，登录 <4>web.devchat.ai</4> 获得更多 tokens",
-  "devchat.help": "你想生成一些代码还是对这个项目有疑问？请首先右键单击相关的文件或代码片段，将它们添加到 DevChat 中作为上下文，然后在输入框中写下你的请求或问题，我将基于添加的上下文生成代码或回答你的问题。<br> <br> 你还可以点击输入框左侧的“+”按钮，查看更多添加上下文的快捷方法。此外，在输入框中键入“/”，DevChat 会列出可供使用的各类工作流，按 Tab 键或输入完整命令触发你需要的工作流。聊天愉快！ <br> <br>下面是一些工作流的示例：<br> <br> [/code: 基于你的提示词和上下文生成代码](#code) <br> [/commit_message: 根据加入上下文中的代码变更生成提交消息](#commit_message) <br> <br> [/release_note: 根据加入上下文中的提交历史生成提交说明](#release_note) <br> <br> [/ask-code: 询问任何关于当前代码库的信息，并从这位人工智能代理那里获得答案](#ask_code) <br> <br>你可以点击[设置](#settings)来配置 DevChat",
-  "devchat.setkey": "你的环境或设置中缺少 DevChat 访问密钥。请输入你的 DevChat 访问密钥，这样我就可以开始正常工作了。<br> <br> <button value=\"setting_devchat_key\">设置 DevChat 访问密钥</button>",
-  "Is DevChat Access Key ready?": "DevChat 访问密钥是否已经设置好？",
-  "Ask questions about the current project's codebase, which requires proactive acquisition of additional context information to answer.": "询问关于当前项目代码库的问题，我将主动获取相关的上下文信息来回答。",
-  "Generate code with a general template embedded into the prompt.": "使用隐式嵌入到提示词中的通用模板生成代码。",
-  "Generate code with a Python-specific template embedded into the prompt.": "使用隐式嵌入到提示词中的 Python 特定模板生成代码。",
-  "commit changes with commit message in english.": "选择要提交的代码变更，总结英文提交消息，并提交到代码库。",
-  "Generate a commit message for the given git diff.": "为给定的 git diff 生成提交消息。",
-  "Generate a release note for the given commit log.": "为给定的提交日志生成发布说明。"
 }