From cbe6f56aa65a4fe7af263fd9ace415a660ca5fdb Mon Sep 17 00:00:00 2001
From: docubot <67483024+docubot@users.noreply.github.com>
Date: Thu, 18 Aug 2022 16:33:51 -0400
Subject: [PATCH] New translation batch for cn (#30074)
* Add crowdin translations
* Run script/i18n/homogenize-frontmatter.js
* Run script/i18n/lint-translation-files.js --check rendering
* run script/i18n/reset-files-with-broken-liquid-tags.js --language=cn
* run script/i18n/reset-known-broken-translation-files.js
* Check in cn CSV report
---
translations/log/cn-resets.csv | 11 +-
.../managing-your-profile-readme.md | 2 +-
.../managing-accessibility-settings.md | 15 +-
.../managing-your-theme-settings.md | 9 +
.../metadata-syntax-for-github-actions.md | 4 +-
.../actions/learn-github-actions/contexts.md | 16 +-
.../environment-variables.md | 2 +-
.../learn-github-actions/expressions.md | 20 +-
...hing-dependencies-to-speed-up-workflows.md | 6 +-
.../deploying-github-ae.md | 4 +-
...ub-actions-for-github-enterprise-server.md | 27 ++-
...f-your-identity-provider-is-unavailable.md | 2 +-
...aming-the-audit-log-for-your-enterprise.md | 6 +
...ainer-registry-from-the-docker-registry.md | 8 -
...or-security-settings-in-your-enterprise.md | 2 +-
.../viewing-people-in-your-enterprise.md | 15 ++
.../about-billing-for-github-copilot.md | 2 +-
.../about-billing-for-github-packages.md | 4 +-
...unted-subscriptions-for-github-accounts.md | 4 +-
...ode-scanning-alerts-for-your-repository.md | 13 +-
...g-code-scanning-alerts-in-pull-requests.md | 2 +-
.../viewing-and-updating-dependabot-alerts.md | 27 ++-
.../zh-CN/content/code-security/guides.md | 2 +
.../code-security/secret-scanning/index.md | 1 +
.../protecting-pushes-with-secret-scanning.md | 36 ++-
...ing-a-branch-blocked-by-push-protection.md | 56 +++++
.../secret-scanning-patterns.md | 15 +-
.../about-the-dependency-graph.md | 3 +-
.../developing-in-codespaces/index.md | 1 +
.../renaming-a-codespace.md | 54 +++++
.../editing-wiki-content.md | 2 +-
...-guidelines-for-repository-contributors.md | 2 +-
...-started-with-github-community-exchange.md | 2 +-
.../about-github-community-exchange.md | 2 +
...about-github-global-campus-for-students.md | 40 ++++
...y-to-github-global-campus-as-a-student.md} | 15 +-
.../index.md | 11 +-
...to-global-campus-for-students-approved.md} | 7 +-
...about-github-global-campus-for-teachers.md | 35 +++
...y-to-github-global-campus-as-a-teacher.md} | 13 +-
.../index.md | 17 ++
...to-global-campus-for-teachers-approved.md} | 9 +-
.../index.md | 4 +-
.../about-campus-advisors.md | 22 --
.../about-campus-experts.md | 2 +-
.../about-github-campus-program.md | 3 +-
.../index.md | 1 -
.../about-github-education-for-students.md | 25 --
...education-for-educators-and-researchers.md | 33 ---
.../index.md | 16 --
.../zh-CN/content/education/guides.md | 12 +-
translations/zh-CN/content/education/index.md | 8 +-
...github-codespaces-with-github-classroom.md | 2 +-
.../create-a-group-assignment.md | 2 +-
.../create-an-individual-assignment.md | 2 +-
...e-the-git-and-github-starter-assignment.md | 2 +-
.../zh-CN/content/education/quickstart.md | 8 +-
.../zh-CN/content/get-started/index.md | 3 -
.../about-project-boards.md | 2 +
.../changing-project-board-visibility.md | 9 +-
.../creating-a-project-board.md | 8 +
.../using-the-api-to-manage-projects.md | 2 +-
...t-board-permissions-for-an-organization.md | 2 +
...visibility-changes-in-your-organization.md | 16 +-
.../working-with-the-nuget-registry.md | 2 +
.../about-pull-request-merges.md | 20 +-
.../commenting-on-a-pull-request.md | 2 +-
...guring-commit-merging-for-pull-requests.md | 30 +++
...uring-commit-rebasing-for-pull-requests.md | 8 +-
...ring-commit-squashing-for-pull-requests.md | 11 +-
.../configuring-pull-request-merges/index.md | 1 +
...estions-to-update-pull-request-branches.md | 2 +
.../adding-a-file-to-a-repository.md | 3 +-
...-visibility-permissions-or-projects-v2.yml | 7 +
...classic-project-visibility-permissions.yml | 7 +
.../default-merge-squash-commit-message.yml | 7 +
.../data/learning-tracks/code-security.yml | 2 +
.../release-notes/enterprise-server/3-2/0.yml | 1 +
.../release-notes/enterprise-server/3-2/1.yml | 1 +
.../enterprise-server/3-2/10.yml | 1 +
.../enterprise-server/3-2/11.yml | 1 +
.../enterprise-server/3-2/12.yml | 1 +
.../enterprise-server/3-2/13.yml | 1 +
.../enterprise-server/3-2/14.yml | 1 +
.../enterprise-server/3-2/15.yml | 1 +
.../enterprise-server/3-2/16.yml | 9 +
.../enterprise-server/3-2/17.yml | 9 +
.../release-notes/enterprise-server/3-2/2.yml | 1 +
.../release-notes/enterprise-server/3-2/3.yml | 1 +
.../release-notes/enterprise-server/3-2/4.yml | 1 +
.../release-notes/enterprise-server/3-2/5.yml | 1 +
.../release-notes/enterprise-server/3-2/6.yml | 1 +
.../release-notes/enterprise-server/3-2/7.yml | 1 +
.../release-notes/enterprise-server/3-2/8.yml | 1 +
.../release-notes/enterprise-server/3-2/9.yml | 1 +
.../release-notes/enterprise-server/3-3/0.yml | 2 +-
.../release-notes/enterprise-server/3-3/1.yml | 1 +
.../enterprise-server/3-3/10.yml | 1 +
.../enterprise-server/3-3/11.yml | 11 +
.../enterprise-server/3-3/12.yml | 11 +
.../release-notes/enterprise-server/3-3/2.yml | 1 +
.../release-notes/enterprise-server/3-3/3.yml | 1 +
.../release-notes/enterprise-server/3-3/4.yml | 1 +
.../release-notes/enterprise-server/3-3/5.yml | 1 +
.../release-notes/enterprise-server/3-3/6.yml | 1 +
.../release-notes/enterprise-server/3-3/7.yml | 1 +
.../release-notes/enterprise-server/3-3/8.yml | 1 +
.../release-notes/enterprise-server/3-3/9.yml | 1 +
.../release-notes/enterprise-server/3-4/0.yml | 2 +-
.../release-notes/enterprise-server/3-4/1.yml | 1 +
.../release-notes/enterprise-server/3-4/2.yml | 1 +
.../release-notes/enterprise-server/3-4/3.yml | 1 +
.../release-notes/enterprise-server/3-4/4.yml | 7 +-
.../release-notes/enterprise-server/3-4/5.yml | 9 +-
.../release-notes/enterprise-server/3-4/6.yml | 12 +
.../release-notes/enterprise-server/3-4/7.yml | 14 ++
.../release-notes/enterprise-server/3-5/0.yml | 26 ++-
.../release-notes/enterprise-server/3-5/1.yml | 8 +
.../release-notes/enterprise-server/3-5/2.yml | 9 +-
.../release-notes/enterprise-server/3-5/3.yml | 17 ++
.../release-notes/enterprise-server/3-5/4.yml | 20 ++
.../enterprise-server/3-6/0-rc1.yml | 3 +-
.../release-notes/enterprise-server/3-6/0.yml | 215 ++++++++++++++++++
.../actions/hardware-requirements-3.6.md | 6 +
.../actions/runner-debug-description.md | 1 +
.../education/about-github-education-link.md | 2 +-
.../access-github-community-exchange.md | 4 +-
.../reusables/education/apply-for-team.md | 2 +-
.../education/educator-requirements.md | 2 +-
.../enterprise/3-5-missing-feature.md | 11 +
.../codespaces-classroom-articles.md | 2 +-
.../reusables/gated-features/codespaces.md | 2 +-
.../data/reusables/gpg/paste-gpg-key-id.md | 13 +-
...owners-can-limit-visibility-permissions.md | 1 +
.../ghas-3.4-secret-scanning-known-issue.md | 16 ++
...quash-and-rebase-linear-commit-history.md} | 0
.../push-protection-command-line-choice.md | 1 +
.../push-protection-multiple-branch-note.md | 8 +
.../push-protection-remove-secret.md | 1 +
.../push-protection-web-ui-choice.md | 6 +
translations/zh-CN/data/ui.yml | 2 +-
.../zh-CN/data/variables/projects.yml | 3 +
.../data/variables/release_candidate.yml | 2 +-
143 files changed, 1007 insertions(+), 301 deletions(-)
create mode 100644 translations/zh-CN/content/code-security/secret-scanning/pushing-a-branch-blocked-by-push-protection.md
create mode 100644 translations/zh-CN/content/codespaces/developing-in-codespaces/renaming-a-codespace.md
rename translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/{use-github-for-your-schoolwork => github-global-campus-for-students}/about-github-community-exchange.md (89%)
create mode 100644 translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/about-github-global-campus-for-students.md
rename translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/{use-github-for-your-schoolwork/apply-for-a-student-developer-pack.md => github-global-campus-for-students/apply-to-github-global-campus-as-a-student.md} (64%)
rename translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/{use-github-for-your-schoolwork => github-global-campus-for-students}/index.md (55%)
rename translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/{use-github-for-your-schoolwork/why-wasnt-my-application-for-a-student-developer-pack-approved.md => github-global-campus-for-students/why-wasnt-my-application-to-global-campus-for-students-approved.md} (86%)
create mode 100644 translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/about-github-global-campus-for-teachers.md
rename translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/{use-github-in-your-classroom-and-research/apply-for-an-educator-or-researcher-discount.md => github-global-campus-for-teachers/apply-to-github-global-campus-as-a-teacher.md} (70%)
create mode 100644 translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/index.md
rename translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/{use-github-in-your-classroom-and-research/why-wasnt-my-application-for-an-educator-or-researcher-discount-approved.md => github-global-campus-for-teachers/why-wasnt-my-application-to-global-campus-for-teachers-approved.md} (66%)
delete mode 100644 translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-at-your-educational-institution/about-campus-advisors.md
delete mode 100644 translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/about-github-education-for-students.md
delete mode 100644 translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research/about-github-education-for-educators-and-researchers.md
delete mode 100644 translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research/index.md
create mode 100644 translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-merging-for-pull-requests.md
create mode 100644 translations/zh-CN/data/features/classic-project-visibility-permissions-or-projects-v2.yml
create mode 100644 translations/zh-CN/data/features/classic-project-visibility-permissions.yml
create mode 100644 translations/zh-CN/data/features/default-merge-squash-commit-message.yml
create mode 100644 translations/zh-CN/data/release-notes/enterprise-server/3-2/17.yml
create mode 100644 translations/zh-CN/data/release-notes/enterprise-server/3-3/12.yml
create mode 100644 translations/zh-CN/data/release-notes/enterprise-server/3-4/7.yml
create mode 100644 translations/zh-CN/data/release-notes/enterprise-server/3-5/4.yml
create mode 100644 translations/zh-CN/data/release-notes/enterprise-server/3-6/0.yml
create mode 100644 translations/zh-CN/data/reusables/actions/hardware-requirements-3.6.md
create mode 100644 translations/zh-CN/data/reusables/actions/runner-debug-description.md
create mode 100644 translations/zh-CN/data/reusables/enterprise/3-5-missing-feature.md
create mode 100644 translations/zh-CN/data/reusables/projects/owners-can-limit-visibility-permissions.md
create mode 100644 translations/zh-CN/data/reusables/release-notes/ghas-3.4-secret-scanning-known-issue.md
rename translations/zh-CN/data/reusables/repositories/{squash-and-rebase-linear-commit-hisitory.md => squash-and-rebase-linear-commit-history.md} (100%)
create mode 100644 translations/zh-CN/data/reusables/secret-scanning/push-protection-command-line-choice.md
create mode 100644 translations/zh-CN/data/reusables/secret-scanning/push-protection-multiple-branch-note.md
create mode 100644 translations/zh-CN/data/reusables/secret-scanning/push-protection-remove-secret.md
create mode 100644 translations/zh-CN/data/reusables/secret-scanning/push-protection-web-ui-choice.md
diff --git a/translations/log/cn-resets.csv b/translations/log/cn-resets.csv
index d9881e213c..c373d5c38f 100644
--- a/translations/log/cn-resets.csv
+++ b/translations/log/cn-resets.csv
@@ -215,10 +215,9 @@ translations/zh-CN/content/developers/webhooks-and-events/webhooks/about-webhook
translations/zh-CN/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md,rendering error
translations/zh-CN/content/discussions/collaborating-with-your-community-using-discussions/about-discussions.md,broken liquid tags
translations/zh-CN/content/discussions/quickstart.md,broken liquid tags
-translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-at-your-educational-institution/about-campus-advisors.md,broken liquid tags
+translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/why-wasnt-my-application-to-global-campus-for-students-approved.md,broken liquid tags
translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-at-your-educational-institution/about-github-campus-program.md,broken liquid tags
translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-at-your-educational-institution/index.md,broken liquid tags
-translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/why-wasnt-my-application-for-a-student-developer-pack-approved.md,broken liquid tags
translations/zh-CN/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/about-using-makecode-arcade-with-github-classroom.md,broken liquid tags
translations/zh-CN/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/using-github-codespaces-with-github-classroom.md,broken liquid tags
translations/zh-CN/content/education/manage-coursework-with-github-classroom/learn-with-github-classroom/view-autograding-results.md,broken liquid tags
@@ -381,9 +380,9 @@ translations/zh-CN/data/reusables/enterprise-accounts/emu-short-summary.md,rende
translations/zh-CN/data/reusables/enterprise-licensing/verified-domains-license-sync.md,broken liquid tags
translations/zh-CN/data/reusables/enterprise_installation/hardware-considerations-all-platforms.md,broken liquid tags
translations/zh-CN/data/reusables/enterprise_management_console/badge_indicator.md,broken liquid tags
-translations/zh-CN/data/reusables/enterprise_user_management/consider-usernames-for-external-authentication.md,broken liquid tags
+translations/zh-CN/data/reusables/enterprise_user_management/consider-usernames-for-external-authentication.md,rendering error
translations/zh-CN/data/reusables/gated-features/codespaces-classroom-articles.md,broken liquid tags
-translations/zh-CN/data/reusables/gated-features/enterprise-accounts.md,broken liquid tags
+translations/zh-CN/data/reusables/gated-features/enterprise-accounts.md,rendering error
translations/zh-CN/data/reusables/gated-features/packages.md,broken liquid tags
translations/zh-CN/data/reusables/gated-features/secret-scanning-partner.md,broken liquid tags
translations/zh-CN/data/reusables/gated-features/secret-scanning.md,broken liquid tags
@@ -404,9 +403,9 @@ translations/zh-CN/data/reusables/package_registry/packages-cluster-support.md,b
translations/zh-CN/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md,broken liquid tags
translations/zh-CN/data/reusables/repositories/enable-security-alerts.md,broken liquid tags
translations/zh-CN/data/reusables/repositories/select-marketplace-apps.md,broken liquid tags
-translations/zh-CN/data/reusables/saml/saml-session-oauth.md,broken liquid tags
+translations/zh-CN/data/reusables/saml/saml-session-oauth.md,rendering error
translations/zh-CN/data/reusables/saml/you-must-periodically-authenticate.md,Listed in localization-support#489
-translations/zh-CN/data/reusables/saml/you-must-periodically-authenticate.md,broken liquid tags
+translations/zh-CN/data/reusables/saml/you-must-periodically-authenticate.md,rendering error
translations/zh-CN/data/reusables/scim/after-you-configure-saml.md,broken liquid tags
translations/zh-CN/data/reusables/secret-scanning/enterprise-enable-secret-scanning.md,broken liquid tags
translations/zh-CN/data/reusables/secret-scanning/partner-program-link.md,broken liquid tags
diff --git a/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/managing-your-profile-readme.md b/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/managing-your-profile-readme.md
index f9d89b2911..2452416503 100644
--- a/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/managing-your-profile-readme.md
+++ b/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/managing-your-profile-readme.md
@@ -66,7 +66,7 @@ shortTitle: 您的个人资料自述文件
- 该仓库为私有仓库。
- 仓库名称不再与您的用户名匹配。
-您选择的方法取决于您的需求，但如果您不确定，我们建议您将仓库设为私有。 有关如何将仓库设为私有的步骤，请参阅[“更改仓库的可见性”](/github/administering-a-repository/setting-repository-visibility#changing-a-repositorys-visibility)。
+您选择的方法取决于您的需求，但如果您不确定，我们建议您将仓库设为私有。 For steps on how to make your repository private, see "[Changing a repository's visibility](/github/administering-a-repository/setting-repository-visibility#changing-a-repositorys-visibility)."
## 延伸阅读
diff --git a/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/managing-accessibility-settings.md b/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/managing-accessibility-settings.md
index 88f73f221d..06a29a83b6 100644
--- a/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/managing-accessibility-settings.md
+++ b/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/managing-accessibility-settings.md
@@ -12,7 +12,7 @@ miniTocMaxHeadingLevel: 3
## 关于辅助功能设置
-To accommodate your vision, hearing, motor, cognitive, or learning needs, you can customize the user interface for {% data variables.product.product_location %}.
+To create an experience on {% ifversion fpt or ghec or ghes %}{% data variables.product.product_location %}{% elsif ghae %}{% data variables.product.product_name %}{% endif %} that fits your needs, you can customize the user interface. Accessibility settings can be essential for people with disabilities, but can be useful to anyone. For example, customization of keyboard shortcuts is essential to people who navigate using voice control, but can be useful to anyone when a keyboard shortcut for {% data variables.product.product_name %} clashes with another application shortcut.
## 管理辅助功能设置
@@ -20,7 +20,7 @@ You can decide whether you want to use some or all keyboard shortcuts on {% ifve
### Managing keyboard shortcuts
-You can perform actions across the {% data variables.product.product_name %} website without using your mouse by using your keyboard instead. Keyboard shortcuts can be useful to save time for some people, but may interfere with accessibility if you don't intend to use the shortcuts.
+You can perform actions across the {% data variables.product.product_name %} website by using your keyboard alone. Keyboard shortcuts can be useful to save time, but can be activated accidentally or interfere with assistive technology.
By default, all keyboard shortcuts are enabled on {% data variables.product.product_name %}. 更多信息请参阅“[键盘快捷键](/get-started/using-github/keyboard-shortcuts)”。
@@ -28,16 +28,17 @@ By default, all keyboard shortcuts are enabled on {% data variables.product.prod
{% data reusables.user-settings.accessibility_settings %}
1. Under "Keyboard shortcuts", manage settings for your keyboard shortcuts.
- - Optionally, to disable or enable shortcut keys that don't use modifiers keys like Control or Command, under "General", deselect **Character keys**. If you disable character keys, you may still be able to trigger shortcuts for your web browser, and you can still trigger shortcuts for {% data variables.product.product_name %} that use a modifier key.
-{%- ifversion command-palette %}
- - Optionally, to customize the keyboard shortcuts for triggering the command palette, under "Command palette", use the drop-down menus to choose a keyboard shortcut. For more information, see "[{% data variables.product.company_short %} Command Palette](/get-started/using-github/github-command-palette)."
+ - To disable shortcut keys that don't use modifiers keys like Control or Command, under "General", deselect **Character keys**.
+ - If you disable character keys, you may still be able to trigger shortcuts for your web browser, and you can still trigger shortcuts for {% data variables.product.product_name %} that use a modifier key.
+ {%- ifversion command-palette %}
+ - To customize the keyboard shortcuts for triggering the command palette, under "Command palette", use the drop-down menus to choose a keyboard shortcut. For more information, see "[{% data variables.product.company_short %} Command Palette](/get-started/using-github/github-command-palette)."
{%- endif %}
{% ifversion motion-management %}
### Managing motion
-You can control how {% data variables.product.product_name %} displays animated images.
+You can control how {% data variables.product.product_name %} displays animated _.gif_ images.
By default, {% data variables.product.product_name %} syncs with your system-level preference for reduced motion. For more information, see the documentation or settings for your operating system.
@@ -45,6 +46,6 @@ By default, {% data variables.product.product_name %} syncs with your system-lev
{% data reusables.user-settings.accessibility_settings %}
1. Under "Motion", manage settings for motion.
- - Optionally, to control how {% data variables.product.product_name %} displays animaged images, under "Autoplay animated images", select **Sync with system**, **Enabled**, or **Disabled**.
+ - To control how {% data variables.product.product_name %} displays animated images, under "Autoplay animated images", select **Sync with system**, **Enabled**, or **Disabled**.
{% endif %}
diff --git a/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/managing-your-theme-settings.md b/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/managing-your-theme-settings.md
index 3d02b0ad3d..90b349ae39 100644
--- a/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/managing-your-theme-settings.md
+++ b/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/managing-your-theme-settings.md
@@ -32,6 +32,15 @@ shortTitle: 管理主题设置
1. 单击想要使用的主题。
- 如果您选择单个主题，请单击一个主题。
+ {%- ifversion ghes = 3.5 %}
+ {% note %}
+
+ **Note**: The light high contrast theme was unavailable in {% data variables.product.product_name %} 3.5.0, 3.5.1, 3.5.2, and 3.5.3. The theme is available in 3.5.4 and later. For more information about upgrades, contact your site administrator.
+
+ For more information about determining the version of {% data variables.product.product_name %} you're using, see "[About versions of {% data variables.product.prodname_docs %}](/get-started/learning-about-github/about-versions-of-github-docs#github-enterprise-server)."
+ {% endnote %}
+ {%- endif %}
+
{% ifversion fpt or ghes > 3.2 or ghae or ghec %}{% else %}{% endif %}
- 如果您选择遵循系统设置，请单击白天主题和夜间主题。
diff --git a/translations/zh-CN/content/actions/creating-actions/metadata-syntax-for-github-actions.md b/translations/zh-CN/content/actions/creating-actions/metadata-syntax-for-github-actions.md
index 783cdc1d3f..47ed9ff43f 100644
--- a/translations/zh-CN/content/actions/creating-actions/metadata-syntax-for-github-actions.md
+++ b/translations/zh-CN/content/actions/creating-actions/metadata-syntax-for-github-actions.md
@@ -433,7 +433,7 @@ runs:
有关 `entrypoint` 如何执行的更多信息，请参阅“[Dockerfile 对 {% data variables.product.prodname_actions %} 的支持](/actions/creating-actions/dockerfile-support-for-github-actions/#entrypoint)”。
-### `post-entrypoint`
+### `runs.post-entrypoint`
**可选** 允许您在 `runs.entrypoint` 操作完成后运行清理脚本。 {% data variables.product.prodname_actions %} 使用 `docker run` 来启动此操作。 因为 {% data variables.product.prodname_actions %} 使用同一基本映像在新容器内运行脚本，所以运行时状态与主 `entrypoint` 容器不同。 您可以在任一工作空间中访问所需的任何状态，`HOME` 或作为 `STATE_` 变量。 `post-entrypoint:` 操作始终默认运行，但您可以使用 [`runs.post-if`](#runspost-if) 覆盖该设置。
@@ -475,7 +475,7 @@ runs:
## `branding`
-您可以使用颜色和 [Feather](https://feathericons.com/) 图标创建徽章，以个性化和识别操作。 徽章显示在 [{% data variables.product.prodname_marketplace %}](https://github.com/marketplace?type=actions) 中的操作名称旁边。
+**Optional** You can use a color and [Feather](https://feathericons.com/) icon to create a badge to personalize and distinguish your action. 徽章显示在 [{% data variables.product.prodname_marketplace %}](https://github.com/marketplace?type=actions) 中的操作名称旁边。
### 示例：为操作配置品牌宣传
diff --git a/translations/zh-CN/content/actions/learn-github-actions/contexts.md b/translations/zh-CN/content/actions/learn-github-actions/contexts.md
index 59fa01de19..5a9f912ee0 100644
--- a/translations/zh-CN/content/actions/learn-github-actions/contexts.md
+++ b/translations/zh-CN/content/actions/learn-github-actions/contexts.md
@@ -457,6 +457,8 @@ jobs:
{% endif %}
| `runner.temp` | `字符串` | {% data reusables.actions.runner-temp-directory-description %}
| `runner.tool_cache` | `字符串` | {% ifversion ghae %}{% data reusables.actions.self-hosted-runners-software %} {% else %} {% data reusables.actions.runner-tool-cache-description %} {% endif %}
+| `runner.debug` | `字符串` | {% data reusables.actions.runner-debug-description %}
+
{%- comment %}
`runner.workspace` 属性故意不记录。 与 `github.workspace`相比，这是一个早期的 Actions 属性，现在与用户无关。 它为兼容性而保留。 | `runner.workspace` | `string` | |
{%- endcomment %}
@@ -538,13 +540,13 @@ jobs:
对于具有矩阵的工作流程，`strategy` 上下文包含有关当前作业的矩阵执行策略的信息。
-| 属性名称 | 类型 | 描述 |
-| ----------------------- | ----- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `strategy` | `对象` | 此上下文针对工作流程运行中的每项作业而改变。 您可以从工作流程中的任何作业或步骤访问此上下文。 此对象包含下面列出的所有属性。 |
-| `strategy.fail-fast` | `字符串` | 为 `true` 时，如果矩阵中的任何作业失败，所有正在进行的作业都将被取消。 更多信息请参阅“[{% data variables.product.prodname_actions %} 的工作流程语法](/actions/learn-github-actions/workflow-syntax-for-github-actions#jobsjob_idstrategyfail-fast)”。 |
-| `strategy.job-index` | `字符串` | 矩阵中当前作业的索引。 **注意：** 此数字是零基数字。 矩阵中第一个作业的索引是 `0`。 |
-| `strategy.job-total` | `字符串` | 矩阵中的作业总数。 **注意：** 此数字 **不是**从零基数字。 例如，对于具有四个作业的矩阵，`job-total` 的值为 `4`。 |
-| `strategy.max-parallel` | `字符串` | 使用 `matrix` 作业策略时可同时运行的最大作业数。 更多信息请参阅“[{% data variables.product.prodname_actions %} 的工作流程语法](/actions/learn-github-actions/workflow-syntax-for-github-actions#jobsjob_idstrategymax-parallel)”。 |
+| 属性名称 | 类型 | 描述 |
+| ----------------------- | ----- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `strategy` | `对象` | 此上下文针对工作流程运行中的每项作业而改变。 您可以从工作流程中的任何作业或步骤访问此上下文。 此对象包含下面列出的所有属性。 |
+| `strategy.fail-fast` | `字符串` | 为 `true` 时，如果矩阵中的任何作业失败，所有正在进行的作业都将被取消。 For more information, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/learn-github-actions/workflow-syntax-for-github-actions#jobsjob_idstrategyfail-fast)." |
+| `strategy.job-index` | `字符串` | 矩阵中当前作业的索引。 **注意：** 此数字是零基数字。 矩阵中第一个作业的索引是 `0`。 |
+| `strategy.job-total` | `字符串` | 矩阵中的作业总数。 **注意：** 此数字 **不是**从零基数字。 例如，对于具有四个作业的矩阵，`job-total` 的值为 `4`。 |
+| `strategy.max-parallel` | `字符串` | 使用 `matrix` 作业策略时可同时运行的最大作业数。 For more information, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/learn-github-actions/workflow-syntax-for-github-actions#jobsjob_idstrategymax-parallel)." |
### `strategy` 上下文的示例内容
diff --git a/translations/zh-CN/content/actions/learn-github-actions/environment-variables.md b/translations/zh-CN/content/actions/learn-github-actions/environment-variables.md
index dd249ca7ca..a290bcda48 100644
--- a/translations/zh-CN/content/actions/learn-github-actions/environment-variables.md
+++ b/translations/zh-CN/content/actions/learn-github-actions/environment-variables.md
@@ -155,7 +155,7 @@ jobs:
{%- ifversion actions-runner-arch-envvars %}
| `RUNNER_ARCH` | {% data reusables.actions.runner-arch-description %}
{%- endif %}
-| `RUNNER_NAME` | {% data reusables.actions.runner-name-description %} 例如 `Hosted Agent` | | `RUNNER_OS` | {% data reusables.actions.runner-os-description %} 例如 `Windows` | | `RUNNER_TEMP` | {% data reusables.actions.runner-temp-directory-description %} 例如 `D:\a\_temp` |
+| `RUNNER_DEBUG` | {% data reusables.actions.runner-debug-description %} | | `RUNNER_NAME` | {% data reusables.actions.runner-name-description %} For example, `Hosted Agent` | | `RUNNER_OS` | {% data reusables.actions.runner-os-description %} For example, `Windows` | | `RUNNER_TEMP` | {% data reusables.actions.runner-temp-directory-description %} For example, `D:\a\_temp` |
{% ifversion not ghae %}| `RUNNER_TOOL_CACHE` | {% data reusables.actions.runner-tool-cache-description %} 例如 `C:\hostedtoolcache\windows` |{% endif %}
{% note %}
diff --git a/translations/zh-CN/content/actions/learn-github-actions/expressions.md b/translations/zh-CN/content/actions/learn-github-actions/expressions.md
index 154ce4a542..d4d7ce534e 100644
--- a/translations/zh-CN/content/actions/learn-github-actions/expressions.md
+++ b/translations/zh-CN/content/actions/learn-github-actions/expressions.md
@@ -125,14 +125,22 @@ env:
如果 `search` 包含 `item`，则返回 `true`。 如果 `search` 为数组，此函数在 `item` 为数组中的元素时返回 `true`。 如果 `search` 为字符串，此函数在 `item` 为 `search` 的子字符串时返回 `true`。 此函数不区分大小写。 抛出值到字符串。
-#### 使用数组的示例
-
-`contains(github.event.issue.labels.*.name, 'bug')` 返回与事件相关的议题是否带有标签 "bug"。
-
#### 使用字符串的示例
`contains('Hello world', 'llo')` 返回 `true`.
+#### Example using an object filter
+
+`contains(github.event.issue.labels.*.name, 'bug')` returns `true` if the issue related to the event has a label "bug".
+
+For more information, see "[Object filters](#object-filters)."
+
+#### Example matching an array of strings
+
+Instead of writing `github.event_name == "push" || github.event_name == "pull_request"`, you can use `contains()` with `fromJson()` to check if an array of strings contains an `item`.
+
+For example, `contains(fromJson('["push", "pull_request"]'), github.event_name)` returns `true` if `github.event_name` is "push" or "pull_request".
+
### startsWith
`startsWith( searchString, searchValue )`
@@ -221,7 +229,7 @@ jobs:
needs: job1
runs-on: ubuntu-latest
strategy:
- matrix: ${{fromJSON(needs.job1.outputs.matrix)}}
+ matrix: ${{ fromJSON(needs.job1.outputs.matrix) }}
steps:
- run: build
```
@@ -235,7 +243,7 @@ jobs:
```yaml
name: print
on: push
-env:
+env:
continue: true
time: 3
jobs:
diff --git a/translations/zh-CN/content/actions/using-workflows/caching-dependencies-to-speed-up-workflows.md b/translations/zh-CN/content/actions/using-workflows/caching-dependencies-to-speed-up-workflows.md
index 8e8b15e896..16c47f1261 100644
--- a/translations/zh-CN/content/actions/using-workflows/caching-dependencies-to-speed-up-workflows.md
+++ b/translations/zh-CN/content/actions/using-workflows/caching-dependencies-to-speed-up-workflows.md
@@ -121,7 +121,7 @@ jobs:
{% raw %}${{ runner.os }}-build-{% endraw %}
{% raw %}${{ runner.os }}-{% endraw %}
- - if: {% raw %}${{ steps.cache-npm.outputs.cache-hit == 'false' }}{% endraw %}
+ - if: {% raw %}${{ steps.cache-npm.outputs.cache-hit != 'true' }}{% endraw %}
name: List the state of node modules
continue-on-error: true
run: npm list
@@ -172,12 +172,12 @@ npm-d5ea0750
### 使用 `cache` 操作的输出
-您可以使用 `cache` 操作的输出来根据缓存命中或错过是否发生来执行某些操作。 如果存在缓存未命中（找不到指定 `key` 的缓存的完全匹配项），则 `cache-hit` 输出将设置为 `false`。
+您可以使用 `cache` 操作的输出来根据缓存命中或错过是否发生来执行某些操作。 When an exact match is found for a cache for the specified `key`, the `cache-hit` output is set to `true`.
在上面的示例工作流程中，有一个步骤列出了发生缓存未命中时 Node 模块的状态：
```yaml
-- if: {% raw %}${{ steps.cache-npm.outputs.cache-hit == 'false' }}{% endraw %}
+- if: {% raw %}${{ steps.cache-npm.outputs.cache-hit != 'true' }}{% endraw %}
name: List the state of node modules
continue-on-error: true
run: npm list
diff --git a/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/deploying-github-ae.md b/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/deploying-github-ae.md
index 6b90d7a924..c1bf20879f 100644
--- a/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/deploying-github-ae.md
+++ b/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/deploying-github-ae.md
@@ -20,9 +20,7 @@ After you purchase or start a trial of {% data variables.product.product_name %}
## Prerequisites
-- Before you can deploy {% data variables.product.product_name %}, you must request access from your {% data variables.product.company_short %} account team. {% data variables.product.company_short %} will enable deployment of {% data variables.product.product_name %} for your Azure subscription. If you haven't already purchased {% data variables.product.product_name %}, you can contact {% data variables.contact.contact_enterprise_sales %} to check your eligibility for a trial.
-
-- You must have permission to perform the `/register/action` operation for the resource provider in Azure. The permission is included in the `Contributor` and `Owner` roles. For more information, see [Azure resource providers and types](https://docs.microsoft.com/en-us/azure/azure-resource-manager/management/resource-providers-and-types#register-resource-provider) in the Microsoft documentation.
+You must have permission to perform the `/register/action` operation for the resource provider in Azure. The permission is included in the `Contributor` and `Owner` roles. For more information, see [Azure resource providers and types](https://docs.microsoft.com/en-us/azure/azure-resource-manager/management/resource-providers-and-types#register-resource-provider) in the Microsoft documentation.
## Deploying {% data variables.product.product_name %} with the {% data variables.actions.azure_portal %}
diff --git a/translations/zh-CN/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-server.md b/translations/zh-CN/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-server.md
index 0aa32d5fea..3eef9926ec 100644
--- a/translations/zh-CN/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-server.md
+++ b/translations/zh-CN/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-server.md
@@ -33,7 +33,8 @@ This article explains how site administrators can configure {% data variables.pr
## Review hardware requirements
-{%- ifversion ghes %}
+
+{%- ifversion ghes < 3.6 %}
The CPU and memory resources available to {% data variables.product.product_location %} determine the number of jobs that can be run concurrently without performance loss. {% data reusables.actions.minimum-hardware %}
@@ -41,6 +42,13 @@ The peak quantity of concurrent jobs running without performance loss depends on
{% endif %}
+{%- ifversion ghes > 3.5 %}
+
+The CPU and memory resources available to {% data variables.product.product_location %} determine the number of runners that can be configured without performance loss. {% data reusables.actions.minimum-hardware %}
+
+The peak quantity of connected runners without performance loss depends on such factors as job duration, artifact usage, number of repositories running Actions, and how much other work your instance is doing not related to Actions. Internal testing at GitHub demonstrated the following performance targets for GitHub Enterprise Server on a range of CPU and memory configurations:
+
+{% endif %}
{%- ifversion ghes = 3.2 %}
@@ -80,6 +88,23 @@ Maximum concurrency was measured using multiple repositories, job duration of ap
{%- endif %}
+
+{%- ifversion ghes = 3.6 %}
+
+{% data reusables.actions.hardware-requirements-3.6 %}
+
+{% data variables.product.company_short %} measured maximum connected runners using multiple repositories, job duration of approximately 10 minutes, and 10 MB artifact uploads. You may experience different performance depending on the overall levels of activity on your instance.
+
+{% note %}
+
+**Notes:**
+
+- Beginning with {% data variables.product.prodname_ghe_server %} 3.6, {% data variables.product.company_short %} documents connected runners as opposed to concurrent jobs. Connected runners represents the most runners you can connect and expect to utilize. It should also be noted that connecting more runners than you can expect to utilize can negatively impact performance.
+
+- Beginning with {% data variables.product.prodname_ghe_server %} 3.5, {% data variables.product.company_short %}'s internal testing uses 3rd generation CPUs to better reflect a typical customer configuration. This change in CPU represents a small portion of the changes to performance targets in this version of {% data variables.product.prodname_ghe_server %}.
+{% endnote %}
+{%- endif %}
+
If you plan to enable {% data variables.product.prodname_actions %} for the users of an existing instance, review the levels of activity for users and automations on the instance and ensure that you have provisioned adequate CPU and memory for your users. For more information about monitoring the capacity and performance of {% data variables.product.prodname_ghe_server %}, see "[Monitoring your appliance](/admin/enterprise-management/monitoring-your-appliance)."
For more information about minimum hardware requirements for {% data variables.product.product_location %}, see the hardware considerations for your instance's platform.
diff --git a/translations/zh-CN/content/admin/identity-and-access-management/managing-recovery-codes-for-your-enterprise/accessing-your-enterprise-account-if-your-identity-provider-is-unavailable.md b/translations/zh-CN/content/admin/identity-and-access-management/managing-recovery-codes-for-your-enterprise/accessing-your-enterprise-account-if-your-identity-provider-is-unavailable.md
index ac8dd264ee..fd80198793 100644
--- a/translations/zh-CN/content/admin/identity-and-access-management/managing-recovery-codes-for-your-enterprise/accessing-your-enterprise-account-if-your-identity-provider-is-unavailable.md
+++ b/translations/zh-CN/content/admin/identity-and-access-management/managing-recovery-codes-for-your-enterprise/accessing-your-enterprise-account-if-your-identity-provider-is-unavailable.md
@@ -13,7 +13,7 @@ topics:
permissions: Enterprise owners can use a recovery code to access an enterprise account.
---
-当身份验证配置错误或身份提供程序 (IdP) 问题阻止您使用 SSO 时，您可以使用恢复代码访问您的企业帐户。
+You can use a recovery code to access your enterprise account when an authentication configuration error or an issue with your identity provider (IdP) prevents you from using SSO.
要以这种方式访问您的企业帐户，您必须以前下载并存储了企业的恢复代码。 更多信息请参阅“[下载企业帐户的单点登录恢复代码](/admin/identity-and-access-management/managing-recovery-codes-for-your-enterprise/downloading-your-enterprise-accounts-single-sign-on-recovery-codes)”。
diff --git a/translations/zh-CN/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/streaming-the-audit-log-for-your-enterprise.md b/translations/zh-CN/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/streaming-the-audit-log-for-your-enterprise.md
index 2d681eb2d1..851db4fda6 100644
--- a/translations/zh-CN/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/streaming-the-audit-log-for-your-enterprise.md
+++ b/translations/zh-CN/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/streaming-the-audit-log-for-your-enterprise.md
@@ -85,6 +85,12 @@ Enterprise owners can set up{% ifversion pause-audit-log-stream %}, pause,{% end
{% ifversion streaming-oidc-s3 %}
#### 使用 OpenID Connect 设置流式传输到 S3
+{% note %}
+
+**Note:** Streaming to Amazon S3 with OpenID Connect is currently in beta and subject to change.
+
+{% endnote %}
+
1. 在 AWS 中，将 {% data variables.product.prodname_dotcom %} OIDC 提供商添加到 IAM。 有关更多信息，请参阅 AWS 文档中的[创建 OpenID Connect (OIDC) 身份提供程序](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_create_oidc.html)。
- 对于提供程序 URL，请使用 `https://oidc-configuration.audit-log.githubusercontent.com`。
diff --git a/translations/zh-CN/content/admin/packages/migrating-your-enterprise-to-the-container-registry-from-the-docker-registry.md b/translations/zh-CN/content/admin/packages/migrating-your-enterprise-to-the-container-registry-from-the-docker-registry.md
index 363dab88d9..1ac8619148 100644
--- a/translations/zh-CN/content/admin/packages/migrating-your-enterprise-to-the-container-registry-from-the-docker-registry.md
+++ b/translations/zh-CN/content/admin/packages/migrating-your-enterprise-to-the-container-registry-from-the-docker-registry.md
@@ -75,11 +75,3 @@ Prior to migration, if a user has created a package in the {% data variables.pro
{% data reusables.enterprise-accounts.packages-tab %}
1. To the right of the number of packages to migrate, click **Re-run migration**. During the migration, {% data variables.product.product_name %} will display progress on this page.
1. If the migration fails again, start from step 1 and re-run the migration.
-
-{% ifversion ghes %}
-
-## Monitoring traffic to the registries
-
-You can use visualize traffic to the Docker registry and {% data variables.product.prodname_container_registry %} from {% data variables.product.product_location %}'s monitor dashboard. The "GitHub Container Package Registry" graph can help you confirm that you've successfully migrated all images to the {% data variables.product.prodname_container_registry %}. In the graph, "v1" represents traffic to the Docker registry, and "v2" represents traffic to the {% data variables.product.prodname_container_registry %}. 更多信息请参阅“[访问监控仪表板](/admin/enterprise-management/monitoring-your-appliance/accessing-the-monitor-dashboard)”。
-
-{% endif %}
diff --git a/translations/zh-CN/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise.md b/translations/zh-CN/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise.md
index 1fc5b500bf..e7c5637f97 100644
--- a/translations/zh-CN/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise.md
+++ b/translations/zh-CN/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise.md
@@ -41,7 +41,7 @@ shortTitle: 安全设置策略
- 当您需要为企业进行双重身份验证时，不使用 2FA 的企业拥有的所有组织中的成员、外部协作者和帐单管理员（包括自动程序帐户）将从组织中删除，并失去对其仓库的访问权限。 他们还会失去对组织私有仓库的复刻的访问权限。 如果他们在从您的组织中删除后的三个月内为其帐户启用双重身份验证，您可以恢复其访问权限和设置。 更多信息请参阅“[恢复组织的前成员](/articles/reinstating-a-former-member-of-your-organization)”。
- 为其帐户禁用 2FA 的企业拥有的任何组织中的任何组织所有者、成员、帐单管理员或外部协作者在您启用所需的双重身份验证后将自动从组织中删除。
-- 如果您是某个要求双重身份验证的企业的唯一所有者，则在不为企业禁用双重身份验证要求的情况下，您将无法为用户帐户禁用 2FA。
+- If you're the sole owner of an enterprise that requires two-factor authentication, you won't be able to disable 2FA for your user account without disabling required two-factor authentication for the enterprise.
{% endwarning %}
diff --git a/translations/zh-CN/content/admin/user-management/managing-users-in-your-enterprise/viewing-people-in-your-enterprise.md b/translations/zh-CN/content/admin/user-management/managing-users-in-your-enterprise/viewing-people-in-your-enterprise.md
index b9e4605730..5a29edd5e9 100644
--- a/translations/zh-CN/content/admin/user-management/managing-users-in-your-enterprise/viewing-people-in-your-enterprise.md
+++ b/translations/zh-CN/content/admin/user-management/managing-users-in-your-enterprise/viewing-people-in-your-enterprise.md
@@ -1,6 +1,7 @@
---
title: Viewing people in your enterprise
intro: 'To audit access to enterprise-owned resources or user license usage, enterprise owners can view every administrator and member of the enterprise.'
+permissions: 'Enterprise owners can view the people in an enterprise.'
redirect_from:
- /github/setting-up-and-managing-your-enterprise-account/viewing-people-in-your-enterprise-account
- /articles/viewing-people-in-your-enterprise-account
@@ -21,6 +22,20 @@ To audit access to your enterprise's resources and manage license usage, you can
You can see all current enterprise members and enterprise administrators{% ifversion ghec %}, as well as pending invitations to become members and administrators{% endif %}. To make it easier to consume this information, you can search and filter the lists.
+{% ifversion ghec %}
+
+If {% data variables.product.prodname_github_connect %} is configured for your enterprise, when you filter a list of people in your enterprise, the following limitations apply.
+
+- The filter for two-factor authentication (2FA) status does not show people who only have an account on a {% data variables.product.prodname_ghe_server %} instance.
+- If you combine the filter for accounts on {% data variables.product.prodname_ghe_server %} instances with either the filter for organizations or 2FA status, you will not see any results.
+
+For more information about {% data variables.product.prodname_github_connect %}, see the following articles.
+
+- "[About {% data variables.product.prodname_github_connect %}](/enterprise-server/admin/configuration/configuring-github-connect/about-github-connect)" in the {% data variables.product.prodname_ghe_server %} documentation
+- "[About {% data variables.product.prodname_github_connect %}](/github-ae@latest/admin/configuration/configuring-github-connect/about-github-connect)" in the {% data variables.product.prodname_ghe_managed %} documentation
+
+{% endif %}
+
## Viewing enterprise administrators
You can view all the current enterprise owners{% ifversion ghec %} and billing managers{% endif %} for your enterprise.{% ifversion enterprise-membership-view-improvements %} You can see useful information about each administrator{% ifversion ghec %} and filter the list by role{% endif %}.{% endif %} You can find a specific person by searching for their username or display name.
diff --git a/translations/zh-CN/content/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot.md b/translations/zh-CN/content/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot.md
index 30888b78ba..75752f018e 100644
--- a/translations/zh-CN/content/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot.md
+++ b/translations/zh-CN/content/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot.md
@@ -18,4 +18,4 @@ shortTitle: GitHub Copilot 的计费
{% data variables.product.prodname_copilot %} 订阅以月或年为周期提供。 如果您选择按月计费周期，则每个日历月将向您收取 $10 的费用。 如果您选择年度结算周期，则每年将向您收取 $100 的费用。 您可以随时修改结算周期，修改将从下一个结算周期开始时反映出来。
-{% data variables.product.prodname_copilot %} 的免费订阅可供经过验证的学生以及 {% data variables.product.company_short %} 上常用开源存储库的维护者使用。 如果您符合开源维护者的条件，当您访问 {% data variables.product.prodname_copilot %} 订阅页面时，您将自动收到通知。 作为学生，如果您当前收到 {% data variables.product.prodname_student_pack %}，则当您访问 {% data variables.product.prodname_copilot %} 订阅页面时，您还将获得免费订阅。 有关 {% data variables.product.prodname_student_pack %} 的详细信息，请参阅[申请学生开发包](/free-pro-team@latest/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/apply-for-a-student-developer-pack)”。
+{% data variables.product.prodname_copilot %} 的免费订阅可供经过验证的学生以及 {% data variables.product.company_short %} 上常用开源存储库的维护者使用。 如果您符合开源维护者的条件，当您访问 {% data variables.product.prodname_copilot %} 订阅页面时，您将自动收到通知。 作为学生，如果您当前收到 {% data variables.product.prodname_student_pack %}，则当您访问 {% data variables.product.prodname_copilot %} 订阅页面时，您还将获得免费订阅。 For more information about the {% data variables.product.prodname_student_pack %}, see "[Apply to {% data variables.product.prodname_global_campus %} as a student](/free-pro-team@latest/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/apply-to-github-global-campus-as-a-student)."
diff --git a/translations/zh-CN/content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md b/translations/zh-CN/content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md
index 1bbe77f653..e7fb70174a 100644
--- a/translations/zh-CN/content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md
+++ b/translations/zh-CN/content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md
@@ -49,9 +49,9 @@ All data transferred out, when triggered by {% data variables.product.prodname_a
Storage usage is shared with build artifacts produced by {% data variables.product.prodname_actions %} for repositories owned by your account. For more information, see "[About billing for {% data variables.product.prodname_actions %}](/billing/managing-billing-for-github-actions/about-billing-for-github-actions)."
-{% data variables.product.prodname_dotcom %} charges usage to the account that owns the repository where the package is published. If your account's usage surpasses these limits and you have set a spending limit above $0 USD, you will pay $0.008 USD per GB of storage per day and $0.50 USD per GB of data transfer.
+{% data variables.product.prodname_dotcom %} charges usage to the account that owns the repository where the package is published. If your account's usage surpasses these limits and you have set a spending limit above $0 USD, you will pay $0.25 USD per GB of storage per day and $0.50 USD per GB of data transfer.
-For example, if your organization uses {% data variables.product.prodname_team %}, allows unlimited spending, uses 150GB of storage, and has 50GB of data transfer out during a month, the organization would have overages of 148GB for storage and 40GB for data transfer for that month. The storage overage would cost $0.008 USD per GB per day or $37 USD. The overage for data transfer would cost $0.50 USD per GB or $20 USD.
+For example, if your organization uses {% data variables.product.prodname_team %}, allows unlimited spending, uses 150GB of storage, and has 50GB of data transfer out during a month, the organization would have overages of 148GB for storage and 40GB for data transfer for that month. The storage overage would cost $0.25 USD per GB per day or $37 USD. The overage for data transfer would cost $0.50 USD per GB or $20 USD.
{% data reusables.dotcom_billing.pricing_calculator.pricing_cal_packages %}
diff --git a/translations/zh-CN/content/billing/managing-billing-for-your-github-account/discounted-subscriptions-for-github-accounts.md b/translations/zh-CN/content/billing/managing-billing-for-your-github-account/discounted-subscriptions-for-github-accounts.md
index 6209f8ad3b..dcfc4b038b 100644
--- a/translations/zh-CN/content/billing/managing-billing-for-your-github-account/discounted-subscriptions-for-github-accounts.md
+++ b/translations/zh-CN/content/billing/managing-billing-for-your-github-account/discounted-subscriptions-for-github-accounts.md
@@ -28,11 +28,11 @@ shortTitle: Discounted subscriptions
## Discounts for personal accounts
-In addition to the unlimited public and private repositories for students and faculty with {% data variables.product.prodname_free_user %}, verified students can apply for the {% data variables.product.prodname_student_pack %} to receive additional benefits from {% data variables.product.prodname_dotcom %} partners. For more information, see "[Apply for a student developer pack](/free-pro-team@latest/education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-a-student-developer-pack)."
+In addition to the unlimited public and private repositories for students and faculty with {% data variables.product.prodname_free_user %}, verified students can apply for the {% data variables.product.prodname_student_pack %} to receive additional benefits from {% data variables.product.prodname_dotcom %} partners. For more information, see "[Apply to {% data variables.product.prodname_global_campus %} as a student](/free-pro-team@latest/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/apply-to-github-global-campus-as-a-student)."
## Discounts for schools and universities
-Verified academic faculty can apply for {% data variables.product.prodname_team %} for teaching or academic research. For more information, see "[Use {% data variables.product.prodname_dotcom %} in your classroom and research](/free-pro-team@latest/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research)." You can also request educational materials goodies for your students. For more information, visit [{% data variables.product.prodname_education %}](https://education.github.com/).
+Verified academic faculty can apply for {% data variables.product.prodname_team %} for teaching or academic research. For more information, see "[{% data variables.product.prodname_global_campus %} for teachers](/free-pro-team@latest/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers)." You can also request educational materials goodies for your students. For more information, visit [{% data variables.product.prodname_education %}](https://education.github.com/).
## Discounts for nonprofits and libraries
diff --git a/translations/zh-CN/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/managing-code-scanning-alerts-for-your-repository.md b/translations/zh-CN/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/managing-code-scanning-alerts-for-your-repository.md
index 26c06bcd22..a5948aba46 100644
--- a/translations/zh-CN/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/managing-code-scanning-alerts-for-your-repository.md
+++ b/translations/zh-CN/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/managing-code-scanning-alerts-for-your-repository.md
@@ -204,15 +204,14 @@ To dismiss {% ifversion delete-code-scanning-alerts %}or delete{% endif %} alert
{% endif %}{% endif %}
1. If you want to dismiss an alert, it's important to explore the alert first, so that you can choose the correct dismissal reason. Click the alert you'd like to explore.
-
-
-1. Review the alert, then click {% ifversion comment-dismissed-code-scanning-alert %}**Dismiss alert** and choose, or type, a reason for closing the alert.
- 
-{% else %}**Dismiss** and choose a reason for closing the alert.
+{%- ifversion comment-dismissed-code-scanning-alert %}
+1. Review the alert, then click **Dismiss alert** and choose, or type, a reason for closing the alert.
+ 
+{%- else %}
+1. Review the alert, then click **Dismiss** and choose a reason for closing the alert.
-{% endif %}
-
+{%- endif %}
{% data reusables.code-scanning.choose-alert-dismissal-reason %}
{% data reusables.code-scanning.false-positive-fix-codeql %}
diff --git a/translations/zh-CN/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/triaging-code-scanning-alerts-in-pull-requests.md b/translations/zh-CN/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/triaging-code-scanning-alerts-in-pull-requests.md
index 0fca5449f5..ffde7428bc 100644
--- a/translations/zh-CN/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/triaging-code-scanning-alerts-in-pull-requests.md
+++ b/translations/zh-CN/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/triaging-code-scanning-alerts-in-pull-requests.md
@@ -118,7 +118,7 @@ topics:
关闭警报的另一种办法是忽略它。 您可以忽略您认为不需要修复的警报。 {% data reusables.code-scanning.close-alert-examples %} 如果您对仓库有写入权限，则 **Dismiss（忽略）**按钮在代码注释和警报摘要中可用。 单击 **Dismiss（忽略）**时，您将被提示选择关闭警报的原因。
{% ifversion comment-dismissed-code-scanning-alert %}
-
+
{% else %}
{% endif %}
diff --git a/translations/zh-CN/content/code-security/dependabot/dependabot-alerts/viewing-and-updating-dependabot-alerts.md b/translations/zh-CN/content/code-security/dependabot/dependabot-alerts/viewing-and-updating-dependabot-alerts.md
index 8c5ed3327b..2b61634b57 100644
--- a/translations/zh-CN/content/code-security/dependabot/dependabot-alerts/viewing-and-updating-dependabot-alerts.md
+++ b/translations/zh-CN/content/code-security/dependabot/dependabot-alerts/viewing-and-updating-dependabot-alerts.md
@@ -173,19 +173,28 @@ topics:
## 查看和更新已关闭的警报
-{% tip %}
-
-**提示：** 您只能重新打开以前已忽略的警报。 无法重新打开已修复的已关闭警报。
-{% endtip %}
+You can view all open alerts, and you can reopen alerts that have been previously dismissed. 无法重新打开已修复的已关闭警报。
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.sidebar-security %}
{% data reusables.repositories.sidebar-dependabot-alerts %}
-1. 要仅查看已关闭的警报，请单击 **Closed（已关闭）**。{% ifversion dependabot-bulk-alerts %} {% else %}
-{% endif %}
-1. 单击要查看或更新的警报。{% ifversion dependabot-bulk-alerts %} {% else %}
-{% endif %}
-2. （可选）如果警报已消除，并且您希望重新打开它，请单击 **Reopen（重新打开）**。 无法重新打开已修复的警报。 
+1. 要仅查看已关闭的警报，请单击 **Closed（已关闭）**。
+
+ {%- ifversion dependabot-bulk-alerts %}
+ 
+ {%- else %}
+ 
+ {%- endif %}
+1. Click the alert that you would like to view or update.
+
+ {%- ifversion dependabot-bulk-alerts %}
+ 
+ {%- else %}
+  {%- endif %}
+2. （可选）如果警报已消除，并且您希望重新打开它，请单击 **Reopen（重新打开）**。 无法重新打开已修复的警报。
+
+ {% indented_data_reference reusables.enterprise.3-5-missing-feature spaces=3 %}
+ 
{% endif %}
diff --git a/translations/zh-CN/content/code-security/guides.md b/translations/zh-CN/content/code-security/guides.md
index 7c70663d53..eca2cdae61 100644
--- a/translations/zh-CN/content/code-security/guides.md
+++ b/translations/zh-CN/content/code-security/guides.md
@@ -28,6 +28,8 @@ includeGuides:
- /code-security/secret-scanning/configuring-secret-scanning-for-your-repositories
- /code-security/secret-scanning/defining-custom-patterns-for-secret-scanning
- /code-security/secret-scanning/managing-alerts-from-secret-scanning
+ - /code-security/secret-scanning/protecting-pushes-with-secret-scanning
+ - /code-security/secret-scanning/pushing-a-branch-blocked-by-push-protection
- /code-security/secret-scanning/secret-scanning-patterns
- /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/tracking-code-scanning-alerts-in-issues-using-task-lists
- /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/about-code-scanning
diff --git a/translations/zh-CN/content/code-security/secret-scanning/index.md b/translations/zh-CN/content/code-security/secret-scanning/index.md
index 72928244d7..d41c1de9aa 100644
--- a/translations/zh-CN/content/code-security/secret-scanning/index.md
+++ b/translations/zh-CN/content/code-security/secret-scanning/index.md
@@ -21,5 +21,6 @@ children:
- /managing-alerts-from-secret-scanning
- /secret-scanning-patterns
- /protecting-pushes-with-secret-scanning
+ - /pushing-a-branch-blocked-by-push-protection
---
diff --git a/translations/zh-CN/content/code-security/secret-scanning/protecting-pushes-with-secret-scanning.md b/translations/zh-CN/content/code-security/secret-scanning/protecting-pushes-with-secret-scanning.md
index 426636a01b..39b0c164bf 100644
--- a/translations/zh-CN/content/code-security/secret-scanning/protecting-pushes-with-secret-scanning.md
+++ b/translations/zh-CN/content/code-security/secret-scanning/protecting-pushes-with-secret-scanning.md
@@ -13,7 +13,7 @@ topics:
- Advanced Security
- Alerts
- Repositories
-shortTitle: 推送保护
+shortTitle: Enable push protection
---
{% data reusables.secret-scanning.beta %}
@@ -30,11 +30,7 @@ If a contributor bypasses a push protection block for a secret, {% data variable
- adds the bypass event to the audit log.{% ifversion secret-scanning-push-protection-email %}
- sends an email alert to organization owners, security managers, and repository administrators, with a link to the related secret and the reason why it was allowed.{% endif %}
-{% data variables.product.prodname_secret_scanning_caps %} 作为推送保护，当前会扫描存储库中查找由以下服务提供商颁发的机密。
-
-{% data reusables.secret-scanning.secret-scanning-pattern-pair-matches %}
-
-{% data reusables.secret-scanning.secret-list-private-push-protection %}
+For information on the secrets and service providers supported for push protection, see "[{% data variables.product.prodname_secret_scanning_caps %} patterns](/code-security/secret-scanning/secret-scanning-patterns#supported-secrets-for-push-protection)."
## 启用 {% data variables.product.prodname_secret_scanning %} 作为推送保护
@@ -58,32 +54,24 @@ If a contributor bypasses a push protection block for a secret, {% data variable
{% data reusables.repositories.navigate-to-ghas-settings %}
{% data reusables.advanced-security.secret-scanning-push-protection-repo %}
+## Using secret scanning as a push protection from the command line
-## 从命令行使用 {% data variables.product.prodname_secret_scanning %} 作为推送保护
-
-当您尝试将受支持的密钥推送到启用了 {% data variables.product.prodname_secret_scanning %} 作为推送保护的存储库或组织时，{% data variables.product.prodname_dotcom %} 将阻止推送。 您可以从提交中删除机密，也可以按照提供的 URL 进行推送。
+{% data reusables.secret-scanning.push-protection-command-line-choice %}
在命令行上一次最多会显示五个检测到的机密。 如果已在存储库中检测到特定机密，并且警报已存在，{% data variables.product.prodname_dotcom %} 不会阻止该机密。
-如果需要从正在推送的分支上的最新提交（即 `HEAD`）以及包含该机密的任何早期提交中删除机密，您可以从 `HEAD` 中删除机密，然后在引入提交和已删除机密的 `HEAD` 的第一个版本之间压缩提交。
+{% data reusables.secret-scanning.push-protection-remove-secret %} For more information about remediating blocked secrets, see "[Pushing a branch blocked by push protection](/code-security/secret-scanning/pushing-a-branch-blocked-by-push-protection#resolving-a-blocked-push-on-the-command-line)."
-{% note %}
+如果确认某个机密是真实的，并且打算稍后修复它，则应尽快修复。 例如，您可以撤销密钥，并从存储库的提交历史记录中删除密钥。 Real secrets that have been exposed must be revoked to avoid unauthorized access. You might consider first rotating the secret before revoking it. 更多信息请参阅“[从仓库中删除敏感数据](/authentication/keeping-your-account-and-data-secure/removing-sensitive-data-from-a-repository)”。
-**注意**：
-
-* 如果您的 git 配置支持推送到多个分支，而不仅仅是到默认分支，则您的推送可能会由于推送了其他和意外的引用而被阻止。 更多信息请参阅 Git 文档中的 [`push.default` 选项](https://git-scm.com/docs/git-config#Documentation/git-config.txt-pushdefault)。
-* 如果在推送时 {% data variables.product.prodname_secret_scanning %} 超时，{% data variables.product.prodname_dotcom %} 仍将在推送后运行扫描。
-
-{% endnote %}
+{% data reusables.secret-scanning.push-protection-multiple-branch-note %}
### 允许推送被阻止的机密
如果 {% data variables.product.prodname_dotcom %} 阻止了您认为可以安全推送的机密，则可以允许该机密并说明应允许该机密的原因。
-如果确认某个机密是真实的，并且打算稍后修复它，则应尽快修复。 例如，您可以撤销密钥，并从存储库的提交历史记录中删除密钥。 更多信息请参阅“[从仓库中删除敏感数据](/authentication/keeping-your-account-and-data-secure/removing-sensitive-data-from-a-repository)”。
-
{% data reusables.secret-scanning.push-protection-allow-secrets-alerts %}
{% data reusables.secret-scanning.push-protection-allow-email %}
@@ -96,9 +84,7 @@ If a contributor bypasses a push protection block for a secret, {% data variable
{% ifversion secret-scanning-push-protection-web-ui %}
## 使用密钥扫描作为 Web UI 的推送保护
-当您使用 Web UI 尝试将受支持的密钥提交到启用了机密扫描作为推送保护的存储库或组织时，{% data variables.product.prodname_dotcom %} 将阻止提交。 您将在页面顶部看到一个横幅，其中包含有关密钥位置的信息，并且密钥也将在文件中加下划线，以便您可以轻松找到它。
-
- 
+{% data reusables.secret-scanning.push-protection-web-ui-choice %}
{% data variables.product.prodname_dotcom %} 将在 Web UI 中一次仅显示一个检测到的机密。 如果已在存储库中检测到特定机密，并且警报已存在，{% data variables.product.prodname_dotcom %} 不会阻止该机密。
@@ -108,7 +94,11 @@ If a contributor bypasses a push protection block for a secret, {% data variable
### 绕过密钥的推送保护
-如果 {% data variables.product.prodname_dotcom %} 阻止了您认为可以安全推送的机密，则可以允许该机密并说明应允许该机密的原因。 如果确认某个机密是真实的，并且打算稍后修复它，则应尽快修复。
+{% data reusables.secret-scanning.push-protection-remove-secret %} For more information about remediating blocked secrets, see "[Pushing a branch blocked by push protection](/code-security/secret-scanning/pushing-a-branch-blocked-by-push-protection#resolving-a-blocked-push-in-the-web-ui)."
+
+如果确认某个机密是真实的，并且打算稍后修复它，则应尽快修复。 更多信息请参阅“[从仓库中删除敏感数据](/authentication/keeping-your-account-and-data-secure/removing-sensitive-data-from-a-repository)”。
+
+如果 {% data variables.product.prodname_dotcom %} 阻止了您认为可以安全推送的机密，则可以允许该机密并说明应允许该机密的原因。
{% data reusables.secret-scanning.push-protection-allow-secrets-alerts %}
diff --git a/translations/zh-CN/content/code-security/secret-scanning/pushing-a-branch-blocked-by-push-protection.md b/translations/zh-CN/content/code-security/secret-scanning/pushing-a-branch-blocked-by-push-protection.md
new file mode 100644
index 0000000000..58a18f2a13
--- /dev/null
+++ b/translations/zh-CN/content/code-security/secret-scanning/pushing-a-branch-blocked-by-push-protection.md
@@ -0,0 +1,56 @@
+---
+title: Pushing a branch blocked by push protection
+intro: 'The push protection feature of {% data variables.product.prodname_secret_scanning %} proactively protects you against leaked secrets in your repositories. You can resolve blocked pushes and, once the detected secret is removed, you can push changes to your working branch from the command line or the web UI.'
+product: '{% data reusables.gated-features.secret-scanning %}'
+miniTocMaxHeadingLevel: 3
+versions:
+ feature: secret-scanning-push-protection
+type: how_to
+topics:
+ - Secret scanning
+ - Advanced Security
+ - Alerts
+ - Repositories
+shortTitle: Push a blocked branch
+---
+
+## About push protection for {% data variables.product.prodname_secret_scanning %}
+
+The push protection feature of {% data variables.product.prodname_secret_scanning %} helps to prevent security leaks by scanning for secrets before you push changes to your repository. {% data reusables.secret-scanning.push-protection-overview %} For information on the secrets and service providers supported for push protection, see "[{% data variables.product.prodname_secret_scanning_caps %} patterns](/code-security/secret-scanning/secret-scanning-patterns#supported-secrets-for-push-protection)."
+
+{% data reusables.secret-scanning.push-protection-remove-secret %}
+
+{% tip %}
+
+**Tip** If {% data variables.product.prodname_dotcom %} blocks a secret that you believe is safe to push, you can allow the secret and specify the reason why it should be allowed. For more information about bypassing push protection for a secret, see "[Allowing a blocked secret to be pushed](/code-security/secret-scanning/protecting-pushes-with-secret-scanning#allowing-a-blocked-secret-to-be-pushed)" and "[Bypassing push protection for a secret](/code-security/secret-scanning/protecting-pushes-with-secret-scanning#bypassing-push-protection-for-a-secret)" for the command line and the web UI, respectively.
+
+{% endtip %}
+
+## Resolving a blocked push on the command line
+
+{% data reusables.secret-scanning.push-protection-command-line-choice %}
+
+{% data reusables.secret-scanning.push-protection-multiple-branch-note %}
+
+If the blocked secret was introduced by the latest commit on your branch, you can follow the guidance below.
+
+1. Remove the secret from your code.
+1. Commit the changes, by using `git commit --amend`.
+1. Push your changes with `git push`.
+
+You can also remove the secret if the secret appears in an earlier commit in the Git history.
+
+1. Use `git log` to determine which commit surfaced in the push error came first in history.
+1. Start an interactive rebase with `git rebase -i ~1`. is the id of the commit from step 1.
+1. Identify your commit to edit by changing `pick` to `edit` on the first line of the text that appears in the editor.
+1. Remove the secret from your code.
+1. Commit the change with `git commit --amend`.
+1. Run `git rebase --continue` to finish the rebase.
+
+## Resolving a blocked commit in the web UI
+
+{% data reusables.secret-scanning.push-protection-web-ui-choice %}
+
+To resolve a blocked commit in the web UI, you need to remove the secret from the file, or use the **Bypass protection** dropdown to allow the secret. For more information about bypassing push protection from the web UI, see "[Protecting pushes with secret scanning](/code-security/secret-scanning/protecting-pushes-with-secret-scanning#bypassing-push-protection-for-a-secret)."
+
+If you confirm a secret is real, you need to remove the secret from the file. 删除机密后，页面顶部的横幅将更改，并告诉您现在可以提交更改。
diff --git a/translations/zh-CN/content/code-security/secret-scanning/secret-scanning-patterns.md b/translations/zh-CN/content/code-security/secret-scanning/secret-scanning-patterns.md
index 20e716d463..1499e8e879 100644
--- a/translations/zh-CN/content/code-security/secret-scanning/secret-scanning-patterns.md
+++ b/translations/zh-CN/content/code-security/secret-scanning/secret-scanning-patterns.md
@@ -21,10 +21,11 @@ redirect_from:
{% ifversion fpt or ghec %}
## About {% data variables.product.prodname_secret_scanning %} patterns
-{% data variables.product.product_name %} maintains two different sets of {% data variables.product.prodname_secret_scanning %} patterns:
+{% data variables.product.product_name %} maintains these different sets of {% data variables.product.prodname_secret_scanning %} patterns:
1. **Partner patterns.** Used to detect potential secrets in all public repositories. For details, see "[Supported secrets for partner patterns](#supported-secrets-for-partner-patterns)."
-2. **Advanced security patterns.** Used to detect potential secrets in repositories with {% data variables.product.prodname_secret_scanning %} enabled. {% ifversion ghec %} For details, see "[Supported secrets for advanced security](#supported-secrets-for-advanced-security)."{% endif %}
+2. **Advanced security patterns.** Used to detect potential secrets in repositories with {% data variables.product.prodname_secret_scanning %} enabled. {% ifversion ghec %} For details, see "[Supported secrets for advanced security](#supported-secrets-for-advanced-security)."{% endif %}{% ifversion secret-scanning-push-protection %}
+3. **Push protection patterns.** Used to detect potential secrets in repositories with {% data variables.product.prodname_secret_scanning %} as a push protection enabled. For details, see "[Supported secrets for push protection](#supported-secrets-for-push-protection)."{% endif %}
{% ifversion fpt %}
Organizations using {% data variables.product.prodname_ghe_cloud %} with {% data variables.product.prodname_GH_advanced_security %} can enable {% data variables.product.prodname_secret_scanning_GHAS %} on their repositories. For details of these patterns, see the [{% data variables.product.prodname_ghe_cloud %} documentation](/enterprise-cloud@latest/code-security/secret-scanning/secret-scanning-patterns#supported-secrets-for-advanced-security).
@@ -59,6 +60,16 @@ If you use the REST API for secret scanning, you can use the `Secret type` to re
{% data reusables.secret-scanning.partner-secret-list-private-repo %}
{% endif %}
+{% ifversion secret-scanning-push-protection %}
+## Supported secrets for push protection
+
+{% data variables.product.prodname_secret_scanning_caps %} as a push protection currently scans repositories for secrets issued by the following service providers.
+
+{% data reusables.secret-scanning.secret-scanning-pattern-pair-matches %}
+
+{% data reusables.secret-scanning.secret-list-private-push-protection %}
+
+{% endif %}
## Further reading
- "[Securing your repository](/code-security/getting-started/securing-your-repository)"
diff --git a/translations/zh-CN/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph.md b/translations/zh-CN/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph.md
index 7d3517de96..fa9322c90d 100644
--- a/translations/zh-CN/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph.md
+++ b/translations/zh-CN/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph.md
@@ -96,7 +96,8 @@ The recommended formats explicitly define which versions are used for all direct
{% endif %}
{% ifversion github-actions-in-dependency-graph %}
-[†] {% data variables.product.prodname_actions %} workflows must be located in the `.github/workflows/` directory of a repository to be recognized as manifests. Any actions or workflows referenced using the syntax `jobs[*].steps[*].uses` or `jobs..uses` will be parsed as dependencies. For more information, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/using-workflows/workflow-syntax-for-github-actions)."
+[†] {% data reusables.enterprise.3-5-missing-feature %} {% data variables.product.prodname_actions %} workflows must be located in the `.github/workflows/` directory of a repository to be recognized as manifests. Any actions or workflows referenced using the syntax `jobs[*].steps[*].uses` or `jobs..uses` will be parsed as dependencies. For more information, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/using-workflows/workflow-syntax-for-github-actions)."
+
{% endif %}
[‡] If you list your Python dependencies within a `setup.py` file, we may not be able to parse and list every dependency in your project.
diff --git a/translations/zh-CN/content/codespaces/developing-in-codespaces/index.md b/translations/zh-CN/content/codespaces/developing-in-codespaces/index.md
index 0de811aae9..d6a331fdbd 100644
--- a/translations/zh-CN/content/codespaces/developing-in-codespaces/index.md
+++ b/translations/zh-CN/content/codespaces/developing-in-codespaces/index.md
@@ -13,6 +13,7 @@ children:
- /developing-in-a-codespace
- /using-source-control-in-your-codespace
- /using-github-codespaces-for-pull-requests
+ - /renaming-a-codespace
- /deleting-a-codespace
- /forwarding-ports-in-your-codespace
- /default-environment-variables-for-your-codespace
diff --git a/translations/zh-CN/content/codespaces/developing-in-codespaces/renaming-a-codespace.md b/translations/zh-CN/content/codespaces/developing-in-codespaces/renaming-a-codespace.md
new file mode 100644
index 0000000000..c60f982d9a
--- /dev/null
+++ b/translations/zh-CN/content/codespaces/developing-in-codespaces/renaming-a-codespace.md
@@ -0,0 +1,54 @@
+---
+title: Renaming a codespace
+intro: 'You can use the {% data variables.product.prodname_cli %} to change the codespace display name to one of your choice.'
+product: '{% data reusables.gated-features.codespaces %}'
+versions:
+ fpt: '*'
+ ghec: '*'
+type: how_to
+topics:
+ - Codespaces
+ - Fundamentals
+ - Developer
+shortTitle: Rename a codespace
+---
+
+## About renaming a codespace
+
+Each codespace is assigned an auto-generated display name. If you have multiple codespaces, the display name helps you to differentiate between codespaces. For example: `literate space parakeet`. You can change the display name for your codespace.
+
+To find the display name of a codespace:
+
+- On {% data variables.product.product_name %}, view your list of codespaces at https://github.com/codespaces.
+
+ 
+
+- In the {% data variables.product.prodname_vscode %} desktop application, or the {% data variables.product.prodname_vscode_shortname %} web client, click the Remote Explorer. The display name is shown below the repository name. For example: `symmetrical space telegram` in the screenshot below.
+
+ 
+
+- In a terminal window on your local machine, use this {% data variables.product.prodname_cli %} command: `gh codespace list`.
+### Permanent codespace names
+
+In addition to the display name, when you create a codespace, a permanent name is also assigned to the codespace. The name is a combination of your {% data variables.product.company_short %} handle, the repository name, and some random characters. 例如： `octocat-myrepo-gmc7`。 You can't change this name.
+
+To find the permanent name of a codespace:
+
+* On {% data variables.product.product_name %}, the permanent name is shown in a pop-up when you hover over the **Open in browser** option on https://github.com/codespaces.
+
+ 
+
+* In a codespace, use this command in the terminal: `echo $CODESPACE_NAME`.
+* In a terminal window on your local machine, use this {% data variables.product.prodname_cli %} command: `gh codespace list`.
+
+## Renaming a codespace
+
+Changing the display name of a codespace can be useful if you have multiple codespaces that you will be using for an extended period. An appropriate name helps you identify a codespace that you use for a particular purpose. You can change the display name for your codespace by using the {% data variables.product.prodname_cli %}.
+
+To rename a codespace, use the `gh codespace edit` subcommand:
+
+```shell
+gh codespace edit -c permanent name of the codespace -d new display name
+```
+
+In this example, replace `permanent name of the codespace` with the permanent name of the codespace. Replace `new display name` with the desired display name.
diff --git a/translations/zh-CN/content/communities/documenting-your-project-with-wikis/editing-wiki-content.md b/translations/zh-CN/content/communities/documenting-your-project-with-wikis/editing-wiki-content.md
index 7c18cb71d1..595d873a96 100644
--- a/translations/zh-CN/content/communities/documenting-your-project-with-wikis/editing-wiki-content.md
+++ b/translations/zh-CN/content/communities/documenting-your-project-with-wikis/editing-wiki-content.md
@@ -26,7 +26,7 @@ topics:
您可以使用页面支持的标准标记或使用 MediaWiki 语法在 wiki 中创建链接。 例如：
- 如果您的页面使用 Markdown 渲染，则链接语法为 `[链接文本](wiki 页面的完整 URL)`。
-- 使用 MediaWiki 语法，链接语法为 `[[链接文本|wiki 页面的名称]]`。
+- With MediaWiki syntax, the link syntax is `[[nameofwikipage|Link Text]]`.
## 添加图像
diff --git a/translations/zh-CN/content/communities/setting-up-your-project-for-healthy-contributions/setting-guidelines-for-repository-contributors.md b/translations/zh-CN/content/communities/setting-up-your-project-for-healthy-contributions/setting-guidelines-for-repository-contributors.md
index 3eee87768d..783c7f20bc 100644
--- a/translations/zh-CN/content/communities/setting-up-your-project-for-healthy-contributions/setting-guidelines-for-repository-contributors.md
+++ b/translations/zh-CN/content/communities/setting-up-your-project-for-healthy-contributions/setting-guidelines-for-repository-contributors.md
@@ -59,7 +59,7 @@ shortTitle: 参与指南
如果您觉得难以着手，以下是参与指南的一些良好示例：
- Atom 编辑器[参与指南](https://github.com/atom/atom/blob/master/CONTRIBUTING.md)。
-- Ruby on Rails [参与指南](https://github.com/rails/rails/blob/master/CONTRIBUTING.md)。
+- Ruby on Rails [参与指南](https://github.com/rails/rails/blob/main/CONTRIBUTING.md)。
- Open Government [参与指南](https://github.com/opengovernment/opengovernment/blob/master/CONTRIBUTING.md)。
## 延伸阅读
diff --git a/translations/zh-CN/content/education/contribute-with-github-community-exchange/getting-started-with-github-community-exchange.md b/translations/zh-CN/content/education/contribute-with-github-community-exchange/getting-started-with-github-community-exchange.md
index 9b1b11ceab..dfa5296abd 100644
--- a/translations/zh-CN/content/education/contribute-with-github-community-exchange/getting-started-with-github-community-exchange.md
+++ b/translations/zh-CN/content/education/contribute-with-github-community-exchange/getting-started-with-github-community-exchange.md
@@ -42,4 +42,4 @@ To report an abusive repository: Go to your {% data variables.product.prodname_c
## 延伸阅读
-- "[关于 {% data variables.product.prodname_community_exchange %}](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/about-github-community-exchange)"
+- ""[关于 {% data variables.product.prodname_community_exchange %}](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/about-github-community-exchange)""
diff --git a/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/about-github-community-exchange.md b/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/about-github-community-exchange.md
similarity index 89%
rename from translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/about-github-community-exchange.md
rename to translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/about-github-community-exchange.md
index d12c38bd80..3e4248ab66 100644
--- a/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/about-github-community-exchange.md
+++ b/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/about-github-community-exchange.md
@@ -1,6 +1,8 @@
---
title: 关于 GitHub Community Exchange
intro: 'Learn the skills you need to contribute to open source projects and grow your own portfolio, with {% data variables.product.prodname_community_exchange %}.'
+redirect_from:
+ - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/about-github-community-exchange
versions:
fpt: '*'
shortTitle: About Community Exchange
diff --git a/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/about-github-global-campus-for-students.md b/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/about-github-global-campus-for-students.md
new file mode 100644
index 0000000000..60d3133ff3
--- /dev/null
+++ b/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/about-github-global-campus-for-students.md
@@ -0,0 +1,40 @@
+---
+title: About GitHub Global Campus for students
+intro: '{% data variables.product.prodname_education %} 让学生免费使用 {% data variables.product.prodname_dotcom %} 合作伙伴的各种开发工具，为他们提供真实的体验。'
+redirect_from:
+ - /education/teach-and-learn-with-github-education/about-github-education-for-students
+ - /github/teaching-and-learning-with-github-education/about-github-education-for-students
+ - /articles/about-github-education-for-students
+ - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-github-education-for-students
+ - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/about-github-education-for-students
+versions:
+ fpt: '*'
+shortTitle: 适合学生
+---
+
+将 {% data variables.product.prodname_dotcom %} 用于学校项目是一种与别人协作的实用方式，可创建展示真实世界的作品集。
+
+拥有 {% data variables.product.prodname_dotcom %} 帐户的每个人都可通过 {% data variables.product.prodname_free_user %} 在无限的公共和私有仓库中协作。 As a student, you can also apply for {% data variables.product.prodname_education %} student benefits. Your {% data variables.product.prodname_education %} student benefits and resources are all included in {% data variables.product.prodname_global_campus %}, a portal that allows you to access your education benefits, all in one place. For more information, see "[Apply to GitHub Global Campus as a student](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/apply-to-github-global-campus-as-a-student)" and [{% data variables.product.prodname_education %}](https://education.github.com/).
+
+Before applying for Global Campus, check if your learning community is already partnered with us as a {% data variables.product.prodname_campus_program %} school. 更多信息请参阅“[关于 {% data variables.product.prodname_campus_program %}](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-github-campus-program)”。
+
+If you're a member of a school club, a teacher can apply for {% data variables.product.prodname_global_campus %} so your team can collaborate using {% data variables.product.prodname_team %}, which allows unlimited users and private repositories, for free. For more information, see "[Apply to {% data variables.product.prodname_global_campus %} as a teacher](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/apply-to-github-global-campus-as-a-teacher)."
+
+Once you are a verified {% data variables.product.prodname_global_campus %} student, you can access {% data variables.product.prodname_global_campus %} anytime by going to the [{% data variables.product.prodname_education %} website](https://education.github.com).
+
+
+
+## {% data variables.product.prodname_global_campus %} features for students
+
+{% data variables.product.prodname_global_campus %} is a portal from which you can access your {% data variables.product.prodname_education %} benefits and resources, all in one place. On the {% data variables.product.prodname_global_campus %} portal, students can:
+- Connect with a local Campus Expert. For more information on campus experts, see "[About Campus Experts](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-at-your-educational-institution/about-campus-experts)."
+- Explore and claim offers for free industry tools from the [Student Developer Pack](https://education.github.com/pack).
+- See upcoming in-person and virtual events for students, curated by {% data variables.product.prodname_education %} and student leaders.
+- View assignments from [GitHub Classroom](https://classroom.github.com/) with upcoming due dates.
+- Stay in the know on what the community is interested in by rewatching recent [Campus TV](https://www.twitch.tv/githubeducation) episodes. Campus TV is created by {% data variables.product.prodname_dotcom %} and student community leaders and can be watched live or on demand.
+- Discover student-created repositories from GitHub Community Exchange. For more information, see "[About GitHub Community Exchange](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/about-github-community-exchange)."
+
+## 延伸阅读
+
+- "[About {% data variables.product.prodname_global_campus %} for teachers](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/about-github-global-campus-for-teachers)"
+- "[关于 {% data variables.product.prodname_community_exchange %}](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/about-github-community-exchange)"
diff --git a/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/apply-for-a-student-developer-pack.md b/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/apply-to-github-global-campus-as-a-student.md
similarity index 64%
rename from translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/apply-for-a-student-developer-pack.md
rename to translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/apply-to-github-global-campus-as-a-student.md
index 07cfed7c9e..a977903218 100644
--- a/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/apply-for-a-student-developer-pack.md
+++ b/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/apply-to-github-global-campus-as-a-student.md
@@ -1,21 +1,22 @@
---
-title: 申请学生开发包
-intro: '作为学生，可以申请 {% data variables.product.prodname_student_pack %}，其中包括 {% data variables.product.prodname_dotcom %} 合作伙伴的特惠和福利。'
+title: Apply to GitHub Global Campus as a student
+intro: 'As a student, you can apply to join {% data variables.product.prodname_global_campus %} and receive access to the student resources and benefits offered by {% data variables.product.prodname_education %}'
redirect_from:
- /education/teach-and-learn-with-github-education/apply-for-a-student-developer-pack
- /github/teaching-and-learning-with-github-education/applying-for-a-student-developer-pack
- /articles/applying-for-a-student-developer-pack
- /education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-a-student-developer-pack
+ - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/apply-for-a-student-developer-pack
versions:
fpt: '*'
-shortTitle: 申请学生包
+shortTitle: Apply to Global Campus
---
{% data reusables.education.about-github-education-link %}
## 要求
-要获得申请 {% data variables.product.prodname_student_pack %} 的资格，必须：
+To be eligible for {% data variables.product.prodname_global_campus %}, including {% data variables.product.prodname_student_pack %} and other benefits, you must:
- 现正攻读学位或文凭授予课程，如高中、初中、大专、大学、自主学习或类似教育机构
- 具有学校发放的可验证电子邮件地址，或者上传能证明您目前学生身份的文档
- 拥有 [{% data variables.product.prodname_dotcom %} 个人帐户](/articles/signing-up-for-a-new-github-account)
@@ -31,9 +32,9 @@ shortTitle: 申请学生包
{% endnote %}
-有关续订 {% data variables.product.prodname_student_pack %} 的信息，请参阅“[到期和续订](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-a-student-developer-pack/#expiration-and-renewals)”。
+For information about renewing your {% data variables.product.prodname_global_campus %} access, see "[Expiration and renewals](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/apply-to-github-global-campus-as-a-student/#expiration-and-renewals)."
-## 申请 {% data variables.product.prodname_student_pack %}
+## Applying to {% data variables.product.prodname_global_campus %}
{% data reusables.education.benefits-page %}
3. 在 "Which best describes your academic status?"（哪一项最准确描述了您的学业身份？）下，选择 **Student（学生）**。 
@@ -45,7 +46,7 @@ shortTitle: 申请学生包
## 到期和续订
-在您的 {% data variables.product.prodname_student_pack %} 访问权限到期后，如果您仍有资格，您可以重新申请，但有些合作伙伴可能不提供续订服务。 合作伙伴的大多数计时特惠在您设置后便开始。 要重新申请，只需返回 https://education.github.com，点击您的个人资料图片，然后点击 **Reverify your academic affiliation（重新验证您的学术关系）**。
+Once your {% data variables.product.prodname_global_campus %} access expires, you may reapply if you're still eligible, although some of our partner offers for {% data variables.product.prodname_student_pack %} cannot renew. 合作伙伴的大多数计时特惠在您设置后便开始。 要重新申请，只需返回 https://education.github.com，点击您的个人资料图片，然后点击 **Reverify your academic affiliation（重新验证您的学术关系）**。
diff --git a/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/index.md b/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/index.md
similarity index 55%
rename from translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/index.md
rename to translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/index.md
index b43870ca05..a30ca6bb45 100644
--- a/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/index.md
+++ b/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/index.md
@@ -1,17 +1,18 @@
---
-title: 使用 GitHub 做功课
+title: GitHub Global Campus for students
intro: '作为学生，使用 {% data variables.product.prodname_dotcom %} 在您的学校项目上协作，并构建真实世界的体验。'
redirect_from:
- /education/teach-and-learn-with-github-education/use-github-for-your-schoolwork
- /github/teaching-and-learning-with-github-education/using-github-for-your-schoolwork
- /articles/using-github-for-your-schoolwork
+ - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork
versions:
fpt: '*'
children:
- - /about-github-education-for-students
- - /apply-for-a-student-developer-pack
- - /why-wasnt-my-application-for-a-student-developer-pack-approved
+ - /about-github-global-campus-for-students
+ - /apply-to-github-global-campus-as-a-student
+ - /why-wasnt-my-application-to-global-campus-for-students-approved
- /about-github-community-exchange
-shortTitle: 用于功课
+shortTitle: About Global Campus for students
---
diff --git a/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/why-wasnt-my-application-for-a-student-developer-pack-approved.md b/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/why-wasnt-my-application-to-global-campus-for-students-approved.md
similarity index 86%
rename from translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/why-wasnt-my-application-for-a-student-developer-pack-approved.md
rename to translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/why-wasnt-my-application-to-global-campus-for-students-approved.md
index 8584d0b696..49ad28e739 100644
--- a/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/why-wasnt-my-application-for-a-student-developer-pack-approved.md
+++ b/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/why-wasnt-my-application-to-global-campus-for-students-approved.md
@@ -1,6 +1,6 @@
---
-title: Why wasn't my application for a student developer pack approved?
-intro: 'Review common reasons that applications for the {% data variables.product.prodname_student_pack %} are not approved and learn tips for reapplying successfully.'
+title: Why wasn't my application to Global Campus for students approved?
+intro: 'Review common reasons that applications for {% data variables.product.prodname_global_campus %} are not approved and learn tips for reapplying successfully.'
redirect_from:
- /education/teach-and-learn-with-github-education/why-wasnt-my-application-for-a-student-developer-pack-approved
- /github/teaching-and-learning-with-github-education/why-wasnt-my-application-for-a-student-developer-pack-approved
@@ -8,6 +8,7 @@ redirect_from:
- /articles/why-wasn-t-my-application-for-a-student-developer-pack-approved
- /articles/why-wasnt-my-application-for-a-student-developer-pack-approved
- /education/explore-the-benefits-of-teaching-and-learning-with-github-education/why-wasnt-my-application-for-a-student-developer-pack-approved
+ - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/why-wasnt-my-application-for-a-student-developer-pack-approved
versions:
fpt: '*'
shortTitle: Application not approved
@@ -69,4 +70,4 @@ Your instructor may still apply for a {% data variables.product.prodname_educati
## Further reading
- "[How to get the GitHub Student Developer Pack without a student ID](https://github.blog/2019-07-30-how-to-get-the-github-student-developer-pack-without-a-student-id/)" on {% data variables.product.prodname_blog %}
-- "[Apply for a student developer pack](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-a-student-developer-pack)"
+- "[Apply to {% data variables.product.prodname_global_campus %} as a student](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/apply-to-github-global-campus-as-a-student)"
diff --git a/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/about-github-global-campus-for-teachers.md b/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/about-github-global-campus-for-teachers.md
new file mode 100644
index 0000000000..c2c4be404b
--- /dev/null
+++ b/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/about-github-global-campus-for-teachers.md
@@ -0,0 +1,35 @@
+---
+title: About GitHub Global Campus for teachers
+intro: '{% data variables.product.prodname_global_campus %} offers teachers a central place to access tools and resources for working more effectively inside and outside of the classroom.'
+redirect_from:
+ - /education/teach-and-learn-with-github-education/about-github-education-for-educators-and-researchers
+ - /github/teaching-and-learning-with-github-education/about-github-education-for-educators-and-researchers
+ - /articles/about-github-education-for-educators-and-researchers
+ - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-github-education-for-educators-and-researchers
+ - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research/about-github-education-for-educators-and-researchers
+versions:
+ fpt: '*'
+shortTitle: For teachers
+---
+
+As a faculty member at an accredited educational institution, you can apply for {% data variables.product.prodname_global_campus %}, which includes {% data variables.product.prodname_education %} benefits and resources. For more information, see "[Apply to {% data variables.product.prodname_global_campus %} as a teacher](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/apply-to-github-global-campus-as-a-teacher)."
+
+{% data variables.product.prodname_global_campus %} is a portal that allows the GitHub Education Community to access their education benefits, all in one place. Once you are a verified {% data variables.product.prodname_global_campus %} teacher, you can access {% data variables.product.prodname_global_campus %} anytime by going to the [{% data variables.product.prodname_education %} website](https://education.github.com).
+
+
+
+在申请个人折扣之前，请检查您的学习社区是否已作为 {% data variables.product.prodname_campus_program %} 学校与我们合作。 更多信息请参阅“[关于 {% data variables.product.prodname_campus_program %}](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-github-campus-program)”。
+
+## {% data variables.product.prodname_global_campus %} features for teachers
+
+{% data variables.product.prodname_global_campus %} is a portal from which you can access your {% data variables.product.prodname_education %} benefits and resources, all in one place. On the {% data variables.product.prodname_global_campus %} portal, teachers of all levels can:
+ {% data reusables.education.apply-for-team %}
+ - View an overview of your active [{% data variables.product.prodname_classroom %}](https://classroom.github.com), including recent assignments and your class's progress at a glance, as well as links to {% data variables.product.prodname_classroom %}.
+ - View and interact with [{% data variables.product.prodname_discussions %}](https://github.com/orgs/community/discussions/categories/github-education) posted by your peers from around the world to discuss current trends in technology education, and see the latest posts from our [{% data variables.product.prodname_education %} blog](https://github.blog/category/education/).
+ - See student events curated by {% data variables.product.prodname_education %} and student leaders.
+ - Stay in the know on what the student community is interested in by rewatching recent [Campus TV](https://www.twitch.tv/githubeducation) episodes. Campus TV is created by {% data variables.product.prodname_dotcom %} and student community leaders and can be watched live or on demand.
+ - Request a {% data variables.product.prodname_dotcom %} swag bag with educational materials and goodies for your students.
+
+## 延伸阅读
+
+- "[关于学生版 {% data variables.product.prodname_global_campus %}](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/about-github-global-campus-for-students)"
diff --git a/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research/apply-for-an-educator-or-researcher-discount.md b/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/apply-to-github-global-campus-as-a-teacher.md
similarity index 70%
rename from translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research/apply-for-an-educator-or-researcher-discount.md
rename to translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/apply-to-github-global-campus-as-a-teacher.md
index aedab9b610..f0fd7857d5 100644
--- a/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research/apply-for-an-educator-or-researcher-discount.md
+++ b/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/apply-to-github-global-campus-as-a-teacher.md
@@ -1,6 +1,6 @@
---
-title: 申请教育者或研究人员折扣
-intro: '如果您是教育者或研究人员，可以为组织申请免费获取 {% data variables.product.prodname_team %}。'
+title: Apply to GitHub Global Campus as a teacher
+intro: 'If you''re a teacher, you can apply to join {% data variables.product.prodname_global_campus %} and receive access to the resources and benefits of {% data variables.product.prodname_education %}.'
redirect_from:
- /education/teach-and-learn-with-github-education/apply-for-an-educator-or-researcher-discount
- /github/teaching-and-learning-with-github-education/applying-for-an-educator-or-researcher-discount
@@ -10,12 +10,13 @@ redirect_from:
- /articles/applying-for-a-discount-for-your-first-robotics-team
- /articles/applying-for-an-educator-or-researcher-discount
- /education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-an-educator-or-researcher-discount
+ - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research/apply-for-an-educator-or-researcher-discount
versions:
fpt: '*'
-shortTitle: 申请折扣
+shortTitle: Apply to Global Campus
---
-## 关于教育者和研究人员折扣
+## About teacher discounts
{% data reusables.education.about-github-education-link %}
@@ -23,7 +24,7 @@ shortTitle: 申请折扣
有关在 {% data variables.product.product_name %} 上创建个人帐户的更多信息，请参阅“[注册新 {% data variables.product.prodname_dotcom %} 帐户](/github/getting-started-with-github/signing-up-for-a-new-github-account)”。
-## 申请教育者或研究人员折扣
+## Applying to {% data variables.product.prodname_global_campus %}
{% data reusables.education.benefits-page %}
{% data reusables.education.click-get-teacher-benefits %}
@@ -35,7 +36,7 @@ shortTitle: 申请折扣
## 延伸阅读
-- "[为什么我的教育者或研究人员折扣申请未获得批准？](/articles/why-wasn-t-my-application-for-an-educator-or-researcher-discount-approved)"
+- "[Why wasn't my application to Global Campus for teachers approved?](/articles/why-wasn-t-my-application-for-an-educator-or-researcher-discount-approved)"
- [{% data variables.product.prodname_education %}](https://education.github.com)
- [{% data variables.product.prodname_classroom %} 视频](https://classroom.github.com/videos)
- [{% data variables.product.prodname_education_community %}]({% data variables.product.prodname_education_forum_link %})
diff --git a/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/index.md b/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/index.md
new file mode 100644
index 0000000000..42da07148b
--- /dev/null
+++ b/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/index.md
@@ -0,0 +1,17 @@
+---
+title: GitHub Global Campus for teachers
+intro: 'As a teacher, use {% data variables.product.prodname_dotcom %} to collaborate on your work in a classroom, student or research group, and more.'
+redirect_from:
+ - /education/teach-and-learn-with-github-education/use-github-in-your-classroom-and-research
+ - /github/teaching-and-learning-with-github-education/using-github-in-your-classroom-and-research
+ - /articles/using-github-in-your-classroom-and-research
+ - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research
+versions:
+ fpt: '*'
+children:
+ - /about-github-global-campus-for-teachers
+ - /apply-to-github-global-campus-as-a-teacher
+ - why-wasnt-my-application-to-global-campus-for-teachers-approved
+shortTitle: 'About Global Campus for teachers'
+---
+
diff --git a/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research/why-wasnt-my-application-for-an-educator-or-researcher-discount-approved.md b/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/why-wasnt-my-application-to-global-campus-for-teachers-approved.md
similarity index 66%
rename from translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research/why-wasnt-my-application-for-an-educator-or-researcher-discount-approved.md
rename to translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/why-wasnt-my-application-to-global-campus-for-teachers-approved.md
index b6813bc64b..bdc322c3e8 100644
--- a/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research/why-wasnt-my-application-for-an-educator-or-researcher-discount-approved.md
+++ b/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/why-wasnt-my-application-to-global-campus-for-teachers-approved.md
@@ -1,6 +1,6 @@
---
-title: 为什么我的教育工作者或研究人员折扣申请未获得批准？
-intro: 查看申请教育工作者或研究人员折扣未获批准的常见原因，并了解成功重新申请的窍门。
+title: Why wasn't my application to Global Campus for teachers approved?
+intro: 'Review common reasons that applications for {% data variables.product.prodname_global_campus %} are not approved and learn tips for reapplying successfully.'
redirect_from:
- /education/teach-and-learn-with-github-education/why-wasnt-my-application-for-an-educator-or-researcher-discount-approved
- /github/teaching-and-learning-with-github-education/why-wasnt-my-application-for-an-educator-or-researcher-discount-approved
@@ -8,6 +8,7 @@ redirect_from:
- /articles/why-wasn-t-my-application-for-an-educator-or-researcher-discount-approved
- /articles/why-wasnt-my-application-for-an-educator-or-researcher-discount-approved
- /education/explore-the-benefits-of-teaching-and-learning-with-github-education/why-wasnt-my-application-for-an-educator-or-researcher-discount-approved
+ - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research/why-wasnt-my-application-for-an-educator-or-researcher-discount-approved
versions:
fpt: '*'
shortTitle: 申请未被批准
@@ -41,8 +42,8 @@ shortTitle: 申请未被批准
## 非学生申请学生开发包
-教育工作者或研究人员没有资格获得 [{% data variables.product.prodname_student_pack %}](https://education.github.com/pack)随附的合作伙伴优惠。 当您重新申请时，确保选择 **Faculty（教职工）**来描述您的学术地位。
+Teachers are not eligible for the partner offers that come with the [{% data variables.product.prodname_student_pack %}](https://education.github.com/pack). 当您重新申请时，确保选择 **Faculty（教职工）**来描述您的学术地位。
## 延伸阅读
-- “[申请教育工作者或研究人员折扣](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-an-educator-or-researcher-discount)”
+- "[Apply to {% data variables.product.prodname_global_campus %} as a teacher](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/apply-to-github-global-campus-as-a-teacher)"
diff --git a/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/index.md b/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/index.md
index b9c545bf34..4f13ba2d73 100644
--- a/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/index.md
+++ b/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/index.md
@@ -10,7 +10,7 @@ versions:
fpt: '*'
children:
- /use-github-at-your-educational-institution
- - /use-github-for-your-schoolwork
- - /use-github-in-your-classroom-and-research
+ - /github-global-campus-for-students
+ - /github-global-campus-for-teachers
---
diff --git a/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-at-your-educational-institution/about-campus-advisors.md b/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-at-your-educational-institution/about-campus-advisors.md
deleted file mode 100644
index 77e4c35b89..0000000000
--- a/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-at-your-educational-institution/about-campus-advisors.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-title: About Campus Advisors
-intro: 'As an instructor or mentor, learn to use {% data variables.product.prodname_dotcom %} at your school with Campus Advisors training and support.'
-redirect_from:
- - /education/teach-and-learn-with-github-education/about-campus-advisors
- - /github/teaching-and-learning-with-github-education/about-campus-advisors
- - /articles/about-campus-advisors
- - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-campus-advisors
-versions:
- fpt: '*'
----
-Professors, teachers and mentors can use the Campus Advisors online training to master Git and {% data variables.product.prodname_dotcom %} and learn best practices for teaching students with {% data variables.product.prodname_dotcom %}. For more information, see "[Campus Advisors](https://education.github.com/teachers/advisors)."
-
-{% note %}
-
-**Note:** As an instructor, you can't create accounts on {% data variables.product.product_location %} for your students. Students must create their own accounts on {% data variables.product.product_location %}.
-
-{% endnote %}
-
-Teachers can manage a course on software development with {% data variables.product.prodname_education %}. {% data variables.product.prodname_classroom %} allows you to distribute code, provide feedback, and manage coursework using {% data variables.product.product_name %}. For more information, see "[Manage coursework with {% data variables.product.prodname_classroom %}](/education/manage-coursework-with-github-classroom)."
-
-If you're a student or academic faculty and your school isn't partnered with {% data variables.product.prodname_dotcom %} as a {% data variables.product.prodname_campus_program %} school, then you can still individually apply for discounts to use {% data variables.product.prodname_dotcom %}. For more information, see "[Use {% data variables.product.prodname_dotcom %} for your schoolwork](/education/teach-and-learn-with-github-education/use-github-for-your-schoolwork)" or "[Use {% data variables.product.prodname_dotcom %} in your classroom and research](/education/teach-and-learn-with-github-education/use-github-in-your-classroom-and-research/)."
diff --git a/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-at-your-educational-institution/about-campus-experts.md b/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-at-your-educational-institution/about-campus-experts.md
index c4fad99038..61cb157840 100644
--- a/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-at-your-educational-institution/about-campus-experts.md
+++ b/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-at-your-educational-institution/about-campus-experts.md
@@ -12,4 +12,4 @@ versions:
作为 {% data variables.product.prodname_dotcom %} Campus Expert，学习公共演讲技能、技术写作、社区领导和软件开发技能。
-要详细了解学生领导者和教师的培训计划，请参阅 "[{% data variables.product.prodname_dotcom %} Campus Experts](https://education.github.com/students/experts)" 和 "[Campus Advisors](https://education.github.com/teachers/advisors)"。
+To learn more about training programs for student leaders, see "[{% data variables.product.prodname_dotcom %} Campus Experts](https://education.github.com/students/experts)."
diff --git a/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-at-your-educational-institution/about-github-campus-program.md b/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-at-your-educational-institution/about-github-campus-program.md
index a1d9f936f4..4787d4f333 100644
--- a/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-at-your-educational-institution/about-github-campus-program.md
+++ b/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-at-your-educational-institution/about-github-campus-program.md
@@ -7,6 +7,7 @@ redirect_from:
- /articles/about-github-education
- /education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-github-education
- /education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-github-campus-program
+ - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-at-your-educational-institution/about-campus-advisors
versions:
fpt: '*'
shortTitle: GitHub Campus Program
@@ -15,7 +16,7 @@ shortTitle: GitHub Campus Program
- No-cost access to {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %} for all of your technical and academic departments
- 50,000 {% data variables.product.prodname_actions %} minutes and 50 GB {% data variables.product.prodname_registry %} storage
-- Teacher training to master Git and {% data variables.product.prodname_dotcom %} with our [Campus Advisor program](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-campus-advisors)
+- Teacher training to master Git and {% data variables.product.prodname_dotcom %}
- Exclusive access to new features, GitHub Education-specific swag, and free developer tools from {% data variables.product.prodname_dotcom %} partners
- Automated access to premium {% data variables.product.prodname_education %} features, like the {% data variables.product.prodname_student_pack %}
diff --git a/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-at-your-educational-institution/index.md b/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-at-your-educational-institution/index.md
index e8ce38a6ac..206004a52a 100644
--- a/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-at-your-educational-institution/index.md
+++ b/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-at-your-educational-institution/index.md
@@ -10,7 +10,6 @@ versions:
children:
- /about-github-campus-program
- /about-campus-experts
- - /about-campus-advisors
shortTitle: At your institution
---
diff --git a/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/about-github-education-for-students.md b/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/about-github-education-for-students.md
deleted file mode 100644
index a23bf548a8..0000000000
--- a/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/about-github-education-for-students.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-title: 关于学生版 GitHub Education
-intro: '{% data variables.product.prodname_education %} 让学生免费使用 {% data variables.product.prodname_dotcom %} 合作伙伴的各种开发工具，为他们提供真实的体验。'
-redirect_from:
- - /education/teach-and-learn-with-github-education/about-github-education-for-students
- - /github/teaching-and-learning-with-github-education/about-github-education-for-students
- - /articles/about-github-education-for-students
- - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-github-education-for-students
-versions:
- fpt: '*'
-shortTitle: 适合学生
----
-
-{% data reusables.education.about-github-education-link %}
-
-将 {% data variables.product.prodname_dotcom %} 用于学校项目是一种与别人协作的实用方式，可创建展示真实世界的作品集。
-
-拥有 {% data variables.product.prodname_dotcom %} 帐户的每个人都可通过 {% data variables.product.prodname_free_user %} 在无限的公共和私有仓库中协作。 作为学生，您还可以申请 GitHub 学生福利。 更多信息请参阅“[申请学生开发包](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-a-student-developer-pack)”和 [{% data variables.product.prodname_education %}](https://education.github.com/)。
-
-如果您是 FIRST 机器人俱乐部的成员，您的辅导员可以申请教育者折扣，这样您的团队可以免费使用 {% data variables.product.prodname_team %}（允许无限的用户和私有仓库） 进行协作。 更多信息请参阅“[申请教育者或研究人员折扣](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-an-educator-or-researcher-discount)”。
-
-## 延伸阅读
-
-- "[关于教育者和研究人员版 {% data variables.product.prodname_education %}](/articles/about-github-education-for-educators-and-researchers)"
-- "[关于 {% data variables.product.prodname_community_exchange %}](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/about-github-community-exchange)"
diff --git a/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research/about-github-education-for-educators-and-researchers.md b/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research/about-github-education-for-educators-and-researchers.md
deleted file mode 100644
index deac027e8f..0000000000
--- a/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research/about-github-education-for-educators-and-researchers.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-title: 关于适用于教育者和研究人员的 GitHub Education
-intro: '{% data variables.product.prodname_education %} 提供各种工具帮助教育者和研究人员在课堂内外更有效地工作。'
-redirect_from:
- - /education/teach-and-learn-with-github-education/about-github-education-for-educators-and-researchers
- - /github/teaching-and-learning-with-github-education/about-github-education-for-educators-and-researchers
- - /articles/about-github-education-for-educators-and-researchers
- - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-github-education-for-educators-and-researchers
-versions:
- fpt: '*'
-shortTitle: 教育工作者和研究人员
----
-
-{% data reusables.education.about-github-education-link %}
-
-## 适用于教育者的 {% data variables.product.prodname_education %}
-
-利用 {% data variables.product.prodname_education %} 适用于各级教育者的工具和服务，您可以：
- - 使用 [{% data variables.product.prodname_classroom %}](https://classroom.github.com) 分发代码、向学生提供反馈以及收集 {% data variables.product.prodname_dotcom %} 中的作业。
- - 加入我们的 [{% data variables.product.prodname_education_community %}](https://github.com/orgs/community/discussions/categories/github-education)，以与全球各地的同行讨论技术教育的当前趋势。
- - [申请 {% data variables.product.prodname_dotcom %} swag 包](https://github.com/orgs/community/discussions/13)，其中包括学生用教育资料和重要工具。
- {% data reusables.education.apply-for-team %}
-
-## 适用于研究人员的 {% data variables.product.prodname_education %}
-
-利用 {% data variables.product.prodname_education %} 适用于研究人员的工具和服务，您可以：
- - 在 {% data variables.product.prodname_dotcom %} 上与世界各地的其他人协作处理研究工作。
- - [了解](https://education.github.com/stories)全球各地的学术机构如何使用 {% data variables.product.prodname_dotcom %} 进行研究。
- {% data reusables.education.apply-for-team %}
-
-## 延伸阅读
-
-- "[关于学生版 {% data variables.product.prodname_education %}](/articles/about-github-education-for-students)"
diff --git a/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research/index.md b/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research/index.md
deleted file mode 100644
index 08b99ae749..0000000000
--- a/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research/index.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-title: 在课堂上和研究中使用 GitHub
-intro: '作为教育工作者或研究人员，使用 {% data variables.product.prodname_dotcom %} 在课堂上、学生或研究小组中协作完成您的工作等等。'
-redirect_from:
- - /education/teach-and-learn-with-github-education/use-github-in-your-classroom-and-research
- - /github/teaching-and-learning-with-github-education/using-github-in-your-classroom-and-research
- - /articles/using-github-in-your-classroom-and-research
-versions:
- fpt: '*'
-children:
- - /about-github-education-for-educators-and-researchers
- - /apply-for-an-educator-or-researcher-discount
- - /why-wasnt-my-application-for-an-educator-or-researcher-discount-approved
-shortTitle: 课堂和研究
----
-
diff --git a/translations/zh-CN/content/education/guides.md b/translations/zh-CN/content/education/guides.md
index 63bc62061e..a680f9db5a 100644
--- a/translations/zh-CN/content/education/guides.md
+++ b/translations/zh-CN/content/education/guides.md
@@ -13,14 +13,15 @@ shortTitle: 指南
- [注册新 {% data variables.product.prodname_dotcom %} 帐户](/github/getting-started-with-github/signing-up-for-a-new-github-account)
- [Git 和 {% data variables.product.prodname_dotcom %} 快速入门 ](/github/getting-started-with-github/quickstart)
-- [关于学生版 GitHub Education](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/about-github-education-for-students)
-- [申请教育者或研究人员折扣](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-an-educator-or-researcher-discount)
-- [申请学生开发包](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-a-student-developer-pack)
+- [About {% data variables.product.prodname_global_campus %} for students](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/about-github-global-campus-for-students)
+- [Apply to {% data variables.product.prodname_global_campus %} as a teacher](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/apply-to-github-global-campus-as-a-teacher)
+- [Apply to {% data variables.product.prodname_global_campus %} as a student](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/apply-to-github-global-campus-as-a-student)
## 使用 {% data variables.product.company_short %} 运行软件开发课程
使用 {% data variables.product.prodname_classroom %} 管理课堂，分配和检查学生的工作，并且教授新一代软件开发人员。
+- [About {% data variables.product.prodname_global_campus %} for teachers](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/about-github-global-campus-for-teachers)
- [设置 {% data variables.product.prodname_classroom %} 的基本知识 ](/education/manage-coursework-with-github-classroom/basics-of-setting-up-github-classroom)
- [管理教室](/education/manage-coursework-with-github-classroom/manage-classrooms)
- [使用 Git 和 {% data variables.product.company_short %} 起始作业](/education/manage-coursework-with-github-classroom/use-the-git-and-github-starter-assignment)
@@ -35,7 +36,7 @@ shortTitle: 指南
将 {% data variables.product.prodname_dotcom %} 并入您的教育，并使用与专业人士相同的工具。
- [Git 和 {% data variables.product.prodname_dotcom %} 学习资源](/github/getting-started-with-github/git-and-github-learning-resources)
-- [使用 {% data variables.product.prodname_dotcom %} 做功课](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork)
+- [{% data variables.product.prodname_global_campus %} for students](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students)
- [试用 {% data variables.product.prodname_desktop %}](/desktop)
- [试用 {% data variables.product.prodname_cli %}](/github/getting-started-with-github/github-cli)
@@ -44,7 +45,6 @@ shortTitle: 指南
参与社区，从 {% data variables.product.company_short %} 获得培训，并学习或教授新技能。
- [{% data variables.product.prodname_education_community %}]({% data variables.product.prodname_education_forum_link %})
+- [About {% data variables.product.prodname_global_campus %} for students](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/about-github-global-campus-for-students)
- [关于 Campus Experts](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-campus-experts)
-- [关于 Campus Advisors](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-campus-advisors)
-- [关于 {% data variables.product.prodname_community_exchange %}](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/about-github-community-exchange)
- [Contribute with GitHub Community Exchange](/education/contribute-with-github-community-exchange)
diff --git a/translations/zh-CN/content/education/index.md b/translations/zh-CN/content/education/index.md
index 3edc040eb7..657978ddd3 100644
--- a/translations/zh-CN/content/education/index.md
+++ b/translations/zh-CN/content/education/index.md
@@ -6,16 +6,16 @@ introLinks:
quickstart: /education/quickstart
featuredLinks:
guides:
- - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-a-student-developer-pack
- - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-an-educator-or-researcher-discount
+ - education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/apply-to-github-global-campus-as-a-student
+ - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/apply-to-github-global-campus-as-a-teacher
- /education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-at-your-educational-institution
guideCards:
- /github/getting-started-with-github/signing-up-for-a-new-github-account
- /github/getting-started-with-github/git-and-github-learning-resources
- /education/manage-coursework-with-github-classroom/basics-of-setting-up-github-classroom
popular:
- - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork
- - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research
+ - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students
+ - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers
- /desktop
- /github/getting-started-with-github/github-cli
- /education/manage-coursework-with-github-classroom/teach-with-github-classroom
diff --git a/translations/zh-CN/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/using-github-codespaces-with-github-classroom.md b/translations/zh-CN/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/using-github-codespaces-with-github-classroom.md
index 1f3cd3f358..e988487bc2 100644
--- a/translations/zh-CN/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/using-github-codespaces-with-github-classroom.md
+++ b/translations/zh-CN/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/using-github-codespaces-with-github-classroom.md
@@ -29,7 +29,7 @@ The {% data variables.product.prodname_codespaces %} Education benefit gives ver
{% data reusables.classroom.free-limited-codespaces-for-verified-teachers-beta-note %}
-To become a verified teacher, you need to be approved for an educator or teacher benefit. For more information, see "[Applying for an educator or teacher benefit](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research/apply-for-an-educator-or-researcher-discount#applying-for-an-educator-or-researcher-discount)."
+To become a verified teacher, you need to be approved for an educator or teacher benefit. For more information, see "[Apply to {% data variables.product.prodname_global_campus %} as a teacher](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/apply-to-github-global-campus-as-a-teacher)."
After you have confirmation that you are a verified teacher, visit [{% data variables.product.prodname_global_campus %} for Teachers](https://education.github.com/globalcampus/teacher) to upgrade the organization to GitHub Team. For more information, see [GitHub's products](/get-started/learning-about-github/githubs-products#github-team).
diff --git a/translations/zh-CN/content/education/manage-coursework-with-github-classroom/teach-with-github-classroom/create-a-group-assignment.md b/translations/zh-CN/content/education/manage-coursework-with-github-classroom/teach-with-github-classroom/create-a-group-assignment.md
index 338effce51..01287f5260 100644
--- a/translations/zh-CN/content/education/manage-coursework-with-github-classroom/teach-with-github-classroom/create-a-group-assignment.md
+++ b/translations/zh-CN/content/education/manage-coursework-with-github-classroom/teach-with-github-classroom/create-a-group-assignment.md
@@ -151,6 +151,6 @@ redirect_from:
## 延伸阅读
-- "[在课堂和研究中使用 {% data variables.product.prodname_dotcom %}](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research)"
+- [{% data variables.product.prodname_global_campus %} for teachers](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers)
- "[将学习管理系统连接到 {% data variables.product.prodname_classroom %}](/education/manage-coursework-with-github-classroom/connect-a-learning-management-system-to-github-classroom)"
- {% data variables.product.prodname_education %} 社区中的[在小组作业中使用现有团队吗？](https://education.github.community/t/using-existing-teams-in-group-assignments/6999)
diff --git a/translations/zh-CN/content/education/manage-coursework-with-github-classroom/teach-with-github-classroom/create-an-individual-assignment.md b/translations/zh-CN/content/education/manage-coursework-with-github-classroom/teach-with-github-classroom/create-an-individual-assignment.md
index 0602d2c15c..2345dd78f6 100644
--- a/translations/zh-CN/content/education/manage-coursework-with-github-classroom/teach-with-github-classroom/create-an-individual-assignment.md
+++ b/translations/zh-CN/content/education/manage-coursework-with-github-classroom/teach-with-github-classroom/create-an-individual-assignment.md
@@ -130,5 +130,5 @@ shortTitle: 个人作业
## 延伸阅读
-- "[在课堂和研究中使用 {% data variables.product.prodname_dotcom %}](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research)"
+- "[{% data variables.product.prodname_global_campus %} for teachers](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers)"
- "[将学习管理系统连接到 {% data variables.product.prodname_classroom %}](/education/manage-coursework-with-github-classroom/connect-a-learning-management-system-to-github-classroom)"
diff --git a/translations/zh-CN/content/education/manage-coursework-with-github-classroom/teach-with-github-classroom/use-the-git-and-github-starter-assignment.md b/translations/zh-CN/content/education/manage-coursework-with-github-classroom/teach-with-github-classroom/use-the-git-and-github-starter-assignment.md
index 946ad7257e..60b0a77dd9 100644
--- a/translations/zh-CN/content/education/manage-coursework-with-github-classroom/teach-with-github-classroom/use-the-git-and-github-starter-assignment.md
+++ b/translations/zh-CN/content/education/manage-coursework-with-github-classroom/teach-with-github-classroom/use-the-git-and-github-starter-assignment.md
@@ -100,5 +100,5 @@ Git 和 {% data variables.product.company_short %} 起始作业只适用于个
## 延伸阅读
-- "[在课堂和研究中使用 {% data variables.product.prodname_dotcom %}](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research)"
+- "[{% data variables.product.prodname_global_campus %} for teachers](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers)"
- "[将学习管理系统连接到 {% data variables.product.prodname_classroom %}](/education/manage-coursework-with-github-classroom/connect-a-learning-management-system-to-github-classroom)"
diff --git a/translations/zh-CN/content/education/quickstart.md b/translations/zh-CN/content/education/quickstart.md
index 8eede3c2a5..db3ad537be 100644
--- a/translations/zh-CN/content/education/quickstart.md
+++ b/translations/zh-CN/content/education/quickstart.md
@@ -15,7 +15,7 @@ shortTitle: 快速入门
{% tip %}
-**提示**：如果您是学生，想利用学术折扣，请参阅“[申请学生开发包](/github/teaching-and-learning-with-github-education/applying-for-a-student-developer-pack)”。
+**Tip**: If you're a student and you'd like to take advantage of an academic discount, see "[Apply to {% data variables.product.prodname_global_campus %} as a student](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/apply-to-github-global-campus-as-a-student)."
{% endtip %}
@@ -35,9 +35,9 @@ shortTitle: 快速入门
更多信息请参阅“[{% data variables.product.prodname_dotcom %} 帐户的类型](/github/getting-started-with-github/types-of-github-accounts)”。
-## 申请教育者折扣
+## Applying for teacher benefits
-接下来，您将注册从 {% data variables.product.company_short %} 获得服务折扣。 {% data reusables.education.educator-requirements %}
+Next, you'll sign up for teacher benefits and resources from {% data variables.product.company_short %} by applying to {% data variables.product.prodname_global_campus %}, a portal that allows you to access your education benefits all in one place. {% data reusables.education.educator-requirements %}
{% tip %}
@@ -53,6 +53,8 @@ shortTitle: 快速入门
{% data reusables.education.plan-to-use-github %}
{% data reusables.education.submit-application %}
+Once you are a verified {% data variables.product.prodname_global_campus %} educator, you can access {% data variables.product.prodname_global_campus %} anytime by going to the [{% data variables.product.prodname_education %} website](https://education.github.com).
+
## 设置 {% data variables.product.prodname_classroom %}
通过个人帐户和组织帐户便可开始使用 {% data variables.product.prodname_classroom %}。 {% data variables.product.prodname_classroom %} 免费使用。 您可以跟踪和管理作业，自动对工作进行评分，并为学生提供反馈。
diff --git a/translations/zh-CN/content/get-started/index.md b/translations/zh-CN/content/get-started/index.md
index 3ea2dcc101..4dd808b97c 100644
--- a/translations/zh-CN/content/get-started/index.md
+++ b/translations/zh-CN/content/get-started/index.md
@@ -27,7 +27,6 @@ introLinks:
featuredLinks:
guides:
- /github/getting-started-with-github/githubs-products
- - /github/getting-started-with-github/create-a-repo
- /get-started/onboarding/getting-started-with-your-github-account
- /get-started/onboarding/getting-started-with-github-team
- /get-started/onboarding/getting-started-with-github-enterprise-cloud
@@ -39,9 +38,7 @@ featuredLinks:
- /github/getting-started-with-github/set-up-git
- /get-started/learning-about-github/about-versions-of-github-docs
- /github/getting-started-with-github/github-glossary
- - /github/getting-started-with-github/fork-a-repo
- /github/getting-started-with-github/keyboard-shortcuts
- - /github/getting-started-with-github/saving-repositories-with-stars
guideCards:
- /github/getting-started-with-github/types-of-github-accounts
- /github/getting-started-with-github/finding-ways-to-contribute-to-open-source-on-github
diff --git a/translations/zh-CN/content/issues/organizing-your-work-with-project-boards/managing-project-boards/about-project-boards.md b/translations/zh-CN/content/issues/organizing-your-work-with-project-boards/managing-project-boards/about-project-boards.md
index 897b5e045c..6ab2fcc1b5 100644
--- a/translations/zh-CN/content/issues/organizing-your-work-with-project-boards/managing-project-boards/about-project-boards.md
+++ b/translations/zh-CN/content/issues/organizing-your-work-with-project-boards/managing-project-boards/about-project-boards.md
@@ -31,6 +31,8 @@ You can create notes within columns to serve as task reminders, references to is
To create a {% data variables.projects.projects_v1_board %} for your organization, you must be an organization member. Organization owners and people with {% data variables.projects.projects_v1_board %} admin permissions can customize access to the {% data variables.projects.projects_v1_board %}.
+{% ifversion classic-project-visibility-permissions %}{% data reusables.projects.owners-can-limit-visibility-permissions %}{% endif %}
+
If an organization-owned {% data variables.projects.projects_v1_board %} includes issues or pull requests from a repository that you don't have permission to view, the card will be redacted. For more information, see "[{% data variables.product.prodname_project_v1_caps %} permissions for an organization](/articles/project-board-permissions-for-an-organization)."
The activity view shows the {% data variables.projects.projects_v1_board %}'s recent history, such as cards someone created or moved between columns. 要访问活动视图，请单击 **Menu（菜单）**并向下滚动。
diff --git a/translations/zh-CN/content/issues/organizing-your-work-with-project-boards/managing-project-boards/changing-project-board-visibility.md b/translations/zh-CN/content/issues/organizing-your-work-with-project-boards/managing-project-boards/changing-project-board-visibility.md
index 30d17cbc37..05f3961ccd 100644
--- a/translations/zh-CN/content/issues/organizing-your-work-with-project-boards/managing-project-boards/changing-project-board-visibility.md
+++ b/translations/zh-CN/content/issues/organizing-your-work-with-project-boards/managing-project-boards/changing-project-board-visibility.md
@@ -17,11 +17,14 @@ allowTitleToDifferFromFilename: true
{% data reusables.project-management.project-board-visibility %}
-{% tip %}
+{% note %}
-**Tip:** When you make your {% data variables.projects.projects_v1_board %} {% ifversion ghae %}internal{% else %}public{% endif %}, organization members are given read access by default. You can give specific organization members write or admin permissions by giving access to teams they're on or by adding them to the {% data variables.projects.projects_v1_board %} as a collaborator. For more information, see "[{% data variables.product.prodname_project_v1_caps %} permissions for an organization](/articles/project-board-permissions-for-an-organization)."
+**{% ifversion classic-project-visibility-permissions %}Notes{% else %}Note{% endif %}:** {% ifversion classic-project-visibility-permissions %}
-{% endtip %}
+* {% data reusables.projects.owners-can-limit-visibility-permissions %}
+* {% endif %}When you make your {% data variables.projects.projects_v1_board %} {% ifversion ghae %}internal{% else %}public{% endif %}, organization members are given read access by default. You can give specific organization members write or admin permissions by giving access to teams they're on or by adding them to the {% data variables.projects.projects_v1_board %} as a collaborator. For more information, see "[{% data variables.product.prodname_project_v1_caps %} permissions for an organization](/articles/project-board-permissions-for-an-organization)."
+
+{% endnote %}
1. 导航到您要设为{% ifversion ghae %}内部{% else %}公共{% endif %}或私有的项目板。
{% data reusables.project-management.click-menu %}
diff --git a/translations/zh-CN/content/issues/organizing-your-work-with-project-boards/managing-project-boards/creating-a-project-board.md b/translations/zh-CN/content/issues/organizing-your-work-with-project-boards/managing-project-boards/creating-a-project-board.md
index b732c6dd62..1c4465f6b9 100644
--- a/translations/zh-CN/content/issues/organizing-your-work-with-project-boards/managing-project-boards/creating-a-project-board.md
+++ b/translations/zh-CN/content/issues/organizing-your-work-with-project-boards/managing-project-boards/creating-a-project-board.md
@@ -57,6 +57,14 @@ You can also configure workflow automations to keep your {% data variables.proje
{% data reusables.projects.classic-project-creation %}
+{% ifversion classic-project-visibility-permissions %}
+{% note %}
+
+**注意：**{% data reusables.projects.owners-can-limit-visibility-permissions %}
+
+{% endnote %}
+{% endif %}
+
{% data reusables.profile.access_org %}
{% data reusables.user-settings.access_org %}
{% data reusables.organizations.organization-wide-project %}{% ifversion projects-v2 %}
diff --git a/translations/zh-CN/content/issues/planning-and-tracking-with-projects/automating-your-project/using-the-api-to-manage-projects.md b/translations/zh-CN/content/issues/planning-and-tracking-with-projects/automating-your-project/using-the-api-to-manage-projects.md
index f97ebd9d34..cbe09228de 100644
--- a/translations/zh-CN/content/issues/planning-and-tracking-with-projects/automating-your-project/using-the-api-to-manage-projects.md
+++ b/translations/zh-CN/content/issues/planning-and-tracking-with-projects/automating-your-project/using-the-api-to-manage-projects.md
@@ -305,7 +305,7 @@ gh api graphql -f query='
}
}
}
-}
+}'
```
{% endcli %}
diff --git a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-project-boards/project-board-permissions-for-an-organization.md b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-project-boards/project-board-permissions-for-an-organization.md
index 51048f632d..ef9c1e961b 100644
--- a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-project-boards/project-board-permissions-for-an-organization.md
+++ b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-project-boards/project-board-permissions-for-an-organization.md
@@ -39,6 +39,8 @@ For example, if an organization owner has given all organization members read pe
## {% data variables.projects.projects_v1_board_caps %} visibility
+{% ifversion classic-project-visibility-permissions %}{% data reusables.projects.owners-can-limit-visibility-permissions %}{% endif %}
+
{% data reusables.project-management.project-board-visibility %} You can change the {% data variables.projects.projects_v1_board %}'s visibility from private to {% ifversion ghae %}internal{% else %}public{% endif %} and back again. For more information, see "[Changing {% data variables.product.prodname_project_v1 %} visibility](/articles/changing-project-board-visibility)."
## 延伸阅读
diff --git a/translations/zh-CN/content/organizations/managing-organization-settings/allowing-project-visibility-changes-in-your-organization.md b/translations/zh-CN/content/organizations/managing-organization-settings/allowing-project-visibility-changes-in-your-organization.md
index 1051ed7c4b..d477b805e5 100644
--- a/translations/zh-CN/content/organizations/managing-organization-settings/allowing-project-visibility-changes-in-your-organization.md
+++ b/translations/zh-CN/content/organizations/managing-organization-settings/allowing-project-visibility-changes-in-your-organization.md
@@ -1,19 +1,19 @@
---
title: Allowing project visibility changes in your organization
-intro: Organization owners can allow members with admin permissions to adjust the visibility of projects in their organization.
+intro: 'Organization owners can allow members with admin permissions to adjust the visibility of {% data variables.projects.projects_v2_and_v1 %} in their organization.'
versions:
- feature: projects-v2
+ feature: classic-project-visibility-permissions-or-projects-v2
topics:
- Organizations
- Projects
shortTitle: Project visibility permissions
allowTitleToDifferFromFilename: true
-permissions: Organization owners can allow project visibility changes for an organization.
+permissions: 'Organization owners can allow {% data variables.projects.project_v2_and_v1 %} visibility changes for an organization.'
---
-You can restrict who has the ability to change the visibility of projects in your organization, such as restricting members from changing a project from private to public.
+You can restrict who has the ability to change the visibility of {% data variables.projects.projects_v2_and_v1 %} in your organization, such as restricting members from changing {% data variables.projects.projects_v2_and_v1 %} from private to public.
-You can limit the ability to change project visibility to just organization owners, or you can allow anyone with admin permissions on a project to change the visibility.
+You can limit the ability to change {% data variables.projects.project_v2_and_v1 %} visibility to just organization owners, or you can allow anyone granted admin permissions to change the visibility.
{% data reusables.profile.access_org %}
{% data reusables.profile.org_settings %}
@@ -23,4 +23,8 @@ You can limit the ability to change project visibility to just organization owne
## 延伸阅读
-- "[Managing visibility of your projects](/issues/planning-and-tracking-with-projects/managing-your-project/managing-visibility-of-your-projects)"
+{% ifversion projects-v2 %}
+- "[Managing visibility of your {% data variables.projects.projects_v2 %}](/issues/planning-and-tracking-with-projects/managing-your-project/managing-visibility-of-your-projects)"
+{%- endif %}{%- ifversion projects-v1 %}
+- "[Changing {% data variables.product.prodname_project_v1 %} visibility](/issues/organizing-your-work-with-project-boards/managing-project-boards/changing-project-board-visibility)"
+{% endif %}
diff --git a/translations/zh-CN/content/packages/working-with-a-github-packages-registry/working-with-the-nuget-registry.md b/translations/zh-CN/content/packages/working-with-a-github-packages-registry/working-with-the-nuget-registry.md
index b71c23c9b7..fc4326ab48 100644
--- a/translations/zh-CN/content/packages/working-with-a-github-packages-registry/working-with-the-nuget-registry.md
+++ b/translations/zh-CN/content/packages/working-with-a-github-packages-registry/working-with-the-nuget-registry.md
@@ -232,6 +232,8 @@ Your NuGet package may fail to push if the `RepositoryUrl` in *.csproj* is not s
If you're using a nuspec file, ensure that it has a `repository` element with the required `type` and `url` attributes.
+If you're using a `GITHUB_TOKEN` to authenticate to a {% data variables.product.prodname_registry %} registry within a {% data variables.product.prodname_actions %} workflow, the token cannot access private repository-based packages in a different repository other than where the workflow is running in. To access packages associated with other repositories, instead generate a PAT with the `read:packages` scope and pass this token in as a secret.
+
## Further reading
- "[Deleting and restoring a package](/packages/learn-github-packages/deleting-and-restoring-a-package)"
diff --git a/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges.md b/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges.md
index 502bad4198..89b6da254e 100644
--- a/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges.md
+++ b/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges.md
@@ -16,22 +16,36 @@ topics:
- Pull requests
---
+## Merge your commits
+
{% data reusables.pull_requests.default_merge_option %}
-## 压缩与合并拉取请求提交
+## Squash and merge your commits
{% data reusables.pull_requests.squash_and_merge_summary %}
### 合并压缩合并的消息
+{% ifversion default-merge-squash-commit-message %}
+在压缩与合并时，{% data variables.product.prodname_dotcom %} 生成默认提交消息，您可以进行编辑。 Depending on how the repository is configured and the number of commits in the pull request, not including merge commits, this message may include the pull request title, pull request description, or information about the commits.
+{% else %}
在压缩与合并时，{% data variables.product.prodname_dotcom %} 生成默认提交消息，您可以进行编辑。 默认消息取决于拉取请求中的提交次数，不包括合并提交。
| 提交数 | 摘要 | 描述 |
| ---- | -------------------- | ------------------- |
| 一个提交 | 单个提交的提交消息标题，后接拉取请求编号 | 单个提交的提交消息正文 |
| 多个提交 | 拉取请求标题，后接拉取请求编号 | 按日期顺序列出所有被压缩提交的提交消息 |
+{% endif %}
-{% ifversion fpt or ghec or ghes > 3.5 or ghae-issue-7042 %}
+| 提交数 | 摘要 | 描述 |
+| ---- | -------------------- | ------------------- |
+| 一个提交 | 单个提交的提交消息标题，后接拉取请求编号 | 单个提交的提交消息正文 |
+| 多个提交 | 拉取请求标题，后接拉取请求编号 | 按日期顺序列出所有被压缩提交的提交消息 |
+
+{% ifversion default-merge-squash-commit-message %}
+People with maintainer or admin access to a repository can configure their repository's default merge message for all squashed commits to use the pull request title, the pull request title and commit details, or the pull request title and description. For more information, see "[Configure commit squashing](/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-squashing-for-pull-requests)".{% endif %}
+
+{% ifversion ghes = 3.6 %}
对存储库具有管理员访问权限的人员可以将存储库配置为使用拉取请求的标题作为所有压缩提交的默认合并消息。 更多信息请参阅“[配置提交压缩](/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-squashing-for-pull-requests)”。
{% endif %}
@@ -43,7 +57,7 @@ topics:
由于此提交仅位于基础分支而不是头部分支上，因此两个分支的共同原型保持不变。 如果您继续使用头部分支，则在两个分支之间创建新的拉取请求，该拉取请求将包含自共同原型以来的所有提交，其中包括你在之前的拉取请求中压缩与合并的提交。 如果没有冲突，您可以安全地合并这些提交。 但是，此工作流会增大合并冲突的可能性。 如果您继续压缩与合并长运行头部分支的拉取请求，则必须反复解决相同的冲突。
-## 变基与合并拉取请求提交
+## Rebase and merge your commits
{% data reusables.pull_requests.rebase_and_merge_summary %}
diff --git a/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/commenting-on-a-pull-request.md b/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/commenting-on-a-pull-request.md
index d222db51ef..ed02781fb6 100644
--- a/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/commenting-on-a-pull-request.md
+++ b/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/commenting-on-a-pull-request.md
@@ -27,7 +27,7 @@ shortTitle: 对 PR 的评论
也可以采用单独行注释的形式或者作为[拉取请求审查](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/about-pull-request-reviews)的一部分，在拉取请求的 **Files changed（已更改文件）**选项卡上对文件的特定部分做出评论。 添加行注释是讨论有关实现的问题或向作者提供反馈的好方法。
-有关向拉取请求审查添加行注释的更多信息，请参阅“[审查拉取请求中提议的更改](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request)”。
+For more information on adding line comments to a pull request review, see "[Reviewing proposed changes in a pull request](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request)."
{% note %}
diff --git a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-merging-for-pull-requests.md b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-merging-for-pull-requests.md
new file mode 100644
index 0000000000..311bc17a2b
--- /dev/null
+++ b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-merging-for-pull-requests.md
@@ -0,0 +1,30 @@
+---
+title: Configuring commit merging for pull requests
+intro: 'You can enforce, allow, or disable merging with a merge commit for all pull request merges on {% data variables.product.product_location %} in your repository.'
+versions:
+ fpt: '*'
+ ghes: '*'
+ ghae: '*'
+ ghec: '*'
+topics:
+ - Repositories
+shortTitle: Configure commit merging
+---
+
+{% data reusables.pull_requests.configure_pull_request_merges_intro %}
+
+{% data reusables.repositories.navigate-to-repo %}
+{% data reusables.repositories.sidebar-settings %}
+1. Under {% ifversion fpt or ghec or ghes > 3.5 or ghae-issue-6069 %}"Pull Requests"{% else %}"Merge button"{% endif %}, select **Allow merge commits**. This allows contributors to merge a pull request with a full history of commits.{% ifversion default-merge-squash-commit-message %} {% endif %}{% ifversion ghes = 3.6 %} {% endif %}
+{% ifversion ghes < 3.6 %}
+ {% endif %}
+{% ifversion default-merge-squash-commit-message %}
+1. Optionally, under **Allow merge commits**, use the dropdown to choose the format of the commit message presented to contributors when merging. The default message includes the pull request number and title. For example, `Merge pull request #123 from patch-1`. You can also choose to use just the pull request title, or the pull request title and description. 
+{% endif %}
+
+如果选择多种合并方法，则协作者可以选择在合并拉取请求时要使用的合并提交类型。 {% data reusables.repositories.squash-and-rebase-linear-commit-history %}
+
+## 延伸阅读
+
+- "[关于拉取请求合并](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges)"
+- "[合并拉取请求](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request)"
diff --git a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-rebasing-for-pull-requests.md b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-rebasing-for-pull-requests.md
index 0d21cedcf6..b20c2c6035 100644
--- a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-rebasing-for-pull-requests.md
+++ b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-rebasing-for-pull-requests.md
@@ -19,4 +19,10 @@ shortTitle: 配置提交变基
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.sidebar-settings %}
-3. 在 {% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-6069 %}“拉取请求”{% else %}“合并按钮”{% endif %} 下，选择 **Allow rebase merging（允许变基合并）**。 这将允许贡献者通过将其个人提交变基到基本分支来合并拉取请求。 如果您还选择了另一种合并方法，则贡献者在合并拉取请求时能够选择合并提交的类型。 {% data reusables.repositories.squash-and-rebase-linear-commit-hisitory %} 
+3. 在 {% ifversion fpt or ghec or ghes > 3.5 or ghae-issue-6069 %}“拉取请求”{% else %}“合并按钮”{% endif %} 下，选择 **Allow rebase merging（允许变基合并）**。 这将允许贡献者通过将其个人提交变基到基本分支来合并拉取请求。
+{% ifversion default-merge-squash-commit-message %}
+ {% endif %}{% ifversion ghes = 3.6 %} {% endif %}
+ {% ifversion ghes < 3.6 %}
+ {% endif %}
+
+如果您还选择了另一种合并方法，则贡献者在合并拉取请求时能够选择合并提交的类型。 {% data reusables.repositories.squash-and-rebase-linear-commit-history %}
diff --git a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-squashing-for-pull-requests.md b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-squashing-for-pull-requests.md
index 39c7f1ddfa..fc249bc3d2 100644
--- a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-squashing-for-pull-requests.md
+++ b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-squashing-for-pull-requests.md
@@ -21,11 +21,14 @@ shortTitle: 配置提交压缩
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.sidebar-settings %}
-3. 在 {% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-6069 %}"拉取请求"{% else %}"合并按钮"{% endif %} 下，可以选择 **Allow merge commits（允许合并提交）**。 这将允许贡献者合并具有完整提交历史记录的拉取请求。 
-4. 在 {% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-6069 %}“拉取请求”{% else %}“合并按钮”{% endif %} 下，选择 **Allow squash merging（允许压缩合并）**。 这将允许贡献者通过将所有提交压缩到单个提交中来合并拉取请求。 压缩消息如果包含多个提交，则自动默认为拉取请求的标题。 {% ifversion fpt or ghec or ghes > 3.5 or ghae-issue-7042 %}如果要将拉取请求的标题用作所有压缩提交的默认合并消息，而不考虑拉取请求中的提交次数，请选择 **Default to PR title for squash merge commits（默认为压缩合并提交的 PR 标题）**。 {% else %}
-{% endif %}
+1. 在 {% ifversion fpt or ghec or ghes > 3.5 or ghae-issue-6069 %}“拉取请求”{% else %}“合并按钮”{% endif %} 下，选择 **Allow squash merging（允许压缩合并）**。 这将允许贡献者通过将所有提交压缩到单个提交中来合并拉取请求。 The default commit message presented to contributors when merging is the commit title and message if the pull request contains only 1 commit, or the pull request title and list of commits if the pull request contains 2 or more commits. {% ifversion ghes = 3.6 %} To always use the title of the pull request regardless of the number of commits in the pull request select **Default to PR title for squash merge commits**.{% endif %}{% ifversion default-merge-squash-commit-message %} {% endif %}{% ifversion ghes = 3.6 %} {% endif %}
+{% ifversion ghes < 3.6 %}
+ {% endif %}
+{% ifversion default-merge-squash-commit-message %}
+1. Optionally, under **Allow squash merging**, use the dropdown to choose the format of the default squash commit message presented to contributors when merging. The default message uses the commit title and message if the pull request contains only 1 commit, or the pull request title and list of commits if the pull request contains 2 or more commits. You can also choose to use just the pull request title, the pull request title and commit details, or the pull request title and description. 
+{% endif %}
-如果选择多种合并方法，则协作者可以选择在合并拉取请求时要使用的合并提交类型。 {% data reusables.repositories.squash-and-rebase-linear-commit-hisitory %}
+如果选择多种合并方法，则协作者可以选择在合并拉取请求时要使用的合并提交类型。 {% data reusables.repositories.squash-and-rebase-linear-commit-history %}
## 延伸阅读
diff --git a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/index.md b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/index.md
index 410f9d8784..876d48968a 100644
--- a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/index.md
+++ b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/index.md
@@ -13,6 +13,7 @@ topics:
- Repositories
children:
- /about-merge-methods-on-github
+ - /configuring-commit-merging-for-pull-requests
- /configuring-commit-squashing-for-pull-requests
- /configuring-commit-rebasing-for-pull-requests
- /managing-a-merge-queue
diff --git a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-suggestions-to-update-pull-request-branches.md b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-suggestions-to-update-pull-request-branches.md
index de8777002b..fb080edb02 100644
--- a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-suggestions-to-update-pull-request-branches.md
+++ b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-suggestions-to-update-pull-request-branches.md
@@ -16,6 +16,8 @@ permissions: People with maintainer permissions can enable or disable the settin
如果启用该设置以始终建议更新存储库中的拉取请求分支，则当拉取请求的头部分支与基本分支不符时，具有写入权限的人员将始终能够在拉取请求页面上更新头部分支。 如果未启用，则仅当基本分支要求分支在合并之前保持最新并且分支不是最新时，才可以使用更新功能。 更多信息请参阅“[使拉取请求与基本分支保持同步](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/keeping-your-pull-request-in-sync-with-the-base-branch)”。
+{% data reusables.enterprise.3-5-missing-feature %}
+
## 管理更新请求分支的建议
{% data reusables.repositories.navigate-to-repo %}
diff --git a/translations/zh-CN/content/repositories/working-with-files/managing-files/adding-a-file-to-a-repository.md b/translations/zh-CN/content/repositories/working-with-files/managing-files/adding-a-file-to-a-repository.md
index 9650a6eb7a..01d4b38d56 100644
--- a/translations/zh-CN/content/repositories/working-with-files/managing-files/adding-a-file-to-a-repository.md
+++ b/translations/zh-CN/content/repositories/working-with-files/managing-files/adding-a-file-to-a-repository.md
@@ -9,6 +9,7 @@ redirect_from:
- /github/managing-files-in-a-repository/adding-a-file-to-a-repository-using-the-command-line
- /github/managing-files-in-a-repository/managing-files-on-github/adding-a-file-to-a-repository
- /github/managing-files-in-a-repository/managing-files-using-the-command-line/adding-a-file-to-a-repository-using-the-command-line
+ - /github/managing-large-files/about-large-files-on-github
versions:
fpt: '*'
ghes: '*'
@@ -21,7 +22,7 @@ shortTitle: 添加文件
## 将文件添加到 {% data variables.product.product_name %} 上的存储库
-通过浏览器添加到仓库的文件大小限于每个文件 {% data variables.large_files.max_github_browser_size %}。 较大的文件可通过命令行添加，最大每个 {% data variables.large_files.max_github_size %}。 更多信息请参阅“[使用命令行添加文件到仓库](#adding-a-file-to-a-repository-using-the-command-line)”。
+通过浏览器添加到仓库的文件大小限于每个文件 {% data variables.large_files.max_github_browser_size %}。 较大的文件可通过命令行添加，最大每个 {% data variables.large_files.max_github_size %}。 更多信息请参阅“[使用命令行添加文件到仓库](#adding-a-file-to-a-repository-using-the-command-line)”。 To add files larger than {% data variables.large_files.max_github_size %}, you must use {% data variables.large_files.product_name_long %}. For more information, see "[About large files on {% data variables.product.product_name %}](/repositories/working-with-files/managing-large-files/about-large-files-on-github)."
{% tip %}
diff --git a/translations/zh-CN/data/features/classic-project-visibility-permissions-or-projects-v2.yml b/translations/zh-CN/data/features/classic-project-visibility-permissions-or-projects-v2.yml
new file mode 100644
index 0000000000..cd0d1e5857
--- /dev/null
+++ b/translations/zh-CN/data/features/classic-project-visibility-permissions-or-projects-v2.yml
@@ -0,0 +1,7 @@
+#Issue 7720
+#Organization owners can restrict public classic projects /OR/ Projects V2
+versions:
+ fpt: '*'
+ ghec: '*'
+ ghes: '>3.6'
+ ghae: 'issue-7720'
diff --git a/translations/zh-CN/data/features/classic-project-visibility-permissions.yml b/translations/zh-CN/data/features/classic-project-visibility-permissions.yml
new file mode 100644
index 0000000000..fd04a9d07f
--- /dev/null
+++ b/translations/zh-CN/data/features/classic-project-visibility-permissions.yml
@@ -0,0 +1,7 @@
+#Issue 7720
+#Organization owners can restrict public classic projects.
+versions:
+ fpt: '*'
+ ghec: '*'
+ ghes: '>3.6'
+ ghae: 'issue-7720'
diff --git a/translations/zh-CN/data/features/default-merge-squash-commit-message.yml b/translations/zh-CN/data/features/default-merge-squash-commit-message.yml
new file mode 100644
index 0000000000..957b2f27ff
--- /dev/null
+++ b/translations/zh-CN/data/features/default-merge-squash-commit-message.yml
@@ -0,0 +1,7 @@
+#Reference: issue #7597
+#Admin can control default PR merge/ squash commit messages
+versions:
+ fpt: '*'
+ ghec: '*'
+ ghes: '>=3.7'
+ ghae: 'issue-7597'
diff --git a/translations/zh-CN/data/learning-tracks/code-security.yml b/translations/zh-CN/data/learning-tracks/code-security.yml
index 71900ecddf..cf4ce3b65f 100644
--- a/translations/zh-CN/data/learning-tracks/code-security.yml
+++ b/translations/zh-CN/data/learning-tracks/code-security.yml
@@ -61,6 +61,8 @@ secret_scanning:
- '{% ifversion not fpt %}/code-security/secret-scanning/defining-custom-patterns-for-secret-scanning{% endif %}'
- '{% ifversion not fpt %}/code-security/secret-scanning/managing-alerts-from-secret-scanning{% endif %}'
- '{% ifversion not fpt %}/code-security/secret-scanning/secret-scanning-patterns{% endif %}'
+ - '{% ifversion secret-scanning-push-protection %}/code-security/secret-scanning/protecting-pushes-with-secret-scanning{% endif %}'
+ - '{% ifversion secret-scanning-push-protection %}/code-security/secret-scanning/pushing-a-branch-blocked-by-push-protection{% endif %}'
#Security overview feature available in GHEC and GHES 3.2+, so other articles hidden to hide the learning path in other versions
security_alerts:
title: '探索和管理安全警报'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-2/0.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-2/0.yml
index 36f6c4c82c..ba34f7a61d 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-2/0.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/0.yml
@@ -273,6 +273,7 @@ sections:
- When "Users can search GitHub.com" is enabled with GitHub Connect, issues in private and internal repositories are not included in GitHub.com search results.
- The {% data variables.product.prodname_registry %} npm registry no longer returns a time value in metadata responses. This was done to allow for substantial performance improvements. We continue to have all the data necessary to return a time value as part of the metadata response and will resume returning this value in the future once we have solved the existing performance issues.
- Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
deprecations:
- heading: Deprecation of GitHub Enterprise Server 2.21
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-2/1.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-2/1.yml
index e2b03c3f3d..eb3fe6368d 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-2/1.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/1.yml
@@ -26,3 +26,4 @@ sections:
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后，私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分，我们继续拥有返回时间值所需的所有数据，并将在我们解决现有性能问题后恢复返回这个值。'
- 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-2/10.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-2/10.yml
index 4a9c0e730f..5013566901 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-2/10.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/10.yml
@@ -14,3 +14,4 @@ sections:
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后，私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分，我们继续拥有返回时间值所需的所有数据，并将在我们解决现有性能问题后恢复返回这个值。'
- 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-2/11.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-2/11.yml
index 6f72918717..54bd558fe3 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-2/11.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/11.yml
@@ -42,3 +42,4 @@ sections:
- 当“用户可以搜索 GitHub.com”与 {% data variables.product.prodname_github_connect %} 一起启用时，私有和内部存储库中的议题不会包含在 {% data variables.product.prodname_dotcom_the_website %} 搜索结果中。
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分，我们继续拥有返回时间值所需的所有数据，并将在我们解决现有性能问题后恢复返回这个值。'
- 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-2/12.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-2/12.yml
index 471d33f780..61e2d92238 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-2/12.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/12.yml
@@ -21,3 +21,4 @@ sections:
- When "Users can search GitHub.com" is enabled with {% data variables.product.prodname_github_connect %}, issues in private and internal repositories are not included in {% data variables.product.prodname_dotcom_the_website %} search results.
- The {% data variables.product.prodname_registry %} npm registry no longer returns a time value in metadata responses. This was done to allow for substantial performance improvements. We continue to have all the data necessary to return a time value as part of the metadata response and will resume returning this value in the future once we have solved the existing performance issues.
- Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
\ No newline at end of file
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-2/13.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-2/13.yml
index 17812ebd97..9eab81df22 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-2/13.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/13.yml
@@ -26,3 +26,4 @@ sections:
- 当“用户可以搜索 GitHub.com”与 {% data variables.product.prodname_github_connect %} 一起启用时，私有和内部存储库中的议题不会包含在 {% data variables.product.prodname_dotcom_the_website %} 搜索结果中。
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分，我们继续拥有返回时间值所需的所有数据，并将在我们解决现有性能问题后恢复返回这个值。'
- 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-2/14.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-2/14.yml
index 935c56921c..580c2b5397 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-2/14.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/14.yml
@@ -21,3 +21,4 @@ sections:
- 当“用户可以搜索 GitHub.com”与 {% data variables.product.prodname_github_connect %} 一起启用时，私有和内部存储库中的议题不会包含在 {% data variables.product.prodname_dotcom_the_website %} 搜索结果中。
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分，我们继续拥有返回时间值所需的所有数据，并将在我们解决现有性能问题后恢复返回这个值。'
- 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-2/15.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-2/15.yml
index e72ae1301e..767fde0099 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-2/15.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/15.yml
@@ -17,3 +17,4 @@ sections:
- 当“用户可以搜索 GitHub.com”与 {% data variables.product.prodname_github_connect %} 一起启用时，私有和内部存储库中的议题不会包含在 {% data variables.product.prodname_dotcom_the_website %} 搜索结果中。
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分，我们继续拥有返回时间值所需的所有数据，并将在我们解决现有性能问题后恢复返回这个值。'
- 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-2/16.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-2/16.yml
index 344cc4382e..afcece1432 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-2/16.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/16.yml
@@ -15,3 +15,12 @@ sections:
- The `ghe-set-password` command-line utility starts required services automatically when the instance is booted in recovery mode.
- Metrics for `aqueduct` background processes are gathered for Collectd forwarding and display in the Management Console.
- The location of the database migration and configuration run log, `/data/user/common/ghe-config.log`, is now displayed on the page that details a migration in progress.
+ known_issues:
+ - 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 实例上，攻击者可以创建第一个管理员用户。
+ - 自定义防火墙规则在升级过程中被删除。
+ - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
+ - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接，则议题无法关闭。
+ - 当“用户可以搜索 GitHub.com”与 {% data variables.product.prodname_github_connect %} 一起启用时，私有和内部存储库中的议题不会包含在 {% data variables.product.prodname_dotcom_the_website %} 搜索结果中。
+ - '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分，我们继续拥有返回时间值所需的所有数据，并将在我们解决现有性能问题后恢复返回这个值。'
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-2/17.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-2/17.yml
new file mode 100644
index 0000000000..4d76e62101
--- /dev/null
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/17.yml
@@ -0,0 +1,9 @@
+date: '2022-08-11'
+sections:
+ security_fixes:
+ - |
+ **CRITICAL**: GitHub Enterprise Server's Elasticsearch container used a version of OpenJDK 8 that was vulnerable to an integer truncation issue when processing malicious XSLT stylesheets. The vulnerability is tracked as [CVE-2022-34169](https://github.com/advisories/GHSA-9339-86wc-4qgf).
+ - |
+ **HIGH**: Previously installed apps on user accounts were automatically granted permission to access an organization on scoped access tokens after the user account was transformed into an organization account. This vulnerability was reported via the [GitHub Bug Bounty program](https://bounty.github.com).
+ bugs:
+ - When a custom dormancy threshold was set for the instance, suspending all dormant users did not reliably respect the threshold. For more information about dormancy, see "[Managing dormant users](/admin/user-management/managing-users-in-your-enterprise/managing-dormant-users)."
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-2/2.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-2/2.yml
index c9e304e0f9..937c760f88 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-2/2.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/2.yml
@@ -21,3 +21,4 @@ sections:
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后，私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分，我们继续拥有返回时间值所需的所有数据，并将在我们解决现有性能问题后恢复返回这个值。'
- 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-2/3.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-2/3.yml
index 5c1b3f7a32..1d68a8ef65 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-2/3.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/3.yml
@@ -28,3 +28,4 @@ sections:
- When "Users can search GitHub.com" is enabled with GitHub Connect, issues in private and internal repositories are not included in GitHub.com search results.
- The {% data variables.product.prodname_registry %} npm registry no longer returns a time value in metadata responses. This was done to allow for substantial performance improvements. We continue to have all the data necessary to return a time value as part of the metadata response and will resume returning this value in the future once we have solved the existing performance issues.
- Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
\ No newline at end of file
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-2/4.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-2/4.yml
index 32110331ad..5597f5ef78 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-2/4.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/4.yml
@@ -28,3 +28,4 @@ sections:
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后，私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分，我们继续拥有返回时间值所需的所有数据，并将在我们解决现有性能问题后恢复返回这个值。'
- 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-2/5.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-2/5.yml
index 9d61ab979d..5f4408ccdc 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-2/5.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/5.yml
@@ -26,3 +26,4 @@ sections:
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后，私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分，我们继续拥有返回时间值所需的所有数据，并将在我们解决现有性能问题后恢复返回这个值。'
- 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-2/6.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-2/6.yml
index c3c616482c..d44867dc22 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-2/6.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/6.yml
@@ -12,3 +12,4 @@ sections:
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后，私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分，我们继续拥有返回时间值所需的所有数据，并将在我们解决现有性能问题后恢复返回这个值。'
- 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-2/7.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-2/7.yml
index b5578d00cf..3662231b82 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-2/7.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/7.yml
@@ -21,3 +21,4 @@ sections:
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后，私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分，我们继续拥有返回时间值所需的所有数据，并将在我们解决现有性能问题后恢复返回这个值。'
- 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-2/8.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-2/8.yml
index 613acdfcc1..5afad911c2 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-2/8.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/8.yml
@@ -24,3 +24,4 @@ sections:
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后，私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分，我们继续拥有返回时间值所需的所有数据，并将在我们解决现有性能问题后恢复返回这个值。'
- 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-2/9.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-2/9.yml
index 33f66b18bc..7968e9fa49 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-2/9.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/9.yml
@@ -18,3 +18,4 @@ sections:
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后，私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分，我们继续拥有返回时间值所需的所有数据，并将在我们解决现有性能问题后恢复返回这个值。'
- 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-3/0.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-3/0.yml
index 5081ac6236..f321bb7caa 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-3/0.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-3/0.yml
@@ -253,7 +253,7 @@ sections:
- Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
- '{% data variables.product.prodname_actions %} storage settings cannot be validated and saved in the {% data variables.enterprise.management_console %} when "Force Path Style" is selected, and must instead be configured with the `ghe-actions-precheck` command line utility.'
- '{% data variables.product.prodname_ghe_server %} 3.3 instances installed on Azure and provisioned with 32+ CPU cores would fail to launch, due to a bug present in the current Linux kernel. [Updated: 2022-04-08]'
-
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
deprecations:
- heading: Deprecation of GitHub Enterprise Server 2.22
notes:
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-3/1.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-3/1.yml
index 98a172f757..4f0c79389c 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-3/1.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-3/1.yml
@@ -15,3 +15,4 @@ sections:
- 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
- '{% data variables.product.prodname_actions %} 存储设置在选择“Force Path Style（强制路径样式）”时无法验证和保存在 {% data variables.enterprise.management_console %} 中，而必须使用“ghe-actions-precheck”命令行实用程序进行配置。'
- '由于当前 Linux 内核中存在错误，{% data variables.product.prodname_ghe_server %} 在 Azure 上安装并预配了 32 个以上 CPU 内核的 3.3 实例将无法启动。[更新时间：2022 年 4 月 8 日]'
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-3/10.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-3/10.yml
index 850021bbcf..a85553a01c 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-3/10.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-3/10.yml
@@ -19,3 +19,4 @@ sections:
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分，我们继续拥有返回时间值所需的所有数据，并将在我们解决现有性能问题后恢复返回这个值。'
- 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
- '{% data variables.product.prodname_actions %} 存储设置在选择“Force Path Style（强制路径样式）”时无法验证和保存在 {% data variables.enterprise.management_console %} 中，而必须使用“ghe-actions-precheck”命令行实用程序进行配置。'
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-3/11.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-3/11.yml
index 7126962c8a..17f235d02a 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-3/11.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-3/11.yml
@@ -17,3 +17,14 @@ sections:
- The `ghe-set-password` command-line utility starts required services automatically when the instance is booted in recovery mode.
- Metrics for `aqueduct` background processes are gathered for Collectd forwarding and display in the Management Console.
- The location of the database migration and configuration run log, `/data/user/common/ghe-config.log`, is now displayed on the page that details a migration in progress.
+ known_issues:
+ - 升级到 {% data variables.product.prodname_ghe_server %} 3.3 后，{% data variables.product.prodname_actions %} 可能无法自动启动。要解决此问题，请通过 SSH 连接到设备并运行“ghe-actions-start”命令。
+ - 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 实例上，攻击者可以创建第一个管理员用户。
+ - 自定义防火墙规则在升级过程中被删除。
+ - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
+ - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接，则议题无法关闭。
+ - 当“用户可以搜索 GitHub.com”与 {% data variables.product.prodname_github_connect %} 一起启用时，私有和内部存储库中的议题不会包含在 {% data variables.product.prodname_dotcom_the_website %} 搜索结果中。
+ - '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分，我们继续拥有返回时间值所需的所有数据，并将在我们解决现有性能问题后恢复返回这个值。'
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
+ - '{% data variables.product.prodname_actions %} 存储设置在选择“Force Path Style（强制路径样式）”时无法验证和保存在 {% data variables.enterprise.management_console %} 中，而必须使用“ghe-actions-precheck”命令行实用程序进行配置。'
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-3/12.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-3/12.yml
new file mode 100644
index 0000000000..bdd7c88536
--- /dev/null
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-3/12.yml
@@ -0,0 +1,11 @@
+date: '2022-08-11'
+sections:
+ security_fixes:
+ - |
+ **CRITICAL**: GitHub Enterprise Server's Elasticsearch container used a version of OpenJDK 8 that was vulnerable to an integer truncation issue when processing malicious XSLT stylesheets. The vulnerability is tracked as [CVE-2022-34169](https://github.com/advisories/GHSA-9339-86wc-4qgf).
+ - |
+ **HIGH**: Previously installed apps on user accounts were automatically granted permission to access an organization on scoped access tokens after the user account was transformed into an organization account. This vulnerability was reported via the [GitHub Bug Bounty program](https://bounty.github.com).
+ bugs:
+ - When a custom dormancy threshold was set for the instance, suspending all dormant users did not reliably respect the threshold. For more information about dormancy, see "[Managing dormant users](/admin/user-management/managing-users-in-your-enterprise/managing-dormant-users)."
+ changes:
+ - 'The enterprise audit log now includes more user-generated events, such as `project.create`. The REST API also returns additional user-generated events, such as `repo.create`. For more information, see "[Accessing the audit log for your enterprise](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/accessing-the-audit-log-for-your-enterprise)" and "[Using the audit log API for your enterprise](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/using-the-audit-log-api-for-your-enterprise#querying-the-audit-log-rest-api)."'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-3/2.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-3/2.yml
index 0dbdd02c84..824883ab54 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-3/2.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-3/2.yml
@@ -30,3 +30,4 @@ sections:
- 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
- '{% data variables.product.prodname_actions %} 存储设置在选择“Force Path Style（强制路径样式）”时无法验证和保存在 {% data variables.enterprise.management_console %} 中，而必须使用“ghe-actions-precheck”命令行实用程序进行配置。'
- '由于当前 Linux 内核中存在错误，{% data variables.product.prodname_ghe_server %} 在 Azure 上安装并预配了 32 个以上 CPU 内核的 3.3 实例将无法启动。[更新时间：2022 年 4 月 8 日]'
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-3/3.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-3/3.yml
index 06e3a3f038..8288dd7822 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-3/3.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-3/3.yml
@@ -28,3 +28,4 @@ sections:
- 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
- '{% data variables.product.prodname_actions %} 存储设置在选择“Force Path Style（强制路径样式）”时无法验证和保存在 {% data variables.enterprise.management_console %} 中，而必须使用“ghe-actions-precheck”命令行实用程序进行配置。'
- '由于当前 Linux 内核中存在错误，{% data variables.product.prodname_ghe_server %} 在 Azure 上安装并预配了 32 个以上 CPU 内核的 3.3 实例将无法启动。[更新时间：2022 年 4 月 8 日]'
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-3/4.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-3/4.yml
index 5faa2f1fe2..3bc8b30a68 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-3/4.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-3/4.yml
@@ -23,3 +23,4 @@ sections:
- 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
- '{% data variables.product.prodname_actions %} 存储设置在选择“Force Path Style（强制路径样式）”时无法验证和保存在 {% data variables.enterprise.management_console %} 中，而必须使用“ghe-actions-precheck”命令行实用程序进行配置。'
- '由于当前 Linux 内核中存在错误，{% data variables.product.prodname_ghe_server %} 在 Azure 上安装并预配了 32 个以上 CPU 内核的 3.3 实例将无法启动。[更新时间：2022 年 4 月 8 日]'
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-3/5.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-3/5.yml
index 066b200831..ae71131498 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-3/5.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-3/5.yml
@@ -17,3 +17,4 @@ sections:
- 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
- '{% data variables.product.prodname_actions %} 存储设置在选择“Force Path Style（强制路径样式）”时无法验证和保存在 {% data variables.enterprise.management_console %} 中，而必须使用“ghe-actions-precheck”命令行实用程序进行配置。'
- '由于当前 Linux 内核中存在错误，{% data variables.product.prodname_ghe_server %} 在 Azure 上安装并预配了 32 个以上 CPU 内核的 3.3 实例将无法启动。[更新时间：2022 年 4 月 8 日]'
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-3/6.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-3/6.yml
index c9c8a5b7c1..18f193bedd 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-3/6.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-3/6.yml
@@ -48,3 +48,4 @@ sections:
- 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
- '{% data variables.product.prodname_actions %} 存储设置在选择“Force Path Style（强制路径样式）”时无法验证和保存在 {% data variables.enterprise.management_console %} 中，而必须使用“ghe-actions-precheck”命令行实用程序进行配置。'
- '由于当前 Linux 内核中存在错误，{% data variables.product.prodname_ghe_server %} 在 Azure 上安装并预配了 32 个以上 CPU 内核的 3.3 实例将无法启动。[更新时间：2022 年 4 月 8 日]'
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-3/7.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-3/7.yml
index cd9533fa1e..20b9e5bb46 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-3/7.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-3/7.yml
@@ -30,3 +30,4 @@ sections:
- 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
- '{% data variables.product.prodname_actions %} 存储设置在选择“Force Path Style（强制路径样式）”时无法验证和保存在 {% data variables.enterprise.management_console %} 中，而必须使用“ghe-actions-precheck”命令行实用程序进行配置。'
- '由于当前 Linux 内核中存在错误，{% data variables.product.prodname_ghe_server %} 在 Azure 上安装并预配了 32 个以上 CPU 内核的 3.3 实例将无法启动。[更新时间：2022 年 4 月 8 日]'
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-3/8.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-3/8.yml
index d36e597c4e..6ab157bd1e 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-3/8.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-3/8.yml
@@ -32,3 +32,4 @@ sections:
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分，我们继续拥有返回时间值所需的所有数据，并将在我们解决现有性能问题后恢复返回这个值。'
- 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
- '{% data variables.product.prodname_actions %} 存储设置在选择“Force Path Style（强制路径样式）”时无法验证和保存在 {% data variables.enterprise.management_console %} 中，而必须使用“ghe-actions-precheck”命令行实用程序进行配置。'
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-3/9.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-3/9.yml
index 60034b57d1..802d0fd368 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-3/9.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-3/9.yml
@@ -24,3 +24,4 @@ sections:
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分，我们继续拥有返回时间值所需的所有数据，并将在我们解决现有性能问题后恢复返回这个值。'
- 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
- '{% data variables.product.prodname_actions %} 存储设置在选择“Force Path Style（强制路径样式）”时无法验证和保存在 {% data variables.enterprise.management_console %} 中，而必须使用“ghe-actions-precheck”命令行实用程序进行配置。'
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-4/0.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-4/0.yml
index 20b3b3d019..4e3db0e1d5 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-4/0.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-4/0.yml
@@ -252,7 +252,7 @@ sections:
To work around this problem, you can take one of the two following actions.
- Reconfigure the IdP by uploading a static copy of the SAML metadata without the `WantAssertionsEncrypted` attribute.
- Copy the SAML metadata, remove `WantAssertionsEncrypted` attribute, host it on a web server, and reconfigure the IdP to point to that URL.
-
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
deprecations:
- heading: Deprecation of GitHub Enterprise Server 3.0
notes:
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-4/1.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-4/1.yml
index 8be3e4415a..e0a313acaa 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-4/1.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-4/1.yml
@@ -55,6 +55,7 @@ sections:
要解决此问题，您可以执行以下两个操作之一。
- 通过上传 SAML 元数据的静态副本（不带“WantAssertionsEncrypted”属性）来重新配置 IdP。
- 复制 SAML 元数据，删除“WantAssertionsEncrypted”属性，将其托管在 Web 服务器上，然后将 IdP 重新配置为指向该 URL。
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
deprecations:
-
heading: 弃用 GitHub Enterprise Server 3.0
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-4/2.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-4/2.yml
index e16bcc929d..2f1bb07d45 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-4/2.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-4/2.yml
@@ -29,6 +29,7 @@ sections:
- |
在多个级别（例如，企业和组织）上使用“--ephemeral”参数注册自托管运行器后，运行器可能会陷入空闲状态并需要重新注册。[更新时间：2022 年 6 月 17 日]
- After upgrading to {% data variables.product.prodname_ghe_server %} 3.4, releases may appear to be missing from repositories. This can occur when the required Elasticsearch index migrations have not successfully completed.
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
deprecations:
-
heading: 弃用 GitHub Enterprise Server 3.0
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-4/3.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-4/3.yml
index af863a724f..f3b9b36a28 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-4/3.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-4/3.yml
@@ -38,3 +38,4 @@ sections:
- |
在多个级别（例如，企业和组织）上使用“--ephemeral”参数注册自托管运行器后，运行器可能会陷入空闲状态并需要重新注册。[更新时间：2022 年 6 月 17 日]
- After upgrading to {% data variables.product.prodname_ghe_server %} 3.4 releases may appear to be missing from repositories. This can occur when the required Elasticsearch index migrations have not successfully completed.
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-4/4.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-4/4.yml
index 6fbed802ee..1da8c90a4a 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-4/4.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-4/4.yml
@@ -28,10 +28,5 @@ sections:
- 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
- |
在多个级别（例如，企业和组织）上使用“--ephemeral”参数注册自托管运行器后，运行器可能会陷入空闲状态并需要重新注册。[更新时间：2022 年 6 月 17 日]
- - |
- 将 SAML 加密断言与 {% data variables.product.prodname_ghe_server %} 3.4.0 和 3.4.1 一起使用时，“SPSSODescriptor”中的新 XML 属性“WantAssertionsEncrypted”包含 SAML 元数据的无效属性。使用此 SAML 元数据终端节点的 IdP 在验证 SAML 元数据 XML 架构时可能会遇到错误。修复程序将在下一个修补程序版本中提供。[更新时间：2022-04-11]
-
- 要解决此问题，您可以执行以下两个操作之一。
- - 通过上传 SAML 元数据的静态副本（不带“WantAssertionsEncrypted”属性）来重新配置 IdP。
- - 复制 SAML 元数据，删除“WantAssertionsEncrypted”属性，将其托管在 Web 服务器上，然后将 IdP 重新配置为指向该 URL。
- After upgrading to {% data variables.product.prodname_ghe_server %} 3.4, releases may appear to be missing from repositories. This can occur when the required Elasticsearch index migrations have not successfully completed.
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-4/5.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-4/5.yml
index da5c825d67..019f896aa7 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-4/5.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-4/5.yml
@@ -25,11 +25,6 @@ sections:
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分，我们继续拥有返回时间值所需的所有数据，并将在我们解决现有性能问题后恢复返回这个值。'
- 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
- |
- 在多个级别（例如，企业和组织）上使用“--ephemeral”参数注册自托管运行器后，运行器可能会陷入空闲状态并需要重新注册。[更新时间：2022 年 6 月 17 日]
- - |
- 将 SAML 加密断言与 {% data variables.product.prodname_ghe_server %} 3.4.0 和 3.4.1 一起使用时，“SPSSODescriptor”中的新 XML 属性“WantAssertionsEncrypted”包含 SAML 元数据的无效属性。使用此 SAML 元数据终端节点的 IdP 在验证 SAML 元数据 XML 架构时可能会遇到错误。修复程序将在下一个修补程序版本中提供。[更新时间：2022-04-11]
-
- 要解决此问题，您可以执行以下两个操作之一。
- - 通过上传 SAML 元数据的静态副本（不带“WantAssertionsEncrypted”属性）来重新配置 IdP。
- - 复制 SAML 元数据，删除“WantAssertionsEncrypted”属性，将其托管在 Web 服务器上，然后将 IdP 重新配置为指向该 URL。
+ After registering a self-hosted runner with the `--ephemeral` parameter on more than one level (for example, both enterprise and organization), the runner may get stuck in an idle state and require re-registration.
- After upgrading to {% data variables.product.prodname_ghe_server %} 3.4, releases may appear to be missing from repositories. This can occur when the required Elasticsearch index migrations have not successfully completed.
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-4/6.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-4/6.yml
index b77fdc7ddf..9ae32341af 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-4/6.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-4/6.yml
@@ -19,3 +19,15 @@ sections:
- The `ghe-set-password` command-line utility starts required services automatically when the instance is booted in recovery mode.
- Metrics for `aqueduct` background processes are gathered for Collectd forwarding and display in the Management Console.
- The location of the database migration and configuration run log, `/data/user/common/ghe-config.log`, is now displayed on the page that details a migration in progress.
+ known_issues:
+ - 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 实例上，攻击者可以创建第一个管理员用户。
+ - 自定义防火墙规则在升级过程中被删除。
+ - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
+ - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接，则议题无法关闭。
+ - 当“用户可以搜索 GitHub.com”与 {% data variables.product.prodname_github_connect %} 一起启用时，私有和内部存储库中的议题不会包含在 {% data variables.product.prodname_dotcom_the_website %} 搜索结果中。
+ - '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分，我们继续拥有返回时间值所需的所有数据，并将在我们解决现有性能问题后恢复返回这个值。'
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
+ - |
+ 在多个级别（例如，企业和组织）上使用“--ephemeral”参数注册自托管运行器后，运行器可能会陷入空闲状态并需要重新注册。[更新时间：2022 年 6 月 17 日]
+ - After upgrading to {% data variables.product.prodname_ghe_server %} 3.4, releases may appear to be missing from repositories. This can occur when the required Elasticsearch index migrations have not successfully completed.
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-4/7.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-4/7.yml
new file mode 100644
index 0000000000..4ac13d11b8
--- /dev/null
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-4/7.yml
@@ -0,0 +1,14 @@
+date: '2022-08-11'
+sections:
+ security_fixes:
+ - |
+ **CRITICAL**: GitHub Enterprise Server's Elasticsearch container used a version of OpenJDK 8 that was vulnerable to an integer truncation issue when processing malicious XSLT stylesheets. The vulnerability is tracked as [CVE-2022-34169](https://github.com/advisories/GHSA-9339-86wc-4qgf).
+ - |
+ **HIGH**: Previously installed apps on user accounts were automatically granted permission to access an organization on scoped access tokens after the user account was transformed into an organization account. This vulnerability was reported via the [GitHub Bug Bounty program](https://bounty.github.com).
+ bugs:
+ - In some cases, GitHub Enterprise Server instances on AWS that used the `r4.4xlarge` instance type would fail to boot.
+ - 'When calculating committers for GitHub Advanced Security, it was not possible to specify individual repositories. For more information, see "[Site admin dashboard](/admin/configuration/configuring-your-enterprise/site-admin-dashboard#advanced-security-committers)."'
+ - When a custom dormancy threshold was set for the instance, suspending all dormant users did not reliably respect the threshold. For more information about dormancy, see "[Managing dormant users](/admin/user-management/managing-users-in-your-enterprise/managing-dormant-users)."
+ changes:
+ - '`pre_receive_hook.rejected_push` events were not displayed in the enterprise audit log.'
+ - Both migration archives for repositories and archive exports for user accounts include release reactions.
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-5/0.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-5/0.yml
index 81f501608e..0beb3b5aef 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-5/0.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-5/0.yml
@@ -116,7 +116,8 @@ sections:
heading: 依赖关系图支持 GitHub Actions
notes:
- |
- 依赖项关系图现在检测 GitHub Actions 工作流程的 YAML 文件。GitHub Enterprise Server 将在**Insights（见解）**选项卡的依赖项关系图部分中显示工作流程文件。发布操作的存储库还可以从存储库主页上的“Used By（使用者）”控件中查看依赖于该操作的存储库的数量。更多信息请参阅“[关于依赖关系图](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph)”。
+ The dependency graph now detects YAML files for GitHub Actions workflows. GitHub Enterprise Server will display the workflow files within the **Insights** tab's dependency graph section. Repositories that publish actions will also be able to see the number of repositories that depend on that action from the "Used By" control on the repository homepage. For more information, see "[About the dependency graph](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph)."
+ - **Note**: This feature was unavailable in GitHub Enterprise Server 3.5.0, 3.5.1, 3.5.2, and 3.5.3. The feature is available in 3.5.4 and later. [Updated: 2022-08-16]
-
heading: 公开测试版企业安全概述
notes:
@@ -201,7 +202,8 @@ sections:
heading: 重新打开忽略的 Dependabot 警报
notes:
- |
- 现在，您可以通过已关闭警报的 UI 页面重新打开已消除的 Dependabot 警报。这不会影响 Dependabot 拉取请求或 GraphQL API。更多信息请参阅“[关于 Dependabot 警报](/code-security/dependabot/dependabot-alerts/about-dependabot-alerts)”。
+ You can now reopen dismissed Dependabot alerts through the UI page for a closed alert. This does not affect Dependabot pull requests or the GraphQL API. For more information, see "[About Dependabot alerts](/code-security/dependabot/dependabot-alerts/about-dependabot-alerts)."
+ - **Note**: This feature was unavailable in GitHub Enterprise Server 3.5.0, 3.5.1, 3.5.2, and 3.5.3. The feature is available in 3.5.4 and later. [Updated: 2022-08-16]
-
heading: 对 Dependabot 版本更新的发布支持已公开测试
notes:
@@ -261,11 +263,12 @@ sections:
heading: 使拉取请求的主题分支保持最新状态的更多方法
notes:
- |
- 通过拉取请求页面上的**Update branch（更新分支）**按钮，您可以使用基本分支中的最新更改来更新拉取请求的分支。这对于在合并之前验证更改是否与基本分支的当前版本兼容非常有用。现在，两项增强功能为您提供了更多方法来使您的分支保持最新状态。
+ The **Update branch** button on the pull request page lets you update your pull request's branch with the latest changes from the base branch. This is useful for verifying your changes are compatible with the current version of the base branch before you merge. Two enhancements now give you more ways to keep your branch up-to-date.
- - 当拉取请求的主题分支与基本分支一起过期时，您现在可以选择通过重新基于最新版本的基础分支来更新它。重新定基将分支中的更改应用到基本分支的最新版本，从而生成具有线性历史记录的分支，因为不会创建合并提交。若要通过变基进行更新，请单击**Update branch（更新分支）**按钮旁边的下拉菜单，单击**Update with rebase（使用变基更新）**，然后单击**Rebase branch（变基分支）**。以前，**Update branch（更新分支）**执行了传统的合并，该合并始终导致拉取请求分支中的合并提交。此选项仍然可用，但现在您可以选择。更多信息请参阅“[保持您的拉取请求与基本分支同步](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/keeping-your-pull-request-in-sync-with-the-base-branch)”。
+ - When your pull request's topic branch is out of date with the base branch, you now have the option to update it by rebasing on the latest version of the base branch. Rebasing applies the changes from your branch onto the latest version of the base branch, resulting in a branch with a linear history since no merge commit is created. To update by rebasing, click the drop down menu next to the **Update Branch** button, click **Update with rebase**, and then click **Rebase branch**. Previously, **Update branch** performed a traditional merge that always resulted in a merge commit in your pull request branch. This option is still available, but now you have the choice. For more information, see "[Keeping your pull request in sync with the base branch](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/keeping-your-pull-request-in-sync-with-the-base-branch)."
- - 新的存储库设置允许**Update branch（更新分支）**按钮在拉取请求的主题分支与基本分支不是最新的时始终可用。以前，仅当启用了**Require branches to be up to date before merging（要求分支在合并之前保持最新）**分支保护设置时，此按钮才可用。具有管理员或维护者访问权限的人员可以从存储库设置中的**Pull Requests（拉取请求）**部分中管理**Always suggest updating pull request branches（始终建议更新拉取请求分支）**设置。更多信息请参阅“[管理更新拉取请求分支的建议](/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-suggestions-to-update-pull-request-branches)”。
+ - A new repository setting allows the **Update branch** button to always be available when a pull request's topic branch is not up to date with the base branch. Previously, this button was only available when the **Require branches to be up to date before merging** branch protection setting was enabled. People with admin or maintainer access can manage the **Always suggest updating pull request branches** setting from the **Pull Requests** section in repository settings. For more information, see "[Managing suggestions to update pull request branches](/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-suggestions-to-update-pull-request-branches)."
+ - **Note**: This feature was unavailable in GitHub Enterprise Server 3.5.0, 3.5.1, 3.5.2, and 3.5.3. The feature is available in 3.5.4 and later. [Updated: 2022-08-16]
-
heading: 为 GitHub Pages 网站配置自定义 HTTP 标头
notes:
@@ -280,7 +283,8 @@ sections:
heading: 浅色高对比度主题已正式发布
notes:
- |
- 现在，前景和背景元素之间对比度更高的浅色高对比度主题现已正式发布。更多信息请参阅“[管理您的主题设置](/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/managing-your-theme-settings)”。
+ A light high contrast theme, with greater contrast between foreground and background elements, is now generally available. For more information, see "[Managing your theme settings](/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/managing-your-theme-settings)."
+ - **Note**: This feature was unavailable in GitHub Enterprise Server 3.5.0, 3.5.1, 3.5.2, and 3.5.3. The feature is available in 3.5.4 and later. [Updated: 2022-08-16]
-
heading: 标记保护规则
notes:
@@ -346,5 +350,13 @@ sections:
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分，我们继续拥有返回时间值所需的所有数据，并将在我们解决现有性能问题后恢复返回这个值。'
- 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
- Actions services need to be restarted after restoring an appliance from a backup taken on a different host.
- - 'Deleted repositories will not be purged from disk automatically after the 90-day retention period ends. [Updated: 2022-06-08]'
+ - 'Deleted repositories will not be purged from disk automatically after the 90-day retention period ends. This issue is resolved in the 3.5.1 patch release. [Updated: 2022-06-10]'
- 'Management Console may appear stuck on the _Starting_ screen after upgrading an under-provisioned instance to GitHub Enterprise Server 3.5. [Updated: 2022-06-20]'
+ - |
+ The following features were unavailable for users in GitHub Enterprise Server 3.5.0, 3.5.1, 3.5.2, and 3.5.3. The features are available in 3.5.4 and later. [Updated: 2022-08-16]
+
+ - Detection of GitHub Actions workflow files for the dependency graph
+ - Reopening of dismissed Dependabot alerts
+ - Enabling the **Update branch** button for all pull requests in a repository
+ - Light high contrast theme
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-5/1.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-5/1.yml
index 58e2214b61..29d5f5533d 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-5/1.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-5/1.yml
@@ -31,3 +31,11 @@ sections:
- Actions services need to be restarted after restoring an appliance from a backup taken on a different host.
- 'Deleted repositories will not be purged from disk automatically after the 90-day retention period ends. This issue is resolved in the 3.5.1 release. [Updated: 2022-06-10]'
- 'Management Console may appear stuck on the _Starting_ screen after upgrading an under-provisioned instance to GitHub Enterprise Server 3.5. [Updated: 2022-06-20]'
+ - |
+ The following features were unavailable for users in GitHub Enterprise Server 3.5.0, 3.5.1, 3.5.2, and 3.5.3. The features are available in 3.5.4 and later. [Updated: 2022-08-16]
+
+ - Detection of GitHub Actions workflow files for the dependency graph
+ - Reopening of dismissed Dependabot alerts
+ - Enabling the **Update branch** button for all pull requests in a repository
+ - Light high contrast theme
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-5/2.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-5/2.yml
index 563a2b7444..3a1b83f742 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-5/2.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-5/2.yml
@@ -32,4 +32,11 @@ sections:
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分，我们继续拥有返回时间值所需的所有数据，并将在我们解决现有性能问题后恢复返回这个值。'
- 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
- Actions services need to be restarted after restoring an appliance from a backup taken on a different host.
- - 'Deleted repositories will not be purged from disk automatically after the 90-day retention period ends. This issue is resolved in the 3.5.1 release. [Updated: 2022-06-10]'
+ - |
+ The following features were unavailable for users in GitHub Enterprise Server 3.5.0, 3.5.1, 3.5.2, and 3.5.3. The features are available in 3.5.4 and later. [Updated: 2022-08-16]
+
+ - Detection of GitHub Actions workflow files for the dependency graph
+ - Reopening of dismissed Dependabot alerts
+ - Enabling the **Update branch** button for all pull requests in a repository
+ - Light high contrast theme
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-5/3.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-5/3.yml
index 0014a4b35b..d5456110cf 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-5/3.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-5/3.yml
@@ -21,3 +21,20 @@ sections:
- The `ghe-set-password` command-line utility starts required services automatically when the instance is booted in recovery mode.
- Metrics for `aqueduct` background processes are gathered for Collectd forwarding and display in the Management Console.
- The location of the database migration and configuration run log, `/data/user/common/ghe-config.log`, is now displayed on the page that details a migration in progress.
+ known_issues:
+ - 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 实例上，攻击者可以创建第一个管理员用户。
+ - 自定义防火墙规则在升级过程中被删除。
+ - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
+ - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接，则议题无法关闭。
+ - 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后，私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
+ - '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分，我们继续拥有返回时间值所需的所有数据，并将在我们解决现有性能问题后恢复返回这个值。'
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
+ - Actions services need to be restarted after restoring an appliance from a backup taken on a different host.
+ - |
+ The following features were unavailable for users in GitHub Enterprise Server 3.5.0, 3.5.1, 3.5.2, and 3.5.3. The features are available in 3.5.4 and later. [Updated: 2022-08-16]
+
+ - Detection of GitHub Actions workflow files for the dependency graph
+ - Reopening of dismissed Dependabot alerts
+ - Enabling the **Update branch** button for all pull requests in a repository
+ - Light high contrast theme
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-5/4.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-5/4.yml
new file mode 100644
index 0000000000..2d66fe18bf
--- /dev/null
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-5/4.yml
@@ -0,0 +1,20 @@
+date: '2022-08-11'
+sections:
+ security_fixes:
+ - |
+ **CRITICAL**: GitHub Enterprise Server's Elasticsearch container used a version of OpenJDK 8 that was vulnerable to an integer truncation issue when processing malicious XSLT stylesheets. The vulnerability is tracked as [CVE-2022-34169](https://github.com/advisories/GHSA-9339-86wc-4qgf).
+ - |
+ **HIGH**: Previously installed apps on user accounts were automatically granted permission to access an organization on scoped access tokens after the user account was transformed into an organization account. This vulnerability was reported via the [GitHub Bug Bounty program](https://bounty.github.com).
+ bugs:
+ - In some cases, GitHub Enterprise Server instances on AWS that used the `r4.4xlarge` instance type would fail to boot.
+ - In some cases, UI elements within a pull request's **Files changed** tab could overlap.
+ - When a custom dormancy threshold was set for the instance, suspending all dormant users did not reliably respect the threshold. For more information about dormancy, see "[Managing dormant users](/admin/user-management/managing-users-in-your-enterprise/managing-dormant-users)."
+ - 'When calculating committers for GitHub Advanced Security, it was not possible to specify individual repositories. For more information, see "[Site admin dashboard](/admin/configuration/configuring-your-enterprise/site-admin-dashboard#advanced-security-committers)."'
+ - In some cases, Elasticsearch's post-upgrade `es:upgrade` process could crash before completion.
+ - The script for migration to internal repositories failed to convert the visibility for public repositories to internal or private. For more information about the migration, see "[Migrating to internal repositories](/admin/user-management/managing-repositories-in-your-enterprise/migrating-to-internal-repositories)."
+ - 'Detection of GitHub Actions workflow files for the dependency graph was unavailable in GitHub Enterprise Server 3.5.0, 3.5.1, 3.5.2, and 3.5.3, but is now available in 3.5.4. For more information, see "[About the dependency graph](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph#supported-package-ecosystems)."'
+ - 'The ability to reopen dismissed Dependabot alerts was unavailable in GitHub Enterprise Server 3.5.0, 3.5.1, 3.5.2, and 3.5.3, but is now available in 3.5.4. For more information, see "[Viewing and updating Dependabot alerts](/code-security/dependabot/dependabot-alerts/viewing-and-updating-dependabot-alerts#viewing-and-updating-closed-alerts)."'
+ - The ability to always suggest updates from the base branch to a pull request's HEAD was unavailable in GitHub Enterprise Server 3.5.0, 3.5.1, 3.5.2, and 3.5.3, but is now available in 3.5.4. For more information, see "[Managing suggestions to update pull request branches](/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-suggestions-to-update-pull-request-branches)."
+ - The light high contrast theme was unavailable in GitHub Enterprise Server 3.5.0, 3.5.1, 3.5.2, and 3.5.3, but is now available in 3.5.4. For more information, see "[Managing your theme settings](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/managing-your-theme-settings)."
+ changes:
+ - '`pre_receive_hook.rejected_push` events were not displayed in the enterprise audit log.'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-6/0-rc1.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-6/0-rc1.yml
index b8dc55835f..a729a01d0e 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-6/0-rc1.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-6/0-rc1.yml
@@ -1,6 +1,6 @@
date: '2022-07-26'
release_candidate: true
-deprecated: false
+deprecated: true
intro: |
{% note %}
@@ -214,3 +214,4 @@ sections:
- In a repository's settings, enabling the option to allow users with read access to create discussions does not enable this functionality.
- In some cases, users cannot convert existing issues to discussions.
- Custom patterns for secret scanning have `.*` as an end delimiter, specifically in the "After secret" field. This delimiter causes inconsistencies in scans for secrets across repositories, and you may notice gaps in a repository's history where no scans completed. Incremental scans may also be impacted. To prevent issues with scans, modify the end of the pattern to remove the `.*` delimiter.
+ - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-6/0.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-6/0.yml
new file mode 100644
index 0000000000..5a6efee21d
--- /dev/null
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-6/0.yml
@@ -0,0 +1,215 @@
+date: '2022-08-16'
+deprecated: false
+intro: |
+ {% note %}
+
+ **Note:** If {% data variables.product.product_location %} is running a release candidate build, you can't upgrade with a hotpatch. We recommend that you only run release candidates in a test environment.
+
+ {% endnote %}
+
+ For upgrade instructions, see "[Upgrading {% data variables.product.prodname_ghe_server %}](/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrading-github-enterprise-server)."
+sections:
+ features:
+ -
+ heading: 基础架构
+ notes:
+ - |
+ Repository caching is generally available. Repository caching increases Git read performance for distributed developers, providing the data locality and convenience of geo-replication without impact on push workflows. With the general availability release, GitHub Enterprise Server caches both Git and Git LFS data. For more information, see "[About repository caching](/admin/enterprise-management/caching-repositories/about-repository-caching)."
+ -
+ heading: Instance security
+ notes:
+ - |
+ GitHub has changed the supported algorithms and hash functions for all SSH connections to GitHub Enterprise Server, disabled the unencrypted and unauthenticated Git protocol, and optionally allowed the advertisement of an Ed25519 host key. For more information, see the [GitHub Blog](https://github.blog/2022-06-28-improving-git-protocol-security-on-github-enterprise-server/) and the following articles.
+
+ - "[Configuring SSH connections to your instance](/admin/configuration/configuring-your-enterprise/configuring-ssh-connections-to-your-instance)"
+ - "[Enforcing repository management policies in your enterprise](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-repository-management-policies-in-your-enterprise#configuring-anonymous-git-read-access)"
+ - "[Configuring host keys for your instance](/admin/configuration/configuring-your-enterprise/configuring-host-keys-for-your-instance)"
+ - |
+ You can require TLS encryption for incoming SMTP connections to your instance. For more information, see "[Configuring email for notifications](/admin/configuration/configuring-your-enterprise/configuring-email-for-notifications)."
+ -
+ heading: 审核日志
+ notes:
+ - |
+ You can stream audit log and Git events for your instance to Amazon S3, Azure Blob Storage, Azure Event Hubs, Google Cloud Storage, or Splunk. Audit log streaming is in public beta and subject to change. For more information, see "[Streaming the audit log for your enterprise](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/streaming-the-audit-log-for-your-enterprise)."
+ -
+ heading: GitHub Connect
+ notes:
+ - |
+ Server Statistics is now generally available. Server Statistics collects aggregate usage data from your GitHub Enterprise Server instance, which you can use to better anticipate the needs of your organization, understand how your team works, and show the value you get from GitHub Enterprise Server. For more information, see "[About Server Statistics](/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/about-server-statistics)."
+ -
+ heading: Administrator experience
+ notes:
+ - |
+ Enterprise owners can join organizations on the instance as a member or owner from the enterprise account's **Organizations** page. For more information, see "[Managing your role in an organization owned by your enterprise](/admin/user-management/managing-organizations-in-your-enterprise/managing-your-role-in-an-organization-owned-by-your-enterprise)."
+ - |
+ Enterprise owners can allow users to dismiss the configured global announcement banner. For more information, see "[Customizing user messages for your enterprise](/admin/user-management/managing-users-in-your-enterprise/customizing-user-messages-for-your-enterprise#creating-a-global-announcement-banner)."
+ -
+ heading: GitHub Advanced Security
+ notes:
+ - |
+ Users on an instance with a GitHub Advanced Security license can opt to receive a webhook event that triggers when an organization owner or repository administrator enables or disables a code security or analysis feature. For more information, see the following documentation.
+
+ - "[Webhook events and payloads](/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#security_and_analysis)" in the webhook documentation
+ - "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization)"
+ - "[Managing security and analysis features for your repository](/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-security-and-analysis-settings-for-your-repository)"
+ - |
+ Users on an instance with a GitHub Advanced Security license can optionally add a comment when dismissing a code scanning alert in the web UI or via the REST API. Dismissal comments appear in the event timeline. Users can also add or retrieve a dismissal comment via the REST API. For more information, see "[Triaging code scanning alerts in pull requests](/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/triaging-code-scanning-alerts-in-pull-requests#dismissing-an-alert-on-your-pull-request)" and "[Code Scanning](/rest/code-scanning#update-a-code-scanning-alert)" in the REST API documentation.
+ - |
+ On instances with a GitHub Advanced Security license, secret scanning prevents the leak of secrets in the web editor. For more information, see "[Protecting pushes with secret scanning](/code-security/secret-scanning/protecting-pushes-with-secret-scanning#using-secret-scanning-as-a-push-protection-from-the-web-ui)."
+ - |
+ Enterprise owners and users on an instance with a GitHub Advanced Security license can view secret scanning alerts and bypasses of secret scanning's push protection in the enterprise and organization audit logs, and via the REST API. For more information, see the following documentation.
+
+ - "[Protecting pushes with secret scanning](/code-security/secret-scanning/protecting-pushes-with-secret-scanning)"
+ - "[Audit log events for your enterprise](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/audit-log-events-for-your-enterprise#secret_scanning_push_protection-category-actions)"
+ - "[Reviewing the audit log for your organization](/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization#secret_scanning_push_protection-category-actions)"
+ - "[Secret Scanning](/rest/secret-scanning#list-secret-scanning-alerts-for-an-enterprise)" in the REST API documentation
+ - |
+ Enterprise owners on an instance with a GitHub Advanced Security license can perform dry runs of custom secret scanning patterns for the enterprise, and all users can perform dry runs when editing a pattern. Dry runs allow you to understand a pattern's impact across the entire instance and hone the pattern before publication and generation of alerts. For more information, see "[Defining custom patterns for secret scanning](/code-security/secret-scanning/defining-custom-patterns-for-secret-scanning)."
+ - |
+ Users on an instance with a GitHub Advanced Security license can use `sort` and `direction` parameters in the REST API when retrieving secret scanning alerts, and sort based on the alert’s `created` or `updated` fields. The new parameters are available for the entire instance, or for individual organizations or repositories. For more information, see the following documentation.
+
+ - "[List secret scanning alerts for an enterprise](/rest/secret-scanning#list-secret-scanning-alerts-for-an-enterprise)"
+ - "[List secret scanning alerts for an organization](/rest/secret-scanning#list-secret-scanning-alerts-for-an-organization)"
+ - "[List secret scanning alerts for a repository](/rest/secret-scanning#list-secret-scanning-alerts-for-a-repository)"
+ - "[Secret Scanning](/rest/secret-scanning)" in the REST API documentation
+ - |
+ The contents of the `github/codeql-go` repository have moved to the `github/codeql` repository, to live alongside similar libraries for all other programming languages supported by CodeQL. The open-source CodeQL queries, libraries, and extractor for analyzing codebases written in the Go programming language with GitHub's CodeQL code analysis tools can now be found in the new location. For more information, including guidance on migrating your existing workflows, see [github/codeql-go#741](https://github.com/github/codeql-go/issues/741).
+ -
+ heading: Dependabot
+ notes:
+ - |
+ Enterprise owners on instances with a GitHub Advanced Security license can see an overview of Dependabot alerts for the entire instance, including a repository-centric view of application security risks, and an alert-centric view of all secret scanning and Dependabot alerts. The views are in beta and subject to change, and alert-centric views for code scanning are planned for a future release of GitHub Enterprise Server. For more information, see "[Viewing the security overview](/code-security/security-overview/viewing-the-security-overview#viewing-the-security-overview-for-an-enterprise)."
+ - |
+ Dependabot alerts show users if repository code calls vulnerable functions. Individual alerts display a "vulnerable call" label and code snippet, and users can filter search by `has:vulnerable-calls`. Vulnerable functions are curated during publication to the [GitHub Advisory Database](https://github.com/advisories). New incoming Python advisories will be supported, and GitHub is backfilling known vulnerable functions for historical Python advisories. After beta testing with Python, GitHub will add support for other ecosystems. For more information, see "[Viewing and updating Dependabot alerts](/code-security/dependabot/dependabot-alerts/viewing-and-updating-dependabot-alerts)."
+ - |
+ Users can select multiple Dependabot alerts, then dismiss or reopen or dismiss the alerts. For example, from the **Closed alerts** tab, you can select multiple alerts that have been previously dismissed, and then reopen them all at once. For more information, see "[About Dependabot alerts](/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-alerts-for-vulnerable-dependencies)."
+ - |
+ Dependabot updates `@types` dependencies alongside corresponding packages in TypeScript projects. Before this change, users would see separate pull requests for a package and the corresponding `@types` package. This feature is automatically enabled for repositories containing `@types` packages in the project's `devDependencies` within the _package.json_ file. You can disable this behavior by setting the [`ignore`](/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#ignore) field in your `dependabot.yml` file to `@types/*`. For more information, see "[About Dependabot version updates](/code-security/dependabot/dependabot-version-updates/about-dependabot-version-updates)" and "[Configuration options for the _dependabot.yml_ file](/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file)."
+ -
+ heading: 代码安全
+ notes:
+ - |
+ GitHub Actions can enforce dependency reviews on users' pull requests by scanning for dependencies, and will warn users about associated security vulnerabilities. The `dependency-review-action` action is supported by a new API endpoint that diffs the dependencies between any two revisions. For more information, see "[About dependency review](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement)."
+ - |
+ The dependency graph detects _Cargo.toml_ and _Cargo.lock_ files for Rust. These files will be displayed in the **Dependency graph** section of the **Insights** tab. Users will receive Dependabot alerts and updates for vulnerabilities associated with their Rust dependencies. Package metadata, including mapping packages to repositories, will be added at a later date. For more information, see "[About the dependency graph](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph)."
+ - |
+ If GitHub Connect is enabled for your instance, users can contribute an improvement to a security advisory in the [GitHub Advisory Database](https://github.com/advisories). To contribute, click **Suggest improvements for this vulnerability** while viewing an advisory's details. For more information, see the following articles.
+
+ - "[Managing GitHub Connect](/admin/configuration/configuring-github-connect/managing-github-connect)"
+ - "[Browsing security vulnerabilities in the GitHub Advisory Database](/enterprise-cloud@latest/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/browsing-security-vulnerabilities-in-the-github-advisory-database)" in the GitHub Enterprise Cloud documentation
+ - "[About GitHub Security Advisories for repositories](/enterprise-cloud@latest/code-security/repository-security-advisories/about-github-security-advisories-for-repositories)" in the GitHub Enterprise Cloud documentation
+ - "[Editing security advisories in the GitHub Advisory Database](/enterprise-cloud@latest/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/editing-security-advisories-in-the-github-advisory-database)" in the GitHub Enterprise Cloud documentation
+ -
+ heading: GitHub Actions
+ notes:
+ - |
+ Within a workflow that calls a reusable workflow, users can pass the secrets to the reusable workflow with `secrets: inherit`. For more information, see "[Reusing workflows](/actions/using-workflows/reusing-workflows#using-inputs-and-secrets-in-a-reusable-workflow)."
+ - |
+ When using GitHub Actions, to reduce the risk of merging a change that was not reviewed by another person into a protected branch, enterprise owners and repository administrators can prevent Actions from creating pull requests. Organization owners could previously enable this restriction. For more information, see the following articles.
+
+ - "[Enforcing policies for GitHub Actions in your enterprise](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-github-actions-in-your-enterprise#preventing-github-actions-from-creating-or-approving-pull-requests)"
+ - "[Disabling or limiting GitHub Actions for your organization](/organizations/managing-organization-settings/disabling-or-limiting-github-actions-for-your-organization#preventing-github-actions-from-creating-or-approving-pull-requests)"
+ - "[Managing GitHub Actions settings for a repository](/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository#preventing-github-actions-from-creating-or-approving-pull-requests)"
+ - |
+ Users can write a single workflow triggered by `workflow_dispatch` and `workflow_call`, and use the `inputs` context to access input values. Previously, `workflow_dispatch` inputs were in the event payload, which increased difficulty for workflow authors who wanted to write one workflow that was both reusable and manually triggered. For workflows triggered by `workflow_dispatch`, inputs are still available in the `github.event.inputs` context to maintain compatibility. For more information, see "[Contexts](/actions/learn-github-actions/contexts#inputs-context)."
+ - |
+ To summarize the result of a job, users can generate Markdown and publish the contents as a job summary. For example, after running tests with GitHub Actions, a summary can provide an overview of passed, failed, or skipped tests, potentially reducing the need to review the full log output. For more information, see "[Workflow commands for GitHub Actions](/actions/using-workflows/workflow-commands-for-github-actions#adding-a-job-summary)."
+ - |
+ To more easily diagnose job execution failures during a workflow re-run, users can enable debug logging, which outputs information about a job's execution and environment. For more information, see "[Re-running workflows and jobs](/actions/managing-workflow-runs/re-running-workflows-and-jobs)" and "[Using workflow run logs](/actions/monitoring-and-troubleshooting-workflows/using-workflow-run-logs#viewing-logs-to-diagnose-failures)."
+ - |
+ If you manage self-hosted runners for GitHub Actions, you can ensure a consistent state on the runner itself before and after a workflow run by defining scripts to execute. By using scripts, you no longer need to require that users manually incorporate these steps into workflows. Pre- and post-job scripts are in beta and subject to change. For more information, see "[Running scripts before or after a job](/actions/hosting-your-own-runners/running-scripts-before-or-after-a-job)."
+ -
+ heading: GitHub Packages
+ notes:
+ - |
+ Enterprise owners can migrate container images from the GitHub Docker registry to the GitHub Container registry. The Container registry provides the following benefits.
+
+ - Improves the sharing of containers within an organization
+ - Allows the application of granular access permissions
+ - Permits the anonymous sharing of public container images
+ - Implements OCI standards for hosting Docker images
+
+ The Container registry is in beta and subject to change. For more information, see "[Migrating your enterprise to the Container registry from the Docker registry](/admin/packages/migrating-your-enterprise-to-the-container-registry-from-the-docker-registry)."
+ -
+ heading: Community experience
+ notes:
+ - |
+ GitHub Discussions is available for GitHub Enterprise Server. GitHub Discussions provides a central gathering space to ask questions, share ideas, and build connections. For more information, see "[GitHub Discussions](/discussions)."
+ - |
+ Enterprise owners can configure a policy to control whether people's usernames or full names are displayed within internal or public repositories. For more information, see "[Enforcing repository management policies in your enterprise](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-repository-management-policies-in-your-enterprise#enforcing-a-policy-for-the-display-of-member-names-in-your-repositories)."
+ -
+ heading: 组织
+ notes:
+ - |
+ Users can create member-only READMEs for an organization. For more information, see "[Customizing your organization's profile](/organizations/collaborating-with-groups-in-organizations/customizing-your-organizations-profile)."
+ - |
+ Organization owners can pin a repository to an organization's profile directly from the repository via the new **Pin repository** dropdown. Pinned public repositories appear to all users of your instance, while public, private, and internal repositories are only visible to organization members.
+ -
+ heading: 仓库
+ notes:
+ - |
+ While creating a fork, users can customize the fork's name. For more information, see "[Fork a repo](/get-started/quickstart/fork-a-repo)."
+ - |
+ Users can block creation of branches that match a configured name pattern with the **Restrict pushes that create matching branches** branch protection rule. For example, if a repository's default branch changes from `master` to `main`, a repository administrator can prevent any subsequent creation or push of the `master` branch. For more information, see
+ "[About protected branches](/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/about-protected-branches#restrict-who-can-push-to-matching-branches)" and "[Managing a branch protection rule](/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule#creating-a-branch-protection-rule)."
+ - |
+ Users can create a branch directly from a repository's **Branches** page by clicking the **New branch**. For more information, see "[Creating and deleting branches within your repository](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-and-deleting-branches-within-your-repository)."
+ - |
+ Users can delete a branch that's associated with an open pull request. For more information, see "[Creating and deleting branches within your repository](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-and-deleting-branches-within-your-repository)."
+ - |
+ Repositories with multiple licenses display all of the licenses in the "About" sidebar on the {% octicon "code" aria-label="The code icon" %} **Code** tab. For more information, see "[Licensing a repository](/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/licensing-a-repository)."
+ - When a user renames or moves a file to a new directory, if at least half of the file's contents are identical, the commit history indicates that the file was renamed, similar to `git log --follow`. For more information, see the [GitHub Blog](https://github.blog/changelog/2022-06-06-view-commit-history-across-file-renames-and-moves/).
+ - |
+ Users can require a successful deployment of a branch before anyone can merge the pull request associated with the branch. For more information, see "[About protected branches](/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/about-protected-branches#require-deployments-to-succeed-before-merging)" and "[Managing a branch protection rule](/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule)."
+ - |
+ Enterprise owners can prevent organization owners from inviting collaborators to repositories on the instance. For more information, see "[Enforcing a policy for inviting collaborators to repositories](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-repository-management-policies-in-your-enterprise#enforcing-a-policy-for-inviting-collaborators-to-repositories)."
+ - |
+ Users can grant exceptions to GitHub Apps for any branch protection rule that supports exceptions. For more information, see "[About apps](/developers/apps/getting-started-with-apps/about-apps)" and "[Managing a branch protection rule](/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule)."
+ -
+ heading: 提交
+ notes:
+ - |
+ For public GPG signing keys that are expired or revoked, GitHub Enterprise Server verifies Git commit signatures and show commits as verified if the user made the commit while the key was still valid. Users can also upload expired or revoked GPG keys. For more information, see "[About commit signature verification](/authentication/managing-commit-signature-verification/about-commit-signature-verification)."
+ - |
+ To affirm that a commit complies with the rules and licensing governing a repository, organization owners and repository administrators can now require developers to sign off on commits made through the web interface. For more information, see "[Managing the commit signoff policy for your organization](/organizations/managing-organization-settings/managing-the-commit-signoff-policy-for-your-organization)" and "[Managing the commit signoff policy for your repository](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-the-commit-signoff-policy-for-your-repository)."
+ -
+ heading: 拉取请求
+ notes:
+ - |
+ Using the file tree located in the **Files changed** tab of a pull request, users can navigate modified files, understand the size and scope of changes, and focus reviews. The file tree appears if a pull request modifies at least two files, and the browser window is sufficiently wide. For more information, see "[Reviewing proposed changes in a pull request](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request)" and "[Filtering files in a pull request](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/filtering-files-in-a-pull-request)."
+ - |
+ Users can default to using pull requests titles as the commit message for all squash merges. For more information, see "[Configuring commit squashing for pull requests](/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-squashing-for-pull-requests)."
+ -
+ heading: 版本发布
+ notes:
+ - |
+ When viewing the details for a particular release, users can see the creation date for each release asset. For more information, see "[Viewing your repository's releases and tags](/repositories/releasing-projects-on-github/viewing-your-repositorys-releases-and-tags)."
+ - While creating a release with automatically generated release notes, users can see the tag identified as the previous release, then choose to select a different tag to specify as the previous release. For more information, see "[Automatically generated release notes](/repositories/releasing-projects-on-github/automatically-generated-release-notes)."
+ -
+ heading: Markdown
+ notes:
+ - |
+ Editing Markdown in the web interface has been improved.
+
+ - After a user selects text and pastes a URL, the selected text will become a Markdown link to the pasted URL.
+ - When a user pastes spreadsheet cells or HTML tables, the resulting text will render as a table.
+ - When a user copies text containing links, the pasted text will include the link as a Markdown link.
+
+ For more information, see "[Basic writing and formatting syntax](/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax#links)."
+ - |
+ When editing a Markdown file in the web interface, clicking the **Preview** tab will automatically scroll to the place in the preview that you were editing. The scroll location is based on the position of your cursor before you clicked the **Preview** tab.
+ changes:
+ - Interactive elements in the web interface such as links and buttons show a visible outline when focused with a keyboard, to help users find the current position on a page. In addition, when focused, form fields have a higher contrast outline.
+ - If a user refreshes the page while creating a new issue or pull request, the assignees, reviewers, labels and projects will all be preserved.
+ known_issues:
+ - 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 实例上，攻击者可以创建第一个管理员用户。
+ - 自定义防火墙规则在升级过程中被删除。
+ - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
+ - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接，则议题无法关闭。
+ - 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后，私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
+ - '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分，我们继续拥有返回时间值所需的所有数据，并将在我们解决现有性能问题后恢复返回这个值。'
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
+ - Actions services need to be restarted after restoring an instance from a backup taken on a different host.
+ - In a repository's settings, enabling the option to allow users with read access to create discussions does not enable this functionality.
+ - In some cases, users cannot convert existing issues to discussions.
+ - Custom patterns for secret scanning have `.*` as an end delimiter, specifically in the "After secret" field. This delimiter causes inconsistencies in scans for secrets across repositories, and you may notice gaps in a repository's history where no scans completed. Incremental scans may also be impacted. To prevent issues with scans, modify the end of the pattern to remove the `.*` delimiter.
diff --git a/translations/zh-CN/data/reusables/actions/hardware-requirements-3.6.md b/translations/zh-CN/data/reusables/actions/hardware-requirements-3.6.md
new file mode 100644
index 0000000000..ed19d78a28
--- /dev/null
+++ b/translations/zh-CN/data/reusables/actions/hardware-requirements-3.6.md
@@ -0,0 +1,6 @@
+| vCPU | 内存 | Maximum Connected Runners |
+|:---- |:------ |:------------------------- |
+| 8 | 64 GB | 740 runners |
+| 32 | 160 GB | 2700 runners |
+| 96 | 384 GB | 7000 runners |
+| 128 | 512 GB | 7000 runners |
diff --git a/translations/zh-CN/data/reusables/actions/runner-debug-description.md b/translations/zh-CN/data/reusables/actions/runner-debug-description.md
new file mode 100644
index 0000000000..b90948ae47
--- /dev/null
+++ b/translations/zh-CN/data/reusables/actions/runner-debug-description.md
@@ -0,0 +1 @@
+This is set only if [debug logging](/actions/monitoring-and-troubleshooting-workflows/enabling-debug-logging) is enabled, and always has the value of `1`. It can be useful as an indicator to enable additional debugging or verbose logging in your own job steps.
diff --git a/translations/zh-CN/data/reusables/education/about-github-education-link.md b/translations/zh-CN/data/reusables/education/about-github-education-link.md
index 7548ce9941..380c09338d 100644
--- a/translations/zh-CN/data/reusables/education/about-github-education-link.md
+++ b/translations/zh-CN/data/reusables/education/about-github-education-link.md
@@ -1,3 +1,3 @@
-作为认证的教育机构的学生或教职员工，您可以申请 {% data variables.product.prodname_education %} 福利，包括访问 {% data variables.product.prodname_global_campus %}。 {% data variables.product.prodname_global_campus %} 是一个门户，允许 GitHub 教育社区访问他们的教育福利 - 集中在一个位置！ The {% data variables.product.prodname_global_campus %} portal includes access to {% data variables.product.prodname_education_community_with_url %}, industry tools used by professional developers, events, [Campus TV](https://www.twitch.tv/githubeducation) content, {% data variables.product.prodname_classroom_with_url %}, {% data variables.product.prodname_community_exchange %}, and other exclusive features to help students and teachers shape the next generation of software development.
+As a student or faculty member at an accredited educational institution, you can apply for {% data variables.product.prodname_global_campus %}. {% data variables.product.prodname_global_campus %} 是一个门户，允许 GitHub 教育社区访问他们的教育福利 - 集中在一个位置！ The {% data variables.product.prodname_global_campus %} portal includes access to {% data variables.product.prodname_education_community_with_url %}, industry tools used by professional developers, events, [Campus TV](https://www.twitch.tv/githubeducation) content, {% data variables.product.prodname_classroom_with_url %}, [{% data variables.product.prodname_community_exchange %}](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/about-github-community-exchange), {% data variables.product.prodname_student_pack %}, and other exclusive features to help students and teachers shape the next generation of software development.
在申请个人折扣之前，请检查您的学习社区是否已作为 {% data variables.product.prodname_campus_program %} 学校与我们合作。 更多信息请参阅“[关于 {% data variables.product.prodname_campus_program %}](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-github-campus-program)”。
diff --git a/translations/zh-CN/data/reusables/education/access-github-community-exchange.md b/translations/zh-CN/data/reusables/education/access-github-community-exchange.md
index b482e8be96..98d2c9f6e0 100644
--- a/translations/zh-CN/data/reusables/education/access-github-community-exchange.md
+++ b/translations/zh-CN/data/reusables/education/access-github-community-exchange.md
@@ -2,6 +2,6 @@ To access {% data variables.product.prodname_community_exchange %}, visit your {
If you're a student or faculty member at an accredited educational institution, you can apply for {% data variables.product.prodname_education %} benefits, which includes access to {% data variables.product.prodname_community_exchange %} within {% data variables.product.prodname_global_campus %}.
-- If you’re a student and you haven't joined {% data variables.product.prodname_education %} yet, apply using the [student application form]( https://education.github.com/discount_requests/student_application). For more information, see "[About GitHub Education for students](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/about-github-education-for-students)."
+- If you’re a student and you haven't joined {% data variables.product.prodname_education %} yet, apply using the [student application form]( https://education.github.com/discount_requests/student_application). For more information, see "[About {% data variables.product.prodname_global_campus %} for students](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/about-github-global-campus-for-students)."
-- If you’re an educator and you haven't joined {% data variables.product.prodname_education %} yet, apply using the [teacher application form]( https://education.github.com/discount_requests/teacher_application). For more information, see "[About GitHub Education for educators](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research/apply-for-an-educator-or-researcher-discount)."
+- If you’re an educator and you haven't joined {% data variables.product.prodname_education %} yet, apply using the [teacher application form]( https://education.github.com/discount_requests/teacher_application). For more information, see "[Apply to {% data variables.product.prodname_global_campus %} as a teacher](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/apply-to-github-global-campus-as-a-teacher)."
diff --git a/translations/zh-CN/data/reusables/education/apply-for-team.md b/translations/zh-CN/data/reusables/education/apply-for-team.md
index 4c3c8e68b2..952bcf5815 100644
--- a/translations/zh-CN/data/reusables/education/apply-for-team.md
+++ b/translations/zh-CN/data/reusables/education/apply-for-team.md
@@ -1 +1 @@
-- 申请免费 [{% data variables.product.prodname_team %}](/articles/github-s-products)，允许无限制的用户和私有仓库。 更多信息请参阅“[申请教育者或研究人员折扣](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-an-educator-or-researcher-discount)”。
+- 申请免费 [{% data variables.product.prodname_team %}](/articles/github-s-products)，允许无限制的用户和私有仓库。 For more information, see "[Apply to {% data variables.product.prodname_global_campus %} as a teacher](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/apply-to-github-global-campus-as-a-teacher)."
diff --git a/translations/zh-CN/data/reusables/education/educator-requirements.md b/translations/zh-CN/data/reusables/education/educator-requirements.md
index bc06c7424e..3ce352c6a8 100644
--- a/translations/zh-CN/data/reusables/education/educator-requirements.md
+++ b/translations/zh-CN/data/reusables/education/educator-requirements.md
@@ -1,4 +1,4 @@
-要申请教育工作者或研究人员折扣，您必须满足以下要求。
+To apply for teacher benefits and {% data variables.product.prodname_global_campus %} access, you must meet the following requirements.
- 是教育者、教师或研究人员.
- 具有学校分发的可验证电子邮件地址.
diff --git a/translations/zh-CN/data/reusables/enterprise/3-5-missing-feature.md b/translations/zh-CN/data/reusables/enterprise/3-5-missing-feature.md
new file mode 100644
index 0000000000..bc357a5174
--- /dev/null
+++ b/translations/zh-CN/data/reusables/enterprise/3-5-missing-feature.md
@@ -0,0 +1,11 @@
+{% ifversion ghes = 3.5 %}
+
+{% note %}
+
+**Note**: This feature was unavailable in GitHub Enterprise Server 3.5.0, 3.5.1, 3.5.2, and 3.5.3. The feature is available in 3.5.4 and later. For more information about upgrades, contact your site administrator.
+
+For more information about determining the version of {% data variables.product.product_name %} you're using, see "[About versions of {% data variables.product.prodname_docs %}](/get-started/learning-about-github/about-versions-of-github-docs#github-enterprise-server)."
+
+{% endnote %}
+
+{% endif %}
diff --git a/translations/zh-CN/data/reusables/gated-features/codespaces-classroom-articles.md b/translations/zh-CN/data/reusables/gated-features/codespaces-classroom-articles.md
index 120cc15e18..924aac0d15 100644
--- a/translations/zh-CN/data/reusables/gated-features/codespaces-classroom-articles.md
+++ b/translations/zh-CN/data/reusables/gated-features/codespaces-classroom-articles.md
@@ -1 +1 @@
-Codespaces is available to use with {% data variables.product.prodname_classroom %} for organizations that use {% data variables.product.prodname_team %}. To find out if you qualify for a free upgrade to {% data variables.product.prodname_team %}, see "[Apply for an educator or researcher discount](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research/apply-for-an-educator-or-researcher-discount)."
+Codespaces is available to use with {% data variables.product.prodname_classroom %} for organizations that use {% data variables.product.prodname_team %}. To find out if you qualify for a free upgrade to {% data variables.product.prodname_team %}, see "[Apply to {% data variables.product.prodname_global_campus %} as a teacher](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/apply-to-github-global-campus-as-a-teacher)."
diff --git a/translations/zh-CN/data/reusables/gated-features/codespaces.md b/translations/zh-CN/data/reusables/gated-features/codespaces.md
index 04b424cfd7..61b7cf868c 100644
--- a/translations/zh-CN/data/reusables/gated-features/codespaces.md
+++ b/translations/zh-CN/data/reusables/gated-features/codespaces.md
@@ -1 +1 @@
-{% data variables.product.prodname_github_codespaces %} 可用于使用 {% data variables.product.prodname_team %} 或 {% data variables.product.prodname_ghe_cloud %} 的组织。 {% data reusables.gated-features.more-info-org-products %}
+{% data variables.product.prodname_github_codespaces %} 可用于使用 {% data variables.product.prodname_team %} 或 {% data variables.product.prodname_ghe_cloud %} 的组织。 {% data variables.product.prodname_github_codespaces %} is also available as a limited beta release for individual users on {% data variables.product.prodname_free_user %} and {% data variables.product.prodname_pro %} plans. {% data reusables.gated-features.more-info-org-products %}
diff --git a/translations/zh-CN/data/reusables/gpg/paste-gpg-key-id.md b/translations/zh-CN/data/reusables/gpg/paste-gpg-key-id.md
index e852b26a73..1382c8011f 100644
--- a/translations/zh-CN/data/reusables/gpg/paste-gpg-key-id.md
+++ b/translations/zh-CN/data/reusables/gpg/paste-gpg-key-id.md
@@ -1,4 +1,9 @@
-1. 要在 Git 中设置 GPG 签名密钥，请粘贴下面的文本，替换您想要使用的 GPG 密钥 ID。 在此例中，GPG 密钥 ID 是 `3AA5C34371567BD2`：
- ```shell
-$ git config --global user.signingkey 3AA5C34371567BD2
-```
+1. To set your primary GPG signing key in Git, paste the text below, substituting in the GPG primary key ID you'd like to use. 在此例中，GPG 密钥 ID 是 `3AA5C34371567BD2`：
+ ```shell
+ $ git config --global user.signingkey 3AA5C34371567BD2
+ ```
+
+ Alternatively, when setting a subkey include the `!` suffix. In this example, the GPG subkey ID is `4BB6D45482678BE3`:
+ ```shell
+ $ git config --global user.signingkey 4BB6D45482678BE3!
+ ```
diff --git a/translations/zh-CN/data/reusables/projects/owners-can-limit-visibility-permissions.md b/translations/zh-CN/data/reusables/projects/owners-can-limit-visibility-permissions.md
new file mode 100644
index 0000000000..3edc1f385e
--- /dev/null
+++ b/translations/zh-CN/data/reusables/projects/owners-can-limit-visibility-permissions.md
@@ -0,0 +1 @@
+Organization owners can control the ability of organization members to create public {% data variables.projects.projects_v2_and_v1 %}, or change the visibility of existing {% data variables.projects.projects_v2_and_v1 %} to public. For more information, see "[Allowing project visibility changes in your organization](/organizations/managing-organization-settings/allowing-project-visibility-changes-in-your-organization)."
\ No newline at end of file
diff --git a/translations/zh-CN/data/reusables/release-notes/ghas-3.4-secret-scanning-known-issue.md b/translations/zh-CN/data/reusables/release-notes/ghas-3.4-secret-scanning-known-issue.md
new file mode 100644
index 0000000000..313d4af669
--- /dev/null
+++ b/translations/zh-CN/data/reusables/release-notes/ghas-3.4-secret-scanning-known-issue.md
@@ -0,0 +1,16 @@
+{% ifversion ghes > 3.1 or ghes < 3.5 %}
+
+In some cases, GitHub Advanced Security customers who upgrade to GitHub Enterprise Server 3.5 or later may notice that alerts from secret scanning are missing in the web UI and REST API. To ensure the alerts remain visible, do not skip 3.4 when you upgrade from an earlier release to 3.5 or later. A fix for 3.5 and later will be available in an upcoming patch release.
+
+To plan an upgrade through 3.4, see the [Upgrade assistant](https://support.github.com/enterprise/server-upgrade). [Updated: 2022-08-16]
+
+{% elsif ghes > 3.4 or ghes < 3.7 %}
+
+In some cases, GitHub Advanced Security customers who upgrade to GitHub Enterprise Server {{ currentVersion }} may notice that alerts from secret scanning are missing in the web UI and REST API. To ensure the alerts remain visible, do not skip 3.4 as you upgrade to the latest release. To plan an upgrade through 3.4, see the [Upgrade assistant](https://support.github.com/enterprise/server-upgrade).
+
+- To display the missing alerts for all repositories owned by an organization, organization owners can navigate to the organization's **Code security and analysis** settings, then click **Enable all** for secret scanning. 更多信息请参阅“[管理组织的安全和分析设置](/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization#enabling-or-disabling-a-feature-for-all-existing-repositories)”。
+- To display the missing alerts for an individual repository, people with admin access to the repository can disable then enable secret scanning for the repository. 更多信息请参阅“[管理仓库的安全和分析设置](/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-security-and-analysis-settings-for-your-repository)”。
+
+A fix will be available in an upcoming patch release. [Updated: 2022-08-16]
+
+{% endif %}
diff --git a/translations/zh-CN/data/reusables/repositories/squash-and-rebase-linear-commit-hisitory.md b/translations/zh-CN/data/reusables/repositories/squash-and-rebase-linear-commit-history.md
similarity index 100%
rename from translations/zh-CN/data/reusables/repositories/squash-and-rebase-linear-commit-hisitory.md
rename to translations/zh-CN/data/reusables/repositories/squash-and-rebase-linear-commit-history.md
diff --git a/translations/zh-CN/data/reusables/secret-scanning/push-protection-command-line-choice.md b/translations/zh-CN/data/reusables/secret-scanning/push-protection-command-line-choice.md
new file mode 100644
index 0000000000..cc38b8b452
--- /dev/null
+++ b/translations/zh-CN/data/reusables/secret-scanning/push-protection-command-line-choice.md
@@ -0,0 +1 @@
+当您尝试将受支持的密钥推送到启用了 {% data variables.product.prodname_secret_scanning %} 作为推送保护的存储库或组织时，{% data variables.product.prodname_dotcom %} 将阻止推送。 You can remove the secret from your branch or follow a provided URL to allow the push.
diff --git a/translations/zh-CN/data/reusables/secret-scanning/push-protection-multiple-branch-note.md b/translations/zh-CN/data/reusables/secret-scanning/push-protection-multiple-branch-note.md
new file mode 100644
index 0000000000..69c2c51925
--- /dev/null
+++ b/translations/zh-CN/data/reusables/secret-scanning/push-protection-multiple-branch-note.md
@@ -0,0 +1,8 @@
+{% note %}
+
+**注意**：
+
+* If your git configuration supports pushes to multiple branches, and not only to the current branch, your push may be blocked due to additional and unintended refs being pushed. For more information, see the [`push.default` options](https://git-scm.com/docs/git-config#Documentation/git-config.txt-pushdefault) in the Git documentation.
+* If {% data variables.product.prodname_secret_scanning %} upon a push times out, {% data variables.product.prodname_dotcom %} will still scan your commits for secrets after the push.
+
+{% endnote %}
diff --git a/translations/zh-CN/data/reusables/secret-scanning/push-protection-remove-secret.md b/translations/zh-CN/data/reusables/secret-scanning/push-protection-remove-secret.md
new file mode 100644
index 0000000000..d4fd0e390e
--- /dev/null
+++ b/translations/zh-CN/data/reusables/secret-scanning/push-protection-remove-secret.md
@@ -0,0 +1 @@
+If you confirm a secret is real, you need to remove the secret from your branch, _from all the commits it appears in_, before pushing again.
\ No newline at end of file
diff --git a/translations/zh-CN/data/reusables/secret-scanning/push-protection-web-ui-choice.md b/translations/zh-CN/data/reusables/secret-scanning/push-protection-web-ui-choice.md
new file mode 100644
index 0000000000..250e5c68e6
--- /dev/null
+++ b/translations/zh-CN/data/reusables/secret-scanning/push-protection-web-ui-choice.md
@@ -0,0 +1,6 @@
+当您使用 Web UI 尝试将受支持的密钥提交到启用了机密扫描作为推送保护的存储库或组织时，{% data variables.product.prodname_dotcom %} 将阻止提交。
+
+您将在页面顶部看到一个横幅，其中包含有关密钥位置的信息，并且密钥也将在文件中加下划线，以便您可以轻松找到它。
+
+ 
+
\ No newline at end of file
diff --git a/translations/zh-CN/data/ui.yml b/translations/zh-CN/data/ui.yml
index 4d408236e7..94597dcfdf 100644
--- a/translations/zh-CN/data/ui.yml
+++ b/translations/zh-CN/data/ui.yml
@@ -5,7 +5,7 @@ header:
github_docs: GitHub Docs
contact: 联系我们
notices:
- ghae_silent_launch: GitHub AE 目前是有限发行版。请联系我们的销售团队以了解更多信息。
+ ghae_silent_launch: GitHub AE is currently under limited release.
release_candidate: '# 版本名称是通过 includes/header-notification.html 在以下文本之前呈现：目前可用作发行版候选。更多信息请参阅“关于升级到新版本”。'
localization_complete: We publish frequent updates to our documentation, and translation of this page may still be in progress. For the most current information, please visit the English documentation.
early_access: '📣请不要公开分享此 URL，该页面包含有关早期访问功能的内容。'
diff --git a/translations/zh-CN/data/variables/projects.yml b/translations/zh-CN/data/variables/projects.yml
index 7d2696bf33..d2ca299210 100644
--- a/translations/zh-CN/data/variables/projects.yml
+++ b/translations/zh-CN/data/variables/projects.yml
@@ -11,3 +11,6 @@ projects_v1_boards: >-
projects_v1_boards_caps: >-
{% ifversion ghes or ghae %}Project boards{% else %}Classic projects{% endif %}
command-palette-shortcut: 'Command+K (Mac) or Ctrl+K (Windows/Linux)'
+#Use feature flags to return which projects versions are available.
+projects_v2_and_v1: '{% ifversion projects-v2 %}{% data variables.projects.projects_v2 %}{% ifversion projects-v1 %} and {% data variables.projects.projects_v1_boards %}{% endif %}{% else %}{% data variables.projects.projects_v1_boards %}{% endif %}'
+project_v2_and_v1: '{% ifversion projects-v2 %}{% data variables.projects.project_v2 %}{% ifversion projects-v1 %} and {% data variables.projects.projects_v1_board %}{% endif %}{% else %}{% data variables.projects.projects_v1_board %}{% endif %}'
diff --git a/translations/zh-CN/data/variables/release_candidate.yml b/translations/zh-CN/data/variables/release_candidate.yml
index d39e7c0f8d..ec65ef6f94 100644
--- a/translations/zh-CN/data/variables/release_candidate.yml
+++ b/translations/zh-CN/data/variables/release_candidate.yml
@@ -1,2 +1,2 @@
---
-version: enterprise-server@3.6
+version: ''