From {% data variables.product.product_name %} to {% data variables.product.prodname_dotcom_the_website %} | {% data variables.product.product_name %} -| Unified search | Search terms, search results | From {% data variables.product.prodname_dotcom_the_website %} to {% data variables.product.product_name %}
From {% data variables.product.product_name %} to {% data variables.product.prodname_dotcom_the_website %} | {% data variables.product.product_name %} -| Unified contributions | Contribution counts | From {% data variables.product.product_name %} to {% data variables.product.prodname_dotcom_the_website %} | {% data variables.product.prodname_dotcom_the_website %} +| 功能 | Data | Which way does the data flow? | Where is the data used? | +| ------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ----------------------------------------------------------------------------------------------------- |{% ifversion ghes %} +| Automatic user license sync | Each {% data variables.product.product_name %} user's user ID and email addresses | From {% data variables.product.product_name %} to {% data variables.product.prodname_ghe_cloud %} | {% data variables.product.prodname_ghe_cloud %} |{% endif %}{% ifversion ghes or ghae-issue-4864 %} +| {% data variables.product.prodname_dependabot_alerts %} | Vulnerability alerts | From {% data variables.product.prodname_dotcom_the_website %} to {% data variables.product.product_name %} | {% data variables.product.product_name %} |{% endif %}{% if dependabot-updates-github-connect %} +| {% data variables.product.prodname_dependabot_updates %} | Dependencies and the metadata for each dependency's repository
If a dependency is stored in a private repository on {% data variables.product.prodname_dotcom_the_website %}, data will only be transmitted if {% data variables.product.prodname_dependabot %} is configured and authorized to access that repository. | From {% data variables.product.prodname_dotcom_the_website %} to {% data variables.product.product_name %} | {% data variables.product.product_name %} {% endif %} +| {% data variables.product.prodname_dotcom_the_website %} actions | Name of action, action (YAML file from {% data variables.product.prodname_marketplace %}) | From {% data variables.product.prodname_dotcom_the_website %} to {% data variables.product.product_name %}
From {% data variables.product.product_name %} to {% data variables.product.prodname_dotcom_the_website %} | {% data variables.product.product_name %} +| Unified search | Search terms, search results | From {% data variables.product.prodname_dotcom_the_website %} to {% data variables.product.product_name %}
From {% data variables.product.product_name %} to {% data variables.product.prodname_dotcom_the_website %} | {% data variables.product.product_name %} +| Unified contributions | Contribution counts | From {% data variables.product.product_name %} to {% data variables.product.prodname_dotcom_the_website %} | {% data variables.product.prodname_dotcom_the_website %} ## 延伸阅读 diff --git a/translations/zh-CN/content/admin/configuration/configuring-github-connect/enabling-automatic-user-license-sync-for-your-enterprise.md b/translations/zh-CN/content/admin/configuration/configuring-github-connect/enabling-automatic-user-license-sync-for-your-enterprise.md index 73665631cc32..718b426ffc75 100644 --- a/translations/zh-CN/content/admin/configuration/configuring-github-connect/enabling-automatic-user-license-sync-for-your-enterprise.md +++ b/translations/zh-CN/content/admin/configuration/configuring-github-connect/enabling-automatic-user-license-sync-for-your-enterprise.md @@ -7,7 +7,7 @@ redirect_from: - /admin/configuration/enabling-automatic-user-license-sync-between-github-enterprise-server-and-github-enterprise-cloud - /admin/configuration/managing-connections-between-github-enterprise-server-and-github-enterprise-cloud/enabling-automatic-user-license-sync-between-github-enterprise-server-and-github-enterprise-cloud - /admin/configuration/managing-connections-between-your-enterprise-accounts/enabling-automatic-user-license-sync-between-github-enterprise-server-and-github-enterprise-cloud -permissions: 'Site administrators for {% data variables.product.prodname_ghe_server %} who are also owners of the connected {% data variables.product.prodname_ghe_cloud %} organization or enterprise account can enable automatic user license synchronization.' +permissions: Enterprise owners can enable automatic user license synchronization. versions: ghes: '*' type: how_to diff --git a/translations/zh-CN/content/admin/configuration/configuring-github-connect/enabling-dependabot-for-your-enterprise.md b/translations/zh-CN/content/admin/configuration/configuring-github-connect/enabling-dependabot-for-your-enterprise.md new file mode 100644 index 000000000000..3429b7873461 --- /dev/null +++ b/translations/zh-CN/content/admin/configuration/configuring-github-connect/enabling-dependabot-for-your-enterprise.md @@ -0,0 +1,126 @@ +--- +title: Enabling Dependabot for your enterprise +intro: 'You can allow users of {% data variables.product.product_location %} to find and fix vulnerabilities in code dependencies by enabling {% data variables.product.prodname_dependabot_alerts %}{% ifversion ghes > 3.2 %} and {% data variables.product.prodname_dependabot_updates %}{% endif %}.' +miniTocMaxHeadingLevel: 3 +shortTitle: Dependabot +redirect_from: + - /enterprise/admin/installation/enabling-security-alerts-for-vulnerable-dependencies-on-github-enterprise-server + - /enterprise/admin/configuration/enabling-security-alerts-for-vulnerable-dependencies-on-github-enterprise-server + - /enterprise/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server + - /admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server + - /admin/configuration/managing-connections-between-github-enterprise-server-and-github-enterprise-cloud/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server + - /admin/configuration/managing-connections-between-your-enterprise-accounts/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server + - /admin/configuration/managing-connections-between-your-enterprise-accounts/enabling-the-dependency-graph-and-dependabot-alerts-on-your-enterprise-account + - /admin/configuration/configuring-github-connect/enabling-the-dependency-graph-and-dependabot-alerts-for-your-enterprise +permissions: 'Enterprise owners can enable {% data variables.product.prodname_dependabot %}.' +versions: + ghes: '*' + ghae: issue-4864 +type: how_to +topics: + - Enterprise + - Security + - Dependency graph + - Dependabot +--- + +## About {% data variables.product.prodname_dependabot %} for {% data variables.product.product_name %} + +{% data variables.product.prodname_dependabot %} helps users of {% data variables.product.product_location %} find and fix vulnerabilities in their dependencies.{% ifversion ghes > 3.2 %} You can enable {% data variables.product.prodname_dependabot_alerts %} to notify users about vulnerable dependencies and {% data variables.product.prodname_dependabot_updates %} to fix the vulnerabilities and keep dependencies updated to the latest version. + +### About {% data variables.product.prodname_dependabot_alerts %} +{% endif %} + +{% data reusables.dependabot.dependabot-alerts-beta %} + +With {% data variables.product.prodname_dependabot_alerts %}, {% data variables.product.prodname_dotcom %} identifies vulnerable dependencies in repositories and creates alerts on {% data variables.product.product_location %}, using data from the {% data variables.product.prodname_advisory_database %} and the dependency graph service. + +{% data reusables.repositories.tracks-vulnerabilities %} + +After you enable {% data variables.product.prodname_dependabot_alerts %} for your enterprise, vulnerability data is synced from the {% data variables.product.prodname_advisory_database %} to your instance once every hour. Only {% data variables.product.company_short %}-reviewed advisories are synchronized. {% data reusables.security-advisory.link-browsing-advisory-db %} + +You can also choose to manually sync vulnerability data at any time. For more information, see "[Viewing the vulnerability data for your enterprise](/admin/code-security/managing-supply-chain-security-for-your-enterprise/viewing-the-vulnerability-data-for-your-enterprise)." + +{% note %} + +**Note:** When you enable enable {% data variables.product.prodname_dependabot_alerts %}, no code or information about code from {% data variables.product.product_location %} is uploaded to {% data variables.product.prodname_dotcom_the_website %}. + +{% endnote %} + +When {% data variables.product.product_location %} receives information about a vulnerability, it identifies repositories in {% data variables.product.product_location %} that use the affected version of the dependency and generates {% data variables.product.prodname_dependabot_alerts %}. You can choose whether or not to notify users automatically about new {% data variables.product.prodname_dependabot_alerts %}. + +For repositories with {% data variables.product.prodname_dependabot_alerts %} enabled, scanning is triggered on any push to the default branch that contains a manifest file or lock file. Additionally, when a new vulnerability record is added to {% data variables.product.product_location %}, {% data variables.product.product_name %} scans all existing repositories on {% data variables.product.product_location %} and generates alerts for any repository that is vulnerable. 更多信息请参阅“[关于易受攻击的依赖项的警报](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)”。 + +{% ifversion ghes > 3.2 %} +### About {% data variables.product.prodname_dependabot_updates %} + +{% data reusables.dependabot.beta-security-and-version-updates %} + +After you enable {% data variables.product.prodname_dependabot_alerts %}, you can choose to enable {% data variables.product.prodname_dependabot_updates %}. When {% data variables.product.prodname_dependabot_updates %} are enabled for {% data variables.product.product_location %}, users can configure repositories so that their dependencies are updated and kept secure automatically. + +{% note %} + +**Note:** {% data variables.product.prodname_dependabot_updates %} on {% data variables.product.product_name %} requires {% data variables.product.prodname_actions %} with self-hosted runners. + +{% endnote %} + +With {% data variables.product.prodname_dependabot_updates %}, {% data variables.product.company_short %} automatically creates pull requests to update dependencies in two ways. + +- **{% data variables.product.prodname_dependabot_version_updates %}**: Users add a {% data variables.product.prodname_dependabot %} configuration file to the repository to enable {% data variables.product.prodname_dependabot %} to create pull requests when a new version of a tracked dependency is released. For more information, see "[About {% data variables.product.prodname_dependabot_version_updates %}](/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/about-dependabot-version-updates)." +- **{% data variables.product.prodname_dependabot_security_updates %}**: Users toggle a repository setting to enable {% data variables.product.prodname_dependabot %} to create pull requests when {% data variables.product.prodname_dotcom %} detects a vulnerability in one of the dependencies of the dependency graph for the repository. For more information, see "[About alerts for vulnerable dependencies](/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-alerts-for-vulnerable-dependencies)" and "[About {% data variables.product.prodname_dependabot_security_updates %}](/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-dependabot-security-updates)." +{% endif %} + +## Enabling {% data variables.product.prodname_dependabot_alerts %} + +Before you can enable {% data variables.product.prodname_dependabot_alerts %}: +- You must enable {% data variables.product.prodname_github_connect %}. For more information, see "[Managing {% data variables.product.prodname_github_connect %}](/admin/configuration/configuring-github-connect/managing-github-connect)."{% ifversion ghes %} +- You must enable the dependency graph. For more information, see "[Enabling the dependency graph for your enterprise](/admin/code-security/managing-supply-chain-security-for-your-enterprise/enabling-the-dependency-graph-for-your-enterprise)."{% endif %} + +{% data reusables.enterprise-accounts.access-enterprise %} +{%- ifversion ghes < 3.1 %}{% data reusables.enterprise-accounts.settings-tab %}{% endif %} +{% data reusables.enterprise-accounts.github-connect-tab %} +{%- if dependabot-updates-github-connect %} +1. Under "{% data variables.product.prodname_dependabot %}", to the right of "Users can receive vulnerability alerts for open source code dependencies", select the dropdown menu and click **Enabled without notifications**. Optionally, to enable alerts with notifications, click **Enabled with notifications**. + +  + +{%- else %} +1. Under "Repositories can be scanned for vulnerabilities", select the drop-down menu and click **Enabled without notifications**. Optionally, to enable alerts with notifications, click **Enabled with notifications**.  +{%- endif %} + {% tip %} + + **Tip**: We recommend configuring {% data variables.product.prodname_dependabot_alerts %} without notifications for the first few days to avoid an overload of emails. After a few days, you can enable notifications to receive {% data variables.product.prodname_dependabot_alerts %} as usual. + + {% endtip %} + +{% if dependabot-updates-github-connect %} +## Enabling {% data variables.product.prodname_dependabot_updates %} + +After you enable {% data variables.product.prodname_dependabot_alerts %} for your enterprise, you can enable {% data variables.product.prodname_dependabot_updates %}. + +{% ifversion ghes %} +Before you enable {% data variables.product.prodname_dependabot_updates %}, you must configure {% data variables.product.product_location %} to use {% data variables.product.prodname_actions %} with self-hosted runners. 更多信息请参阅“[开始使用 GitHub Enterprise Server 的 {% data variables.product.prodname_actions %}](/admin/github-actions/enabling-github-actions-for-github-enterprise-server/getting-started-with-github-actions-for-github-enterprise-server)”。 + +{% data variables.product.prodname_dependabot_updates %} are not supported on {% data variables.product.product_name %} if your enterprise uses clustering or a high-availability configuration. +{% endif %} + +{% data reusables.enterprise_site_admin_settings.sign-in %} +{% data reusables.enterprise_site_admin_settings.access-settings %} +{% data reusables.enterprise_site_admin_settings.management-console %} +{% data reusables.enterprise_management_console.advanced-security-tab %} +1. Under "Security", select **{% data variables.product.prodname_dependabot_security_updates %}**. + +  + +{% data reusables.enterprise_management_console.save-settings %} +1. 单击 **Visit your instance（访问您的实例）**。 +1. Configure self-hosted runners to create the pull requests that will update dependencies. For more information, see "[Managing self-hosted runners for {% data variables.product.prodname_dependabot_updates %} on your enterprise](/admin/github-actions/enabling-github-actions-for-github-enterprise-server/managing-self-hosted-runners-for-dependabot-updates)." +{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.github-connect-tab %} +1. Under "{% data variables.product.prodname_dependabot %}", to the right of "Users can easily upgrade to non-vulnerable open source code dependencies", click **Enable**. + +  + +{% elsif ghes > 3.2 %} +When you enable {% data variables.product.prodname_dependabot_alerts %}, you should consider also setting up {% data variables.product.prodname_actions %} for {% data variables.product.prodname_dependabot_security_updates %}. This feature allows developers to fix vulnerabilities in their dependencies. For more information, see "[Managing self-hosted runners for {% data variables.product.prodname_dependabot_updates %} on your enterprise](/admin/github-actions/enabling-github-actions-for-github-enterprise-server/managing-self-hosted-runners-for-dependabot-updates)." +{% endif %} diff --git a/translations/zh-CN/content/admin/configuration/configuring-github-connect/enabling-the-dependency-graph-and-dependabot-alerts-for-your-enterprise.md b/translations/zh-CN/content/admin/configuration/configuring-github-connect/enabling-the-dependency-graph-and-dependabot-alerts-for-your-enterprise.md deleted file mode 100644 index 749abaa8dc42..000000000000 --- a/translations/zh-CN/content/admin/configuration/configuring-github-connect/enabling-the-dependency-graph-and-dependabot-alerts-for-your-enterprise.md +++ /dev/null @@ -1,127 +0,0 @@ ---- -title: Enabling the dependency graph and Dependabot alerts for your enterprise -intro: 'You can allow users on {% data variables.product.product_location %} to find and fix vulnerabilities in code dependencies by enabling the dependency graph and {% data variables.product.prodname_dependabot_alerts %}.' -miniTocMaxHeadingLevel: 3 -shortTitle: Dependabot -redirect_from: - - /enterprise/admin/installation/enabling-security-alerts-for-vulnerable-dependencies-on-github-enterprise-server - - /enterprise/admin/configuration/enabling-security-alerts-for-vulnerable-dependencies-on-github-enterprise-server - - /enterprise/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server - - /admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server - - /admin/configuration/managing-connections-between-github-enterprise-server-and-github-enterprise-cloud/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server - - /admin/configuration/managing-connections-between-your-enterprise-accounts/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server - - /admin/configuration/managing-connections-between-your-enterprise-accounts/enabling-the-dependency-graph-and-dependabot-alerts-on-your-enterprise-account -permissions: 'Enterprise owners who are also owners of the connected {% data variables.product.prodname_ghe_cloud %} organization or enterprise account can enable the dependency graph and {% data variables.product.prodname_dependabot_alerts %} on {% data variables.product.product_location %}.' -versions: - ghes: '*' - ghae: issue-4864 -type: how_to -topics: - - Enterprise - - Security - - Dependency graph - - Dependabot ---- - -## 关于 {% data variables.product.product_location %} 上易受攻击的依赖项的警报 - -{% data reusables.dependabot.dependabot-alerts-beta %} - -{% data variables.product.prodname_dotcom %} identifies vulnerable dependencies in repositories and creates {% data variables.product.prodname_dependabot_alerts %} on {% data variables.product.product_location %}, using: - -- Data from the {% data variables.product.prodname_advisory_database %} -- The dependency graph service - -For more information about these features, see "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)" and "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)." - -### About synchronization of data from the {% data variables.product.prodname_advisory_database %} - -{% data reusables.repositories.tracks-vulnerabilities %} - -You can connect {% data variables.product.product_location %} to {% data variables.product.prodname_ghe_cloud %} with {% data variables.product.prodname_github_connect %}. Once connected, vulnerability data is synced from the {% data variables.product.prodname_advisory_database %} to your instance once every hour. 您还可以随时选择手动同步漏洞数据。 代码和关于代码的信息不会从 {% data variables.product.product_location %} 上传到 {% data variables.product.prodname_dotcom_the_website %}。 - -Only {% data variables.product.company_short %}-reviewed advisories are synchronized. {% data reusables.security-advisory.link-browsing-advisory-db %} - -### About scanning of repositories with synchronized data from the {% data variables.product.prodname_advisory_database %} - -For repositories with {% data variables.product.prodname_dependabot_alerts %} enabled, scanning is triggered on any push to the default branch that contains a manifest file or lock file. Additionally, when a new vulnerability record is added to the instance, {% data variables.product.prodname_ghe_server %} scans all existing repositories in that instance and generates alerts for any repository that is vulnerable. For more information, see "[Detection of vulnerable dependencies](/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-alerts-for-vulnerable-dependencies#detection-of-vulnerable-dependencies)." - -### About generation of {% data variables.product.prodname_dependabot_alerts %} - -If you enable vulnerability detection, when {% data variables.product.product_location %} receives information about a vulnerability, it identifies repositories in your instance that use the affected version of the dependency and generates {% data variables.product.prodname_dependabot_alerts %}. You can choose whether or not to notify users automatically about new {% data variables.product.prodname_dependabot_alerts %}. - -## Enabling the dependency graph and {% data variables.product.prodname_dependabot_alerts %} for vulnerable dependencies on {% data variables.product.product_location %} - -### 基本要求 - -For {% data variables.product.product_location %} to detect vulnerable dependencies and generate {% data variables.product.prodname_dependabot_alerts %}: -- You must enable {% data variables.product.prodname_github_connect %}. {% ifversion ghae %}This also enables the dependency graph service.{% endif %}{% ifversion ghes or ghae %}For more information, see "[Managing {% data variables.product.prodname_github_connect %}](/admin/configuration/configuring-github-connect/managing-github-connect)."{% endif %} -{% ifversion ghes %}- You must enable the dependency graph service.{% endif %} -- You must enable vulnerability scanning. - -{% ifversion ghes %} -{% ifversion ghes > 3.1 %} -您可以通过 {% data variables.enterprise.management_console %} 或管理 shell 启用依赖关系图。 我们建议您遵循 {% data variables.enterprise.management_console %} 路线，除非 {% data variables.product.product_location %} 使用集群。 - -### 通过 {% data variables.enterprise.management_console %} 启用依赖关系图 -{% data reusables.enterprise_site_admin_settings.sign-in %} -{% data reusables.enterprise_site_admin_settings.access-settings %} -{% data reusables.enterprise_site_admin_settings.management-console %} -{% data reusables.enterprise_management_console.advanced-security-tab %} -1. 在“Security（安全）”下，单击 **Dependency graph（依赖关系图）**。  -{% data reusables.enterprise_management_console.save-settings %} -1. 单击 **Visit your instance（访问您的实例）**。 - -### 通过管理 shell 启用依赖关系图 -{% endif %}{% ifversion ghes < 3.2 %} -### 启用依赖关系图 -{% endif %} -{% data reusables.enterprise_site_admin_settings.sign-in %} -1. 在管理 shell 中，启用 {% data variables.product.product_location %} 上的依赖关系图： - {% ifversion ghes > 3.1 %}```shell - ghe-config app.dependency-graph.enabled true - ``` - {% else %}```shell - ghe-config app.github.dependency-graph-enabled true - ghe-config app.github.vulnerability-alerting-and-settings-enabled true - ```{% endif %} - {% note %} - - **Note**: For more information about enabling access to the administrative shell via SSH, see "[Accessing the administrative shell (SSH)](/enterprise/{{ currentVersion }}/admin/configuration/accessing-the-administrative-shell-ssh)." - - {% endnote %} -2. 应用配置。 - ```shell - $ ghe-config-apply - ``` -3. 返回到 {% data variables.product.prodname_ghe_server %}。 -{% endif %} - -### 启用 {% data variables.product.prodname_dependabot_alerts %} - -{% ifversion ghes %} -在为您的实例启用 {% data variables.product.prodname_dependabot_alerts %} 之前，您需要启用依赖关系图。 更多信息请参阅上文。 -{% endif %} - -{% data reusables.enterprise-accounts.access-enterprise %} -{%- ifversion ghes < 3.1 %}{% data reusables.enterprise-accounts.settings-tab %}{% endif %} -{% data reusables.enterprise-accounts.github-connect-tab %} -1. Under "Repositories can be scanned for vulnerabilities", select the drop-down menu and click **Enabled without notifications**. Optionally, to enable alerts with notifications, click **Enabled with notifications**.  - - {% tip %} - - **Tip**: We recommend configuring {% data variables.product.prodname_dependabot_alerts %} without notifications for the first few days to avoid an overload of emails. 几天后，您可以开启通知，像往常一样接收 {% data variables.product.prodname_dependabot_alerts %}。 - - {% endtip %} - -{% ifversion fpt or ghec or ghes > 3.2 %} -When you enable {% data variables.product.prodname_dependabot_alerts %}, you should consider also setting up {% data variables.product.prodname_actions %} for {% data variables.product.prodname_dependabot_security_updates %}. This feature allows developers to fix vulnerabilities in their dependencies. For more information, see "[Setting up {% data variables.product.prodname_dependabot %} security and version updates on your enterprise](/admin/github-actions/enabling-github-actions-for-github-enterprise-server/setting-up-dependabot-updates)." -{% endif %} - -## 查看 {% data variables.product.product_location %} 上易受攻击的依赖项 - -您可以查看 {% data variables.product.product_location %} 中的所有漏洞，然后手动同步 {% data variables.product.prodname_dotcom_the_website %} 中的漏洞数据，以更新列表。 - -{% data reusables.enterprise_site_admin_settings.access-settings %} -2. 在左侧边栏中，单击 **Vulnerabilities**。  -3. 要同步漏洞数据，请单击 **Sync Vulnerabilities now**。  diff --git a/translations/zh-CN/content/admin/configuration/configuring-github-connect/enabling-unified-contributions-for-your-enterprise.md b/translations/zh-CN/content/admin/configuration/configuring-github-connect/enabling-unified-contributions-for-your-enterprise.md index 347265eaad71..3432a0110ece 100644 --- a/translations/zh-CN/content/admin/configuration/configuring-github-connect/enabling-unified-contributions-for-your-enterprise.md +++ b/translations/zh-CN/content/admin/configuration/configuring-github-connect/enabling-unified-contributions-for-your-enterprise.md @@ -11,7 +11,7 @@ redirect_from: - /admin/configuration/enabling-unified-contributions-between-github-enterprise-server-and-githubcom - /admin/configuration/managing-connections-between-github-enterprise-server-and-github-enterprise-cloud/enabling-unified-contributions-between-github-enterprise-server-and-githubcom - /admin/configuration/managing-connections-between-your-enterprise-accounts/enabling-unified-contributions-between-your-enterprise-account-and-githubcom -permissions: 'Enterprise owners who are also owners of the connected {% data variables.product.prodname_ghe_cloud %} organization or enterprise account can enable unified contributions between {% data variables.product.product_location %} and {% data variables.product.prodname_dotcom_the_website %}.' +permissions: 'Enterprise owners can enable unified contributions between {% data variables.product.product_location %} and {% data variables.product.prodname_dotcom_the_website %}.' versions: ghes: '*' ghae: '*' diff --git a/translations/zh-CN/content/admin/configuration/configuring-github-connect/enabling-unified-search-for-your-enterprise.md b/translations/zh-CN/content/admin/configuration/configuring-github-connect/enabling-unified-search-for-your-enterprise.md index 6740bf22f8a3..6c2bcc83223f 100644 --- a/translations/zh-CN/content/admin/configuration/configuring-github-connect/enabling-unified-search-for-your-enterprise.md +++ b/translations/zh-CN/content/admin/configuration/configuring-github-connect/enabling-unified-search-for-your-enterprise.md @@ -11,7 +11,7 @@ redirect_from: - /admin/configuration/enabling-unified-search-between-github-enterprise-server-and-githubcom - /admin/configuration/managing-connections-between-github-enterprise-server-and-github-enterprise-cloud/enabling-unified-search-between-github-enterprise-server-and-githubcom - /admin/configuration/managing-connections-between-your-enterprise-accounts/enabling-unified-search-between-your-enterprise-account-and-githubcom -permissions: 'Enterprise owners who are also owners of the connected {% data variables.product.prodname_ghe_cloud %} organization or enterprise account can enable unified search between {% data variables.product.product_name %} and {% data variables.product.prodname_dotcom_the_website %}.' +permissions: 'Enterprise owners can enable unified search between {% data variables.product.product_name %} and {% data variables.product.prodname_dotcom_the_website %}.' versions: ghes: '*' ghae: '*' diff --git a/translations/zh-CN/content/admin/configuration/configuring-github-connect/index.md b/translations/zh-CN/content/admin/configuration/configuring-github-connect/index.md index 8d195df5ff78..baf1fbba8db2 100644 --- a/translations/zh-CN/content/admin/configuration/configuring-github-connect/index.md +++ b/translations/zh-CN/content/admin/configuration/configuring-github-connect/index.md @@ -20,7 +20,7 @@ children: - /about-github-connect - /managing-github-connect - /enabling-automatic-user-license-sync-for-your-enterprise - - /enabling-the-dependency-graph-and-dependabot-alerts-for-your-enterprise + - /enabling-dependabot-for-your-enterprise - /enabling-unified-search-for-your-enterprise - /enabling-unified-contributions-for-your-enterprise shortTitle: GitHub Connect diff --git a/translations/zh-CN/content/admin/configuration/configuring-network-settings/configuring-dns-nameservers.md b/translations/zh-CN/content/admin/configuration/configuring-network-settings/configuring-dns-nameservers.md index ff3c34fe96e3..79443ea858df 100644 --- a/translations/zh-CN/content/admin/configuration/configuring-network-settings/configuring-dns-nameservers.md +++ b/translations/zh-CN/content/admin/configuration/configuring-network-settings/configuring-dns-nameservers.md @@ -30,14 +30,20 @@ shortTitle: 配置 DNS 服务器 ## 使用管理 shell 配置域名服务器 {% data reusables.enterprise_installation.ssh-into-instance %} + 2. 要编辑域名服务器，请输入： + ```shell - $ sudo vim /etc/resolvconf/resolv.conf.d/head + sudo vim /etc/resolvconf/resolv.conf.d/head ``` + +{% data reusables.enterprise_installation.preventing-nameservers-change %} + 3. 附加任何 `nameserver` 条目，然后保存文件。 4. 验证变更后，请保存文件。 5. 要向 {% data variables.product.product_location %} 添加新的域名服务器条目，请运行以下命令： + ```shell - $ sudo service resolvconf restart - $ sudo service dnsmasq restart + sudo service resolvconf restart + sudo service dnsmasq restart ``` diff --git a/translations/zh-CN/content/admin/configuration/configuring-network-settings/configuring-tls.md b/translations/zh-CN/content/admin/configuration/configuring-network-settings/configuring-tls.md index 7a492905cbbc..b0fd50df26ca 100644 --- a/translations/zh-CN/content/admin/configuration/configuring-network-settings/configuring-tls.md +++ b/translations/zh-CN/content/admin/configuration/configuring-network-settings/configuring-tls.md @@ -50,7 +50,7 @@ topics: {% warning %} - **Warning**: Your key must be an RSA key and must not have a passphrase. 更多信息请参阅“[将密码从密钥文件中移除](/admin/guides/installation/troubleshooting-ssl-errors#removing-the-passphrase-from-your-key-file)”。 + **警告**：您的密钥必须是 RSA 密钥，并且不能有密码。 更多信息请参阅“[将密码从密钥文件中移除](/admin/guides/installation/troubleshooting-ssl-errors#removing-the-passphrase-from-your-key-file)”。 {% endwarning %} {% data reusables.enterprise_management_console.save-settings %} diff --git a/translations/zh-CN/content/admin/configuration/configuring-network-settings/network-ports.md b/translations/zh-CN/content/admin/configuration/configuring-network-settings/network-ports.md index 367390021dda..bad6b8e5a969 100644 --- a/translations/zh-CN/content/admin/configuration/configuring-network-settings/network-ports.md +++ b/translations/zh-CN/content/admin/configuration/configuring-network-settings/network-ports.md @@ -23,14 +23,14 @@ topics: 需要使用一些管理端口来配置 {% data variables.product.product_location %} 和运行某些功能。 最终用户在使用基本应用程序时不需要管理端口。 -| 端口 | 服务 | 描述 | -| -------- | ----- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| 8443 | HTTPS | 基于安全 Web 的 {% data variables.enterprise.management_console %}。 进行基本安装和配置时需要。 | -| 8080 | HTTP | 基于纯文本 Web 的 {% data variables.enterprise.management_console %}。 除非手动禁用 SSL，否则不需要。 | -| 122 | SSH | 对 {% data variables.product.product_location %} 进行 Shell 访问。 Required to be open to incoming connections between all nodes in a high availability configuration. 默认 SSH 端口 (22) 专用于 Git 和 SSH 应用程序网络流量。 | -| 1194/UDP | VPN | 采用高可用性配置的安全复制网络隧道。 Required to be open for communication between all nodes in the configuration. | -| 123/UDP | NTP | 为时间协议操作所需。 | -| 161/UDP | SNMP | 为网络监视协议操作所需。 | +| 端口 | 服务 | 描述 | +| -------- | ----- | ---------------------------------------------------------------------------------------------------------------------------- | +| 8443 | HTTPS | 基于安全 Web 的 {% data variables.enterprise.management_console %}。 进行基本安装和配置时需要。 | +| 8080 | HTTP | 基于纯文本 Web 的 {% data variables.enterprise.management_console %}。 除非手动禁用 SSL，否则不需要。 | +| 122 | SSH | 对 {% data variables.product.product_location %} 进行 Shell 访问。 需要对高可用性配置中所有节点之间的传入连接开放。 默认 SSH 端口 (22) 专用于 Git 和 SSH 应用程序网络流量。 | +| 1194/UDP | VPN | 采用高可用性配置的安全复制网络隧道。 需要对配置中所有节点之间的通信开放。 | +| 123/UDP | NTP | 为时间协议操作所需。 | +| 161/UDP | SNMP | 为网络监视协议操作所需。 | ## 最终用户的应用程序端口 diff --git a/translations/zh-CN/content/admin/configuration/configuring-network-settings/using-github-enterprise-server-with-a-load-balancer.md b/translations/zh-CN/content/admin/configuration/configuring-network-settings/using-github-enterprise-server-with-a-load-balancer.md index 48bdd0324eb0..37f828aad7c6 100644 --- a/translations/zh-CN/content/admin/configuration/configuring-network-settings/using-github-enterprise-server-with-a-load-balancer.md +++ b/translations/zh-CN/content/admin/configuration/configuring-network-settings/using-github-enterprise-server-with-a-load-balancer.md @@ -17,7 +17,7 @@ topics: shortTitle: 使用负载平衡器 --- -## About load balancers +## 关于负载均衡器 {% data reusables.enterprise_clustering.load_balancer_intro %} diff --git a/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/configuring-github-pages-for-your-enterprise.md b/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/configuring-github-pages-for-your-enterprise.md index 976bd594c4a3..d341653ffe6e 100644 --- a/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/configuring-github-pages-for-your-enterprise.md +++ b/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/configuring-github-pages-for-your-enterprise.md @@ -1,5 +1,5 @@ --- -title: 为企业配置 GitHub Pages +title: Configuring GitHub Pages for your enterprise intro: 'You can enable or disable {% data variables.product.prodname_pages %} for your enterprise{% ifversion ghes %} and choose whether to make sites publicly accessible{% endif %}.' redirect_from: - /enterprise/admin/guides/installation/disabling-github-enterprise-pages @@ -16,35 +16,37 @@ type: how_to topics: - Enterprise - Pages -shortTitle: 配置 GitHub Pages +shortTitle: Configure GitHub Pages --- {% ifversion ghes %} -## 为 {% data variables.product.prodname_pages %} 启用公共站点 +## Enabling public sites for {% data variables.product.prodname_pages %} If private mode is enabled on your enterprise, the public cannot access {% data variables.product.prodname_pages %} sites hosted by your enterprise unless you enable public sites. {% warning %} -**警告**：如果为 {% data variables.product.prodname_pages %} 启用公共站点，则企业上每个仓库中的每个站点均可由公众访问。 +**Warning:** If you enable public sites for {% data variables.product.prodname_pages %}, every site in every repository on your enterprise will be accessible to the public. {% endwarning %} {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.management-console %} {% data reusables.enterprise_management_console.pages-tab %} -4. 选择 **Public Pages**。  +4. Select **Public Pages**. +  {% data reusables.enterprise_management_console.save-settings %} -## 为企业禁用 {% data variables.product.prodname_pages %} +## Disabling {% data variables.product.prodname_pages %} for your enterprise -如果为企业禁用了子域隔离，则还应禁用 {% data variables.product.prodname_pages %}，以免遭受潜在安全漏洞的攻击。 更多信息请参阅“[启用子域隔离](/admin/configuration/enabling-subdomain-isolation)”。 +If subdomain isolation is disabled for your enterprise, you should also disable {% data variables.product.prodname_pages %} to protect yourself from potential security vulnerabilities. For more information, see "[Enabling subdomain isolation](/admin/configuration/enabling-subdomain-isolation)." {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.management-console %} {% data reusables.enterprise_management_console.pages-tab %} -4. 取消选择 **Enable Pages**。  +4. Unselect **Enable Pages**. +  {% data reusables.enterprise_management_console.save-settings %} {% endif %} @@ -54,13 +56,14 @@ If private mode is enabled on your enterprise, the public cannot access {% data {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.policies-tab %} {% data reusables.enterprise-accounts.pages-tab %} -5. 在“Pages policies（页面策略）”下，取消选择 **Enable {% data variables.product.prodname_pages %}（启用 Github）**。  +5. Under "Pages policies", deselect **Enable {% data variables.product.prodname_pages %}**. +  {% data reusables.enterprise-accounts.pages-policies-save %} {% endif %} {% ifversion ghes %} -## 延伸阅读 +## Further reading -- "[启用私人模式](/admin/configuration/enabling-private-mode)" +- "[Enabling private mode](/admin/configuration/enabling-private-mode)" {% endif %} diff --git a/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/configuring-the-referrer-policy-for-your-enterprise.md b/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/configuring-the-referrer-policy-for-your-enterprise.md index 44c98b1b3aea..ebca4a967cf1 100644 --- a/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/configuring-the-referrer-policy-for-your-enterprise.md +++ b/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/configuring-the-referrer-policy-for-your-enterprise.md @@ -32,5 +32,7 @@ You can enable the `same-origin` referrer policy to instruct modern browsers to {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.settings-tab %} -1. Under "User Agent Referrer Policy", select **Enable same origin referrer policy for all organizations**.  -1. 单击 **Save（保存）**。  +1. Under "User Agent Referrer Policy", select **Enable same origin referrer policy for all organizations**. +  +1. Click **Save**. +  diff --git a/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/troubleshooting-ssl-errors.md b/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/troubleshooting-ssl-errors.md index 3a5dd85f32d9..38f9a46c2e76 100644 --- a/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/troubleshooting-ssl-errors.md +++ b/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/troubleshooting-ssl-errors.md @@ -81,6 +81,6 @@ $ cat yourdomain.com.crt bundle-certificates.crt > yourdomain.combined.crt $ ghe-ssl-ca-certificate-install -c rootCA.crt ``` -## Updating an SSL certificate +## 更新 SSL 证书 -You can generate a new self-signed certificate or update an existing SSL certificate for {% data variables.product.product_location %} with the `ghe-ssl-certificate-setup` command line utility. 更多信息请参阅“[命令行实用程序](/admin/configuration/configuring-your-enterprise/command-line-utilities#ghe-ssl-ca-certificate-setup)”。 +您可以使用 `ghe-ssl-certificate-setup` 命令行实用工具生成新的自签名证书或更新 {% data variables.product.product_location %} 的现有 SSL 证书。 更多信息请参阅“[命令行实用程序](/admin/configuration/configuring-your-enterprise/command-line-utilities#ghe-ssl-ca-certificate-setup)”。 diff --git a/translations/zh-CN/content/admin/enterprise-management/configuring-clustering/differences-between-clustering-and-high-availability-ha.md b/translations/zh-CN/content/admin/enterprise-management/configuring-clustering/differences-between-clustering-and-high-availability-ha.md index 46445e5ec1ae..f3f5dfa2f768 100644 --- a/translations/zh-CN/content/admin/enterprise-management/configuring-clustering/differences-between-clustering-and-high-availability-ha.md +++ b/translations/zh-CN/content/admin/enterprise-management/configuring-clustering/differences-between-clustering-and-high-availability-ha.md @@ -35,7 +35,7 @@ shortTitle: 选择集群或 HA ## 备份和灾难恢复 -Neither HA nor Clustering should be considered a replacement for regular backups. 更多信息请参阅“[在设备上配置备份](/enterprise/admin/guides/installation/configuring-backups-on-your-appliance)”。 +HA 或集群都不应被视为常规备份的替代品。 更多信息请参阅“[在设备上配置备份](/enterprise/admin/guides/installation/configuring-backups-on-your-appliance)”。 ## 监视 diff --git a/translations/zh-CN/content/admin/enterprise-management/configuring-clustering/evacuating-a-cluster-node.md b/translations/zh-CN/content/admin/enterprise-management/configuring-clustering/evacuating-a-cluster-node.md index 6afc1546f43e..2d207e894adc 100644 --- a/translations/zh-CN/content/admin/enterprise-management/configuring-clustering/evacuating-a-cluster-node.md +++ b/translations/zh-CN/content/admin/enterprise-management/configuring-clustering/evacuating-a-cluster-node.md @@ -13,55 +13,73 @@ topics: - Enterprise --- -如果数据服务集群中只有三个节点，则无法撤出节点，因为 `ghe-spoke` 没有其他位置可以进行复制。 如果您有四个或更多节点，则 `ghe-spoke ` 会将所有仓库移出已撤出的节点。 +## 关于撤出群集节点 -如果您正在使具有任何数据服务（如 git、页面或存储）的某个节点离线，请在使节点离线之前撤出每个节点。 +在 {% data variables.product.product_name %}的群集配置中，您可以在使节点脱机之前撤出该节点。 撤出可确保服务层中的其余节点包含服务的所有数据。 例如，替换群集中节点的虚拟机时，应先撤出该节点。 -1. 用 `ghe-config` 命令查找节点的 `uuid`。 +有关 {% data variables.product.prodname_ghe_server %} 的节点和服务层的详细信息，请参阅“[关于群集节点](/admin/enterprise-management/configuring-clustering/about-cluster-nodes)”。 - ```shell - $ ghe-config cluster.HOSTNAME.uuid - ``` +{% warning %} -2. 在复制数据时，您需要监视节点的状态。 理想情况下，在复制完成之前，不应使该节点离线。 要监视节点的状态，请运行以下任意命令： +**警告**： - 对于 Git - ``` - ghe-spokes evac-status - ``` - 对于 {% data variables.product.prodname_pages %} +- 为避免数据丢失，{% data variables.product.company_short %} 强烈建议您在使节点脱机之前撤出该节点。 - ```shell - echo "select count(*) from pages_replicas where host = 'pages-server-UUID'" | ghe-dbconsole -y - ``` +- 如果数据服务集群中只有三个节点，则无法撤出节点，因为 `ghe-spoke` 没有其他位置可以进行复制。 如果您有四个或更多节点，则 `ghe-spoke ` 会将所有仓库移出已撤出的节点。 - 对于存储 - ``` - ghe-storage evacuation-status - ``` +{% endwarning %} -3. 复制完成后，您可以撤出存储服务。 运行以下任意命令： +## 撤出集群节点 - 对于 Git +如果计划使某个节点脱机，并且该节点运行数据服务角色（如 `git-server`、`pages-server` 或 `storage-server`），请在使节点脱机之前撤出每个节点。 - ```shell - ghe-spokes server evacuate git-server-UUID \'REASON FOR EVACUATION\' - ``` +{% data reusables.enterprise_clustering.ssh-to-a-node %} +1. 若要查找要撤出的节点的 UUID，请运行以下命令。 将 `HOSTNAME` 替换为节点的主机名。 - 对于 {% data variables.product.prodname_pages %} + ```shell + $ ghe-config cluster.HOSTNAME.uuid + ``` +1. 在 {% data variables.product.product_name %} 复制数据时监控节点的状态。 在复制完成之前，不要使节点脱机。 要监控节点的状态，请运行以下任一命令，将 `UUID` 替换为步骤 2 中的 UUID。 - ```shell - ghe-dpages evacuate pages-server-UUID - ``` + - **Git**： - 对于存储，请使节点离线 + ```shell + $ ghe-spokes evac-status git-server-UUID + ``` - ```shell - ghe-storage offline storage-server-UUID - ``` + - **{% data variables.product.prodname_pages %}**： - 然后撤出 + ```shell + $ echo "select count(*) from pages_replicas where host = 'pages-server-UUID'" | ghe-dbconsole -y + ``` - ```shell - ghe-storage evacuate storage-server-UUID - ``` + - **存储**： + + ```shell + $ ghe-storage evacuation-status storage-server-UUID + ``` +1. 复制完成后，可以通过运行以下任一命令来撤出节点，将 `UUID` 替换为步骤 2 中的 UUID。 + + - **Git**： + + ```shell + $ ghe-spokes server evacuate git-server-UUID \'REASON FOR EVACUATION\' + ``` + + - **{% data variables.product.prodname_pages %}**： + + ```shell + $ ghe-dpages evacuate pages-server-UUID + ``` + + - 对于**存储**，先通过运行以下命令使节点脱机。 + + ```shell + $ ghe-storage offline storage-server-UUID + ``` + + 存储节点脱机后，可以通过运行以下命令撤出该节点。 + + ```shell + $ ghe-storage evacuate storage-server-UUID + ``` diff --git a/translations/zh-CN/content/admin/enterprise-management/configuring-high-availability/about-geo-replication.md b/translations/zh-CN/content/admin/enterprise-management/configuring-high-availability/about-geo-replication.md index ab10b07669e7..3223a9397880 100644 --- a/translations/zh-CN/content/admin/enterprise-management/configuring-high-availability/about-geo-replication.md +++ b/translations/zh-CN/content/admin/enterprise-management/configuring-high-availability/about-geo-replication.md @@ -23,7 +23,7 @@ Git 请求和特定的文件服务器请求（例如 LFS 和文件上传）可 ## 限制 -将请求写入副本需要将数据发送到主设备和所有副本。 This means that the performance of all writes is limited by the slowest replica, although new geo-replicas can seed the majority of their data from existing co-located geo-replicas, rather than from the primary. {% ifversion ghes > 3.2 %}To reduce the latency and bandwidth caused by distributed teams and large CI farms without impacting write throughput, you can configure repository caching instead. For more information, see "[About repository caching](/admin/enterprise-management/caching-repositories/about-repository-caching)."{% endif %} +将请求写入副本需要将数据发送到主设备和所有副本。 这意味着所有写入操作的性能都受限于最慢的副本，虽然新的地理副本可以从现有共同位置地理副本（而不是从主设备）播种大部分数据。 {% ifversion ghes > 3.2 %}若要在不影响写入吞吐量的情况下减少分布式团队和大型 CI 服务器场导致的延迟和带宽，可以改为配置仓库缓存。 更多信息请参阅“[关于仓库缓存](/admin/enterprise-management/caching-repositories/about-repository-caching)”。{% endif %} Geo-replication 不会增大 {% data variables.product.prodname_ghe_server %} 实例的容量，也不会解决与 CPU 或内存资源不足相关的性能问题。 如果主设备处于脱机状态，则活动副本将无法满足任何读取或写入请求。 diff --git a/translations/zh-CN/content/admin/enterprise-management/configuring-high-availability/about-high-availability-configuration.md b/translations/zh-CN/content/admin/enterprise-management/configuring-high-availability/about-high-availability-configuration.md index 6ec77e8fa774..dda78cca5952 100644 --- a/translations/zh-CN/content/admin/enterprise-management/configuring-high-availability/about-high-availability-configuration.md +++ b/translations/zh-CN/content/admin/enterprise-management/configuring-high-availability/about-high-availability-configuration.md @@ -15,11 +15,11 @@ topics: shortTitle: 关于 HA 配置 --- -配置高可用性时，会自动设置将所有数据存储（Git 仓库、MySQL、Redis 和 Elasticsearch）单向、异步地从主设备复制到副本。 Most {% data variables.product.prodname_ghe_server %} configuration settings are also replicated, including the {% data variables.enterprise.management_console %} password. For more information, see "[Accessing the management console](/admin/configuration/configuring-your-enterprise/accessing-the-management-console)." +配置高可用性时，会自动设置将所有数据存储（Git 仓库、MySQL、Redis 和 Elasticsearch）单向、异步地从主设备复制到副本。 还会复制大多数 {% data variables.product.prodname_ghe_server %} 配置设置，包括 {% data variables.enterprise.management_console %} 密码。 For more information, see "[Accessing the management console](/admin/configuration/configuring-your-enterprise/accessing-the-management-console)." {% data variables.product.prodname_ghe_server %} 支持主动/被动配置，在这些配置下，副本作为备用设备运行，并且数据库服务在复制模式下运行，但应用程序服务将停止。 -After replication has been established, the {% data variables.enterprise.management_console %} is no longer accessible on replica appliances. If you navigate to the replica's IP address or hostname on port 8443, you'll see a "Server in replication mode" message, which indicates that the appliance is currently configured as a replica. +建立复制后，副本设备上将不再可访问 {% data variables.enterprise.management_console %} 。 如果在端口 8443 上导航到副本的 IP 地址或主机名，您将看到“Server in replication mode（服务器处于复制模式）”消息，表示设备当前已配置为副本。 {% data reusables.enterprise_installation.replica-limit %} ## 有针对性的故障场景 @@ -30,8 +30,8 @@ After replication has been established, the {% data variables.enterprise.managem 高可用性配置不适用于： - - **扩展**。 虽然可以使用 Geo-replication 将流量分布在不同地理位置，但写入性能受限于主设备的速度和可用性。 For more information, see "[About geo-replication](/enterprise/{{ currentVersion }}/admin/guides/installation/about-geo-replication/)."{% ifversion ghes > 3.2 %} - - **CI/CD load**. If you have a large number of CI clients that are geographically distant from your primary instance, you may benefit from configuring a repository cache. For more information, see "[About repository caching](/admin/enterprise-management/caching-repositories/about-repository-caching)."{% endif %} + - **扩展**。 虽然可以使用 Geo-replication 将流量分布在不同地理位置，但写入性能受限于主设备的速度和可用性。 更多信息请参阅“[关于 Geo-replication](/enterprise/{{ currentVersion }}/admin/guides/installation/about-geo-replication/)”。{% ifversion ghes > 3.2 %} + - **CI/CD 负载**。 如果您有大量在地理位置上远离主实例的 CI 客户端，则配置仓库缓存可能会使您受益匪浅。 更多信息请参阅“[关于仓库缓存](/admin/enterprise-management/caching-repositories/about-repository-caching)”。{% endif %} - **备份主设备**。 高可用性副本不会替代灾难恢复计划中的非现场备份。 某些形式的数据损坏或数据丢失可能会立即从主设备复制到副本。 为确保安全回滚到稳定的过去状态，必须通过历史快照执行定期备份。 - **零停机时间升级**。 为避免受控升级场景下出现数据丢失和裂脑的状况，请先将主设备置于维护模式并等待所有写入操作完成，然后再对副本进行升级。 @@ -45,13 +45,13 @@ After replication has been established, the {% data variables.enterprise.managem 在故障转移期间，必须将主设备置于维护模式，并将其 DNS 记录重定向到副本的 IP 地址。 将流量从主设备重新定向到副本所需的时间将取决于 TTL 配置以及更新 DNS 记录所需的时间。 -如果您要使用 Geo-replication，则必须配置 Geo DNS，将流量定向到距离最近的副本。 For more information, see "[About geo-replication](/enterprise/{{ currentVersion }}/admin/guides/installation/about-geo-replication/)." +如果您要使用 Geo-replication，则必须配置 Geo DNS，将流量定向到距离最近的副本。 更多信息请参阅“[关于 Geo-replication](/enterprise/{{ currentVersion }}/admin/guides/installation/about-geo-replication/)”。 ### 负载均衡器 {% data reusables.enterprise_clustering.load_balancer_intro %} {% data reusables.enterprise_clustering.load_balancer_dns %} -在故障转移期间，您必须将主设备置于维护模式。 您可以将负载均衡器配置为自动检测副本何时已升级为主设备，或者可能需要手动更改配置。 您必须先将副本手动升级为主设备，随后副本才能对用户流量作出响应。 For more information, see "[Using {% data variables.product.prodname_ghe_server %} with a load balancer](/enterprise/{{ currentVersion }}/admin/guides/installation/using-github-enterprise-server-with-a-load-balancer/)." +在故障转移期间，您必须将主设备置于维护模式。 您可以将负载均衡器配置为自动检测副本何时已升级为主设备，或者可能需要手动更改配置。 您必须先将副本手动升级为主设备，随后副本才能对用户流量作出响应。 更多信息请参阅“[结合使用 {% data variables.product.prodname_ghe_server %} 和负载均衡器](/enterprise/{{ currentVersion }}/admin/guides/installation/using-github-enterprise-server-with-a-load-balancer/)”。 {% data reusables.enterprise_installation.monitoring-replicas %} @@ -188,4 +188,4 @@ Success: Replica has been promoted to primary and is now accepting requests. ## 延伸阅读 - “[创建高可用性副本](/enterprise/{{ currentVersion }}/admin/guides/installation/creating-a-high-availability-replica)” -- "[Network ports](/admin/configuration/configuring-network-settings/network-ports)" +- "[网络端口](/admin/configuration/configuring-network-settings/network-ports)" diff --git a/translations/zh-CN/content/admin/enterprise-management/configuring-high-availability/creating-a-high-availability-replica.md b/translations/zh-CN/content/admin/enterprise-management/configuring-high-availability/creating-a-high-availability-replica.md index d9288c2f26b7..712817f2f2b3 100644 --- a/translations/zh-CN/content/admin/enterprise-management/configuring-high-availability/creating-a-high-availability-replica.md +++ b/translations/zh-CN/content/admin/enterprise-management/configuring-high-availability/creating-a-high-availability-replica.md @@ -20,7 +20,7 @@ shortTitle: 创建 HA 副本 ## 创建高可用性副本 1. 在所需平台上设置新的 {% data variables.product.prodname_ghe_server %} 设备。 副本设备应镜像主设备的 CPU、RAM 和存储设置。 建议您在独立环境中安装副本设备。 底层硬件、软件和网络组件应与主设备的相应部分隔离。 如果要使用云提供商，请使用单独的区域或分区。 更多信息请参阅“[设置 {% data variables.product.prodname_ghe_server %} 实例](/enterprise/{{ currentVersion }}/admin/guides/installation/setting-up-a-github-enterprise-server-instance)”。 -1. Ensure that both the primary appliance and the new replica appliance can communicate with each other over ports 122/TCP and 1194/UDP. 更多信息请参阅“[网络端口](/admin/configuration/configuring-network-settings/network-ports#administrative-ports)”。 +1. 确保主设备和新的副本设备可以通过端口 122/TCP 和 1194/UDP 相互通信。 更多信息请参阅“[网络端口](/admin/configuration/configuring-network-settings/network-ports#administrative-ports)”。 1. 在浏览器中，导航到新副本设备的 IP 地址并上传您的 {% data variables.product.prodname_enterprise %} 许可。 {% data reusables.enterprise_installation.replica-steps %} 1. 使用 SSH 连接到副本设备的 IP 地址。 diff --git a/translations/zh-CN/content/admin/enterprise-management/configuring-high-availability/recovering-a-high-availability-configuration.md b/translations/zh-CN/content/admin/enterprise-management/configuring-high-availability/recovering-a-high-availability-configuration.md index d958f181d4a0..be5fc0a2e8fe 100644 --- a/translations/zh-CN/content/admin/enterprise-management/configuring-high-availability/recovering-a-high-availability-configuration.md +++ b/translations/zh-CN/content/admin/enterprise-management/configuring-high-availability/recovering-a-high-availability-configuration.md @@ -15,20 +15,29 @@ topics: shortTitle: 恢复 HA 配置 --- +## 关于高可用性配置的恢复 + 如果故障转移是在计划内进行的，或者与设备的健康状态无关，则可以将之前的主设备用作新的副本设备。 如果故障转移与主设备的问题相关，则最好创建新的副本设备。 更多信息请参阅“[创建高可用性副本](/enterprise/{{ currentVersion }}/admin/guides/installation/creating-a-high-availability-replica/)”。 +{% warning %} + +**警告：** 在将以前的主设备配置为新副本之前，必须启用维护模式。 如果不启用维护模式，将导致生产中断。 + +{% endwarning %} + ## 将之前的主设备配置为新副本 1. 使用 SSH 连接到之前的主设备的 IP 地址。 ```shell $ ssh -p 122 admin@FORMER PRIMARY IP ``` -2. 在之前的主设备上，使用之前副本的 IP 地址运行 `ghe-repl-setup`。 +1. 在以前的主设备上启用维护模式。 更多信息请参阅“[启用和排定维护模式](/admin/configuration/configuring-your-enterprise/enabling-and-scheduling-maintenance-mode)”。 +1. 在之前的主设备上，使用之前副本的 IP 地址运行 `ghe-repl-setup`。 ```shell $ ghe-repl-setup FORMER REPLICA IP ``` {% data reusables.enterprise_installation.add-ssh-key-to-primary %} -4. 要验证与新的主设备的连接并为新副本启用副本模式，请再次运行 `ghe-repl-setup`。 +1. 要验证与新的主设备的连接并为新副本启用副本模式，请再次运行 `ghe-repl-setup`。 ```shell $ ghe-repl-setup FORMER REPLICA IP ``` diff --git a/translations/zh-CN/content/admin/enterprise-management/monitoring-your-appliance/configuring-collectd.md b/translations/zh-CN/content/admin/enterprise-management/monitoring-your-appliance/configuring-collectd.md index de18025f1ae7..54eba19595c1 100644 --- a/translations/zh-CN/content/admin/enterprise-management/monitoring-your-appliance/configuring-collectd.md +++ b/translations/zh-CN/content/admin/enterprise-management/monitoring-your-appliance/configuring-collectd.md @@ -47,7 +47,7 @@ topics: ## 使用 `ghe-export-graphs` 导出 collectd 数据 -命令行工具 `ghe-export-graphs` 将导出 `collectd` 存储在 RRD 数据库中的数据。 This command turns the data into XML and exports it into a single tarball (`.tgz`). +命令行工具 `ghe-export-graphs` 将导出 `collectd` 存储在 RRD 数据库中的数据。 此命令会将数据转换为 XML 格式并导出到一个 tarball (`.tgz`) 中。 此文件的主要用途是为 {% data variables.contact.contact_ent_support %} 团队提供关于 VM 性能的数据（无需下载整个支持包）， 不应包含在常规备份导出范围中，也没有对应的导入文件。 如果您联系 {% data variables.contact.contact_ent_support %}，我们可能会要求您提供此数据，以便协助故障排查。 diff --git a/translations/zh-CN/content/admin/enterprise-management/monitoring-your-appliance/generating-a-health-check-for-your-enterprise.md b/translations/zh-CN/content/admin/enterprise-management/monitoring-your-appliance/generating-a-health-check-for-your-enterprise.md new file mode 100644 index 000000000000..df21b5a2fefd --- /dev/null +++ b/translations/zh-CN/content/admin/enterprise-management/monitoring-your-appliance/generating-a-health-check-for-your-enterprise.md @@ -0,0 +1,56 @@ +--- +title: Generating a Health Check for your enterprise +intro: 'You can gain insight into the general health and Git and API requests of {% data variables.product.product_location %} by generating a Health Check.' +versions: + ghes: '*' +type: how_to +topics: + - Enterprise + - Fundamentals + - Infrastructure + - Monitoring + - Performance +product: '{% data reusables.gated-features.generated-health-checks %}' +--- + +{% note %} + +**Note:** Generating a Health Check is currently in beta for {% data variables.product.prodname_ghe_server %} and subject to change. + +{% endnote %} + +## About generated Health Checks + +You can create a support bundle for {% data variables.product.product_location %} that contains a lot of data, such as diagnostics and log files. To help analyze and interpret this data, you can generate a Health Check. For more information about support bundles, see "[Providing data to {% data variables.contact.github_support %}](/support/contacting-github-support/providing-data-to-github-support#creating-and-sharing-support-bundles)." + +A Health Check provides the following information about {% data variables.product.product_location %}. +- Insights into the general health of {% data variables.product.product_location %}, such as upgrade status, storage, and license seat consumption +- A security section, which focuses on subdomain isolation and user authentication +- Analysis of Git requests, with details about the busiest repositories and Git users +- Analysis of API requests, including the busiest times, most frequently requested endpoints, and most active callers + +## Generating a Health Check + +Before you can generate a Health Check, you must create a support bundle. 更多信息请参阅“[将数据提供给 {% data variables.contact.github_support %}](/support/contacting-github-support/providing-data-to-github-support#creating-and-sharing-support-bundles)”。 + +1. Navigate to the [{% data variables.contact.support_portal %}](https://support.github.com/). +2. In the upper-right corner of the page, click **Premium**. + +  + +3. To the right of **Health Checks**, click **Request Health Check**. + +  + +4. Under "Select an enterprise account", select the dropdown menu and click an enterprise account. + +  + +5. Under "Upload a support bundle", click **Chose File** and choose a file to upload. Then, click **Request Health Check**. + +  + + +After you request a Health Check, a job is scheduled to generate the Health Check. After several hours to one day, the generated Health Check will appear in the "Health Checks" section of the {% data variables.contact.support_portal %}. + + diff --git a/translations/zh-CN/content/admin/enterprise-management/monitoring-your-appliance/index.md b/translations/zh-CN/content/admin/enterprise-management/monitoring-your-appliance/index.md index 589b99db6943..04656927f4dd 100644 --- a/translations/zh-CN/content/admin/enterprise-management/monitoring-your-appliance/index.md +++ b/translations/zh-CN/content/admin/enterprise-management/monitoring-your-appliance/index.md @@ -16,5 +16,6 @@ children: - /setting-up-external-monitoring - /configuring-collectd - /monitoring-using-snmp + - /generating-a-health-check-for-your-enterprise --- diff --git a/translations/zh-CN/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/increasing-storage-capacity.md b/translations/zh-CN/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/increasing-storage-capacity.md index f4a2d40b5cda..45ccd11f6aac 100644 --- a/translations/zh-CN/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/increasing-storage-capacity.md +++ b/translations/zh-CN/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/increasing-storage-capacity.md @@ -71,7 +71,7 @@ shortTitle: 增加存储容量 $ sudo parted /dev/xvdg mkpart primary ext4 0% 50% $ sudo parted /dev/xvdg mkpart primary ext4 50% 100% ``` -1. To stop replication, run the `ghe-repl-stop` command. +1. 若要停止复制，请运行 `ghe-repl-stop` 命令。 ```shell $ ghe-repl-stop @@ -90,4 +90,4 @@ shortTitle: 增加存储容量 1. 启动设备。 1. 确保系统服务正常运行，然后释放维护模式。 更多信息请参阅“[启用和排定维护模式](/admin/guides/installation/enabling-and-scheduling-maintenance-mode)”。 -If your appliance is configured for high-availability or geo-replication, remember to start replication on each replica node using `ghe-repl-start` after the storage on all nodes has been upgraded. +如果您的设备配置为高可用性或异地复制，请记住在所有节点上的存储升级后，使用 `ghe-repl-start` 在每个副本节点上开始复制。 diff --git a/translations/zh-CN/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrading-github-enterprise-server.md b/translations/zh-CN/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrading-github-enterprise-server.md index 8b9bea4d7531..70ad4d0b2cdc 100644 --- a/translations/zh-CN/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrading-github-enterprise-server.md +++ b/translations/zh-CN/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrading-github-enterprise-server.md @@ -27,7 +27,7 @@ shortTitle: 升级 GHES ## 准备升级 -1. 确定升级策略并选择要升级到的版本。 For more information, see "[Upgrade requirements](/enterprise/{{ currentVersion }}/admin/guides/installation/upgrade-requirements/)" and refer to the [{% data variables.enterprise.upgrade_assistant %}](https://support.github.com/enterprise/server-upgrade) to find the upgrade path from your current release version. +1. 确定升级策略并选择要升级到的版本。 更多信息请参阅“[升级要求](/enterprise/{{ currentVersion }}/admin/guides/installation/upgrade-requirements/)”，并参考 [{% data variables.enterprise.upgrade_assistant %}](https://support.github.com/enterprise/server-upgrade) 以查找当前发行版的升级路径。 3. 使用 {% data variables.product.prodname_enterprise_backup_utilities %} 创建全新的主实例备份。 更多信息请参阅 [{% data variables.product.prodname_enterprise_backup_utilities %} README.md 文件](https://github.com/github/backup-utils#readme)。 4. 如果您要使用升级包进行升级，请为 {% data variables.product.prodname_ghe_server %} 最终用户排定维护窗口。 如果您要使用热补丁，则不需要使用维护模式。 @@ -41,7 +41,7 @@ shortTitle: 升级 GHES ## 生成快照 -快照是虚拟机 (VM) 在某一时间点的检查点。 强烈建议在升级虚拟机之前生成快照，这样一来，如果升级失败，您可以将 VM 还原到快照状态。 We only recommend taking a VM snapshot when the appliance is powered down or in maintenance mode and all background jobs have finished. +快照是虚拟机 (VM) 在某一时间点的检查点。 强烈建议在升级虚拟机之前生成快照，这样一来，如果升级失败，您可以将 VM 还原到快照状态。 我们仅建议在设备关闭电源或处于维护模式且所有后台作业都已完成时拍摄 VM 快照。 如果您要升级到新的功能版本，则必须生成 VM 快照。 如果您要升级到补丁版本，可以连接现有数据磁盘。 @@ -71,7 +71,7 @@ shortTitle: 升级 GHES {% data reusables.enterprise_installation.hotpatching-explanation %} -Using the {% data variables.enterprise.management_console %}, you can install a hotpatch immediately or schedule it for later installation. 您可以使用管理 shell 的 `ghe-upgrade` 实用程序安装热补丁。 更多信息请参阅“[升级要求](/enterprise/{{ currentVersion }}/admin/guides/installation/upgrade-requirements/)”。 +使用 {% data variables.enterprise.management_console %}，您可以立即安装热补丁，也可以安排以后安装。 您可以使用管理 shell 的 `ghe-upgrade` 实用程序安装热补丁。 更多信息请参阅“[升级要求](/enterprise/{{ currentVersion }}/admin/guides/installation/upgrade-requirements/)”。 {% note %} @@ -88,9 +88,9 @@ Using the {% data variables.enterprise.management_console %}, you can install a #### 使用 {% data variables.enterprise.management_console %} 安装热补丁 -You can use the {% data variables.enterprise.management_console %} to upgrade with a hotpatch by enabling automatic updates. You will then be presented with the latest available version of {% data variables.product.prodname_ghe_server %} that you can upgrade to. +您可以通过启用自动更新来使用 {% data variables.enterprise.management_console %} 通过热补丁进行升级。 然后，您将看到可升级到的最新可用 {% data variables.product.prodname_ghe_server %} 版本。 -If the upgrade target you're presented with is a feature release instead of a patch release, you cannot use the {% data variables.enterprise.management_console %} to install a hotpatch. You must install the hotpatch using the administrative shell instead. For more information, see "[Installing a hotpatch using the administrative shell](#installing-a-hotpatch-using-the-administrative-shell)." +如果显示的升级目标是功能版本而不是修补程序版本，则无法使用 {% data variables.enterprise.management_console %} 来安装修补程序。 您必须改为使用管理 shell 安装热补丁。 更多信息请参阅“[使用管理 shell 安装热补丁](#installing-a-hotpatch-using-the-administrative-shell)”。 1. 启用自动更新。 更多信息请参阅“[启用自动更新](/enterprise/{{ currentVersion }}/admin/guides/installation/enabling-automatic-update-checks/)”。 {% data reusables.enterprise_site_admin_settings.access-settings %} @@ -221,7 +221,7 @@ If the upgrade target you're presented with is a feature release instead of a pa {% endnote %} - If `ghe-repl-status` did not return `OK`, contact {% data variables.contact.enterprise_support %}. 更多信息请参阅“[从 {% data variables.contact.github_support %} 获取帮助](/admin/enterprise-support/receiving-help-from-github-support)”。 + 如果 `ghe-repl-status` 未返回 `OK`，请联系 {% data variables.contact.enterprise_support %}。 更多信息请参阅“[从 {% data variables.contact.github_support %} 获取帮助](/admin/enterprise-support/receiving-help-from-github-support)”。 6. 最后一个副本升级完毕且重新同步完成后，请禁用维护模式，以便用户能够使用 {% data variables.product.product_location %}。 @@ -231,9 +231,9 @@ If the upgrade target you're presented with is a feature release instead of a pa ### 回滚补丁版本 -要回滚补丁版本，请使用带 `--allow-patch-rollback` 开关的 `ghe-upgrade` 命令。 Before rolling back, replication must be temporarily stopped by running `ghe-repl-stop` on all replica instances. {% data reusables.enterprise_installation.command-line-utilities-ghe-upgrade-rollback %} +要回滚补丁版本，请使用带 `--allow-patch-rollback` 开关的 `ghe-upgrade` 命令。 在回滚之前，必须通过在所有副本实例上运行 `ghe-repl-stop` 来暂时停止复制。 {% data reusables.enterprise_installation.command-line-utilities-ghe-upgrade-rollback %} -Once the rollback is complete, restart replication by running `ghe-repl-start` on all replicas. +回滚完成后，通过在所有副本上运行 `ghe-repl-start` 来重新启动复制。 更多信息请参阅“[命令行实用程序](/enterprise/{{ currentVersion }}/admin/guides/installation/command-line-utilities/#ghe-upgrade)”。 diff --git a/translations/zh-CN/content/admin/github-actions/advanced-configuration-and-troubleshooting/troubleshooting-github-actions-for-your-enterprise.md b/translations/zh-CN/content/admin/github-actions/advanced-configuration-and-troubleshooting/troubleshooting-github-actions-for-your-enterprise.md index be6dc809eb09..cd563300ed74 100644 --- a/translations/zh-CN/content/admin/github-actions/advanced-configuration-and-troubleshooting/troubleshooting-github-actions-for-your-enterprise.md +++ b/translations/zh-CN/content/admin/github-actions/advanced-configuration-and-troubleshooting/troubleshooting-github-actions-for-your-enterprise.md @@ -185,3 +185,43 @@ There are three ways to resolve this problem: 1. Return to {% data variables.product.prodname_ghe_server %}. {% endif %} + +{% ifversion ghes > 3.3 %} + + + +## Troubleshooting bundled actions in {% data variables.product.prodname_actions %} + +If you receive the following error when installing {% data variables.product.prodname_actions %} in {% data variables.product.prodname_ghe_server %}, you can resolve the problem by installing the official bundled actions and starter workflows. + +```shell +A part of the Actions setup had problems and needs an administrator to resolve. +``` + +To install the official bundled actions and starter workflows within a designated organization in {% data variables.product.prodname_ghe_server %}, follow this procedure. + +1. Identify an organization that will store the official bundled actions and starter worflows. You can create a new organization or reuse an existing one. + - To create a new organization, see "[Creating a new organization from scratch](/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch)." + - For assistance with choosing a name for this organization, see "[Reserved Names](/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-server#reserved-names)." + +1. Log in to the administrative shell using SSH. For more information, see "[Accessing the administrative shell (SSH)](/admin/configuration/accessing-the-administrative-shell-ssh)." +1. To designate your organization as the location to store the bundled actions, use the `ghe-config` command, replacing `ORGANIZATION` with the name of your organization. + ```shell + $ ghe-config app.actions.actions-org ORGANIZATION + ``` + and: + ```shell + $ ghe-config app.actions.github-org ORGANIZATION + ``` +1. To add the bundled actions to your organization, unset the SHA. + ```shell + $ ghe-config --unset 'app.actions.actions-repos-sha1sum' + ``` +1. Apply the configuration. + ```shell + $ ghe-config-apply + ``` + +After you've completed these steps, you can resume configuring {% data variables.product.prodname_actions %} at "[Managing access permissions for GitHub Actions in your enterprise](/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-server#managing-access-permissions-for-github-actions-in-your-enterprise)." + +{% endif %} diff --git a/translations/zh-CN/content/admin/github-actions/enabling-github-actions-for-github-enterprise-server/index.md b/translations/zh-CN/content/admin/github-actions/enabling-github-actions-for-github-enterprise-server/index.md index ee0f477635a1..b41450a5394f 100644 --- a/translations/zh-CN/content/admin/github-actions/enabling-github-actions-for-github-enterprise-server/index.md +++ b/translations/zh-CN/content/admin/github-actions/enabling-github-actions-for-github-enterprise-server/index.md @@ -9,7 +9,7 @@ children: - /enabling-github-actions-with-azure-blob-storage - /enabling-github-actions-with-amazon-s3-storage - /enabling-github-actions-with-minio-gateway-for-nas-storage - - /setting-up-dependabot-updates + - /managing-self-hosted-runners-for-dependabot-updates shortTitle: Enable GitHub Actions --- diff --git a/translations/zh-CN/content/admin/github-actions/enabling-github-actions-for-github-enterprise-server/setting-up-dependabot-updates.md b/translations/zh-CN/content/admin/github-actions/enabling-github-actions-for-github-enterprise-server/managing-self-hosted-runners-for-dependabot-updates.md similarity index 51% rename from translations/zh-CN/content/admin/github-actions/enabling-github-actions-for-github-enterprise-server/setting-up-dependabot-updates.md rename to translations/zh-CN/content/admin/github-actions/enabling-github-actions-for-github-enterprise-server/managing-self-hosted-runners-for-dependabot-updates.md index 4a97dde58398..ca70cb7b4af1 100644 --- a/translations/zh-CN/content/admin/github-actions/enabling-github-actions-for-github-enterprise-server/setting-up-dependabot-updates.md +++ b/translations/zh-CN/content/admin/github-actions/enabling-github-actions-for-github-enterprise-server/managing-self-hosted-runners-for-dependabot-updates.md @@ -1,6 +1,8 @@ --- -title: Setting up Dependabot security and version updates on your enterprise +title: Managing self-hosted runners for Dependabot updates on your enterprise intro: 'You can create dedicated runners for {% data variables.product.product_location %} that {% data variables.product.prodname_dependabot %} uses to create pull requests to help secure and maintain the dependencies used in repositories on your enterprise.' +redirect_from: + - /admin/github-actions/enabling-github-actions-for-github-enterprise-server/setting-up-dependabot-updates allowTitleToDifferFromFilename: true miniTocMaxHeadingLevel: 3 versions: @@ -10,38 +12,31 @@ topics: - Security - Dependabot - Dependencies -shortTitle: Set up Dependabot updates +shortTitle: Dependabot updates --- {% data reusables.dependabot.beta-security-and-version-updates %} -{% tip %} +## About self-hosted runners for {% data variables.product.prodname_dependabot_updates %} -**Tip**: If {% data variables.product.product_location %} uses clustering, you cannot set up {% data variables.product.prodname_dependabot %} security and version updates as {% data variables.product.prodname_actions %} are not supported in cluster mode. +You can help users of {% data variables.product.product_location %} to create and maintain secure code by setting up {% data variables.product.prodname_dependabot %} security and version updates. With {% data variables.product.prodname_dependabot_updates %}, developers can configure repositories so that their dependencies are updated and kept secure automatically. For more information, see "[Enabling {% data variables.product.prodname_dependabot %} for your enterprise](/admin/configuration/configuring-github-connect/enabling-dependabot-for-your-enterprise)." -{% endtip %} +To use {% data variables.product.prodname_dependabot_updates %} on {% data variables.product.product_location %}, you must configure self-hosted runners to create the pull requests that will update dependencies. -## 关于 {% data variables.product.prodname_dependabot %} 更新 +## 基本要求 -When you set up {% data variables.product.prodname_dependabot %} security and version updates for {% data variables.product.product_location %}, users can configure repositories so that their dependencies are updated and kept secure automatically. This is an important step in helping developers create and maintain secure code. +{% if dependabot-updates-github-connect %} +Configuring self-hosted runners is only one step in the middle of the process for enabling {% data variables.product.prodname_dependabot_updates %}. There are several steps you must follow before these steps, including configuring {% data variables.product.product_location %} to use {% data variables.product.prodname_actions %} with self-hosted runners. For more information, see "[Enabling {% data variables.product.prodname_dependabot %} for your enterprise](/admin/configuration/configuring-github-connect/enabling-dependabot-for-your-enterprise)." +{% else %} +Before you configure self-hosted runners for {% data variables.product.prodname_dependabot_updates %}, you must: -Users can set up {% data variables.product.prodname_dependabot %} to create pull requests to update their dependencies using two features. +- Configure {% data variables.product.product_location %} to use {% data variables.product.prodname_actions %} with self-hosted runners. 更多信息请参阅“[开始使用 GitHub Enterprise Server 的 {% data variables.product.prodname_actions %}](/admin/github-actions/enabling-github-actions-for-github-enterprise-server/getting-started-with-github-actions-for-github-enterprise-server)”。 +- Enable {% data variables.product.prodname_dependabot_alerts %} for your enterprise. For more information, see "[Enabling {% data variables.product.prodname_dependabot %} for your enterprise](/admin/configuration/configuring-github-connect/enabling-dependabot-for-your-enterprise)." +{% endif %} -- **{% data variables.product.prodname_dependabot_version_updates %}**: Users add a {% data variables.product.prodname_dependabot %} configuration file to the repository to enable {% data variables.product.prodname_dependabot %} to create pull requests when a new version of a tracked dependency is released. 更多信息请参阅“[关于 {% data variables.product.prodname_dependabot_version_updates %}](/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/about-dependabot-version-updates)“。 -- **{% data variables.product.prodname_dependabot_security_updates %}**: Users toggle a repository setting to enable {% data variables.product.prodname_dependabot %} to create pull requests when {% data variables.product.prodname_dotcom %} detects a vulnerability in one of the dependencies of the dependency graph for the repository. For more information, see "[About alerts for vulnerable dependencies](/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-alerts-for-vulnerable-dependencies)" and "[About {% data variables.product.prodname_dependabot_security_updates %}](/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-dependabot-security-updates)." +## Configuring self-hosted runners for {% data variables.product.prodname_dependabot_updates %} -## Prerequisites for {% data variables.product.prodname_dependabot %} updates - -Both types of {% data variables.product.prodname_dependabot %} update have the following requirements. - -- Configure {% data variables.product.product_location %} to use {% data variables.product.prodname_actions %}. For more information, see "[Getting started with {% data variables.product.prodname_actions %} for GitHub Enterprise Server](/admin/github-actions/enabling-github-actions-for-github-enterprise-server/getting-started-with-github-actions-for-github-enterprise-server)." -- Set up one or more {% data variables.product.prodname_actions %} self-hosted runners for {% data variables.product.prodname_dependabot %}. For more information, see "[Setting up self-hosted runners for {% data variables.product.prodname_dependabot %} updates](#setting-up-self-hosted-runners-for-dependabot-updates)" below. - -Additionally, {% data variables.product.prodname_dependabot_security_updates %} rely on the dependency graph, vulnerability data from {% data variables.product.prodname_github_connect %}, and {% data variables.product.prodname_dependabot_alerts %}. These features must be enabled on {% data variables.product.product_location %}. For more information, see "[Enabling the dependency graph and {% data variables.product.prodname_dependabot_alerts %} for your enterprise](/admin/configuration/configuring-github-connect/enabling-the-dependency-graph-and-dependabot-alerts-for-your-enterprise)." - -## Setting up self-hosted runners for {% data variables.product.prodname_dependabot %} updates - -When you have configured {% data variables.product.product_location %} to use {% data variables.product.prodname_actions %}, you need to add self-hosted runners for {% data variables.product.prodname_dependabot %} updates. For more information, see "[Getting started with {% data variables.product.prodname_actions %} for GitHub Enterprise Server](/admin/github-actions/enabling-github-actions-for-github-enterprise-server/getting-started-with-github-actions-for-github-enterprise-server)." +After you configure {% data variables.product.product_location %} to use {% data variables.product.prodname_actions %}, you need to add self-hosted runners for {% data variables.product.prodname_dependabot_updates %}. ### System requirements for {% data variables.product.prodname_dependabot %} runners 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 a3801a0252d1..8d5d97d5d6c2 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 @@ -31,7 +31,7 @@ This article explains how site administrators can configure {% data variables.pr {% data reusables.actions.migrating-enterprise %} -## Review hardware considerations +## Review hardware requirements {% ifversion ghes = 3.0 %} @@ -45,7 +45,7 @@ This article explains how site administrators can configure {% data variables.pr {%- ifversion ghes < 3.2 %} -The CPU and memory resources available to {% data variables.product.product_location %} determine the maximum job throughput for {% data variables.product.prodname_actions %}. +The CPU and memory resources available to {% data variables.product.product_location %} determine the maximum job throughput for {% data variables.product.prodname_actions %}. {% data reusables.actions.minimum-hardware %} Internal testing at {% data variables.product.company_short %} demonstrated the following maximum throughput for {% data variables.product.prodname_ghe_server %} instances with a range of CPU and memory configurations. You may see different throughput depending on the overall levels of activity on your instance. @@ -53,7 +53,7 @@ Internal testing at {% data variables.product.company_short %} demonstrated the {%- ifversion ghes > 3.1 %} -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. +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 %} The peak quantity of concurrent jobs running 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: @@ -73,9 +73,17 @@ Maximum concurrency was measured using multiple repositories, job duration of ap {%- endif %} -{%- ifversion ghes > 3.2 %} +{%- ifversion ghes = 3.3 %} -{% data reusables.actions.hardware-requirements-after %} +{% data reusables.actions.hardware-requirements-3.3 %} + +Maximum concurrency was measured 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. + +{%- endif %} + +{%- ifversion ghes = 3.4 %} + +{% data reusables.actions.hardware-requirements-3.4 %} Maximum concurrency was measured 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. diff --git a/translations/zh-CN/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/introducing-github-actions-to-your-enterprise.md b/translations/zh-CN/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/introducing-github-actions-to-your-enterprise.md index 01341eb374eb..5ffc8bb19f95 100644 --- a/translations/zh-CN/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/introducing-github-actions-to-your-enterprise.md +++ b/translations/zh-CN/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/introducing-github-actions-to-your-enterprise.md @@ -71,6 +71,7 @@ Think about how your enterprise can use features of {% data variables.product.pr {% data reusables.actions.internal-actions-summary %} {% ifversion ghec or ghes > 3.3 or ghae-issue-4757 %} +{% data reusables.actions.reusable-workflows-ghes-beta %} With reusable workflows, your team can call one workflow from another workflow, avoiding exact duplication. Reusable workflows promote best practice by helping your team use workflows that are well designed and have already been tested. For more information, see "[Reusing workflows](/actions/learn-github-actions/reusing-workflows)." {% endif %} diff --git a/translations/zh-CN/content/admin/identity-and-access-management/authenticating-users-for-your-github-enterprise-server-instance/using-saml.md b/translations/zh-CN/content/admin/identity-and-access-management/authenticating-users-for-your-github-enterprise-server-instance/using-saml.md index 4492cab6c852..06da89bfff28 100644 --- a/translations/zh-CN/content/admin/identity-and-access-management/authenticating-users-for-your-github-enterprise-server-instance/using-saml.md +++ b/translations/zh-CN/content/admin/identity-and-access-management/authenticating-users-for-your-github-enterprise-server-instance/using-saml.md @@ -7,7 +7,7 @@ redirect_from: - /enterprise/admin/authentication/using-saml - /admin/authentication/using-saml - /enterprise/admin/authentication/authenticating-users-for-your-github-enterprise-server-instance/using-saml -intro: 'SAML 是一种基于 XML 的身份验证和授权标准。 {% data variables.product.prodname_ghe_server %} 可以作为您的内部 SAML 身份提供程序 (IdP) 的服务提供程序 (SP)。' +intro: 'You can configure SAML single sign-on (SSO) for {% data variables.product.product_name %}, which allows users to authenticate through a SAML identity provider (IdP) to access your instance.' versions: ghes: '*' type: how_to @@ -19,12 +19,24 @@ topics: - SSO --- +## About SAML for {% data variables.product.product_name %} + +SAML SSO allows people to authenticate and access {% data variables.product.product_location %} through an external system for identity management. + +SAML 是一种基于 XML 的身份验证和授权标准。 When you configure SAML for {% data variables.product.product_location %}, the external system for authentication is called an identity provider (IdP). Your instance acts as a SAML service provider (SP). For more information, see [Security Assertion Markup Language](https://en.wikipedia.org/wiki/Security_Assertion_Markup_Language) on Wikipedia. + {% data reusables.enterprise_user_management.built-in-authentication %} ## 支持的 SAML 服务 {% data reusables.saml.saml-supported-idps %} +{% ifversion ghes > 3.3 %} + +If your IdP supports encrypted assertions, you can configure encrypted assertions on {% data variables.product.product_name %} for increased security during the authentication process. + +{% endif %} + {% data reusables.saml.saml-single-logout-not-supported %} ## 使用 SAML 时的用户名考量因素 @@ -55,7 +67,7 @@ topics: ## SAML 元数据 -您的 {% data variables.product.prodname_ghe_server %} 实例的服务提供程序元数据位于 `http(s)://[hostname]/saml/metadata` 下。 +The service provider metadata for {% data variables.product.product_location %} is available at `http(s)://[hostname]/saml/metadata`. 要手动配置您的身份提供程序，断言使用者服务 (ACS) URL 为 `http(s)://[hostname]/saml/consume`。 它使用 `urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST` 绑定。 @@ -87,24 +99,92 @@ To specify more than one value for an attribute, use multiple `
- `checkboxes`
- `dropdown`
- `input`
- `markdown`
- `textarea`
- `checkboxes`
- `dropdown`
- `input`
- `markdown`
- `textarea`
对 [{% data variables.product.prodname_code_scanning %} API](/rest/reference/code-scanning) 中安全事件的读取和写入权限
对 [{% data variables.product.prodname_secret_scanning %} API](/rest/reference/secret-scanning) 中安全事件的读取和写入权限
仅在授予其他用户或服务对安全事件的访问权限而*不*授予对代码的访问权限时，才需要此作用域。{% endif %}{% ifversion ghes < 3.1 %} | `security_events` | 授予对 [{% data variables.product.prodname_code_scanning %} API](/rest/reference/code-scanning) 中安全事件的读取和写入权限。 仅在授予其他用户或服务对安全事件的访问权限而*不*授予对代码的访问权限时，才需要此作用域。{% endif %} -| **`admin:repo_hook`** | Grants read, write, ping, and delete access to repository hooks in {% ifversion fpt %}public or private{% elsif ghec or ghes %}public, private, or internal{% elsif ghae %}private or internal{% endif %} repositories. The `repo` {% ifversion fpt or ghec or ghes %}and `public_repo` scopes grant{% else %}scope grants{% endif %} full access to repositories, including repository hooks. 使用 `admin:repo_hook` 作用域将访问权限限制为仅仓库挂钩。 | -| `write:repo_hook` | Grants read, write, and ping access to hooks in {% ifversion fpt %}public or private{% elsif ghec or ghes %}public, private, or internal{% elsif ghae %}private or internal{% endif %} repositories. | -| `read:repo_hook` | Grants read and ping access to hooks in {% ifversion fpt %}public or private{% elsif ghec or ghes %}public, private, or internal{% elsif ghae %}private or internal{% endif %} repositories. | -| **`admin:org`** | 全面管理组织及其团队、项目和成员。 | -| `write:org` | 对组织成员身份、组织项目和团队成员身份的读取和写入权限。 | -| `read:org` | 对组织成员身份、组织项目和团队成员身份的只读权限。 | -| **`admin:public_key`** | 全面管理公钥。 | -| `write:public_key` | 创建、列出和查看公钥的详细信息。 | -| `read:public_key` | 列出和查看公钥的详细信息。 | -| **`admin:org_hook`** | 授予对组织挂钩的读取、写入、ping 和删除权限。 **注：**OAuth 令牌只能对由 OAuth 应用程序创建的组织挂钩执行这些操作。 个人访问令牌只能对用户创建的组织挂钩执行这些操作。 | -| **`gist`** | 授予对 gist 的写入权限。 | -| **`通知`** | 授予：
* 对用户通知的读取权限
* 对线程的标记读取权限
* 对仓库的关注和取消关注权限，以及
* 对线程订阅的读取、写入和删除权限。 | -| **`用户`** | 仅授予对个人资料的读取/写入权限。 请注意，此作用域包括 `user:email` 和 `user:follow`。 | -| `read:user` | 授予读取用户个人资料数据的权限。 | -| `user:email` | 授予对用户电子邮件地址的读取权限。 | -| `user:follow` | 授予关注或取消关注其他用户的权限。 | -| **`delete_repo`** | 授予删除可管理仓库的权限。 | -| **`write:discussion`** | 授予对团队讨论的读取和写入权限。 | +| **`admin:repo_hook`** | 授予对{% ifversion fpt %}公共或私有{% elsif ghec or ghes %}公共、私有或内部{% elsif ghae %}私有或内部{% endif %}仓库中仓库挂钩的读取、写入、ping 和删除访问权限。 `repo` {% ifversion fpt or ghec or ghes %}和 `public_repo` 范围授予{% else %}范围授予{% endif %}对仓库（包括仓库挂钩）的完全访问权限。 使用 `admin:repo_hook` 作用域将访问权限限制为仅仓库挂钩。 | +| `write:repo_hook` | 授予对{% ifversion fpt %}公共或私有{% elsif ghec or ghes %}公共、私有或内部{% elsif ghae %}私有或内部{% endif %}仓库中挂钩的读取、写入和 ping 访问权限。 | +| `read:repo_hook` | 授予对{% ifversion fpt %}公共或私有{% elsif ghec or ghes %}公共、私有或内部{% elsif ghae %}私有或内部{% endif %}仓库中挂钩的读取和 ping 访问权限。 | +| **`admin:org`** | 全面管理组织及其团队、项目和成员。 | +| `write:org` | 对组织成员身份、组织项目和团队成员身份的读取和写入权限。 | +| `read:org` | 对组织成员身份、组织项目和团队成员身份的只读权限。 | +| **`admin:public_key`** | 全面管理公钥。 | +| `write:public_key` | 创建、列出和查看公钥的详细信息。 | +| `read:public_key` | 列出和查看公钥的详细信息。 | +| **`admin:org_hook`** | 授予对组织挂钩的读取、写入、ping 和删除权限。 **注：**OAuth 令牌只能对由 OAuth 应用程序创建的组织挂钩执行这些操作。 个人访问令牌只能对用户创建的组织挂钩执行这些操作。 | +| **`gist`** | 授予对 gist 的写入权限。 | +| **`通知`** | 授予：
* 对用户通知的读取权限
* 对线程的标记读取权限
* 对仓库的关注和取消关注权限，以及
* 对线程订阅的读取、写入和删除权限。 | +| **`用户`** | 仅授予对个人资料的读取/写入权限。 请注意，此作用域包括 `user:email` 和 `user:follow`。 | +| `read:user` | 授予读取用户个人资料数据的权限。 | +| `user:email` | 授予对用户电子邮件地址的读取权限。 | +| `user:follow` | 授予关注或取消关注其他用户的权限。 | +| **`delete_repo`** | 授予删除可管理仓库的权限。 | +| **`write:discussion`** | 授予对团队讨论的读取和写入权限。 | | `read:discussion` | 授予对团队讨论的读取权限。{% ifversion fpt or ghae or ghec %} -| **`write:packages`** | 授予在 {% data variables.product.prodname_registry %} 中上传或发布包的权限。 更多信息请参阅“[发布包](/github/managing-packages-with-github-packages/publishing-a-package)”。 | -| **`read:packages`** | 授予从 {% data variables.product.prodname_registry %} 下载或安装包的权限。 更多信息请参阅“[安装包](/github/managing-packages-with-github-packages/installing-a-package)”。 | -| **`delete:packages`** | 授予从 {% data variables.product.prodname_registry %} 删除包的权限。 For more information, see "{% ifversion fpt or ghes > 3.0 or ghec or ghae %}[Deleting and restoring a package](/packages/learn-github-packages/deleting-and-restoring-a-package){% elsif ghes < 3.1 %}[Deleting a package](/packages/learn-github-packages/deleting-a-package){% endif %}."{% endif %} -| **`admin:gpg_key`** | 全面管理 GPG 密钥。 | -| `write:gpg_key` | 创建、列出和查看 GPG 密钥的详细信息。 | +| **`write:packages`** | 授予在 {% data variables.product.prodname_registry %} 中上传或发布包的权限。 更多信息请参阅“[发布包](/github/managing-packages-with-github-packages/publishing-a-package)”。 | +| **`read:packages`** | 授予从 {% data variables.product.prodname_registry %} 下载或安装包的权限。 更多信息请参阅“[安装包](/github/managing-packages-with-github-packages/installing-a-package)”。 | +| **`delete:packages`** | 授予从 {% data variables.product.prodname_registry %} 删除包的权限。 更多信息请参阅“{% ifversion fpt or ghes > 3.0 or ghec or ghae %}[删除和恢复包](/packages/learn-github-packages/deleting-and-restoring-a-package){% elsif ghes < 3.1 %}[删除包](/packages/learn-github-packages/deleting-a-package){% endif %}”。{% endif %} +| **`admin:gpg_key`** | 全面管理 GPG 密钥。 | +| `write:gpg_key` | 创建、列出和查看 GPG 密钥的详细信息。 | | `read:gpg_key` | 列出和查看 GPG 密钥的详细信息。{% ifversion fpt or ghec %} -| **`代码空间`** | Grants the ability to create and manage codespaces. Codespaces can expose a GITHUB_TOKEN which may have a different set of scopes. For more information, see "[Security in Codespaces](/codespaces/codespaces-reference/security-in-codespaces#authentication)."{% endif %} -| **`工作流程`** | 授予添加和更新 {% data variables.product.prodname_actions %} 工作流程文件的权限。 如果在同一仓库中的另一个分支上存在相同的文件(具有相同的路径和内容)，则工作流程文件可以在没有此作用域的情况下提交。 工作流程文件可以暴露可能有不同范围集的 `GITHUB_TOKEN`。 更多信息请参阅“[工作流程中的身份验证](/actions/reference/authentication-in-a-workflow#permissions-for-the-github_token)。 | +| **`代码空间`** | 授予创建和管理代码空间的能力。 Codespaces 可以暴露可能有不同范围集的 GITHUB_TOKEN。 更多信息请参阅“[Codespaces 中的安全性](/codespaces/codespaces-reference/security-in-codespaces#authentication)”。{% endif %} +| **`工作流程`** | 授予添加和更新 {% data variables.product.prodname_actions %} 工作流程文件的权限。 如果在同一仓库中的另一个分支上存在相同的文件(具有相同的路径和内容)，则工作流程文件可以在没有此作用域的情况下提交。 工作流程文件可以暴露可能有不同范围集的 `GITHUB_TOKEN`。 更多信息请参阅“[工作流程中的身份验证](/actions/reference/authentication-in-a-workflow#permissions-for-the-github_token)。 | {% note %} diff --git a/translations/zh-CN/content/developers/apps/getting-started-with-apps/differences-between-github-apps-and-oauth-apps.md b/translations/zh-CN/content/developers/apps/getting-started-with-apps/differences-between-github-apps-and-oauth-apps.md index 6f372a7fabd6..95e94432141f 100644 --- a/translations/zh-CN/content/developers/apps/getting-started-with-apps/differences-between-github-apps-and-oauth-apps.md +++ b/translations/zh-CN/content/developers/apps/getting-started-with-apps/differences-between-github-apps-and-oauth-apps.md @@ -57,14 +57,14 @@ _授权的_ OAuth 应用程序有权访问用户或组织所有者可访问的 {% endnote %} -| GitHub 应用程序 | OAuth 应用程序 | -| --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| GitHub 应用可以使用带外 JSON Web 令牌格式的私钥请求安装访问令牌。 | OAuth 应用程序可以通过 Web 请求在重定向后将请求令牌交换为访问令牌。 | -| 安装程序将应用程序识别为 GitHub 应用自动程序，例如 @jenkins-bot。 | 访问令牌将应用程序识别为向应用程序授予令牌的用户，例如 @octocat。 | -| 安装令牌在预定义的时间（当前为 1 小时）后过期。 | OAuth 令牌在被客户撤销之前一直保持活动状态。 | -| {% data variables.product.prodname_github_apps %} installed on organizations or repositories are subject to rate limits for server-to-server requests. For more information, see "[Rate limits for {% data variables.product.prodname_github_apps %}](/developers/apps/building-github-apps/rate-limits-for-github-apps)." | OAuth tokens use the user's rate limit of {% ifversion fpt or ghec or ghes %}5,000{% elsif ghae %}15,000{% endif %} requests per hour. | -| 速率限制的增加可在 GitHub 应用程序级别（影响所有安装）和单个安装级别上授予。 | 速率限制的增加按 OAuth 应用程序授予。 授予该 OAuth 应用程序的每个令牌都会获得增加的上限。 | -| {% data variables.product.prodname_github_apps %} can authenticate on behalf of the user, which is called a user-to-server request. 授权流程与 OAuth 应用程序授权流程相同。 用户到服务器令牌可能会过期，可通过刷新令牌进行续订。 更多信息请参阅“[刷新用户到服务器访问令牌](/apps/building-github-apps/refreshing-user-to-server-access-tokens/)”和“[识别和授权 GitHub 应用程序用户](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps/)”。 | {% data variables.product.prodname_oauth_apps %} 使用的 OAuth 流程代表用户授权 {% data variables.product.prodname_oauth_app %}。 这与用于 {% data variables.product.prodname_github_app %} 用户到服务器授权中使用的流程相同。 | +| GitHub 应用程序 | OAuth 应用程序 | +| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| GitHub 应用可以使用带外 JSON Web 令牌格式的私钥请求安装访问令牌。 | OAuth 应用程序可以通过 Web 请求在重定向后将请求令牌交换为访问令牌。 | +| 安装程序将应用程序识别为 GitHub 应用自动程序，例如 @jenkins-bot。 | 访问令牌将应用程序识别为向应用程序授予令牌的用户，例如 @octocat。 | +| 安装令牌在预定义的时间（当前为 1 小时）后过期。 | OAuth 令牌在被客户撤销之前一直保持活动状态。 | +| 安装在组织或仓库上的 {% data variables.product.prodname_github_apps %} 受服务器到服务器请求的速率限制。 更多信息请参阅“[{% data variables.product.prodname_github_apps %} 的速率限制”](/developers/apps/building-github-apps/rate-limits-for-github-apps)。 | OAuth 令牌使用用户的速率限制，即每小时 {% ifversion fpt or ghec or ghes %}5,000{% elsif ghae %}15,000{% endif %} 个请求。 | +| 速率限制的增加可在 GitHub 应用程序级别（影响所有安装）和单个安装级别上授予。 | 速率限制的增加按 OAuth 应用程序授予。 授予该 OAuth 应用程序的每个令牌都会获得增加的上限。 | +| {% data variables.product.prodname_github_apps %} 可以代表用户进行身份验证，这称为用户到服务器请求。 授权流程与 OAuth 应用程序授权流程相同。 用户到服务器令牌可能会过期，可通过刷新令牌进行续订。 更多信息请参阅“[刷新用户到服务器访问令牌](/apps/building-github-apps/refreshing-user-to-server-access-tokens/)”和“[识别和授权 GitHub 应用程序用户](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps/)”。 | {% data variables.product.prodname_oauth_apps %} 使用的 OAuth 流程代表用户授权 {% data variables.product.prodname_oauth_app %}。 这与用于 {% data variables.product.prodname_github_app %} 用户到服务器授权中使用的流程相同。 | ## 请求资源的权限级别 diff --git a/translations/zh-CN/content/developers/apps/getting-started-with-apps/setting-up-your-development-environment-to-create-a-github-app.md b/translations/zh-CN/content/developers/apps/getting-started-with-apps/setting-up-your-development-environment-to-create-a-github-app.md index aabf472d4c08..7e6c39298f87 100644 --- a/translations/zh-CN/content/developers/apps/getting-started-with-apps/setting-up-your-development-environment-to-create-a-github-app.md +++ b/translations/zh-CN/content/developers/apps/getting-started-with-apps/setting-up-your-development-environment-to-create-a-github-app.md @@ -54,7 +54,7 @@ $ git clone https://github.com/github-developer/github-app-template.git ## 步骤 1. 启动新的 Sme 通道 -为了帮助 GitHub 将 web 挂钩发送到您的本地计算机而不将其暴露在互联网上，您可以使用一个名为 Smee 的工具。 首先，转到 https://smee.io，然后单击 **Start a new channel（启动新通道）**。 If you're already comfortable with other tools that expose your local machine to the internet like [`ngrok`](https://dashboard.ngrok.com/get-started) or [`localtunnel`](https://localtunnel.github.io/www/), feel free to use those. +为了帮助 GitHub 将 web 挂钩发送到您的本地计算机而不将其暴露在互联网上，您可以使用一个名为 Smee 的工具。 首先，转到 https://smee.io，然后单击 **Start a new channel（启动新通道）**。 如果您已经习惯使用将本地计算机暴露到互联网上的其他工具，例如 [`ngrok`](https://dashboard.ngrok.com/get-started) 或 [`localtunnel`](https://localtunnel.github.io/www/)，请随意使用。  @@ -91,7 +91,7 @@ $ git clone https://github.com/github-developer/github-app-template.git `smee --url
-## Monitoring students' progress
-The assignment overview page displays information about your assignment acceptances and team progress. You may have different summary information based on the configurations of your assignments.
-
-- **Total teams**: The number of teams that have been created.
-- **Rostered students**: The number of students on the Classroom's roster.
-- **Students not on a team**: The number of students on the Classroom roster who have not yet joined a team.
-- **Accepted teams**: The number of teams who have accepted this assignment.
-- **Assignment submissions**: The number of teams that have submitted the assignment. Submission is triggered at the assignment deadline.
-- **Passing teams**: The number of teams that are currently passing the autograding tests for this assignment.
+## 监控学生的进度
+作业概述页显示有关作业接受和团队进度的信息。 根据作业的配置，您可能有不同的摘要信息。
+
+- **团队总数**：已创建的团队数。
+- **名册学生**：教室名册上的学生人数。
+- **不在团队的学生**：课堂名册上尚未加入团队的学生人数。
+- **接受的团队**：已接受此任务的团队数。
+- **作业提交**：已提交作业的团队数。 在作业截止日期触发提交。
+- **通过团队**：当前通过此作业的自动评分测试的团队数。
## 后续步骤
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 b0e6cfd5ec1c..8d1169272499 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
@@ -101,20 +101,20 @@ shortTitle: 个人作业
{% data reusables.classroom.assignments-guide-invite-students-to-assignment %}
-You can see whether a student has joined the classroom and accepted or submitted an assignment in the **Classroom roster** tab for the assignment. You can also link students' {% data variables.product.prodname_dotcom %} aliases to their associated roster identifier and vice versa in this tab. {% data reusables.classroom.assignments-to-prevent-submission %}
+您可以在作业的 **Classroom roster（课堂花名册）**选项卡中查看学生是否已进入教室或提交作业。 您还可以在此选项卡中将学生的 {% data variables.product.prodname_dotcom %} 别名链接到其关联的花名册标识符，反之亦然。 {% data reusables.classroom.assignments-to-prevent-submission %}
{% warning %} -**Warning:** Older versions of Git for Windows came with Git Credential Manager for Windows. This older product is no longer supported and cannot connect to GitHub via OAuth. We recommend you upgrade to [the latest version of Git for Windows](https://github.com/git-for-windows/git/releases/latest). +**警告：** 旧版本的 Windows 版 Git 附有 Windows 版 Git Credential Manager。 此旧产品不再受支持，并且无法通过 OAuth 连接到 GitHub。 我们建议您升级到[最新版本的 Windows 版 Git](https://github.com/git-for-windows/git/releases/latest)。 {% endwarning %} {% warning %} -**Warning:** If you cached incorrect or outdated credentials in Credential Manager for Windows, Git will fail to access {% data variables.product.product_name %}. To reset your cached credentials so that Git prompts you to enter your credentials, access the Credential Manager in the Windows Control Panel under User Accounts > Credential Manager. Look for the {% data variables.product.product_name %} entry and delete it. +**警告：**如果在 Windows 凭据管理器中缓存了不正确或过期的凭据，Git 将无法访问 {% data variables.product.product_name %}。 若要重置缓存的凭据，以便 Git 提示您输入凭据，请在 Windows 控制面板中的“用户帐户”>“凭据管理器”下访问凭据管理器。 找到 {% data variables.product.product_name %} 条目并将其删除。 {% endwarning %} @@ -85,17 +85,17 @@ Once you've authenticated successfully, your credentials are stored in the Windo {% linux %} -For Linux, install Git and GCM, then configure Git to use GCM. +对于 Linux，安装 Git 和 GCM，然后配置 Git 使用 GCM。 -1. Install Git from your distro's packaging system. Instructions will vary depending on the flavor of Linux you run. +1. 从发行版的打包系统安装 Git。 说明将根据您运行的 Linux 的风格而有所不同。 -2. Install GCM. See the [instructions in the GCM repo](https://github.com/GitCredentialManager/git-credential-manager#linux-install-instructions), as they'll vary depending on the flavor of Linux you run. +2. 安装 GCM。 请参阅 [GCM 存储库中的说明](https://github.com/GitCredentialManager/git-credential-manager#linux-install-instructions)，因为它们会因您运行的 Linux 风格而异。 -3. Configure Git to use GCM. There are several backing stores that you may choose from, so see the GCM docs to complete your setup. For more information, see "[GCM Linux](https://aka.ms/gcmcore-linuxcredstores)." +3. 配置 Git 使用 GCM 有几个支持商店，您可以从中选择，因此请参阅 GCM 文档来完成设置。 更多信息请参阅“[GCM Linux](https://aka.ms/gcmcore-linuxcredstores)”。 {% data reusables.gcm-core.next-time-you-clone %} -Once you've authenticated successfully, your credentials are stored on your system and will be used every time you clone an HTTPS URL. Git will not require you to type your credentials in the command line again unless you change your credentials. +验证成功后，您的凭据存储在系统中，每次克隆 HTTPS URL 时都会使用。 Git 不会要求您在命令行中再次键入凭据，除非您更改凭据。 有关在 Linux 上存储凭据的更多选项，请参阅 Pro Git 中的[凭据存储](https://git-scm.com/book/en/v2/Git-Tools-Credential-Storage) 。 @@ -103,4 +103,4 @@ Once you've authenticated successfully, your credentials are stored on your syst
-For more information or to report issues with GCM, see the official GCM docs at "[Git Credential Manager](https://github.com/GitCredentialManager/git-credential-manager)." +如需详细信息或报告 GCM 问题，请参阅 [Git Credential Manager](https://github.com/GitCredentialManager/git-credential-manager) 上的官方 GCM 文档。 diff --git a/translations/zh-CN/content/get-started/getting-started-with-git/configuring-git-to-handle-line-endings.md b/translations/zh-CN/content/get-started/getting-started-with-git/configuring-git-to-handle-line-endings.md index c9c9e419a2a6..c9a268f3bcd4 100644 --- a/translations/zh-CN/content/get-started/getting-started-with-git/configuring-git-to-handle-line-endings.md +++ b/translations/zh-CN/content/get-started/getting-started-with-git/configuring-git-to-handle-line-endings.md @@ -17,7 +17,7 @@ versions: shortTitle: 处理行结束 --- -## About line endings +## 关于行结尾 每次按键盘上的 return 时，会插入一个称为行结束符的不可见字符。 不同的操作系统处理行结束符的方式不同。 在使用 Git 和 {% data variables.product.product_name %} 协作处理项目时，Git 可能产生意外结果，例如，您在 Windows 计算机上操作，而您的协作者是在 macOS 中做的更改。 diff --git a/translations/zh-CN/content/get-started/getting-started-with-git/ignoring-files.md b/translations/zh-CN/content/get-started/getting-started-with-git/ignoring-files.md index daddfd1d4fa9..db0b42d94c8d 100644 --- a/translations/zh-CN/content/get-started/getting-started-with-git/ignoring-files.md +++ b/translations/zh-CN/content/get-started/getting-started-with-git/ignoring-files.md @@ -28,7 +28,7 @@ GitHub 在 `github/gitignore` 公共仓库中维护建议用于许多常用操 $ touch .gitignore ``` - If the command succeeds, there will be no output. + 如果命令成功，则不会有输出。 例如 *.gitignore* 文件，请参阅 Octocat 仓库中的“[一些常见的 .gitignore 配置](https://gist.github.com/octocat/9257657)”。 diff --git a/translations/zh-CN/content/get-started/getting-started-with-git/managing-remote-repositories.md b/translations/zh-CN/content/get-started/getting-started-with-git/managing-remote-repositories.md index d3496d01402c..78481f4cba1e 100644 --- a/translations/zh-CN/content/get-started/getting-started-with-git/managing-remote-repositories.md +++ b/translations/zh-CN/content/get-started/getting-started-with-git/managing-remote-repositories.md @@ -107,7 +107,7 @@ git@{% data variables.command_line.codeblock %}:USERNAME/REPOSITORY > origin https://{% data variables.command_line.codeblock %}/USERNAME/REPOSITORY.git (push) ``` -下次对远程仓库执行 `git fetch`、`git pull` 或 `git push` 操作时，您需要提供 GitHub 用户名和密码。 {% data reusables.user_settings.password-authentication-deprecation %} +下次对远程仓库执行 `git fetch`、`git pull` 或 `git push` 操作时，您需要提供 GitHub 用户名和密码。 {% data reusables.user-settings.password-authentication-deprecation %} 您可以[使用凭据小助手](/github/getting-started-with-github/caching-your-github-credentials-in-git)让 Git 在每次与 GitHub 会话时记住您的 GitHub 用户名和个人访问令牌。 @@ -173,7 +173,7 @@ $ git remote -v ### 故障排除：无法将配置部分 'remote.[old name]' 重命名为 'remote.[new name]' -This error means that the old remote name you typed doesn't exist. +此错误表示您键入的旧远程名称不存在。 您可以使用 `git remote -v` 命令检查当前存在哪些远程： @@ -195,7 +195,7 @@ $ git remote -v `git remote rm` 命令使用一个参数： * 远程名称，例如 `destination` -Removing the remote URL from your repository only unlinks the local and remote repositories. It does not delete the remote repository. +从存储库中删除远程 URL 只会取消本地和远程存储库的链接。 它不会删除远程存储库。 ## 示例 @@ -219,7 +219,7 @@ $ git remote -v {% warning %} -**Note**: `git remote rm` does not delete the remote repository from the server. 它只是从本地仓库中删除远程及其引用。 +**注意**：`git remote rm` 不会从服务器中删除远程存储库。 它只是从本地仓库中删除远程及其引用。 {% endwarning %} diff --git a/translations/zh-CN/content/get-started/getting-started-with-git/setting-your-username-in-git.md b/translations/zh-CN/content/get-started/getting-started-with-git/setting-your-username-in-git.md index 166cd3173d0e..ef07f6e7cbae 100644 --- a/translations/zh-CN/content/get-started/getting-started-with-git/setting-your-username-in-git.md +++ b/translations/zh-CN/content/get-started/getting-started-with-git/setting-your-username-in-git.md @@ -14,7 +14,7 @@ versions: shortTitle: 设置用户名 --- -## About Git usernames +## 关于 Git 用户名 您可以使用 `git config` 命令更改与您的 Git 提交关联的名称。 您设置的新名称将在从命令行推送到 {% data variables.product.product_name %} 的任何未来提交中显示。 如果您想要将真实姓名保密，则可以使用任意文本作为您的 Git 用户名。 使用 `git config` 更改与 Git 提交关联的名称仅影响未来的提交，不会更改用于过去提交的名称。 @@ -23,12 +23,12 @@ shortTitle: 设置用户名 {% data reusables.command_line.open_the_multi_os_terminal %} -2. {% data reusables.user_settings.set_your_git_username %} +2. {% data reusables.user-settings.set_your_git_username %} ```shell $ git config --global user.name "Mona Lisa" ``` -3. {% data reusables.user_settings.confirm_git_username_correct %} +3. {% data reusables.user-settings.confirm_git_username_correct %} ```shell $ git config --global user.name > Mona Lisa @@ -40,12 +40,12 @@ shortTitle: 设置用户名 2. 将当前工作目录更改为您想要在其中配置与 Git 提交关联的名称的本地仓库。 -3. {% data reusables.user_settings.set_your_git_username %} +3. {% data reusables.user-settings.set_your_git_username %} ```shell $ git config user.name "Mona Lisa" ``` -3. {% data reusables.user_settings.confirm_git_username_correct %} +3. {% data reusables.user-settings.confirm_git_username_correct %} ```shell $ git config user.name > Mona Lisa diff --git a/translations/zh-CN/content/get-started/getting-started-with-git/updating-credentials-from-the-macos-keychain.md b/translations/zh-CN/content/get-started/getting-started-with-git/updating-credentials-from-the-macos-keychain.md index 8f4a05643170..e206e73052ac 100644 --- a/translations/zh-CN/content/get-started/getting-started-with-git/updating-credentials-from-the-macos-keychain.md +++ b/translations/zh-CN/content/get-started/getting-started-with-git/updating-credentials-from-the-macos-keychain.md @@ -22,7 +22,7 @@ We recommend you either [configure SSH](/articles/generating-an-ssh-key) or upgr {% endtip %} -{% data reusables.user_settings.password-authentication-deprecation %} +{% data reusables.user-settings.password-authentication-deprecation %} ## Updating your credentials via Keychain Access diff --git a/translations/zh-CN/content/get-started/getting-started-with-git/why-is-git-always-asking-for-my-password.md b/translations/zh-CN/content/get-started/getting-started-with-git/why-is-git-always-asking-for-my-password.md index 2eb420e177f7..5976e72826b7 100644 --- a/translations/zh-CN/content/get-started/getting-started-with-git/why-is-git-always-asking-for-my-password.md +++ b/translations/zh-CN/content/get-started/getting-started-with-git/why-is-git-always-asking-for-my-password.md @@ -16,7 +16,7 @@ shortTitle: Git 密码 与使用 SSH 相比，使用 HTTPS 远程 URL 具有一些优势。 它比 SSH 更容易设置，通常通过严格的防火墙和代理进行工作。 但是，每次拉取或推送仓库时，它也会提示您输入 {% data variables.product.product_name %} 凭据。 -{% data reusables.user_settings.password-authentication-deprecation %} +{% data reusables.user-settings.password-authentication-deprecation %} 通过配置 Git 为您[缓存凭据](/github/getting-started-with-github/caching-your-github-credentials-in-git)，您可以避免提示输入密码。 在配置凭据缓存后，当您使用 HTTPS 拉取或推送仓库时，Git 会自动使用缓存的个人访问令牌。 diff --git a/translations/zh-CN/content/get-started/learning-about-github/access-permissions-on-github.md b/translations/zh-CN/content/get-started/learning-about-github/access-permissions-on-github.md index 73a2d8c20c92..09784f777b1d 100644 --- a/translations/zh-CN/content/get-started/learning-about-github/access-permissions-on-github.md +++ b/translations/zh-CN/content/get-started/learning-about-github/access-permissions-on-github.md @@ -7,7 +7,7 @@ redirect_from: - /articles/access-permissions-on-github - /github/getting-started-with-github/access-permissions-on-github - /github/getting-started-with-github/learning-about-github/access-permissions-on-github -intro: 'With roles, you can control who has access to your accounts and resources on {% data variables.product.product_name %} and the level of access each person has.' +intro: '使用角色，您可以控制谁有权访问您在 {% data variables.product.product_name %} 上的帐户和资源，以及每个人拥有的访问权限级别。' versions: fpt: '*' ghes: '*' @@ -19,11 +19,11 @@ topics: shortTitle: 访问权限 --- -## About access permissions on {% data variables.product.prodname_dotcom %} +## 关于 {% data variables.product.prodname_dotcom %} 上的访问权限 {% data reusables.organizations.about-roles %} -Roles work differently for different types of accounts. For more information about accounts, see "[Types of {% data variables.product.prodname_dotcom %} accounts](/get-started/learning-about-github/types-of-github-accounts)." +对于不同类型的帐户，角色的工作方式不同。 有关帐户的详细信息，请参阅“[{% data variables.product.prodname_dotcom %} 帐户类型](/get-started/learning-about-github/types-of-github-accounts)”。 ## 个人用户帐户 @@ -32,7 +32,7 @@ Roles work differently for different types of accounts. For more information abo ## 组织帐户 组织成员可以是*所有者*{% ifversion fpt or ghec %}、*帐单管理员*{% endif %}或*成员*角色。 所有者对组织具有完全管理权限{% ifversion fpt or ghec %}，而帐单管理员负责管理帐单设置{% endif %}。 成员是其他每个人的默认角色。 您可以通过团队一次管理多个成员的访问权限。 更多信息请参阅： -- "[Roles in an organization](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization)" +- "[组织中的角色](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization)" - "[组织的项目板权限](/articles/project-board-permissions-for-an-organization)" - "[组织的仓库角色](/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization)" - "[关于团队](/articles/about-teams)" @@ -42,12 +42,12 @@ Roles work differently for different types of accounts. For more information abo {% ifversion fpt %} {% data reusables.gated-features.enterprise-accounts %} -For more information about permissions for enterprise accounts, see [the {% data variables.product.prodname_ghe_cloud %} documentation](/enterprise-cloud@latest/get-started/learning-about-github/access-permissions-on-github). +有关企业帐户权限的详细信息，请参阅 [{% data variables.product.prodname_ghe_cloud %} 文档](/enterprise-cloud@latest/get-started/learning-about-github/access-permissions-on-github)。 {% else %} -*Enterprise owners* have ultimate power over the enterprise account and can take every action in the enterprise account.{% ifversion ghec or ghes %} *Billing managers* can manage your enterprise account's billing settings.{% endif %} Members and outside collaborators of organizations owned by your enterprise account are automatically members of the enterprise account, although they have no access to the enterprise account itself or its settings. 更多信息请参阅“[企业中的角色](/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise)”。 +*企业所有者*对企业帐户拥有最终权力，并且可以在企业帐户中执行所有操作。{% ifversion ghec or ghes %} *帐单管理员*可以管理企业帐户的帐单设置。{% endif %} 企业帐户拥有的组织的成员和外部协作者将自动成为企业帐户的成员，尽管他们无权访问企业帐户本身或其设置。 更多信息请参阅“[企业中的角色](/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise)”。 {% ifversion ghec %} -If an enterprise uses {% data variables.product.prodname_emus %}, members are provisioned as new user accounts on {% data variables.product.prodname_dotcom %} and are fully managed by the identity provider. The {% data variables.product.prodname_managed_users %} have read-only access to repositories that are not a part of their enterprise and cannot interact with users that are not also members of the enterprise. Within the organizations owned by the enterprise, the {% data variables.product.prodname_managed_users %} can be granted the same granular access levels available for regular organizations. 更多信息请参阅“[关于 {% data variables.product.prodname_emus %}](/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/about-enterprise-managed-users)”。 +如果企业使用 {% data variables.product.prodname_emus %}，则成员将在 {% data variables.product.prodname_dotcom %} 上预配为新的用户帐户，并由身份提供商完全管理。 {% data variables.product.prodname_managed_users %} 对不属于其企业的存储库具有只读访问权限，并且无法与不是企业成员的用户进行交互。 在企业拥有的组织中，可以向 {% data variables.product.prodname_managed_users %} 授予与常规组织相同的粒度访问级别。 更多信息请参阅“[关于 {% data variables.product.prodname_emus %}](/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/about-enterprise-managed-users)”。 {% endif %} {% endif %} diff --git a/translations/zh-CN/content/get-started/learning-about-github/githubs-products.md b/translations/zh-CN/content/get-started/learning-about-github/githubs-products.md index 9c2cd1dd8307..4961400aa7c5 100644 --- a/translations/zh-CN/content/get-started/learning-about-github/githubs-products.md +++ b/translations/zh-CN/content/get-started/learning-about-github/githubs-products.md @@ -1,6 +1,6 @@ --- -title: GitHub 的产品 -intro: '{% data variables.product.prodname_dotcom %} 的产品和定价计划概述。' +title: GitHub's products +intro: 'An overview of {% data variables.product.prodname_dotcom %}''s products and pricing plans.' redirect_from: - /articles/github-s-products - /articles/githubs-products @@ -18,98 +18,101 @@ topics: - Desktop - Security --- - -## 关于 {% data variables.product.prodname_dotcom %} 的产品 +## About {% data variables.product.prodname_dotcom %}'s products {% data variables.product.prodname_dotcom %} offers free and paid products for storing and collaborating on code. Some products apply only to user accounts, while other plans apply only to organization and enterprise accounts. For more information about accounts, see "[Types of {% data variables.product.prodname_dotcom %} accounts](/get-started/learning-about-github/types-of-github-accounts)." -您可以在 <{% data variables.product.pricing_url %}> 上查看每款产品的价格和完整功能列表。 {% data reusables.products.product-roadmap %} +You can see pricing and a full list of features for each product at <{% data variables.product.pricing_url %}>. {% data reusables.products.product-roadmap %} When you read {% data variables.product.prodname_docs %}, make sure to select the version that reflects your product. For more information, see "[About versions of {% data variables.product.prodname_docs %}](/get-started/learning-about-github/about-versions-of-github-docs)." -## 用户帐户的 {% data variables.product.prodname_free_user %} +## {% data variables.product.prodname_free_user %} for user accounts -通过用户帐户的 {% data variables.product.prodname_free_team %}，可与无限的协作者合作处理功能完全的无限公共仓库，或者是功能有限的无限私有仓库， +With {% data variables.product.prodname_free_team %} for user accounts, you can work with unlimited collaborators on unlimited public repositories with a full feature set, and on unlimited private repositories with a limited feature set. -通过 {% data variables.product.prodname_free_user %}，用户帐户可包含： +With {% data variables.product.prodname_free_user %}, your user account includes: - {% data variables.product.prodname_gcf %} - {% data variables.product.prodname_dependabot_alerts %} -- 双重身份验证 -- 2,000 {% data variables.product.prodname_actions %} 分钟 -- 500MB {% data variables.product.prodname_registry %} 存储空间 +- Two-factor authentication enforcement +- 2,000 {% data variables.product.prodname_actions %} minutes +- 500MB {% data variables.product.prodname_registry %} storage ## {% data variables.product.prodname_pro %} -除了可用于用户帐户的 {% data variables.product.prodname_free_user %} 的功能之外，{% data variables.product.prodname_pro %} 还包含： -- 通过电子邮件提供的 {% data variables.contact.github_support %} -- 3,000 {% data variables.product.prodname_actions %} 分钟 -- 2GB {% data variables.product.prodname_registry %} 存储空间 -- 私有仓库中的高级工具和洞察力： - - 必需拉取请求审查 - - 多个拉取请求审查者 - - 受保护分支 - - 代码所有者 - - 自动链接的引用 +In addition to the features available with {% data variables.product.prodname_free_user %} for user accounts, {% data variables.product.prodname_pro %} includes: +- {% data variables.contact.github_support %} via email +- 3,000 {% data variables.product.prodname_actions %} minutes +- 2GB {% data variables.product.prodname_registry %} storage +- Advanced tools and insights in private repositories: + - Required pull request reviewers + - Multiple pull request reviewers + - Protected branches + - Code owners + - Auto-linked references - {% data variables.product.prodname_pages %} - Wikis - - 仓库洞察图：脉冲、贡献者、流量、提交、代码频率、网络和复刻 + - Repository insights graphs: Pulse, contributors, traffic, commits, code frequency, network, and forks -## 组织的 {% data variables.product.prodname_free_team %} +## {% data variables.product.prodname_free_team %} for organizations -通过组织的 {% data variables.product.prodname_free_team %}，可与无限的协作者合作处理功能完全的无限公共仓库，或者是功能有限的无限私有仓库， +With {% data variables.product.prodname_free_team %} for organizations, you can work with unlimited collaborators on unlimited public repositories with a full feature set, or unlimited private repositories with a limited feature set. -除了可用于用户帐户的 {% data variables.product.prodname_free_user %} 的功能之外，组织的 {% data variables.product.prodname_free_team %} 还包含： +In addition to the features available with {% data variables.product.prodname_free_user %} for user accounts, {% data variables.product.prodname_free_team %} for organizations includes: - {% data variables.product.prodname_gcf %} -- 团队讨论 -- 用于管理组的团队访问权限控制 -- 2,000 {% data variables.product.prodname_actions %} 分钟 -- 500MB {% data variables.product.prodname_registry %} 存储空间 +- Team discussions +- Team access controls for managing groups +- 2,000 {% data variables.product.prodname_actions %} minutes +- 500MB {% data variables.product.prodname_registry %} storage ## {% data variables.product.prodname_team %} -除了可用于组织的 {% data variables.product.prodname_free_team %} 的功能之外，{% data variables.product.prodname_team %} 还包含： -- 通过电子邮件提供的 {% data variables.contact.github_support %} -- 3,000 {% data variables.product.prodname_actions %} 分钟 -- 2GB {% data variables.product.prodname_registry %} 存储空间 -- 私有仓库中的高级工具和洞察力： - - 必需拉取请求审查 - - 多个拉取请求审查者 - - 草稿拉取请求 - - 团队拉取请求审查 - - 受保护分支 - - 代码所有者 - - 预定提醒 +In addition to the features available with {% data variables.product.prodname_free_team %} for organizations, {% data variables.product.prodname_team %} includes: +- {% data variables.contact.github_support %} via email +- 3,000 {% data variables.product.prodname_actions %} minutes +- 2GB {% data variables.product.prodname_registry %} storage +- Advanced tools and insights in private repositories: + - Required pull request reviewers + - Multiple pull request reviewers + - Draft pull requests + - Team pull request reviewers + - Protected branches + - Code owners + - Scheduled reminders - {% data variables.product.prodname_pages %} - Wikis - - 仓库洞察图：脉冲、贡献者、流量、提交、代码频率、网络和复刻 -{% ifversion fpt or ghec %} + - Repository insights graphs: Pulse, contributors, traffic, commits, code frequency, network, and forks +{%- ifversion fpt or ghec %} - The option to enable {% data variables.product.prodname_github_codespaces %} - Organization owners can enable {% data variables.product.prodname_github_codespaces %} for the organization by setting a spending limit and granting user permissions for members of their organization. For more information, see "[Enabling Codespaces for your organization](/codespaces/managing-codespaces-for-your-organization/enabling-codespaces-for-your-organization)." -{% endif %} +{%- endif %} + +{% data variables.product.company_short %} bills for {% data variables.product.prodname_team %} on a per-user basis. For more information, see "[About per-user pricing]({% ifversion not fpt %}/free-pro-team@latest{% endif %}/billing/managing-billing-for-your-github-account/about-per-user-pricing){% ifversion fpt %}."{% else %}" in the Free, Pro, & Team documentation.{% endif %} {% data reusables.github-actions.actions-billing %} ## {% data variables.product.prodname_enterprise %} -{% data variables.product.prodname_enterprise %} 包括两个部署选项：云托管和自托管。 +{% data variables.product.prodname_enterprise %} includes two deployment options: cloud-hosted and self-hosted. -除了 {% data variables.product.prodname_team %} 的可用功能之外，{% data variables.product.prodname_enterprise %} 还包括： +In addition to the features available with {% data variables.product.prodname_team %}, {% data variables.product.prodname_enterprise %} includes: - {% data variables.contact.enterprise_support %} -- 更多安全、合规和部署控件 -- SAML 单点登录进行身份验证 -- 使用 SAML 或 SCIM 进行配置 +- Additional security, compliance, and deployment controls +- Authentication with SAML single sign-on +- Access provisioning with SAML or SCIM - {% data variables.product.prodname_github_connect %} -- 购买 {% data variables.product.prodname_GH_advanced_security %} 的选项。 更多信息请参阅“[关于 {% data variables.product.prodname_GH_advanced_security %}](/github/getting-started-with-github/about-github-advanced-security)”。 +- The option to purchase {% data variables.product.prodname_GH_advanced_security %}. For more information, see "[About {% data variables.product.prodname_GH_advanced_security %}](/github/getting-started-with-github/about-github-advanced-security)." + +{% data variables.product.prodname_ghe_cloud %} also includes: +- {% data variables.contact.enterprise_support %}. For more information, see "{% data variables.product.prodname_ghe_cloud %} support" and "{% data variables.product.prodname_ghe_cloud %} Addendum." +- 50,000 {% data variables.product.prodname_actions %} minutes +- 50GB {% data variables.product.prodname_registry %} storage +- Access control for {% data variables.product.prodname_pages %} sites. For more information, see Changing the visibility of your {% data variables.product.prodname_pages %} site" +- A service level agreement for 99.9% monthly uptime +- The option to configure your enterprise for {% data variables.product.prodname_emus %}, so you can provision and manage members with your identity provider and restrict your member's contributions to just your enterprise. For more information, see "[About {% data variables.product.prodname_emus %}](/enterprise-cloud@latest/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/about-enterprise-managed-users)." +- The option to centrally manage policy and billing for multiple {% data variables.product.prodname_dotcom_the_website %} organizations with an enterprise account. For more information, see "[About enterprise accounts](/enterprise-cloud@latest/admin/overview/about-enterprise-accounts)." -{% data variables.product.prodname_ghe_cloud %} 还包括： -- {% data variables.contact.enterprise_support %}. 更多信息请参阅“{% data variables.product.prodname_ghe_cloud %} 支持”和“{% data variables.product.prodname_ghe_cloud %} 附录”。 -- 50,000 {% data variables.product.prodname_actions %} 分钟 -- 50GB {% data variables.product.prodname_registry %} 存储空间 -- {% data variables.product.prodname_pages %} 站点的访问控制。 更多信息请参阅“更改 {% data variables.product.prodname_pages %} 站点的可见性” -- 99.9% 月持续运行时间的服务等级协议 -- The option to configure your enterprise for {% data variables.product.prodname_emus %}, so you can provision and manage members with your identity provider and restrict your member's contributions to just your enterprise. 更多信息请参阅“[关于 {% data variables.product.prodname_emus %}](/enterprise-cloud@latest/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/about-enterprise-managed-users)”。 -- 通过企业帐户集中管理多个 {% data variables.product.prodname_dotcom_the_website %} 组织的策略和帐单的选项。 更多信息请参阅“[关于企业帐户](/enterprise-cloud@latest/admin/overview/about-enterprise-accounts)”。 +{% data variables.product.company_short %} bills for {% data variables.product.prodname_ghe_cloud %} on a per-user basis. For more information, see "[About per-user pricing]({% ifversion not ghec %}/enterprise-cloud@latest{% endif %}/billing/managing-billing-for-your-github-account/about-per-user-pricing){% ifversion ghec %}."{% else %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% endif %} -您可以设置试用版来评估 {% data variables.product.prodname_ghe_cloud %}。 更多信息请参阅“设置 {% data variables.product.prodname_ghe_cloud %} 的试用”。 +You can set up a trial to evaluate {% data variables.product.prodname_ghe_cloud %}. For more information, see "Setting up a trial of {% data variables.product.prodname_ghe_cloud %}." -有关托管理您自己的 [{% data variables.product.prodname_ghe_server %}](https://enterprise.github.com) 实例的更多信息，请联系 {% data variables.contact.contact_enterprise_sales %}。 {% data reusables.enterprise_installation.request-a-trial %} +For more information about hosting your own instance of [{% data variables.product.prodname_ghe_server %}](https://enterprise.github.com), contact {% data variables.contact.contact_enterprise_sales %}. {% data reusables.enterprise_installation.request-a-trial %} diff --git a/translations/zh-CN/content/get-started/learning-about-github/types-of-github-accounts.md b/translations/zh-CN/content/get-started/learning-about-github/types-of-github-accounts.md index 705086b15f18..5b35c84e6af9 100644 --- a/translations/zh-CN/content/get-started/learning-about-github/types-of-github-accounts.md +++ b/translations/zh-CN/content/get-started/learning-about-github/types-of-github-accounts.md @@ -1,5 +1,5 @@ --- -title: GitHub 帐户的类型 +title: Types of GitHub accounts intro: 'Accounts on {% data variables.product.product_name %} allow you to organize and control access to code.' redirect_from: - /manage-multiple-clients @@ -26,8 +26,8 @@ topics: With {% data variables.product.product_name %}, you can store and collaborate on code. Accounts allow you to organize and control access to that code. There are three types of accounts on {% data variables.product.product_name %}. - Personal accounts -- 组织帐户 -- 企业帐户 +- Organization accounts +- Enterprise accounts Every person who uses {% data variables.product.product_name %} signs into a personal account. An organization account enhances collaboration between multiple personal accounts, and {% ifversion fpt or ghec %}an enterprise account{% else %}the enterprise account for {% data variables.product.product_location %}{% endif %} allows central management of multiple organizations. @@ -37,7 +37,7 @@ Every person who uses {% data variables.product.product_location %} signs into a Your personal account can own resources such as repositories, packages, and projects. Any time you take any action on {% data variables.product.product_location %}, such as creating an issue or reviewing a pull request, the action is attributed to your personal account. -{% ifversion fpt or ghec %}Each personal account uses either {% data variables.product.prodname_free_user %} or {% data variables.product.prodname_pro %}. All personal accounts can own an unlimited number of public and private repositories, with an unlimited number of collaborators on those repositories. If you use {% data variables.product.prodname_free_user %}, private repositories owned by your personal account have a limited feature set. You can upgrade to {% data variables.product.prodname_pro %} to get a full feature set for private repositories. 更多信息请参阅“[{% data variables.product.prodname_dotcom %} 的产品](/articles/githubs-products)”。 {% else %}You can create an unlimited number of repositories owned by your personal account, with an unlimited number of collaborators on those repositories.{% endif %} +{% ifversion fpt or ghec %}Each personal account uses either {% data variables.product.prodname_free_user %} or {% data variables.product.prodname_pro %}. All personal accounts can own an unlimited number of public and private repositories, with an unlimited number of collaborators on those repositories. If you use {% data variables.product.prodname_free_user %}, private repositories owned by your personal account have a limited feature set. You can upgrade to {% data variables.product.prodname_pro %} to get a full feature set for private repositories. For more information, see "[{% data variables.product.prodname_dotcom %}'s products](/articles/githubs-products)." {% else %}You can create an unlimited number of repositories owned by your personal account, with an unlimited number of collaborators on those repositories.{% endif %} {% tip %} @@ -46,12 +46,12 @@ Your personal account can own resources such as repositories, packages, and proj {% endtip %} {% ifversion fpt or ghec %} -Most people will use one personal account for all their work on {% data variables.product.prodname_dotcom_the_website %}, including both open source projects and paid employment. If you're currently using more than one personal account that you created for yourself, we suggest combining the accounts. 更多信息请参阅“[合并多个用户帐户](/articles/merging-multiple-user-accounts)”。 +Most people will use one personal account for all their work on {% data variables.product.prodname_dotcom_the_website %}, including both open source projects and paid employment. If you're currently using more than one personal account that you created for yourself, we suggest combining the accounts. For more information, see "[Merging multiple user accounts](/articles/merging-multiple-user-accounts)." {% endif %} -## 组织帐户 +## Organization accounts -Organizations are shared accounts where an unlimited number of people can collaborate across many projects at once. +Organizations are shared accounts where an unlimited number of people can collaborate across many projects at once. Like personal accounts, organizations can own resources such as repositories, packages, and projects. However, you cannot sign into an organization. Instead, each person signs into their own personal account, and any actions the person takes on organization resources are attributed to their personal account. Each personal account can be a member of multiple organizations. @@ -59,31 +59,31 @@ The personal accounts within an organization can be given different roles in the  -{% ifversion fpt or ghec %} +{% ifversion fpt or ghec %} Even if you're a member of an organization that uses SAML single sign-on, you will still sign into your own personal account on {% data variables.product.prodname_dotcom_the_website %}, and that personal account will be linked to your identity in your organization's identity provider (IdP). For more information, see "[About authentication with SAML single sign-on](/enterprise-cloud@latest/authentication/authenticating-with-saml-single-sign-on/about-authentication-with-saml-single-sign-on){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation{% else %}."{% endif %} However, if you're a member of an enterprise that uses {% data variables.product.prodname_emus %}, instead of using a personal account that you created, a new account will be provisioned for you by the enterprise's IdP. To access any organizations owned by that enterprise, you must authenticate using their IdP instead of a {% data variables.product.prodname_dotcom_the_website %} username and password. For more information, see "[About {% data variables.product.prodname_emus %}](/enterprise-cloud@latest/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/about-enterprise-managed-users){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %} {% endif %} -You can also create nested sub-groups of organization members called teams, to reflect your group's structure and simplify access management. 更多信息请参阅“[关于团队](/organizations/organizing-members-into-teams/about-teams)”。 +You can also create nested sub-groups of organization members called teams, to reflect your group's structure and simplify access management. For more information, see "[About teams](/organizations/organizing-members-into-teams/about-teams)." {% data reusables.organizations.organization-plans %} For more information about all the features of organizations, see "[About organizations](/organizations/collaborating-with-groups-in-organizations/about-organizations)." -## 企业帐户 +## Enterprise accounts {% ifversion fpt %} {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %} include enterprise accounts, which allow administrators to centrally manage policy and billing for multiple organizations and enable innersourcing between the organizations. For more information, see "[About enterprise accounts](/enterprise-cloud@latest/admin/overview/about-enterprise-accounts)" in the {% data variables.product.prodname_ghe_cloud %} documentation. {% elsif ghec %} -Enterprise accounts allow central policy management and billing for multiple organizations. You can use your enterprise account to centrally manage policy and billing. Unlike organizations, enterprise accounts cannot directly own resources like repositories, packages, or projects. These resources are owned by organizations within the enterprise account instead. 更多信息请参阅“[关于企业帐户](/admin/overview/about-enterprise-accounts)”。 +Enterprise accounts allow central policy management and billing for multiple organizations. You can use your enterprise account to centrally manage policy and billing. Unlike organizations, enterprise accounts cannot directly own resources like repositories, packages, or projects. These resources are owned by organizations within the enterprise account instead. For more information, see "[About enterprise accounts](/admin/overview/about-enterprise-accounts)." {% elsif ghes or ghae %} -Your enterprise account is a collection of all the organizations {% ifversion ghae %}owned by{% elsif ghes %}on{% endif %} {% data variables.product.product_location %}. You can use your enterprise account to centrally manage policy and billing. Unlike organizations, enterprise accounts cannot directly own resources like repositories, packages, or projects. These resources are owned by organizations within the enterprise account instead. 更多信息请参阅“[关于企业帐户](/admin/overview/about-enterprise-accounts)”。 +Your enterprise account is a collection of all the organizations {% ifversion ghae %}owned by{% elsif ghes %}on{% endif %} {% data variables.product.product_location %}. You can use your enterprise account to centrally manage policy and billing. Unlike organizations, enterprise accounts cannot directly own resources like repositories, packages, or projects. These resources are owned by organizations within the enterprise account instead. For more information, see "[About enterprise accounts](/admin/overview/about-enterprise-accounts)." {% endif %} -## 延伸阅读 +## Further reading {% ifversion fpt or ghec %} - "[Signing up for a new {% data variables.product.prodname_dotcom %} account](/articles/signing-up-for-a-new-github-account)"{% endif %} -- “[创建新组织帐户](/articles/creating-a-new-organization-account)” -- [Organizing people for successful collaboration](https://vimeo.com/333786093) video in {% data variables.product.company_short %} Resources +- "[Creating a new organization account](/articles/creating-a-new-organization-account)" +- [Organizing people for successful collaboration](https://vimeo.com/333786093) video in {% data variables.product.company_short %} Resources \ No newline at end of file diff --git a/translations/zh-CN/content/get-started/onboarding/getting-started-with-github-ae.md b/translations/zh-CN/content/get-started/onboarding/getting-started-with-github-ae.md index f40f220b7f48..013ac1a1afaf 100644 --- a/translations/zh-CN/content/get-started/onboarding/getting-started-with-github-ae.md +++ b/translations/zh-CN/content/get-started/onboarding/getting-started-with-github-ae.md @@ -16,13 +16,13 @@ You will first need to purchase {% data variables.product.product_name %}. For m {% data reusables.github-ae.initialize-enterprise %} ### 2. Initializing {% data variables.product.product_name %} -After {% data variables.product.company_short %} creates the owner account for {% data variables.product.product_location %} on {% data variables.product.product_name %}, you will receive an email to sign in and complete the initialization. During initialization, you, as the enterprise owner, will name {% data variables.product.product_location %}, configure SAML SSO, create policies for all organizations in {% data variables.product.product_location %}, and configure a support contact for your enterprise members. 更多信息请参阅“[初始化 {% data variables.product.prodname_ghe_managed %}](/admin/configuration/configuring-your-enterprise/initializing-github-ae)。” +After {% data variables.product.company_short %} creates the owner account for {% data variables.product.product_location %} on {% data variables.product.product_name %}, you will receive an email to sign in and complete the initialization. During initialization, you, as the enterprise owner, will name {% data variables.product.product_location %}, configure SAML SSO, create policies for all organizations in {% data variables.product.product_location %}, and configure a support contact for your enterprise members. For more information, see "[Initializing {% data variables.product.prodname_ghe_managed %}](/admin/configuration/configuring-your-enterprise/initializing-github-ae)." -### 3. 限制网络流量 -You can configure an allow list for specific IP addresses to restrict access to assets owned by organizations in your enterprise account. 更多信息请参阅“[限制到企业的网络流量](/admin/configuration/configuring-your-enterprise/restricting-network-traffic-to-your-enterprise)”。 +### 3. Restricting network traffic +You can configure an allow list for specific IP addresses to restrict access to assets owned by organizations in your enterprise account. For more information, see "[Restricting network traffic to your enterprise](/admin/configuration/configuring-your-enterprise/restricting-network-traffic-to-your-enterprise)." ### 4. Managing identity and access for {% data variables.product.product_location %} -You can centrally manage access to {% data variables.product.product_location %} on {% data variables.product.product_name %} from an identity provider (IdP) using SAML single sign-on (SSO) for user authentication and System for Cross-domain Identity Management (SCIM) for user provisioning. Once you configure provisioning, you can assign or unassign users to the application from the IdP, creating or disabling user accounts in the enterprise. 更多信息请参阅“[关于企业的身份和访问权限管理](/admin/authentication/managing-identity-and-access-for-your-enterprise/about-identity-and-access-management-for-your-enterprise)”。 +You can centrally manage access to {% data variables.product.product_location %} on {% data variables.product.product_name %} from an identity provider (IdP) using SAML single sign-on (SSO) for user authentication and System for Cross-domain Identity Management (SCIM) for user provisioning. Once you configure provisioning, you can assign or unassign users to the application from the IdP, creating or disabling user accounts in the enterprise. For more information, see "[About identity and access management for your enterprise](/admin/authentication/managing-identity-and-access-for-your-enterprise/about-identity-and-access-management-for-your-enterprise)." ### 5. Managing billing for {% data variables.product.product_location %} Owners of the subscription for {% data variables.product.product_location %} on {% data variables.product.product_name %} can view billing details for {% data variables.product.product_name %} in the Azure portal. For more information, see "[Managing billing for your enterprise](/admin/overview/managing-billing-for-your-enterprise)." @@ -33,13 +33,13 @@ As an enterprise owner for {% data variables.product.product_name %}, you can ma ### 1. Managing members of {% data variables.product.product_location %} {% data reusables.getting-started.managing-enterprise-members %} -### 2. 创建组织 +### 2. Creating organizations {% data reusables.getting-started.creating-organizations %} ### 3. Adding members to organizations {% data reusables.getting-started.adding-members-to-organizations %} -### 4. 创建团队 +### 4. Creating teams {% data reusables.getting-started.creating-teams %} ### 5. Setting organization and repository permission levels diff --git a/translations/zh-CN/content/get-started/onboarding/getting-started-with-github-enterprise-cloud.md b/translations/zh-CN/content/get-started/onboarding/getting-started-with-github-enterprise-cloud.md index 17f8fad06645..ecf0b5d63e54 100644 --- a/translations/zh-CN/content/get-started/onboarding/getting-started-with-github-enterprise-cloud.md +++ b/translations/zh-CN/content/get-started/onboarding/getting-started-with-github-enterprise-cloud.md @@ -51,9 +51,9 @@ Alternatively, if you have an existing organization account that you would like When you choose to use an organization account with {% data variables.product.prodname_ghe_cloud %}, you'll first have access to a [30-day trial](/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud). If you don't purchase {% data variables.product.prodname_enterprise %} or {% data variables.product.prodname_team %} before your trial ends, your organization will be downgraded to {% data variables.product.prodname_free_user %} and lose access to any advanced tooling and features that are only included with paid products. For more information, see "[Finishing your trial](/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud#finishing-your-trial)." -Your organization's billing settings page allows you to manage settings like your payment method and billing cycle, view information about your subscription, and upgrade your storage and {% data variables.product.prodname_actions %} minutes. For more information on managing your billing settings, see "[Managing your {% data variables.product.prodname_dotcom %} billing settings](/billing/managing-your-github-billing-settings)." +Your organization's billing settings page allows you to manage settings like your payment method and billing cycle, view information about your subscription, and upgrade your storage and {% data variables.product.prodname_actions %} minutes. 有关管理帐单设置的更多信息，请参阅"[管理您的 {% data variables.product.prodname_dotcom %} 计费设置](/billing/managing-your-github-billing-settings)"。 -Only organization members with the *owner* or *billing manager* role can access or change billing settings for your organization. A billing manager is a user who manages the billing settings for your organization and does not use a paid license in your organization's subscription. For more information on adding a billing manager to your organization, see "[Adding a billing manager to your organization](/organizations/managing-peoples-access-to-your-organization-with-roles/adding-a-billing-manager-to-your-organization)." +只有拥有*所有者*或*帐单管理员*角色的组织成员才能访问或更改组织的帐单设置。 A billing manager is a user who manages the billing settings for your organization and does not use a paid license in your organization's subscription. 有关向组织添加帐单管理员的详细信息，请参阅“[将帐单管理员添加到组织](/organizations/managing-peoples-access-to-your-organization-with-roles/adding-a-billing-manager-to-your-organization)”。 ### Setting up an enterprise account with {% data variables.product.prodname_ghe_cloud %} {% note %} @@ -77,15 +77,15 @@ You can view your current subscription, license usage, invoices, payment history ### Managing members and teams in your organization You can set permissions and member roles, create and manage teams, and give people access to repositories in your organization. -#### 1. Managing members of your organization +#### 1. 管理组织成员 {% data reusables.getting-started.managing-org-members %} -#### 2. Organization permissions and roles +#### 2. 组织权限和角色 {% data reusables.getting-started.org-permissions-and-roles %} -#### 3. About and creating teams +#### 3. 关于和创建团队 {% data reusables.getting-started.about-and-creating-teams %} -#### 4. Managing team settings +#### 4. 管理团队设置 {% data reusables.getting-started.managing-team-settings %} -#### 5. Giving people and teams access to repositories, project boards and apps +#### 5. 为人员和团队提供对存储库、项目板和应用程序的访问权限 {% data reusables.getting-started.giving-access-to-repositories-projects-apps %} ### Managing members of an enterprise account @@ -112,12 +112,12 @@ To audit access to enterprise-owned resources or user license usage, you can vie ### Managing security for a single organization You can help keep your organization secure by requiring two-factor authentication, configuring security features, reviewing your organization's audit log and integrations, and enabling SAML single sign-on and team synchronization. -#### 1. Requiring two-factor authentication +#### 1. 需要双重身份验证 {% data reusables.getting-started.requiring-2fa %} -#### 2. Configuring security features for your organization +#### 2. 为组织配置安全功能 {% data reusables.getting-started.configuring-security-features %} -#### 3. Reviewing your organization's audit log and integrations +#### 3. 查看组织的审核日志和集成 {% data reusables.getting-started.reviewing-org-audit-log-and-integrations %} #### 4. Enabling and enforcing SAML single sign-on for your organization @@ -166,11 +166,11 @@ You can enable and manage team synchronization between an identity provider (IdP ### Managing settings for a single organization To manage and moderate your organization, you can set organization policies, manage permissions for repository changes, and use organization-level community health files. -#### 1. Managing organization policies +#### 1. 管理组织策略 {% data reusables.getting-started.managing-org-policies %} -#### 2. Managing repository changes +#### 2. 管理存储库更改 {% data reusables.getting-started.managing-repo-changes %} -#### 3. Using organization-level community health files and moderation tools +#### 3. 使用组织级别的社区健康文件和调解工具 {% data reusables.getting-started.using-org-community-files-and-moderation-tools %} ### Managing settings for an enterprise account @@ -186,15 +186,15 @@ You can also restrict email notifications for your enterprise account so that en ## Part 6: Customizing and automating your organization or enterprise's work on {% data variables.product.prodname_dotcom %} Members of your organization or enterprise can use tools from the {% data variables.product.prodname_marketplace %}, the {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API, and existing {% data variables.product.product_name %} features to customize and automate your work. -### 1. Using {% data variables.product.prodname_marketplace %} +### 1. 使用 {% data variables.product.prodname_marketplace %} {% data reusables.getting-started.marketplace %} -### 2. Using the {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API +### 2. 使用 {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API {% data reusables.getting-started.api %} -### 3. Building {% data variables.product.prodname_actions %} +### 3. 构建 {% data variables.product.prodname_actions %} {% data reusables.getting-started.actions %} -### 4. Publishing and managing {% data variables.product.prodname_registry %} +### 4. 发布和管理 {% data variables.product.prodname_registry %} {% data reusables.getting-started.packages %} -### 5. Using {% data variables.product.prodname_pages %} +### 5. 使用 {% data variables.product.prodname_pages %} {% data variables.product.prodname_pages %} is a static site hosting service that takes HTML, CSS, and JavaScript files straight from a repository and publishes a website. You can manage the publication of {% data variables.product.prodname_pages %} sites at the organization level. For more information, see "[Managing the publication of {% data variables.product.prodname_pages %} sites for your organization](/organizations/managing-organization-settings/managing-the-publication-of-github-pages-sites-for-your-organization)" and "[About {% data variables.product.prodname_pages %}](/pages/getting-started-with-github-pages/about-github-pages)." ## Part 7: Participating in {% data variables.product.prodname_dotcom %}'s community diff --git a/translations/zh-CN/content/get-started/onboarding/getting-started-with-github-enterprise-server.md b/translations/zh-CN/content/get-started/onboarding/getting-started-with-github-enterprise-server.md index e67a90c14e1e..f0ed5e62c79d 100644 --- a/translations/zh-CN/content/get-started/onboarding/getting-started-with-github-enterprise-server.md +++ b/translations/zh-CN/content/get-started/onboarding/getting-started-with-github-enterprise-server.md @@ -41,30 +41,30 @@ You can set up a staging instance to test modifications, plan for disaster recov To protect your production data, you can configure automated backups of {% data variables.product.product_location %} with {% data variables.product.prodname_enterprise_backup_utilities %}. 更多信息请参阅“[在设备上配置备份](/admin/configuration/configuring-your-enterprise/configuring-backups-on-your-appliance)”。 ### 8. 管理企业的帐单 -Billing for all the organizations and {% data variables.product.product_name %} instances connected to your enterprise account is aggregated into a single bill charge for all of your paid {% data variables.product.prodname_dotcom %}.com services. Enterprise owners and billing managers can access and manage billing settings for enterprise accounts. For more information, see "[Managing billing for your enterprise](/admin/overview/managing-billing-for-your-enterprise)." +Billing for all the organizations and {% data variables.product.product_name %} instances connected to your enterprise account is aggregated into a single bill charge for all of your paid {% data variables.product.prodname_dotcom %}.com services. Enterprise owners and billing managers can access and manage billing settings for enterprise accounts. 更多信息请参阅“[管理帐户的计费](/admin/overview/managing-billing-for-your-enterprise)”。 ## Part 2: Organizing and managing your team As an enterprise owner or administrator, you can manage settings on user, repository, team and organization levels. You can manage members of your enterprise, create and manage organizations, set policies for repository management, and create and manage teams. -### 1. Managing members of {% data variables.product.product_location %} +### 1. 管理 {% data variables.product.product_location %} 的成员 {% data reusables.getting-started.managing-enterprise-members %} ### 2. 创建组织 {% data reusables.getting-started.creating-organizations %} -### 3. Adding members to organizations +### 3. 向组织添加成员 {% data reusables.getting-started.adding-members-to-organizations %} ### 4. 创建团队 {% data reusables.getting-started.creating-teams %} -### 5. Setting organization and repository permission levels +### 5. 设置组织和存储库权限级别 {% data reusables.getting-started.setting-org-and-repo-permissions %} -### 6. Enforcing repository management policies +### 6. 实施存储库管理策略 {% data reusables.getting-started.enforcing-repo-management-policies %} -## Part 3: Building securely +## 第 3 部分：安全构建 To increase the security of {% data variables.product.product_location %}, you can configure authentication for enterprise members, use tools and audit logging to stay in compliance, configure security and analysis features for your organizations, and optionally enable {% data variables.product.prodname_GH_advanced_security %}. ### 1. Authenticating enterprise members You can use {% data variables.product.product_name %}'s built-in authentication method, or you can choose between an established authentication provider, such as CAS, LDAP, or SAML, to integrate your existing accounts and centrally manage user access to {% data variables.product.product_location %}. For more information, see "[Authenticating users for {% data variables.product.product_location %}](/admin/authentication/authenticating-users-for-your-github-enterprise-server-instance)." @@ -75,7 +75,7 @@ You can also require two-factor authentication for each of your organizations. F You can implement required status checks and commit verifications to enforce your organization's compliance standards and automate compliance workflows. You can also use the audit log for your organization to review actions performed by your team. For more information, see "[Enforcing policy with pre-receive hooks](/admin/policies/enforcing-policy-with-pre-receive-hooks)" and "[Audit logging](/admin/user-management/monitoring-activity-in-your-enterprise/audit-logging)." {% ifversion ghes %} -### 3. Configuring security features for your organizations +### 3. 为组织配置安全功能 {% data reusables.getting-started.configuring-security-features %} {% endif %} @@ -89,22 +89,22 @@ You can customize and automate work in organizations in your enterprise with {% ### 1. Building {% data variables.product.prodname_github_apps %} and {% data variables.product.prodname_oauth_apps %} You can build integrations with the {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API, such as {% data variables.product.prodname_github_apps %} or {% data variables.product.prodname_oauth_apps %}, for use in organizations in your enterprise to complement and extend your workflows. 更多信息请参阅“[关于应用程序](/developers/apps/getting-started-with-apps/about-apps)”。 -### 2. Using the {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API +### 2. 使用 {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API {% data reusables.getting-started.api %} {% ifversion ghes %} -### 3. Building {% data variables.product.prodname_actions %} +### 3. 构建 {% data variables.product.prodname_actions %} {% data reusables.getting-started.actions %} For more information on enabling and configuring {% data variables.product.prodname_actions %} on {% data variables.product.product_name %}, see "[Getting started with {% data variables.product.prodname_actions %} for {% data variables.product.prodname_ghe_server %}](/admin/github-actions/enabling-github-actions-for-github-enterprise-server/getting-started-with-github-actions-for-github-enterprise-server)." -### 4. Publishing and managing {% data variables.product.prodname_registry %} +### 4. 发布和管理 {% data variables.product.prodname_registry %} {% data reusables.getting-started.packages %} For more information on enabling and configuring {% data variables.product.prodname_registry %} for {% data variables.product.product_location %}, see "[Getting started with {% data variables.product.prodname_registry %} for your enterprise](/admin/packages/getting-started-with-github-packages-for-your-enterprise)." {% endif %} -### 5. Using {% data variables.product.prodname_pages %} +### 5. 使用 {% data variables.product.prodname_pages %} {% data reusables.getting-started.github-pages-enterprise %} ## Part 5: Connecting with other {% data variables.product.prodname_dotcom %} resources diff --git a/translations/zh-CN/content/get-started/onboarding/getting-started-with-github-team.md b/translations/zh-CN/content/get-started/onboarding/getting-started-with-github-team.md index 9cb450578c8d..27e6ee5e6a16 100644 --- a/translations/zh-CN/content/get-started/onboarding/getting-started-with-github-team.md +++ b/translations/zh-CN/content/get-started/onboarding/getting-started-with-github-team.md @@ -10,16 +10,16 @@ This guide will walk you through setting up, configuring and managing your {% da ## Part 1: Configuring your account on {% data variables.product.product_location %} As the first steps in starting with {% data variables.product.prodname_team %}, you will need to create a user account or log into your existing account on {% data variables.product.prodname_dotcom %}, create an organization, and set up billing. -### 1. 关于组织 -组织是共享帐户，其中业务和开源项目可一次协助处理多个项目。 所有者和管理员可通过复杂的安全和管理功能管理成员对组织数据和项目的访问。 For more information on the features of organizations, see "[About organizations](/organizations/collaborating-with-groups-in-organizations/about-organizations#terms-of-service-and-data-protection-for-organizations)." +### 1. About organizations +Organizations are shared accounts where businesses and open-source projects can collaborate across many projects at once. Owners and administrators can manage member access to the organization's data and projects with sophisticated security and administrative features. For more information on the features of organizations, see "[About organizations](/organizations/collaborating-with-groups-in-organizations/about-organizations#terms-of-service-and-data-protection-for-organizations)." ### 2. Creating an organization and signing up for {% data variables.product.prodname_team %} -Before creating an organization, you will need to create a user account or log in to your existing account on {% data variables.product.product_location %}. 更多信息请参阅“[注册新 {% data variables.product.prodname_dotcom %} 帐户](/get-started/signing-up-for-github/signing-up-for-a-new-github-account)”。 +Before creating an organization, you will need to create a user account or log in to your existing account on {% data variables.product.product_location %}. For more information, see "[Signing up for a new {% data variables.product.prodname_dotcom %} account](/get-started/signing-up-for-github/signing-up-for-a-new-github-account)." -Once your user account is set up, you can create an organization and pick a plan. This is where you can choose a {% data variables.product.prodname_team %} subscription for your organization. 更多信息请参阅“[从头开始创建新组织](/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch)”。 +Once your user account is set up, you can create an organization and pick a plan. This is where you can choose a {% data variables.product.prodname_team %} subscription for your organization. For more information, see "[Creating a new organization from scratch](/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch)." ### 3. Managing billing for an organization -You must manage billing settings, payment method, and paid features and products for each of your personal accounts and organizations separately. You can switch between settings for your different accounts using the context switcher in your settings. 更多信息请参阅“[在不同帐户的设置之间切换](/billing/managing-your-github-billing-settings/about-billing-on-github#switching-between-settings-for-your-different-accounts)”。 +You must manage billing settings, payment method, and paid features and products for each of your personal accounts and organizations separately. You can switch between settings for your different accounts using the context switcher in your settings. For more information, see "[Switching between settings for your different accounts](/billing/managing-your-github-billing-settings/about-billing-on-github#switching-between-settings-for-your-different-accounts)." Your organization's billing settings page allows you to manage settings like your payment method, billing cycle and billing email, or view information such as your subscription, billing date and payment history. You can also view and upgrade your storage and GitHub Actions minutes. For more information on managing your billing settings, see "[Managing your {% data variables.product.prodname_dotcom %} billing settings](/billing/managing-your-github-billing-settings)." @@ -72,7 +72,7 @@ You can help to make your organization more secure by recommending or requiring ### 3. Building {% data variables.product.prodname_actions %} {% data reusables.getting-started.actions %} -### 4. Publishing and managing {% data variables.product.prodname_registry %} +### 4. Publishing and managing {% data variables.product.prodname_registry %} {% data reusables.getting-started.packages %} ## Part 6: Participating in {% data variables.product.prodname_dotcom %}'s community @@ -92,8 +92,8 @@ You can read documentation that reflects the features available with {% data var ### 5. Supporting the open source community {% data reusables.getting-started.sponsors %} -### 6. 联系 {% data variables.contact.github_support %} +### 6. Contacting {% data variables.contact.github_support %} {% data reusables.getting-started.contact-support %} -## 延伸阅读 +## Further reading - "[Getting started with your GitHub account](/get-started/onboarding/getting-started-with-your-github-account)" diff --git a/translations/zh-CN/content/get-started/onboarding/getting-started-with-your-github-account.md b/translations/zh-CN/content/get-started/onboarding/getting-started-with-your-github-account.md index 0839bfb13a5a..5b464f44e3e0 100644 --- a/translations/zh-CN/content/get-started/onboarding/getting-started-with-your-github-account.md +++ b/translations/zh-CN/content/get-started/onboarding/getting-started-with-your-github-account.md @@ -145,7 +145,7 @@ You can enable {% data variables.product.prodname_discussions %} for your reposi {% data reusables.getting-started.customizing-and-automating %} {% ifversion fpt or ghec %} -### 1. Using {% data variables.product.prodname_marketplace %} +### 1. 使用 {% data variables.product.prodname_marketplace %} {% data reusables.getting-started.marketplace %} {% endif %} ### {% ifversion fpt or ghec %}2.{% else %}1.{% endif %} Using the {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API @@ -172,11 +172,11 @@ A large part of building securely is maintaining your project's dependencies to For more information, see "[Securing your software supply chain](/code-security/supply-chain-security)." {% endif %} -## Part 6: Participating in {% data variables.product.prodname_dotcom %}'s community +## 第 6 部分：参与 {% data variables.product.prodname_dotcom %} 的社区 {% data reusables.getting-started.participating-in-community %} -### 1. Contributing to open source projects +### 1. 为开源项目做贡献 {% data reusables.getting-started.open-source-projects %} ### 2. Interacting with {% data variables.product.prodname_gcf %} diff --git a/translations/zh-CN/content/get-started/privacy-on-github/about-githubs-use-of-your-data.md b/translations/zh-CN/content/get-started/privacy-on-github/about-githubs-use-of-your-data.md index dd7b505275bd..e2b73c6a07c9 100644 --- a/translations/zh-CN/content/get-started/privacy-on-github/about-githubs-use-of-your-data.md +++ b/translations/zh-CN/content/get-started/privacy-on-github/about-githubs-use-of-your-data.md @@ -20,7 +20,7 @@ shortTitle: GitHub 对您的数据的使用 {% data reusables.repositories.about-github-archive-program %} 更多信息请参阅“[关于在 {% data variables.product.prodname_dotcom %} 上存档内容](/github/creating-cloning-and-archiving-repositories/about-archiving-content-and-data-on-github#about-the-github-archive-program)”。 -{% data reusables.user_settings.export-data %} 更多信息请参阅“[请求个人帐户数据的存档](/articles/requesting-an-archive-of-your-personal-account-s-data)”。 +{% data reusables.user-settings.export-data %} For more information, see "[Requesting an archive of your personal account's data](/articles/requesting-an-archive-of-your-personal-account-s-data)." 如果您选择使用私人仓库的数据，我们将继续按照[服务条款](/free-pro-team@latest/github/site-policy/github-terms-of-service)，将您的私人数据、源代码或商业秘密视为机密和私密。 我们了解的信息只来自汇总的数据。 更多信息请参阅“[管理私有仓库的数据使用设置](/get-started/privacy-on-github/managing-data-use-settings-for-your-private-repository)”。 diff --git a/translations/zh-CN/content/get-started/privacy-on-github/requesting-an-archive-of-your-personal-accounts-data.md b/translations/zh-CN/content/get-started/privacy-on-github/requesting-an-archive-of-your-personal-accounts-data.md index 090c8d012de3..6bae405d789f 100644 --- a/translations/zh-CN/content/get-started/privacy-on-github/requesting-an-archive-of-your-personal-accounts-data.md +++ b/translations/zh-CN/content/get-started/privacy-on-github/requesting-an-archive-of-your-personal-accounts-data.md @@ -4,7 +4,7 @@ redirect_from: - /articles/requesting-an-archive-of-your-personal-account-s-data - /articles/requesting-an-archive-of-your-personal-accounts-data - /github/understanding-how-github-uses-and-protects-your-data/requesting-an-archive-of-your-personal-accounts-data -intro: '{% data reusables.user_settings.export-data %}' +intro: '{% data reusables.user-settings.export-data %}' versions: fpt: '*' ghec: '*' @@ -28,8 +28,8 @@ shortTitle: 请求帐户存档 ## 下载个人帐户数据的存档 -{% data reusables.user_settings.access_settings %} -{% data reusables.user_settings.account_settings %} +{% data reusables.user-settings.access_settings %} +{% data reusables.user-settings.account_settings %} 3. 在“Export account data（导出帐户数据）”下，单击 **Start export（开始导出）**或 **New export（新导出）**。   4. 导出准备好供下载后，{% data variables.product.product_name %} 将发送下载链接到您的主电子邮件地址。 5. 单击电子邮件中的下载链接并在提示时重新输入密码。 @@ -37,6 +37,6 @@ shortTitle: 请求帐户存档 ## 删除个人帐户数据存档的访问权限 -{% data reusables.user_settings.access_settings %} -{% data reusables.user_settings.account_settings %} +{% data reusables.user-settings.access_settings %} +{% data reusables.user-settings.account_settings %} 3. 要在其过期之前禁用发送到您电子邮件的下载链接，请在“Export account data（导出帐户数据）”下，找到您想要禁用的数据导出下载，然后单击 **Delete（删除）**。  diff --git a/translations/zh-CN/content/get-started/quickstart/create-a-repo.md b/translations/zh-CN/content/get-started/quickstart/create-a-repo.md index 16e41fc101f4..b1850ed2b065 100644 --- a/translations/zh-CN/content/get-started/quickstart/create-a-repo.md +++ b/translations/zh-CN/content/get-started/quickstart/create-a-repo.md @@ -57,10 +57,10 @@ topics: {% data reusables.cli.cli-learn-more %} -1. In the command line, navigate to the directory where you would like to create a local clone of your new project. -2. To create a repository for your project, use the `gh repo create` subcommand. When prompted, select **Create a new repository on GitHub from scratch** and enter the name of your new project. If you want your project to belong to an organization instead of to your user account, specify the organization name and project name with `organization-name/project-name`. -3. Follow the interactive prompts. To clone the repository locally, confirm yes when asked if you would like to clone the remote project directory. -4. Alternatively, to skip the prompts supply the repository name and a visibility flag (`--public`, `--private`, or `--internal`). For example, `gh repo create project-name --public`. To clone the repository locally, pass the `--clone` flag. For more information about possible arguments, see the [GitHub CLI manual](https://cli.github.com/manual/gh_repo_create). +1. 在命令行中，导航到要在其中创建新项目的本地克隆的目录。 +2. 要为项目创建存储库，请使用 `gh repo create` 子命令。 出现提示时，选择**从头开始在 GitHub 上创建新存储库** ，然后输入新项目的名称。 如果希望项目属于某个组织而不是您的用户帐户，请使用 `organization-name/project-name` 指定组织名称和项目名称。 +3. Follow the interactive prompts. 要在本地克隆存储库，请在询问您是否要克隆远程项目目录时确认是。 +4. 或者，要跳过提示，请提供存储库名称和可见性标志（`--public`、`--private` 或 `--internal`）。 例如 `gh repo create project-name --public`。 要在本地克隆存储库，请传递 `--clone` 标志。 有关可能的参数的详细信息，请参阅 [GitHub CLI 手册](https://cli.github.com/manual/gh_repo_create)。 {% endcli %} @@ -87,18 +87,18 @@ A *[提交](/articles/github-glossary#commit)*就像是项目中所有文件在 {% cli %} -Now that you have created a project, you can start committing changes. +创建项目后，可以开始提交更改。 -*自述文件*是详细介绍项目的好工具，您也可以添加一些文档，例如介绍如何安装或使用项目的文档。 *自述文件*的内容自动显示在仓库的首页上。 Follow these steps to add a *README* file. +*自述文件*是详细介绍项目的好工具，您也可以添加一些文档，例如介绍如何安装或使用项目的文档。 *自述文件*的内容自动显示在仓库的首页上。 请按照以下步骤添加 *README* 文件。 -1. In the command line, navigate to the root directory of your new project. (This directory was created when you ran the `gh repo create` command.) -1. Create a *README* file with some information about the project. +1. 在命令行中，导航到新项目的根目录。 （此目录是在运行 `gh repo create` 命令时创建的。） +1. 创建 *README* 文件，其中包含有关项目的一些信息。 ```shell echo "info about this project" >> README.md ``` -1. Enter `git status`. You will see that you have an untracked `README.md` file. +1. 输入 `git status`。 您将看到您有一个未跟踪的 `README.md` 文件。 ```shell $ git status @@ -110,13 +110,13 @@ Now that you have created a project, you can start committing changes. nothing added to commit but untracked files present (use "git add" to track) ``` -1. Stage and commit the file. +1. 暂存并提交文件。 ```shell git add README.md && git commit -m "Add README" ``` -1. Push the changes to your branch. +1. 将更改推送到您的分支。 ```shell git push --set-upstream origin HEAD diff --git a/translations/zh-CN/content/get-started/quickstart/fork-a-repo.md b/translations/zh-CN/content/get-started/quickstart/fork-a-repo.md index 6c25821232bd..6ef8d49d2a90 100644 --- a/translations/zh-CN/content/get-started/quickstart/fork-a-repo.md +++ b/translations/zh-CN/content/get-started/quickstart/fork-a-repo.md @@ -56,7 +56,7 @@ topics: 您可能为了对上游或原始仓库提议更改而复刻项目。 在这种情况下，最好定期将您的复刻与上游仓库同步。 为此，您需要在命令行上使用 Git。 您可以使用刚才复刻的 [octocat/Spoon-Knife](https://github.com/octocat/Spoon-Knife) 仓库练习设置上游仓库。 -1. On {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom_the_website %}{% else %}{% data variables.product.product_location %}{% endif %}, navigate to the [octocat/Spoon-Knife](https://github.com/octocat/Spoon-Knife) repository. +1. 在 {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom_the_website %}{% else %}{% data variables.product.product_location %}{% endif %} 上，导航到 [octocat/Spoon-Knife](https://github.com/octocat/Spoon-Knife) 存储库。 2. 在页面的右上角，单击 **Fork（复刻）**。  {% endwebui %} @@ -84,11 +84,11 @@ gh repo fork repository --org "octo-org" ## 克隆复刻的仓库 -Right now, you have a fork of the Spoon-Knife repository, but you don't have the files in that repository locally on your computer. +现在，您有了 Spoon-Knife 仓库的复刻，但您的计算机本地还没有该仓库中的文件。 {% webui %} -1. On {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom_the_website %}{% else %}{% data variables.product.product_location %}{% endif %}, navigate to **your fork** of the Spoon-Knife repository. +1. 在 {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom_the_website %}{% else %}{% data variables.product.product_location %}{% endif %} 上，导航到您在 Spoon-Knife 存储库的**复刻**。 {% data reusables.repositories.copy-clone-url %} {% data reusables.command_line.open_the_multi_os_terminal %} {% data reusables.command_line.change-current-directory-clone %} @@ -133,11 +133,11 @@ gh repo fork repository --clone=true ## 配置 Git 以将您的复刻与原始仓库同步 -When you fork a project in order to propose changes to the original repository, you can configure Git to pull changes from the original, or upstream, repository into the local clone of your fork. +为了对原始仓库提议更改而复刻项目时，您可以配置 Git 以将更改从原始或上游仓库拉取到复刻的本地克隆。 {% webui %} -1. On {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom_the_website %}{% else %}{% data variables.product.product_location %}{% endif %}, navigate to the [octocat/Spoon-Knife](https://github.com/octocat/Spoon-Knife) repository. +1. 在 {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom_the_website %}{% else %}{% data variables.product.product_location %}{% endif %} 上，导航到 [octocat/Spoon-Knife](https://github.com/octocat/Spoon-Knife) 存储库。 {% data reusables.repositories.copy-clone-url %} {% data reusables.command_line.open_the_multi_os_terminal %} 4. 将目录更改为您克隆的复刻的位置。 @@ -166,7 +166,7 @@ When you fork a project in order to propose changes to the original repository, > upstream https://{% data variables.command_line.codeblock %}/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git (push) ``` -现在，您可以使用一些 Git 命令使您的复刻与上游仓库保持同步。 For more information, see "[Syncing a fork](/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork)." +现在，您可以使用一些 Git 命令使您的复刻与上游仓库保持同步。 更多信息请参阅“[同步复刻](/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork)”。 {% endwebui %} @@ -198,7 +198,7 @@ gh repo fork repository --remote-name "main-remote-repo" ## 另找一个仓库进行复刻 复刻仓库，开始参与项目。 {% data reusables.repositories.you-can-fork %} -{% ifversion fpt or ghec %}You can browse [Explore](https://github.com/explore) to find projects and start contributing to open source repositories. 更多信息请参阅“[寻找在 {% data variables.product.prodname_dotcom %} 上参与开源项目的方法](/github/getting-started-with-github/finding-ways-to-contribute-to-open-source-on-github)”。 +{% ifversion fpt or ghec %}您可以浏览 [Explore](https://github.com/explore) 以查找项目并开始参与开源仓库。 更多信息请参阅“[寻找在 {% data variables.product.prodname_dotcom %} 上参与开源项目的方法](/github/getting-started-with-github/finding-ways-to-contribute-to-open-source-on-github)”。 {% endif %} diff --git a/translations/zh-CN/content/get-started/quickstart/set-up-git.md b/translations/zh-CN/content/get-started/quickstart/set-up-git.md index 91eb445b5664..f8272f9fc359 100644 --- a/translations/zh-CN/content/get-started/quickstart/set-up-git.md +++ b/translations/zh-CN/content/get-started/quickstart/set-up-git.md @@ -1,5 +1,5 @@ --- -title: 设置 Git +title: Set up Git redirect_from: - /git-installation-redirect - /linux-git-installation @@ -12,7 +12,7 @@ redirect_from: - /articles/set-up-git - /github/getting-started-with-github/set-up-git - /github/getting-started-with-github/quickstart/set-up-git -intro: '{% data variables.product.prodname_dotcom %} 的核心是名为 Git 的开源版本控制系统 (VCS) 。 Git 负责在您计算机上本地发生的、与 {% data variables.product.prodname_dotcom %} 有关的所有内容。' +intro: 'At the heart of {% data variables.product.prodname_dotcom %} is an open source version control system (VCS) called Git. Git is responsible for everything {% data variables.product.prodname_dotcom %}-related that happens locally on your computer.' versions: fpt: '*' ghes: '*' @@ -24,39 +24,38 @@ topics: - Notifications - Accounts --- +## Using Git -## 使用 Git +To use Git on the command line, you'll need to download, install, and configure Git on your computer. You can also install {% data variables.product.prodname_cli %} to use {% data variables.product.prodname_dotcom %} from the command line. For more information, see "[About {% data variables.product.prodname_cli %}](/github-cli/github-cli/about-github-cli)." -要在命令行中使用 Git，您将需要在计算机上下载、安装和配置 Git。 You can also install {% data variables.product.prodname_cli %} to use {% data variables.product.prodname_dotcom %} from the command line. 更多信息请参阅“[关于 {% data variables.product.prodname_cli %}](/github-cli/github-cli/about-github-cli)”。 +If you want to work with Git locally, but don't want to use the command line, you can instead download and install the [{% data variables.product.prodname_desktop %}]({% data variables.product.desktop_link %}) client. For more information, see "[Installing and configuring {% data variables.product.prodname_desktop %}](/desktop/installing-and-configuring-github-desktop/)." -如果要在本地使用 Git，但不想使用命令行，您可以下载并安装 [{% data variables.product.prodname_desktop %}]({% data variables.product.desktop_link %}) 客户端。 更多信息请参阅“[安装和配置 {% data variables.product.prodname_desktop %}](/desktop/installing-and-configuring-github-desktop/)”。 +If you don't need to work with files locally, {% data variables.product.product_name %} lets you complete many Git-related actions directly in the browser, including: -如果无需在本地使用文件，{% data variables.product.product_name %} 可让您在浏览器中直接完成许多 Git 相关的操作，包括： +- [Creating a repository](/articles/create-a-repo) +- [Forking a repository](/articles/fork-a-repo) +- [Managing files](/repositories/working-with-files/managing-files) +- [Being social](/articles/be-social) -- [创建仓库](/articles/create-a-repo) -- [复刻仓库](/articles/fork-a-repo) -- [管理文件](/repositories/working-with-files/managing-files) -- [社交化](/articles/be-social) +## Setting up Git -## 设置 Git - -1. [下载并安装最新版本的 Git](https://git-scm.com/downloads)。 +1. [Download and install the latest version of Git](https://git-scm.com/downloads). {% note %} **Note**: If you are using a Chrome OS device, additional set up is required: 1. Install a terminal emulator such as Termux from the Google Play Store on your Chrome OS device. -2. From the terminal emulator that you installed, install Git. For example, in Termux, enter `apt install git` and then type `y` when prompted. +2. From the terminal emulator that you installed, install Git. For example, in Termux, enter `apt install git` and then type `y` when prompted. {% endnote %} -2. [在 Git 中设置您的用户名](/github/getting-started-with-github/setting-your-username-in-git)。 -3. [在 Git 中设置提交电子邮件地址](/articles/setting-your-commit-email-address)。 +2. [Set your username in Git](/github/getting-started-with-github/setting-your-username-in-git). +3. [Set your commit email address in Git](/articles/setting-your-commit-email-address). -## 后续步骤：使用来自 Git 的 {% data variables.product.prodname_dotcom %} 进行身份验证 +## Next steps: Authenticating with {% data variables.product.prodname_dotcom %} from Git -从 Git 连接到 {% data variables.product.prodname_dotcom %} 仓库时，您将需要使用 HTTPS 或 SSH 通过 {% data variables.product.product_name %} 进行身份验证。 +When you connect to a {% data variables.product.prodname_dotcom %} repository from Git, you'll need to authenticate with {% data variables.product.product_name %} using either HTTPS or SSH. {% note %} @@ -64,20 +63,20 @@ topics: {% endnote %} -### 通过 HTTPS 连接（推荐） +### Connecting over HTTPS (recommended) -如果[使用 HTTPS 克隆](/github/getting-started-with-github/about-remote-repositories/#cloning-with-https-urls)，您可以使用凭据小助手[在 Git 中缓存 {% data variables.product.prodname_dotcom %} 凭据](/github/getting-started-with-github/caching-your-github-credentials-in-git)。 +If you [clone with HTTPS](/github/getting-started-with-github/about-remote-repositories/#cloning-with-https-urls), you can [cache your {% data variables.product.prodname_dotcom %} credentials in Git](/github/getting-started-with-github/caching-your-github-credentials-in-git) using a credential helper. -### 通过 SSH 连接 +### Connecting over SSH -如果[使用 SSH 克隆](/github/getting-started-with-github/about-remote-repositories/#cloning-with-ssh-urls)，您必须在用于从 {% data variables.product.product_name %} 推送或拉取的每台计算机上[生成 SSH 密钥](/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent)。 +If you [clone with SSH](/github/getting-started-with-github/about-remote-repositories/#cloning-with-ssh-urls), you must [generate SSH keys](/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent) on each computer you use to push or pull from {% data variables.product.product_name %}. -## 祝贺 +## Celebrate -恭喜。您现在已将 Git 和 {% data variables.product.prodname_dotcom %} 全部设置完毕！ 您现在可以选择创建仓库以放置项目。 这是备份代码的好方法，易于在世界各地分享代码。 更多信息请参阅“[创建仓库](/articles/create-a-repo)”。 +Congratulations, you now have Git and {% data variables.product.prodname_dotcom %} all set up! You may now choose to create a repository where you can put your projects. This is a great way to back up your code and makes it easy to share the code around the world. For more information see "[Create a repository](/articles/create-a-repo)". -您可以通过复刻创建仓库的副本，并提出您希望看到的更改，而不会影响上游仓库。 更多信息请参阅“[复刻仓库](/articles/fork-a-repo)”。 +You can create a copy of a repository by forking it and propose the changes that you want to see without affecting the upstream repository. For more information see "[Fork a repository](/articles/fork-a-repo)." -Each repository on {% data variables.product.prodname_dotcom %} is owned by a person or an organization. 您可以在 {% data variables.product.product_name %} 上连接和关注人员、仓库和组织以与之进行交互。 更多信息请参阅“[社交](/articles/be-social)”。 +Each repository on {% data variables.product.prodname_dotcom %} is owned by a person or an organization. You can interact with the people, repositories, and organizations by connecting and following them on {% data variables.product.product_name %}. For more information see "[Be social](/articles/be-social)." {% data reusables.support.connect-in-the-forum-bootcamp %} diff --git a/translations/zh-CN/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud.md b/translations/zh-CN/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud.md index 5ec162d52849..d0491e93f603 100644 --- a/translations/zh-CN/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud.md +++ b/translations/zh-CN/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud.md @@ -1,6 +1,6 @@ --- -title: 设置 GitHub Enterprise Cloud 试用版 -intro: '您可以免费试用 {% data variables.product.prodname_ghe_cloud %}。' +title: Setting up a trial of GitHub Enterprise Cloud +intro: 'You can try {% data variables.product.prodname_ghe_cloud %} for free.' redirect_from: - /articles/setting-up-a-trial-of-github-enterprise-cloud - /github/getting-started-with-github/setting-up-a-trial-of-github-enterprise-cloud @@ -11,13 +11,13 @@ versions: ghes: '*' topics: - Accounts -shortTitle: Enterprise Cloud 试用版 +shortTitle: Enterprise Cloud trial --- {% data reusables.enterprise.ghec-cta-button %} -## 关于 {% data variables.product.prodname_ghe_cloud %} +## About {% data variables.product.prodname_ghe_cloud %} {% data variables.product.prodname_ghe_cloud %} is a plan for large businesses or teams who collaborate on {% data variables.product.prodname_dotcom_the_website %}. @@ -27,15 +27,15 @@ You can use organizations for free with {% data variables.product.prodname_free_ You can set up a trial of {% data variables.product.prodname_ghe_cloud %} to evaluate these additional features on a new or existing organization account. -试用版也可用于 {% data variables.product.prodname_ghe_server %}。 更多信息请参阅“[设置 {% data variables.product.prodname_ghe_server %} 的试用](/articles/setting-up-a-trial-of-github-enterprise-server)”。 +Trials are also available for {% data variables.product.prodname_ghe_server %}. For more information, see "[Setting up a trial of {% data variables.product.prodname_ghe_server %}](/articles/setting-up-a-trial-of-github-enterprise-server)." {% data reusables.products.which-product-to-use %} -## 关于 {% data variables.product.prodname_ghe_cloud %} 试用版 +## About trials of {% data variables.product.prodname_ghe_cloud %} -You can set up a 30-day trial to evaluate {% data variables.product.prodname_ghe_cloud %}. 在试用期间无需提供付款方式，除非您将 {% data variables.product.prodname_marketplace %} 应用程序添加到需要付款方式的组织。 更多信息请参阅“关于 {% data variables.product.prodname_marketplace %} 的计费”。 +You can set up a 30-day trial to evaluate {% data variables.product.prodname_ghe_cloud %}. You do not need to provide a payment method during the trial unless you add {% data variables.product.prodname_marketplace %} apps to your organization that require a payment method. For more information, see "About billing for {% data variables.product.prodname_marketplace %}." -试用版包括 50 个席位。 如果需要更多席位来评估 {% data variables.product.prodname_ghe_cloud %}，请联系 {% data variables.contact.contact_enterprise_sales %}。 在试用结束时，您可以选择不同数量的席位。 +Your trial includes 50 seats. If you need more seats to evaluate {% data variables.product.prodname_ghe_cloud %}, contact {% data variables.contact.contact_enterprise_sales %}. At the end of the trial, you can choose a different number of seats. {% data reusables.saml.saml-accounts %} @@ -43,35 +43,38 @@ For more information, see "[About identity and access management with SAML singl {% data variables.product.prodname_emus %} is not part of the free trial of {% data variables.product.prodname_ghe_cloud %}. If you're interested in {% data variables.product.prodname_emus %}, please contact [{% data variables.product.prodname_dotcom %}'s Sales team](https://enterprise.github.com/contact). -## 设置 {% data variables.product.prodname_ghe_cloud %} 的试用版 +## Setting up your trial of {% data variables.product.prodname_ghe_cloud %} -Before you can try {% data variables.product.prodname_ghe_cloud %}, you must be signed into a user account. If you don't already have a user account on {% data variables.product.prodname_dotcom_the_website %}, you must create one. 更多信息请参阅“注册新 {% data variables.product.prodname_dotcom %} 帐户”。 +Before you can try {% data variables.product.prodname_ghe_cloud %}, you must be signed into a user account. If you don't already have a user account on {% data variables.product.prodname_dotcom_the_website %}, you must create one. For more information, see "Signing up for a new {% data variables.product.prodname_dotcom %} account." 1. Navigate to [{% data variables.product.prodname_dotcom %} for enterprises](https://github.com/enterprise). -1. Click **Start a free trial**.  -1. Click **Enterprise Cloud**.  +1. Click **Start a free trial**. +  +1. Click **Enterprise Cloud**. +  1. Follow the prompts to configure your trial. -## 探索 {% data variables.product.prodname_ghe_cloud %} +## Exploring {% data variables.product.prodname_ghe_cloud %} -设置试用版后，您可以按照 [Enterprise 入门指南](https://resources.github.com/enterprise-onboarding/)来探索 {% data variables.product.prodname_ghe_cloud %}。 +After setting up your trial, you can explore {% data variables.product.prodname_ghe_cloud %} by following the [Enterprise Onboarding Guide](https://resources.github.com/enterprise-onboarding/). {% data reusables.docs.you-can-read-docs-for-your-product %} {% data reusables.products.product-roadmap %} -## 结束试用 +## Finishing your trial You can buy {% data variables.product.prodname_enterprise %} at any time during your trial. Purchasing {% data variables.product.prodname_enterprise %} ends your trial, removing the 50-seat maximum and initiating payment. -If you don't purchase {% data variables.product.prodname_enterprise %}, when the trial ends, your organization will be downgraded. If you used an existing organization for the trial, the organization will be downgraded to the product you were using before the trial. If you created a new organization for the trial, the organization will be downgraded to {% data variables.product.prodname_free_team %}. +If you don't purchase {% data variables.product.prodname_enterprise %}, when the trial ends, your organization will be downgraded. If you used an existing organization for the trial, the organization will be downgraded to the product you were using before the trial. If you created a new organization for the trial, the organization will be downgraded to {% data variables.product.prodname_free_team %}. -Your organization will lose access to any functionality that is not included in the new product, such as advanced features like {% data variables.product.prodname_pages %} for private repositories. If you don't plan to upgrade, to avoid losing access to advanced features, consider making affected repositories public before your trial ends. 更多信息请参阅“[设置仓库可见性](/articles/setting-repository-visibility)”。 +Your organization will lose access to any functionality that is not included in the new product, such as advanced features like {% data variables.product.prodname_pages %} for private repositories. If you don't plan to upgrade, to avoid losing access to advanced features, consider making affected repositories public before your trial ends. For more information, see "[Setting repository visibility](/articles/setting-repository-visibility)." Downgrading also disables any SAML settings configured during the trial period. If you later purchase {% data variables.product.prodname_enterprise %}, your SAML settings will be enabled again for users in your organization to authenticate. {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} {% data reusables.organizations.billing_plans %} -5. 在“{% data variables.product.prodname_ghe_cloud %} Free Trial（GitHub Enterprise Cloud 免费试用）”下，单击 **Buy Enterprise（购买 Enterprise 版）**或 **Downgrade to Team（降级到 Team 版）**。  -6. 按照提示输入付款方式，然后单击 **Submit（提交）**。 +5. Under "{% data variables.product.prodname_ghe_cloud %} Free Trial", click **Buy Enterprise** or **Downgrade to Team**. +  +6. Follow the prompts to enter your payment method, then click **Submit**. diff --git a/translations/zh-CN/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-server.md b/translations/zh-CN/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-server.md index ea9f18a5f997..1f9ff8ce7801 100644 --- a/translations/zh-CN/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-server.md +++ b/translations/zh-CN/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-server.md @@ -19,7 +19,7 @@ shortTitle: Enterprise Server 试用版 您可以申请 45 天试用版来试用 {% data variables.product.prodname_ghe_server %}。 您的试用版将作为虚拟设备安装，带有内部或云部署选项。 有关支持的可视化平台列表，请参阅“[设置 GitHub Enterprise Server 实例](/enterprise-server@latest/admin/installation/setting-up-a-github-enterprise-server-instance)”。 -{% ifversion ghes %}{% data variables.product.prodname_dependabot %}{% else %}安全{% endif %}警报和 {% data variables.product.prodname_github_connect %} 目前在 {% data variables.product.prodname_ghe_server %} 试用版中不可用。 要获取这些功能的演示，请联系 {% data variables.contact.contact_enterprise_sales %}。 For more information about these features, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" and "[Connecting your enterprise account to {% data variables.product.prodname_ghe_cloud %}](/enterprise-server@latest/admin/configuration/managing-connections-between-your-enterprise-accounts/connecting-your-enterprise-account-to-github-enterprise-cloud)." +{% ifversion ghes %}{% data variables.product.prodname_dependabot %}{% else %}安全{% endif %}警报和 {% data variables.product.prodname_github_connect %} 目前在 {% data variables.product.prodname_ghe_server %} 试用版中不可用。 要获取这些功能的演示，请联系 {% data variables.contact.contact_enterprise_sales %}。 有关这些功能的详细信息，请参阅“[关于有漏洞的依赖项警报](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)”和“[将企业帐户连接到 {% data variables.product.prodname_ghe_cloud %}](/enterprise-server@latest/admin/configuration/managing-connections-between-your-enterprise-accounts/connecting-your-enterprise-account-to-github-enterprise-cloud)”。 试用版也可用于 {% data variables.product.prodname_ghe_cloud %}。 更多信息请参阅“[设置 {% data variables.product.prodname_ghe_cloud %} 的试用](/articles/setting-up-a-trial-of-github-enterprise-cloud)”。 @@ -42,7 +42,7 @@ shortTitle: Enterprise Server 试用版 - [{% data variables.product.prodname_dotcom %} 快速入门指南](https://resources.github.com/webcasts/Quick-start-guide-to-GitHub/)网络直播 - {% data variables.product.prodname_dotcom %} 指南中的[了解 {% data variables.product.prodname_dotcom %} 流程](https://guides.github.com/introduction/flow/) - {% data variables.product.prodname_dotcom %} 指南中的 [Hello World](https://guides.github.com/activities/hello-world/) - - "[About versions of {% data variables.product.prodname_docs %}](/get-started/learning-about-github/about-versions-of-github-docs)" + - "[关于 {% data variables.product.prodname_docs %} 的版本](/get-started/learning-about-github/about-versions-of-github-docs)" 3. 要配置实例以满足组织的需求，请参阅“[配置企业](/enterprise-server@latest/admin/configuration/configuring-your-enterprise)”。 4. 要将 {% data variables.product.prodname_ghe_server %} 与您的身份提供程序集成，请参阅“[使用 SAML](/enterprise-server@latest/admin/user-management/using-saml)”和“[使用 LDAP](/enterprise-server@latest/admin/authentication/using-ldap)”。 5. 邀请不限数量的人员加入您的试用版。 diff --git a/translations/zh-CN/content/get-started/signing-up-for-github/signing-up-for-a-new-github-account.md b/translations/zh-CN/content/get-started/signing-up-for-github/signing-up-for-a-new-github-account.md index 7ae446c82fa2..5b23ef648f29 100644 --- a/translations/zh-CN/content/get-started/signing-up-for-github/signing-up-for-a-new-github-account.md +++ b/translations/zh-CN/content/get-started/signing-up-for-github/signing-up-for-a-new-github-account.md @@ -1,7 +1,7 @@ --- -title: 注册新 GitHub 帐户 -shortTitle: 注册新 GitHub 帐户 -intro: '{% data variables.product.company_short %} 为一起工作的人员团队提供个人和组织的用户帐户。' +title: Signing up for a new GitHub account +shortTitle: Sign up for a new GitHub account +intro: '{% data variables.product.company_short %} offers user accounts for individuals and organizations for teams of people working together.' redirect_from: - /articles/signing-up-for-a-new-github-account - /github/getting-started-with-github/signing-up-for-a-new-github-account @@ -17,15 +17,16 @@ topics: You can create a personal account, which serves as your identity on {% data variables.product.prodname_dotcom_the_website %}, or an organization, which allows multiple personal accounts to collaborate across multiple projects. For more information about account types, see "[Types of {% data variables.product.prodname_dotcom %} accounts](/get-started/learning-about-github/types-of-github-accounts)." -When you create a personal account or organization, you must select a billing plan for the account. 更多信息请参阅“[{% data variables.product.company_short %} 的产品](/get-started/learning-about-github/githubs-products)”。 +When you create a personal account or organization, you must select a billing plan for the account. For more information, see "[{% data variables.product.company_short %}'s products](/get-started/learning-about-github/githubs-products)." ## Signing up for a new account +1. If you want to create a new personal account, make sure you are currently signed out of GitHub. {% data reusables.accounts.create-account %} -1. 按照提示操作，创建您的个人帐户或组织。 +1. Follow the prompts to create your personal account or organization. -## 后续步骤 +## Next steps -- “[验证电子邮件地址](/articles/verifying-your-email-address)” +- "[Verify your email address](/articles/verifying-your-email-address)" - "[Creating an enterprise account](/enterprise-cloud@latest/admin/overview/creating-an-enterprise-account)"{% ifversion fpt %} in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %} -- `github/roadmap` 仓库中的 [ {% data variables.product.prodname_roadmap %} ]({% data variables.product.prodname_roadmap_link %}) +- [ {% data variables.product.prodname_roadmap %} ]( {% data variables.product.prodname_roadmap_link %} ) in the `github/roadmap` repository diff --git a/translations/zh-CN/content/get-started/signing-up-for-github/verifying-your-email-address.md b/translations/zh-CN/content/get-started/signing-up-for-github/verifying-your-email-address.md index 13f03e12c93c..e2eb92333272 100644 --- a/translations/zh-CN/content/get-started/signing-up-for-github/verifying-your-email-address.md +++ b/translations/zh-CN/content/get-started/signing-up-for-github/verifying-your-email-address.md @@ -1,6 +1,6 @@ --- -title: 验证电子邮件地址 -intro: '验证主电子邮件地址可确保增强的安全性，以便 {% data variables.product.prodname_dotcom %} 员工在您忘记密码时更好地协助您，并为您提供 {% data variables.product.prodname_dotcom %} 上更多功能的访问权限。' +title: Verifying your email address +intro: 'Verifying your primary email address ensures strengthened security, allows {% data variables.product.prodname_dotcom %} staff to better assist you if you forget your password, and gives you access to more features on {% data variables.product.prodname_dotcom %}.' redirect_from: - /articles/troubleshooting-email-verification - /articles/setting-up-email-verification @@ -12,59 +12,60 @@ versions: ghec: '*' topics: - Accounts -shortTitle: 验证您的电子邮件地址 +shortTitle: Verify your email address --- - -## 关于电子邮件通知 - -您可在注册新帐户后或添加新电子邮件地址时验证您的电子邮件地址。 如果电子邮件地址无法送达或退回，它将无法进行验证。 - -如果没有验证电子邮件地址，您将无法： - - 创建或复刻仓库 - - 创建议题或拉取请求 - - 对议题、拉取请求或提交发表评论 - - 授权 {% data variables.product.prodname_oauth_app %} 应用程序 - - 生成个人访问令牌 - - 接收电子邮件通知 - - 对仓库加星标 - - 创建或更新项目板，包括添加卡片 - - 创建或更新 gist - - 创建或使用 {% data variables.product.prodname_actions %} - - 通过 {% data variables.product.prodname_sponsors %} 赞助开发者 +## About email verification + +You can verify your email address after signing up for a new account, or when you add a new email address. If an email address is undeliverable or bouncing, it will be unverified. + +If you do not verify your email address, you will not be able to: + - Create or fork repositories + - Create issues or pull requests + - Comment on issues, pull requests, or commits + - Authorize {% data variables.product.prodname_oauth_app %} applications + - Generate personal access tokens + - Receive email notifications + - Star repositories + - Create or update project boards, including adding cards + - Create or update gists + - Create or use {% data variables.product.prodname_actions %} + - Sponsor developers with {% data variables.product.prodname_sponsors %} {% warning %} -**警告**： +**Warnings**: -- {% data reusables.user_settings.no-verification-disposable-emails %} -- {% data reusables.user_settings.verify-org-approved-email-domain %} +- {% data reusables.user-settings.no-verification-disposable-emails %} +- {% data reusables.user-settings.verify-org-approved-email-domain %} {% endwarning %} -## 验证电子邮件地址 +## Verifying your email address -{% data reusables.user_settings.access_settings %} -{% data reusables.user_settings.emails %} -1. 在电子邮件地址下，单击 **Resend verification email（重新发送验证电子邮件）**。  -4. {% data variables.product.prodname_dotcom %} 将向您发送一封含有链接的电子邮件。 单击该链接后，您将转到 {% data variables.product.prodname_dotcom %} 仪表板并看到确认横幅。  +{% data reusables.user-settings.access_settings %} +{% data reusables.user-settings.emails %} +1. Under your email address, click **Resend verification email**. +  +4. {% data variables.product.prodname_dotcom %} will send you an email with a link in it. After you click that link, you'll be taken to your {% data variables.product.prodname_dotcom %} dashboard and see a confirmation banner. +  -## 电子邮件验证故障排除 +## Troubleshooting email verification -### 无法发送验证电子邮件 +### Unable to send verification email -{% data reusables.user_settings.no-verification-disposable-emails %} +{% data reusables.user-settings.no-verification-disposable-emails %} -### 单击验证链接后的错误页面 +### Error page after clicking verification link -验证链接将在 24 小时后过期。 如果您没有在 24 小时内验证电子邮件，则可以请求其他电子邮件验证链接。 更多信息请参阅“[验证电子邮件地址](/articles/verifying-your-email-address)”。 +The verification link expires after 24 hours. If you don't verify your email within 24 hours, you can request another email verification link. For more information, see "[Verifying your email address](/articles/verifying-your-email-address)." If you click on the link in the confirmation email within 24 hours and you are directed to an error page, you should ensure that you're signed into the correct account on {% data variables.product.product_location %}. 1. {% data variables.product.signout_link %} of your personal account on {% data variables.product.product_location %}. -2. 退出并重新启动浏览器。 +2. Quit and restart your browser. 3. {% data variables.product.signin_link %} to your personal account on {% data variables.product.product_location %}. -4. 单击我们发送给您的电子邮件中的验证链接。 +4. Click on the verification link in the email we sent you. -## 延伸阅读 +## Further reading -- “[更改主电子邮件地址](/articles/changing-your-primary-email-address)” +- "[Changing your primary email address](/articles/changing-your-primary-email-address)" diff --git a/translations/zh-CN/content/get-started/using-git/pushing-commits-to-a-remote-repository.md b/translations/zh-CN/content/get-started/using-git/pushing-commits-to-a-remote-repository.md index c28e77a9050f..00de94acae4e 100644 --- a/translations/zh-CN/content/get-started/using-git/pushing-commits-to-a-remote-repository.md +++ b/translations/zh-CN/content/get-started/using-git/pushing-commits-to-a-remote-repository.md @@ -15,7 +15,7 @@ versions: shortTitle: 推送提交到远程 --- -## About `git push` +## 关于 `git push` `git push` 命令使用两个参数： * 远程命令，如 `origin` @@ -101,7 +101,7 @@ git fetch upstream ## 延伸阅读 - ["Pro Git" 书中的“远程”一章](https://git-scm.com/book/ch5-2.html) -- [`git remote` main page](https://git-scm.com/docs/git-remote.html) +- [`git remote` 主页面](https://git-scm.com/docs/git-remote.html) - "[Git 小抄](/articles/git-cheatsheet)" - "[Git 工作流程](/github/getting-started-with-github/git-workflows)" - "[Git 手册](https://guides.github.com/introduction/git-handbook/)" diff --git a/translations/zh-CN/content/get-started/using-git/splitting-a-subfolder-out-into-a-new-repository.md b/translations/zh-CN/content/get-started/using-git/splitting-a-subfolder-out-into-a-new-repository.md index 0209f9d2cf66..d38f7862b537 100644 --- a/translations/zh-CN/content/get-started/using-git/splitting-a-subfolder-out-into-a-new-repository.md +++ b/translations/zh-CN/content/get-started/using-git/splitting-a-subfolder-out-into-a-new-repository.md @@ -31,8 +31,8 @@ shortTitle: 拆分子文件夹 $ cd REPOSITORY-NAME ``` -5. To filter out the subfolder from the rest of the files in the repository, run [`git filter-repo`](https://github.com/newren/git-filter-repo), supplying this information: - - `FOLDER-NAME`: The folder within your project where you'd like to create a separate repository. +5. 要从仓库中的其余文件过滤出该子文件夹，请运行 [`git filter-repo`](https://github.com/newren/git-filter-repo)，提供以下信息： + - `FOLDER-NAME`：项目中您要从其创建单独仓库的文件夹。 {% windows %} @@ -51,11 +51,11 @@ shortTitle: 拆分子文件夹 > Ref 'refs/heads/BRANCH-NAME' was rewritten ``` - The repository should now only contain the files that were in your subfolder(s). + 现在，该仓库应仅包含您的子文件夹中的文件。 6. 在 {% data variables.product.product_name %} 上[创建新仓库](/articles/creating-a-new-repository/)。 -7. At the top of your new repository on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %}'s Quick Setup page, click {% octicon "clippy" aria-label="The copy to clipboard icon" %} to copy the remote repository URL. +7. 在新仓库顶部 {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %} 的快速设置页面，点击 {% octicon "clippy" aria-label="The copy to clipboard icon" %} 以复制远程仓库 URL。  diff --git a/translations/zh-CN/content/get-started/using-github/exploring-early-access-releases-with-feature-preview.md b/translations/zh-CN/content/get-started/using-github/exploring-early-access-releases-with-feature-preview.md index c6206c809cd2..dd4d3c831765 100644 --- a/translations/zh-CN/content/get-started/using-github/exploring-early-access-releases-with-feature-preview.md +++ b/translations/zh-CN/content/get-started/using-github/exploring-early-access-releases-with-feature-preview.md @@ -17,11 +17,11 @@ shortTitle: 功能预览 {% data variables.product.prodname_dotcom %} 的产品和功能可能经过多个发行阶段。 -| 阶段 | 描述 | -| ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Alpha | 产品或功能正在大量开发中，要求和范围通常不断变化。 此功能可用于演示和测试目的，但可能不会形成文档。 Alpha 版本功能不一定完整，不提供服务水平协议 (SLA)，也没有技术支持义务。
**Note**: A product or feature released as a "Technology Preview" is considered to be in the alpha release stage. Technology Preview releases share the same characteristics of alpha releases as described above. | -| 测试版 | 产品或功能已准备好进行更广泛的分发。 Beta 版本可以是公共版本或私有版本，会形成文档，但没有任何 SLA 或技术支持义务。 | -| 通用 (GA) | 产品或功能经过全面测试，并公开向所有用户开放。 GA 版本已经可以用于生产，具有相关的 SLA 和技术支持义务。 | +| 阶段 | 描述 | +| ------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Alpha | 产品或功能正在大量开发中，要求和范围通常不断变化。 此功能可用于演示和测试目的，但可能不会形成文档。 Alpha 版本功能不一定完整，不提供服务水平协议 (SLA)，也没有技术支持义务。
**注意**：作为“技术预览版”发布的产品或功能被视为处于 Alpha 版发布阶段。 技术预览版与上述 Alpha 版本具有相同的特征。 | +| 测试版 | 产品或功能已准备好进行更广泛的分发。 Beta 版本可以是公共版本或私有版本，会形成文档，但没有任何 SLA 或技术支持义务。 | +| 通用 (GA) | 产品或功能经过全面测试，并公开向所有用户开放。 GA 版本已经可以用于生产，具有相关的 SLA 和技术支持义务。 | ## 通过功能预览了解发行版 diff --git a/translations/zh-CN/content/get-started/using-github/github-cli.md b/translations/zh-CN/content/get-started/using-github/github-cli.md index 16e401bd3710..9b62ec362cd7 100644 --- a/translations/zh-CN/content/get-started/using-github/github-cli.md +++ b/translations/zh-CN/content/get-started/using-github/github-cli.md @@ -14,4 +14,4 @@ topics: {% data reusables.cli.cli-features %} -For more information, see "[{% data variables.product.prodname_cli %}](/github-cli)." +更多信息请参阅“[{% data variables.product.prodname_cli %}](/github-cli)”。 diff --git a/translations/zh-CN/content/get-started/using-github/keyboard-shortcuts.md b/translations/zh-CN/content/get-started/using-github/keyboard-shortcuts.md index 1506792c342e..992497db5c83 100644 --- a/translations/zh-CN/content/get-started/using-github/keyboard-shortcuts.md +++ b/translations/zh-CN/content/get-started/using-github/keyboard-shortcuts.md @@ -17,14 +17,14 @@ versions: ## 关于键盘快捷键 -Typing ? on {% data variables.product.prodname_dotcom %} brings up a dialog box that lists the keyboard shortcuts available for that page. 您可以使用这些键盘快捷键对站点执行操作，而无需使用鼠标导航。 +在 {% data variables.product.prodname_dotcom %} 中输入 ? 可弹出一个对话框，列出可用于该页面的键盘快捷键。 您可以使用这些键盘快捷键对站点执行操作，而无需使用鼠标导航。 {% if keyboard-shortcut-accessibility-setting %} -You can disable character key shortcuts, while still allowing shortcuts that use modifier keys, in your accessibility settings. For more information, see "[Managing accessibility settings](/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/managing-accessibility-settings)."{% endif %} +您可以在辅助功能设置中禁用字符键快捷键，同时仍允许使用修饰键的快捷键。 更多信息请参阅“[管理辅助功能设置](/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/managing-accessibility-settings)”。{% endif %} 下面是一些可用键盘快捷键的列表。 {% if command-palette %} -The {% data variables.product.prodname_command_palette %} also gives you quick access to a wide range of actions, without the need to remember keyboard shortcuts. For more information, see "[{% data variables.product.prodname_command_palette %}](/get-started/using-github/github-command-palette)."{% endif %} +{% data variables.product.prodname_command_palette %} 还可让您快速访问各种操作，而无需记住键盘快捷键。 For more information, see "[{% data variables.product.prodname_command_palette %}](/get-started/using-github/github-command-palette)."{% endif %} ## 站点快捷键 @@ -36,42 +36,42 @@ The {% data variables.product.prodname_command_palette %} also gives you quick a {% if command-palette %} -Command+K (Mac) or Ctrl+K (Windows/Linux) | Opens the {% data variables.product.prodname_command_palette %}. If you are editing Markdown text, open the command palette with Command+Option+K or Ctrl+Alt+K. For more information, see "[{% data variables.product.prodname_command_palette %}](/get-started/using-github/github-command-palette)."{% endif %} +Command+K (Mac) 或 Ctrl+K (Windows/Linux) | 打开 {% data variables.product.prodname_command_palette %}。 如果要编辑 Markdown 文本，请使用 Command+Option+K 或 Ctrl+Alt+K打开命令面板。 For more information, see "[{% data variables.product.prodname_command_palette %}](/get-started/using-github/github-command-palette)."{% endif %} ## 仓库 -| 键盘快捷键 | 描述 | -| ------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| G C | 转到 **Code（代码）**选项卡 | -| G I | 转到 **Issues（议题）**选项卡。 更多信息请参阅“[关于议题](/articles/about-issues)”。 | -| G P | 转到 **Pull requests（拉取请求）**选项卡。 For more information, see "[About pull requests](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests)."{% ifversion fpt or ghes or ghec %} +| 键盘快捷键 | 描述 | +| ------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| G C | 转到 **Code（代码）**选项卡 | +| G I | 转到 **Issues（议题）**选项卡。 更多信息请参阅“[关于议题](/articles/about-issues)”。 | +| G P | 转到 **Pull requests（拉取请求）**选项卡。 更多信息请参阅“[关于拉取请求](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests)”。{% ifversion fpt or ghes or ghec %} | G A | 转到 **Actions（操作）**选项卡。 更多信息请参阅“[关于 Actions](/actions/getting-started-with-github-actions/about-github-actions)”。{% endif %} -| G B | 转到 **Projects（项目）**选项卡。 更多信息请参阅“[关于项目板](/articles/about-project-boards)”。 | +| G B | 转到 **Projects（项目）**选项卡。 更多信息请参阅“[关于项目板](/articles/about-project-boards)”。 | | G W | 转到 **Wiki** 选项卡。 更多信息请参阅“[关于 wiki](/communities/documenting-your-project-with-wikis/about-wikis)”。{% ifversion fpt or ghec %} | G G | 转到 **Discussions（讨论）**选项卡。 更多信息请参阅“[关于讨论](/discussions/collaborating-with-your-community-using-discussions/about-discussions)”。{% endif %} ## 源代码编辑 -| 键盘快捷键 | 描述 | -| ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |{% ifversion fpt or ghec %} -| . | Opens a repository or pull request in the web-based editor. For more information, see "[Web-based editor](/codespaces/developing-in-codespaces/web-based-editor)."{% endif %} -| Command+B (Mac) or Ctrl+B (Windows/Linux) | 插入 Markdown 格式用于粗体文本 | -| Command+I (Mac) or Ctrl+I (Windows/Linux) | 插入 Markdown 格式用于斜体文本 | -| Command+K (Mac) or Ctrl+K (Windows/Linux) | Inserts Markdown formatting for creating a link{% ifversion fpt or ghec or ghae or ghes > 3.3 %} -| Command+Shift+7 (Mac) or Ctrl+Shift+7 (Windows/Linux) | Inserts Markdown formatting for an ordered list | -| Command+Shift+8 (Mac) or Ctrl+Shift+8 (Windows/Linux) | Inserts Markdown formatting for an unordered list | -| Command+Shift+. (Mac) or Ctrl+Shift+. (Windows/Linux) | Inserts Markdown formatting for a quote{% endif %} -| E | 在 **Edit file（编辑文件）**选项卡中打开源代码文件 | -| Command+F (Mac) or Ctrl+F (Windows/Linux) | 开始在文件编辑器中搜索 | -| Command+G (Mac) or Ctrl+G (Windows/Linux) | 查找下一个 | -| Command+Shift+G (Mac) or Ctrl+Shift+G (Windows/Linux) | 查找上一个 | -| Command+Option+F (Mac) or Ctrl+Shift+F (Windows/Linux) | 替换 | -| Command+Shift+Option+F (Mac) or Ctrl+Shift+R (Windows/Linux) | 全部替换 | -| Alt+G | 跳至行 | -| Command+Z (Mac) or Ctrl+Z (Windows/Linux) | 撤消 | -| Command+Y (Mac) or Ctrl+Y (Windows/Linux) | 重做 | -| Command+Shift+P | 在 **Edit file（编辑文件）** 与 **Preview changes（预览更改）**选项卡之间切换 | -| Command+S (Mac) or Ctrl+S (Windows/Linux) | 填写提交消息 | +| 键盘快捷键 | 描述 | +| ---------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------ |{% ifversion fpt or ghec %} +| . | 在基于 Web 的编辑器中打开存储库或拉取请求。 更多信息请参阅“[基于 Web 的编辑器](/codespaces/developing-in-codespaces/web-based-editor)”。{% endif %} +| Command+B (Mac) 或 Ctrl+B (Windows/Linux) | 插入 Markdown 格式用于粗体文本 | +| Command+I (Mac) 或 Ctrl+I (Windows/Linux) | 插入 Markdown 格式用于斜体文本 | +| Command+K (Mac) 或 Ctrl+K (Windows/Linux) | 插入 Markdown 格式以创建链接{% ifversion fpt or ghec or ghae or ghes > 3.3 %} +| Command+Shift+7 (Mac) 或 Ctrl+Shift+7 (Windows/Linux) | 为有序列表插入 Markdown 格式 | +| Command+Shift+8 (Mac) 或 Ctrl+Shift+8 (Windows/Linux) | 为无序列表插入 Markdown 格式 | +| Command+Shift+. (Mac) 或 Ctrl+Shift+. (Windows/Linux) | 为报价插入 Markdown 格式{% endif %} +| E | 在 **Edit file（编辑文件）**选项卡中打开源代码文件 | +| Command+F (Mac) 或 Ctrl+F (Windows/Linux) | 开始在文件编辑器中搜索 | +| Command+G (Mac) 或 Ctrl+G (Windows/Linux) | 查找下一个 | +| Command+Shift+G (Mac) 或 Ctrl+Shift+G (Windows/Linux) | 查找上一个 | +| Command+Option+F (Mac) 或 Ctrl+Shift+F (Windows/Linux) | 替换 | +| Command+Shift+Option+F (Mac) 或 Ctrl+Shift+R (Windows/Linux) | 全部替换 | +| Alt+G | 跳至行 | +| Command+Z (Mac) 或 Ctrl+Z (Windows/Linux) | 撤消 | +| Command+Y (Mac) 或 Ctrl+Y (Windows/Linux) | 重做 | +| Command+Shift+P | 在 **Edit file（编辑文件）** 与 **Preview changes（预览更改）**选项卡之间切换 | +| Command+S (Mac) 或 Ctrl+S (Windows/Linux) | 填写提交消息 | 有关更多键盘快捷键，请参阅 [CodeMirror 文档](https://codemirror.net/doc/manual.html#commands)。 @@ -89,95 +89,96 @@ The {% data variables.product.prodname_command_palette %} also gives you quick a ## 评论 -| 键盘快捷键 | 描述 | -| ----------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Command+B (Mac) or Ctrl+B (Windows/Linux) | 插入 Markdown 格式用于粗体文本 | -| Command+I (Mac) or Ctrl+I (Windows/Linux) | 插入斜体文本的 Markdown 格式{% ifversion fpt or ghae or ghes > 3.1 or ghec %} -| Command+E (Mac) or Ctrl+E (Windows/Linux) | 在行内插入代码或命令的 Markdown 格式{% endif %} -| Command+K (Mac) or Ctrl+K (Windows/Linux) | 插入 Markdown 格式用于创建链接 | -| Command+Shift+P (Mac) or Ctrl+Shift+P (Windows/Linux) | Toggles between the **Write** and **Preview** comment tabs{% ifversion fpt or ghae or ghes > 3.4 or ghec %} -| Command+Shift+V (Mac) or Ctrl+Shift+V (Windows/Linux) | Pastes HTML link as plain text{% endif %}{% ifversion fpt or ghae or ghes > 3.2 or ghec %} -| Command+Shift+7 (Mac) or Ctrl+Shift+7 (Windows/Linux) | Inserts Markdown formatting for an ordered list | -| Command+Shift+8 (Mac) or Ctrl+Shift+8 (Windows/Linux) | Inserts Markdown formatting for an unordered list{% endif %} -| Command+Enter (Mac) or Ctrl+Enter (Windows/Linux) | 提交评论 | -| Ctrl+. and then Ctrl+[saved reply number] | 打开已保存回复菜单，然后使用已保存回复自动填写评论字段。 更多信息请参阅“[关于已保存回复](/articles/about-saved-replies)”。{% ifversion fpt or ghae or ghes > 3.2 or ghec %} -| Command+Shift+. (Mac) or Ctrl+Shift+. (Windows/Linux) | Inserts Markdown formatting for a quote{% endif %}{% ifversion fpt or ghec %} -| Command+G (Mac) or Ctrl+G (Windows/Linux) | 插入建议。 更多信息请参阅“[审查拉取请求中提议的更改](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request)”。 +| 键盘快捷键 | 描述 | +| ---------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Command+B (Mac) 或 Ctrl+B (Windows/Linux) | 插入 Markdown 格式用于粗体文本 | +| Command+I (Mac) 或 Ctrl+I (Windows/Linux) | 插入斜体文本的 Markdown 格式{% ifversion fpt or ghae or ghes > 3.1 or ghec %} +| Command+E (Mac) 或 Ctrl+E (Windows/Linux) | 在行内插入代码或命令的 Markdown 格式{% endif %} +| Command+K (Mac) 或 Ctrl+K (Windows/Linux) | 插入 Markdown 格式用于创建链接 | +| Command+Shift+P (Mac) 或 Ctrl+Shift+P (Windows/Linux) | 在 **Write（撰写）**和 **Preview（预览）**评论选项卡之间切换{% ifversion fpt or ghae or ghes > 3.4 or ghec %} +| Command+Shift+V (Mac) 或 Ctrl+Shift+V (Windows/Linux) | 将 HTML 链接粘贴为纯文本{% endif %}{% ifversion fpt or ghae or ghes > 3.2 or ghec %} +| Command+Shift+7 (Mac) 或 Ctrl+Shift+7 (Windows/Linux) | 为有序列表插入 Markdown 格式 | +| Command+Shift+8 (Mac) 或 Ctrl+Shift+8 (Windows/Linux) | 为无序列表插入 Markdown 格式{% endif %} +| Command+Enter (Mac) 或 Ctrl+Enter (Windows/Linux) | 提交评论 | +| Ctrl+.，然后 Ctrl+[保存的回复编号] | 打开已保存回复菜单，然后使用已保存回复自动填写评论字段。 更多信息请参阅“[关于已保存回复](/articles/about-saved-replies)”。{% ifversion fpt or ghae or ghes > 3.2 or ghec %} +| Command+Shift+. (Mac) 或 Ctrl+Shift+. (Windows/Linux) | 为报价插入 Markdown 格式{% endif %}{% ifversion fpt or ghec %} +| Command+G (Mac) 或 Ctrl+G (Windows/Linux) | 插入建议。 更多信息请参阅“[审查拉取请求中提议的更改](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request)”。 {% endif %} -| R | 在您的回复中引用所选的文本。 更多信息请参阅“[基本撰写和格式语法](/articles/basic-writing-and-formatting-syntax#quoting-text)”。 | +| R | 在您的回复中引用所选的文本。 更多信息请参阅“[基本撰写和格式语法](/articles/basic-writing-and-formatting-syntax#quoting-text)”。 | ## 议题和拉取请求列表 -| 键盘快捷键 | 描述 | -| ------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| C | 创建议题 | -| Command+/ (Mac) or Ctrl+/ (Windows/Linux) | 将光标聚焦于议题或拉取请求搜索栏。 For more information, see "[Filtering and searching issues and pull requests](/issues/tracking-your-work-with-issues/filtering-and-searching-issues-and-pull-requests)."| | -| U | 按作者过滤 | -| L | 按标签过滤或编辑标签。 更多信息请参阅“[按标签过滤议题和拉取请求](/articles/filtering-issues-and-pull-requests-by-labels)”。 | -| Alt 并单击 | 按标签过滤时，排除标签。 更多信息请参阅“[按标签过滤议题和拉取请求](/articles/filtering-issues-and-pull-requests-by-labels)”。 | -| M | 按里程碑过滤或编辑里程碑。 更多信息请参阅“[按里程碑过滤议题和拉取请求](/articles/filtering-issues-and-pull-requests-by-milestone)”。 | -| A | 按受理人过滤或编辑受理人。 更多信息请参阅“[按受理人过滤议题和拉取请求](/articles/filtering-issues-and-pull-requests-by-assignees)”。 | -| O or Enter | 打开议题 | +| 键盘快捷键 | 描述 | +| ------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------- | +| C | 创建议题 | +| Command+/ (Mac) 或 Ctrl+/ (Windows/Linux) | 将光标聚焦于议题或拉取请求搜索栏。 更多信息请参阅“[筛选和搜索问题以及拉取请求](/issues/tracking-your-work-with-issues/filtering-and-searching-issues-and-pull-requests)”。| | +| U | 按作者过滤 | +| L | 按标签过滤或编辑标签。 更多信息请参阅“[按标签过滤议题和拉取请求](/articles/filtering-issues-and-pull-requests-by-labels)”。 | +| Alt 并单击 | 按标签过滤时，排除标签。 更多信息请参阅“[按标签过滤议题和拉取请求](/articles/filtering-issues-and-pull-requests-by-labels)”。 | +| M | 按里程碑过滤或编辑里程碑。 更多信息请参阅“[按里程碑过滤议题和拉取请求](/articles/filtering-issues-and-pull-requests-by-milestone)”。 | +| A | 按受理人过滤或编辑受理人。 更多信息请参阅“[按受理人过滤议题和拉取请求](/articles/filtering-issues-and-pull-requests-by-assignees)”。 | +| O 或 Enter | 打开议题 | ## 议题和拉取请求 -| 键盘快捷键 | 描述 | -| ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Q | 请求审查者。 更多信息请参阅“[申请拉取请求审查](/articles/requesting-a-pull-request-review/)”。 | -| M | 设置里程碑。 更多信息请参阅“[将里程碑与议题及拉取请求关联](/articles/associating-milestones-with-issues-and-pull-requests/)”。 | -| L | 应用标签。 更多信息请参阅“[应用标签到议题和拉取请求](/articles/applying-labels-to-issues-and-pull-requests/)”。 | -| A | 设置受理人。 更多信息请参阅“[分配议题和拉取请求到其他 {% data variables.product.company_short %} 用户](/articles/assigning-issues-and-pull-requests-to-other-github-users/)”。 | -| Command+Shift+P (Mac) or Ctrl+Shift+P (Windows/Linux) | 在 **Write（撰写）**和 **Preview（预览）**选项卡之间切换{% ifversion fpt or ghec %} -| Alt 并单击 | When creating an issue from a task list, open the new issue form in the current tab by holding Alt and clicking the {% octicon "issue-opened" aria-label="The issue opened icon" %} in the upper-right corner of the task. 更多信息请参阅“[关于任务列表](/issues/tracking-your-work-with-issues/creating-issues/about-task-lists)”。 | -| Shift 并点击 | When creating an issue from a task list, open the new issue form in a new tab by holding Shift and clicking the {% octicon "issue-opened" aria-label="The issue opened icon" %} in the upper-right corner of the task. 更多信息请参阅“[关于任务列表](/issues/tracking-your-work-with-issues/creating-issues/about-task-lists)”。 | -| Command and click (Mac) or Ctrl+Shift and click (Windows/Linux) | When creating an issue from a task list, open the new issue form in the new window by holding Command or Ctrl+Shift and clicking the {% octicon "issue-opened" aria-label="The issue opened icon" %} in the upper-right corner of the task. 更多信息请参阅“[关于任务列表](/issues/tracking-your-work-with-issues/creating-issues/about-task-lists)”。{% endif %} +| 键盘快捷键 | 描述 | +| ---------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Q | 请求审查者。 更多信息请参阅“[申请拉取请求审查](/articles/requesting-a-pull-request-review/)”。 | +| M | 设置里程碑。 更多信息请参阅“[将里程碑与议题及拉取请求关联](/articles/associating-milestones-with-issues-and-pull-requests/)”。 | +| L | 应用标签。 更多信息请参阅“[应用标签到议题和拉取请求](/articles/applying-labels-to-issues-and-pull-requests/)”。 | +| A | 设置受理人。 更多信息请参阅“[分配议题和拉取请求到其他 {% data variables.product.company_short %} 用户](/articles/assigning-issues-and-pull-requests-to-other-github-users/)”。 | +| X | 链接来自同一存储库的议题或拉取请求。 更多信息请参阅“[将拉取请求链接到议题](/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue/)”。 | +| Command+Shift+P (Mac) 或 Ctrl+Shift+P (Windows/Linux) | 在 **Write（撰写）**和 **Preview（预览）**选项卡之间切换{% ifversion fpt or ghec %} +| Alt 并单击 | 从任务列表创建议题时，按住 Alt 并单击任务右上角的 {% octicon "issue-opened" aria-label="The issue opened icon" %} ，在当前选项卡中打开新议题表单。 更多信息请参阅“[关于任务列表](/issues/tracking-your-work-with-issues/creating-issues/about-task-lists)”。 | +| Shift 并点击 | 从任务列表创建议题时，按住 Shift 并单击任务右上角的 {% octicon "issue-opened" aria-label="The issue opened icon" %} ，在新选项卡中打开新议题表单。 更多信息请参阅“[关于任务列表](/issues/tracking-your-work-with-issues/creating-issues/about-task-lists)”。 | +| Command 并点击 (Mac) 或 Ctrl+Shift 并点击 (Windows/Linux) | 从任务列表创建议题时，按住 Command 或 Ctrl+Shift 并单击任务右上角的 {% octicon "issue-opened" aria-label="The issue opened icon" %} ，在新窗口中打开新议题表单。 更多信息请参阅“[关于任务列表](/issues/tracking-your-work-with-issues/creating-issues/about-task-lists)”。{% endif %} ## 拉取请求中的更改 -| 键盘快捷键 | 描述 | -| ---------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| C | 在拉取请求中打开提交列表 | -| T | 在拉取请求中打开已更改文件列表 | -| J | 将所选内容在列表中向下移动 | -| K | 将所选内容在列表中向上移动 | -| Command+Shift+Enter | 添加一条有关拉取请求差异的评论 | -| Alt 并单击 | Toggle between collapsing and expanding all outdated review comments in a pull request by holding down Alt and clicking **Show outdated** or **Hide outdated**.|{% ifversion fpt or ghes or ghae or ghec %} -| Click, then Shift and click | Comment on multiple lines of a pull request by clicking a line number, holding Shift, then clicking another line number. 更多信息请参阅“[评论拉取请求](/github/collaborating-with-issues-and-pull-requests/commenting-on-a-pull-request#adding-line-comments-to-a-pull-request)。” +| 键盘快捷键 | 描述 | +| ---------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| C | 在拉取请求中打开提交列表 | +| T | 在拉取请求中打开已更改文件列表 | +| J | 将所选内容在列表中向下移动 | +| K | 将所选内容在列表中向上移动 | +| Command+Shift+Enter | 添加一条有关拉取请求差异的评论 | +| Alt 并单击 | 通过按下 Alt 并单击 **Show outdated（显示已过期）**或 **Hide outdated（隐藏已过期）**，在折叠和展开拉取请求中所有过期的审查评论之间切换。{% ifversion fpt or ghes or ghae or ghec %} +| 单击，然后按住 Shift 并单击 | 单击一个行号，按住 Shift，然后单击另一行号，便可对拉取请求的多行发表评论。 更多信息请参阅“[评论拉取请求](/github/collaborating-with-issues-and-pull-requests/commenting-on-a-pull-request#adding-line-comments-to-a-pull-request)。” {% endif %} ## 项目板 ### 移动列 -| 键盘快捷键 | 描述 | -| -------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------- | -| Enter or Space | 开始移动聚焦的列 | -| Esc | 取消正在进行的移动 | -| Enter | 完成正在进行的移动 | -| ← or H | 向左移动列 | -| Command+← or Command+H (Mac) or Ctrl+← or Ctrl+H (Windows/Linux) | 将列移动到最左侧的位置 | -| → or L | 向右移动列 | -| Command+→ or Command+L (Mac) or Ctrl+→ or Ctrl+L (Windows/Linux) | 将列移动到最右侧的位置 | +| 键盘快捷键 | 描述 | +| ----------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------- | +| Enter 或 Space | 开始移动聚焦的列 | +| Esc | 取消正在进行的移动 | +| Enter | 完成正在进行的移动 | +| ← 或 H | 向左移动列 | +| Command+← 或 Command+H (Mac) 或 Ctrl+← 或 Ctrl+H (Windows/Linux) | 将列移动到最左侧的位置 | +| → 或 L | 向右移动列 | +| Command+→ 或 Command+L (Mac) 或 Ctrl+→ 或 Ctrl+L (Windows/Linux) | 将列移动到最右侧的位置 | ### 移动卡片 -| 键盘快捷键 | 描述 | -| ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------- | -| Enter or Space | 开始移动聚焦的卡片 | -| Esc | 取消正在进行的移动 | -| Enter | 完成正在进行的移动 | -| ↓ or J | 向下移动卡片 | -| Command+↓ or Command+J (Mac) or Ctrl+↓ or Ctrl+J (Windows/Linux) | 将卡片移动到该列的底部 | -| ↑ or K | 向上移动卡片 | -| Command+↑ or Command+K (Mac) or Ctrl+↑ or Ctrl+K (Windows/Linux) | 将卡片移动到该列的顶部 | -| ← or H | 将卡片移动到左侧列的底部 | -| Shift+← or Shift+H | 将卡片移动到左侧列的顶部 | -| Command+← or Command+H (Mac) or Ctrl+← or Ctrl+H (Windows/Linux) | 将卡片移动到最左侧列的底部 | -| Command+Shift+← or Command+Shift+H (Mac) or Ctrl+Shift+← or Ctrl+Shift+H (Windows/Linux) | 将卡片移动到最左侧列的顶部 | -| → | 将卡片移动到右侧列的底部 | -| Shift+→ or Shift+L | 将卡片移动到右侧列的顶部 | -| Command+→ or Command+L (Mac) or Ctrl+→ or Ctrl+L (Windows/Linux) | 将卡片移动到最右侧列的底部 | -| Command+Shift+→ or Command+Shift+L (Mac) or Ctrl+Shift+→ or Ctrl+Shift+L (Windows/Linux) | 将卡片移动到最右侧列的底部 | +| 键盘快捷键 | 描述 | +| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------- | +| Enter 或 Space | 开始移动聚焦的卡片 | +| Esc | 取消正在进行的移动 | +| Enter | 完成正在进行的移动 | +| ↓ 或 J | 向下移动卡片 | +| Command+↓ 或 Command+J (Mac) 或 Ctrl+↓ 或 Ctrl+J (Windows/Linux) | 将卡片移动到该列的底部 | +| ↑ 或 K | 向上移动卡片 | +| Command+↑ 或 Command+K (Mac) 或 Ctrl+↑ 或 Ctrl+K (Windows/Linux) | 将卡片移动到该列的顶部 | +| ← 或 H | 将卡片移动到左侧列的底部 | +| Shift+← 或 Shift+H | 将卡片移动到左侧列的顶部 | +| Command+← 或 Command+H (Mac) 或 Ctrl+← 或 Ctrl+H (Windows/Linux) | 将卡片移动到最左侧列的底部 | +| Command+Shift+← 或 Command+Shift+H (Mac) 或 Ctrl+Shift+← 或 Ctrl+Shift+H (Windows/Linux) | 将卡片移动到最左侧列的顶部 | +| → | 将卡片移动到右侧列的底部 | +| Shift+→ 或 Shift+L | 将卡片移动到右侧列的顶部 | +| Command+→ 或 Command+L (Mac) 或 Ctrl+→ 或 Ctrl+L (Windows/Linux) | 将卡片移动到最右侧列的底部 | +| Command+Shift+→ 或 Command+Shift+L (Mac) 或 Ctrl+Shift+→ 或 Ctrl+Shift+L (Windows/Linux) | 将卡片移动到最右侧列的底部 | ### 预览卡片 @@ -188,13 +189,13 @@ The {% data variables.product.prodname_command_palette %} also gives you quick a {% ifversion fpt or ghec %} ## {% data variables.product.prodname_actions %} -| 键盘快捷键 | 描述 | -| ---------------------------------------------------------------------------------------------------- | ----------------------- | -| Command+Space (Mac) or Ctrl+Space (Windows/Linux) | 在工作流程编辑器中，获取对工作流程文件的建议。 | -| G F | 转到工作流程文件 | -| Shift+T or T | 切换日志中的时间戳 | -| Shift+F or F | 切换全屏日志 | -| Esc | 退出全屏日志 | +| 键盘快捷键 | 描述 | +| --------------------------------------------------------------------------------------------------- | ----------------------- | +| Command+Space (Mac) 或 Ctrl+Space (Windows/Linux) | 在工作流程编辑器中，获取对工作流程文件的建议。 | +| G F | 转到工作流程文件 | +| Shift+T 或 T | 切换日志中的时间戳 | +| Shift+F 或 F | 切换全屏日志 | +| Esc | 退出全屏日志 | {% endif %} @@ -209,21 +210,21 @@ The {% data variables.product.prodname_command_palette %} also gives you quick a {% else %} -| 键盘快捷键 | 描述 | -| -------------------------------------------- | ----- | -| E or I or Y | 标记为已读 | -| Shift+M | 静音线程 | +| 键盘快捷键 | 描述 | +| ------------------------------------------ | ----- | +| E 或 I 或 Y | 标记为已读 | +| Shift+M | 静音线程 | {% endif %} ## 网络图 -| 键盘快捷键 | 描述 | -| ------------------------------------------------------------------------------------------ | ------ | -| ← or H | 向左滚动 | -| → or L | 向右滚动 | -| ↑ or K | 向上滚动 | -| ↓ or J | 向下滚动 | -| Shift+← (Mac) or Shift+H (Windows/Linux) | 一直向左滚动 | -| Shift+→ (Mac) or Shift+L (Windows/Linux) | 一直向右滚动 | -| Shift+↑ (Mac) or Shift+K (Windows/Linux) | 一直向上滚动 | -| Shift+↓ (Mac) or Shift+J (Windows/Linux) | 一直向下滚动 | +| 键盘快捷键 | 描述 | +| ----------------------------------------------------------------------------------------- | ------ | +| ← 或 H | 向左滚动 | +| → 或 L | 向右滚动 | +| ↑ 或 K | 向上滚动 | +| ↓ 或 J | 向下滚动 | +| Shift+← (Mac) 或 Shift+H (Windows/Linux) | 一直向左滚动 | +| Shift+→ (Mac) 或 Shift+L (Windows/Linux) | 一直向右滚动 | +| Shift+↑ (Mac) 或 Shift+K (Windows/Linux) | 一直向上滚动 | +| Shift+↓ (Mac) 或 Shift+J (Windows/Linux) | 一直向下滚动 | diff --git a/translations/zh-CN/content/get-started/using-github/troubleshooting-connectivity-problems.md b/translations/zh-CN/content/get-started/using-github/troubleshooting-connectivity-problems.md index 8be09ee86b26..eae6cfef1713 100644 --- a/translations/zh-CN/content/get-started/using-github/troubleshooting-connectivity-problems.md +++ b/translations/zh-CN/content/get-started/using-github/troubleshooting-connectivity-problems.md @@ -31,7 +31,7 @@ shortTitle: 连接问题 ## 切换克隆方法 -从通过 SSH 克隆切换到通过 HTTPS 克隆可改善连接，反之亦然。 For more information, see "[Troubleshooting cloning errors](/repositories/creating-and-managing-repositories/troubleshooting-cloning-errors)." +从通过 SSH 克隆切换到通过 HTTPS 克隆可改善连接，反之亦然。 更多信息请参阅“[排查克隆错误](/repositories/creating-and-managing-repositories/troubleshooting-cloning-errors)”。 如果您遇到 SSH 超时，请参阅“[错误：文件编号错误](/articles/error-bad-file-number)”。 diff --git a/translations/zh-CN/content/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/about-writing-and-formatting-on-github.md b/translations/zh-CN/content/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/about-writing-and-formatting-on-github.md index b885bb92a843..42498e68b06b 100644 --- a/translations/zh-CN/content/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/about-writing-and-formatting-on-github.md +++ b/translations/zh-CN/content/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/about-writing-and-formatting-on-github.md @@ -31,8 +31,8 @@ You can enable a fixed-width font in every comment field on {% data variables.pr  -{% data reusables.user_settings.access_settings %} -{% data reusables.user_settings.appearance-settings %} +{% data reusables.user-settings.access_settings %} +{% data reusables.user-settings.appearance-settings %} 1. Under "Markdown editor font preference", select **Use a fixed-width (monospace) font when editing Markdown**.  {% endif %} diff --git a/translations/zh-CN/content/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax.md b/translations/zh-CN/content/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax.md index b4eda913e5f6..36b9379e1051 100644 --- a/translations/zh-CN/content/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax.md +++ b/translations/zh-CN/content/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax.md @@ -85,7 +85,7 @@ git commit 更多信息请参阅“[创建和突出显示代码块](/articles/creating-and-highlighting-code-blocks)”。 -{% data reusables.user_settings.enabling-fixed-width-fonts %} +{% data reusables.user-settings.enabling-fixed-width-fonts %} ## 链接 diff --git a/translations/zh-CN/content/get-started/writing-on-github/working-with-advanced-formatting/creating-and-highlighting-code-blocks.md b/translations/zh-CN/content/get-started/writing-on-github/working-with-advanced-formatting/creating-and-highlighting-code-blocks.md index 0cdcb55e2000..4d2eceea1e87 100644 --- a/translations/zh-CN/content/get-started/writing-on-github/working-with-advanced-formatting/creating-and-highlighting-code-blocks.md +++ b/translations/zh-CN/content/get-started/writing-on-github/working-with-advanced-formatting/creating-and-highlighting-code-blocks.md @@ -46,7 +46,7 @@ Look! You can see my backticks.  -{% data reusables.user_settings.enabling-fixed-width-fonts %} +{% data reusables.user-settings.enabling-fixed-width-fonts %} ## 语法突显 diff --git a/translations/zh-CN/content/get-started/writing-on-github/working-with-advanced-formatting/organizing-information-with-tables.md b/translations/zh-CN/content/get-started/writing-on-github/working-with-advanced-formatting/organizing-information-with-tables.md index 7f4c8444b82f..31a98180ed54 100644 --- a/translations/zh-CN/content/get-started/writing-on-github/working-with-advanced-formatting/organizing-information-with-tables.md +++ b/translations/zh-CN/content/get-started/writing-on-github/working-with-advanced-formatting/organizing-information-with-tables.md @@ -40,7 +40,7 @@ shortTitle: 使用表格组织的数据  -{% data reusables.user_settings.enabling-fixed-width-fonts %} +{% data reusables.user-settings.enabling-fixed-width-fonts %} ## 格式化表格中的内容 diff --git a/translations/zh-CN/content/get-started/writing-on-github/working-with-saved-replies/creating-a-saved-reply.md b/translations/zh-CN/content/get-started/writing-on-github/working-with-saved-replies/creating-a-saved-reply.md index d1390d9113e1..abdfb5c737a1 100644 --- a/translations/zh-CN/content/get-started/writing-on-github/working-with-saved-replies/creating-a-saved-reply.md +++ b/translations/zh-CN/content/get-started/writing-on-github/working-with-saved-replies/creating-a-saved-reply.md @@ -12,8 +12,8 @@ versions: ghec: '*' --- -{% data reusables.user_settings.access_settings %} -{% data reusables.user_settings.saved_replies %} +{% data reusables.user-settings.access_settings %} +{% data reusables.user-settings.saved_replies %} 3. 在“Add a saved reply（添加已保存回复）”下，添加已保存回复的标题。  4. 在“Write（撰写 ）”字段中，添加要用于已保存回复的内容。 有关在 {% data variables.product.product_name %} 上撰写的更多信息，请参阅“[基本撰写和格式语法](/articles/basic-writing-and-formatting-syntax)”。  5. 要查看回复，请单击 **Preview（预览）**。  diff --git a/translations/zh-CN/content/get-started/writing-on-github/working-with-saved-replies/deleting-a-saved-reply.md b/translations/zh-CN/content/get-started/writing-on-github/working-with-saved-replies/deleting-a-saved-reply.md index 89c1697cd800..b90c8c03b05a 100644 --- a/translations/zh-CN/content/get-started/writing-on-github/working-with-saved-replies/deleting-a-saved-reply.md +++ b/translations/zh-CN/content/get-started/writing-on-github/working-with-saved-replies/deleting-a-saved-reply.md @@ -12,7 +12,7 @@ versions: ghec: '*' --- -{% data reusables.user_settings.access_settings %} -{% data reusables.user_settings.saved_replies %} +{% data reusables.user-settings.access_settings %} +{% data reusables.user-settings.saved_replies %} 3. 在“已保存回复”下，靠近要删除的已保存回复的位置，单击 {% octicon "x" aria-label="The X" %}。  diff --git a/translations/zh-CN/content/get-started/writing-on-github/working-with-saved-replies/editing-a-saved-reply.md b/translations/zh-CN/content/get-started/writing-on-github/working-with-saved-replies/editing-a-saved-reply.md index 285391c9d882..7b34ba58df56 100644 --- a/translations/zh-CN/content/get-started/writing-on-github/working-with-saved-replies/editing-a-saved-reply.md +++ b/translations/zh-CN/content/get-started/writing-on-github/working-with-saved-replies/editing-a-saved-reply.md @@ -13,8 +13,8 @@ versions: ghec: '*' --- -{% data reusables.user_settings.access_settings %} -{% data reusables.user_settings.saved_replies %} +{% data reusables.user-settings.access_settings %} +{% data reusables.user-settings.saved_replies %} 3. 使用位于要编辑已保存回复旁边的“Saved replies”（已保存回复），单击 {% octicon "pencil" aria-label="The pencil" %}。  4. 在“ Edit saved reply”（已保存回复）下，您可以编辑已保存回复的标题和内容。  diff --git a/translations/zh-CN/content/github-cli/github-cli/quickstart.md b/translations/zh-CN/content/github-cli/github-cli/quickstart.md index 8217f4e5ed36..a760363009aa 100644 --- a/translations/zh-CN/content/github-cli/github-cli/quickstart.md +++ b/translations/zh-CN/content/github-cli/github-cli/quickstart.md @@ -19,7 +19,7 @@ shortTitle: 快速入门 ## 入门指南 -1. [Install](https://github.com/cli/cli#installation) {% data variables.product.prodname_cli %} on macOS, Windows, or Linux. +1. 在 macOS、Windows 或 Linux 上[安装](https://github.com/cli/cli#installation) {% data variables.product.prodname_cli %}。 1. In the command line, authenticate to {% data variables.product.company_short %}. ```shell diff --git a/translations/zh-CN/content/github/copilot/about-github-copilot-telemetry.md b/translations/zh-CN/content/github/copilot/about-github-copilot-telemetry.md index abd6a29c2e64..b4592764f1d5 100644 --- a/translations/zh-CN/content/github/copilot/about-github-copilot-telemetry.md +++ b/translations/zh-CN/content/github/copilot/about-github-copilot-telemetry.md @@ -1,6 +1,6 @@ --- title: 关于 GitHub Copilot 遥测 -intro: '{% data variables.product.prodname_copilot %} collects and relies on additional telemetry data beyond what other {% data variables.product.company_short %} products and services collect.' +intro: '{% data variables.product.prodname_copilot %} 收集并依赖超出其他 {% data variables.product.company_short %} 产品和服务收集的额外遥测数据。' redirect_from: - /early-access/github/copilot/about-github-copilot-telemetry versions: @@ -9,20 +9,20 @@ versions: ## 哪些数据会被收集？ -Data collected is described in the "[{% data variables.product.prodname_copilot %} Telemetry Terms](/github/copilot/github-copilot-telemetry-terms)." In addition, the {% data variables.product.prodname_copilot %} extension/plugin collects activity from the user's Integrated Development Environment (IDE), tied to a timestamp, and metadata collected by the extension/plugin telemetry package. When used with Visual Studio Code, IntelliJ, NeoVIM, or other IDEs, {% data variables.product.prodname_copilot %} collects the standard metadata provided by those IDEs. +收集的数据在“[{% data variables.product.prodname_copilot %} 遥测术语](/github/copilot/github-copilot-telemetry-terms)”中进行了描述。 此外，{% data variables.product.prodname_copilot %} 扩展/插件从用户的集成开发环境 (IDE) 收集活动（绑定到时间戳）以及扩展/插件遥测包收集的元数据。 当与 Visual Studio Code、IntelliJ、NeoVIM 或其他 IDE 一起使用时，{% data variables.product.prodname_copilot %} 会收集这些 IDE 提供的标准元数据。 -## How the data is used by {% data variables.product.company_short %} +## {% data variables.product.company_short %} 如何使用数据 -{% data variables.product.company_short %} will use this data for: +{% data variables.product.company_short %} 会将这些数据用于： - 直接改进产品，包括评估处理中的不同策略，并预测用户可能认为有用的建议 -- Evaluating the product, e.g. by measuring the positive impact it has on the user -- Improving the underlying code generation models, e.g. by providing positive and negative examples (but always so that your private code is not used as input to suggest code for other users of {% data variables.product.prodname_copilot %}) +- 评估产品，例如通过衡量其对用户的积极影响 +- 改进基础代码生成模型，例如通过提供正面和负面示例（但始终不会将您的私有代码用作输入来为 {% data variables.product.prodname_copilot %} 的其他用户建议代码） - 引导密切相关的 {% data variables.product.company_short %} 产品 -- Investigating and detecting potential abuse of the {% data variables.product.prodname_copilot %} service -- Other purposes related to improving the {% data variables.product.prodname_copilot %} service, including sharing as described in the next section +- 调查和发现可能滥用 {% data variables.product.prodname_copilot %} 服务的情况 +- 与改进 {% data variables.product.prodname_copilot %} 服务相关的其他目的，包括下一节中所述的共享 ## 如何共享数据 -遥测数据安全地存储在 {% data variables.product.company_short %} 系统上，并进行了适当的加密。 We know user edit actions, source code snippets, and URLs of repositories and file paths are sensitive data. Consequently, access is strictly controlled. The data can only be accessed by (1) named {% data variables.product.company_short %} personnel (employees and contractors) working on the {% data variables.product.prodname_copilot %} team or on the {% data variables.product.company_short %} platform health team, (2) Microsoft personnel (employees and contractors) working on or with the Azure and/or {% data variables.product.prodname_copilot %} teams, and (3) employees of OpenAI who work on {% data variables.product.prodname_copilot %}. +遥测数据安全地存储在 {% data variables.product.company_short %} 系统上，并进行了适当的加密。 我们知道用户编辑操作、源代码片段以及存储库和文件路径的 URL 都是敏感数据。 因此，访问受到严格控制。 数据访问仅限于 (1) {% data variables.product.company_short %} 团队或 {% data variables.product.prodname_copilot %} 平台健康团队中指定的 {% data variables.product.company_short %} 人员（员工和承包商），(2) 在 Azure 和/或 {% data variables.product.prodname_copilot %} 团队工作或与之合作的 Microsoft 人员（员工和承包商），以及 (3) 在 {% data variables.product.prodname_copilot %} 上工作的 OpenAI 员工。 diff --git a/translations/zh-CN/content/github/copilot/index.md b/translations/zh-CN/content/github/copilot/index.md index 2e967d1c261c..efd582e924e2 100644 --- a/translations/zh-CN/content/github/copilot/index.md +++ b/translations/zh-CN/content/github/copilot/index.md @@ -1,6 +1,6 @@ --- title: GitHub Copilot -intro: 'You can use {% data variables.product.prodname_dotcom %} Copilot to assist with your programming in your editor' +intro: '您可以使用 {% data variables.product.prodname_dotcom %} Copilot 帮助您在编辑器中的编程' versions: fpt: '*' children: diff --git a/translations/zh-CN/content/github/copilot/research-recitation.md b/translations/zh-CN/content/github/copilot/research-recitation.md index cf4188c1f874..ced0724918c4 100644 --- a/translations/zh-CN/content/github/copilot/research-recitation.md +++ b/translations/zh-CN/content/github/copilot/research-recitation.md @@ -57,9 +57,9 @@ r'^\s+\d+\s+\d+\s+\d+\s+\d+\s+\d+\s+\d+\s+\d+\s+\d+\s+\d+\s+\d+\s+\d+\s+\d+\s+\d 过滤后还剩下 473 条建议。 但它们的表现形式非常不同： 1. 有些基本上只是重复另一个通过了过滤的案例。 例如，有时 {% data variables.product.prodname_dotcom %} Copilot 提出建议，开发人员键入一个评论行，然后 {% data variables.product.prodname_dotcom %} Copilot 再次提供一个非常相似的建议。 我从分析中删除了这些作为重复项的案例。 -2. 有些是长而重复的序列。 Like the following example, where the repeated blocks of `‘
’` are of course found somewhere in the training set:
Such suggestions can be helpful (test cases, regular expressions) or not helpful (like this case, I suspect). 但无论如何，它们并不符合我开始调查时所想到的死记硬背学习的想法。
+2. 有些是长而重复的序列。 像下面的示例一样，在培训集的某个地方当然可以找到重复的 `‘
’` 块 ：
这样的建议可能会有所帮助（测试案例、正则表达式）或没有帮助（像本案例，我怀疑）。 但无论如何，它们并不符合我开始调查时所想到的死记硬背学习的想法。
3. 有些是标准库存，如自然数字、质数、股市股票代码或希腊字母：
-4. 有些是常见的、直接的方式，甚至是普遍的方式，以很少的自然自由度做事。 For example, the middle part of the following strikes me as very much the standard way of using the BeautifulSoup package to parse a Wikipedia list. 事实上， 在 {% data variables.product.prodname_dotcom %} Copilot 的培训数据[5](#footnote5) 中找到的最佳匹配片段使用这种代码解析不同的文章，并继续根据结果做不同的事情。
这也不符合我对引文的想法。 这有点像有人说“我要把垃圾拿出来；我很快就会回来的”— 这是事实陈述，不是引文，尽管这句话以前已经说过很多次了。
+4. 有些是常见的、直接的方式，甚至是普遍的方式，以很少的自然自由度做事。 例如， 下面的中间部分触发了我使用 BeautifulSoup 包解析维基百科列表的标准方法。 事实上， 在 {% data variables.product.prodname_dotcom %} Copilot 的培训数据[5](#footnote5) 中找到的最佳匹配片段使用这种代码解析不同的文章，并继续根据结果做不同的事情。
这也不符合我对引文的想法。 这有点像有人说“我要把垃圾拿出来；我很快就会回来的”— 这是事实陈述，不是引文，尽管这句话以前已经说过很多次了。
5. 然后还有所有其他情况。 代码或评论中至少有一些特定重叠。 这些是我最感兴趣的，也是我从现在开始要集中精力的。
此存储桶必须有一些边缘案例[6](#footnote6)，并且您的里程可能因您认为应分类的方式而有所不同。 也许你甚至一开始就不同意整套存储桶。
diff --git a/translations/zh-CN/content/github/site-policy/github-terms-for-additional-products-and-features.md b/translations/zh-CN/content/github/site-policy/github-terms-for-additional-products-and-features.md
index 51a77368d1d9..3a665edfdc08 100644
--- a/translations/zh-CN/content/github/site-policy/github-terms-for-additional-products-and-features.md
+++ b/translations/zh-CN/content/github/site-policy/github-terms-for-additional-products-and-features.md
@@ -16,19 +16,19 @@ topics:
通过使用附加产品和特性，您也同意下面列出的适用的 GitHub 条款。 违反 GitHub 关于附加产品和特性的条款便是违反协议。 在本文未定义的任何大写术语采用“协议”中的含义。
**对于企业用户**
-- **GitHub Enterprise Cloud** users may have access to the following Additional Products and Features: Actions, Advanced Security, Advisory Database, Codespaces, Dependabot Preview, GitHub Enterprise Importer, Learning Lab, Packages, and Pages.
+- **GitHub Enterprise Cloud** 用户可以访问以下附加产品和特性：Actions、Advanced Security、Advisory Database、Codespaces、Dependabot Preview、GitHub Enterprise Importer、Learning Lab、Packages 和 Pages。
-- **GitHub Enterprise Server** users may have access to the following Additional Products and Features: Actions, Advanced Security, Advisory Database, Connect, Dependabot Preview, GitHub Enterprise Importer, Learning Lab, Packages, Pages, and SQL Server Images.
+- **GitHub Enterprise Server** 用户可以访问以下附加产品和特性：Actions、Advanced Security、Advisory Database、Connect、Dependabot Preview、GitHub Enterprise Importer、Learning Lab、Packages、Pages 和 SQL Server Images。
-- **GitHub AE** users may have access to the following Additional Products and Features: Actions, Advanced Security, Advisory Database, Connect, Dependabot Preview, GitHub Enterprise Importer, Packages and Pages.
+- **GitHub AE** 用户可以访问以下附加产品和特性：Actions、Advanced Security、Advisory Database、Connect、Dependabot Preview、GitHub Enterprise Importer、Packages 和 Pages。
## 操作
GitHub Actions 使您能够直接在您的 GitHub 仓库中创建自定义软件开发生命周期工作流程。 Actions 按使用情况计费。 [Actions 文档](/actions)包含详细信息，包括计算和存储量（取决于您的帐户计划）以及如何监控您的 Actions 分钟使用和设置使用限制。
-对 Actions 和任何 Action 产品或服务元素的使用，不得违反协议、[GitHub 可接受使用政策](/github/site-policy/github-acceptable-use-policies)或 [Actions 文档](/actions/reference/usage-limits-billing-and-administration)规定的 GitHub Actions 服务限制。 Additionally, regardless of whether an Action is using self-hosted runners, Actions should not be used for:
+对 Actions 和任何 Action 产品或服务元素的使用，不得违反协议、[GitHub 可接受使用政策](/github/site-policy/github-acceptable-use-policies)或 [Actions 文档](/actions/reference/usage-limits-billing-and-administration)规定的 GitHub Actions 服务限制。 此外，无论操作是否使用自托管运行器，操作都不应用于：
- 密码破解;
-- disrupting, gaining, or attempting to gain unauthorized access to, any service, device, data, account, or network (other than those authorized by the [GitHub Bug Bounty program](https://bounty.github.com));
-- the provision of a stand-alone or integrated application or service offering the Actions product or service, or any elements of the Actions product or service, for commercial purposes;
+- 破坏、获取或试图未经授权而访问任何服务、设备、数据、帐户或网络（ [GitHub Bug 赏金计划](https://bounty.github.com)授权的除外）;
+- 为商业目的提供独立或集成的应用程序或服务，提供 Actions 产品或服务，或者 Actions 产品或服务的任何元素；
- 任何给我们的服务器带来负担的活动，如果这种负担与提供给用户的收益不成比例（例如，不要将 Action 用作内容交付网络或作为无服务器应用程序的一部分，但收益低负担也低的 Action 可能没问题）；或
- 如果使用 GitHub 托管的运行器，与使用 GitHub Actions 的仓库相关的软件项目创建、测试、部署或发布无关的任何其他活动。
@@ -52,26 +52,26 @@ _GitHub Advisory Database 的许可_
GitHub Advisory Database 的许可采用[知识共享署名 4.0 许可](https://creativecommons.org/licenses/by/4.0/)原则。 有关署名条款，请参阅
@@ -299,13 +299,13 @@ on:
-Uses the tibdex/github-app-token action to generate an installation access token for your app from the app ID and private key. The installation access token is accessed later in the workflow as
@@ -335,7 +335,7 @@ env:
为此步骤设置环境变量。
{% raw %}${{ steps.generate_token.outputs.token }}{% endraw %}.
+使用 tibdex/github-app-token action 从应用 ID 和私钥为应用生成安装访问令牌。 稍后在工作流程中以s {% raw %}${{ steps.generate_token.outputs.token }}{% endraw %} 的形式访问安装访问令牌。
-Replace APP_ID with the name of the secret that contains your app ID.
+将 APP_ID 替换为包含应用 ID 的密钥的名称。
-Replace APP_PEM with the name of the secret that contains your app private key.
+将 APP_PEM 替换为包含应用私钥的机密的名称。
-If you are using a personal access token, replace YOUR_TOKEN with the name of the secret that contains your personal access token.
+如果使用的是个人访问令牌，请将 YOUR_TOKEN 替换为包含个人访问令牌的机密的名称。
将 YOUR_ORGANIZATION 替换为组织名称。 例如 octo-org。
diff --git a/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/best-practices-for-managing-projects.md b/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/best-practices-for-managing-projects.md
index 71655dc73ce3..34b798f1b357 100644
--- a/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/best-practices-for-managing-projects.md
+++ b/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/best-practices-for-managing-projects.md
@@ -27,19 +27,19 @@ topics:
议题和拉取请求包括内置功能，让您轻松地与协作者沟通。 使用@提及提醒个人或整个团队注意评论。 指派议题协作者负责沟通。 链接到相关的议题或拉取请求以沟通它们是如何连接的。
-## Make use of the description and README
+## 使用描述和 README
-Use your project's description and README to share information about the project.
+使用您的项目描述和 README 来分享有关该项目的信息。
例如：
-- Explaining the purpose of the project.
-- Describing the project views and how to use them.
-- Including relevant links and people to contact for more information.
+- 解释项目的目的。
+- 描述项目视图及其使用方法。
+- 包括相关链接和要联系的人员以获取更多信息。
-Project READMEs support Markdown which allows you to use images and advanced formatting such as links, lists, and headers.
+项目 README 支持 Markdown，它允许您使用图像和高级格式，如链接、列表和标题。
-For more information, see "[Creating a project (beta)](/issues/trying-out-the-new-projects-experience/creating-a-project#updating-your-project-description-and-readme)."
+更多信息请参阅“[创建项目（测试版）](/issues/trying-out-the-new-projects-experience/creating-a-project#updating-your-project-description-and-readme)”。
## 使用视图
@@ -48,7 +48,7 @@ For more information, see "[Creating a project (beta)](/issues/trying-out-the-ne
例如：
- 按状态过滤以查看所有未启动的项
-- Group by a custom priority field to monitor the volume of high priority items
+- 按自定义优先级字段分组以监控高优先级项目的数量
- 按自定义日期字段排序，以查看具有最早目标运输日期的物品
更多信息请参阅“[自定义项目视图](/issues/trying-out-the-new-projects-experience/customizing-your-project-views)”。
@@ -61,22 +61,22 @@ For more information, see "[Creating a project (beta)](/issues/trying-out-the-ne
## 使用自动化
-You can automate tasks to spend less time on busy work and more time on the project itself. 需要手动操作的越少，项目就越有可能保持最新状态。
+您可以自动执行任务，以减少您在繁琐工作上花费的时间，将更多的时间用于项目本身。 需要手动操作的越少，项目就越有可能保持最新状态。
-Projects (beta) offers built-in workflows. For example, when an issue is closed, you can automatically set the status to "Done."
+项目（测试版）提供内置工作流程。 例如，当议题关闭时，您可以自动将状态设置为“完成”。
-Additionally, {% data variables.product.prodname_actions %} and the GraphQL API enable you to automate routine project management tasks. For example, to keep track of pull requests awaiting review, you can create a workflow that adds a pull request to a project and sets the status to "needs review"; this process can be automatically triggered when a pull request is marked as "ready for review."
+此外，{% data variables.product.prodname_actions %} 和 GraphQL API 还可让您实现例行项目管理任务自动化。 例如，要跟踪等待审查的拉取请求，您可以创建一个工作流程，将拉取请求添加到项目并将状态设置为“需要审核”；当拉取请求标记为“准备审核”时，可以自动触发此过程。
- 有关示例工作流程，请参阅“[自动化项目](/issues/trying-out-the-new-projects-experience/automating-projects)”。
- 有关 API 的更多信息，请参阅“[使用 API 管理项目](/issues/trying-out-the-new-projects-experience/using-the-api-to-manage-projects)”。
- 有关 {% data variables.product.prodname_actions %} 的更多信息，请参阅[“{% data variables.product.prodname_actions %}](/actions)”。
-## Use different field types
+## 使用不同的字段类型
-Take advantage of the various field types to meet your needs.
+利用各种字段类型来满足您的需求。
-Use an iteration field to schedule work or create a timeline. You can group by iteration to see if items are balanced between iterations, or you can filter to focus on a single iteration. Iteration fields also let you view work that you completed in past iterations, which can help with velocity planning and reflecting on your team's accomplishments.
+使用迭代字段可以安排工作或创建日程表。 您可以按迭代进行分组以查看项目在迭代之间是否平衡，也可以进行筛选以专注于单个迭代。 迭代字段还允许您查看在过去迭代中完成的工作，这有助于快速规划和反映团队的成就。
-Use a single select field to track information about a task based on a preset list of values. For example, track priority or project phase. Since the values are selected from a preset list, you can easily group or filter to focus on items with a specific value.
+使用单选字段可以根据预设的值列表跟踪有关任务的信息。 例如，跟踪优先级或项目阶段。 由于这些值是从预设列表中选择的，因此您可以轻松地对值进行分组或筛选，以将焦点放在具有特定值的项目上。
-For more information about the different field types, see "[Creating a project (beta)](/issues/trying-out-the-new-projects-experience/creating-a-project#adding-custom-fields)."
+有关不同字段类型的详细信息，请参阅“[创建项目（测试版）](/issues/trying-out-the-new-projects-experience/creating-a-project#adding-custom-fields)。
diff --git a/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/creating-a-project.md b/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/creating-a-project.md
index 1ab30e4b91dd..887dcce2d18d 100644
--- a/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/creating-a-project.md
+++ b/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/creating-a-project.md
@@ -17,15 +17,15 @@ topics:
## 创建项目
-### Creating an organization project
+### 创建组织项目
{% data reusables.projects.create-project %}
-### Creating a user project
+### 创建用户项目
{% data reusables.projects.create-user-project %}
-## Updating your project description and README
+## 更新项目描述和 README
{% data reusables.projects.project-description %}
@@ -39,13 +39,13 @@ topics:
1. 将光标放在项目底部一行，{% octicon "plus" aria-label="plus icon" %} 的旁边。
1. 输入您的想法，然后按 **Enter**。
-1. To add body text, click on the title of the draft issue. In the markdown input box that appears, enter the text for the draft issue body, then click **Save**.
+1. 要添加正文文本，请单击草稿议题的标题。 在出现的 Markdown 输入框中，输入草稿正文的文本，然后单击 **Save（保存）**。
-Draft issues can have a title, text body, assignees, and any custom fields from your project. In order to populate the repository, labels, or milestones for a draft issue, you must first convert the draft issue to an issue. For more information, see "[Converting draft issues to issues](#converting-draft-issues-to-issues)."
+草稿议题可以具有标题、文本正文、受理人以及项目中的任何自定义字段。 为了填充草稿议题的存储库、标签或里程碑，必须首先将草稿问题转换为议题。 更多信息请参阅“[将草稿议题转换为议题](#converting-draft-issues-to-issues)”。
{% note %}
-**Note**: Users will not receive notifications when they are assigned to or mentioned in a draft issue unless the draft issue is converted to an issue.
+**注意**：用户在草稿议题中被分配或提及时不会收到通知，除非草稿议题已转换为议题。
{% endnote %}
@@ -59,7 +59,7 @@ Draft issues can have a title, text body, assignees, and any custom fields from
#### 搜索议题或拉取请求
1. 将光标放在项目底部一行，{% octicon "plus" aria-label="plus icon" %} 的旁边。
-2. Enter #.
+2. 输入 #。
3. 选择拉取请求或议题所在的仓库。 您可以输入仓库名称的一部分来缩小选项范围。
4. 选择议题或拉取请求。 您可以键入标题的一部分以缩小选项范围。
@@ -72,37 +72,37 @@ Draft issues can have a title, text body, assignees, and any custom fields from
-## Converting draft issues to issues
+## 将草稿议题转换为议题
-In table layout:
+在表格布局中：
-1. Click the {% octicon "triangle-down" aria-label="the item menu" %} on the draft issue that you want to convert.
-2. Select **Convert to issue**.
-3. Select the repository that you want to add the issue to.
-4. Alternatively, edit the `labels`, `milestone`, or `repository` fields of the draft issue that you want to convert.
+1. 在要转换的草稿议题上单击 {% octicon "triangle-down" aria-label="the item menu" %}。
+2. 选择 **Convert to issue（转换为议题）**。
+3. 选择要将议题添加到的存储库。
+4. 或者，编辑要转换的草稿议题的 `labels`、`milestone` 或 `repository` 字段。
-In board layout:
+在板布局中：
-1. Click the {% octicon "kebab-horizontal" aria-label="the item menu" %} on the draft issue that you want to convert.
-2. Select **Convert to issue**.
-3. Select the repository that you want to add the issue to.
+1. 在要转换的草稿议题上单击 {% octicon "kebab-horizontal" aria-label="the item menu" %}。
+2. 选择 **Convert to issue（转换为议题）**。
+3. 选择要将议题添加到的存储库。
-## Removing items from your project
+## 从项目中删除项
-You can archive an item to keep the context about the item in the project but remove it from the project views. You can delete an item to remove it from the project entirely.
+您可以对项存档以保留项目中有关该项的上下文，但将其从项目视图中移除。 您可以删除某个项以将其从项目中完全移除。
-1. Select the item(s) to archive or delete. To select multiple items, do one of the following:
- - Command+Click (Mac) or Ctrl+Click (Windows/Linux) each item.
- - Select an item then Shift+↑ or Shift+↓ to select additional items above or below the initially selected item.
- - Select an item then Shift+Click another item to select all items between the two items.
- - Enter Command+A (Mac) or Ctrl+A (Windows/Linux) to select all items in a column in a board layout or all items in a table layout.
-2. To archive all selected items, enter E. To delete all selected items, enter Del. Alternatively, select the {% octicon "triangle-down" aria-label="the item menu" %} (in table layout) or the {% octicon "kebab-horizontal" aria-label="the item menu" %} (in board layout), then select the desired action.
+1. 选择要存档或删除的项。 要选择多个项，请执行下列操作之一：
+ - Command+点击 (Mac) 或 Ctrl+点击 (Windows/Linux) 每个项。
+ - 选择一个项，然后按 Shift+↑ 或 Shift+↓ 以选择最初所选项上方或下方的其他项。
+ - 选择一个项，然后 Shift+点击另一个项以选择两个项之间的所有项。
+ - 输入 Command+A (Mac) 或 Ctrl+A (Windows/Linux) 以选择板布局中列中的所有项或表格布局中的所有项。
+2. 要存档所有选定项，请输入 E。 要删除所有选定项，请输入 Del。 或者，选择 {% octicon "triangle-down" aria-label="the item menu" %}（在表格布局中）或 {% octicon "kebab-horizontal" aria-label="the item menu" %} （在板布局中），然后选择所需的操作。
-You can restore archived items but not deleted items. For more information, see [Restoring archived items](#restoring-archived-items).
+您可以恢复已存档的项，但不能恢复已删除的项。 更多信息请参阅“[恢复存档的项](#restoring-archived-items)”。
-## Restoring archived items
+## 恢复存档的项
-To restore an archived item, navigate to the issue or pull request. In the project side bar on the issue or pull request, click **Restore** for the project that you want to restore the item to. Draft issues cannot be restored.
+要恢复存档的项，请导航到议题或拉取请求。 在议题或拉取请求的项目侧栏中，对要将项还原到的项目单击 **Restore（恢复）**。 草稿议题无法恢复。
## 添加字段
@@ -110,7 +110,7 @@ To restore an archived item, navigate to the issue or pull request. In the proje
### 显示现有字段
-Your project tracks up-to-date information about issues and pull requests, including any changes to the title, assignees, labels, milestones, repository, reviewers, and linked pull requests. 当项目初始化时，会显示“标题”和“受理人”；其他字段隐藏。 您可以更改项目中这些字段的可见性。
+您的项目跟踪有关议题和拉取请求的最新信息，包括对标题、受理人、标签、里程碑、存储库、审阅者和链接的拉取请求所做的任何更改。 当项目初始化时，会显示“标题”和“受理人”；其他字段隐藏。 您可以更改项目中这些字段的可见性。
1. {% data reusables.projects.open-command-palette %}
2. 开始键入 "show"。
@@ -125,50 +125,50 @@ Your project tracks up-to-date information about issues and pull requests, inclu
您可以添加自定义字段到项目。 自定义字段将显示在项目中议题和拉取请求的侧栏。
-Custom fields can be text, number, date, single select, or iteration:
+自定义字段可以是文本、数字、日期、单选或迭代：
-- Text: The value can be any text.
-- Number: The value must be a number.
-- Date: The value must be a date.
-- Single select: The value must be selected from a set of specified values.
-- Iteration: The value must be selected from a set of date ranges (iterations). Iterations in the past are automatically marked as "completed", and the iteration covering the current date range is marked as "current".
+- 文本：值可以是任何文本。
+- 数字：值必须是数字。
+- 日期：值必须是日期。
+- 单选：必须从一组指定的值中选择值。
+- 迭代：必须从一组日期范围（迭代）中选择值。 过去的迭代将自动标记为“已完成”，覆盖当前日期范围的迭代将标记为“当前”。
1. {% data reusables.projects.open-command-palette %} 开始输入 "Create new field" 的任何部分。 当 "Create new field" 显示在命令板中时，选择它。
2. 或者，单击最右侧字段标题中的 {% octicon "plus" aria-label="the plus icon" %} 。 将显示带有项目字段的下拉菜单。 单击 **New field（新建字段）**。
3. 将显示一个弹出窗口，供您输入有关新字段的信息。 
4. 在文本框中，输入新字段的名称。
5. 选择下拉菜单并点击所需的类型。
-6. If you specified **Single select** as the type, enter the options.
-7. If you specified **Iteration** as the type, enter the start date of the first iteration and the duration of the iteration. Three iterations are automatically created, and you can add additional iterations on the project's settings page.
+6. 如果您指定**单选**为类型，请输入选项。
+7. 如果指定**迭代**为类型，请输入第一个迭代的开始日期和迭代的持续时间。 将自动创建三个迭代，您可以在项目的设置页上添加其他迭代。
-You can later edit the drop down options for single select and iteration fields.
+您可以稍后编辑单选和迭代字段的下拉选项。
{% data reusables.projects.project-settings %}
-1. Under **Fields**, select the field that you want to edit.
-1. For single select fields, you can add, delete, or reorder the options.
-2. For iteration fields, you can add or delete iterations, change iteration names, and change the start date and duration of the iteration.
+1. 在 **Fields（字段）**下，选择要编辑的字段。
+1. 对于单选字段，您可以添加、删除或重新排序选项。
+2. 对于迭代字段，您可以添加或删除迭代、更改迭代名称以及更改迭代的开始日期和持续时间。
-## Customizing your views
+## 自定义视图
您可以将项目视为表格或板、按字段对项分组、筛选项，等等。 更多信息请参阅“[自定义项目（测试版）视图](/issues/trying-out-the-new-projects-experience/customizing-your-project-views)”。
-## Configuring built-in automation
+## 配置内置自动化
{% data reusables.projects.about-workflows %}
-You can enable or disable the built-in workflows for your project.
+您可以为项目启用或禁用内置工作流程。
{% data reusables.projects.enable-basic-workflow %}
-## Adding your project to a repository
+## 将项目添加到存储库
-You can list relevant projects in a repository. You can only list projects that are owned by the same user or organization that owns the repository.
+您可以在存储库中列出相关项目。 您只能列出由拥有存储库的同一用户或组织拥有的项目。
-In order for repository members to see a project listed in a repository, they must have visibility for the project. For more information, see "[Managing the visibility of your projects (beta)](/issues/trying-out-the-new-projects-experience/managing-the-visibility-of-your-projects)" and "[Managing access to projects (beta)](/issues/trying-out-the-new-projects-experience/managing-access-to-projects)."
+为了使存储库成员能够看到存储库中列出的项目，他们必须具有项目的可见性。 更多信息请参阅“[管理项目（测试版）的可见性](/issues/trying-out-the-new-projects-experience/managing-the-visibility-of-your-projects)”和“[管理对项目（测试版）的访问](/issues/trying-out-the-new-projects-experience/managing-access-to-projects)”。
-1. On {% data variables.product.prodname_dotcom %}, navigate to the main page of your repository.
+1. 在 {% data variables.product.prodname_dotcom %} 上，导航到仓库的主页面。
1. 单击 {% octicon "table" aria-label="the project icon" %} **Projects（项目）**。
-1. Click **Projects (Beta)** in the side bar.
-1. Click **Add project**.
-1. In the search bar that appears, search for projects that are owned by the same user or organization that owns the repository.
-1. Click on a project to list it in your repository.
+1. 单击侧栏中的**项目（测试版）**。
+1. 单击 **Add project（添加项目）**。
+1. 在显示的搜索栏中，搜索由拥有存储库的同一用户或组织拥有的项目。
+1. 单击某个项目以将其列在您的存储库中。
diff --git a/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/customizing-your-project-views.md b/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/customizing-your-project-views.md
index 6e99134b6b40..e6cf5b76161c 100644
--- a/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/customizing-your-project-views.md
+++ b/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/customizing-your-project-views.md
@@ -12,66 +12,66 @@ topics:
{% data reusables.projects.projects-beta %}
-## Project command palette
+## 项目命令面板
-Use the project command palette to quickly change settings and run commands in your project.
+使用项目命令面板快速更改项目中的设置并运行命令。
1. {% data reusables.projects.open-command-palette %}
2. 开始键入命令的任何部分或浏览命令面板窗口以查找命令。 更多命令示例请参阅下面的章节。
-## Changing the project layout
+## 更改项目布局
您可以将项目视为表或板。
1. {% data reusables.projects.open-command-palette %}
2. 开始键入 "Switch layout"。
-3. Choose the required command. For example, **Switch layout: Table**.
+3. 选择所需的命令。 例如 **Switch layout: Table**。
-Alternatively, click {% octicon "triangle-down" aria-label="the drop-down icon" %} next to a view name and click **Table** or **Board**.
+或者，单击视图名称旁边的 {% octicon "triangle-down" aria-label="the drop-down icon" %} ，然后单击 **Table（表）**或 **Board（板）**。
-## Showing and hiding fields
+## 显示和隐藏字段
-You can show or hide a specific field.
+您可以显示或隐藏特定字段。
-### Showing and hiding fields in table layout
+### 在表格布局中显示和隐藏字段
1. {% data reusables.projects.open-command-palette %}
2. 开始键入要执行的操作（"show" 或 "hide"）或字段名称。
-3. Choose the required command. For example, **Show: Milestone**.
+3. 选择所需的命令。 例如 **Show: Milestone**。
或者，单击表格右侧的 {% octicon "plus" aria-label="the plus icon" %}。 在显示的下拉菜单中，指示要显示或隐藏哪些字段。 {% octicon "check" aria-label="check icon" %} 指示显示哪些字段。
-Alternatively, click {% octicon "triangle-down" aria-label="the drop-down icon" %} next to the field name and click **Hide field**.
+或者，单击字段名称旁边的 {% octicon "triangle-down" aria-label="the drop-down icon" %} ，然后单击 **Hide field（隐藏字段）**。
-### Showing and hiding fields in board layout
+### 在板布局中显示和隐藏字段
-1. Click {% octicon "triangle-down" aria-label="the drop-down icon" %} next to the view name.
-2. Under **configuration**, click {% octicon "list-unordered" aria-label="the unordered list icon" %}.
-3. In the menu that's displayed, select fields to add them and deselect fields to remove them from the view.
+1. 单击视图名称旁边的 {% octicon "triangle-down" aria-label="the drop-down icon" %}。
+2. 在 **configuration（配置）**下，单击 {% octicon "list-unordered" aria-label="the unordered list icon" %}。
+3. 在显示的菜单中，选择字段可添加它们，取消选择字段则将其从视图中移除。
-## Reordering fields
+## 对字段重新排序
您可以更改字段的顺序。
1. 单击字段标题。
-2. While clicking, drag the field to the required location.
+2. 点击时，将字段拖到所需位置。
-## Reordering rows
+## 对行重新排序
在表布局中，您可以更改行的顺序。
1. 点击行开头的数字。
-2. While clicking, drag the row to the required location.
+2. 点击时，将行拖到所需位置。
-## Sorting by field values
+## 按字段值排序
在表布局中，您可以按字段值排序项。
1. {% data reusables.projects.open-command-palette %}
2. 开始键入 "Sort by" 或您想要排序的字段的名称。
-3. Choose the required command. For example, **Sort by: Assignees, asc**.
+3. 选择所需的命令。 例如 **Sort by: Assignees, asc**。
-Alternatively, click {% octicon "triangle-down" aria-label="the drop-down icon" %} next to the field name that you want to sort by and click **Sort ascending** or **Sort descending**.
+或者，单击您要排序的字段名称旁边的 {% octicon "triangle-down" aria-label="the drop-down icon" %}，然后单击 **Sort ascending（升序排序）**或 **Sort descending（降序排序）**。
{% note %}
@@ -83,123 +83,123 @@ Alternatively, click {% octicon "triangle-down" aria-label="the drop-down icon"
1. {% data reusables.projects.open-command-palette %}
2. 开始键入 "Remove sort-by"。
-3. Choose **Remove sort-by**.
+3. 选择 **Remove sort-by（删除排序依据）**。
-Alternatively, click {% octicon "triangle-down" aria-label="the drop-down icon" %} next to the view name and click the menu item that indicates the current sort.
+或者，单击视图名称旁边的 {% octicon "triangle-down" aria-label="the drop-down icon" %} ，然后单击指示当前排序的菜单项。
-## Grouping by field values in table layout
+## 在表布局中按字段值分组
-In the table layout, you can group items by a custom field value. 对项分组时，如果将项拖动到新组，则应用该组的值。 For example, if you group by "Status" and then drag an item with a status of `In progress` to the `Done` group, the status of the item will switch to `Done`. Similarly, when you add a new item to a group, the new item is populated with the value of the group.
+在表布局中，您可以按自定义字段值排序组项。 对项分组时，如果将项拖动到新组，则应用该组的值。 例如， 如果您是按“状态”分组，然后将一个状态为 `In progress` 的项拖动到 `Done` 组，则该项的状态将切换到 `Done`。 同样，当您向组添加新项时，新项将使用组的值填充。
{% note %}
-**Note:** Currently, you cannot group by title, labels, reviewers, or linked pull requests.
+**注意：**目前，您无法按标题、标签、审阅者或链接的拉取请求进行分组。
{% endnote %}
1. {% data reusables.projects.open-command-palette %}
2. 开始键入 "Group by" 或您想要分组的字段的名称。
-3. Choose the required command. For example, **Group by: Status**.
+3. 选择所需的命令。 例如 **Group by: Status**。
-Alternatively, click {% octicon "triangle-down" aria-label="the drop-down icon" %} next to the field name that you want to group by and click **Group by values**.
+或者，单击要作为分组依据的字段名称旁边的 {% octicon "triangle-down" aria-label="the drop-down icon" %} ，然后单击 **Group by values（按值分组）**。
按照类似步骤删除分组。
1. {% data reusables.projects.open-command-palette %}
2. 开始键入 "Remove group-by"。
-3. Choose **Remove group-by**.
+3. 选择 **Remove group-by（删除分组依据）**。
-Alternatively, click {% octicon "triangle-down" aria-label="the drop-down icon" %} next to the view name and click the menu item that indicates the current grouping.
+或者，选择视图名称旁边的 {% octicon "triangle-down" aria-label="the drop-down icon" %}，然后单击显示当前分组的菜单项。
-## Setting the column field in board layout
+## 在板布局中设置列字段
-In the board layout, you choose any single select or iteration field for your columns. If you drag an item to a new column, the value of that column is applied to the dragged item. For example, if you use the "Status" field for your board columns and then drag an item with a status of `In progress` to the `Done` column, the status of the item will switch to `Done`.
+在板布局中，您可以为列选择任何单选或迭代字段。 如果将某个项拖到新列，则该列的值将应用于拖动的项。 例如，如果对板列使用“Status（状态）”字段，然后将状态为 `In progress` 的项拖到 `Done` 列，则该项的状态将切换到 `Done`。
1. {% data reusables.projects.open-command-palette %}
-1. Start typing "Column field by" or the name of the field you want to use for your columns.
-1. Choose the required command. For example, **Column field by: Status**.
+1. 开始键入 "Column field by" 或您想要用于列的字段名称。
+1. 选择所需的命令。 例如 **Column field by: Status**。
-Alternatively, click {% octicon "triangle-down" aria-label="the drop-down icon" %} next to the board view that you want to modify and click {% octicon "columns" aria-label="the column icon" %} **Column field**. Then select the field that you want to use for the board columns.
+或者，单击要修改的板视图旁边的 {% octicon "triangle-down" aria-label="the drop-down icon" %} ，然后单击 {% octicon "columns" aria-label="the column icon" %} **Column field（列字段）**。 然后选择要用于板列的字段。
-## Filtering items
+## 过滤项
-Click {% octicon "filter" aria-label="the filter icon" %} at the top of the table to show the "Filter by keyword or by field" bar. Start typing the field name and value that you want to filter by. 当您输入时，可能的值将会出现。
+点击表格顶部的 {% octicon "filter" aria-label="the filter icon" %} 以显示“Filter by keyword or by field（按关键字或字段过滤）”列。 开始键入要过滤的字段名称和值。 当您输入时，可能的值将会出现。
-- To filter for multiple values, separate the values with a comma. For example `label:"good first issue",bug` will list all issues with a label `good first issue` or `bug`.
-- To filter for the absence of a specific value, place `-` before your filter. For example, `-label:"bug"` will only show items that do not have the label `bug`.
-- To filter for the absence of all values, enter `no:` followed by the field name. For example, `no:assignee` will only show items that do not have an assignee.
-- To filter by state, enter `is:`. For example, `is: issue` or `is:open`.
-- 多个过滤条件之间用逗号分隔。 For example, `status:"In progress" -label:"bug" no:assignee` will show only items that have a status of `In progress`, do not have the label `bug`, and do not have an assignee.
-- To filter for the current iteration of an iteration field, use `@current`. For example, `sprint:@current`.
+- 要过滤多个值，请用逗号分隔值。 例如， `label:"good first issue",bug` 将列出标签为 `good first issue` 或 `bug` 的所有议题。
+- 要过滤缺少特定值的字段，请在过滤器之前加入 `-`。 例如， `-label:"bug"` 只会显示没有标签的 `bug` 的项。
+- 要过滤缺少所有值的字段, 请输入 `no:`，后接字段名称。 例如，`no:assignee` 仅显示没有受理人的项。
+- 要按状态过滤，请输入 `is:`。 例如 `is: issue` 或 `is:open`。
+- 多个过滤条件之间用逗号分隔。 例如，`status:"In progress" -label:"bug" no:assignee` 仅显示状态为 `In progress`、没有标签 `bug` 且没有受理人的项。
+- 要过滤迭代字段的当前迭代，请使用 `@current`。 例如 `sprint:@current`。
-Alternatively, use the command palette.
+或者，使用命令面板。
1. {% data reusables.projects.open-command-palette %}
2. 开始键入 "Filter by" 或您想要筛选的字段的名称。
-3. Choose the required command. For example, **Filter by Status**.
-4. Enter the value that you want to filter for. For example: "In progress". You can also filter for the absence of specific values (for example, choose "Exclude status" then choose a status) or the absence of all values (for example, "No status").
+3. 选择所需的命令。 例如 **Filter by Status**。
+4. 输入您想要过滤的值。 例如："In progress"。 您还可以过滤缺少特定值的字段（例如，选择“Exclude status（排除状态）”，然后选择一个状态）或缺少所有值的字段（例如，“No status（无状态）”）。
-In board layout, you can click on item data to filter for items with that value. For example, click on an assignee to show only items for that assignee. To remove the filter, click the item data again.
+在板布局中，您可以单击项目数据以过滤具有该值的项。 例如，单击某个受理人以仅显示该受理人的项。 要移除过滤器，请再次单击项数据。
-## Creating a project view
+## 创建项目视图
-Project views allow you to quickly view specific aspects of your project. Each view is displayed on a separate tab in your project.
+项目视图允许您快速查看项目的特定方面。 每个视图都显示在项目中单独的选项卡上。
-For example, you can have:
-- A view that shows all items not yet started (filter on "Status").
-- A view that shows the workload for each team (group by a custom "Team" field).
-- A view that shows the items with the earliest target ship date (sort by a date field).
+例如，您可以有：
+- 显示所有尚未开始的项的视图（按“状态”过滤）。
+- 显示每个团队的工作负荷的视图（按自定义“团队”字段分组）。
+- 显示具有最早目标运送日期的项的视图（按日期字段排序）。
-To add a new view:
+要添加新视图：
1. {% data reusables.projects.open-command-palette %}
2. 开始键入 "New view"（创建新视图）或 "Duplicate view"（复制当前视图）。
-3. Choose the required command.
+3. 选择所需的命令。
或者，点击右侧视图旁边的 {% octicon "plus" aria-label="the plus icon" %} **New view（新视图）**。
-Alternatively, click {% octicon "triangle-down" aria-label="the drop-down icon" %} next to a view name and click **Duplicate view**.
+或者，单击视图名称旁边的 {% octicon "triangle-down" aria-label="the drop-down icon" %} ，然后单击 **Duplicate view（复制视图）**。
-The new view is automatically saved.
+新视图将自动保存。
-## Saving changes to a view
+## 保存对视图的更改
-When you make changes to a view - for example, sorting, reordering, filtering, or grouping the data in a view - a dot is displayed next to the view name to indicate that there are unsaved changes.
+对视图进行更改（例如，对视图中的数据进行排序、重新排序、过滤或分组）时，视图名称旁边会显示一个点，以指示存在未保存的更改。
-
+
-如果您不想保存更改，可以忽略此指示。 No one else will see your changes.
+如果您不想保存更改，可以忽略此指示。 没有其他人会看到您的更改。
-To save the current configuration of the view for all project members:
+保存所有项目成员的视图的当前配置：
1. {% data reusables.projects.open-command-palette %}
1. 开始键入 "Save view" 或 "Save changes to new view"。
-1. Choose the required command.
+1. 选择所需的命令。
-Alternatively, click {% octicon "triangle-down" aria-label="the drop-down icon" %} next to a view name and click **Save view** or **Save changes to new view**.
+或者，单击视图名称旁边的 {% octicon "triangle-down" aria-label="the drop-down icon" %}，然后点击 **Save view（保存视图）** 或 **Save changes to new view（保存更改到新视图）**。
-## Reordering saved views
+## 对保存的视图重新排序
-To change the order of the tabs that contain your saved views, click and drag a tab to a new location.
+要更改包含已保存视图的选项卡的顺序，请单击选项卡并将其拖到新位置。
-The new tab order is automatically saved.
+新选项卡顺序自动保存。
-## Renaming a saved view
+## 重命名保存的视图
-To rename a view:
-1. Double click the name in the project tab.
-1. Change the name.
-1. Press Enter, or click outside of the tab.
+要重命名视图：
+1. 双击项目选项卡中的名称。
+1. 更改名称。
+1. 按 Enter 键，或在选项卡外部单击。
-The name change is automatically saved.
+名称更改将自动保存。
-## Deleting a saved view
+## 删除已保存的视图
要删除视图：
1. {% data reusables.projects.open-command-palette %}
2. 开始键入 "Delete view"。
-3. Choose the required command.
+3. 选择所需的命令。
-Alternatively, click {% octicon "triangle-down" aria-label="the drop-down icon" %} next to a view name and click **Delete view**.
+或者，单击视图名称旁边的 {% octicon "triangle-down" aria-label="the drop-down icon" %} ，然后单击 **Delete view（删除视图）**。
## 延伸阅读
diff --git a/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/quickstart.md b/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/quickstart.md
index c0ff2f118bd0..d44c32826ac9 100644
--- a/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/quickstart.md
+++ b/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/quickstart.md
@@ -19,23 +19,23 @@ topics:
## 基本要求
-You can either create an organization project or a user project. To create an organization project, you need a {% data variables.product.prodname_dotcom %} organization. 有关创建组织的更多信息，请参阅“[从头开始创建新组织](/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch)”。
+您可以创建组织项目或用户项目。 要创建组织项目，您需要一个 {% data variables.product.prodname_dotcom %} 组织。 有关创建组织的更多信息，请参阅“[从头开始创建新组织](/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch)”。
-In this guide, you will add existing issues from repositories owned by your organization (for organization projects) or by you (for user projects) to your new project. 有关创建议题的更多信息，请参阅“[创建议题](/issues/tracking-your-work-with-issues/creating-an-issue)”。
+在本指南中，您将把组织拥有的存储库（对于组织项目）或您拥有的存储库（对于用户项目）的现有议题添加到新项目中。 有关创建议题的更多信息，请参阅“[创建议题](/issues/tracking-your-work-with-issues/creating-an-issue)”。
## 创建项目
-First, create an organization project or a user project.
+首先，创建组织项目或用户项目。
-### Creating an organization project
+### 创建组织项目
{% data reusables.projects.create-project %}
-### Creating a user project
+### 创建用户项目
{% data reusables.projects.create-user-project %}
-## Setting your project description and README
+## 设置项目描述和 README
{% data reusables.projects.project-description %}
@@ -53,13 +53,13 @@ First, create an organization project or a user project.
有关向项目添加议题的其他方法，或有关您可以向项目添加其他项的信息，请参阅“[创建项目](/issues/trying-out-the-new-projects-experience/creating-a-project#adding-items-to-your-project)”。
-## Adding draft issues to your project
+## 向项目添加草稿议题
-Next, add a draft issue to your project.
+接下来，将草稿议题添加到项目中。
1. 将光标放在项目底部一行，{% octicon "plus" aria-label="plus icon" %} 的旁边。
1. 输入您的想法，然后按 **Enter**。
-1. Click on the title of the draft issue. In the markdown input box that appears, enter the some more information about your idea, then click **Save**.
+1. 单击草稿议题的标题。 在出现的 Markdown 输入框中，输入有关您想法的更多信息，然后单击 **Save（保存）**。
## 创建字段来跟踪优先级
@@ -108,11 +108,11 @@ Next, add a draft issue to your project.
保存视图后，打开项目的任何人都将看到保存的视图。 在这里按优先级分组，但您还可以添加其他修饰符，如排序、筛选或布局。 接下来，您将创建一个修改了布局的新视图。
-## Adding a board layout
+## 添加板布局
要查看项目议题的进度，您可以切换到板布局。
-The board layout is based on the status field, so specify a status for each issue in your project.
+板布局基于状态字段，因此会指定项目中每个议题的状态。
@@ -138,15 +138,15 @@ The board layout is based on the status field, so specify a status for each issu
-## Configure built-in automation
+## 配置内置自动化
-Finally, add a built in workflow to set the status to **Todo** when an item is added to your project.
+最后，添加内置工作流程，以便在将项添加到项目时状态设置为**待办事项** 。
1. In your project, click {% octicon "workflow" aria-label="the workflow icon" %}.
-2. Under **Default workflows**, click **Item added to project**.
-3. Next to **When**, ensure that both `issues` and `pull requests` are selected.
-4. Next to **Set**, select **Status:Todo**.
-5. Click the **Disabled** toggle to enable the workflow.
+2. 在 **Default workflows（默认工作流程）**下，单击 **Item added to project（已添加到项目的项）**。
+3. 在 **When（何时）**旁边，确保同时选择 `issues（议题）`和 `pull requests（拉取请求）`。
+4. 在 **Set（设置）**旁边，选择 **Status:Todo（状态：待办事项）**。
+5. 单击 **Disabled（已禁用）**切换开关以启用工作流程。
## 后续步骤
diff --git a/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/using-the-api-to-manage-projects.md b/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/using-the-api-to-manage-projects.md
index 86d3896f9c4a..a792e61393a3 100644
--- a/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/using-the-api-to-manage-projects.md
+++ b/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/using-the-api-to-manage-projects.md
@@ -11,7 +11,7 @@ topics:
- Projects
---
-本文演示如何使用 GraphQL API 来管理项目。 For more information about how to use the API in a {% data variables.product.prodname_actions %} workflow, see "[Automating projects (beta)](/issues/trying-out-the-new-projects-experience/automating-projects)." For a full list of the available data types, see "[Reference](/graphql/reference)."
+本文演示如何使用 GraphQL API 来管理项目。 有关如何在 {% data variables.product.prodname_actions %} 工作流程中使用 API 的详细信息，请参阅“[自动化项目（测试版）](/issues/trying-out-the-new-projects-experience/automating-projects)”。 有关可用数据类型的完整列表，请参阅“[参考](/graphql/reference)”。
{% data reusables.projects.projects-beta %}
@@ -19,7 +19,7 @@ topics:
{% curl %}
-在所有下面的 cURL 示例中， 将 `TOKENN` 替换为具有 `read:org` 范围（对于查询）或 `write:org` 范围（对于查询和突变）的令牌。 The token can be a personal access token for a user or an installation access token for a {% data variables.product.prodname_github_app %}. For more information about creating a personal access token, see "[Creating a personal access token](/github/authenticating-to-github/keeping-your-account-and-data-secure/creating-a-personal-access-token)." For more information about creating an installation access token for a {% data variables.product.prodname_github_app %}, see "[Authenticating with {% data variables.product.prodname_github_apps %}](/developers/apps/building-github-apps/authenticating-with-github-apps#authenticating-as-a-github-app)."
+在所有下面的 cURL 示例中， 将 `TOKENN` 替换为具有 `read:org` 范围（对于查询）或 `write:org` 范围（对于查询和突变）的令牌。 令牌可以是用户的个人访问令牌，也可以是 {% data variables.product.prodname_github_app %} 的安装访问令牌。 有关创建个人访问令牌的更多信息，请参阅“[创建个人访问令牌](/github/authenticating-to-github/keeping-your-account-and-data-secure/creating-a-personal-access-token)”。 有关为 {% data variables.product.prodname_github_app %} 创建安装访问令牌的详细信息，请参阅“[使用 {% data variables.product.prodname_github_apps %} 进行身份验证](/developers/apps/building-github-apps/authenticating-with-github-apps#authenticating-as-a-github-app)”。
{% endcurl %}
@@ -27,7 +27,7 @@ topics:
{% data reusables.cli.cli-learn-more %}
-Before running {% data variables.product.prodname_cli %} commands, you must authenticate by running `gh auth login --scopes "write:org"`. If you only need to read, but not edit, projects, you can omit the `--scopes` argument. 有关命令行身份验证的更多信息，请参阅 "[gh auth login](https://cli.github.com/manual/gh_auth_login)"。
+在运行 {% data variables.product.prodname_cli %} 命令之前，必须通过运行 `gh auth login --scopes "write:org"` 进行身份验证。 如果只需要读取项目，但不需要编辑项目，则可以省略 `--scopes` 参数。 有关命令行身份验证的更多信息，请参阅 "[gh auth login](https://cli.github.com/manual/gh_auth_login)"。
{% endcli %}
@@ -50,19 +50,19 @@ gh api graphql -f query='
}' -f organization=$my_org -F number=$my_num
```
-For more information, see "[Forming calls with GraphQL]({% ifversion ghec%}/free-pro-team@latest{% endif %}/graphql/guides/forming-calls-with-graphql#working-with-variables)."
+更多信息请参阅“[使用 GraphQL 创建调用]({% ifversion ghec%}/free-pro-team@latest{% endif %}/graphql/guides/forming-calls-with-graphql#working-with-variables)”。
{% endcli %}
## 查找项目信息
-使用查询获取项目数据。 For more information, see "[About queries]({% ifversion ghec%}/free-pro-team@latest{% endif %}/graphql/guides/forming-calls-with-graphql#about-queries)."
+使用查询获取项目数据。 更多信息请参阅“[关于查询]({% ifversion ghec%}/free-pro-team@latest{% endif %}/graphql/guides/forming-calls-with-graphql#about-queries)。”
-### Finding the node ID of an organization project
+### 查找组织项目的节点 ID
要通过 API 更新您的项目，您需要知道项目的节点 ID。
-You can find the node ID of an organization project if you know the organization name and project number. 将 `ORGANIZATION` 替换为您的组织名称。 例如 `octo-org`。 Replace `NUMBER` with the project number. 要查找项目编号，请查看项目 URL。 例如，`https://github.com/orgs/octo-org/projects/5` 有一个编号为 5 的项目。
+如果您知道组织名称和项目编号，则可以找到组织项目的节点 ID。 将 `ORGANIZATION` 替换为您的组织名称。 例如 `octo-org`。 将 `NUMBER` 替换为项目编号。 要查找项目编号，请查看项目 URL。 例如，`https://github.com/orgs/octo-org/projects/5` 有一个编号为 5 的项目。
{% curl %}
```shell
@@ -113,11 +113,11 @@ gh api graphql -f query='
```
{% endcli %}
-### Finding the node ID of a user project
+### 查找用户项目的节点 ID
要通过 API 更新您的项目，您需要知道项目的节点 ID。
-You can find the node ID of a user project if you know the project number. Replace `USER` with your user name. 例如 `octocat`。 将 `NUMBER` 替换为项目编号。 要查找项目编号，请查看项目 URL。 For example, `https://github.com/users/octocat/projects/5` has a project number of 5.
+如果您知道项目编号，则可以找到用户项目的节点 ID。 将 `USER` 替换为您的用户名。 例如 `octocat`。 将 `NUMBER` 替换为项目编号。 要查找项目编号，请查看项目 URL。 例如，`https://github.com/users/octocat/projects/5` 有一个编号为 5 的项目。
{% curl %}
```shell
@@ -141,7 +141,7 @@ gh api graphql -f query='
```
{% endcli %}
-You can also find the node ID for all of your projects. The following example will return the node ID and title of your first 20 projects. Replace `USER` with your username. 例如 `octocat`。
+您还可以找到所有项目的节点 ID。 以下示例将返回前 20 个项目的节点 ID 和标题。 将 `USER` 替换为您的用户名。 例如 `octocat`。
{% curl %}
```shell
@@ -170,7 +170,7 @@ gh api graphql -f query='
### 查找字段的节点 ID
-要更新字段的值，您需要知道字段的节点 ID。 Additionally, you will need to know the ID of the options for single select fields and the ID of the iterations for iteration fields.
+要更新字段的值，您需要知道字段的节点 ID。 此外，您还需要知道单个选择字段的选项 ID 和迭代字段的迭代 ID。
下面的示例将返回项目中前 20 个字段的 ID、名称和设置。 将 `PROJECT_ID` 替换为项目的节点 ID。
@@ -237,7 +237,7 @@ gh api graphql -f query='
}
```
-每个字段都有 ID。 Additionally, single select fields and iteration fields have a `settings` value. In the single select settings, you can find the ID of each option for the single select. In the iteration settings, you can find the duration of the iteration, the start day of the iteration (from 1 for Monday to 7 for Sunday), the list of incomplete iterations, and the list of completed iterations. For each iteration in the lists of iterations, you can find the ID, title, duration, and start date of the iteration.
+每个字段都有 ID。 此外，单个选择字段和迭代字段有`设置`值。 在单选设置中，您可以找到单选的每个选项的 ID。 在迭代设置中，您可以找到迭代的持续时间、迭代的开始日期（从星期一的 1 到星期日的 7）、未完成迭代的列表以及已完成迭代的列表。 对于迭代列表中的每个迭代，您可以找到迭代的 ID、标题、持续时间和开始日期。
### 查找项目中各项的信息
@@ -245,7 +245,7 @@ gh api graphql -f query='
{% note %}
-**Note**: The API will not return information about draft issues.
+**注意**：API 不会返回有关草稿议题的信息。
{% endnote %}
@@ -302,7 +302,7 @@ gh api graphql -f query='
```
{% endcli %}
-项目可能包含用户无权查看的项。 In this case, the response will include a redacted item.
+项目可能包含用户无权查看的项。 在这种情况下，响应将包括已编辑的项。
```shell
{
@@ -315,7 +315,7 @@ gh api graphql -f query='
## 更新项目
-使用突变来更新项目。 For more information, see "[About mutations]({% ifversion ghec %}/free-pro-team@latest{% endif %}/graphql/guides/forming-calls-with-graphql#about-mutations)."
+使用突变来更新项目。 更多信息请参阅“[关于突变]({% ifversion ghec %}/free-pro-team@latest{% endif %}/graphql/guides/forming-calls-with-graphql#about-mutations)。”
{% note %}
@@ -363,11 +363,11 @@ gh api graphql -f query='
}
```
-If you try to add an item that already exists, the existing item ID is returned instead.
+如果您尝试添加已经存在的项，则返回现有项 ID。
-### Updating a project's settings
+### 更新项目的设置
-The following example will update your project's settings. 将 `PROJECT_ID` 替换为项目的节点 ID。 Set `public` to `true` to make your project public on {% data variables.product.product_name %}. Modify `description` to make changes to your project's README.
+以下示例将更新项目的设置。 将 `PROJECT_ID` 替换为项目的节点 ID。 将 `public` 设置为 `true` ，以便在 {% data variables.product.product_name %} 上公开您的项目。 修改 `description` 以对项目的 README 进行更改。
{% curl %}
```shell
@@ -402,9 +402,9 @@ gh api graphql -f query='
```
{% endcli %}
-### Updating a custom text, number, or date field
+### 更新自定义文本、数字或日期字段
-The following example will update the value of a date field for an item. 将 `PROJECT_ID` 替换为项目的节点 ID。 将 `ITEM_ID` 替换为您想要更新的项的节点 ID。 将 `FIELD_ID` 替换为您想要更新的字段的 ID。
+下面的示例将更新项目的日期字段值。 将 `PROJECT_ID` 替换为项目的节点 ID。 将 `ITEM_ID` 替换为您想要更新的项的节点 ID。 将 `FIELD_ID` 替换为您想要更新的字段的 ID。
{% curl %}
```shell
@@ -437,18 +437,18 @@ gh api graphql -f query='
{% note %}
-**注意：** 您不能使用 `updateProjectNextItemField` 更改 `Assignees`、`Labels`、`Milestone` 或 `Repository`，因为这些字段是拉取请求和议题，而不是项目项的属性。 Instead, you must use the [addAssigneesToAssignable]({% ifversion ghec%}/free-pro-team@latest{% endif %}/graphql/reference/mutations#addassigneestoassignable), [removeAssigneesFromAssignable]({% ifversion ghec%}/free-pro-team@latest{% endif %}/graphql/reference/mutations#removeassigneesfromassignable), [addLabelsToLabelable]({% ifversion ghec%}/free-pro-team@latest{% endif %}/graphql/reference/mutations#addlabelstolabelable), [removeLabelsFromLabelable]({% ifversion ghec%}/free-pro-team@latest{% endif %}/graphql/reference/mutations#removelabelsfromlabelable), [updateIssue]({% ifversion ghec%}/free-pro-team@latest{% endif %}/graphql/reference/mutations#updateissue), [updatePullRequest]({% ifversion ghec%}/free-pro-team@latest{% endif %}/graphql/reference/mutations#updatepullrequest), or [transferIssue]({% ifversion ghec%}/free-pro-team@latest{% endif %}/graphql/reference/mutations#transferissue) mutations.
+**注意：** 您不能使用 `updateProjectNextItemField` 更改 `Assignees`、`Labels`、`Milestone` 或 `Repository`，因为这些字段是拉取请求和议题，而不是项目项的属性。 相反，您必须使用 [addAssigneesToAssignable]({% ifversion ghec%}/free-pro-team@latest{% endif %}/graphql/reference/mutations#addassigneestoassignable)、[removeAssigneesFromAssignable]({% ifversion ghec%}/free-pro-team@latest{% endif %}/graphql/reference/mutations#removeassigneesfromassignable)、[addLabelsToLabelable]({% ifversion ghec%}/free-pro-team@latest{% endif %}/graphql/reference/mutations#addlabelstolabelable)、[removeLabelsFromLabelable]({% ifversion ghec%}/free-pro-team@latest{% endif %}/graphql/reference/mutations#removelabelsfromlabelable)、[updateIssue]({% ifversion ghec%}/free-pro-team@latest{% endif %}/graphql/reference/mutations#updateissue)、[updatePullRequest]({% ifversion ghec%}/free-pro-team@latest{% endif %}/graphql/reference/mutations#updatepullrequest) 或 [transferIssue]({% ifversion ghec%}/free-pro-team@latest{% endif %}/graphql/reference/mutations#transferissue) 突变。
{% endnote %}
-### Updating a single select field
+### 更新单选字段
-The following example will update the value of a single select field for an item.
+下面的示例将更新项的单选字段值。
- `PROJECT_ID` - 用项目节点 ID 替换。
- `ITEM_ID` - 替换为您想要更新的项的节点 ID。
-- `FIELD_ID` - Replace this with the ID of the single select field that you want to update.
-- `OPTION_ID` - Replace this with the ID of the desired single select option.
+- `FIELD_ID` - 替换为您想要更新的单选字段的 ID。
+- `OPTION_ID` - 替换为所需单选选项的 ID。
{% curl %}
```shell
@@ -479,14 +479,14 @@ gh api graphql -f query='
```
{% endcli %}
-### Updating an iteration field
+### 更新迭代字段
-The following example will update the value of an iteration field for an item.
+下面的示例将更新项的迭代字段值。
- `PROJECT_ID` - 用项目节点 ID 替换。
- `ITEM_ID` - 替换为您想要更新的项的节点 ID。
-- `FIELD_ID` - Replace this with the ID of the iteration field that you want to update.
-- `ITERATION_ID` - Replace this with the ID of the desired iteration. This can be either an active iteration (from the `iterations` array) or a completed iteration (from the `completed_iterations` array).
+- `FIELD_ID` - 替换为您想要更新的迭代字段的 ID。
+- `ITERATION_ID` - 替换为所需迭代的 ID。 这可以是活动迭代（来自 `iterations` 数组）或已完成迭代（来自 `completed_iterations` 数组）。
{% curl %}
```shell
diff --git a/translations/zh-CN/content/organizations/collaborating-with-groups-in-organizations/about-your-organizations-news-feed.md b/translations/zh-CN/content/organizations/collaborating-with-groups-in-organizations/about-your-organizations-news-feed.md
index 58ae6d21bfba..fff64a160fc6 100644
--- a/translations/zh-CN/content/organizations/collaborating-with-groups-in-organizations/about-your-organizations-news-feed.md
+++ b/translations/zh-CN/content/organizations/collaborating-with-groups-in-organizations/about-your-organizations-news-feed.md
@@ -22,7 +22,7 @@ shortTitle: 组织消息馈送
## 访问组织的消息馈送
1. {% data variables.product.signin_link %} 到 {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %} 上的帐户。
-2. 打开 {% data reusables.user_settings.personal_dashboard %}。
+2. 打开 {% data reusables.user-settings.personal_dashboard %}。
3. 单击页面左上角的帐户上下文切换器。 
4. 从下拉菜单中选择组织。{% ifversion fpt or ghec %} {% else %}
{% endif %}
diff --git a/translations/zh-CN/content/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch.md b/translations/zh-CN/content/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch.md
index 80346e7e9717..e4decd23c73f 100644
--- a/translations/zh-CN/content/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch.md
+++ b/translations/zh-CN/content/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch.md
@@ -18,8 +18,8 @@ shortTitle: 创建新组织
从头开始创建新组织时，它没有任何与之关联的仓库。 有关为组织添加仓库的更多信息，请参阅“[创建新仓库](/articles/creating-a-new-repository)”和“[转让仓库](/articles/transferring-a-repository)”。
-{% data reusables.user_settings.access_settings %}
-{% data reusables.user_settings.organizations %}
+{% data reusables.user-settings.access_settings %}
+{% data reusables.user-settings.organizations %}
{% data reusables.organizations.new-organization %}
4. 按照提示创建组织。 {% ifversion fpt or ghec %}要详细了解可用于您的团队的计划，请参阅“[{% data variables.product.prodname_dotcom %} 的产品](/articles/githubs-products)”。{% endif %}
diff --git a/translations/zh-CN/content/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization.md b/translations/zh-CN/content/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization.md
index 4217654b388a..8bfb16e6072b 100644
--- a/translations/zh-CN/content/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization.md
+++ b/translations/zh-CN/content/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization.md
@@ -29,7 +29,7 @@ shortTitle: 查看组织见解
通过组织活动洞察，您可以查看整个组织或特定仓库每周、每月和每年的数据可视化，包括议题和拉取请求活动、热门使用语言以及有关组织成员花费其时间累积的信息。
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
3. 在组织名称下，单击 {% octicon "graph" aria-label="The bar graph icon" %} **Insights（洞察）**。 
4. （可选）在页面的右上角，选择查看过去 **1 周**、**1 个月**或 **1 年**的数据。 
5. （可选）在页面的右上角，选择查看最多三个仓库的数据，然后单击 **Apply（应用）**。 
@@ -45,7 +45,7 @@ shortTitle: 查看组织见解
通过依赖项洞察，您可以查看组织所依赖的开源项目的漏洞、许可证和其他重要信息。
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
3. 在组织名称下，单击 {% octicon "graph" aria-label="The bar graph icon" %} **Insights（洞察）**。 
4. 要查看此组织的依赖项，请单击 **Dependencies（依赖项）**。 
5. 要查看所有您的 {% data variables.product.prodname_ghe_cloud %} 组织的依赖项洞察，请单击 **My organizations（我的组织）**。 
diff --git a/translations/zh-CN/content/organizations/collaborating-with-your-team/creating-a-team-discussion.md b/translations/zh-CN/content/organizations/collaborating-with-your-team/creating-a-team-discussion.md
index e5a6c0a6e4a2..10224cb34e7a 100644
--- a/translations/zh-CN/content/organizations/collaborating-with-your-team/creating-a-team-discussion.md
+++ b/translations/zh-CN/content/organizations/collaborating-with-your-team/creating-a-team-discussion.md
@@ -18,7 +18,7 @@ shortTitle: 创建团队讨论
{% data reusables.organizations.team-discussions-permissions %} 更多信息请参阅“[关于团队讨论](/organizations/collaborating-with-your-team/about-team-discussions)”。
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.specific_team %}
{% data reusables.organizations.team-discussions-tab %}
6. 输入团队讨论标题和评论以开始对话。 
diff --git a/translations/zh-CN/content/organizations/collaborating-with-your-team/editing-or-deleting-a-team-discussion.md b/translations/zh-CN/content/organizations/collaborating-with-your-team/editing-or-deleting-a-team-discussion.md
index f7839d18cd94..da9074a50121 100644
--- a/translations/zh-CN/content/organizations/collaborating-with-your-team/editing-or-deleting-a-team-discussion.md
+++ b/translations/zh-CN/content/organizations/collaborating-with-your-team/editing-or-deleting-a-team-discussion.md
@@ -16,7 +16,7 @@ shortTitle: 管理团队讨论
---
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.specific_team %}
{% data reusables.organizations.team-discussions-tab %}
6. 单击要编辑或删除的团队讨论旁边的 {% octicon "kebab-horizontal" aria-label="The edit icon" %}。
diff --git a/translations/zh-CN/content/organizations/collaborating-with-your-team/pinning-a-team-discussion.md b/translations/zh-CN/content/organizations/collaborating-with-your-team/pinning-a-team-discussion.md
index 59401ab54236..c1ebd65dca7b 100644
--- a/translations/zh-CN/content/organizations/collaborating-with-your-team/pinning-a-team-discussion.md
+++ b/translations/zh-CN/content/organizations/collaborating-with-your-team/pinning-a-team-discussion.md
@@ -15,7 +15,7 @@ topics:
---
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.specific_team %}
{% data reusables.organizations.team-discussions-tab %}
5. 单击要固定的团队讨论旁边的 {% octicon "pin" aria-label="The pin icon" %}。 单击该图标也可以取消固定讨论。 
diff --git a/translations/zh-CN/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md b/translations/zh-CN/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md
index 6c2dda06fbc8..6db887e258b6 100644
--- a/translations/zh-CN/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md
+++ b/translations/zh-CN/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md
@@ -39,7 +39,7 @@ shortTitle: 管理 SAML 访问
{% data reusables.identity-and-permissions.revoking-identity-team-sync %}
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.people %}
{% data reusables.saml.click-person-revoke-identity %}
{% data reusables.saml.saml-identity-linked %}
@@ -50,7 +50,7 @@ shortTitle: 管理 SAML 访问
## 查看和撤销活动的 SAML 会话
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.people %}
{% data reusables.saml.click-person-revoke-session %}
{% data reusables.saml.saml-identity-linked %}
@@ -62,7 +62,7 @@ shortTitle: 管理 SAML 访问
{% data reusables.saml.about-authorized-credentials %}
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.people %}
{% data reusables.saml.click-person-revoke-credentials %}
{% data reusables.saml.saml-identity-linked %}
diff --git a/translations/zh-CN/content/organizations/index.md b/translations/zh-CN/content/organizations/index.md
index 76f399a6a073..8b45d95d0b1f 100644
--- a/translations/zh-CN/content/organizations/index.md
+++ b/translations/zh-CN/content/organizations/index.md
@@ -1,11 +1,30 @@
---
title: 组织和团队
shortTitle: 组织
-intro: 跨多个项目协作，同时管理对项目和数据的访问，并为组织自定义设置。
+intro: 您可以使用组织同时与多个项目中无限数量的人员进行协作，同时管理对数据的访问和自定义设置。
redirect_from:
- /articles/about-improved-organization-permissions
- /categories/setting-up-and-managing-organizations-and-teams
- /github/setting-up-and-managing-organizations-and-teams
+introLinks:
+ overview: /organizations/collaborating-with-groups-in-organizations/about-organizations
+featuredLinks:
+ guides:
+ - /get-started/learning-about-github/types-of-github-accounts
+ - /organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization
+ - /organizations/organizing-members-into-teams/about-teams
+ popular:
+ - /organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch
+ - /organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization
+ - /organizations/managing-organization-settings/verifying-or-approving-a-domain-for-your-organization
+ - /organizations/restricting-access-to-your-organizations-data/about-oauth-app-access-restrictions
+ - '{% ifversion ghae %}/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization{% endif %}'
+ guideCards:
+ - /organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization
+ - /organizations/managing-membership-in-your-organization/adding-people-to-your-organization
+ - /organizations/managing-access-to-your-organizations-repositories/managing-an-individuals-access-to-an-organization-repository
+ - /organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization
+layout: product-landing
versions:
fpt: '*'
ghes: '*'
diff --git a/translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md b/translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md
index 8701ddab1aa5..0130ed90b129 100644
--- a/translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md
+++ b/translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md
@@ -21,6 +21,8 @@ shortTitle: 审核审计日志
The audit log lists events triggered by activities that affect your organization within the current month and previous six months. 只有所有者才能访问组织的审核日志。
+{% data reusables.audit_log.only-three-months-displayed %}
+
{% data reusables.profile.access_org %}
{% data reusables.profile.org_settings %}
{% data reusables.audit_log.audit_log_sidebar_for_org_admins %}
@@ -170,6 +172,8 @@ GraphQL 响应可包含长达 90 至 120 天的数据。
{% data reusables.audit_log.audit-log-git-events-retention %}
+By default, only events from the past three months are returned. To include older events, you must specify a timestamp in your query.
+
有关审核日志 REST API 的更多信息，请参阅“[组织](/rest/reference/orgs#get-the-audit-log-for-an-organization)”。
{% endif %}
@@ -544,22 +548,22 @@ GraphQL 响应可包含长达 90 至 120 天的数据。
### `protected_branch` 类操作
-| 操作 | 描述 |
-| ----------------------------------------------------- | ------------------------------------------------------------------------------------- |
-| `create` | 在分支上启用分支保护时触发。 |
-| `destroy` | 在分支上禁用分支保护时触发。 |
-| `update_admin_enforced` | 为仓库管理员实施分支保护时触发。 |
-| `update_require_code_owner_review` | 在分支上更新必需代码所有者审查的实施时触发。 |
-| `dismiss_stale_reviews` | 在分支上更新忽略旧拉取请求的实施时触发。 |
-| `update_signature_requirement_enforcement_level` | 在分支上更新必需提交签名的实施时触发。 |
-| `update_pull_request_reviews_enforcement_level` | 在分支上更新必需拉取请求审查的实施时触发。 Can be one of `0`(deactivated), `1`(non-admins), `2`(everyone). |
-| `update_required_status_checks_enforcement_level` | 在分支上更新必需状态检查的实施时触发。 |
-| `update_strict_required_status_checks_policy` | 当分支在合并之前保持最新的要求被更改时触发。 |
-| `rejected_ref_update` | 当分支更新尝试被拒绝时触发。 |
+| 操作 | 描述 |
+| ----------------------------------------------------- | ------------------------------------------------------------- |
+| `create` | 在分支上启用分支保护时触发。 |
+| `destroy` | 在分支上禁用分支保护时触发。 |
+| `update_admin_enforced` | 为仓库管理员实施分支保护时触发。 |
+| `update_require_code_owner_review` | 在分支上更新必需代码所有者审查的实施时触发。 |
+| `dismiss_stale_reviews` | 在分支上更新忽略旧拉取请求的实施时触发。 |
+| `update_signature_requirement_enforcement_level` | 在分支上更新必需提交签名的实施时触发。 |
+| `update_pull_request_reviews_enforcement_level` | 在分支上更新必需拉取请求审查的实施时触发。 可以是 `0`（已停用）、`1`（非管理员）`2`（所有人）之一。 |
+| `update_required_status_checks_enforcement_level` | 在分支上更新必需状态检查的实施时触发。 |
+| `update_strict_required_status_checks_policy` | 当分支在合并之前保持最新的要求被更改时触发。 |
+| `rejected_ref_update` | 当分支更新尝试被拒绝时触发。 |
| `policy_override` | 当仓库管理员重写分支保护要求时触发。{% ifversion fpt or ghes or ghae or ghec %}
-| `update_allow_force_pushes_enforcement_level` | 对受保护分支启用或禁用强制推送时触发。 |
-| `update_allow_deletions_enforcement_level` | 对受保护分支启用或禁用分支删除时触发。 |
-| `update_linear_history_requirement_enforcement_level` | 对受保护分支启用或禁用必要线性提交历史记录时触发。 |
+| `update_allow_force_pushes_enforcement_level` | 对受保护分支启用或禁用强制推送时触发。 |
+| `update_allow_deletions_enforcement_level` | 对受保护分支启用或禁用分支删除时触发。 |
+| `update_linear_history_requirement_enforcement_level` | 对受保护分支启用或禁用必要线性提交历史记录时触发。 |
{% endif %}
{% ifversion fpt or ghes > 3.1 or ghae or ghec %}
diff --git a/translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-two-factor-authentication-for-your-organization/viewing-whether-users-in-your-organization-have-2fa-enabled.md b/translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-two-factor-authentication-for-your-organization/viewing-whether-users-in-your-organization-have-2fa-enabled.md
index 22328f419b08..fec776fc8be8 100644
--- a/translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-two-factor-authentication-for-your-organization/viewing-whether-users-in-your-organization-have-2fa-enabled.md
+++ b/translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-two-factor-authentication-for-your-organization/viewing-whether-users-in-your-organization-have-2fa-enabled.md
@@ -22,7 +22,7 @@ shortTitle: View 2FA usage
{% endnote %}
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.people %}
4. 要查看已启用或已禁用双因素身份验证的组织成员（包括组织所有者），在右侧单击 **2FA**，然后选择 **Enabled（启用）**或 **Disabled（禁用）**。 
5. 要查看组织中的外部协作者，在“People（人员）”选项卡下，单击 **Outside collaborators（外部协作者）**。 
diff --git a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-project-boards/adding-an-outside-collaborator-to-a-project-board-in-your-organization.md b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-project-boards/adding-an-outside-collaborator-to-a-project-board-in-your-organization.md
index 7519488488db..5b31212b28de 100644
--- a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-project-boards/adding-an-outside-collaborator-to-a-project-board-in-your-organization.md
+++ b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-project-boards/adding-an-outside-collaborator-to-a-project-board-in-your-organization.md
@@ -18,7 +18,7 @@ shortTitle: 添加协作者
外部协作者并未明确是组织的成员，但对组织的项目板具有访问权限。
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.organization-wide-project %}
{% data reusables.project-management.select-project %}
{% data reusables.project-management.click-menu %}
diff --git a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-project-boards/managing-access-to-a-project-board-for-organization-members.md b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-project-boards/managing-access-to-a-project-board-for-organization-members.md
index 906d1920978c..6ef61279332c 100644
--- a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-project-boards/managing-access-to-a-project-board-for-organization-members.md
+++ b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-project-boards/managing-access-to-a-project-board-for-organization-members.md
@@ -26,7 +26,7 @@ shortTitle: 管理成员的访问权限
{% endtip %}
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.organization-wide-project %}
{% data reusables.project-management.select-project %}
{% data reusables.project-management.click-menu %}
diff --git a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-project-boards/managing-an-individuals-access-to-an-organization-project-board.md b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-project-boards/managing-an-individuals-access-to-an-organization-project-board.md
index cf450ff1cf43..7cde45fd4274 100644
--- a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-project-boards/managing-an-individuals-access-to-an-organization-project-board.md
+++ b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-project-boards/managing-an-individuals-access-to-an-organization-project-board.md
@@ -25,7 +25,7 @@ shortTitle: 管理个人访问
## 授予组织成员对项目板的访问
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.organization-wide-project %}
{% data reusables.project-management.select-project %}
{% data reusables.project-management.click-menu %}
@@ -38,7 +38,7 @@ shortTitle: 管理个人访问
## 更改组织成员对项目板的访问
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.organization-wide-project %}
{% data reusables.project-management.select-project %}
{% data reusables.project-management.click-menu %}
@@ -51,7 +51,7 @@ shortTitle: 管理个人访问
从项目板删除协作者时，根据他们其他角色的权限，他们可能仍然保有对项目板的访问权限。 要完全删除个人对项目板的访问权限，必须删除其每个角色的访问权限。 例如，某个人可能对项目板具有组织成员或团队成员的访问权限。 更多信息请参阅“[组织的项目板权限](/articles/project-board-permissions-for-an-organization)”。
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.organization-wide-project %}
{% data reusables.project-management.select-project %}
{% data reusables.project-management.click-menu %}
diff --git a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-project-boards/managing-team-access-to-an-organization-project-board.md b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-project-boards/managing-team-access-to-an-organization-project-board.md
index 8d8141f68031..6e230c5c8a2f 100644
--- a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-project-boards/managing-team-access-to-an-organization-project-board.md
+++ b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-project-boards/managing-team-access-to-an-organization-project-board.md
@@ -34,7 +34,7 @@ shortTitle: 管理团队访问
{% endnote %}
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.organization-wide-project %}
{% data reusables.project-management.select-project %}
{% data reusables.project-management.click-menu %}
@@ -48,7 +48,7 @@ shortTitle: 管理团队访问
如果团队的项目板访问权限继承自父团队，您必须删除父团队的项目板访问权限，以更新子团队的访问权限。
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.specific_team %}
4. 在团队的对话上方，单击 {% octicon "project" aria-label="The Projects icon" %} **Projects（项目）**。 
5. 要更改权限级别，在要更新的项目板右侧使用下拉列表。 要删除项目板，请单击 **{% octicon "trash" aria-label="The trash icon" %}**。 
diff --git a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-project-boards/removing-an-outside-collaborator-from-an-organization-project-board.md b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-project-boards/removing-an-outside-collaborator-from-an-organization-project-board.md
index d46672537c00..1808759f2267 100644
--- a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-project-boards/removing-an-outside-collaborator-from-an-organization-project-board.md
+++ b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-project-boards/removing-an-outside-collaborator-from-an-organization-project-board.md
@@ -16,7 +16,7 @@ shortTitle: 删除外部协作者
---
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.organization-wide-project %}
{% data reusables.project-management.select-project %}
{% data reusables.project-management.click-menu %}
diff --git a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md
index 8735fe8696d9..91970401f2e8 100644
--- a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md
+++ b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md
@@ -1,6 +1,6 @@
---
title: 添加外部协作者到组织的仓库
-intro: '*外部协作者*并未明确是组织的成员，但对组织中的一个或多个仓库具有、读取、写入或管理员权限。'
+intro: 您可以允许不属于您组织成员的人员访问您的组织拥有的仓库。
redirect_from:
- /articles/adding-outside-collaborators-to-repositories-in-your-organization
- /github/setting-up-and-managing-organizations-and-teams/adding-outside-collaborators-to-repositories-in-your-organization
@@ -18,35 +18,32 @@ permissions: People with admin access to a repository can add an outside collabo
## 关于外部协作者
+外部协作者是指不是您组织的成员，但有权访问您组织的一个或多个仓库的人员。 您可以选择要为每个外部协作者授予的访问权限级别。 {% data reusables.organizations.outside_collaborator_forks %}
+
{% data reusables.organizations.outside-collaborators-use-seats %}
-组织所有者可以限制邀请协作者的能力。 更多信息请参阅“[设置添加外部协作者的权限](/articles/setting-permissions-for-adding-outside-collaborators)”。.
+组织所有者可以限制邀请协作者的能力。 更多信息请参阅“[设置添加外部协作者的权限](/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators)”。.
{% ifversion ghes %}
要将某人添加为仓库的外部协作者，此人必须在 {% data variables.product.product_location %} 上拥有用户帐户。 如果您的企业使用外部身份验证系统（如 SAML 或 LDAP），则要添加的人员必须通过该系统登录才能创建帐户。 如果此人无权访问身份验证系统，并且为您的企业启用了内置身份验证，则站点管理员可以为该人员创建用户帐户。 更多信息请参阅“[使用内置身份验证](/admin/authentication/authenticating-users-for-your-github-enterprise-server-instance/using-built-in-authentication#inviting-users)”。
{% endif %}
{% ifversion not ghae %}
-如果您的组织[要求成员和外部协作者使用双重身份验证](/articles/requiring-two-factor-authentication-in-your-organization)，则他们必须启用双重身份验证后才可接受您的邀请，协作处理组织仓库。
+如果您的组织需要双重身份验证，则在接受您的邀请以在仓库上进行协作之前，所有外部协作者都必须启用双重身份验证。 更多信息请参阅“[您的组织中需要双重身份验证](/organizations/keeping-your-organization-secure/managing-two-factor-authentication-for-your-organization/requiring-two-factor-authentication-in-your-organization)”。
{% endif %}
-{% data reusables.organizations.outside_collaborator_forks %}
-
{% ifversion fpt %}
为了进一步支持团队的协作能力，您可以升级到 {% data variables.product.prodname_ghe_cloud %}，其中包括受保护的分支机构和私有仓库的代码所有者等功能。 {% data reusables.enterprise.link-to-ghec-trial %}
{% endif %}
## 添加外部协作者到仓库
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5974 %}
+您可以在仓库设置中授予外部协作者访问仓库的权限。 更多信息请参阅“[管理有权访问仓库的团队和人员](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-teams-and-people-with-access-to-your-repository#inviting-a-team-or-person)”。
+{% else %}
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.sidebar-settings %}
-{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %}
-{% data reusables.repositories.click-collaborators-teams %}
-{% data reusables.organizations.invite-teams-or-people %}
-5. 在搜索字段中，开始键入您想邀请的人员的姓名，然后单击匹配列表中的姓名。 
-6. 在“Choose a role（选择角色）”下，选择要授予此人的权限，然后单击 **Add NAME to REPOSITORY（将姓名添加到仓库）**。 
-{% else %}
5. 在左侧边栏中，单击 **Collaborators & teams（协作者和团队）**。 
6. 在 "Collaborators"（协作者）下，输入您要授权其访问仓库的人员的名称，然后单击 **Add collaborator（添加协作者）**。 
-7. 在新协作者名称旁边，选择适当的权限级别：*写入*、*读取*或*管理员*。 
+7. 在新协作者的姓名旁边，使用下拉菜单并选择适当的访问权限级别。 
{% endif %}
diff --git a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/canceling-an-invitation-to-become-an-outside-collaborator-in-your-organization.md b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/canceling-an-invitation-to-become-an-outside-collaborator-in-your-organization.md
index bbb650517acc..3afe84ad25e7 100644
--- a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/canceling-an-invitation-to-become-an-outside-collaborator-in-your-organization.md
+++ b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/canceling-an-invitation-to-become-an-outside-collaborator-in-your-organization.md
@@ -18,7 +18,7 @@ shortTitle: 取消协作者邀请
对于每个待定协作者，您可以同时取消加入组织仓库的所有邀请。
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.people %}
{% data reusables.organizations.people_tab_outside_collaborators %}
5. 单击 **X pending collaborators（删除待定协作者）**。 
diff --git a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/converting-an-organization-member-to-an-outside-collaborator.md b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/converting-an-organization-member-to-an-outside-collaborator.md
index d77080b9f18e..bebbcc7a8340 100644
--- a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/converting-an-organization-member-to-an-outside-collaborator.md
+++ b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/converting-an-organization-member-to-an-outside-collaborator.md
@@ -33,7 +33,7 @@ shortTitle: 将成员转换为协作者
将组织成员转换为外部协作者时，他们作为组织成员的权限将保存三个月，因此，如果您在该时间范围内{% ifversion fpt or ghec %} 邀请他们重新加入{% else %} 将他们重新添加到{% endif %} 您的组织，您可以恢复其成员权限。 更多信息请参阅“[恢复组织的前成员](/articles/reinstating-a-former-member-of-your-organization)”。
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.people %}
4. 选择要转换为外部协作者的人员。 
5. 在成员列表的上方，使用下拉菜单并单击 **Convert to outside collaborator（转换为外部协作者）**。 
diff --git a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/converting-an-outside-collaborator-to-an-organization-member.md b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/converting-an-outside-collaborator-to-an-organization-member.md
index 5b3c98bc752b..4bbeda86127f 100644
--- a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/converting-an-outside-collaborator-to-an-organization-member.md
+++ b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/converting-an-outside-collaborator-to-an-organization-member.md
@@ -24,7 +24,7 @@ shortTitle: 将协作者转换为成员
{% endif %}
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.people %}
{% data reusables.organizations.people_tab_outside_collaborators %}
{% ifversion fpt or ghec %}
diff --git a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/managing-an-individuals-access-to-an-organization-repository.md b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/managing-an-individuals-access-to-an-organization-repository.md
index 7c71c1b48895..baf3527cd2d0 100644
--- a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/managing-an-individuals-access-to-an-organization-repository.md
+++ b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/managing-an-individuals-access-to-an-organization-repository.md
@@ -24,15 +24,15 @@ permissions: People with admin access to a repository can manage access to the r
{% data reusables.repositories.deleted_forks_from_private_repositories_warning %}
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5974 %}
+## 管理个人对组织仓库的访问
+您可以在仓库设置中授予个人对仓库的访问权限，或更改个人对仓库的访问权限级别。 更多信息请参阅“[管理有权访问仓库的团队和人员](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-teams-and-people-with-access-to-your-repository)”。
+{% else %}
## 授予用户对仓库的访问权限
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.sidebar-settings %}
-{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %}
-{% data reusables.repositories.click-collaborators-teams %}
-{% else %}
{% data reusables.repositories.navigate-to-manage-access %}
-{% endif %}
{% data reusables.organizations.invite-teams-or-people %}
1. 在搜索字段中，开始输入要邀请的人员的名称，然后单击匹配列表中的名称。 
6. 在“Choose a role（选择角色）”下，选择要授予此人的仓库角色，然后单击 **Add NAME to REPOSITORY（将姓名添加到仓库）**。 
@@ -40,13 +40,13 @@ permissions: People with admin access to a repository can manage access to the r
## 管理个人对组织仓库的访问
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.people %}
4. 单击 **Members（成员）**或 **Outside collaborators（外部协作者）**以管理具有不同访问权限的人员。 
5. 在您要管理的人员名称右侧，使用 {% octicon "gear" aria-label="The Settings gear" %} 下拉菜单，并单击 **Manage（管理）**。 
6. 在 "Manage access"（管理访问权限）页面上的仓库旁边，单击 **Manage access（管理访问权限）**。 
7. 检查个人对指定仓库的访问权限，例如他们是协作者还是通过团队成员资格来访问仓库。 
-
+{% endif %}
## 延伸阅读
{% ifversion fpt or ghec %}- "[限制与仓库的交互](/articles/limiting-interactions-with-your-repository)"{% endif %}
diff --git a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository.md b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository.md
index aa6980a54647..a25d2154d8c9 100644
--- a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository.md
+++ b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository.md
@@ -28,28 +28,40 @@ shortTitle: 管理团队访问
## 授予团队对仓库的访问权限
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5974 %}
+您可以在仓库设置中授予团队对仓库的访问权限，或更改团队对仓库的访问权限级别。 更多信息请参阅“[管理有权访问仓库的团队和人员](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-teams-and-people-with-access-to-your-repository#inviting-a-team-or-person)”。
+{% else %}
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.specific_team %}
{% data reusables.organizations.team-repositories-tab %}
5. 在仓库列表上方，单击 **Add repository（添加仓库）**。 
6. 输入仓库的名称，然后单击 **Add repository to team（添加仓库到团队）**。 
7. 也可选择在仓库名称右侧使用下拉菜单，为团队选择不同的权限级别。 
-
+{% endif %}
## 删除团队对仓库的访问权限
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5974 %}
+您可以在仓库设置中删除团队对组织仓库的访问权限。 更多信息请参阅“[管理有权访问仓库的团队和人员](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-teams-and-people-with-access-to-your-repository#removing-access-for-a-team-or-person)”。
+
+如果团队可以直接访问仓库，您可以删除该团队对仓库的访问。 如果团队对仓库的访问权限继承自父团队，则必须删除父团队对仓库的访问权限才可删除其子团队的相应权限。
+
+{% data reusables.repositories.deleted_forks_from_private_repositories_warning %}
+
+{% else %}
+
如果团队能够直接访问仓库，您可以更改其对仓库的访问权限。 如果团队对仓库的访问权限继承自父团队，则必须删除父团队对仓库的访问权限才可删除其子团队的相应权限。
{% data reusables.repositories.deleted_forks_from_private_repositories_warning %}
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.specific_team %}
{% data reusables.organizations.team-repositories-tab %}
5. 选择要从团队删除的仓库。 
6. 在仓库列表上方，使用下拉菜单，然后单击 **Remove from team（从团队删除）**。 
7. 检查要从团队删除的仓库，然后单击 **Remove repositories（删除仓库）**。 
-
+{% endif %}
## 延伸阅读
- "[组织的仓库角色](/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization)"
diff --git a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/reinstating-a-former-outside-collaborators-access-to-your-organization.md b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/reinstating-a-former-outside-collaborators-access-to-your-organization.md
index e9343ef194be..7c222a0747bb 100644
--- a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/reinstating-a-former-outside-collaborators-access-to-your-organization.md
+++ b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/reinstating-a-former-outside-collaborators-access-to-your-organization.md
@@ -40,7 +40,7 @@ shortTitle: 恢复协作者
{% endtip %}
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.people %}
{% data reusables.organizations.invite_member_from_people_tab %}
{% data reusables.organizations.reinstate-user-type-username %}
diff --git a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/removing-an-outside-collaborator-from-an-organization-repository.md b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/removing-an-outside-collaborator-from-an-organization-repository.md
index 62eeb2ed496e..73436f6a3cc9 100644
--- a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/removing-an-outside-collaborator-from-an-organization-repository.md
+++ b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/removing-an-outside-collaborator-from-an-organization-repository.md
@@ -33,7 +33,7 @@ shortTitle: 删除协作者
## 从组织中的所有仓库删除外部协作者
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.people %}
{% data reusables.organizations.people_tab_outside_collaborators %}
5. 选择您想要从组织中删除的一个或多个外部协作者。 
@@ -45,7 +45,7 @@ shortTitle: 删除协作者
如果只是想要从组织的特定仓库中删除外部协作者，则可以一次删除此人员对一个特定仓库的访问权限。
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.people %}
{% data reusables.organizations.people_tab_outside_collaborators %}
5. 在您想要删除的人员用户名右侧，使用 {% octicon "gear" aria-label="The Settings gear" %} 下拉菜单，并单击 **Manage（管理）**。 
@@ -53,6 +53,9 @@ shortTitle: 删除协作者
7. 要完全删除外部协作者对仓库的访问权限，在右上角单击 **Remove access to this repository（删除对此仓库的访问权限）**。 
8. 要确认，请单击 **Remove access（删除访问权限）**。 
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5974 %}
+您还可以在仓库设置的访问概述中从仓库中删除外部协作者。 更多信息请参阅“[管理有权访问仓库的团队和人员](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-teams-and-people-with-access-to-your-repository#removing-access-for-a-team-or-person)”。
+{% endif %}
## 延伸阅读
- “[将外部协作者添加到组织中的仓库](/articles/adding-outside-collaborators-to-repositories-in-your-organization)”
diff --git a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/viewing-people-with-access-to-your-repository.md b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/viewing-people-with-access-to-your-repository.md
index 1e2e03663779..a2b45ad24af0 100644
--- a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/viewing-people-with-access-to-your-repository.md
+++ b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/viewing-people-with-access-to-your-repository.md
@@ -16,23 +16,20 @@ shortTitle: 查看有访问权限的人
---
管理员可以使用此信息帮助非内部人员，收集数据用于合规性以及其他常规安全检查。
-
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5974 %}
+
+{% else %}
-
-## 查看具有仓库访问权限的人员
-
-{% ifversion fpt or ghec %}
-{% note %}
-
-**注**：您还可以查看有权访问仓库的团队和人员的组合概述。 更多信息请参阅“[管理有权访问仓库的团队和人员](/github/administering-a-repository/managing-teams-and-people-with-access-to-your-repository)”。
-
-{% endnote %}
{% endif %}
+## 查看具有仓库访问权限的人员
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5974 %}
+您可以在仓库设置中查看有权访问仓库的团队和人员的组合概述。 更多信息请参阅“[管理有权访问仓库的团队和人员](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-teams-and-people-with-access-to-your-repository#about-access-management-for-repositories)”。
+{% else %}
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.accessing-repository-graphs %}
{% data reusables.repositories.accessing-repository-people %}
-
+{% endif %}
## 导出具有您的仓库访问权限人员的列表
{% data variables.product.prodname_ghe_cloud %} 或 {% data variables.product.prodname_ghe_server %} 上的组织所有者可以导出具有仓库访问权限人员的 CSV 列表。
diff --git a/translations/zh-CN/content/organizations/managing-membership-in-your-organization/adding-people-to-your-organization.md b/translations/zh-CN/content/organizations/managing-membership-in-your-organization/adding-people-to-your-organization.md
index d093849e6b4d..0a885927156e 100644
--- a/translations/zh-CN/content/organizations/managing-membership-in-your-organization/adding-people-to-your-organization.md
+++ b/translations/zh-CN/content/organizations/managing-membership-in-your-organization/adding-people-to-your-organization.md
@@ -16,7 +16,7 @@ shortTitle: 将人员添加到组织
{% endif %}
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.people %}
{% data reusables.organizations.invite_member_from_people_tab %}
{% data reusables.organizations.invite_to_org %}
diff --git a/translations/zh-CN/content/organizations/managing-membership-in-your-organization/canceling-or-editing-an-invitation-to-join-your-organization.md b/translations/zh-CN/content/organizations/managing-membership-in-your-organization/canceling-or-editing-an-invitation-to-join-your-organization.md
index 16278c013bf5..a2671f014035 100644
--- a/translations/zh-CN/content/organizations/managing-membership-in-your-organization/canceling-or-editing-an-invitation-to-join-your-organization.md
+++ b/translations/zh-CN/content/organizations/managing-membership-in-your-organization/canceling-or-editing-an-invitation-to-join-your-organization.md
@@ -14,7 +14,7 @@ shortTitle: 取消或编辑邀请
---
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.people %}
4. 在 People（人员）选项卡上，单击 **Pending invitation（待定邀请）**。 
5. 在要编辑或取消其邀请的受邀人用户名或电子邮件地址旁边，单击 **Edit invitation（编辑邀请）**。 
diff --git a/translations/zh-CN/content/organizations/managing-membership-in-your-organization/exporting-member-information-for-your-organization.md b/translations/zh-CN/content/organizations/managing-membership-in-your-organization/exporting-member-information-for-your-organization.md
index 60d992d02db4..3e53f6b979b7 100644
--- a/translations/zh-CN/content/organizations/managing-membership-in-your-organization/exporting-member-information-for-your-organization.md
+++ b/translations/zh-CN/content/organizations/managing-membership-in-your-organization/exporting-member-information-for-your-organization.md
@@ -28,6 +28,6 @@ You can get member information directly from the {% data variables.product.produ
For more information about the APIs, see our [GraphQL API](/graphql/reference/objects#user) and [REST API](/rest/reference/users) documentation about users.
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.people %}
{% data reusables.organizations.people-export %}
diff --git a/translations/zh-CN/content/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization.md b/translations/zh-CN/content/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization.md
index 31b090c1f389..6d853d79d251 100644
--- a/translations/zh-CN/content/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization.md
+++ b/translations/zh-CN/content/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization.md
@@ -28,7 +28,7 @@ If your organization requires members to use two-factor authentication, users th
## Inviting a user to join your organization
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.people %}
{% data reusables.organizations.invite_member_from_people_tab %}
{% data reusables.organizations.invite_to_org %}
diff --git a/translations/zh-CN/content/organizations/managing-membership-in-your-organization/reinstating-a-former-member-of-your-organization.md b/translations/zh-CN/content/organizations/managing-membership-in-your-organization/reinstating-a-former-member-of-your-organization.md
index 4336c9754ee5..7689089637ce 100644
--- a/translations/zh-CN/content/organizations/managing-membership-in-your-organization/reinstating-a-former-member-of-your-organization.md
+++ b/translations/zh-CN/content/organizations/managing-membership-in-your-organization/reinstating-a-former-member-of-your-organization.md
@@ -55,7 +55,7 @@ If your organization has a paid per-user subscription, an unused license must be
## Reinstating a former member of your organization
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.people %}
{% data reusables.organizations.invite_member_from_people_tab %}
{% data reusables.organizations.reinstate-user-type-username %}
diff --git a/translations/zh-CN/content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md b/translations/zh-CN/content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md
index 80e88cf7a8a8..b4ec0b6ed6ff 100644
--- a/translations/zh-CN/content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md
+++ b/translations/zh-CN/content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md
@@ -55,7 +55,7 @@ shortTitle: 删除成员
## 撤销用户的成员身份
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.people %}
4. 选择您想要从组织中删除的成员。 
5. 在成员列表上方，使用下拉菜单，然后单击 **Remove from organization（从组织中删除）**。 
diff --git a/translations/zh-CN/content/organizations/managing-organization-settings/disabling-project-boards-in-your-organization.md b/translations/zh-CN/content/organizations/managing-organization-settings/disabling-project-boards-in-your-organization.md
index 8c9dfb369a18..6e7a6698e1f6 100644
--- a/translations/zh-CN/content/organizations/managing-organization-settings/disabling-project-boards-in-your-organization.md
+++ b/translations/zh-CN/content/organizations/managing-organization-settings/disabling-project-boards-in-your-organization.md
@@ -25,7 +25,7 @@ shortTitle: 禁用项目板
{% data reusables.profile.access_org %}
{% data reusables.profile.org_settings %}
{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %}
-1. In the "Code planning, and automation" section of the sidebar, click **{% octicon "table" aria-label="The table icon" %} Projects**.
+1. 在侧边栏的“Code planning, and automation（代码规划和自动化）”部分中，点击 **{% octicon "table" aria-label="The table icon" %} 项目**。
{% endif %}
1. 决定是否禁用组织范围的项目板，禁用组织中的仓库项目板，或两者均禁用。 然后，在“项目”（项目）下：
- 要禁用组织范围的项目板，请取消选择 **Enable projects for the organization（启用组织的项目）**。
diff --git a/translations/zh-CN/content/organizations/managing-organization-settings/index.md b/translations/zh-CN/content/organizations/managing-organization-settings/index.md
index c68a4aae6ce3..4daf8b7a3264 100644
--- a/translations/zh-CN/content/organizations/managing-organization-settings/index.md
+++ b/translations/zh-CN/content/organizations/managing-organization-settings/index.md
@@ -20,6 +20,7 @@ children:
- /setting-permissions-for-deleting-or-transferring-repositories
- /restricting-repository-visibility-changes-in-your-organization
- /managing-the-forking-policy-for-your-organization
+ - /managing-pull-request-reviews-in-your-organization
- /disabling-or-limiting-github-actions-for-your-organization
- /configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization
- /setting-permissions-for-adding-outside-collaborators
diff --git a/translations/zh-CN/content/organizations/managing-organization-settings/integrating-jira-with-your-organization-project-board.md b/translations/zh-CN/content/organizations/managing-organization-settings/integrating-jira-with-your-organization-project-board.md
index 752d895b95af..742954a3467f 100644
--- a/translations/zh-CN/content/organizations/managing-organization-settings/integrating-jira-with-your-organization-project-board.md
+++ b/translations/zh-CN/content/organizations/managing-organization-settings/integrating-jira-with-your-organization-project-board.md
@@ -16,7 +16,7 @@ shortTitle: 集成 Jira
1. 在左侧边栏中，选择 **{% octicon "code" aria-label="The code icon" %} 开发者设置**，然后单击 **OAuth Apps（OAuth 应用程序）**。 
1. 单击 **New OAuth App（新建 OAuth 应用程序）**。
{% else %}
-{% data reusables.user_settings.access_settings %}
+{% data reusables.user-settings.access_settings %}
1. 在左侧边栏的 **Organization settings（组织设置）**下，单击组织的名称。 
1. 在左侧边栏的 **Developer settings（开发者设置）**下，单击 **OAuth applications（OAuth 应用程序）**。 
1. 单击 **Register a new application（注册新应用程序）**。
@@ -26,7 +26,7 @@ shortTitle: 集成 Jira
3. 在 **Authorization callback URL（授权回叫 URL）**下，输入 Jira 实例的完整 URL。
4. 单击 **Register application（注册应用程序）**。 
9. 在 **Organization owned applications（组织拥有的应用程序）**下，记下 "Client ID"（客户 ID）和 "Client Secret"（客户端密钥）值。 
-{% data reusables.user_settings.jira_help_docs %}
+{% data reusables.user-settings.jira_help_docs %}
## 延伸阅读
diff --git a/translations/zh-CN/content/organizations/managing-organization-settings/managing-pull-request-reviews-in-your-organization.md b/translations/zh-CN/content/organizations/managing-organization-settings/managing-pull-request-reviews-in-your-organization.md
new file mode 100644
index 000000000000..2e709d88c291
--- /dev/null
+++ b/translations/zh-CN/content/organizations/managing-organization-settings/managing-pull-request-reviews-in-your-organization.md
@@ -0,0 +1,27 @@
+---
+title: Managing pull request reviews in your organization
+intro: You can limit which users can approve or request changes to a pull requests in your organization.
+versions:
+ feature: pull-request-approval-limit
+permissions: Organization owners can limit which users can submit reviews that approve or request changes to a pull request.
+topics:
+ - Organizations
+ - Pull requests
+shortTitle: Manage pull request reviews
+---
+
+## About code review limits
+
+By default, in public repositories, any user can submit reviews that approve or request changes to a pull request.
+
+You can limit who is able to approve or request changes to pull requests in public repositories owned by your organization. After you enable code review limits, anyone can comment on pull requests in your public repositories, but only people with explicit access to a repository can approve a pull request or request changes.
+
+You can also enable code review limits for individual repositories. If you enable or limits for your organization, you will override any limits for individual repositories owned by the organization. For more information, see "[Managing pull request reviews in your repository](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-pull-request-reviews-in-your-repository)."
+
+## Enabling code review limits
+
+{% data reusables.profile.access_org %}
+{% data reusables.profile.org_settings %}
+{% data reusables.organizations.moderation-settings %}
+1. Under "{% octicon "report" aria-label="The report icon" %} Moderation", click **Code review limits**. 
+1. Review the information on screen. Click **Limit review on all repositories** to limit reviews to those with explicit access, or click **Remove review limits from all repositories** to remove the limits from every public repository in your organization. 
diff --git a/translations/zh-CN/content/organizations/managing-organization-settings/verifying-or-approving-a-domain-for-your-organization.md b/translations/zh-CN/content/organizations/managing-organization-settings/verifying-or-approving-a-domain-for-your-organization.md
index fb152a3e3873..280fffbcc033 100644
--- a/translations/zh-CN/content/organizations/managing-organization-settings/verifying-or-approving-a-domain-for-your-organization.md
+++ b/translations/zh-CN/content/organizations/managing-organization-settings/verifying-or-approving-a-domain-for-your-organization.md
@@ -31,7 +31,7 @@ shortTitle: 验证或批准域
{% ifversion fpt or ghec %}在 {% data variables.product.prodname_ghe_cloud %} 上，验证组织域的所有权后，您可以将组织的电子邮件通知限制为该域。 更多信息请参阅“[限制组织的电子邮件通知](/organizations/keeping-your-organization-secure/restricting-email-notifications-for-your-organization)”。 {% ifversion fpt %}{% data reusables.enterprise.link-to-ghec-trial %}{% endif %}{% endif %}
-{% ifversion fpt or ghec %}You can also verify custom domains used for {% data variables.product.prodname_pages %} to prevent domain takeovers when a custom domain remains configured but your {% data variables.product.prodname_pages %} site is either disabled or no longer uses the domain. For more information, see "[Verifying your custom domain for {% data variables.product.prodname_pages %}](/pages/configuring-a-custom-domain-for-your-github-pages-site/verifying-your-custom-domain-for-github-pages)."{% endif %}
+{% ifversion fpt or ghec %}您还可以验证用于 {% data variables.product.prodname_pages %} 的自定义域，以防止在自定义域保持配置状态但您的 {% data variables.product.prodname_pages %} 站点被禁用或不再使用该域时域接管。 更多信息请参阅“[验证 {% data variables.product.prodname_pages %} 的自定义域](/pages/configuring-a-custom-domain-for-your-github-pages-site/verifying-your-custom-domain-for-github-pages)”。{% endif %}
## 关于域批准
diff --git a/translations/zh-CN/content/organizations/managing-peoples-access-to-your-organization-with-roles/maintaining-ownership-continuity-for-your-organization.md b/translations/zh-CN/content/organizations/managing-peoples-access-to-your-organization-with-roles/maintaining-ownership-continuity-for-your-organization.md
index f196c43a3d22..d71dd5c6d69a 100644
--- a/translations/zh-CN/content/organizations/managing-peoples-access-to-your-organization-with-roles/maintaining-ownership-continuity-for-your-organization.md
+++ b/translations/zh-CN/content/organizations/managing-peoples-access-to-your-organization-with-roles/maintaining-ownership-continuity-for-your-organization.md
@@ -34,7 +34,7 @@ shortTitle: 保持所有权连续性
## 任命组织所有者
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.people %}
4. 选择要晋升为所有者的人员。 
5. 在成员列表的上方，使用下拉菜单并单击 **Change role（更改角色）**。 
diff --git a/translations/zh-CN/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md b/translations/zh-CN/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md
index 1d667d9e3c96..5e08b5d1386b 100644
--- a/translations/zh-CN/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md
+++ b/translations/zh-CN/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md
@@ -99,7 +99,7 @@ You can only choose an additional permission if it's not already included in the
If a person is given different levels of access through different avenues, such as team membership and the base permissions for an organization, the highest access overrides the others. For example, if an organization owner gives an organization member a custom role that uses the "Read" inherited role, and then an organization owner sets the organization's base permission to "Write", then this custom role will have write access, along with any additional permissions included in the custom role.
-If a person has been given conflicting access, you'll see a warning on the repository access page. The warning appears with "{% octicon "alert" aria-label="The alert icon" %} Mixed roles" next to the person with the conflicting access. To see the source of the conflicting access, hover over the warning icon or click **Mixed roles**.
+{% data reusables.organizations.mixed-roles-warning %}
To resolve conflicting access, you can adjust your organization's base permissions or the team's access, or edit the custom role. 更多信息请参阅：
- “[设置组织的基本权限](/github/setting-up-and-managing-organizations-and-teams/setting-base-permissions-for-an-organization)”
diff --git a/translations/zh-CN/content/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization.md b/translations/zh-CN/content/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization.md
index 6b751cc4f6e1..2585d99f49f9 100644
--- a/translations/zh-CN/content/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization.md
+++ b/translations/zh-CN/content/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization.md
@@ -130,6 +130,7 @@ If your organization has a security team, you can use the security manager role
| 管理默认标签（请参阅“[管理组织中仓库的默认标签](/articles/managing-default-labels-for-repositories-in-your-organization)”） | **X** | | | |{% ifversion ghec %}
| 启用团队同步（详情请参阅“[管理组织的团队同步](/organizations/managing-saml-single-sign-on-for-your-organization/managing-team-synchronization-for-your-organization)”） | **X** | | |
{% endif %}
+| Manage pull request reviews in the organization (see "[Managing pull request reviews in your organization](/organizations/managing-organization-settings/managing-pull-request-reviews-in-your-organization)") | **X** | | | |
{% elsif ghes > 3.2 or ghae-issue-4999 %}
@@ -176,7 +177,9 @@ If your organization has a security team, you can use the security manager role
| 将组织成员转换为[外部协作者](#outside-collaborators) | **X** | | |
| [查看对组织仓库具有访问权限的人员](/articles/viewing-people-with-access-to-your-repository) | **X** | | |
| [导出具有组织仓库访问权限人员的列表](/articles/viewing-people-with-access-to-your-repository/#exporting-a-list-of-people-with-access-to-your-repository) | **X** | | |
-| 管理默认标签（请参阅“[管理组织中仓库的默认标签](/articles/managing-default-labels-for-repositories-in-your-organization)”） | **X** | | |
+| 管理默认标签（请参阅“[管理组织中仓库的默认标签](/articles/managing-default-labels-for-repositories-in-your-organization)”） | **X** | | |{% if pull-request-approval-limit %}
+| Manage pull request reviews in the organization (see "[Managing pull request reviews in your organization](/organizations/managing-organization-settings/managing-pull-request-reviews-in-your-organization)") | **X** | | |
+{% endif %}
{% ifversion ghae %}| Manage IP allow lists (see "[Restricting network traffic to your enterprise](/admin/configuration/restricting-network-traffic-to-your-enterprise)") | **X** | | |{% endif %}
diff --git a/translations/zh-CN/content/organizations/managing-saml-single-sign-on-for-your-organization/accessing-your-organization-if-your-identity-provider-is-unavailable.md b/translations/zh-CN/content/organizations/managing-saml-single-sign-on-for-your-organization/accessing-your-organization-if-your-identity-provider-is-unavailable.md
index ffb4f7eebe37..9f7f29490cc0 100644
--- a/translations/zh-CN/content/organizations/managing-saml-single-sign-on-for-your-organization/accessing-your-organization-if-your-identity-provider-is-unavailable.md
+++ b/translations/zh-CN/content/organizations/managing-saml-single-sign-on-for-your-organization/accessing-your-organization-if-your-identity-provider-is-unavailable.md
@@ -14,17 +14,9 @@ shortTitle: 不可用的身份提供程序
组织管理员可以使用[下载或保存的恢复代码](/articles/downloading-your-organization-s-saml-single-sign-on-recovery-codes)绕过单点登录。 您可能已将这些保存到密码管理器，如 [LastPass](https://lastpass.com/) 或 [1Password](https://1password.com/)。
-{% note %}
+{% data reusables.saml.recovery-code-caveats %}
-**注：**恢复代码只能使用一次，并且必须按连续的顺序使用。 恢复代码授予 24 小时访问权限。
-
-{% endnote %}
-
-1. 在单点登录对话框底部，单击 **Use a recovery code（使用恢复代码）**绕过单点登录。 
-2. 在 "Recovery Code"（恢复代码）字段中，输入您的恢复代码。 
-3. 单击 **Verify（验证）**。 
-
-请务必注意，恢复代码在使用后便不再有效。 恢复代码不能重复使用。
+{% data reusables.saml.recovery-code-access %}
## 延伸阅读
diff --git a/translations/zh-CN/content/organizations/migrating-to-improved-organization-permissions/converting-an-owners-team-to-improved-organization-permissions.md b/translations/zh-CN/content/organizations/migrating-to-improved-organization-permissions/converting-an-owners-team-to-improved-organization-permissions.md
index 687a4476bee4..3dd1cd716371 100644
--- a/translations/zh-CN/content/organizations/migrating-to-improved-organization-permissions/converting-an-owners-team-to-improved-organization-permissions.md
+++ b/translations/zh-CN/content/organizations/migrating-to-improved-organization-permissions/converting-an-owners-team-to-improved-organization-permissions.md
@@ -30,7 +30,7 @@ shortTitle: 转换所有者团队
{% endtip %}
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.owners-team %}
{% data reusables.organizations.convert-owners-team-confirm %}
5. 在团队名称字段中，为所有者团队选择一个新名称。 例如：
@@ -48,7 +48,7 @@ shortTitle: 转换所有者团队
{% endwarning %}
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.owners-team %}
{% data reusables.organizations.convert-owners-team-confirm %}
5. 在页面底部，查看警告，然后单击 **Delete the Owners team（删除所有者团队）**。 
diff --git a/translations/zh-CN/content/organizations/migrating-to-improved-organization-permissions/migrating-admin-teams-to-improved-organization-permissions.md b/translations/zh-CN/content/organizations/migrating-to-improved-organization-permissions/migrating-admin-teams-to-improved-organization-permissions.md
index 94aaf490176a..69b1a12102d0 100644
--- a/translations/zh-CN/content/organizations/migrating-to-improved-organization-permissions/migrating-admin-teams-to-improved-organization-permissions.md
+++ b/translations/zh-CN/content/organizations/migrating-to-improved-organization-permissions/migrating-admin-teams-to-improved-organization-permissions.md
@@ -40,6 +40,6 @@ shortTitle: 迁移管理团队
## 迁移单一管理员团队
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.specific_team %}
1. 在团队说明框中，单击 **Migrate team（迁移团队）**。 
diff --git a/translations/zh-CN/content/organizations/organizing-members-into-teams/adding-organization-members-to-a-team.md b/translations/zh-CN/content/organizations/organizing-members-into-teams/adding-organization-members-to-a-team.md
index 31c60c081be1..e0d4f0cefa7f 100644
--- a/translations/zh-CN/content/organizations/organizing-members-into-teams/adding-organization-members-to-a-team.md
+++ b/translations/zh-CN/content/organizations/organizing-members-into-teams/adding-organization-members-to-a-team.md
@@ -19,7 +19,7 @@ shortTitle: 将成员添加到团队
{% data reusables.organizations.team-synchronization %}
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.specific_team %}
{% data reusables.organizations.team_members_tab %}
6. 在团队成员列表上方，单击 **Add a member（添加成员）**。 
diff --git a/translations/zh-CN/content/organizations/organizing-members-into-teams/assigning-the-team-maintainer-role-to-a-team-member.md b/translations/zh-CN/content/organizations/organizing-members-into-teams/assigning-the-team-maintainer-role-to-a-team-member.md
index 48ad9abd9b86..47516fa5b50d 100644
--- a/translations/zh-CN/content/organizations/organizing-members-into-teams/assigning-the-team-maintainer-role-to-a-team-member.md
+++ b/translations/zh-CN/content/organizations/organizing-members-into-teams/assigning-the-team-maintainer-role-to-a-team-member.md
@@ -41,7 +41,7 @@ People with the team maintainer role can manage team membership and settings.
Before you can promote an organization member to team maintainer, the person must already be a member of the team.
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.specific_team %}
{% data reusables.organizations.team_members_tab %}
4. 选择要将其升级为团队维护员的人员。 
diff --git a/translations/zh-CN/content/organizations/organizing-members-into-teams/changing-team-visibility.md b/translations/zh-CN/content/organizations/organizing-members-into-teams/changing-team-visibility.md
index f6ca68b62c81..a67463a23b09 100644
--- a/translations/zh-CN/content/organizations/organizing-members-into-teams/changing-team-visibility.md
+++ b/translations/zh-CN/content/organizations/organizing-members-into-teams/changing-team-visibility.md
@@ -23,7 +23,7 @@ topics:
{% endtip %}
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.teams %}
3. 选择要更改其可见性的一个或多个团队。 
4. 在团队列表的上方，使用下拉菜单并单击 **Change visibility（更改可见性）**。 
diff --git a/translations/zh-CN/content/organizations/organizing-members-into-teams/creating-a-team.md b/translations/zh-CN/content/organizations/organizing-members-into-teams/creating-a-team.md
index dbe245a37d7d..ea5f0a23d55e 100644
--- a/translations/zh-CN/content/organizations/organizing-members-into-teams/creating-a-team.md
+++ b/translations/zh-CN/content/organizations/organizing-members-into-teams/creating-a-team.md
@@ -20,7 +20,7 @@ topics:
{% data reusables.organizations.team-synchronization %}
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.new_team %}
{% data reusables.organizations.team_name %}
{% data reusables.organizations.team_description %}
diff --git a/translations/zh-CN/content/organizations/organizing-members-into-teams/deleting-a-team.md b/translations/zh-CN/content/organizations/organizing-members-into-teams/deleting-a-team.md
index 9d4d659ee901..f74efaf04ada 100644
--- a/translations/zh-CN/content/organizations/organizing-members-into-teams/deleting-a-team.md
+++ b/translations/zh-CN/content/organizations/organizing-members-into-teams/deleting-a-team.md
@@ -21,7 +21,7 @@ topics:
{% endtip %}
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.teams %}
4. 选择要删除的团队。 
5. 在团队列表上方，使用下拉菜单并单击 **Delete（删除）**。 
diff --git a/translations/zh-CN/content/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team.md b/translations/zh-CN/content/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team.md
index 4c1f6a07f897..4565050b6d70 100644
--- a/translations/zh-CN/content/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team.md
+++ b/translations/zh-CN/content/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team.md
@@ -54,7 +54,7 @@ When code owners are automatically requested for review, the team is still remov
## Configuring team notifications
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.specific_team %}
{% data reusables.organizations.team_settings %}
{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %}
@@ -68,7 +68,7 @@ When code owners are automatically requested for review, the team is still remov
## Configuring auto assignment
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.specific_team %}
{% data reusables.organizations.team_settings %}
{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %}
@@ -92,7 +92,7 @@ When code owners are automatically requested for review, the team is still remov
## Disabling auto assignment
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.specific_team %}
{% data reusables.organizations.team_settings %}
1. 选择 **Enable auto assignment（启用自动分配）**以删除复选标记。 
diff --git a/translations/zh-CN/content/organizations/organizing-members-into-teams/managing-scheduled-reminders-for-your-team.md b/translations/zh-CN/content/organizations/organizing-members-into-teams/managing-scheduled-reminders-for-your-team.md
index 2298c5379c16..cb49dc8dddfe 100644
--- a/translations/zh-CN/content/organizations/organizing-members-into-teams/managing-scheduled-reminders-for-your-team.md
+++ b/translations/zh-CN/content/organizations/organizing-members-into-teams/managing-scheduled-reminders-for-your-team.md
@@ -23,7 +23,7 @@ shortTitle: 预定提醒
## 为团队创建预定提醒
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.specific_team %}
{% data reusables.organizations.team_settings %}
{% data reusables.reminders.scheduled-reminders %}
@@ -46,7 +46,7 @@ shortTitle: 预定提醒
## 管理团队的预定提醒
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.specific_team %}
{% data reusables.organizations.team_settings %}
{% data reusables.reminders.scheduled-reminders %}
@@ -56,7 +56,7 @@ shortTitle: 预定提醒
## Deleting a scheduled reminder for a team
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.specific_team %}
{% data reusables.organizations.team_settings %}
{% data reusables.reminders.scheduled-reminders %}
diff --git a/translations/zh-CN/content/organizations/organizing-members-into-teams/moving-a-team-in-your-organizations-hierarchy.md b/translations/zh-CN/content/organizations/organizing-members-into-teams/moving-a-team-in-your-organizations-hierarchy.md
index d265f1efc0c0..d1c7c4b49874 100644
--- a/translations/zh-CN/content/organizations/organizing-members-into-teams/moving-a-team-in-your-organizations-hierarchy.md
+++ b/translations/zh-CN/content/organizations/organizing-members-into-teams/moving-a-team-in-your-organizations-hierarchy.md
@@ -30,7 +30,7 @@ shortTitle: 移动团队
{% endtip %}
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.teams %}
4. 在团队列表中，单击您要更改其父团队的团队名称。 
{% data reusables.organizations.team_settings %}
diff --git a/translations/zh-CN/content/organizations/organizing-members-into-teams/removing-organization-members-from-a-team.md b/translations/zh-CN/content/organizations/organizing-members-into-teams/removing-organization-members-from-a-team.md
index f41fb2bc0208..8a112ce80005 100644
--- a/translations/zh-CN/content/organizations/organizing-members-into-teams/removing-organization-members-from-a-team.md
+++ b/translations/zh-CN/content/organizations/organizing-members-into-teams/removing-organization-members-from-a-team.md
@@ -19,7 +19,7 @@ shortTitle: 删除成员
{% data reusables.repositories.deleted_forks_from_private_repositories_warning %}
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.specific_team %}
4. 选择您想要删除的一个或多个人员。 
5. 在团队成员列表上方，使用下拉菜单，然后单击 **Remove from team（从团队中删除）**。 
diff --git a/translations/zh-CN/content/organizations/organizing-members-into-teams/renaming-a-team.md b/translations/zh-CN/content/organizations/organizing-members-into-teams/renaming-a-team.md
index 5a115ce850ca..a8172c670110 100644
--- a/translations/zh-CN/content/organizations/organizing-members-into-teams/renaming-a-team.md
+++ b/translations/zh-CN/content/organizations/organizing-members-into-teams/renaming-a-team.md
@@ -15,7 +15,7 @@ topics:
---
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.specific_team %}
{% data reusables.organizations.team_settings %}
5. 输入团队的新名称或说明。 
diff --git a/translations/zh-CN/content/organizations/organizing-members-into-teams/requesting-to-add-a-child-team.md b/translations/zh-CN/content/organizations/organizing-members-into-teams/requesting-to-add-a-child-team.md
index afa5bf00e09b..65f09d50c4f3 100644
--- a/translations/zh-CN/content/organizations/organizing-members-into-teams/requesting-to-add-a-child-team.md
+++ b/translations/zh-CN/content/organizations/organizing-members-into-teams/requesting-to-add-a-child-team.md
@@ -22,7 +22,7 @@ shortTitle: 添加子团队
{% data reusables.organizations.child-team-inherits-permissions %}
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.teams %}
4. 在团队列表中，单击您要在其中添加子团队的父团队名称。 
5. 在团队页面顶部，单击 {% octicon "people" aria-label="The people icon" %} **Teams（团队）**。 
diff --git a/translations/zh-CN/content/organizations/organizing-members-into-teams/requesting-to-add-or-change-a-parent-team.md b/translations/zh-CN/content/organizations/organizing-members-into-teams/requesting-to-add-or-change-a-parent-team.md
index 245d0e45f16f..89cbf4dd2d5b 100644
--- a/translations/zh-CN/content/organizations/organizing-members-into-teams/requesting-to-add-or-change-a-parent-team.md
+++ b/translations/zh-CN/content/organizations/organizing-members-into-teams/requesting-to-add-or-change-a-parent-team.md
@@ -22,7 +22,7 @@ shortTitle: 添加或更改父团队
{% data reusables.organizations.child-team-inherits-permissions %}
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.teams %}
4. 在团队列表中，单击您要在父团队下嵌套的团队的名称。 
{% data reusables.organizations.team_settings %}
diff --git a/translations/zh-CN/content/organizations/organizing-members-into-teams/setting-your-teams-profile-picture.md b/translations/zh-CN/content/organizations/organizing-members-into-teams/setting-your-teams-profile-picture.md
index c74625870180..406f7c373300 100644
--- a/translations/zh-CN/content/organizations/organizing-members-into-teams/setting-your-teams-profile-picture.md
+++ b/translations/zh-CN/content/organizations/organizing-members-into-teams/setting-your-teams-profile-picture.md
@@ -19,7 +19,7 @@ shortTitle: 团队头像
除非您设置团队的头像，否则团队头像将与组织的头像一致。
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.specific_team %}
{% data reusables.organizations.team_settings %}
5. 单击 **Upload new picture（上传新图片）**并选择所需的头像。 
diff --git a/translations/zh-CN/content/organizations/organizing-members-into-teams/synchronizing-a-team-with-an-identity-provider-group.md b/translations/zh-CN/content/organizations/organizing-members-into-teams/synchronizing-a-team-with-an-identity-provider-group.md
index 91450cd1b09b..db7820dfb01e 100644
--- a/translations/zh-CN/content/organizations/organizing-members-into-teams/synchronizing-a-team-with-an-identity-provider-group.md
+++ b/translations/zh-CN/content/organizations/organizing-members-into-teams/synchronizing-a-team-with-an-identity-provider-group.md
@@ -77,7 +77,7 @@ shortTitle: 与 IdP 同步
将 IdP 组连接到 {% data variables.product.product_name %} 团队时，组中的所有用户都会自动添加到团队中。 {% ifversion ghae %}任何尚未成为父组织成员的用户也会添加到组织。{% endif %}
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.specific_team %}
{% data reusables.organizations.team_settings %}
{% ifversion ghec %}
@@ -90,7 +90,7 @@ shortTitle: 与 IdP 同步
如果您断开 IdP 组与 {% data variables.product.prodname_dotcom %} 团队的连接，则通过 IdP 组分配给 {% data variables.product.prodname_dotcom %} 团队的团队成员将从团队中删除。 {% ifversion ghae %} 任何只是因为团队连接而成为父组织成员的用户也会从组织中删除。{% endif %}
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
{% data reusables.organizations.specific_team %}
{% data reusables.organizations.team_settings %}
{% ifversion ghec %}
diff --git a/translations/zh-CN/content/packages/learn-github-packages/about-permissions-for-github-packages.md b/translations/zh-CN/content/packages/learn-github-packages/about-permissions-for-github-packages.md
index 034353899453..449ca03e9cc8 100644
--- a/translations/zh-CN/content/packages/learn-github-packages/about-permissions-for-github-packages.md
+++ b/translations/zh-CN/content/packages/learn-github-packages/about-permissions-for-github-packages.md
@@ -47,7 +47,7 @@ shortTitle: 关于权限
例如：
- 要从仓库下载和安装包，您的令牌必须具有 `read:packages` 作用域，并且您的用户帐户必须具有读取权限。
-- {% ifversion fpt or ghes > 3.0 or ghec %}要在 {% data variables.product.product_name %}上删除软件包，您的令牌至少必须有 `delete:packages` 和 `read:packages` 作用域。 Repo-scoped 软件包也需要 `repo` 作用域。{% elsif ghes < 3.1 %}要在 {% data variables.product.product_name %} 上删除私有软件的指定版本，您的令牌必须具有 `delete:packages` 和 `repo` 作用域。 Public packages cannot be deleted.{% elsif ghae %}To delete a specified version of a package on {% data variables.product.product_name %}, your token must have the `delete:packages` and `repo` scope.{% endif %} For more information, see "{% ifversion fpt or ghes > 3.0 or ghec or ghae %}[Deleting and restoring a package](/packages/learn-github-packages/deleting-and-restoring-a-package){% elsif ghes < 3.1 %}[Deleting a package](/packages/learn-github-packages/deleting-a-package){% endif %}."
+- {% ifversion fpt or ghes > 3.0 or ghec %}要在 {% data variables.product.product_name %}上删除软件包，您的令牌至少必须有 `delete:packages` 和 `read:packages` 作用域。 Repo-scoped 软件包也需要 `repo` 作用域。{% elsif ghes < 3.1 %}要在 {% data variables.product.product_name %} 上删除私有软件的指定版本，您的令牌必须具有 `delete:packages` 和 `repo` 作用域。 公共包不能删除。{% elsif ghae %}要在 {% data variables.product.product_name %} 上删除包的指定版本，您必须具有 `delete:packages` 和 `repo` 作用域。{% endif %} 更多信息请参阅“{% ifversion fpt or ghes > 3.0 or ghec or ghae %}[删除和恢复包](/packages/learn-github-packages/deleting-and-restoring-a-package){% elsif ghes < 3.1 %}[删除包](/packages/learn-github-packages/deleting-a-package){% endif %}”。
| 作用域 | 描述 | 所需权限 |
| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------- | ------ |
diff --git a/translations/zh-CN/content/packages/learn-github-packages/configuring-a-packages-access-control-and-visibility.md b/translations/zh-CN/content/packages/learn-github-packages/configuring-a-packages-access-control-and-visibility.md
index 9d40ba17d12a..4c92d59dea59 100644
--- a/translations/zh-CN/content/packages/learn-github-packages/configuring-a-packages-access-control-and-visibility.md
+++ b/translations/zh-CN/content/packages/learn-github-packages/configuring-a-packages-access-control-and-visibility.md
@@ -86,33 +86,33 @@ shortTitle: 访问控制和可见性
要进一步自定义对容器映像的访问，请参阅“[配置对组织的容器映像的访问](#configuring-access-to-container-images-for-an-organization)”。
-## Ensuring {% data variables.product.prodname_codespaces %} access to your package
+## 确保 {% data variables.product.prodname_codespaces %} 访问您的软件包
-By default, a codespace can seamlessly access certain packages in the {% data variables.product.prodname_dotcom %} Container Registry, such as those published in the same repository with the **Inherit access** option selected. For more information on which access is automatically configured, see "[Accessing images stored in {% data variables.product.prodname_dotcom %} Container Registry](/codespaces/codespaces-reference/allowing-your-codespace-to-access-a-private-image-registry#accessing-images-stored-in-github-container-registry)."
+默认情况下，代码空间可以无缝访问 {% data variables.product.prodname_dotcom %} 容器注册表中的某些包，例如在选中了 **Inherit access（继承访问）**选项的同一仓库中发布的包。 有关自动配置哪些访问权限的详细信息，请参阅“[访问存储在容器注册表 {% data variables.product.prodname_dotcom %} 中的映像](/codespaces/codespaces-reference/allowing-your-codespace-to-access-a-private-image-registry#accessing-images-stored-in-github-container-registry)”。
-Otherwise, to ensure that a codespace has access to your package, you must grant access to the repository where the codespace is being launched.
+否则，为了确保代码空间能够访问您的软件包，必须授予对启动代码空间的仓库的访问权限。
-指定的仓库不需要是保存包源代码的仓库。 You can give codespaces in multiple repositories access to a package.
+指定的仓库不需要是保存包源代码的仓库。 您可以授予多个仓库中的代码空间对包的访问权限。
-Once you've selected the package you're interested in sharing with codespaces in a repository, you can grant that repo access.
+选择您想与仓库中的代码空间共享的包后，可以授予该仓库访问权限。
-1. In the right sidebar, click **Package settings**.
+1. 在右侧边栏单击 **Package settings（包设置）**。
- 
+ 
-2. Under "Manage Codespaces access", click **Add repository**.
+2. 在“Manage Codespaces access（管理 Codespaces 访问）”下，单击 **Add repository（添加仓库）**。
-3. Search for the repository you want to add.
+3. 搜索要添加的仓库。
-4. Repeat for any additional repositories you would like to allow access.
+4. 对要允许访问的任何其他仓库重复此步骤。
-5. If the codespaces for a repository no longer need access to an image, you can remove access.
+5. 如果仓库的代码空间不再需要访问映像，则可以删除访问权限。
- 
+ 
## 为个人帐户配置容器映像的可见性
@@ -140,7 +140,7 @@ Once you've selected the package you're interested in sharing with codespaces in
6. 在“Container creation（容器创建）”下，选择是要启用公共、私有或内部容器映像。
- 要让组织成员创建公共容器映像，请单击 **Public（公共）**。
- 要让组织成员创建只对其他组织成员可见的私有容器映像，请单击 **Private（私有）**。 您可以进一步自定义私有容器映像的可见性。
- - To enable organization members to create internal container images that are visible to all organization members, click **Internal**. If the organization belongs to an enterprise, the container images will be visible to all enterprise members. 
+ - 要使组织成员能够创建对所有组织成员可见的内部容器映像，请单击 **Internal（内部）**。 如果组织属于企业，则容器映像将对所有企业成员可见。 
## 为组织配置容器映像的可见性
diff --git a/translations/zh-CN/content/packages/learn-github-packages/deleting-and-restoring-a-package.md b/translations/zh-CN/content/packages/learn-github-packages/deleting-and-restoring-a-package.md
index 1c25862e1021..35037f14f4af 100644
--- a/translations/zh-CN/content/packages/learn-github-packages/deleting-and-restoring-a-package.md
+++ b/translations/zh-CN/content/packages/learn-github-packages/deleting-and-restoring-a-package.md
@@ -211,7 +211,7 @@ HOSTNAME/graphql
如果包在您的一个仓库中或范围限于您的用户帐，则您可以通过用户帐户设置恢复已删除的包。 更多信息请参阅“[必需权限](#required-permissions-to-delete-or-restore-a-package)”。
-{% data reusables.user_settings.access_settings %}
+{% data reusables.user-settings.access_settings %}
2. 在左侧，单击 **Packages（包）**。
4. 在“Deleted Packages（已删除的包）”下要恢复的包旁边，单击 **Restore（恢复）**。 
5. 要确认，请输入包名称，然后单击**I understand the consequences, restore this package（我明白后果，恢复此包）**。 
diff --git a/translations/zh-CN/content/packages/learn-github-packages/viewing-packages.md b/translations/zh-CN/content/packages/learn-github-packages/viewing-packages.md
index 47c20f206326..5b7d3a04e906 100644
--- a/translations/zh-CN/content/packages/learn-github-packages/viewing-packages.md
+++ b/translations/zh-CN/content/packages/learn-github-packages/viewing-packages.md
@@ -51,7 +51,7 @@ versions:
您可以查找并查看位于您所属组织的仓库中的包。
{% data reusables.profile.access_org %}
-{% data reusables.user_settings.access_org %}
+{% data reusables.user-settings.access_org %}
3. 在组织名称下，单击 {% octicon "package" aria-label="The package icon" %} **Packages（包）**。
{% data reusables.package_registry.navigate-to-packages %}
diff --git a/translations/zh-CN/content/pages/configuring-a-custom-domain-for-your-github-pages-site/verifying-your-custom-domain-for-github-pages.md b/translations/zh-CN/content/pages/configuring-a-custom-domain-for-your-github-pages-site/verifying-your-custom-domain-for-github-pages.md
index fc37d655fb74..d8e5302de3e4 100644
--- a/translations/zh-CN/content/pages/configuring-a-custom-domain-for-your-github-pages-site/verifying-your-custom-domain-for-github-pages.md
+++ b/translations/zh-CN/content/pages/configuring-a-custom-domain-for-your-github-pages-site/verifying-your-custom-domain-for-github-pages.md
@@ -22,7 +22,7 @@ It's also possible to verify a domain for your organization{% ifversion ghec %}
## Verifying a domain for your user site
-{% data reusables.user_settings.access_settings %}
+{% data reusables.user-settings.access_settings %}
1. In the "Code, planning, and automation" section of the sidebar, click **{% octicon "browser" aria-label="The pages icon" %} Pages**.
{% data reusables.pages.settings-verify-domain-setup %}
1. Wait for your DNS configuration to change, this may be immediate or take up to 24 hours. You can confirm the change to your DNS configuration by running the `dig` command on the command line. In the command below, replace `USERNAME` with your username and `example.com` with the domain you're verifying. If your DNS configuration has updated, you should see your new TXT record in the output.
diff --git a/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request.md b/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request.md
index c97f07dfcb6e..7d0f9e3a27ab 100644
--- a/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request.md
+++ b/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request.md
@@ -37,8 +37,18 @@ You can provide feedback about auto-merge through a [{% data variables.product.p
1. 在“Pull Requests（拉取请求）”列表中，单击要自动合并的拉取请求。
1. （可选）要选择合并方法，请选择 **Enable auto-merge（启用自动合并）**下拉菜单，然后单击合并方法。 更多信息请参阅“[关于拉取请求合并](/github/collaborating-with-issues-and-pull-requests/about-pull-request-merges)”。 
1. 单击 **Enable auto-merge（启用自动合并）**。 
+ {% ifversion fpt %}
1. 如果选择合并或压缩并合并方法，请输入提交消息和说明，然后选择要创作合并提交的电子邮件地址。 
-1. 单击 **Confirm auto-merge（确认自动合并）**。 
+ {% note %}
+
+ **Note:** The email dropdown menu is not available if you have email privacy enabled or if you only have one verified and visible email associated with your {% data variables.product.company_short %} account.
+
+ {% endnote %}
+ {% endif %}
+ {% ifversion ghes > 3.0 or ghae or ghec %}
+1. If you chose the merge or squash and merge methods, type a commit message and description. 
+ {% endif %}
+1. 单击 **Confirm auto-merge（确认自动合并）**。
## 禁用自动合并
diff --git a/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/reverting-a-pull-request.md b/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/reverting-a-pull-request.md
index 6aaa57151527..9650377408c9 100644
--- a/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/reverting-a-pull-request.md
+++ b/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/reverting-a-pull-request.md
@@ -17,7 +17,7 @@ topics:
## 关于还原拉取请求
-在 {% data variables.product.product_name %} 上还原拉取请求会创建一个新拉取请求。其中包含原始合并拉取请求中一个还原的合并提交。
+在 {% data variables.product.product_name %} 上还原拉取请求会创建一个新拉取请求。其中包含原始合并拉取请求中一个还原的合并提交。 To revert pull requests, you must have [write permissions](/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization) in the repository.
## 还原拉取请求
@@ -34,5 +34,5 @@ topics:
{% data reusables.repositories.sidebar-pr %}
2. 在“Pull Requests（拉取请求）”列表中，单击要还原的拉取请求。
-3. 在拉取请求底部附近，单击 **Revert（还原）**。 
+3. 在拉取请求底部附近，单击 **Revert（还原）**。 If the **Revert** option isn't displayed, you'll need to ask the repository administrator for write permissions. 
4. 合并产生的拉取请求。 更多信息请参阅“[合并拉取请求](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request)”。
diff --git a/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests.md b/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests.md
index a15a7a7cdd66..e418e06287d2 100644
--- a/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests.md
+++ b/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests.md
@@ -32,7 +32,7 @@ You can create pull requests on {% data variables.product.prodname_dotcom_the_we
在创建拉取请求后，您可以从主题分支推送提交，以将它们添加到现有的拉取请求。 这些提交将以时间顺序显示在您的拉取请求中，在 "Files changed"（更改的文件）选项卡中可以看到更改。
-其他贡献者可以审查您提议的更改，添加审查注释，参与拉取请求讨论，甚至对拉取请求添加评论。
+其他贡献者可以审查您提议的更改，添加审查注释，参与拉取请求讨论，甚至对拉取请求添加评论。 {% if pull-request-approval-limit %}{% data reusables.pull_requests.code-review-limits %}{% endif %}
{% ifversion fpt or ghec %}
您可以在“Conversation（对话）”选项卡上查看有关分支当前部署状态和以前部署活动的信息。 更多信息请参阅“[查看仓库的部署活动](/repositories/viewing-activity-and-data-for-your-repository/viewing-deployment-activity-for-your-repository)”。
@@ -72,6 +72,6 @@ You can create pull requests on {% data variables.product.prodname_dotcom_the_we
## 延伸阅读
- {% data variables.product.prodname_dotcom %} 词汇中的“[拉取请求](/articles/github-glossary/#pull-request)”
-- "[About branches](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-branches)"
+- "[关于分支](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-branches)"
- "[评论拉取请求](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/commenting-on-a-pull-request)"
- "[关闭拉取请求](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/closing-a-pull-request)"
diff --git a/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-and-deleting-branches-within-your-repository.md b/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-and-deleting-branches-within-your-repository.md
index 40842bc2649c..e65022bbf5cc 100644
--- a/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-and-deleting-branches-within-your-repository.md
+++ b/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-and-deleting-branches-within-your-repository.md
@@ -45,6 +45,6 @@ shortTitle: 创建和删除分支
## 延伸阅读
-- "[About branches](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-branches)"
+- "[关于分支](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-branches)"
- “[查看仓库中的分支](/github/administering-a-repository/viewing-branches-in-your-repository)”
- "[删除和恢复拉取请求中的分支](/github/administering-a-repository/deleting-and-restoring-branches-in-a-pull-request)"
diff --git a/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/requesting-a-pull-request-review.md b/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/requesting-a-pull-request-review.md
index ca97a53b1339..7afd4c566b8c 100644
--- a/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/requesting-a-pull-request-review.md
+++ b/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/requesting-a-pull-request-review.md
@@ -1,6 +1,7 @@
---
title: 请求拉取请求审查
intro: 创建拉取请求后，您可以请求特定人员审查您提议的更改。 如果您是组织成员，还可以请求特定团队审查您的更改。
+product: '{% data reusables.gated-features.multiple-pr-reviewers %}'
redirect_from:
- /github/collaborating-with-issues-and-pull-requests/proposing-changes-to-your-work-with-pull-requests/requesting-a-pull-request-review
- /articles/requesting-a-pull-request-review
@@ -29,9 +30,9 @@ shortTitle: 请求 PR 审查
您可以向建议的或特定的人员请求审查。 建议的审查者基于 [git 追溯数据](/articles/tracking-changes-in-a-file/)。 如果您请求审查，则具有仓库读取权限的其他人仍可审查您的拉取请求。 在有人审查您的拉取请求后您做了必要的更改，您可以重新请求同一审查者再次审查。 如果请求的审查者未提交审查，并且拉取请求满足仓库的[可合并性要求](/articles/defining-the-mergeability-of-pull-requests)，则您仍然可以合并该拉取请求。
{% data reusables.repositories.sidebar-pr %}
-2. 在拉取请求列表中，单击您想要请求特定人员或团队审查的拉取请求。
-3. 导航到右侧边栏中的 **Reviewers（审查者）**。
-4. 要向建议的人员请求审查，在 **Reviewers（审查者）**下其用户名旁边，单击 **Request（请求）**。 
+1. 在拉取请求列表中，单击您想要请求特定人员或团队审查的拉取请求。
+2. 导航到右侧边栏中的 **Reviewers（审查者）**。
+3. 要向建议的人员请求审查，在 **Reviewers（审查者）**下其用户名旁边，单击 **Request（请求）**。 
5. （可选）要向建议人员以外的其他人请求审查，请单击 **Reviewers（审查者）**，然后单击下拉列表中的姓名。 
6. （可选）如果您知道想要其审查的人员或团队的名称，请单击 **Reviewers（审查者）**，然后输入您请求审查更改的人员用户名或团队名称。 单击其团队名称或用户名以请求审查。 
7. 审查您的拉取请求并且您已进行必要的更改后，可以请求审查者重新审查您的拉取请求。 导航到右侧边栏中的 **Reviewers（审查者）**，然后单击您想要其审查的审查者姓名旁边的 {% octicon "sync" aria-label="The sync icon" %}。 
diff --git a/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/about-pull-request-reviews.md b/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/about-pull-request-reviews.md
index d66121e209c9..56f1dd8e2131 100644
--- a/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/about-pull-request-reviews.md
+++ b/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/about-pull-request-reviews.md
@@ -20,6 +20,8 @@ shortTitle: 关于 PR 审查
打开拉取请求后，具有*读取*权限的任何人都可以查看该拉取请求提议的更改并进行评论。 您也可以建议对代码行的具体更改，作者可直接从拉取请求应用这些更改。 更多信息请参阅“[审查拉取请求中提议的更改](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request)”。
+{% if pull-request-approval-limit %}{% data reusables.pull_requests.code-review-limits %}{% endif %}
+
仓库所有者和协作者可向具体的个人申请拉取请求审查。 组织成员也可向具有仓库读取权限的团队申请拉取请求审查。 更多信息请参阅“[申请拉取请求审查](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/requesting-a-pull-request-review)”。 {% ifversion fpt or ghae or ghes or ghec %}您可以指定自动分配一部分团队成员，而不是分配整个团队。 For more information, see "[Managing code review settings for your team](/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team)."{% endif %}
审查允许讨论提议的更改，帮助确保更改符合仓库的参与指南及其他质量标准。 您可以在 CODEOWNERS 文件中定义哪些个人或团队拥有代码的特定类型或区域。 当拉取请求修改定义了所有者的代码时，该个人或团队将自动被申请为审查者。 更多信息请参阅“[关于代码所有者](/articles/about-code-owners/)”。
diff --git a/translations/zh-CN/content/repositories/archiving-a-github-repository/archiving-repositories.md b/translations/zh-CN/content/repositories/archiving-a-github-repository/archiving-repositories.md
index 5ddc0bb3049c..a5146ec04852 100644
--- a/translations/zh-CN/content/repositories/archiving-a-github-repository/archiving-repositories.md
+++ b/translations/zh-CN/content/repositories/archiving-a-github-repository/archiving-repositories.md
@@ -27,6 +27,14 @@ topics:
{% endnote %}
{% endif %}
+{% ifversion ghec or ghes > 3.4 or ghae-issue-6329 %}
+{% note %}
+
+**Note:** Customers who use {% data variables.product.prodname_GH_advanced_security %} can enable {% data variables.product.prodname_secret_scanning %} on archived repositories. 更多信息请参阅“[关于 {% data variables.product.prodname_secret_scanning %}](/code-security/secret-scanning/about-secret-scanning#about-secret-scanning-for-private-repositories)”。
+
+{% endnote %}
+{% endif %}
+
{% data reusables.repositories.archiving-repositories-recommendation %}
在仓库存档后，便无法添加或删除协作者或团队。 具有仓库访问权限的贡献者只能对项目复刻或标星。
diff --git a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/about-merge-methods-on-github.md b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/about-merge-methods-on-github.md
index f381c50aef13..49747d1b2774 100644
--- a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/about-merge-methods-on-github.md
+++ b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/about-merge-methods-on-github.md
@@ -12,7 +12,7 @@ versions:
ghec: '*'
topics:
- Repositories
-shortTitle: About merge methods
+shortTitle: 关于合并方法
---
{% data reusables.pull_requests.configure_pull_request_merges_intro %} 您可以只对仓库启用所需的方法，以实施一种合并方法，如提交压缩或变基。
@@ -20,7 +20,7 @@ shortTitle: About merge methods
{% ifversion fpt or ghec %}
{% note %}
-**Note:** When using the merge queue, you no longer get to choose the merge method, as this is controlled by the queue. {% data reusables.pull_requests.merge-queue-references %}
+**注意：**使用合并队列时，您将无法再选择合并方法，因为这由队列控制。 {% data reusables.pull_requests.merge-queue-references %}
{% endnote %}
{% endif %}
diff --git a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-the-automatic-deletion-of-branches.md b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-the-automatic-deletion-of-branches.md
index 9043262f772c..bec3d6702f23 100644
--- a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-the-automatic-deletion-of-branches.md
+++ b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-the-automatic-deletion-of-branches.md
@@ -19,7 +19,7 @@ shortTitle: 自动删除分支
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.sidebar-settings %}
-3. Under {% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-6069 %}"Pull Requests"{% else %}"Merge button"{% endif %}, select or unselect **Automatically delete head branches**. 
+3. 在 {% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-6069 %}“拉取请求”{% else %}“合并按钮”{% endif %} 下，选择或取消选择 **Automatically delete head branches（自动删除头部分支）**。 
## 延伸阅读
- "[合并拉取请求](/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/defining-the-mergeability-of-pull-requests/about-protected-branches.md b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/about-protected-branches.md
index feae43c9620f..2a18627c2090 100644
--- a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/about-protected-branches.md
+++ b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/about-protected-branches.md
@@ -160,7 +160,7 @@ Any person or integration with write permissions to a repository can set the sta
### 允许强制推送
-{% ifversion fpt or ghec %}
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5624 %}
默认情况下，{% data variables.product.product_name %} 阻止对所有受保护分支的强制推送。 When you enable force pushes to a protected branch, you can choose one of two groups who can force push:
1. Allow everyone with at least write permissions to the repository to force push to the branch, including those with admin permissions.
diff --git a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md
index 4976a307b3e5..cfbf8ca1b28d 100644
--- a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md
+++ b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md
@@ -51,7 +51,7 @@ For more information about each of the available branch protection settings, see
{% data reusables.repositories.sidebar-settings %}
{% data reusables.repositories.repository-branches %}
{% data reusables.repositories.add-branch-protection-rules %}
-{% ifversion fpt or ghec %}
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5506 %}
1. Optionally, enable required pull requests.
- Under "Protect matching branches", select **Require a pull request before merging**. 
- Optionally, to require approvals before a pull request can be merged, select **Require approvals**, click the **Required number of approvals before merging** drop-down menu, then select the number of approving reviews you would like to require on the branch. 
@@ -62,7 +62,7 @@ For more information about each of the available branch protection settings, see
{% endif %}
- （可选）要在将代码修改提交推送到分支时忽略拉取请求批准审查，请选择 **Dismiss stale pull request approvals when new commits are pushed（推送新提交时忽略旧拉取请求批准）**。 
- （可选）要在拉取请求影响具有指定所有者的代码时要求代码所有者审查，请选择 **Require review from Code Owners（需要代码所有者审查）**。 更多信息请参阅“[关于代码所有者](/github/creating-cloning-and-archiving-repositories/about-code-owners)”。 
-{% ifversion fpt or ghec %}
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5611 %}
- Optionally, to allow specific people or teams to push code to the branch without being subject to the pull request rules above, select **Allow specific actors to bypass pull request requirements**. Then, search for and select the people or teams who are allowed to bypass the pull request requirements. 
{% endif %}
- （可选）如果仓库属于组织，请选择 **Restrict who can dismiss pull request reviews（限制谁可以忽略拉取请求审查）**。 然后，搜索并选择有权忽略拉取请求审查的人员或团队。 更多信息请参阅“[忽略拉取请求审查](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/dismissing-a-pull-request-review)”。 
@@ -88,7 +88,7 @@ For more information about each of the available branch protection settings, see
- 选择 **Restrict who can push to matching branches（限制谁可以推送到匹配分支）**。 
- 搜索并选择有权限推送到受保护分支的人员、团队或应用程序。 
1. （可选）在“Rules applied to everyone including administrators（适用于包括管理员在内的所有人规则）”下，选择 **Allow force pushes（允许强制推送）**。 
-{% ifversion fpt or ghec %}
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5624 %}
Then, choose who can force push to the branch.
- Select **Everyone** to allow everyone with at least write permissions to the repository to force push to the branch, including those with admin permissions.
- Select **Specify who can force push** to allow only specific people or teams to force push to the branch. Then, search for and select those people or teams. 
diff --git a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/index.md b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/index.md
index 41e102a54a2e..db8fbf0da5a2 100644
--- a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/index.md
+++ b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/index.md
@@ -1,6 +1,6 @@
---
-title: Configuring branches and merges in your repository
-intro: 'You can manage branches in your repository, configure the way branches are merged in your repository, and protect important branches by defining the mergeability of pull requests.'
+title: 在存储库中配置分支和合并
+intro: 您可以管理存储库中的分支，配置分支在存储库中的合并方式，并通过定义拉取请求的可合并性来保护重要分支。
versions:
fpt: '*'
ghes: '*'
@@ -12,6 +12,6 @@ children:
- /managing-branches-in-your-repository
- /configuring-pull-request-merges
- /defining-the-mergeability-of-pull-requests
-shortTitle: Branches and merges
+shortTitle: 分支和合并
---
diff --git a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/managing-branches-in-your-repository/deleting-and-restoring-branches-in-a-pull-request.md b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/managing-branches-in-your-repository/deleting-and-restoring-branches-in-a-pull-request.md
index a41f9692a245..fcda45eb9029 100644
--- a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/managing-branches-in-your-repository/deleting-and-restoring-branches-in-a-pull-request.md
+++ b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/managing-branches-in-your-repository/deleting-and-restoring-branches-in-a-pull-request.md
@@ -15,7 +15,7 @@ versions:
ghec: '*'
topics:
- Repositories
-shortTitle: Delete & restore branches
+shortTitle: 删除和恢复分支
---
## 删除用于拉取请求的分支
diff --git a/translations/zh-CN/content/repositories/creating-and-managing-repositories/cloning-a-repository.md b/translations/zh-CN/content/repositories/creating-and-managing-repositories/cloning-a-repository.md
index 80efa691b631..0ad29594857e 100644
--- a/translations/zh-CN/content/repositories/creating-and-managing-repositories/cloning-a-repository.md
+++ b/translations/zh-CN/content/repositories/creating-and-managing-repositories/cloning-a-repository.md
@@ -86,7 +86,7 @@ gh repo clone https://github.com/cli/cli
- 您可以使用 HTTPS 连接。 更多信息请参阅“[HTTPS 克隆错误](/github/creating-cloning-and-archiving-repositories/https-cloning-errors)”。
- 您有权访问要克隆的仓库。 更多信息请参阅“[错误：找不到仓库](/github/creating-cloning-and-archiving-repositories/error-repository-not-found)”。
-- 要克隆的默认分支仍然存在。 您有权访问要克隆的仓库。 更多信息请参阅“[错误：远程 HEAD 引用不存在的 ref，无法检出](/github/creating-cloning-and-archiving-repositories/error-remote-head-refers-to-nonexistent-ref-unable-to-checkout)”。
+- 要克隆的默认分支仍然存在。 更多信息请参阅“[错误：远程 HEAD 引用不存在的 ref，无法检出](/repositories/creating-and-managing-repositories/troubleshooting-cloning-errors#error-remote-head-refers-to-nonexistent-ref-unable-to-checkout)”。
{% ifversion fpt or ghec %}
diff --git a/translations/zh-CN/content/repositories/creating-and-managing-repositories/index.md b/translations/zh-CN/content/repositories/creating-and-managing-repositories/index.md
index b695df6407f3..ae6028569e3a 100644
--- a/translations/zh-CN/content/repositories/creating-and-managing-repositories/index.md
+++ b/translations/zh-CN/content/repositories/creating-and-managing-repositories/index.md
@@ -1,6 +1,6 @@
---
-title: Creating and managing repositories
-intro: 'You can create a repository on {% data variables.product.product_name %} to store and collaborate on your project''s files, then manage the repository''s name and location.'
+title: 创建和管理存储库
+intro: '您可以在 {% data variables.product.product_name %} 上创建存储库以存储和协作处理项目的文件，然后管理存储库的名称和位置。'
redirect_from:
- /articles/creating-a-repository-on-github
- /github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github
@@ -24,6 +24,6 @@ children:
- /transferring-a-repository
- /deleting-a-repository
- /restoring-a-deleted-repository
-shortTitle: Create & manage repositories
+shortTitle: 创建和管理存储库
---
diff --git a/translations/zh-CN/content/repositories/creating-and-managing-repositories/restoring-a-deleted-repository.md b/translations/zh-CN/content/repositories/creating-and-managing-repositories/restoring-a-deleted-repository.md
index 6f80196c142a..d6f054c5dec2 100644
--- a/translations/zh-CN/content/repositories/creating-and-managing-repositories/restoring-a-deleted-repository.md
+++ b/translations/zh-CN/content/repositories/creating-and-managing-repositories/restoring-a-deleted-repository.md
@@ -30,11 +30,11 @@ shortTitle: 恢复已删除的仓库
## 恢复用户帐户所拥有的已删除仓库
-{% data reusables.user_settings.access_settings %}
-{% data reusables.user_settings.repo-tab %}
-{% data reusables.user_settings.deleted-repos %}
-{% data reusables.user_settings.restore-repo %}
-{% data reusables.user_settings.restore-confirmation %}
+{% data reusables.user-settings.access_settings %}
+{% data reusables.user-settings.repo-tab %}
+{% data reusables.user-settings.deleted-repos %}
+{% data reusables.user-settings.restore-repo %}
+{% data reusables.user-settings.restore-confirmation %}
## 恢复组织所拥有的已删除仓库
@@ -42,8 +42,8 @@ shortTitle: 恢复已删除的仓库
{% data reusables.profile.access_org %}
{% data reusables.profile.org_settings %}
{% data reusables.organizations.deleted-repos %}
-{% data reusables.user_settings.restore-repo %}
-{% data reusables.user_settings.restore-confirmation %}
+{% data reusables.user-settings.restore-repo %}
+{% data reusables.user-settings.restore-confirmation %}
## 延伸阅读
diff --git a/translations/zh-CN/content/repositories/index.md b/translations/zh-CN/content/repositories/index.md
index f8e4c4db9a86..58dba8a74ff7 100644
--- a/translations/zh-CN/content/repositories/index.md
+++ b/translations/zh-CN/content/repositories/index.md
@@ -1,6 +1,6 @@
---
title: 仓库
-intro: Learn to use and manage the repositories that allow you to store and collaborate on your project's code.
+intro: 了解如何使用和管理存储库，以便存储项目代码并进行协作。
introLinks:
quickstart: /get-started/quickstart/create-a-repo
overview: /repositories/creating-and-managing-repositories/about-repositories
diff --git a/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners.md b/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners.md
index 0909edba93c4..bf408ca1799b 100644
--- a/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners.md
+++ b/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners.md
@@ -50,9 +50,14 @@ To reduce the size of your CODEOWNERS file, consider using wildcard patterns to
CODEOWNERS 文件使用遵循 [gitignore](https://git-scm.com/docs/gitignore#_pattern_format) 文件中所用大多数规则的模式，但有[一些例外](#syntax-exceptions)。 模式后接一个或多个使用标准 `@username` 或 `@org/team-name` 格式的 {% data variables.product.prodname_dotcom %} 用户名或团队名称。 Users must have `read` access to the repository and teams must have explicit `write` access, even if the team's members already have access. You can also refer to a user by an email address that has been added to their account on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %}, for example `user@example.com`.
+CODEOWNERS paths are case sensitive, because {% data variables.product.prodname_dotcom %} uses a case sensitive file system. Since CODEOWNERS are evaluated by {% data variables.product.prodname_dotcom %}, even systems that are case insensitive (for example, macOS) must use paths and files that are cased correctly in the CODEOWNERS file.
+
+{% if codeowners-errors %}
+If any line in your CODEOWNERS file contains invalid syntax, that line will be skipped. When you navigate to the CODEOWNERS file in your repository on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %}, you can see any errors highlighted. A list of errors in a repository's CODEOWNERS file is also accessible via the API. 更多信息请参阅 REST API 文档中的“[仓库](/rest/reference/repos#list-codeowners-errors)”。
+{% else %}
如果 CODEOWNERS 文件中的任何行包含无效语法，则该文件将不会被检测并且不会用于请求审查。
+{% endif %}
-CODEOWNERS paths are case sensitive, because {% data variables.product.prodname_dotcom %} uses a case sensitive file system. Since CODEOWNERS are evaluated by {% data variables.product.prodname_dotcom %}, even systems that are case insensitive (for example, macOS) must use paths and files that are cased correctly in the CODEOWNERS file.
### CODEOWNERS 文件示例
```
# This is a comment.
diff --git a/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-security-and-analysis-settings-for-your-repository.md b/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-security-and-analysis-settings-for-your-repository.md
index f6b38871a1ff..1619c037aa9e 100644
--- a/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-security-and-analysis-settings-for-your-repository.md
+++ b/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-security-and-analysis-settings-for-your-repository.md
@@ -1,6 +1,6 @@
---
-title: 管理仓库的安全性和分析设置
-intro: '您可以控制功能以保护 {% data variables.product.prodname_dotcom %} 上项目的安全并分析其中的代码。'
+title: Managing security and analysis settings for your repository
+intro: 'You can control features that secure and analyze the code in your project on {% data variables.product.prodname_dotcom %}.'
permissions: People with admin permissions to a repository can manage security and analysis settings for the repository.
redirect_from:
- /articles/managing-alerts-for-vulnerable-dependencies-in-your-organization-s-repositories
@@ -22,22 +22,22 @@ topics:
- Dependency graph
- Secret scanning
- Repositories
-shortTitle: 安全和分析
+shortTitle: Security & analysis
---
-
{% ifversion fpt or ghec %}
-## 为公共仓库启用或禁用安全和分析功能
+## Enabling or disabling security and analysis features for public repositories
-您可以管理公共仓库的一部分安全和分析功能。 其他功能是永久启用的，包括依赖项图和密码扫描。
+You can manage a subset of security and analysis features for public repositories. Other features are permanently enabled, including dependency graph and secret scanning.
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.sidebar-settings %}
{% data reusables.repositories.navigate-to-security-and-analysis %}
-4. Under "Configure security and analysis features", to the right of the feature, click **Disable** or **Enable**.{% ifversion fpt %} {% elsif ghec %}
-{% endif %}
+4. Under "Configure security and analysis features", to the right of the feature, click **Disable** or **Enable**.{% ifversion fpt %}
+ {% elsif ghec %}
+ {% endif %}
{% endif %}
-## 为私有仓库启用或禁用安全和分析功能{% ifversion fpt or ghec %}{% endif %}
+## Enabling or disabling security and analysis features{% ifversion fpt or ghec %} for private repositories{% endif %}
You can manage the security and analysis features for your {% ifversion fpt or ghec %}private or internal {% endif %}repository.{% ifversion ghes or ghec %} If your organization belongs to an enterprise with a license for {% data variables.product.prodname_GH_advanced_security %} then extra options are available. {% data reusables.advanced-security.more-info-ghas %}
{% elsif fpt %} Organizations that use {% data variables.product.prodname_ghe_cloud %} with {% data variables.product.prodname_advanced_security %} have extra options available. For more information, see the [{% data variables.product.prodname_ghe_cloud %} documentation](/enterprise-cloud@latest//repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-security-and-analysis-settings-for-your-repository#enabling-or-disabling-security-and-analysis-features-for-private-repositories).
@@ -49,79 +49,82 @@ You can manage the security and analysis features for your {% ifversion fpt or g
{% data reusables.repositories.sidebar-settings %}
{% data reusables.repositories.navigate-to-security-and-analysis %}
{% ifversion fpt or ghes > 3.0 or ghec %}
-4. 在“Configure security and analysis features（配置安全性和分析功能）”下，单击功能右侧的 **Disable（禁用）**或 **Enable（启用）**。 {% ifversion not fpt %}The control for "{% data variables.product.prodname_GH_advanced_security %}" is disabled if your enterprise has no available licenses for {% data variables.product.prodname_advanced_security %}.{% endif %}{% ifversion fpt %} {% elsif ghec %}
-{% elsif ghes > 3.2 %}
-{% else %}
-{% endif %}
-
+4. Under "Configure security and analysis features", to the right of the feature, click **Disable** or **Enable**. {% ifversion not fpt %}The control for "{% data variables.product.prodname_GH_advanced_security %}" is disabled if your enterprise has no available licenses for {% data variables.product.prodname_advanced_security %}.{% endif %}{% ifversion fpt %}
+ {% elsif ghec %}
+ {% elsif ghes > 3.2 %}
+ {% else %}
+ {% endif %}
+
{% ifversion not fpt %}
{% note %}
- **Note:** If you disable {% data variables.product.prodname_GH_advanced_security %}, {% ifversion ghec %}dependency review, {% endif %}{% data variables.product.prodname_secret_scanning %} and {% data variables.product.prodname_code_scanning %} are disabled. 任何工作流程、SARIF上传或 {% data variables.product.prodname_code_scanning %} 的 API 调用都将失败。
+ **Note:** If you disable {% data variables.product.prodname_GH_advanced_security %}, {% ifversion ghec %}dependency review, {% endif %}{% data variables.product.prodname_secret_scanning %} and {% data variables.product.prodname_code_scanning %} are disabled. Any workflows, SARIF uploads, or API calls for {% data variables.product.prodname_code_scanning %} will fail.
{% endnote %}{% endif %}
{% endif %}
{% ifversion ghes = 3.0 %}
-4. 在“Configure security and analysis features（配置安全性和分析功能）”下，单击功能右侧的 **Disable（禁用）**或 **Enable（启用）**。 
+4. Under "Configure security and analysis features", to the right of the feature, click **Disable** or **Enable**.
+ 
{% endif %}
{% ifversion ghae %}
-4. 在“Configure security and analysis features（配置安全性和分析功能）”下，单击功能右侧的 **Disable（禁用）**或 **Enable（启用）**。 在启用“{% data variables.product.prodname_secret_scanning %}”之前，您可能需要先启用 {% data variables.product.prodname_GH_advanced_security %}。 
+4. Under "Configure security and analysis features", to the right of the feature, click **Disable** or **Enable**. Before you can enable "{% data variables.product.prodname_secret_scanning %}" for your repository, you may need to enable {% data variables.product.prodname_GH_advanced_security %}.
+ 
{% endif %}
-## 授予对安全警报的访问权限
+## Granting access to security alerts
Security alerts for a repository are visible to people with admin access to the repository and, when the repository is owned by an organization, organization owners. You can give additional teams and people access to the alerts.
{% note %}
-组织所有者和仓库管理员只能向具有仓库写入权限的人员授予安全警报的查看权限，如 {% data variables.product.prodname_secret_scanning %} 警报。
+Organization owners and repository administrators can only grant access to view security alerts, such as {% data variables.product.prodname_secret_scanning %} alerts, to people or teams who have write access to the repo.
{% endnote %}
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.sidebar-settings %}
{% data reusables.repositories.navigate-to-security-and-analysis %}
-4. 在“Access to alerts（访问警报）”下，在搜索字段中开始键入您要查找的个人或团队的名称，然后单击匹配列表中的名称。
+4. Under "Access to alerts", in the search field, start typing the name of the person or team you'd like to find, then click a name in the list of matches.
{% ifversion fpt or ghec or ghes > 3.2 %}
- 
+ 
{% endif %}
{% ifversion ghes < 3.3 %}
- 
+ 
{% endif %}
{% ifversion ghae %}
- 
+ 
{% endif %}
-
-5. 单击 **Save changes（保存更改）**。
+
+5. Click **Save changes**.
{% ifversion fpt or ghes > 3.2 or ghec %}
- 
+ 
{% endif %}
{% ifversion ghes < 3.3 %}
- 
+ 
{% endif %}
{% ifversion ghae %}
- 
+ 
{% endif %}
-## 删除对安全警报的访问权限
+## Removing access to security alerts
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.sidebar-settings %}
{% data reusables.repositories.navigate-to-security-and-analysis %}
-4. 在“Access to alerts（访问警报）”下，在要删除其访问权限的个人或团队的右侧，单击 {% octicon "x" aria-label="X symbol" %}。
- {% ifversion fpt or ghec or ghes > 3.2 %}
- 
+4. Under "Access to alerts", to the right of the person or team whose access you'd like to remove, click {% octicon "x" aria-label="X symbol" %}.
+ {% ifversion fpt or ghec or ghes > 3.2 %}
+ 
{% endif %}
{% ifversion ghes < 3.3 %}
- 
+ 
{% endif %}
{% ifversion ghae %}
- 
+ 
{% endif %}
- 5. 单击 **Save changes（保存更改）**。
+ 5. Click **Save changes**.
-## 延伸阅读
+## Further reading
-- "[保护您的仓库](/code-security/getting-started/securing-your-repository)"
-- “[管理组织的安全性和分析设置](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)”
+- "[Securing your repository](/code-security/getting-started/securing-your-repository)"
+- "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)"
diff --git a/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/index.md b/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/index.md
index 55aba5b9ca02..29162eae146c 100644
--- a/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/index.md
+++ b/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/index.md
@@ -12,6 +12,7 @@ children:
- /setting-repository-visibility
- /managing-teams-and-people-with-access-to-your-repository
- /managing-the-forking-policy-for-your-repository
+ - /managing-pull-request-reviews-in-your-repository
- /managing-git-lfs-objects-in-archives-of-your-repository
- /enabling-anonymous-git-read-access-for-a-repository
- /about-email-notifications-for-pushes-to-your-repository
diff --git a/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-pull-request-reviews-in-your-repository.md b/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-pull-request-reviews-in-your-repository.md
new file mode 100644
index 000000000000..f45430b860db
--- /dev/null
+++ b/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-pull-request-reviews-in-your-repository.md
@@ -0,0 +1,27 @@
+---
+title: Managing pull request reviews in your repository
+intro: You can limit which users can approve or request changes to a pull requests in a public repository.
+versions:
+ feature: pull-request-approval-limit
+permissions: Repository administrators can limit which users can approve or request changes to a pull request in a public repository.
+topics:
+ - Repositories
+ - Pull requests
+shortTitle: Manage pull request reviews
+---
+
+## About code review limits
+
+By default, in public repositories, any user can submit reviews that approve or request changes to a pull request.
+
+You can limit which users are able to submit reviews that approve or request changes to pull requests in your public repository. When you enable code review limits, anyone can comment on pull requests in your public repository, but only people with read access or higher can approve pull requests or request changes.
+
+You can also enable code review limits for an organization. If you enable limits for an organization, you will override any limits for individual repositories owned by the organization. For more information, see "[Managing pull request reviews in your organization](/organizations/managing-organization-settings/managing-pull-request-reviews-in-your-organization)"
+
+## Enabling code review limits
+
+{% data reusables.repositories.navigate-to-repo %}
+{% data reusables.repositories.sidebar-settings %}
+1. Under **Access**, click **Moderation options**. 
+1. Under **Moderation options**, click **Code review limits**. 
+1. Select or deselect **Limit to users explicitly granted read or higher access**. 
diff --git a/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-teams-and-people-with-access-to-your-repository.md b/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-teams-and-people-with-access-to-your-repository.md
index ea7e21bb8a86..640bd829cb81 100644
--- a/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-teams-and-people-with-access-to-your-repository.md
+++ b/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-teams-and-people-with-access-to-your-repository.md
@@ -9,6 +9,8 @@ redirect_from:
versions:
fpt: '*'
ghec: '*'
+ ghes: '>3.3'
+ ghae: issue-5974
topics:
- Repositories
shortTitle: 团队和人员
@@ -20,6 +22,8 @@ shortTitle: 团队和人员
此概览可帮助您审核对仓库、内部或外部承包商或员工的访问权限，并有效响应安全事件。
+{% data reusables.organizations.mixed-roles-warning %}
+
For more information about repository roles, see "[Permission levels for a user account repository](/github/setting-up-and-managing-your-github-user-account/permission-levels-for-a-user-account-repository)" and "[Repository roles for an organization](/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization)."
@@ -28,21 +32,33 @@ For more information about repository roles, see "[Permission levels for a user
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.sidebar-settings %}
+{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %}
{% data reusables.repositories.click-collaborators-teams %}
-4. 在“Manage access（管理访问权限）”下的搜索字段中，开始输入您要查找的团队或人员的名称。 
+{% else %}
+{% data reusables.repositories.navigate-to-manage-access %}
+{% endif %}
+1. 在“Manage access（管理访问权限）”下的搜索字段中，开始输入您要查找的团队或人员的名称。 Optionally, use the dropdown menus to filter your search. 
## 更改团队或人员的权限
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.sidebar-settings %}
+{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %}
+{% data reusables.repositories.click-collaborators-teams %}
+{% else %}
{% data reusables.repositories.navigate-to-manage-access %}
+{% endif %}
4. Under "Manage access", find the team or person whose role you'd like to change, then select the Role drop-down and click a new role. 
## 邀请团队或人员
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.sidebar-settings %}
+{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %}
{% data reusables.repositories.click-collaborators-teams %}
+{% else %}
+{% data reusables.repositories.navigate-to-manage-access %}
+{% endif %}
{% data reusables.organizations.invite-teams-or-people %}
5. 在搜索字段中，开始输入要邀请的团队或人员的名称，然后单击匹配列表中的名称。 
6. Under "Choose a role", select the repository role to grant to the team or person, then click **Add NAME to REPOSITORY**. 
@@ -51,7 +67,11 @@ For more information about repository roles, see "[Permission levels for a user
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.sidebar-settings %}
+{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %}
{% data reusables.repositories.click-collaborators-teams %}
+{% else %}
+{% data reusables.repositories.navigate-to-manage-access %}
+{% endif %}
4. 在“Manage access（管理访问权限）”下，找到要删除其访问权限的团队或人员，然后单击 {% octicon "trash" aria-label="The trash icon" %}。 
## 延伸阅读
diff --git a/translations/zh-CN/content/repositories/releasing-projects-on-github/about-releases.md b/translations/zh-CN/content/repositories/releasing-projects-on-github/about-releases.md
index b69cfdc5dd03..39da3c9065ac 100644
--- a/translations/zh-CN/content/repositories/releasing-projects-on-github/about-releases.md
+++ b/translations/zh-CN/content/repositories/releasing-projects-on-github/about-releases.md
@@ -37,13 +37,12 @@ topics:
对仓库具有读取访问权限的任何人都可以查看和比较发行版，但只有对仓库具有写入权限的人员才能管理发行版。 更多信息请参阅“[管理仓库中的发行版](/github/administering-a-repository/managing-releases-in-a-repository)”。
{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-4974 %}
-
You can manually create release notes while managing a release. Alternatively, you can automatically generate release notes from a default template, or customize your own release notes template. For more information, see "[Automatically generated release notes](/repositories/releasing-projects-on-github/automatically-generated-release-notes)."
-
-对仓库具有管理员权限的人可以选择是否将 {% data variables.large_files.product_name_long %} ({% data variables.large_files.product_name_short %}) 对象包含在 {% data variables.product.product_name %} 为每个发行版创建的 ZIP 文件和 tarball 中。 更多信息请参阅“[管理仓库存档中的 {% data variables.large_files.product_name_short %} 对象](/github/administering-a-repository/managing-git-lfs-objects-in-archives-of-your-repository)”。
{% endif %}
{% ifversion fpt or ghec %}
+People with admin permissions to a repository can choose whether {% data variables.large_files.product_name_long %} ({% data variables.large_files.product_name_short %}) objects are included in the ZIP files and tarballs that {% data variables.product.product_name %} creates for each release. For more information, see "[Managing {% data variables.large_files.product_name_short %} objects in archives of your repository](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-git-lfs-objects-in-archives-of-your-repository)."
+
如果发行版修复了安全漏洞，您应该在仓库中发布安全通告。 {% data variables.product.prodname_dotcom %} 审查每个发布的安全通告，并且可能使用它向受影响的仓库发送 {% data variables.product.prodname_dependabot_alerts %}。 更多信息请参阅“[关于 GitHub 安全通告](/github/managing-security-vulnerabilities/about-github-security-advisories)”。
您可以查看依赖项图的 **Dependents（依赖项）**选项卡，了解哪些仓库和包依赖于您仓库中的代码，并因此可能受到新发行版的影响。 更多信息请参阅“[关于依赖关系图](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)”。
diff --git a/translations/zh-CN/content/repositories/releasing-projects-on-github/searching-a-repositorys-releases.md b/translations/zh-CN/content/repositories/releasing-projects-on-github/searching-a-repositorys-releases.md
index 73afcd809a63..00e10a4bc103 100644
--- a/translations/zh-CN/content/repositories/releasing-projects-on-github/searching-a-repositorys-releases.md
+++ b/translations/zh-CN/content/repositories/releasing-projects-on-github/searching-a-repositorys-releases.md
@@ -26,5 +26,7 @@ You can provide text in your search query which will be matched against the titl
| ------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `draft:true` | **draft:true** will only match draft releases. |
| `draft:false` | **draft:false** will only match published releases. |
+| `prerelease:true` | **prerelease:true** will only match pre-releases. |
+| `prerelease:false` | **prerelease:false** will only match releases that are not pre-releases. |
| tag:TAG | **tag:v1** matches a release with the v1 tag and any minor or patch versions within v1, such as v1.0, v1.2, and v1.2.5. |
| created:DATE | **created:2021** will match releases created during 2021. You can also provide date ranges. 更多信息请参阅“[了解搜索语法](/search-github/getting-started-with-searching-on-github/understanding-the-search-syntax#query-for-dates)”。 |
diff --git a/translations/zh-CN/content/repositories/viewing-activity-and-data-for-your-repository/understanding-connections-between-repositories.md b/translations/zh-CN/content/repositories/viewing-activity-and-data-for-your-repository/understanding-connections-between-repositories.md
index 5c5c0a96c81c..1180043ae50e 100644
--- a/translations/zh-CN/content/repositories/viewing-activity-and-data-for-your-repository/understanding-connections-between-repositories.md
+++ b/translations/zh-CN/content/repositories/viewing-activity-and-data-for-your-repository/understanding-connections-between-repositories.md
@@ -1,6 +1,6 @@
---
title: 了解仓库之间的连接
-intro: You can better understand the connections that exist between repositories by viewing a repository's network and forks and the projects that depend on the repository.
+intro: 通过查看存储库的网络和分叉以及依赖于存储库的项目，您可以更好地了解存储库之间存在的连接。
product: '{% data reusables.gated-features.repository-insights %}'
redirect_from:
- /articles/viewing-a-repository-s-network
@@ -21,7 +21,7 @@ versions:
ghec: '*'
topics:
- Repositories
-shortTitle: Connections between repositories
+shortTitle: 存储库之间的连接
---
## 查看仓库的网络
diff --git a/translations/zh-CN/content/repositories/viewing-activity-and-data-for-your-repository/viewing-a-summary-of-repository-activity.md b/translations/zh-CN/content/repositories/viewing-activity-and-data-for-your-repository/viewing-a-summary-of-repository-activity.md
index 90c455057fcb..13dcd74f1a70 100644
--- a/translations/zh-CN/content/repositories/viewing-activity-and-data-for-your-repository/viewing-a-summary-of-repository-activity.md
+++ b/translations/zh-CN/content/repositories/viewing-activity-and-data-for-your-repository/viewing-a-summary-of-repository-activity.md
@@ -1,6 +1,6 @@
---
title: 查看仓库活动的摘要
-intro: 'You can view an overview of a repository''s pull request, issue, and commit activity.'
+intro: 您可以查看存储库的拉取请求、议题和提交活动的概述。
product: '{% data reusables.gated-features.repository-insights %}'
redirect_from:
- /articles/viewing-a-summary-of-repository-activity
@@ -16,13 +16,13 @@ topics:
shortTitle: 查看仓库活动
---
-## About Pulse
+## 关于 Pulse
-您可以通过 Pulse 查看仓库活动的概览。 Pulse includes a list of open and merged pull requests, open and closed issues, and a graph showing the commit activity for the top 15 users who committed to the default branch of the project in the selected [time period](/articles/viewing-a-summary-of-repository-activity#filtering-by-time).
+您可以通过 Pulse 查看仓库活动的概览。 Pulse 包括打开及合并的拉取请求列表、打开和关闭的议题列表，以及显示在所选[时间段](/articles/viewing-a-summary-of-repository-activity#filtering-by-time)提交到项目默认分支的前 15 名用户的提交活动图表。
如果提交合作作者的提交已合并到仓库的默认分支并且他们是贡献最多提交的前 15 名用户，则提交合作作者将包括在提交活动摘要中。
-## Accessing Pulse
+## 访问 Pulse
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.accessing-repository-graphs %}
diff --git a/translations/zh-CN/content/rest/reference/actions.md b/translations/zh-CN/content/rest/reference/actions.md
index 8f93fca88597..ce79dfaffc00 100644
--- a/translations/zh-CN/content/rest/reference/actions.md
+++ b/translations/zh-CN/content/rest/reference/actions.md
@@ -33,9 +33,7 @@ miniTocMaxHeadingLevel: 3
{% ifversion fpt or ghes > 2.22 or ghae or ghec %}
## 权限
-Permissions API 允许您为允许哪些组织和存储库运行 {% data variables.product.prodname_actions %} 以及允许运行哪些操作设置权限。{% ifversion fpt or ghec or ghes %} 更多信息请参阅“[使用限制、计费和管理](/actions/reference/usage-limits-billing-and-administration#disabling-or-limiting-github-actions-for-your-repository-or-organization)”。{% endif %}
-
-您还可以为企业设置权限。 更多信息请参阅“[{% data variables.product.prodname_dotcom %} Enterprise 管理](/rest/reference/enterprise-admin#github-actions)”REST API。
+Permissions API 允许您为允许哪些企业、组织和存储库运行 {% data variables.product.prodname_actions %} 以及允许运行哪些操作设置权限。{% ifversion fpt or ghec or ghes %} 更多信息请参阅“[使用限制、计费和管理](/actions/reference/usage-limits-billing-and-administration#disabling-or-limiting-github-actions-for-your-repository-or-organization)”。{% endif %}
{% for operation in currentRestOperations %}
{% if operation.subcategory == 'permissions' %}{% include rest_operation %}{% endif %}
@@ -58,9 +56,7 @@ Permissions API 允许您为允许哪些组织和存储库运行 {% data variabl
自托管运行器 API 允许您注册、查看和删除自托管的运行器。 {% data reusables.actions.about-self-hosted-runners %} 更多信息请参阅“[托管您自己的运行器](/actions/hosting-your-own-runners)”。
-{% data reusables.actions.actions-authentication %} {% data variables.product.prodname_github_apps %} 必须对仓库具有`管理`权限，或者对组织具有 `organization_self_hosted_runners` 权限。 经过身份验证的用户必须对仓库或组织具有管理员权限才可使用此 API。
-
-您可以管理企业的自托管运行器。 更多信息请参阅“[{% data variables.product.prodname_dotcom %} Enterprise 管理](/rest/reference/enterprise-admin#github-actions)”REST API。
+{% data reusables.actions.actions-authentication %} {% data variables.product.prodname_github_apps %} 必须对仓库具有`管理`权限，或者对组织具有 `organization_self_hosted_runners` 权限。 经过身份验证的用户必须具有对存储库或组织的管理员访问权限或者企业的 `manage_runners:enterprise` 作用域才能使用此 API。
{% for operation in currentRestOperations %}
{% if operation.subcategory == 'self-hosted-runners' %}{% include rest_operation %}{% endif %}
@@ -72,9 +68,7 @@ Permissions API 允许您为允许哪些组织和存储库运行 {% data variabl
自托管运行器组 API 允许您管理自托运行器组。 更多信息请参阅“[使用组管理对自托管运行器的访问](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups)”。
-{% data reusables.actions.actions-authentication %} {% data variables.product.prodname_github_apps %} 必须对仓库具有`管理`权限，或者对组织具有 `organization_self_hosted_runners` 权限。 经过身份验证的用户必须对仓库或组织具有管理员权限才可使用此 API。
-
-您可以管理企业的自托管运行器组。 更多信息请参阅“[{% data variables.product.prodname_dotcom %} Enterprise 管理](/rest/reference/enterprise-admin##github-actions)”REST API。
+{% data reusables.actions.actions-authentication %} {% data variables.product.prodname_github_apps %} 必须对仓库具有`管理`权限，或者对组织具有 `organization_self_hosted_runners` 权限。 经过身份验证的用户必须具有对存储库或组织的管理员访问权限或者企业的 `manage_runners:enterprise` 作用域才能使用此 API。
{% for operation in currentRestOperations %}
{% if operation.subcategory == 'self-hosted-runner-groups' %}{% include rest_operation %}{% endif %}
diff --git a/translations/zh-CN/content/rest/reference/enterprise-admin.md b/translations/zh-CN/content/rest/reference/enterprise-admin.md
index 230e3f76b552..303f997677e8 100644
--- a/translations/zh-CN/content/rest/reference/enterprise-admin.md
+++ b/translations/zh-CN/content/rest/reference/enterprise-admin.md
@@ -1,6 +1,6 @@
---
title: GitHub Enterprise administration
-intro: You can use these endpoints to administer your enterprise. Among the tasks you can perform with this API are many relating to GitHub Actions.
+intro: You can use these endpoints to administer your enterprise.
allowTitleToDifferFromFilename: true
redirect_from:
- /v3/enterprise-admin
@@ -87,14 +87,6 @@ You can also read the current version by calling the [meta endpoint](/rest/refer
{% endif %}
-## GitHub Actions
-
-
-{% for operation in currentRestOperations %}
- {% if operation.subcategory == 'actions' %}{% include rest_operation %}{% endif %}
-{% endfor %}
-
-
{% ifversion ghae or ghes %}
## Admin stats
diff --git a/translations/zh-CN/content/rest/reference/migrations.md b/translations/zh-CN/content/rest/reference/migrations.md
index be4405d4b590..b73c56059654 100644
--- a/translations/zh-CN/content/rest/reference/migrations.md
+++ b/translations/zh-CN/content/rest/reference/migrations.md
@@ -8,6 +8,8 @@ redirect_from:
versions:
fpt: '*'
ghec: '*'
+ ghes: '>3.3'
+ ghae: issue-6184
topics:
- API
miniTocMaxHeadingLevel: 3
@@ -27,6 +29,7 @@ miniTocMaxHeadingLevel: 3
{% if operation.subcategory == 'orgs' %}{% include rest_operation %}{% endif %}
{% endfor %}
+{% ifversion fpt or ghec %}
## 源导入
{% data variables.migrations.source_imports_intro %}
@@ -111,7 +114,7 @@ miniTocMaxHeadingLevel: 3
{% for operation in currentRestOperations %}
{% if operation.subcategory == 'source-imports' %}{% include rest_operation %}{% endif %}
{% endfor %}
-
+{% endif %}
## 用户
用户迁移 API 仅适用于经过身份验证的帐户所有者。 更多信息请参阅“[其他身份验证方法](/rest/overview/other-authentication-methods)”。
diff --git a/translations/zh-CN/content/rest/reference/permissions-required-for-github-apps.md b/translations/zh-CN/content/rest/reference/permissions-required-for-github-apps.md
index 19406639a348..7bd5f733f1ac 100644
--- a/translations/zh-CN/content/rest/reference/permissions-required-for-github-apps.md
+++ b/translations/zh-CN/content/rest/reference/permissions-required-for-github-apps.md
@@ -348,6 +348,9 @@ _流量_
- [`GET /repos/:owner/:repo/check-suites/:check_suite_id`](/rest/reference/checks#get-a-check-suite) (:read)
- [`GET /repos/:owner/:repo/check-suites/:check_suite_id/check-runs`](/rest/reference/checks#list-check-runs-in-a-check-suite) (:read)
- [`POST /repos/:owner/:repo/check-suites/:check_suite_id/rerequest`](/rest/reference/checks#rerequest-a-check-suite) (:write)
+{% if codeowners-errors %}
+- [`GET /repos/:owner/:repo/codeowners/errors`](/rest/reference/repos#list-codeowners-errors) (:read)
+{% endif %}
- [`GET /repos/:owner/:repo/commits`](/rest/reference/commits#list-commits) (:read)
- [`GET /repos/:owner/:repo/commits/:sha`](/rest/reference/commits#get-a-commit) (:read)
- [`GET /repos/:owner/:repo/commits/:sha/check-runs`](/rest/reference/checks#list-check-runs-for-a-git-reference) (:read)
@@ -377,8 +380,8 @@ _分支_
_提交注释_
- [`PATCH /repos/:owner/:repo/comments/:comment_id`](/rest/reference/commits#update-a-commit-comment) (:write)
- [`DELETE /repos/:owner/:repo/comments/:comment_id`](/rest/reference/commits#delete-a-commit-comment) (:write)
-- [`POST /repos/:owner/:repo/comments/:comment_id/reactions`](/rest/reference/reactions#create-reaction-for-a-commit-comment) (:read)
-- [`POST /repos/:owner/:repo/commits/:sha/comments`](/rest/reference/commits#create-a-commit-comment) (:read)
+- [`POST /repos/:owner/:repo/comments/:comment_id/reactions`](/rest/reference/reactions#create-reaction-for-a-commit-comment) (:write)
+- [`POST /repos/:owner/:repo/commits/:sha/comments`](/rest/reference/commits#create-a-commit-comment) (:write)
_Git_
- [`POST /repos/:owner/:repo/git/blobs`](/rest/reference/git#create-a-blob) (:write)
diff --git a/translations/zh-CN/content/search-github/getting-started-with-searching-on-github/understanding-the-search-syntax.md b/translations/zh-CN/content/search-github/getting-started-with-searching-on-github/understanding-the-search-syntax.md
index c4095de80810..665f5a5c3542 100644
--- a/translations/zh-CN/content/search-github/getting-started-with-searching-on-github/understanding-the-search-syntax.md
+++ b/translations/zh-CN/content/search-github/getting-started-with-searching-on-github/understanding-the-search-syntax.md
@@ -61,7 +61,7 @@ shortTitle: 了解搜索语法
| 查询 | 示例 |
| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| YYYY-MM-DDTHH:MM:SS+00:00 | **[cats created:2017-01-01T01:00:00+07:00..2017-03-01T15:30:15+07:00](https://github.com/search?utf8=%E2%9C%93&q=cats+created%3A2017-01-01T01%3A00%3A00%2B07%3A00..2017-03-01T15%3A30%3A15%2B07%3A00&type=Issues)** 匹配在 2017 年 1 月 1 日凌晨 1 点（UTC 偏移为 `07:00`）与 2017 年 3 月 1 日下午 3 点（UTC 偏移为 `07:00`）之间创建的议题。 UTC 偏移量 `07:00`，2017 年 3 月 1 日下午 3 点。 UTC 偏移量 `07:00`。 |
-| YYYY-MM-DDTHH:MM:SSZ | **[cats created:2016-03-21T14:11:00Z..2016-04-07T20:45:00Z](https://github.com/search?utf8=%E2%9C%93&q=cats+created%3A2016-03-21T14%3A11%3A00Z..2016-04-07T20%3A45%3A00Z&type=Issues)** 匹配在 2016 年 3 月 21 日下午 2:11 与 2016 年 4 月 7 日晚上 8:45 之间创建的议题。 |
+| YYYY-MM-DDTHH:MM:SSZ | **[cats created:2016-03-21T14:11:00Z..2016-04-07T20:45:00Z](https://github.com/search?utf8=%E2%9C%93&q=cats+created%3A2016-03-21T14%3A11%3A00Z..2016-04-07T20%3A45%3A00Z&type=Issues)** matches issues created between March 21, 2016 at 2:11pm and April 7, 2016 at 8:45pm. |
## 排除特定结果
diff --git a/translations/zh-CN/content/search-github/index.md b/translations/zh-CN/content/search-github/index.md
index b9e744478dd3..0e655dc0d44c 100644
--- a/translations/zh-CN/content/search-github/index.md
+++ b/translations/zh-CN/content/search-github/index.md
@@ -1,6 +1,26 @@
---
title: 在 GitHub 上搜索信息
-intro: 使用不同类型的搜索来查找您想要的信息。
+intro: 'Learn how to use the search functions available on GitHub to find different types of information, like projects, people, and code.'
+introLinks:
+ overview: /search-github/getting-started-with-searching-on-github/about-searching-on-github
+featuredLinks:
+ guides:
+ - /search-github/searching-on-github/searching-issues-and-pull-requests
+ - /search-github/searching-on-github/searching-code
+ - /search-github/searching-on-github/searching-for-repositories
+ - /search-github/searching-on-github/searching-commits
+ popular:
+ - /search-github/getting-started-with-searching-on-github/understanding-the-search-syntax
+ - /search-github/searching-on-github/searching-users
+ - /search-github/searching-on-github/finding-files-on-github
+ - /search-github/getting-started-with-searching-on-github/sorting-search-results
+ guideCards:
+ - /search-github/searching-on-github/searching-in-forks
+ - /search-github/searching-on-github/searching-topics
+ - /search-github/searching-on-github/searching-for-packages
+changelog:
+ label: search
+layout: product-landing
redirect_from:
- /categories/78/articles
- /categories/search
diff --git a/translations/zh-CN/content/sponsors/receiving-sponsorships-through-github-sponsors/managing-your-sponsorship-tiers.md b/translations/zh-CN/content/sponsors/receiving-sponsorships-through-github-sponsors/managing-your-sponsorship-tiers.md
index 3a2cf667b9d7..ef5724d9a091 100644
--- a/translations/zh-CN/content/sponsors/receiving-sponsorships-through-github-sponsors/managing-your-sponsorship-tiers.md
+++ b/translations/zh-CN/content/sponsors/receiving-sponsorships-through-github-sponsors/managing-your-sponsorship-tiers.md
@@ -71,18 +71,18 @@ shortTitle: 管理付款等级
- 如果赞助的个人资料用于个人帐户，仓库转移到组织，并且个人帐户具有对新仓库的管理员访问权限，则将转移现有赞助商，并且将继续将新赞助商添加到仓库。
- 如果仓库转移到个人帐户，则所有赞助商都将被删除，并且不会将新的赞助商添加到仓库中。
-### Adding a repository a sponsorship tier
+### 将仓库添加到赞助等级
{% data reusables.sponsors.navigate-to-sponsors-dashboard %}
{% data reusables.sponsors.navigate-to-sponsor-tiers-tab %}
{% data reusables.sponsors.edit-tier %}
-1. Select **Grant sponsors access to a private repository**.
+1. 选择 **Grant sponsors access to a private repository（授权赞助者访问私有仓库）**。
- 
+ 
-1. Select the dropdown menu and click the repository you want to add.
+1. 选择下拉菜单并单击您想要添加的仓库。
- 
+ 
{% data reusables.sponsors.tier-update %}
diff --git a/translations/zh-CN/content/sponsors/receiving-sponsorships-through-github-sponsors/sponsors-for-companies.md b/translations/zh-CN/content/sponsors/receiving-sponsorships-through-github-sponsors/sponsors-for-companies.md
index e9483e638c24..dcd299670803 100644
--- a/translations/zh-CN/content/sponsors/receiving-sponsorships-through-github-sponsors/sponsors-for-companies.md
+++ b/translations/zh-CN/content/sponsors/receiving-sponsorships-through-github-sponsors/sponsors-for-companies.md
@@ -1,7 +1,7 @@
---
-title: Receiving payments from Sponsors for Companies
-shortTitle: Sponsors for Companies
-intro: 'To accept payments from the Sponsors for Companies service, you must accept some additional terms.'
+title: 从公司赞助商接收付款
+shortTitle: 公司赞助商
+intro: 要接受来自公司赞助商服务的付款，您必须接受一些附加条款。
allowTitleToDifferFromFilename: true
versions:
fpt: '*'
@@ -14,28 +14,28 @@ topics:
{% data reusables.sponsors.beta-note-sponsors-for-companies %}
-## About the Sponsors for Companies service
+## 关于公司赞助商服务
-When you create a sponsors profile, you become eligible for sponsorship payments from individual users and organizations who are billed by credit card. In addition, {% data variables.product.company_short %} now offers a Sponsors for Companies service to enterprise customers who pay by invoice, including companies who use {% data variables.product.prodname_ghe_server %} or {% data variables.product.prodname_ghe_managed %}.
+创建赞助者个人资料后，您有资格获得通过信用卡计费的个人用户和组织的赞助付款。 此外，{% data variables.product.company_short %} 现在为通过发票付款的企业客户提供公司赞助商服务，包括使用 {% data variables.product.prodname_ghe_server %} 或 {% data variables.product.prodname_ghe_managed %} 的公司。
- The funds you receive under the Sponsors for Companies service come directly from {% data variables.product.company_short %}, and your participation in this service is subject to separate terms: the "GitHub Maintainer Additional Terms for Optional Data Provision". If you wish to receive funds from {% data variables.product.company_short %} under the Sponsors for Companies service, you'll need to complete the agreement before receiving any of those funds.
+ 您在公司赞助商服务下获得的资金直接来自 {% data variables.product.company_short %}，并且您参与此服务受单独条款的约束：“GitHub 维护者可选数据规定附加条款”。 如果您希望从 {% data variables.product.company_short %} 公司赞助商服务下获得资金，则需要在收到任何这些资金之前完成协议。
-## About the additional terms
+## 关于附加条款
-The "GitHub Maintainer Additional Terms for Optional Data Provision" agreement is available from your [{% data variables.product.prodname_sponsors %} dashboard](https://github.com/sponsors/accounts) (see steps below). Key points of the agreement include:
+“GitHub 维护者可选数据规定附加条款”协议可从您的 [{% data variables.product.prodname_sponsors %} 仪表板](https://github.com/sponsors/accounts)获得（请参阅以下步骤）。 该协议的要点包括：
-* Due to the way the service is set up, you'll receive payment from {% data variables.product.company_short %}, not from another company.
-* If taxes are required to be withheld on payment made through this program, {% data variables.product.company_short %} will deduct taxes from the amount owed and pay them to the appropriate taxing authority.
-* We'll share some aggregated data on your project(s) or projects you contribute to with the companies that pay for access to this data on a {% data variables.product.company_short %} dashboard. These data fields are outlined in Section 5 of the agreement.
-* Data will be aggregated and will not include any User Personal Information (as defined in {% data variables.product.company_short %}’s [Privacy Statement](/free-pro-team@latest/github/site-policy/github-privacy-statement)), or any information from private repositories.
-* You, as a Maintainer, can terminate the agreement with 14 days notice by contacting us.
+* 由于服务的设置方式，您将从 {% data variables.product.company_short %} 收到付款，而不是从其他公司收到付款。
+* 如果通过此计划付款时需要预扣税款，{% data variables.product.company_short %} 将从欠款中扣除税款并将其支付给相应的税务机关。
+* 我们将在 {% data variables.product.company_short %} 仪表板上与为访问这些数据付费的公司共享有关您的项目或您参与的项目的一些汇总数据。 协议第 5 节中概述了这些数据领域。
+* 数据将被汇总，不包括任何用户个人信息（如 {% data variables.product.company_short %} [隐私声明](/free-pro-team@latest/github/site-policy/github-privacy-statement)中所定义）或来自私人仓库的任何信息。
+* 作为维护者，您可以通过提前 14 天联系我们终止协议。
-If you agree to the terms outlined in the "GitHub Maintainer Additional Terms for Optional Data Provision" agreement, you will receive a payment from {% data variables.product.company_short %} each time a company purchases access to the service. The company purchases access to the dashboard from {% data variables.product.company_short %} for a limited amount of time (for example, one month or one year), and {% data variables.product.company_short %} purchases a license to your data to populate the dashboard. Your financial relationship is with {% data variables.product.company_short %}, not the company taking part in the service.
+如果您同意“GitHub 维护者可选数据规定附加条款”协议中概述的条款，则每次公司购买服务访问权限时，您都将收到来自 {% data variables.product.company_short %} 的付款。 公司从 {% data variables.product.company_short %} 购买对仪表板的限时（例如，一个月或一年）访问权限，{% data variables.product.company_short %} 购买数据的许可证以填充仪表板。 您的财务关系是与 {% data variables.product.company_short %}，而不是参与服务的公司。
-## Accepting the additional terms
+## 接受附加条款
-You can view and accept the "GitHub Maintainer Additional Terms for Optional Data Provision" agreement from your [{% data variables.product.prodname_sponsors %} dashboard](https://github.com/sponsors/accounts). For information about joining the Sponsors for Companies service, see "[Paying for GitHub Sponsors by invoice](/sponsors/sponsoring-open-source-contributors/paying-for-github-sponsors-by-invoice)."
+您可以从 [{% data variables.product.prodname_sponsors %} 仪表板](https://github.com/sponsors/accounts)查看和接受“GitHub 维护者可选数据规定附加条款”协议。 有关加入公司赞助商服务的信息，请参阅“[按发票为 GitHub Sponsors 付款](/sponsors/sponsoring-open-source-contributors/paying-for-github-sponsors-by-invoice)”。
{% data reusables.sponsors.navigate-to-sponsors-dashboard %}
-3. On the "Overview" tab, under "Optional steps", click **GitHub Maintainer Additional Terms for Optional Data Provision** to display the agreement.
-4. When you have read the agreement, click **Accept** to accept the terms and join the Sponsors for Companies service. Alternatively, click the {% octicon "x" aria-label="The x octicon" %} in the top right corner of the dialog to close the agreement without accepting.
+3. 在“Overview（概述）”选项卡的“Optional steps（可选步骤）”下，单击 **GitHub Maintainer Additional Terms for Optional Data Provision（GitHub 维护者可选数据规定附加条款）**以显示协议。
+4. 阅读协议后，单击 **Accept（接受）**接受条款并加入公司赞助商服务。 或者，单击对话框右上角的 {% octicon "x" aria-label="The x octicon" %} 以关闭协议而不接受。
diff --git a/translations/zh-CN/content/sponsors/sponsoring-open-source-contributors/paying-for-github-sponsors-by-invoice.md b/translations/zh-CN/content/sponsors/sponsoring-open-source-contributors/paying-for-github-sponsors-by-invoice.md
index 85eeb24bcb93..b928416fd7f7 100644
--- a/translations/zh-CN/content/sponsors/sponsoring-open-source-contributors/paying-for-github-sponsors-by-invoice.md
+++ b/translations/zh-CN/content/sponsors/sponsoring-open-source-contributors/paying-for-github-sponsors-by-invoice.md
@@ -1,7 +1,7 @@
---
-title: Paying for GitHub Sponsors by invoice
-shortTitle: Paying by invoice
-intro: 'If your company pays {% data variables.product.company_short %} by invoice, you can join the Sponsors for Companies service.'
+title: 按发票支付 GitHub Sponsors
+shortTitle: 按发票支付
+intro: '如果您的公司通过发票支付 {% data variables.product.company_short %} ，您可以加入公司赞助商服务。'
versions:
fpt: '*'
ghec: '*'
@@ -15,8 +15,8 @@ redirect_from:
{% data reusables.sponsors.beta-note-sponsors-for-companies %}
-Companies can use an invoice method to participate in the {% data variables.product.prodname_sponsors %} program. This can be particularly convenient if your company has an existing invoiced billing relationship with {% data variables.product.company_short %}. Companies paying by invoice get access to a {% data variables.product.product_name %} dashboard that measures open source contributions and activity across the public projects on {% data variables.product.prodname_dotcom_the_website %} they're interested in.
+公司可以使用发票方法参与 {% data variables.product.prodname_sponsors %} 计划。 如果您的公司与 {% data variables.product.company_short %} 存在发票计费关系，这可能特别方便。 按发票付款的公司可以访问 {% data variables.product.product_name %} 仪表板，该仪表板根据他们感兴趣的 {% data variables.product.prodname_dotcom_the_website %} 衡量公共项目中的开源贡献和活动。
-You can join this beta program by talking to your sales representative, or by [contacting us](https://support.github.com/contact/org-sponsors-waitlist).
+您可以联系您的销售代表或[联系我们](https://support.github.com/contact/org-sponsors-waitlist)加入此测试计划。
-For information about receiving payments from the Sponsors for Companies service, see "[Receiving payments from Sponsors for Companies](/sponsors/receiving-sponsorships-through-github-sponsors/sponsors-for-companies)."
+有关从公司担保人服务接收付款的信息，请参阅“[从公司赞助商接收付款](/sponsors/receiving-sponsorships-through-github-sponsors/sponsors-for-companies)”。
diff --git a/translations/zh-CN/content/sponsors/sponsoring-open-source-contributors/sponsoring-an-open-source-contributor.md b/translations/zh-CN/content/sponsors/sponsoring-open-source-contributors/sponsoring-an-open-source-contributor.md
index d43d450c432f..cca57c19b123 100644
--- a/translations/zh-CN/content/sponsors/sponsoring-open-source-contributors/sponsoring-an-open-source-contributor.md
+++ b/translations/zh-CN/content/sponsors/sponsoring-open-source-contributors/sponsoring-an-open-source-contributor.md
@@ -37,7 +37,7 @@ shortTitle: 赞助贡献者
{% data reusables.sponsors.manage-updates-for-orgs %}
-You can choose whether to display your sponsorship publicly. One-time sponsorships remain visible for one month.
+您可以选择是否公开显示您的赞助。 一次性赞助在一个月内保持可见。
如果被赞助帐户撤销的等级，您将仍保留在该等级，直到您选择其他等级或取消订阅。 更多信息请参阅“[升级赞助](/articles/upgrading-a-sponsorship)”和“[降级赞助](/articles/downgrading-a-sponsorship)”。
diff --git a/translations/zh-CN/content/support/contacting-github-support/providing-data-to-github-support.md b/translations/zh-CN/content/support/contacting-github-support/providing-data-to-github-support.md
index af9f4ca0f043..3e83cee79207 100644
--- a/translations/zh-CN/content/support/contacting-github-support/providing-data-to-github-support.md
+++ b/translations/zh-CN/content/support/contacting-github-support/providing-data-to-github-support.md
@@ -177,3 +177,4 @@ $ ssh -p122 admin@hostname -- 'ghe-diagnostics' > diagnostics.txt
## 延伸阅读
- "[About GitHub Support](/support/learning-about-github-support/about-github-support)"
+- "[Generating a Health Check for your enterprise](/enterprise-server@latest/admin/enterprise-management/monitoring-your-appliance/generating-a-health-check-for-your-enterprise)"
diff --git a/translations/zh-CN/content/support/learning-about-github-support/about-github-premium-support.md b/translations/zh-CN/content/support/learning-about-github-support/about-github-premium-support.md
index 0c9b1ffe0106..b6d5e1071a52 100644
--- a/translations/zh-CN/content/support/learning-about-github-support/about-github-premium-support.md
+++ b/translations/zh-CN/content/support/learning-about-github-support/about-github-premium-support.md
@@ -54,7 +54,8 @@ There are two {% data variables.contact.premium_support %} plans: Premium and Pr
{% note %}
**Notes:**
- - Scheduled checks are limited to one organization per term. You can add scheduled checks for additional organizations at any time for an additional fee by [contacting our account management team](https://enterprise.github.com/contact) or calling [+1 (877) 448-4820](tel:+1-877-448-4820).
+ - Scheduled checks are limited to one organization per term. You can add scheduled checks for additional organizations at any time for an additional fee by [contacting our account management team](https://enterprise.github.com/contact) or calling [+1 (877) 448-4820](tel:+1-877-448-4820).{% ifversion ghes %}
+ - You can generate a Health Check at any time by uploading a support bundle. For more information, see "[Generating a Health Check for your enterprise](/admin/enterprise-management/monitoring-your-appliance/generating-a-health-check-for-your-enterprise)."{% endif %}
- For the {% data variables.product.premium_plus_support_plan %}, 50% of unused Managed Services hours roll over to the next month and expire at the end of the quarter.
- Enterprise owners and billing managers automatically have a support entitlement. Enterprise owners can add support entitlements to members of organizations owned by their enterprise account. For more information, see "[Managing support entitlements for your enterprise](/enterprise-cloud@latest/admin/user-management/managing-users-in-your-enterprise/managing-support-entitlements-for-your-enterprise)."
diff --git a/translations/zh-CN/data/features/codeowners-errors.yml b/translations/zh-CN/data/features/codeowners-errors.yml
new file mode 100644
index 000000000000..e186a4e6eccb
--- /dev/null
+++ b/translations/zh-CN/data/features/codeowners-errors.yml
@@ -0,0 +1,6 @@
+---
+versions:
+ fpt: '*'
+ ghec: '*'
+ ghes: '>=3.5'
+ ghae: 'issue-6078'
diff --git a/translations/zh-CN/data/features/dependabot-updates-github-connect.yml b/translations/zh-CN/data/features/dependabot-updates-github-connect.yml
new file mode 100644
index 000000000000..6ec916de7e1f
--- /dev/null
+++ b/translations/zh-CN/data/features/dependabot-updates-github-connect.yml
@@ -0,0 +1,4 @@
+---
+versions:
+ ghes: '>=3.4'
+ ghae: 'issue-5867'
diff --git a/translations/zh-CN/data/features/pull-request-approval-limit.yml b/translations/zh-CN/data/features/pull-request-approval-limit.yml
new file mode 100644
index 000000000000..27366e98e1ed
--- /dev/null
+++ b/translations/zh-CN/data/features/pull-request-approval-limit.yml
@@ -0,0 +1,6 @@
+---
+#Reference: #5244
+#Documentation for moderation setting to limit who can approve or request changes on a PR.
+versions:
+ fpt: '*'
+ ghec: '*'
diff --git a/translations/zh-CN/data/glossaries/external.yml b/translations/zh-CN/data/glossaries/external.yml
index ce33aa0de5d3..427d5545539c 100644
--- a/translations/zh-CN/data/glossaries/external.yml
+++ b/translations/zh-CN/data/glossaries/external.yml
@@ -210,7 +210,7 @@
description: 发送到用户电子邮件地址的通知。
-
term: 企业帐户
- description: Enterprise accounts allow you to centrally manage policy and billing for multiple organizations. {% data reusables.gated-features.enterprise-accounts %}
+ description: 企业帐户允许您集中管理多个组织的策略和帐单。{% data reusables.gated-features.enterprise-accounts %}
-
term: Explorer
description: >-
@@ -594,7 +594,7 @@
description: >-
仓库是 GitHub 最基本的元素，最容易被想象成项目的文件夹。一个仓库包含所有项目文件（包括文档），并且存储每个文件的修订历史记录。仓库可有多个协作者，也可以是公共仓库或私有仓库。
-
- term: repository cache
+ term: 存储库缓存
description: >-
A read-only mirror of repositories for your GitHub Enterprise server instance, located near distributed teams and CI clients.
-
diff --git a/translations/zh-CN/data/graphql/ghes-3.4/graphql_previews.enterprise.yml b/translations/zh-CN/data/graphql/ghes-3.4/graphql_previews.enterprise.yml
new file mode 100644
index 000000000000..a304950c11c3
--- /dev/null
+++ b/translations/zh-CN/data/graphql/ghes-3.4/graphql_previews.enterprise.yml
@@ -0,0 +1,124 @@
+---
+-
+ title: 使用包版本删除
+ description: >-
+ 此预览支持允许删除私有包版本 DeletePackageVersion 突变。
+ toggled_by: ':package-deletes-preview'
+ announcement: null
+ updates: null
+ toggled_on:
+ - Mutation.deletePackageVersion
+ owning_teams:
+ - '@github/pe-package-registry'
+-
+ title: 部署
+ description: >-
+ 此预览支持部署突变和新部署功能。
+ toggled_by: ':flash-preview'
+ announcement: null
+ updates: null
+ toggled_on:
+ - DeploymentStatus.environment
+ - Mutation.createDeploymentStatus
+ - CreateDeploymentStatusInput
+ - CreateDeploymentStatusPayload
+ - Mutation.createDeployment
+ - CreateDeploymentInput
+ - CreateDeploymentPayload
+ owning_teams:
+ - '@github/c2c-actions-service'
+-
+ title: >-
+ >- MergeInfoPreview - More detailed information about a pull request's merge state.
+ description: >-
+ 此预览支持访问提供有关拉取请求合并状态的更多详细信息的字段。
+ toggled_by: ':merge-info-preview'
+ announcement: null
+ updates: null
+ toggled_on:
+ - PullRequest.canBeRebased
+ - PullRequest.mergeStateStatus
+ owning_teams:
+ - '@github/pe-pull-requests'
+-
+ title: UpdateRefsPreview - 在单个操作中更新多个 ref。
+ description: 此预览支持在单个操作中更新多个 ref。
+ toggled_by: ':update-refs-preview'
+ announcement: null
+ updates: null
+ toggled_on:
+ - Mutation.updateRefs
+ - GitRefname
+ - RefUpdate
+ - UpdateRefsInput
+ - UpdateRefsPayload
+ owning_teams:
+ - '@github/reponauts'
+-
+ title: 项目事件详细信息
+ description: >-
+ 此预览将项目、项目卡和项目列详细信息添加到与项目相关的议题事件。
+ toggled_by: ':starfox-preview'
+ announcement: null
+ updates: null
+ toggled_on:
+ - AddedToProjectEvent.project
+ - AddedToProjectEvent.projectCard
+ - AddedToProjectEvent.projectColumnName
+ - ConvertedNoteToIssueEvent.project
+ - ConvertedNoteToIssueEvent.projectCard
+ - ConvertedNoteToIssueEvent.projectColumnName
+ - MovedColumnsInProjectEvent.project
+ - MovedColumnsInProjectEvent.projectCard
+ - MovedColumnsInProjectEvent.projectColumnName
+ - MovedColumnsInProjectEvent.previousProjectColumnName
+ - RemovedFromProjectEvent.project
+ - RemovedFromProjectEvent.projectColumnName
+ owning_teams:
+ - '@github/github-projects'
+-
+ title: 标签预览
+ description: >-
+ 此预览支持添加、更新、创建和删除标签。
+ toggled_by: ':bane-preview'
+ announcement: null
+ updates: null
+ toggled_on:
+ - Mutation.createLabel
+ - CreateLabelPayload
+ - CreateLabelInput
+ - Mutation.deleteLabel
+ - DeleteLabelPayload
+ - DeleteLabelInput
+ - Mutation.updateLabel
+ - UpdateLabelPayload
+ - UpdateLabelInput
+ owning_teams:
+ - '@github/pe-pull-requests'
+-
+ title: 导入项目
+ description: 此预览增加了对导入项目的支持。
+ toggled_by: ':slothette-preview'
+ announcement: null
+ updates: null
+ toggled_on:
+ - Mutation.importProject
+ owning_teams:
+ - '@github/pe-issues-projects'
+-
+ title: 团队审查任务预览
+ description: >-
+ 此预览支持更新团队审查任务的设置。
+ toggled_by: ':stone-crop-preview'
+ announcement: null
+ updates: null
+ toggled_on:
+ - Mutation.updateTeamReviewAssignment
+ - UpdateTeamReviewAssignmentInput
+ - TeamReviewAssignmentAlgorithm
+ - Team.reviewRequestDelegationEnabled
+ - Team.reviewRequestDelegationAlgorithm
+ - Team.reviewRequestDelegationMemberCount
+ - Team.reviewRequestDelegationNotifyTeam
+ owning_teams:
+ - '@github/pe-pull-requests'
diff --git a/translations/zh-CN/data/graphql/ghes-3.4/graphql_upcoming_changes.public-enterprise.yml b/translations/zh-CN/data/graphql/ghes-3.4/graphql_upcoming_changes.public-enterprise.yml
new file mode 100644
index 000000000000..b0d87df97a19
--- /dev/null
+++ b/translations/zh-CN/data/graphql/ghes-3.4/graphql_upcoming_changes.public-enterprise.yml
@@ -0,0 +1,114 @@
+---
+upcoming_changes:
+ -
+ location: LegacyMigration.uploadUrlTemplate
+ description: '`uploadUrlTemplate` 将被删除。使用 `uploadUrl` 代替。'
+ reason: '`uploadUrlTemplate` 正在被删除，因为它不是标准的 URL，并且增加了一个额外的用户步骤。'
+ date: '2019-04-01T00:00:00+00:00'
+ criticality: 重大
+ owner: tambling
+ -
+ location: AssignedEvent.user
+ description: '`user` 将被删除。使用 `assignee` 字段代替。'
+ reason: 受理人现在可以作为人体模型。
+ date: '2020-01-01T00:00:00+00:00'
+ criticality: 重大
+ owner: tambling
+ -
+ location: EnterpriseBillingInfo.availableSeats
+ description: '`availableSeats` 将被删除。使用 EnterpriseBillingInfo.totalAvailableLicenses 代替。'
+ reason: '`availableSeats` 将被替换为 `totalAvailableLicenses`，以便更明确地表示要返回的值'
+ date: '2020-01-01T00:00:00+00:00'
+ criticality: 重大
+ owner: BlakeWilliams
+ -
+ location: EnterpriseBillingInfo.seats
+ description: '`seats` 将被删除。使用 EnterpriseBillingInfo.totalLicenses 代替。'
+ reason: '`seats` 将被替换为 `totalLicenses`，以便更明确地表示要返回的值'
+ date: '2020-01-01T00:00:00+00:00'
+ criticality: 重大
+ owner: BlakeWilliams
+ -
+ location: UnassignedEvent.user
+ description: '`user` 将被删除。使用 `assignee` 字段代替。'
+ reason: 受理人现在可以作为人体模型。
+ date: '2020-01-01T00:00:00+00:00'
+ criticality: 重大
+ owner: tambling
+ -
+ location: EnterprisePendingMemberInvitationEdge.isUnlicensed
+ description: '`isUnlicensed` 将被删除。'
+ reason: 所有挂起的成员都会使用许可证
+ date: '2020-07-01T00:00:00+00:00'
+ criticality: 重大
+ owner: BrentWheeldon
+ -
+ location: EnterpriseOwnerInfo.pendingCollaborators
+ description: '`pendingCollaborators` 将被删除。改用 `pendingCollaboratorInvitations` 字段。'
+ reason: 仓库邀请此时可与电子邮件关联，而不仅仅是被邀请者。
+ date: '2020-10-01T00:00:00+00:00'
+ criticality: 重大
+ owner: jdennes
+ -
+ location: Issue.timeline
+ description: '`timeline` 将被删除。使用 Issue.timelineItems 代替。'
+ reason: '`timeline` 将被删除'
+ date: '2020-10-01T00:00:00+00:00'
+ criticality: 重大
+ owner: mikesea
+ -
+ location: PullRequest.timeline
+ description: '`timeline` 将被删除。使用 PullRequest.timelineItems 代替。'
+ reason: '`timeline` 将被删除'
+ date: '2020-10-01T00:00:00+00:00'
+ criticality: 重大
+ owner: mikesea
+ -
+ location: RepositoryInvitationOrderField.INVITEE_LOGIN
+ description: '`INVITEE_LOGIN` 将被删除。'
+ reason: '`INVITEE_LOGIN` 不再是有效字段值。仓库邀请此时可与电子邮件关联，而不仅仅是被邀请者。'
+ date: '2020-10-01T00:00:00+00:00'
+ criticality: 重大
+ owner: jdennes
+ -
+ location: EnterpriseMemberEdge.isUnlicensed
+ description: '`isUnlicensed` 将被删除。'
+ reason: 所有成员都会使用许可证
+ date: '2021-01-01T00:00:00+00:00'
+ criticality: 重大
+ owner: BrentWheeldon
+ -
+ location: EnterpriseOutsideCollaboratorEdge.isUnlicensed
+ description: '`isUnlicensed` 将被删除。'
+ reason: 所有外部协作者使用许可证
+ date: '2021-01-01T00:00:00+00:00'
+ criticality: 重大
+ owner: BrentWheeldon
+ -
+ location: EnterprisePendingCollaboratorEdge.isUnlicensed
+ description: '`isUnlicensed` 将被删除。'
+ reason: 所有挂起的协作者使用许可证
+ date: '2021-01-01T00:00:00+00:00'
+ criticality: 重大
+ owner: BrentWheeldon
+ -
+ location: MergeStateStatus.DRAFT
+ description: '`DRAFT` 将被删除。改为使用 PullRequest.isDraft。'
+ reason: DRAFT 状态将从这个枚举中删除，应改用 `isDraft`
+ date: '2021-01-01T00:00:00+00:00'
+ criticality: 重大
+ owner: nplasterer
+ -
+ location: PackageType.DOCKER
+ description: '`DOCKER` 将被删除。'
+ reason: DOCKER 将从这个枚举中移除，因为这种类型将被迁移到仅供软件包 REST API 使用。
+ date: '2021-06-21'
+ criticality: 重大
+ owner: reybard
+ -
+ location: ReactionGroup.users
+ description: '`user` 将被删除。使用 `reactors` 字段代替。'
+ reason: 反应者现在可以是人体模特、自动程序和组织。
+ date: '2021-10-01T00:00:00+00:00'
+ criticality: 重大
+ owner: synthead
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-0/21.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-0/21.yml
index 9ccd94c77a99..3b118cef522e 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-0/21.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-0/21.yml
@@ -4,6 +4,7 @@ sections:
security_fixes:
- Support bundles could include sensitive files if they met a specific set of conditions.
- A UI misrepresentation vulnerability was identified in GitHub Enterprise Server that allowed more permissions to be granted during a GitHub App's user-authorization web flow than was displayed to the user during approval. This vulnerability affected all versions of GitHub Enterprise Server prior to 3.3 and was fixed in versions 3.2.5, 3.1.13, 3.0.21. This vulnerability was reported via the GitHub Bug Bounty program and has been assigned [CVE-2021-41598](https://www.cve.org/CVERecord?id=CVE-2021-41598).
+ - A remote code execution vulnerability was identified in GitHub Enterprise Server that could be exploited when building a GitHub Pages site. This vulnerability affected all versions of GitHub Enterprise Server prior to 3.3 and was fixed in versions 3.0.21, 3.1.13, 3.2.5. This vulnerability was reported via the GitHub Bug Bounty program and has been assigned [CVE-2021-41599](https://www.cve.org/CVERecord?id=CVE-2021-41599). Updated February 17, 2022.
bugs:
- Running `ghe-config-apply` could sometimes fail because of permission issues in `/data/user/tmp/pages`.
- A misconfiguration in the Management Console caused scheduling errors.
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-0/25.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-0/25.yml
new file mode 100644
index 000000000000..9b8fab7db175
--- /dev/null
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-0/25.yml
@@ -0,0 +1,13 @@
+---
+date: '2022-02-17'
+sections:
+ security_fixes:
+ - 包已更新到最新的安全版本。
+ known_issues:
+ - On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
+ - 自定义防火墙规则在升级过程中被删除。
+ - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
+ - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接，则议题无法关闭。
+ - 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后，私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
+ - 当副本节点在高可用性配置下离线时，{% data variables.product.product_name %} 仍可能将 {% data variables.product.prodname_pages %} 请求路由到离线节点，从而减少用户的 {% data variables.product.prodname_pages %} 可用性。
+ - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-1/13.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-1/13.yml
index 781daeca611a..804b31386ecc 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-1/13.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-1/13.yml
@@ -4,6 +4,7 @@ sections:
security_fixes:
- Support bundles could include sensitive files if they met a specific set of conditions.
- A UI misrepresentation vulnerability was identified in GitHub Enterprise Server that allowed more permissions to be granted during a GitHub App's user-authorization web flow than was displayed to the user during approval. This vulnerability affected all versions of GitHub Enterprise Server prior to 3.3 and was fixed in versions 3.2.5, 3.1.13, 3.0.21. This vulnerability was reported via the GitHub Bug Bounty program and has been assigned [CVE-2021-41598](https://www.cve.org/CVERecord?id=CVE-2021-41598).
+ - A remote code execution vulnerability was identified in GitHub Enterprise Server that could be exploited when building a GitHub Pages site. This vulnerability affected all versions of GitHub Enterprise Server prior to 3.3 and was fixed in versions 3.0.21, 3.1.13, 3.2.5. This vulnerability was reported via the GitHub Bug Bounty program and has been assigned [CVE-2021-41599](https://www.cve.org/CVERecord?id=CVE-2021-41599). Updated February 17, 2022
bugs:
- Running `ghe-config-apply` could sometimes fail because of permission issues in `/data/user/tmp/pages`.
- A misconfiguration in the Management Console caused scheduling errors.
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-1/17.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-1/17.yml
new file mode 100644
index 000000000000..cdea421aa74e
--- /dev/null
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-1/17.yml
@@ -0,0 +1,16 @@
+---
+date: '2022-02-17'
+sections:
+ security_fixes:
+ - 包已更新到最新的安全版本。
+ bugs:
+ - Fixes SystemStackError (stack too deep) when getting more than 2^16 keys from memcached.
+ known_issues:
+ - '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分，我们继续拥有返回时间值所需的所有数据，并将在我们解决现有性能问题后恢复返回这个值。'
+ - On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
+ - 自定义防火墙规则在升级过程中被删除。
+ - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
+ - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接，则议题无法关闭。
+ - 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后，私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
+ - If {% data variables.product.prodname_actions %} is enabled for {% data variables.product.prodname_ghe_server %}, teardown of a replica node with `ghe-repl-teardown` will succeed, but may return `ERROR:Running migrations`.
+ - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
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 f8311e8c59c1..5e229c664067 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
@@ -4,6 +4,7 @@ sections:
security_fixes:
- Support bundles could include sensitive files if they met a specific set of conditions.
- A UI misrepresentation vulnerability was identified in GitHub Enterprise Server that allowed more permissions to be granted during a GitHub App's user-authorization web flow than was displayed to the user during approval. This vulnerability affected all versions of GitHub Enterprise Server prior to 3.3 and was fixed in versions 3.2.5, 3.1.13, 3.0.21. This vulnerability was reported via the GitHub Bug Bounty program and has been assigned [CVE-2021-41598](https://www.cve.org/CVERecord?id=CVE-2021-41598).
+ - A remote code execution vulnerability was identified in GitHub Enterprise Server that could be exploited when building a GitHub Pages site. This vulnerability affected all versions of GitHub Enterprise Server prior to 3.3 and was fixed in versions 3.0.21, 3.1.13, 3.2.5. This vulnerability was reported via the GitHub Bug Bounty program and has been assigned [CVE-2021-41599](https://www.cve.org/CVERecord?id=CVE-2021-41599). Updated February 17, 2022.
bugs:
- In some cases when Actions was not enabled, `ghe-support-bundle` reported an unexpected message `Unable to find MS SQL container.`
- Running `ghe-config-apply` could sometimes fail because of permission issues in `/data/user/tmp/pages`.
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
new file mode 100644
index 000000000000..d57809fbc9e4
--- /dev/null
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/9.yml
@@ -0,0 +1,20 @@
+---
+date: '2022-02-17'
+sections:
+ security_fixes:
+ - It was possible for a user to register a user or organization named "saml".
+ - 包已更新到最新的安全版本。
+ bugs:
+ - GitHub Packages storage settings could not be validated and saved in the Management Console when Azure Blob Storage was used.
+ - The mssql.backup.cadence configuration option failed ghe-config-check with an invalid characterset warning.
+ - Fixes SystemStackError (stack too deep) when getting more than 2^16 keys from memcached.
+ changes:
+ - Secret scanning will skip scanning ZIP and other archive files for secrets.
+ known_issues:
+ - On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
+ - 自定义防火墙规则在升级过程中被删除。
+ - 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 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分，我们继续拥有返回时间值所需的所有数据，并将在我们解决现有性能问题后恢复返回这个值。'
+ - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
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
new file mode 100644
index 000000000000..2b91cfca2009
--- /dev/null
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-3/4.yml
@@ -0,0 +1,24 @@
+---
+date: '2022-02-17'
+sections:
+ security_fixes:
+ - It was possible for a user to register a user or organization named "saml".
+ - 包已更新到最新的安全版本。
+ bugs:
+ - GitHub Packages storage settings could not be validated and saved in the Management Console when Azure Blob Storage was used.
+ - The mssql.backup.cadence configuration option failed ghe-config-check with an invalid characterset warning.
+ - Fixes SystemStackError (stack too deep) when getting more than 2^16 keys from memcached.
+ - A number of select menus across the site rendered incorrectly and were not functional.
+ changes:
+ - Dependency Graph can now be enabled without vulnerability data, allowing customers to see what dependencies are in use and at what versions. Enabling Dependency Graph without enabling GitHub Connect will *not* provide vulnerability information.
+ - Secret scanning will skip scanning ZIP and other archive files for secrets.
+ known_issues:
+ - After upgrading to {% data variables.product.prodname_ghe_server %} 3.3, {% data variables.product.prodname_actions %} may fail to start automatically. To resolve this issue, connect to the appliance via SSH and run the `ghe-actions-start` command.
+ - On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
+ - 自定义防火墙规则在升级过程中被删除。
+ - 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 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分，我们继续拥有返回时间值所需的所有数据，并将在我们解决现有性能问题后恢复返回这个值。'
+ - 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.'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-4/0-rc1.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-4/0-rc1.yml
new file mode 100644
index 000000000000..f566c33f24c9
--- /dev/null
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-4/0-rc1.yml
@@ -0,0 +1,193 @@
+---
+date: '2022-03-15'
+release_candidate: true
+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 only running release candidates on test environments.
+
+ {% 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)."
+
+ > This release is dedicated to our colleague and friend John, a Hubber who was always there to help. You will be greatly missed.
+ >
+ > **John "Ralph" Wiebalk 1986–2021**
+sections:
+ features:
+ -
+ heading: Secret scanning REST API now returns locations
+ notes:
+ - |
+ {% data variables.product.prodname_GH_advanced_security %} customers can now use the REST API to retrieve commit details of secrets detected in private repository scans. The new endpoint returns details of a secret's first detection within a file, including the secret's location and commit SHA. For more information, see "[Secret scanning](/rest/reference/secret-scanning)" in the REST API documentation.
+ -
+ heading: Export license data of committer-based billing for GitHub Advanced Security
+ notes:
+ - |
+ Enterprise and organization owners can now export their {% data variables.product.prodname_GH_advanced_security %} license usage data to a CSV file. The {% data variables.product.prodname_advanced_security %} billing data can also be retrieved via billing endpoints in the REST API. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-11-11-export-github-advanced-security-license-usage-data/)."
+ -
+ heading: GitHub Actions reusable workflows in public beta
+ notes:
+ - |
+ You can now reuse entire workflows as if they were an action. This feature is available in public beta. Instead of copying and pasting workflow definitions across repositories, you can now reference an existing workflow with a single line of configuration. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-10-05-github-actions-dry-your-github-actions-configuration-by-reusing-workflows/)."
+ -
+ heading: Dependabot security and version updates in public beta
+ notes:
+ - |
+ {% data variables.product.prodname_dependabot %} is now available in {% data variables.product.prodname_ghe_server %} 3.4 as a public beta, offering both version updates and security updates for several popular ecosystems. {% data variables.product.prodname_dependabot %} on {% data variables.product.prodname_ghe_server %} requires {% data variables.product.prodname_actions %} and a pool of self-hosted runners configured for {% data variables.product.prodname_dependabot %} use. {% data variables.product.prodname_dependabot %} on {% data variables.product.prodname_ghe_server %} also requires {% data variables.product.prodname_github_connect %} and {% data variables.product.prodname_dependabot %} to be enabled by an administrator. Beta feedback and suggestions can be shared in the [{% data variables.product.prodname_dependabot %} Feedback GitHub discussion](https://github.com/github/feedback/discussions/categories/dependabot-feedback). For more information and to try the beta, see "[Setting up {% data variables.product.prodname_dependabot %} security and version updates on your enterprise](/admin/github-actions/enabling-github-actions-for-github-enterprise-server/setting-up-dependabot-updates)."
+ changes:
+ -
+ heading: 管理更改
+ notes:
+ - Users can now choose the number of spaces a tab is equal to, by setting their preferred tab size in the "Appearance" settings of their user account. All code with a tab indent will render using the preferred tab size.
+ - The {% data variables.product.prodname_github_connect %} data connection record now includes a count of the number of active and dormant users and the configured dormancy period.
+ -
+ heading: Performance Changes
+ notes:
+ - WireGuard, used to secure communication between {% data variables.product.prodname_ghe_server %} instances in a High Availability configuration, has been migrated to the Kernel implementation.
+ -
+ heading: Notification Changes
+ notes:
+ - Organization owners can now unsubscribe from email notifications when new deploy keys are added to repositories belonging to their organizations. For more information, see "[Configuring notifications](/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications)."
+ - 'Notification emails from newly created issues and pull requests now include `(Issue #xx)` or `(PR #xx)` in the email subject, so you can recognize and filter emails that reference these types of issues.'
+ -
+ heading: Organization Changes
+ notes:
+ - Organizations can now display a `README.md` file on their profile Overview. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-09-14-readmes-for-organization-profiles/)."
+ - 'Members of organizations can now view a list of their enterprise owners under the organization''s "People" tab. The enterprise owners list is also now accessible using the GraphQL API. For more information, see the "[`enterpriseOwners`](/graphql/reference/objects#organization)" field under the Organization object in the GraphQL API documentation.'
+ -
+ heading: Repositories changes
+ notes:
+ - |
+ A "Manage Access" section is now shown on the "Collaborators and teams" page in your repository settings. The new section makes it easier for repository administrators to see and manage who has access to their repository, and the level of access granted to each user. Administrators can now:
+
+ * Search all members, teams and collaborators who have access to the repository.
+ * View when members have mixed role assignments, granted to them directly as individuals or indirectly via a team. This is visualized through a new "mixed roles" warning, which displays the highest level role the user is granted if their permission level is higher than their assigned role.
+ * Manage access to popular repositories reliably, with page pagination and fewer timeouts when large groups of users have access.
+ - '{% data variables.product.prodname_ghe_server %} 3.4 includes improvements to the repository invitation experience, such as notifications for private repository invites, a UI prompt when visiting a private repository you have a pending invitation for, and a banner on a public repository overview page when there is an pending invitation.'
+ - 'You can now use single-character prefixes for custom autolinks. Autolink prefixes also now allow `.`, `-`, `_`, `+`, `=`, `:`, `/`, and `#` characters, as well as alphanumerics. For more information about custom autolinks, see "[Configuring autolinks to reference external resources](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-autolinks-to-reference-external-resources)."'
+ - A `CODE_OF_CONDUCT.md` file in the root of a repository is now highlighted in the "About" sidebar on the repository overview page.
+ -
+ heading: 'Releases changes'
+ notes:
+ - '{% data variables.product.prodname_ghe_server %} 3.4 includes improvements to the Releases UI, such as automatically generated release notes which display a summary of all the pull requests for a given release. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-10-20-improvements-to-github-releases-generally-available/)."'
+ - When a release is published, an avatar list is now displayed at the bottom of the release. Avatars for all user accounts mentioned in the release notes are shown. For more information, see "[Managing releases in a repository](/repositories/releasing-projects-on-github/managing-releases-in-a-repository)."
+ -
+ heading: 'Markdown changes'
+ notes:
+ - You can now use the new "Accessibility" settings page to manage your keyboard shortcuts. You can choose to disable keyboard shortcuts that only use single characters like S, G C, and . (the period key). For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-11-16-managing-keyboard-shortcuts-using-accessibility-settings/)."
+ - You can now choose to use a fixed-width font in Markdown-enabled fields, like issue comments and pull request descriptions. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-10-12-fixed-width-font-support-in-markdown-enabled-fields/)."
+ - You can now paste a URL on selected text to quickly create a Markdown link. This works in all Markdown-enabled fields, such as issue comments and pull request descriptions. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-11-10-linkify-selected-text-on-url-paste/)."
+ - 'An image URL can now be appended with a theme context, such as `#gh-dark-mode-only`, to define how the Markdown image is displayed to a viewer. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-11-24-specify-theme-context-for-images-in-markdown/)."'
+ - When creating or editing a gist file with the Markdown (`.md`) file extension, you can now use the "Preview" or "Preview Changes" tab to display a Markdown rendering of the file contents. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-11-17-preview-the-markdown-rendering-of-gists/)."
+ - When typing the name of a {% data variables.product.prodname_dotcom %} user in issues, pull requests and discussions, the @mention suggester now ranks existing participants higher than other {% data variables.product.prodname_dotcom %} users, so that it's more likely the user you're looking for will be listed.
+ - Right-to-left languages are now supported natively in Markdown files, issues, pull requests, discussions, and comments.
+ -
+ heading: 'Issues and pull requests changes'
+ notes:
+ - The diff setting to hide whitespace changes in the pull request "Files changed" tab is now retained for your user account for that pull request. The setting you have chosen is automatically reapplied if you navigate away from the page and then revisit the "Files changed" tab of the same pull request.
+ - When using auto assignment for pull request code reviews, you can now choose to only notify requested team members independently of your auto assignment settings. This setting is useful in scenarios where many users are auto assigned but not all users require notification. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-11-10-team-member-pull-request-review-notifications-can-be-configured-independently-of-auto-assignment/)."
+ -
+ heading: 'Branches changes'
+ notes:
+ - 'Organization and repository administrators can now trigger webhooks to listen for changes to branch protection rules on their repositories. For more information, see the "[branch_protection_rule](/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#branch_protection_rule)" event in the webhooks events and payloads documentation.'
+ - When configuring protected branches, you can now enforce that a required status check is provided by a specific {% data variables.product.prodname_github_app %}. If a status is then provided by a different application, or by a user via a commit status, merging is prevented. This ensures all changes are validated by the intended application. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-12-01-ensure-required-status-checks-provided-by-the-intended-app/)."
+ - Only users with administrator permissions are now able to rename protected branches and modify branch protection rules. Previously, with the exception of the default branch, a collaborator could rename a branch and consequently any non-wildcard branch protection rules that applied to that branch were also renamed. For more information, see "[Renaming a branch](/repositories/configuring-branches-and-merges-in-your-repository/managing-branches-in-your-repository/renaming-a-branch)" 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)."
+ - Administrators can now allow only specific users and teams to bypass pull request requirements. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-11-19-allow-bypassing-required-pull-requests/)."
+ - Administrators can now allow only specific users and teams to force push to a repository. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-12-21-specify-who-can-force-push-to-a-repository/)."
+ - When requiring pull requests for all changes to a protected branch, administrators can now choose if approved reviews are also a requirement. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-11-10-require-pull-requests-without-requiring-reviews/)."
+ -
+ heading: 'GitHub Actions changes'
+ notes:
+ - '{% data variables.product.prodname_actions %} workflows triggered by {% data variables.product.prodname_dependabot %} for the `create`, `deployment`, and `deployment_status` events now always receive a read-only token and no secrets. Similarly, workflows triggered by {% data variables.product.prodname_dependabot %} for the `pull_request_target` event on pull requests where the base ref was created by {% data variables.product.prodname_dependabot %}, now always receive a read-only token and no secrets. These changes are designed to prevent potentially malicious code from executing in a privileged workflow. For more information, see "[Automating {% data variables.product.prodname_dependabot %} with {% data variables.product.prodname_actions %}](/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/automating-dependabot-with-github-actions)."'
+ - Workflow runs on `push` and `pull_request` events triggered by {% data variables.product.prodname_dependabot %} will now respect the permissions specified in your workflows, allowing you to control how you manage automatic dependency updates. The default token permissions will remain read-only. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-10-06-github-actions-workflows-triggered-by-dependabot-prs-will-respect-permissions-key-in-workflows/)."
+ - '{% data variables.product.prodname_actions %} workflows triggered by {% data variables.product.prodname_dependabot %} will now be sent the {% data variables.product.prodname_dependabot %} secrets. You can now pull from private package registries in your CI using the same secrets you have configured for {% data variables.product.prodname_dependabot %} to use, improving how {% data variables.product.prodname_actions %} and {% data variables.product.prodname_dependabot %} work together. For more information, see "[Automating {% data variables.product.prodname_dependabot %} with {% data variables.product.prodname_actions %}](/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/automating-dependabot-with-github-actions)."'
+ - You can now manage runner groups and see the status of your self-hosted runners using new Runners and Runner Groups pages in the UI. The Actions settings page for your repository or organization now shows a summary view of your runners, and allows you to deep dive into a specific runner to edit it or see what job it may be currently running. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-09-20-github-actions-experience-refresh-for-the-management-of-self-hosted-runners/)."
+ - 'Actions authors can now have their action run in Node.js 16 by specifying [`runs.using` as `node16` in the action''s `action.yml`](/actions/creating-actions/metadata-syntax-for-github-actions#runs-for-javascript-actions). This is in addition to the existing Node.js 12 support; actions can continue to specify `runs.using: node12` to use the Node.js 12 runtime.'
+ - 'For manually triggered workflows, {% data variables.product.prodname_actions %} now supports the `choice`, `boolean`, and `environment` input types in addition to the default `string` type. For more information, see "[`on.workflow_dispatch.inputs`](/actions/using-workflows/workflow-syntax-for-github-actions#onworkflow_dispatchinputs)."'
+ - Actions written in YAML, also known as composite actions, now support `if` conditionals. This lets you prevent specific steps from executing unless a condition has been met. Like steps defined in workflows, you can use any supported context and expression to create a conditional.
+ - The search order behavior for self-hosted runners has now changed, so that the first available matching runner at any level will run the job in all cases. This allows jobs to be sent to self-hosted runners much faster, especially for organizations and enterprises with lots of self-hosted runners. Previously, when running a job that required a self-hosted runner, {% data variables.product.prodname_actions %} would look for self-hosted runners in the repository, organization, and enterprise, in that order.
+ - 'Runner labels for {% data variables.product.prodname_actions %} self-hosted runners can now be listed, added and removed using the REST API. For more information about using the new APIs at a repository, organization, or enterprise level, see "[Repositories](/rest/reference/actions#list-labels-for-a-self-hosted-runner-for-a-repository)", "[Organizations](/rest/reference/actions#add-custom-labels-to-a-self-hosted-runner-for-an-organization)", and "[Enterprises](/rest/reference/enterprise-admin#list-labels-for-a-self-hosted-runner-for-an-enterprise)" in the REST API documentation.'
+ -
+ heading: 'Dependabot and Dependency graph changes'
+ notes:
+ - Dependency graph now supports detecting Python dependencies in repositories that use the Poetry package manager. Dependencies will be detected from both `pyproject.toml` and `poetry.lock` manifest files.
+ - When configuring {% data variables.product.prodname_dependabot %} security and version updates on GitHub Enterprise Server, we recommend you also enable {% data variables.product.prodname_dependabot %} in {% data variables.product.prodname_github_connect %}. This will allow {% data variables.product.prodname_dependabot %} to retrieve an updated list of dependencies and vulnerabilities from {% data variables.product.prodname_dotcom_the_website %}, by querying for information such as the changelogs of the public releases of open source code that you depend upon. For more information, see "[Enabling the dependency graph and Dependabot alerts for your enterprise](/admin/configuration/configuring-github-connect/enabling-the-dependency-graph-and-dependabot-alerts-for-your-enterprise)."
+ - '{% data variables.product.prodname_dependabot_alerts %} alerts can now be dismissed using the GraphQL API. For more information, see the "[dismissRepositoryVulnerabilityAlert](/graphql/reference/mutations#dismissrepositoryvulnerabilityalert)" mutation in the GraphQL API documentation.'
+ -
+ heading: 'Code scanning and secret scanning changes'
+ notes:
+ - The {% data variables.product.prodname_codeql %} CLI now supports including markdown-rendered query help in SARIF files, so that the help text can be viewed in the {% data variables.product.prodname_code_scanning %} UI when the query generates an alert. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-11-23-display-help-text-for-your-custom-codeql-queries-in-code-scanning/)."
+ - The {% data variables.product.prodname_codeql %} CLI and {% data variables.product.prodname_vscode %} extension now support building databases and analyzing code on machines powered by Apple Silicon, such as Apple M1. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-11-10-codeql-now-supports-apple-silicon-m1/)."
+ - |
+ The depth of {% data variables.product.prodname_codeql %}'s analysis has been improved by adding support for more [libraries and frameworks](https://codeql.github.com/docs/codeql-overview/supported-languages-and-frameworks/) from the Python ecosystem. As a result, {% data variables.product.prodname_codeql %} can now detect even more potential sources of untrusted user data, steps through which that data flows, and potentially dangerous sinks where the data could end up. This results in an overall improvement of the quality of {% data variables.product.prodname_code_scanning %} alerts. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-11-24-codeql-code-scanning-now-recognizes-more-python-libraries-and-frameworks/)."
+ - Code scanning with {% data variables.product.prodname_codeql %} now includes beta support for analyzing code in all common Ruby versions, up to and including 3.02. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-10-27-codeql-code-scanning-adds-beta-support-for-ruby/)."
+ - |
+ Several improvements have been made to the {% data variables.product.prodname_code_scanning %} API:
+
+ * The `fixed_at` timestamp has been added to alerts. This timestamp is the first time that the alert was not detected in an analysis.
+ * Alert results can now be sorted using `sort` and `direction` on either `created`, `updated` or `number`. For more information, see "[List code scanning alerts for a repository](/rest/reference/code-scanning#list-code-scanning-alerts-for-a-repository)."
+ * A `Last-Modified` header has been added to the alerts and alert endpoint response. For more information, see [`Last-Modified`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Last-Modified) in the Mozilla documentation.
+ * The `relatedLocations` field has been added to the SARIF response when you request a code scanning analysis. The field may contain locations which are not the primary location of the alert. See an example in the [SARIF spec](https://docs.oasis-open.org/sarif/sarif/v2.1.0/cs01/sarif-v2.1.0-cs01.html#_Toc16012616) and for more information see "[Get a code scanning analysis for a repository](/rest/reference/code-scanning#get-a-code-scanning-analysis-for-a-repository)."
+ * Both `help` and `tags` data have been added to the webhook response alert rule object. For more information, see "[Code scanning alert webhooks events and payloads](/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#code_scanning_alert)."
+ * Personal access tokens with the `public_repo` scope now have write access for code scanning endpoints on public repos, if the user has permission.
+
+ For more information, see "[Code scanning](/rest/reference/code-scanning)" in the REST API documentation.
+ - '{% data variables.product.prodname_GH_advanced_security %} customers can now use the REST API to retrieve private repository secret scanning results at the enterprise level. The new endpoint supplements the existing repository-level and organization-level endpoints. For more information, see "[Secret scanning](/rest/reference/secret-scanning)" in the REST API documentation.'
+ #No security/bug fixes for the RC release
+ #security_fixes:
+ #- PLACEHOLDER
+ #bugs:
+ #- PLACEHOLDER
+ known_issues:
+ - On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
+ - 自定义防火墙规则在升级过程中被删除。
+ - 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 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分，我们继续拥有返回时间值所需的所有数据，并将在我们解决现有性能问题后恢复返回这个值。'
+ - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ deprecations:
+ -
+ heading: Deprecation of GitHub Enterprise Server 3.0
+ notes:
+ - '**{% data variables.product.prodname_ghe_server %} 3.0 was discontinued on February 16, 2022**. This means that no patch releases will be made, even for critical security issues, after this date. For better performance, improved security, and new features, [upgrade to the newest version of {% data variables.product.prodname_ghe_server %}](/enterprise-server@3.4/admin/enterprise-management/upgrading-github-enterprise-server) as soon as possible.'
+ -
+ heading: Deprecation of GitHub Enterprise Server 3.1
+ notes:
+ - '**{% data variables.product.prodname_ghe_server %} 3.1 will be discontinued on June 3, 2022**. This means that no patch releases will be made, even for critical security issues, after this date. For better performance, improved security, and new features, [upgrade to the newest version of {% data variables.product.prodname_ghe_server %}](/enterprise-server@3.4/admin/enterprise-management/upgrading-github-enterprise-server) as soon as possible.'
+ -
+ heading: XenServer Hypervisor 支持终止
+ notes:
+ - Starting in {% data variables.product.prodname_ghe_server %} 3.3, {% data variables.product.prodname_ghe_server %} on XenServer was deprecated and is no longer supported. Please contact [GitHub Support](https://support.github.com) with questions or concerns.
+ -
+ heading: Deprecation of the Content Attachments API preview
+ notes:
+ - Due to low usage, we have deprecated the Content References API preview in {% data variables.product.prodname_ghe_server %} 3.4. The API was previously accessible with the `corsair-preview` header. Users can continue to navigate to external URLs without this API. Any registered usages of the Content References API will no longer receive a webhook notification for URLs from your registered domain(s) and we no longer return valid response codes for attempted updates to existing content attachments.
+ -
+ heading: Deprecation of the Codes of Conduct API preview
+ notes:
+ - 'The Codes of Conduct API preview, which was accessible with the `scarlet-witch-preview` header, is deprecated and no longer accessible in {% data variables.product.prodname_ghe_server %} 3.4. We instead recommend using the "[Get community profile metrics](/rest/reference/repos#get-community-profile-metrics)" endpoint to retrieve information about a repository''s code of conduct. For more information, see the "[Deprecation Notice: Codes of Conduct API preview](https://github.blog/changelog/2021-10-06-deprecation-notice-codes-of-conduct-api-preview/)" in the {% data variables.product.prodname_dotcom %} changelog.'
+ -
+ heading: Deprecation of OAuth Application API endpoints and API authentication using query parameters
+ notes:
+ - |
+ Starting with {% data variables.product.prodname_ghe_server %} 3.4, the [deprecated version of the OAuth Application API endpoints](https://developer.github.com/changes/2020-02-14-deprecating-oauth-app-endpoint/#endpoints-affected) have been removed. If you encounter 404 error messages on these endpoints, convert your code to the versions of the OAuth Application API that do not have `access_tokens` in the URL. We've also disabled the use of API authentication using query parameters. We instead recommend using [API authentication in the request header](https://developer.github.com/changes/2020-02-10-deprecating-auth-through-query-param/#changes-to-make).
+ -
+ heading: Deprecation of the CodeQL runner
+ notes:
+ - The {% data variables.product.prodname_codeql %} runner is deprecated in {% data variables.product.prodname_ghe_server %} 3.4 and is no longer supported. The deprecation only affects users who use {% data variables.product.prodname_codeql %} code scanning in third party CI/CD systems; {% data variables.product.prodname_actions %} users are not affected. We strongly recommend that customers migrate to the {% data variables.product.prodname_codeql %} CLI, which is a feature-complete replacement for the {% data variables.product.prodname_codeql %} runner. For more information, see the [{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-09-21-codeql-runner-deprecation/).
+ -
+ heading: Deprecation of custom bit-cache extensions
+ notes:
+ - |
+ Starting in {% data variables.product.prodname_ghe_server %} 3.1, support for {% data variables.product.company_short %}'s proprietary bit-cache extensions began to be phased out. These extensions are deprecated in {% data variables.product.prodname_ghe_server %} 3.3 onwards.
+
+ Any repositories that were already present and active on {% data variables.product.product_location %} running version 3.1 or 3.2 will have been automatically updated.
+
+ Repositories which were not present and active before upgrading to {% data variables.product.prodname_ghe_server %} 3.3 may not perform optimally until a repository maintenance task is run and has successfully completed.
+
+ To start a repository maintenance task manually, browse to `https://