diff --git a/options/locale/locale_fr-FR.json b/options/locale/locale_fr-FR.json index f07668d90d..5cfa7498b9 100644 --- a/options/locale/locale_fr-FR.json +++ b/options/locale/locale_fr-FR.json @@ -105,6 +105,7 @@ "copy_error": "Échec de la copie", "copy_type_unsupported": "Ce type de fichier ne peut pas être copié", "copy_filename": "Copier le nom du fichier", + "copy_output": "Copier la sortie", "write": "Écrire", "preview": "Aperçu", "loading": "Chargement…", @@ -3439,7 +3440,7 @@ "action.transfer_repo": "a transféré le dépôt %s vers %s", "action.push_tag": "a poussé l’étiquette %[3]s de %[4]s", "action.delete_tag": "a supprimé l’étiquette %[2]s de %[3]s", - "action.delete_branch": "a supprimée la branche %[2]s de %[3]s", + "action.delete_branch": "a supprimé la branche %[2]s de %[3]s", "action.compare_branch": "Comparer", "action.compare_commits": "Comparer %d révisions", "action.compare_commits_general": "Comparer les révisions", @@ -3758,6 +3759,8 @@ "actions.runners.reset_registration_token_confirm": "Voulez-vous révoquer le jeton actuel et en générer un nouveau ?", "actions.runners.reset_registration_token_success": "Le jeton d’inscription de l’exécuteur a été réinitialisé avec succès", "actions.runs.all_workflows": "Tous les flux de travail", + "actions.runs.other_workflows": "Autres flux de travail", + "actions.runs.other_workflows_tooltip": "Les flux de travail qui ont été exécutés dans ce dépôt mais qui n’existent pas dans la branche par défaut.", "actions.runs.workflow_run_count_1": "%d exécution du workflow", "actions.runs.workflow_run_count_n": "%d exécutions du workflow", "actions.runs.commit": "Révision", @@ -3773,6 +3776,8 @@ "actions.runs.status": "Statut", "actions.runs.actors_no_select": "Tous les acteurs", "actions.runs.status_no_select": "Touts les statuts", + "actions.runs.branch": "Branche", + "actions.runs.branches_no_select": "Toutes les branches", "actions.runs.no_results": "Aucun résultat correspondant.", "actions.runs.no_workflows": "Il n'y a pas encore de workflows.", "actions.runs.no_workflows.quick_start": "Vous découvrez les Actions Gitea ? Consultez le didacticiel.", diff --git a/options/locale/locale_zh-CN.json b/options/locale/locale_zh-CN.json index 6b9ba53878..ba52e2e79d 100644 --- a/options/locale/locale_zh-CN.json +++ b/options/locale/locale_zh-CN.json @@ -105,6 +105,7 @@ "copy_error": "复制失败", "copy_type_unsupported": "无法复制此类型的文件内容", "copy_filename": "复制文件名", + "copy_output": "复制输出", "write": "撰写", "preview": "预览", "loading": "正在加载…", @@ -1321,7 +1322,7 @@ "repo.commits.desc": "浏览代码修改历史", "repo.commits.commits": "次代码提交", "repo.commits.no_commits": "没有共同的提交。「%s」和「%s」的历史完全不同。", - "repo.commits.nothing_to_compare": "这些分支是相同的。", + "repo.commits.nothing_to_compare": "没有差异可显示。", "repo.commits.search.tooltip": "您可以在关键词前加上前缀,如「author:」、「committer:」、「after:」或「before:」,例如「retrin author:Alice before:2019-01-13」。", "repo.commits.search_branch": "此分支", "repo.commits.search_all": "所有分支", @@ -1783,9 +1784,9 @@ "repo.pulls.select_commit_hold_shift_for_range": "选择提交。按住 Shift + 单击选择一个范围", "repo.pulls.review_only_possible_for_full_diff": "只有在查看全部差异时才能进行审核", "repo.pulls.filter_changes_by_commit": "按提交筛选", - "repo.pulls.nothing_to_compare": "分支内容相同,无需创建合并请求。", + "repo.pulls.nothing_to_compare": "没有差异可显示。无需创建合并请求。", "repo.pulls.no_common_history": "这些分支没有共同的合并基点。请选择不同的基点或比较分支。", - "repo.pulls.nothing_to_compare_have_tag": "所选分支 / Git 标签相同。", + "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", "repo.pulls.create": "创建合并请求", @@ -1819,6 +1820,7 @@ "repo.pulls.required_status_check_failed": "一些必要的检查没有成功", "repo.pulls.required_status_check_missing": "缺少一些必要的检查。", "repo.pulls.required_status_check_administrator": "作为管理员,您仍可合并此合并请求", + "repo.pulls.required_status_check_bypass_allowlist": "您可以在此次合并中绕过分支保护规则。", "repo.pulls.blocked_by_approvals": "此合并请求还没有足够的批准。已获批准数 %d 个,需获批准数 %d 个。", "repo.pulls.blocked_by_approvals_whitelisted": "此合并请求尚未获得足够的批准。已获得 %d/%d 个来自允许列表中用户或团队的批准。", "repo.pulls.blocked_by_rejection": "此合并请求有官方审核员请求的更改。", @@ -2138,7 +2140,9 @@ "repo.settings.pulls_desc": "启用合并请求", "repo.settings.pulls.ignore_whitespace": "忽略空白冲突", "repo.settings.pulls.enable_autodetect_manual_merge": "启用自动检查手动合并(注意:在某些特殊情况下可能会出现误判)", + "repo.settings.pulls.allow_merge_update": "允许通过合并更新合并请求分支", "repo.settings.pulls.allow_rebase_update": "允许通过变基更新合并请求分支", + "repo.settings.pulls.default_update_style": "默认分支更新风格", "repo.settings.pulls.default_target_branch": "新合并请求的默认目标分支", "repo.settings.pulls.default_target_branch_default": "默认分支(%s)", "repo.settings.pulls.default_delete_branch_after_merge": "默认合并后删除合并请求分支", @@ -2413,6 +2417,11 @@ "repo.settings.protect_merge_whitelist_committers_desc": "仅允许白名单用户或团队合并合并请求到此分支。", "repo.settings.protect_merge_whitelist_users": "合并白名单用户:", "repo.settings.protect_merge_whitelist_teams": "合并白名单团队:", + "repo.settings.protect_bypass_allowlist": "绕过分支保护", + "repo.settings.protect_enable_bypass_allowlist": "允许指定用户或团队绕过分支保护", + "repo.settings.protect_enable_bypass_allowlist_desc": "列入白名单的用户或团队可以执行合并或推送操作,即使在通常情况下,这些操作会被所需的审批、状态检查或受保护文件规则所阻挡。", + "repo.settings.protect_bypass_allowlist_users": "允许绕过保护的用户:", + "repo.settings.protect_bypass_allowlist_teams": "允许绕过保护的团队:", "repo.settings.protect_check_status_contexts": "启用状态检查", "repo.settings.protect_status_check_patterns": "状态检查表达式:", "repo.settings.protect_status_check_patterns_desc": "输入表达式以指定在分支合并到匹配此规则的分支之前必须通过哪些状态检查。每一行指定一个表达式且表达式不能为空。", @@ -2454,7 +2463,7 @@ "repo.settings.block_outdated_branch": "如果合并请求已经过时,阻止合并", "repo.settings.block_outdated_branch_desc": "当头部分支落后基础分支时,不能合并。", "repo.settings.block_admin_merge_override": "管理员须遵守分支保护规则", - "repo.settings.block_admin_merge_override_desc": "管理员须遵守分支保护规则,不能规避该规则。", + "repo.settings.block_admin_merge_override_desc": "管理员必须遵守分支保护规则,且不得绕过这些规则。如果启用了绕过白名单功能,位于绕过白名单中的用户或团队仍可绕过这些规则。", "repo.settings.default_branch_desc": "选择一个默认分支用于提交代码。", "repo.settings.default_target_branch_desc": "如果在仓库高级设置的合并请求部分中进行了设置,则合并请求可以使用不同的默认目标分支。", "repo.settings.merge_style_desc": "合并方式", @@ -3483,7 +3492,7 @@ "gpg.default_key": "使用默认密钥签名", "gpg.error.extract_sign": "无法提取签名", "gpg.error.generate_hash": "无法生成提交的哈希", - "gpg.error.no_committer_account": "没有帐户链接到提交者的邮箱", + "gpg.error.no_committer_account": "没有帐户关联到提交者的邮箱", "gpg.error.no_gpg_keys_found": "找不到此签名对应的密钥", "gpg.error.not_signed_commit": "未签名的提交", "gpg.error.failed_retrieval_gpg_keys": "找不到任何与该提交者账号相关的密钥", @@ -3622,7 +3631,13 @@ "packages.terraform.delete.latest": "无法删除最新版本的 Terraform 状态。", "packages.vagrant.install": "若要添加一个 Vagrant box,请运行以下命令:", "packages.settings.link": "将此软件包链接到仓库", - "packages.settings.link.description": "如果您将一个软件包与一个仓库链接起来,软件包将显示在仓库的软件包列表中。", + "packages.settings.link.description": "如果您将软件包与仓库关联,该软件包将显示在仓库的软件包列表中。", + "packages.settings.link.notice1": "仅同一所有者名下的仓库可以进行关联。", + "packages.settings.link.notice2": "关联仓库不会更改软件包的可见性。", + "packages.settings.link.notice3": "留空该字段将删除关联。", + "packages.settings.visibility": "软件包可见性", + "packages.settings.visibility.inherit": "软件包的可见性继承自其所有者,无法在此处单独更改。若要更改,请更新拥有此软件包的用户或组织的可见性设置。", + "packages.settings.visibility.button": "更改所有者可见性", "packages.settings.link.select": "选择仓库", "packages.settings.link.button": "更新仓库链接", "packages.settings.link.success": "仓库链接已成功更新。", @@ -3696,6 +3711,7 @@ "actions.status.success": "成功", "actions.status.failure": "失败", "actions.status.cancelled": "已取消", + "actions.status.cancelling": "取消中", "actions.status.skipped": "已忽略", "actions.status.blocked": "阻塞中", "actions.runners": "运行器", @@ -3743,6 +3759,8 @@ "actions.runners.reset_registration_token_confirm": "是否吊销当前令牌并生成一个新令牌?", "actions.runners.reset_registration_token_success": "成功重置运行器注册令牌", "actions.runs.all_workflows": "所有工作流", + "actions.runs.other_workflows": "其他工作流", + "actions.runs.other_workflows_tooltip": "在此仓库中已执行,但不存在于默认分支上的工作流。", "actions.runs.workflow_run_count_1": "%d 次工作流运行", "actions.runs.workflow_run_count_n": "%d 次工作流运行", "actions.runs.commit": "提交", @@ -3758,6 +3776,8 @@ "actions.runs.status": "状态", "actions.runs.actors_no_select": "所有操作者", "actions.runs.status_no_select": "所有状态", + "actions.runs.branch": "分支", + "actions.runs.branches_no_select": "所有分支", "actions.runs.no_results": "没有匹配的结果。", "actions.runs.no_workflows": "目前还没有工作流。", "actions.runs.no_workflows.quick_start": "不知道如何使用 Gitea 工作流吗?请查看快速开始指南。",