Skip to content

Commit 60725df

Browse files
authored
Merge pull request github#16474 from github/repo-sync
repo sync
2 parents 98c6d21 + 2005256 commit 60725df

File tree

41 files changed

+361
-210
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+361
-210
lines changed

translations/log/cn-resets.csv

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ translations/zh-CN/content/code-security/secret-scanning/about-secret-scanning.m
134134
translations/zh-CN/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-supply-chain-security.md,broken liquid tags
135135
translations/zh-CN/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph.md,Listed in localization-support#489
136136
translations/zh-CN/content/code-security/supply-chain-security/understanding-your-software-supply-chain/troubleshooting-the-dependency-graph.md,broken liquid tags
137+
translations/zh-CN/content/codespaces/codespaces-reference/using-github-copilot-in-codespaces.md,broken liquid tags
137138
translations/zh-CN/content/codespaces/customizing-your-codespace/personalizing-codespaces-for-your-account.md,broken liquid tags
138139
translations/zh-CN/content/codespaces/developing-in-codespaces/developing-in-a-codespace.md,broken liquid tags
139140
translations/zh-CN/content/codespaces/developing-in-codespaces/forwarding-ports-in-your-codespace.md,broken liquid tags
@@ -186,6 +187,7 @@ translations/zh-CN/content/get-started/signing-up-for-github/setting-up-a-trial-
186187
translations/zh-CN/content/get-started/signing-up-for-github/signing-up-for-a-new-github-account.md,broken liquid tags
187188
translations/zh-CN/content/get-started/signing-up-for-github/verifying-your-email-address.md,broken liquid tags
188189
translations/zh-CN/content/get-started/using-git/dealing-with-non-fast-forward-errors.md,broken liquid tags
190+
translations/zh-CN/content/get-started/using-github/github-command-palette.md,broken liquid tags
189191
translations/zh-CN/content/get-started/using-github/github-mobile.md,broken liquid tags
190192
translations/zh-CN/content/get-started/writing-on-github/editing-and-sharing-content-with-gists/creating-gists.md,broken liquid tags
191193
translations/zh-CN/content/issues/using-labels-and-milestones-to-track-work/managing-labels.md,broken liquid tags
@@ -272,7 +274,7 @@ translations/zh-CN/data/reusables/rest-reference/activity/events.md,broken liqui
272274
translations/zh-CN/data/reusables/rest-reference/apps/marketplace.md,broken liquid tags
273275
translations/zh-CN/data/reusables/rest-reference/packages/packages.md,broken liquid tags
274276
translations/zh-CN/data/reusables/saml/you-must-periodically-authenticate.md,Listed in localization-support#489
275-
translations/zh-CN/data/reusables/saml/you-must-periodically-authenticate.md,rendering error
277+
translations/zh-CN/data/reusables/saml/you-must-periodically-authenticate.md,broken liquid tags
276278
translations/zh-CN/data/reusables/scim/after-you-configure-saml.md,broken liquid tags
277279
translations/zh-CN/data/reusables/secret-scanning/enterprise-enable-secret-scanning.md,broken liquid tags
278280
translations/zh-CN/data/reusables/sponsors/feedback.md,broken liquid tags

translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/about-your-personal-dashboard.md

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,23 @@ You can also find a list of your recently visited repositories, teams, and proje
4040

4141
## Staying updated with activity from the community
4242

43-
In the "All activity" section of your news feed, you can view updates from repositories you're subscribed to and people you follow. The "All activity" section shows updates from repositories you watch or have starred, and from users you follow.
43+
{% if for-you-feed %}
44+
The main section of your dashboard has two activity feeds:
45+
46+
- Following: Activity by people you follow and from repositories you watch.
47+
- For you: Activity and recommendations based on your {% data variables.product.product_name %} network.
48+
49+
### Following feed
50+
51+
This feed shows activity from repositories and users you have shown a direct interest in, by following a user or watching a repository. For example, you'll see updates when a user you follow:
52+
53+
{% else %}
54+
In the "All activity" section of your news feed, you can view updates from repositories you watch and users you follow.
4455

4556
You'll see updates in your news feed when a user you follow:
57+
{% endif %}
58+
59+
4660
- Stars a repository.
4761
- Follows another user.{% ifversion fpt or ghes or ghec %}
4862
- Creates a public repository.{% endif %}
@@ -51,7 +65,26 @@ You'll see updates in your news feed when a user you follow:
5165
- Forks a public repository.{% endif %}
5266
- Publishes a new release.
5367

54-
For more information about starring repositories and following people, see "[Saving repositories with stars](/articles/saving-repositories-with-stars/)" and "[Following people](/articles/following-people)."
68+
For more information about following people and watching repositories, see "[Following people](/get-started/exploring-projects-on-github/following-people)" and "[Be social](/get-started/quickstart/be-social)."
69+
70+
{% if for-you-feed %}
71+
### For you feed
72+
73+
{% note %}
74+
75+
**Note:** This new tab is currently in public beta and subject to change.
76+
77+
{% endnote %}
78+
79+
This feed shows activity and recommendations based on your network on {% data variables.product.product_name %}. It's designed to provide updates that inspire you, keep you up-to-date, and help you find new communities you want to participate in. Your network includes:
80+
81+
- Repositories you have starred
82+
- Repositories you've contributed to
83+
- Users you follow or sponsor
84+
- Users you've collaborated with
85+
- Organizations you follow
86+
87+
{% endif %}
5588

5689
## Exploring recommended repositories
5790

translations/zh-CN/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ shortTitle: 管理对运行器的访问
1414

1515
{% data reusables.actions.enterprise-beta %}
1616
{% data reusables.actions.enterprise-github-hosted-runners %}
17-
{% data reusables.actions.restrict-runner-workflow-beta %}
1817

1918
## 关于自托管运行器组
2019

translations/zh-CN/content/actions/using-workflows/workflow-commands-for-github-actions.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ Write-Output "::error file=app.js,line=1,col=5,endColumn=7::Missing semicolon"
258258
```
259259

260260
{% endpowershell %}
261+
261262
## 对日志行分组
262263

263264
在日志中创建一个可扩展的组。 要创建组,请使用 `group` 命令并指定 `title`。 打印到 `group``endgroup` 命令之间日志的任何内容都会嵌套在日志中可扩展的条目内。

translations/zh-CN/content/admin/configuration/configuring-network-settings/configuring-a-hostname.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ topics:
1717

1818
如果配置的是主机名,而不是硬编码 IP 地址,您将能够更改运行 {% data variables.product.product_location %} 的物理硬件,而不会影响用户或客户端软件。
1919

20-
{% data variables.enterprise.management_console %} 中的主机名设置应设置为合适的完全限定域名 (FQDN),此域名可在互联网上或您的内部网络内解析。 For example, your hostname setting could be `github.companyname.com.` Web and API requests will automatically redirect to the hostname configured in the {% data variables.enterprise.management_console %}.
20+
{% data variables.enterprise.management_console %} 中的主机名设置应设置为合适的完全限定域名 (FQDN),此域名可在互联网上或您的内部网络内解析。 例如,您的主机名设置可能是 `github.companyname.com` Web API 请求将自动重定向到 {% data variables.enterprise.management_console %} 中配置的主机名。
2121

22-
After you configure a hostname, you can enable subdomain isolation to further increase the security of {% data variables.product.product_location %}. 更多信息请参阅“[启用子域隔离](/enterprise/{{ currentVersion }}/admin/guides/installation/enabling-subdomain-isolation/)”。
22+
配置主机名后,可以启用子域隔离以进一步提高 {% data variables.product.product_location %} 的安全性。 更多信息请参阅“[启用子域隔离](/enterprise/{{ currentVersion }}/admin/guides/installation/enabling-subdomain-isolation/)”。
2323

24-
For more information on the supported hostname types, see [Section 2.1 of the HTTP RFC](https://tools.ietf.org/html/rfc1123#section-2).
24+
有关支持的主机名类型的详细信息,请参阅 [HTTP RFC 2.1 ](https://tools.ietf.org/html/rfc1123#section-2)
2525

2626
{% data reusables.enterprise_installation.changing-hostname-not-supported %}
2727

@@ -33,4 +33,4 @@ For more information on the supported hostname types, see [Section 2.1 of the HT
3333
{% data reusables.enterprise_management_console.test-domain-settings-failure %}
3434
{% data reusables.enterprise_management_console.save-settings %}
3535

36-
To help mitigate various cross-site scripting vulnerabilities, we recommend that you enable subdomain isolation for {% data variables.product.product_location %} after you configure a hostname. 更多信息请参阅“[启用子域隔离](/enterprise/{{ currentVersion }}/admin/guides/installation/enabling-subdomain-isolation/)”。
36+
为了帮助缓解各种跨站点脚本漏洞,我们建议您在配置主机名后为 {% data variables.product.product_location %} 启用子域隔离。 更多信息请参阅“[启用子域隔离](/enterprise/{{ currentVersion }}/admin/guides/installation/enabling-subdomain-isolation/)”。

translations/zh-CN/content/admin/enterprise-management/configuring-high-availability/initiating-a-failover-to-your-replica-appliance.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ shortTitle: 启动故障转移到设备
1919

2020
{% data reusables.enterprise_installation.promoting-a-replica %}
2121

22-
1. If the primary appliance is available, to allow replication to finish before you switch appliances, on the primary appliance, put the primary appliance into maintenance mode.
22+
1. 如果主设备可用,要在切换设备之前允许复制完成,请在主设备上将主设备置于维护模式。
2323

24-
- Put the appliance into maintenance mode.
24+
- 将设备置于维护模式。
2525

2626
- 要使用 Management Console,请参阅“[启用和排定维护模式](/enterprise/admin/guides/installation/enabling-and-scheduling-maintenance-mode/)”。
2727

@@ -44,7 +44,7 @@ shortTitle: 启动故障转移到设备
4444
$ ghe-repl-status -vv
4545
```
4646

47-
4. On the replica appliance, to stop replication and promote the replica appliance to primary status, use the `ghe-repl-promote` command. 此操作还会自动将主节点(若可到达)置于维护模式。
47+
4. 在副本设备上,要停止复制并将副本设备提升为主状态,请使用 `ghe-repl-promote` 命令。 此操作还会自动将主节点(若可到达)置于维护模式。
4848
```shell
4949
$ ghe-repl-promote
5050
```

translations/zh-CN/content/admin/user-management/migrating-data-to-and-from-your-enterprise/about-migrations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ topics:
2525

2626
在迁移中,一切都围绕仓库进行。 与仓库关联的大多数数据都可以迁移。 例如,组织内的仓库将迁移仓库**组织,以及与该仓库关联的任何用户、团队、问题和拉取请求。
2727

28-
下表中的项可随仓库一起迁移。 Any items not shown in the list of migrated data can not be migrated, including {% data variables.large_files.product_name_short %} assets.
28+
下表中的项可随仓库一起迁移。 迁移数据列表中未显示的任何项都无法迁移,包括 {% data variables.large_files.product_name_short %} 资产。
2929

3030
{% data reusables.enterprise_migrations.fork-persistence %}
3131

translations/zh-CN/content/authentication/troubleshooting-ssh/using-ssh-over-the-https-port.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ $ ssh -T -p 443 [email protected]
3333
3434
如果您能在端口 443 上通过 SSH 连接到 `git@ssh.{% data variables.command_line.backticks %}`,则可以覆盖您的 SSH 设置以强制与 {% data variables.product.product_location %} 的任何连接均通过该服务器和端口运行。
3535
36-
To set this in your SSH configuration file, edit the file at `~/.ssh/config`, and add this section:
36+
要在 SSH 配置文件中设置此设置,请在 `~/.ssh/config` 编辑该文件,并添加以下部分:
3737
3838
```
3939
Host {% data variables.command_line.codeblock %}

translations/zh-CN/content/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,12 @@ updates:
256256

257257
支持的选项
258258

259+
{% note %}
260+
261+
**Note:** The `prefix` and the `prefix-development` options have a 15 character limit.
262+
263+
{% endnote %}
264+
259265
- `prefix` 指定所有提交消息的前缀。
260266
- `prefix-development` 为更新“开发”依赖项组中依赖项的所有提交消息指定单独的前缀。 指定此选项的值时,`prefix` 仅用于更新“生产”依赖项组中的依赖项。 支持的包管理器:`bundler`、`composer`、`mix`、`maven`、`npm` 和 `pip`。
261267
- `include: "scope"` 指定任何前缀后接提交中更新的依赖项列表。
@@ -309,7 +315,7 @@ updates:
309315

310316
您可以搜索仓库中是否有 `"@dependabot ignore" in:comments`,以检查仓库是否存储了 `ignore` 首选项。 如果您希望取消忽略以这种方式忽略的依赖项,请重新打开拉取请求。
311317

312-
For more information about the `@dependabot ignore` commands, see "[Managing pull requests for dependency updates](/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-pull-requests-for-dependency-updates#managing-dependabot-pull-requests-with-comment-commands)."
318+
有关 `@dependabot ignore` 命令的更多信息,请参阅“[管理依赖关系更新的拉取请求](/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-pull-requests-for-dependency-updates#managing-dependabot-pull-requests-with-comment-commands)”。
313319

314320
#### 指定要忽略的依赖项和版本
315321

translations/zh-CN/content/codespaces/codespaces-reference/using-github-copilot-in-codespaces.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ redirect_from:
1515
- /codespaces/codespaces-reference/using-copilot-in-codespaces
1616
---
1717

18-
## 使用 {% data variables.product.prodname_copilot %}
18+
## Using {% data variables.product.prodname_copilot %}
1919

2020
[{% data variables.product.prodname_copilot %}](https://copilot.github.com/), an AI pair programmer, can be used in any codespace. To start using {% data variables.product.prodname_copilot_short %} in {% data variables.product.prodname_codespaces %}, install the [{% data variables.product.prodname_copilot_short %} extension from the {% data variables.product.prodname_vscode %} marketplace](https://marketplace.visualstudio.com/items?itemName=GitHub.copilot).
2121

22-
To include {% data variables.product.prodname_copilot_short %}, or other extensions, in all of your codespaces, enable Settings Sync. 更多信息请参阅“[为帐户个性化 {% data variables.product.prodname_codespaces %}](/codespaces/customizing-your-codespace/personalizing-codespaces-for-your-account#settings-sync)”。 Additionally, to include {% data variables.product.prodname_copilot_short %} in a given project for all users, you can specify `GitHub.copilot` as an extension in your `devcontainer.json` file. For information about configuring a `devcontainer.json` file, see "[Configuring {% data variables.product.prodname_codespaces %} for your project](/codespaces/customizing-your-codespace/configuring-codespaces-for-your-project#creating-a-custom-codespace-configuration)."
22+
To include {% data variables.product.prodname_copilot_short %}, or other extensions, in all of your codespaces, enable Settings Sync. For more information, see "[Personalizing {% data variables.product.prodname_codespaces %} for your account](/codespaces/customizing-your-codespace/personalizing-codespaces-for-your-account#settings-sync)." Additionally, to include {% data variables.product.prodname_copilot_short %} in a given project for all users, you can specify `GitHub.copilot` as an extension in your `devcontainer.json` file. For information about configuring a `devcontainer.json` file, see "[Configuring {% data variables.product.prodname_codespaces %} for your project](/codespaces/customizing-your-codespace/configuring-codespaces-for-your-project#creating-a-custom-codespace-configuration)."
2323

0 commit comments

Comments
 (0)