diff --git a/options/locale/locale_zh-CN.json b/options/locale/locale_zh-CN.json index 5960e554b7..6b9ba53878 100644 --- a/options/locale/locale_zh-CN.json +++ b/options/locale/locale_zh-CN.json @@ -313,7 +313,6 @@ "install.admin_email": "邮箱地址", "install.install_btn_confirm": "立即安装", "install.test_git_failed": "无法识别 'git' 命令:%v", - "install.sqlite3_not_available": "您所使用的发行版不支持 SQLite3,请从 %s 下载官方构建版,而不是 gobuild 版本。", "install.invalid_db_setting": "数据库设置无效: %v", "install.invalid_db_table": "数据库表「%s」无效:%v", "install.invalid_repo_path": "仓库根目录设置无效:%v", @@ -1385,6 +1384,7 @@ "repo.projects.column.delete": "删除列", "repo.projects.column.deletion_desc": "删除项目列会将所有相关工单移至默认列。是否继续?", "repo.projects.column.color": "颜色", + "repo.projects.column": "列", "repo.projects.open": "开启", "repo.projects.close": "关闭", "repo.projects.column.assigned_to": "指派给", @@ -1784,6 +1784,7 @@ "repo.pulls.review_only_possible_for_full_diff": "只有在查看全部差异时才能进行审核", "repo.pulls.filter_changes_by_commit": "按提交筛选", "repo.pulls.nothing_to_compare": "分支内容相同,无需创建合并请求。", + "repo.pulls.no_common_history": "这些分支没有共同的合并基点。请选择不同的基点或比较分支。", "repo.pulls.nothing_to_compare_have_tag": "所选分支 / Git 标签相同。", "repo.pulls.nothing_to_compare_and_allow_empty_pr": "这些分支是相等的,此合并请求将为空。", "repo.pulls.has_pull_request": "这些分支之间的合并请求已存在:%[2]s#%[3]d", @@ -1956,7 +1957,6 @@ "repo.signing.wont_sign.headsigned": "合并将不会被签名,因为最新提交没有签名。", "repo.signing.wont_sign.commitssigned": "合并将不会被签名,因为所有相关的提交都没有签名。", "repo.signing.wont_sign.approved": "合并将不会被签名,因为合并请求未被批准。", - "repo.signing.wont_sign.not_signed_in": "您还没有登录。", "repo.ext_wiki": "访问外部百科", "repo.ext_wiki.desc": "链接到外部百科。", "repo.wiki": "百科", @@ -3313,7 +3313,6 @@ "admin.config.cache_config": "缓存配置", "admin.config.cache_adapter": "缓存适配器", "admin.config.cache_interval": "缓存周期", - "admin.config.cache_conn": "缓存连接字符串", "admin.config.cache_item_ttl": "缓存项目 TTL", "admin.config.cache_test": "测试缓存", "admin.config.cache_test_failed": "缓存测试失败:%v。", @@ -3328,7 +3327,6 @@ "admin.config.instance_web_banner.message_placeholder": "横幅消息(支持 Markdown)", "admin.config.session_config": "会话配置", "admin.config.session_provider": "会话提供者", - "admin.config.provider_config": "提供者配置", "admin.config.cookie_name": "Cookie 名称", "admin.config.gc_interval_time": "GC 周期", "admin.config.session_life_time": "会话生命周期",