Skip to content

repo sync #17944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Octomerger merged 2 commits into from
May 17, 2022
Merged

repo sync #17944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f38681
New translation batch for cn (#27762)
docubot May 17, 2022
a767b07
Merge branch 'main' into repo-sync
Octomerger May 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion translations/log/cn-resets.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ translations/zh-CN/content/admin/code-security/managing-github-advanced-security
translations/zh-CN/content/admin/code-security/managing-github-advanced-security-for-your-enterprise/deploying-github-advanced-security-in-your-enterprise.md,broken liquid tags
translations/zh-CN/content/admin/code-security/managing-supply-chain-security-for-your-enterprise/about-supply-chain-security-for-your-enterprise.md,broken liquid tags
translations/zh-CN/content/admin/code-security/managing-supply-chain-security-for-your-enterprise/viewing-the-vulnerability-data-for-your-enterprise.md,broken liquid tags
translations/zh-CN/content/admin/configuration/configuring-github-connect/about-github-connect.md,rendering error
translations/zh-CN/content/admin/configuration/configuring-github-connect/about-github-connect.md,broken liquid tags
translations/zh-CN/content/admin/configuration/configuring-github-connect/enabling-automatic-user-license-sync-for-your-enterprise.md,broken liquid tags
translations/zh-CN/content/admin/configuration/configuring-github-connect/enabling-dependabot-for-your-enterprise.md,broken liquid tags
translations/zh-CN/content/admin/configuration/configuring-github-connect/enabling-server-statistics-for-your-enterprise.md,broken liquid tags
Expand Down Expand Up @@ -199,6 +199,7 @@ translations/zh-CN/content/developers/github-marketplace/github-marketplace-over
translations/zh-CN/content/developers/github-marketplace/using-the-github-marketplace-api-in-your-app/handling-new-purchases-and-free-trials.md,broken liquid tags
translations/zh-CN/content/developers/overview/secret-scanning-partner-program.md,broken liquid tags
translations/zh-CN/content/developers/webhooks-and-events/webhooks/about-webhooks.md,broken liquid tags
translations/zh-CN/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md,rendering error
translations/zh-CN/content/discussions/collaborating-with-your-community-using-discussions/about-discussions.md,broken liquid tags
translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-at-your-educational-institution/about-campus-advisors.md,broken liquid tags
translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-at-your-educational-institution/about-github-campus-program.md,broken liquid tags
Expand Down Expand Up @@ -319,6 +320,8 @@ translations/zh-CN/data/release-notes/enterprise-server/3-1/9.yml,broken liquid
translations/zh-CN/data/release-notes/enterprise-server/3-2/0-rc1.yml,broken liquid tags
translations/zh-CN/data/release-notes/enterprise-server/3-2/0.yml,broken liquid tags
translations/zh-CN/data/release-notes/enterprise-server/3-2/3.yml,broken liquid tags
translations/zh-CN/data/release-notes/enterprise-server/3-3/0-rc1.yml,broken liquid tags
translations/zh-CN/data/release-notes/enterprise-server/3-3/0.yml,broken liquid tags
translations/zh-CN/data/release-notes/github-ae/2021-03/2021-03-03.yml,broken liquid tags
translations/zh-CN/data/reusables/actions/actions-use-policy-settings.md,broken liquid tags
translations/zh-CN/data/reusables/actions/enterprise-common-prereqs.md,broken liquid tags
Expand All @@ -337,6 +340,7 @@ translations/zh-CN/data/reusables/code-scanning/enterprise-enable-code-scanning.
translations/zh-CN/data/reusables/code-scanning/run-additional-queries.md,broken liquid tags
translations/zh-CN/data/reusables/code-scanning/upload-sarif-ghas.md,broken liquid tags
translations/zh-CN/data/reusables/dependabot/dependabot-alerts-dependency-graph-enterprise.md,broken liquid tags
translations/zh-CN/data/reusables/dependabot/enterprise-enable-dependabot.md,broken liquid tags
translations/zh-CN/data/reusables/dotcom_billing/downgrade-org-to-free.md,broken liquid tags
translations/zh-CN/data/reusables/enterprise-accounts/emu-password-reset-session.md,broken liquid tags
translations/zh-CN/data/reusables/enterprise-accounts/emu-short-summary.md,rendering error
Expand Down
8 changes: 4 additions & 4 deletions ...d-notifications-on-github/setting-up-notifications/configuring-notifications.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ Email notifications from {% data variables.product.product_location %} contain t
| --- | --- |
| `From` address | This address will always be {% ifversion fpt or ghec %}'`notifications@github.com`'{% else %}'the no-reply email address configured by your site administrator'{% endif %}. |
| `To` field | This field connects directly to the thread.{% ifversion not ghae %} If you reply to the email, you'll add a new comment to the conversation.{% endif %} |
| `Cc` address | {% data variables.product.product_name %} will `Cc` you if you're subscribed to a conversation. The second `Cc` email address matches the notification reason. The suffix for these notification reasons is {% data variables.notifications.cc_address %}. The possible notification reasons are: <ul><li>`assign`: You were assigned to an issue or pull request.</li><li>`author`: You created an issue or pull request.</li><li>`ci_activity`: A {% data variables.product.prodname_actions %} workflow run that you triggered was completed.</li><li>`comment`: You commented on an issue or pull request.</li><li>`manual`: There was an update to an issue or pull request you manually subscribed to.</li><li>`mention`: You were mentioned on an issue or pull request.</li><li>`push`: Someone committed to a pull request you're subscribed to.</li><li>`review_requested`: You or a team you're a member of was requested to review a pull request.</li>{% ifversion fpt or ghes or ghae-issue-4864 or ghec %}<li>`security_alert`: {% data variables.product.prodname_dotcom %} detected a vulnerability in a repository you receive alerts for.</li>{% endif %}<li>`state_change`: An issue or pull request you're subscribed to was either closed or opened.</li><li>`subscribed`: There was an update in a repository you're watching.</li><li>`team_mention`: A team you belong to was mentioned on an issue or pull request.</li><li>`your_activity`: You opened, commented on, or closed an issue or pull request.</li></ul> |
| `mailing list` field | This field identifies the name of the repository and its owner. The format of this address is always `<repository name>.<repository owner>.{% data variables.command_line.backticks %}`. |{% ifversion fpt or ghes or ghae-issue-4864 or ghec %}
| `Cc` address | {% data variables.product.product_name %} will `Cc` you if you're subscribed to a conversation. The second `Cc` email address matches the notification reason. The suffix for these notification reasons is {% data variables.notifications.cc_address %}. The possible notification reasons are: <ul><li>`assign`: You were assigned to an issue or pull request.</li><li>`author`: You created an issue or pull request.</li><li>`ci_activity`: A {% data variables.product.prodname_actions %} workflow run that you triggered was completed.</li><li>`comment`: You commented on an issue or pull request.</li><li>`manual`: There was an update to an issue or pull request you manually subscribed to.</li><li>`mention`: You were mentioned on an issue or pull request.</li><li>`push`: Someone committed to a pull request you're subscribed to.</li><li>`review_requested`: You or a team you're a member of was requested to review a pull request.</li>{% ifversion fpt or ghes or ghae or ghec %}<li>`security_alert`: {% data variables.product.prodname_dotcom %} detected a vulnerability in a repository you receive alerts for.</li>{% endif %}<li>`state_change`: An issue or pull request you're subscribed to was either closed or opened.</li><li>`subscribed`: There was an update in a repository you're watching.</li><li>`team_mention`: A team you belong to was mentioned on an issue or pull request.</li><li>`your_activity`: You opened, commented on, or closed an issue or pull request.</li></ul> |
| `mailing list` field | This field identifies the name of the repository and its owner. The format of this address is always `<repository name>.<repository owner>.{% data variables.command_line.backticks %}`. |{% ifversion fpt or ghes or ghae or ghec %}
| `X-GitHub-Severity` field | {% data reusables.repositories.security-alerts-x-github-severity %} The possible severity levels are:<ul><li>`low`</li><li>`moderate`</li><li>`high`</li><li>`critical`</li></ul>For more information, see "[About {% data variables.product.prodname_dependabot_alerts %}](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)." |{% endif %}

## Choosing your notification settings
Expand All @@ -139,7 +139,7 @@ Email notifications from {% data variables.product.product_location %} contain t
{% data reusables.notifications-v2.manage-notifications %}
3. On the notifications settings page, choose how you receive notifications when:
- There are updates in repositories or team discussions you're watching or in a conversation you're participating in. For more information, see "[About participating and watching notifications](#about-participating-and-watching-notifications)."
- You gain access to a new repository or you've joined a new team. For more information, see "[Automatic watching](#automatic-watching)."{% ifversion fpt or ghes or ghae-issue-4864 or ghec %}
- You gain access to a new repository or you've joined a new team. For more information, see "[Automatic watching](#automatic-watching)."{% ifversion fpt or ghes or ghae or ghec %}
- There are new {% data variables.product.prodname_dependabot_alerts %} in your repository. For more information, see "[{% data variables.product.prodname_dependabot_alerts %} notification options](#dependabot-alerts-notification-options)." {% endif %} {% ifversion fpt or ghec %}
- There are workflow runs updates on repositories set up with {% data variables.product.prodname_actions %}. For more information, see "[{% data variables.product.prodname_actions %} notification options](#github-actions-notification-options)."{% endif %}{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5668 %}
- There are new deploy keys added to repositories that belong to organizations that you're an owner of. For more information, see "[Organization alerts notification options](#organization-alerts-notification-options)."{% endif %}
Expand Down Expand Up @@ -194,7 +194,7 @@ If you are a member of more than one organization, you can configure each one to
5. Select one of your verified email addresses, then click **Save**.
![Switching your per-org email address](/assets/images/help/notifications/notifications_switching_org_email.gif)

{% ifversion fpt or ghes or ghae-issue-4864 or ghec %}
{% ifversion fpt or ghes or ghae or ghec %}
## {% data variables.product.prodname_dependabot_alerts %} notification options

{% data reusables.notifications.vulnerable-dependency-notification-enable %}
Expand Down
34 changes: 17 additions & 17 deletions ...ub/viewing-and-triaging-notifications/managing-notifications-from-your-inbox.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,13 @@ shortTitle: 从收件箱管理
- `is:gist`
- `is:issue-or-pull-request`
- `is:release`
- `is:repository-invitation`{% ifversion fpt or ghes or ghae-issue-4864 or ghec %}
- `is:repository-invitation`{% ifversion fpt or ghes or ghae or ghec %}
- `is:repository-vulnerability-alert`{% endif %}{% ifversion fpt or ghec %}
- `is:repository-advisory`{% endif %}
- `is:team-discussion`{% ifversion fpt or ghec %}
- `is:discussion`{% endif %}

{% ifversion fpt or ghes or ghae-issue-4864 or ghec %}
{% ifversion fpt or ghes or ghae or ghec %}
有关减少 {% data variables.product.prodname_dependabot_alerts %} 通知干扰的信息，请参阅“[配置漏洞依赖项的通知](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies)”。
{% endif %}

Expand All @@ -133,20 +133,20 @@ shortTitle: 从收件箱管理

要根据收到更新的原因过滤通知，您可以使用 `reason:` 查询。 例如，要查看当您（或您所属团队）被请求审查拉取请求时的通知，请使用 `reason:review-requested`。 更多信息请参阅“[关于通知](/github/managing-subscriptions-and-notifications-on-github/about-notifications#reasons-for-receiving-notifications)”。

| 查询 | 描述 |
| ------------------------- | ------------------------------------------------------------------------ |
| `reason:assign` | 分配给您的议题或拉取请求有更新时。 |
| `reason:author` | 当您打开拉取请求或议题并且有更新或新评论时。 |
| `reason:comment` | 当您评论了议题、拉取请求或团队讨论时。 |
| `reason:participating` | 当您评论了议题、拉取请求或团队讨论或者被@提及时。 |
| `reason:invitation` | 当您被邀请加入团队、组织或仓库时。 |
| `reason:manual` | 当您在尚未订阅的议题或拉取请求上单击 **Subscribe（订阅）**时。 |
| `reason:mention` | 您被直接@提及。 |
| `reason:review-requested` | 您或您所属的团队被请求审查拉取请求。{% ifversion fpt or ghes or ghae-issue-4864 or ghec %}
| 查询 | 描述 |
| ------------------------- | ------------------------------------------------------------- |
| `reason:assign` | 分配给您的议题或拉取请求有更新时。 |
| `reason:author` | 当您打开拉取请求或议题并且有更新或新评论时。 |
| `reason:comment` | 当您评论了议题、拉取请求或团队讨论时。 |
| `reason:participating` | 当您评论了议题、拉取请求或团队讨论或者被@提及时。 |
| `reason:invitation` | 当您被邀请加入团队、组织或仓库时。 |
| `reason:manual` | 当您在尚未订阅的议题或拉取请求上单击 **Subscribe（订阅）**时。 |
| `reason:mention` | 您被直接@提及。 |
| `reason:review-requested` | 您或您所属的团队被请求审查拉取请求。{% ifversion fpt or ghes or ghae or ghec %}
| `reason:security-alert` | 为仓库发出安全警报时。{% endif %}
| `reason:state-change` | 当拉取请求或议题的状态改变时。 例如，议题已关闭或拉取请求合并时。 |
| `reason:team-mention` | 您所在的团队被@提及时。 |
| `reason:ci-activity` | 当仓库有 CI 更新时，例如新的工作流程运行状态。 |
| `reason:state-change` | 当拉取请求或议题的状态改变时。 例如，议题已关闭或拉取请求合并时。 |
| `reason:team-mention` | 您所在的团队被@提及时。 |
| `reason:ci-activity` | 当仓库有 CI 更新时，例如新的工作流程运行状态。 |

{% ifversion fpt or ghec %}
### 支持的 `author:` 查询
Expand All @@ -161,7 +161,7 @@ shortTitle: 从收件箱管理

{% endif %}

{% ifversion fpt or ghes or ghae-issue-4864 or ghec %}
{% ifversion fpt or ghes or ghae or ghec %}
## {% data variables.product.prodname_dependabot %} 自定义过滤器

{% ifversion fpt or ghec or ghes > 3.2 %}
Expand All @@ -173,7 +173,7 @@ shortTitle: 从收件箱管理
有关 {% data variables.product.prodname_dependabot %} 的更多信息，请参阅“[关于 {% data variables.product.prodname_dependabot_alerts %}](/code-security/supply-chain-security/about-alerts-for-vulnerable-dependencies)”。
{% endif %}

{% ifversion ghes < 3.3 or ghae-issue-4864 %}
{% ifversion ghes < 3.3 or ghae %}

如果使用 {% data variables.product.prodname_dependabot %} 来告知易受攻击的依赖项，则可以使用并保存这些自定义筛选器来显示 {% data variables.product.prodname_dependabot_alerts %} 的通知：
- `is:repository_vulnerability_alert`
Expand Down
3 changes: 0 additions & 3 deletions ...ng-contribution-graphs-on-your-profile/viewing-contributions-on-your-profile.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,7 @@ The contribution activity section includes a detailed timeline of your work, inc

![Contribution activity time filter](/assets/images/help/profile/contributions_activity_time_filter.png)

{% ifversion fpt or ghes or ghae or ghec %}

## Viewing contributions from {% data variables.product.prodname_enterprise %} on {% data variables.product.prodname_dotcom_the_website %}

If you use {% ifversion fpt or ghec %}{% data variables.product.prodname_ghe_server %}{% ifversion ghae %} or {% data variables.product.prodname_ghe_managed %}{% endif %}{% else %}{% data variables.product.product_name %}{% endif %} and your enterprise owner enables {% data variables.product.prodname_unified_contributions %}, you can send enterprise contribution counts from to your {% data variables.product.prodname_dotcom_the_website %} profile. For more information, see "[Sending enterprise contributions to your {% data variables.product.prodname_dotcom_the_website %} profile](/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-graphs-on-your-profile/sending-enterprise-contributions-to-your-githubcom-profile)."

{% endif %}
6 changes: 3 additions & 3 deletions ...hub-user-account/managing-user-account-settings/managing-your-theme-settings.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ shortTitle: 管理主题设置

您可能需要使用深色主题来减少某些设备的功耗，以在低光条件下减小眼睛的压力，或者因为您更喜欢主题的外观。

{% ifversion fpt or ghes > 3.2 or ghae-issue-4618 or ghec %}如果您视力不佳，则可以从前景和背景元素之间对比度更高的高对比度主题中受益。{% endif %}{% ifversion fpt or ghae-issue-4619 or ghec %} 如果您有色盲，可能会从我们的浅色盲和深色盲主题中受益。
{% ifversion fpt or ghes > 3.2 or ghae or ghec %}如果您视力不佳，则可以从前景和背景元素之间对比度更高的高对比度主题中受益。{% endif %}{% ifversion fpt or ghae or ghec %} 如果您有色盲，可能会从我们的浅色盲和深色盲主题中受益。

{% endif %}

Expand All @@ -31,10 +31,10 @@ shortTitle: 管理主题设置
1. 单击想要使用的主题。
- 如果您选择单个主题，请单击一个主题。

{% ifversion fpt or ghes > 3.2 or ghae-issue-4618 or ghec %}![Radio buttons for the choice of a single theme](/assets/images/help/settings/theme-choose-a-single-theme-highcontrast.png){% else %}![Radio buttons for the choice of a single theme](/assets/images/help/settings/theme-choose-a-single-theme.png){% endif %}
{% ifversion fpt or ghes > 3.2 or ghae or ghec %}![Radio buttons for the choice of a single theme](/assets/images/help/settings/theme-choose-a-single-theme-highcontrast.png){% else %}![Radio buttons for the choice of a single theme](/assets/images/help/settings/theme-choose-a-single-theme.png){% endif %}
- 如果您选择遵循系统设置，请单击白天主题和夜间主题。

{% ifversion fpt or ghes > 3.2 or ghae-issue-4618 or ghec %}![Buttons for the choice of a theme to sync with the system setting](/assets/images/help/settings/theme-choose-a-day-and-night-theme-to-sync-highcontrast.png){% else %}![Buttons for the choice of a theme to sync with the system setting](/assets/images/help/settings/theme-choose-a-day-and-night-theme-to-sync.png){% endif %}
{% ifversion fpt or ghes > 3.2 or ghae or ghec %}![Buttons for the choice of a theme to sync with the system setting](/assets/images/help/settings/theme-choose-a-day-and-night-theme-to-sync-highcontrast.png){% else %}![Buttons for the choice of a theme to sync with the system setting](/assets/images/help/settings/theme-choose-a-day-and-night-theme-to-sync.png){% endif %}
{% ifversion fpt or ghec %}
- 如果您想选择当前处于公开测试阶段的主题，则首先需要通过功能预览启用它。 更多信息请参阅“[通过功能预览了解早期访问版本](/get-started/using-github/exploring-early-access-releases-with-feature-preview)”。{% endif %}

Expand Down
Loading