diff --git a/core/app/src/main/res/values-zh-rCN/strings.xml b/core/app/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 000000000..9cc71f3ec
--- /dev/null
+++ b/core/app/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="asset_studio_title">资源工作室</string>
+  <string name="asset_studio_subtitle">Drawable 与图标制作工具</string>
+  <string name="asset_studio_launch">启动工作室</string>
+  <string name="asset_studio_create_drawable">创建 Drawable</string>
+  <string name="asset_studio_create_icon">创建图标</string>
+  <string name="asset_studio_import_image">导入图片</string>
+  <string name="asset_studio_recent_assets">最近资源</string>
+  <string name="asset_studio_quick_actions">快捷操作</string>
+  <string name="asset_studio_default_path">res/drawable</string>
+  <string name="asset_studio_launch_description">打开完整的资源工作室界面</string>
+
+  <string name="sub_module_maker_title">子模块创建器</string>
+  <string name="sub_module_maker_subtitle">为您的项目创建新的子模块</string>
+  <string name="sub_module_configuration">模块配置</string>
+  <string name="sub_module_language">编程语言</string>
+  <string name="sub_module_kotlin">Kotlin</string>
+  <string name="sub_module_java">Java</string>
+  <string name="sub_module_name_hint">输入模块名称（如：feature、utils）</string>
+  <string name="sub_module_name_valid">模块名称有效</string>
+  <string name="sub_module_name_invalid">模块名称无效</string>
+  <string name="sub_module_create">创建模块</string>
+  <string name="sub_module_created_success">模块 \'%1$s\' 创建成功！</string>
+  <string name="sub_module_created_error">创建模块失败：%1$s</string>
+  <string name="sub_module_info_title">关于子模块</string>
+  <string name="sub_module_info_description">子模块帮助您将项目组织成更小、更易管理的组件。每个模块可以拥有自己的依赖项和构建配置。</string>
+
+  <string name="title_terminal">终端</string>
+  <string name="terminal_bstab">终端</string>
+  <string name="terminal_new_session">新建终端</string>
+  <string name="terminal_close_session">关闭终端</string>
+  <string name="terminal_empty_state">暂无终端会话</string>
+  <string name="terminal_empty_message">当前没有打开的终端会话，创建一个新会话以开始使用。</string>
+  <string name="terminal_create_first">创建终端</string>
+
+  <string name="edit">编辑</string>
+</resources>
diff --git a/core/resources/src/main/res/values-zh-rCN/strings.xml b/core/resources/src/main/res/values-zh-rCN/strings.xml
index 07507b808..03b1e58aa 100644
--- a/core/resources/src/main/res/values-zh-rCN/strings.xml
+++ b/core/resources/src/main/res/values-zh-rCN/strings.xml
@@ -196,6 +196,10 @@
   <string name="project_renamed_success">项目更名成功</string>
   <string name="project_rename_failed">项目重命名失败</string>
 
+  <string name="btn_idecfg">IDE 配置</string>
+  <string name="msg_use_ndk">为此项目添加 C++ 模板</string>
+  <string name="template_cpp">C++ 项目</string>
+
   <string name="idepref_enableBuildOutput_title">启用构建输出</string>
   <string name="idepref_enableBuildOutput_summary">在编辑器中显示构建输出</string>
 
@@ -573,7 +577,7 @@
   <string name="action_import_classes">导入类</string>
   <string name="action_generate_setters_getters">生成 setter/getter</string>
   <string name="action_add_throws">添加“throws”</string>
-  <string name="action_comment_line">注释此行</string>
+  <string name="action_comment_line">注释行</string>
   <string name="action_create_missing_method">创建缺失方法</string>
   <string name="action_convert_to_block">转为块</string>
   <string name="action_generate_constructor">生成构造函数</string>
@@ -1004,4 +1008,258 @@
   <string name="lsp_ok_button">好的</string>
   <string name="lsp_installation_failed_description">无法安装更新：%s</string>
   <string name="lsp_retry_button">重试</string>
+
+  <!-- Git Client UI Strings -->
+  <string name="git_commit_changes">提交更改</string>
+  <string name="git_commit_action">提交</string>
+  <string name="git_commit_message_empty">提交信息不能为空</string>
+  <string name="git_discard_changes">放弃更改</string>
+  <string name="git_discard_changes_message">您确定要放弃 %1$s 中的更改吗？此操作无法撤消。</string>
+  <string name="git_discard_action">放弃</string>
+  <string name="git_credentials_saved">已保存</string>
+  <string name="git_credentials_not_saved">未保存</string>
+  <string name="git_clear_credentials">清除凭据</string>
+  <string name="git_clear_credentials_message">您确定要清除已保存的凭据吗？</string>
+  <string name="git_clear_action">清除</string>
+  <string name="git_credentials_cleared">凭据已清除</string>
+  <string name="git_user_config">Git 用户配置</string>
+  <string name="git_save_action">保存</string>
+  <string name="git_user_config_updated">用户配置已更新</string>
+  <string name="git_name_email_empty">用户名和邮箱不能为空</string>
+  <string name="git_add_remote">添加远程仓库</string>
+  <string name="git_add_action">添加</string>
+  <string name="git_invalid_input">输入无效</string>
+  <string name="git_name_url_empty">名称和 URL 不能为空</string>
+  <string name="git_no_remotes">无远程仓库</string>
+  <string name="git_no_remotes_message">未配置远程仓库，请先添加一个远程仓库。</string>
+  <string name="git_push_to_remote">推送到远程仓库</string>
+  <string name="git_push_message">将提交推送到 %1$s</string>
+  <string name="git_push_action">推送</string>
+  <string name="git_without_credentials">不使用凭据</string>
+  <string name="git_pull_from_remote">从远程仓库拉取</string>
+  <string name="git_pull_message">从 %1$s 拉取更改</string>
+  <string name="git_pull_action">拉取</string>
+  <string name="git_fetch_from_remote">从远程仓库获取</string>
+  <string name="git_fetch_message">从 %1$s 获取更改</string>
+  <string name="git_fetch_action">获取</string>
+  <string name="git_remove_remote">移除远程仓库</string>
+  <string name="git_remove_remote_message">您确定要移除远程仓库 \'%1$s\' 吗？</string>
+  <string name="git_remove_action">移除</string>
+  <string name="git_operation_failed">操作失败</string>
+  <string name="git_operation_failed_with_name">%1$s 失败</string>
+  <string name="git_current_branch">当前：%1$s</string>
+  <string name="git_create_new_branch">创建新分支</string>
+  <string name="git_create_action">创建</string>
+  <string name="git_branch_name_empty">分支名称不能为空</string>
+  <string name="git_cannot_delete_current_branch">无法删除当前分支</string>
+  <string name="git_delete_branch">删除分支</string>
+  <string name="git_delete_branch_message">您确定要删除分支 \'%1$s\' 吗？</string>
+  <string name="git_delete_action">删除</string>
+  <string name="git_init_failed">初始化仓库失败</string>
+  <string name="git_initialize_repo">初始化仓库</string>
+  <string name="git_initialize_repo_message">在以下位置初始化新的 Git 仓库：\n%1$s\n\n选择初始分支名称：</string>
+  <string name="git_initialize_action">初始化</string>
+  <string name="git_clone_repository">克隆仓库</string>
+  <string name="git_clone_to">克隆到：%1$s</string>
+  <string name="git_clone_action">克隆</string>
+  <string name="git_url_empty">URL 不能为空</string>
+  <string name="git_backup_project">备份项目</string>
+  <string name="git_backing_up_project">正在备份项目…</string>
+  <string name="git_backup_in_progress">备份进行中</string>
+  <string name="git_creating_backup_of">正在创建 %1$s 的备份</string>
+  <string name="git_backup_completed">备份完成</string>
+  <string name="git_backup_success_message">项目备份成功！\n\n位置：\n%1$s</string>
+  <string name="git_backup_failed">备份失败</string>
+  <string name="git_backup_failed_message">备份项目失败：%1$s</string>
+  <string name="git_deleting_project">正在删除项目…</string>
+  <string name="git_delete_in_progress">删除进行中</string>
+  <string name="git_deleting">正在删除 %1$s</string>
+  <string name="git_option_shallow">浅克隆（更快）</string>
+  <string name="git_option_single_branch">仅克隆单个分支</string>
+  <string name="git_option_recursive">包含子模块克隆</string>
+  <string name="git_option_no_tags">不获取标签</string>
+  <string name="git_option_bare">创建裸仓库</string>
+  <string name="git_delete_project_action">删除项目</string>
+  <string name="git_rename_action">重命名</string>
+  <string name="git_remote_origin">origin</string>
+  <string name="git_remote_url_hint">https://github.com/user/repo.git</string>
+  <string name="review_summary">摘要</string>
+  <string name="review_files_modified">待修改的文件</string>
+  <string name="review_code_preview">代码预览</string>
+  <string name="review_apply_changes">应用更改</string>
+  <string name="goto_my_project">前往我的项目</string>
+  <string name="git_credentials_optional">凭据（可选）</string>
+  <string name="git_username_hint">用户名</string>
+  <string name="git_password_hint">密码/令牌</string>
+  <string name="action_download">下载</string>
+  <string name="current_color">当前颜色</string>
+  <string name="hint_hex_color">十六进制颜色（如 #FF6200EE）</string>
+  <string name="color_presets">颜色预设</string>
+  <string name="edit_version_and_sdk">编辑版本和 SDK</string>
+  <string name="git_history_example_action">创建了 MainActivity.kt</string>
+  <string name="git_history_example_time">2 分钟前</string>
+  <string name="git_history_example_files">修改了 3 个文件</string>
+  <string name="configure_local_llm">配置本地大语言模型</string>
+  <string name="hint_base_url">基础 URL</string>
+  <string name="hint_llm_base_url">http://localhost:1234</string>
+  <string name="hint_model_name">模型名称</string>
+  <string name="hint_llm_model_name">local-model</string>
+  <string name="git_commit_history">提交历史</string>
+  <string name="action_refresh">刷新</string>
+  <string name="git_no_commits">暂无提交</string>
+  <string name="git_no_repo_found">未找到仓库</string>
+  <string name="git_init_description">初始化一个新仓库、克隆已有仓库或打开现有仓库</string>
+  <string name="git_open_existing_repo">打开现有仓库</string>
+  <string name="git_stage_all">全部暂存</string>
+  <string name="git_no_changes">未检测到更改</string>
+  <string name="git_commit_message_hint">提交信息</string>
+  <string name="ai_agent_chat_hint">您想让我做什么？</string>
+  <string name="asset_studio_icon_name_hint">图标名称</string>
+  <string name="git_user_email_hint">用户邮箱</string>
+  <string name="hint_hex_color_short">十六进制颜色</string>
+  <string name="hint_search_icons">搜索图标…</string>
+  <string name="ai_provider_hint">AI 提供商</string>
+  <string name="ai_model_hint">模型/代理</string>
+  <string name="git_branch_name_hint">分支名称</string>
+  <string name="loading_versions">正在加载版本…</string>
+  <string name="no_versions_available">暂无可用版本</string>
+  <string name="failed_to_load">加载失败</string>
+  <string name="error_loading">加载出错</string>
+  <string name="msg_request_timed_out">请求超时</string>
+  <string name="msg_no_ndk_versions">仓库中未找到 NDK 版本</string>
+  <string name="msg_no_cmake_versions">仓库中未找到 CMake 版本</string>
+  <string name="project_setup_failed">项目设置失败</string>
+  <string name="action_retry">重试</string>
+  <string name="full_error_details">完整错误详情</string>
+  <string name="asset_studio_material_icons">Material 图标</string>
+  <string name="asset_studio_import_vector">导入矢量 XML</string>
+  <string name="action_import">导入</string>
+  <string name="asset_studio_save_to">保存到</string>
+  <string name="action_generate">生成</string>
+  <string name="select_cmake_version_remove">选择要移除的 CMake 版本</string>
+  <string name="select_ndk_version_remove">选择要移除的 NDK 版本</string>
+  <string name="msg_select_cmake_first">请先从下拉菜单中选择 CMake 版本</string>
+  <string name="msg_select_ndk_first">请先从下拉菜单中选择 NDK 版本</string>
+  <string name="msg_unsupported_arch">不支持的架构：%s</string>
+  <string name="msg_failed_get_filename">获取包文件名失败：%s</string>
+  <string name="msg_empty_filename">从清单中收到空文件名</string>
+  <string name="msg_successfully_downloaded">下载成功</string>
+  <string name="msg_installation_failed_with_error">安装失败：%s</string>
+  <string name="msg_download_failed_with_error">下载失败：%s</string>
+  <string name="msg_failed_get_package_info">获取包信息失败：%s</string>
+  <string name="msg_file_too_big">文件太大！</string>
+  <string name="msg_permission_denied">权限被拒绝</string>
+  <string name="ai_agent_version">v0.1-preview</string>
+  <string name="review_changes">审查更改</string>
+
+  <string name="ai_file_example_name">MainActivity.kt</string>
+  <string name="ai_file_modified">已修改</string>
+  <string name="ai_file_example_path">/path/to/file</string>
+  <string name="import_project">导入项目</string>
+  <string name="terminal_appearance">外观</string>
+  <string name="terminal_text_size">文字大小</string>
+  <string name="terminal_hide_extra_keys">隐藏额外按键工具栏</string>
+  <string name="ai_file_modifying">正在修改…</string>
+  <string name="ai_file_write_permissions">AI 文件写入权限</string>
+  <string name="ai_enable_file_writing">启用 AI 文件写入</string>
+  <string name="ai_require_confirmation">写入前需要确认</string>
+  <string name="ai_auto_backup">写入前自动备份文件</string>
+  <string name="ai_file_write_warning">警告：启用文件写入允许 AI 修改您的项目文件。应用前请务必审查更改。</string>
+  <string name="update_dependency">更新依赖</string>
+  <string name="hint_version_name">版本名称</string>
+  <string name="hint_version_code">版本号</string>
+  <string name="hint_min_sdk">最低 SDK</string>
+  <string name="hint_target_sdk">目标 SDK</string>
+  <string name="hint_compile_sdk">编译 SDK</string>
+  <string name="hint_remote_name">远程仓库名称（如 origin）</string>
+  <string name="hint_remote_url">远程仓库 URL</string>
+  <string name="project_path_example">/path/to/project</string>
+  <string name="git_name_label">名称：</string>
+  <string name="git_user_default">用户</string>
+  <string name="git_email_label">邮箱：</string>
+  <string name="git_email_default">user@example.com</string>
+  <string name="git_edit_user_config">编辑用户配置</string>
+  <string name="git_credentials_title">凭据</string>
+  <string name="git_remember_credentials">记住凭据</string>
+  <string name="git_save_credentials_summary">保存推送/拉取的用户名和密码</string>
+  <string name="git_status_label">状态：</string>
+  <string name="server_status_title">状态</string>
+  <string name="ai_ready_to_assist">随时为您提供帮助</string>
+  <string name="ai_modification_summary">修改摘要</string>
+  <string name="asset_studio_preview">预览</string>
+  <string name="asset_studio_source">来源</string>
+  <string name="asset_studio_select_image">选择图片</string>
+  <string name="asset_studio_load_xml">加载 XML</string>
+  <string name="asset_studio_choose_source">选择图片或 XML 矢量图来创建应用图标</string>
+  <string name="asset_studio_icon_settings">图标设置</string>
+  <string name="asset_studio_shape">形状</string>
+  <string name="asset_studio_shape_circle">圆形</string>
+  <string name="asset_studio_shape_square">方形</string>
+  <string name="asset_studio_shape_rounded">圆角</string>
+  <string name="asset_studio_bg_color">背景颜色</string>
+  <string name="asset_studio_choose_color">选择颜色</string>
+  <string name="asset_studio_custom">自定义</string>
+  <string name="asset_studio_fg_scale">前景缩放</string>
+  <string name="asset_studio_rounded_corners">圆角</string>
+  <string name="asset_studio_generate_icons">生成图标</string>
+  <string name="git_current_branch_default">当前：main</string>
+  <string name="dynamic_color">动态取色</string>
+  <string name="color_alpha">透明度</string>
+  <string name="color_red">红色</string>
+  <string name="color_green">绿色</string>
+  <string name="color_blue">蓝色</string>
+  <string name="git_remote_operations">远程操作</string>
+  <string name="git_no_remotes_configured">未配置远程仓库\n添加远程仓库以推送/拉取更改</string>
+  <string name="git_stage">暂存</string>
+  <string name="git_unstage">取消暂存</string>
+  <string name="git_initial_commit_example">初始提交</string>
+  <string name="git_date_example">2024年1月1日 12:00</string>
+  <string name="git_author_example">作者名称</string>
+  <string name="ai_auto_switch_provider">自动切换提供商</string>
+  <string name="ai_auto_switch_summary">出错时自动切换提供商</string>
+  <string name="ai_code_completion">代码补全</string>
+  <string name="ai_code_completion_summary">启用 AI 驱动的代码建议</string>
+  <string name="ai_provider_label">提供商：</string>
+  <string name="not_set">未设置</string>
+  <string name="ai_model_label">模型：</string>
+  <string name="destination">目标位置</string>
+  <string name="edit_icon">编辑图标</string>
+  <string name="color_label">颜色</string>
+  <string name="action_change">更改</string>
+  <string name="save_and_copy">保存并复制</string>
+  <string name="asset_studio_m3_icons">M3 图标</string>
+  <string name="asset_studio_no_recent">暂无最近资源</string>
+  <string name="updating_dependencies">正在更新依赖</string>
+  <string name="msg_loading">加载中…</string>
+  <string name="git_checkout">检出</string>
+  <string name="msg_build_variant_not_found">未找到所选构建变体</string>
+  <string name="msg_cannot_determine_package">无法运行应用，无法确定包名</string>
+  <string name="msg_install_failure">安装失败：%s</string>
+  <string name="msg_installation_succeeded">安装成功</string>
+  <string name="msg_reinitializing_project">正在重新初始化项目…</string>
+  <string name="msg_an_error_occurred">发生错误：%s</string>
+  <string name="msg_failed_to_fetch_versions">获取版本失败：%s</string>
+  <string name="msg_error_fetching_versions">获取版本出错：%s</string>
+  <string name="msg_unable_to_start_activity">无法启动活动</string>
+  <string name="action_convert_to_uppercase">转换为大写</string>
+  <string name="action_convert_to_lowercase">转换为小写</string>
+  <string name="action_delete_line">删除行</string>
+  <string name="action_duplicate_line">复制行</string>
+  <string name="action_copy_line">复制行内容</string>
+  <string name="action_move_line_up">上移一行</string>
+  <string name="action_move_line_down">下移一行</string>
+  <string name="action_insert_line_above">在上方插入行</string>
+  <string name="action_insert_line_below">在下方插入行</string>
+  <string name="action_select_line">选择行</string>
+  <string name="action_trim_trailing_whitespace">去除行尾空白</string>
+  <string name="action_indent_line">增加缩进</string>
+  <string name="action_unindent_line">减少缩进</string>
+  <string name="action_join_lines">合并行</string>
+  <string name="action_clear_all">全部清除</string>
+  <string name="title_clear_all">全部清除</string>
+  <string name="msg_clear_all_confirm">确定要清除所有文本吗？此操作无法撤销。</string>
+  <string name="btn_clear">清除</string>
+  <string name="msg_copied_to_clipboard">已复制到剪贴板</string>
+  <string name="msg_trailing_whitespace_removed">已去除行尾空白</string>
+  <string name="msg_editor_cleared">编辑器已清空</string>
 </resources>
diff --git a/logging/logsender/src/main/res/values-zh-rCN/strings.xml b/logging/logsender/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 000000000..ea165150d
--- /dev/null
+++ b/logging/logsender/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="msg_bind_service_failed">无法绑定到 AndroidIDE</string>
+  <string name="notification_action_exit">退出</string>
+</resources>