Can be one of: `Matched`, `Pending Invitation`, `Server Only`, blank. | -| Member roles | For each of the organizations the user belongs to on GHEC, the organization name and the person's role in that organization (`Owner` or `Member`) separated by a colon
Each organization is delimited by a comma. | -| 企业角色 | Can be one of: `Owner` or `Member`. | +| Field | Description +| ----- | ----------- +| Name | First and last name for the user's account on GHEC. +| Handle or email | GHEC username, or the email address associated with the user's account on GHES. +| Profile link | Link to the {% data variables.product.prodname_dotcom_the_website %} profile page for the user's account on GHEC. +| License type | Can be one of: `Visual Studio subscription` or `Enterprise`. +| License status | Identifies if a user account on {% data variables.product.prodname_dotcom_the_website %} successfully matched either a {% data variables.product.prodname_vs_subscriber %} or GHES user.
Can be one of: `Matched`, `Pending Invitation`, `Server Only`, blank. +| Member roles | For each of the organizations the user belongs to on GHEC, the organization name and the person's role in that organization (`Owner` or `Member`) separated by a colon
Each organization is delimited by a comma. +| Enterprise role | Can be one of: `Owner` or `Member`. {% data variables.product.prodname_vs_subscriber %}s who are not yet members of at least one organization in your enterprise will be included in the report with a pending invitation status, and will be missing values for the "Name" or "Profile link" field. @@ -47,15 +47,15 @@ The license usage report for your enterprise is a CSV file that contains the fol Your {% data variables.product.prodname_ghe_server %} license usage is a JSON file that is typically used when performing a manual sync of user licenses between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %} deployments. The file contains the following information specific to your {% data variables.product.prodname_ghe_server %} environment. -| 字段 | 描述 | -| ---------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| 功能 | The {% data variables.product.prodname_github_connect %} features that are enabled on your {% data variables.product.prodname_ghe_server %} instance, and the date and time of enablement. | -| Host name | The hostname of your {% data variables.product.prodname_ghe_server %} instance. | -| HTTP only | Whether Transport Layer Security (TLS) is enabled and configured on your {% data variables.product.prodname_ghe_server %} instance. Can be one of: `True` or `False`. | -| 许可 | {% data variables.product.prodname_ghe_server %} 许可的哈希. | -| Public key | {% data variables.product.prodname_ghe_server %} 许可的公钥部分. | -| Server ID | UUID generated for your {% data variables.product.prodname_ghe_server %} instance. | -| 版本 | The version of your {% data variables.product.prodname_ghe_server %} instance. | +| Field | Description +| ----- | ----------- +| Features | The {% data variables.product.prodname_github_connect %} features that are enabled on your {% data variables.product.prodname_ghe_server %} instance, and the date and time of enablement. +| Host name | The hostname of your {% data variables.product.prodname_ghe_server %} instance. +| HTTP only | Whether Transport Layer Security (TLS) is enabled and configured on your {% data variables.product.prodname_ghe_server %} instance. Can be one of: `True` or `False`. +| License | A hash of your {% data variables.product.prodname_ghe_server %} license. +| Public key | The public key portion of your {% data variables.product.prodname_ghe_server %} license. +| Server ID | UUID generated for your {% data variables.product.prodname_ghe_server %} instance. +| Version | The version of your {% data variables.product.prodname_ghe_server %} instance. ## Troubleshooting consumed licenses @@ -72,7 +72,7 @@ When attempting to match users across enterprises, {% data variables.product.com Your license usage is recalculated shortly after each license sync is performed. You can view the timestamp of the last license sync job, and, if a job hasn't run since an email address was updated or verified, to resolve an issue with your consumed license report you can manually trigger one. For more information, see "[Syncing license usage between GitHub Enterprise Server and GitHub Enterprise Cloud](/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud)." {% ifversion ghec or ghes > 3.1 %} -If your enterprise uses verified domains, review the list of enterprise members who do not have an email address from a verified domain associated with their {% data variables.product.prodname_dotcom_the_website %} account. Often, these are the users who erroneously consume more than one licensed seat. 更多信息请参阅“[查看来自已验证域的电子邮件地址的成员](/admin/user-management/managing-users-in-your-enterprise/viewing-people-in-your-enterprise#viewing-members-without-an-email-address-from-a-verified-domain)”。 +If your enterprise uses verified domains, review the list of enterprise members who do not have an email address from a verified domain associated with their {% data variables.product.prodname_dotcom_the_website %} account. Often, these are the users who erroneously consume more than one licensed seat. For more information, see "[Viewing members without an email address from a verified domain](/admin/user-management/managing-users-in-your-enterprise/viewing-people-in-your-enterprise#viewing-members-without-an-email-address-from-a-verified-domain)." {% endif %} {% note %} diff --git a/translations/zh-CN/content/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file.md b/translations/zh-CN/content/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file.md index 2314166c4a..b93f03eb21 100644 --- a/translations/zh-CN/content/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file.md +++ b/translations/zh-CN/content/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file.md @@ -280,6 +280,10 @@ updates: prefix-development: "pip dev" include: "scope" ``` +If you use the same configuration as in the example above, bumping the `requests` library in the `pip` development dependency group will generate a commit message of: + + `pip dev: bump requests from 1.0.0 to 1.0.1` + ### `ignore` {% data reusables.dependabot.default-dependencies-allow-ignore %} diff --git a/translations/zh-CN/content/desktop/index.md b/translations/zh-CN/content/desktop/index.md index b77c0e6ebf..c7d5d9006d 100644 --- a/translations/zh-CN/content/desktop/index.md +++ b/translations/zh-CN/content/desktop/index.md @@ -1,7 +1,7 @@ --- title: GitHub Desktop shortTitle: GitHub Desktop -intro: 'With GitHub Desktop, you can interact with GitHub using a GUI instead of the command line or a web browser. You can use GitHub Desktop to complete most Git commands from your desktop, such as pushing to, pulling from, and cloning remote repositories, attributing commits, and creating pull requests, with visual confirmation of changes.' +intro: 使用 GitHub Desktop，您可以使用 GUI 而不是命令行或 Web 浏览器与 GitHub 进行交互。 您可以使用 GitHub Desktop 从桌面完成大多数 Git 命令，例如推送到、拉取远程存储库和克隆远程存储库、归因提交和创建拉取请求，以及直观地确认更改。 introLinks: overview: /desktop/installing-and-configuring-github-desktop/overview/getting-started-with-github-desktop featuredLinks: diff --git a/translations/zh-CN/content/pages/getting-started-with-github-pages/securing-your-github-pages-site-with-https.md b/translations/zh-CN/content/pages/getting-started-with-github-pages/securing-your-github-pages-site-with-https.md index d32aa21230..4664311bc5 100644 --- a/translations/zh-CN/content/pages/getting-started-with-github-pages/securing-your-github-pages-site-with-https.md +++ b/translations/zh-CN/content/pages/getting-started-with-github-pages/securing-your-github-pages-site-with-https.md @@ -66,4 +66,4 @@ shortTitle: 使用 HTTPS 保护站点 |:----------:|:----------------------------------------------------------------------------------------------------------------:|:------------------------------------------------------------------------------------------------------------------:| | CSS | `` | `` | | JavaScript | `` | `` | -| 图像 | `
` | `
` |
+| 图像 | `` | `` |
diff --git a/translations/zh-CN/content/rest/guides/index.md b/translations/zh-CN/content/rest/guides/index.md
index 9769999965..435db86619 100644
--- a/translations/zh-CN/content/rest/guides/index.md
+++ b/translations/zh-CN/content/rest/guides/index.md
@@ -25,4 +25,4 @@ children:
- /getting-started-with-the-checks-api
---
-文档的这一部分旨在让您使用实际 {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API 应用程序开始运行。 我们将涵盖您需要知道的一切，从身份验证到操作结果，再到将结果与其他应用程序相结合。 这里的每个教程都包含一个项目，并且每个项目都将存储在我们的公共[平台样本](https://github.com/github/platform-samples)仓库中并形成文档。 
+文档的这一部分旨在让您使用实际 {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API 应用程序开始运行。 We'll go over everything you need to know, from authentication to results manipulation to integrating results with other apps. Every tutorial will include a project, and each project will be saved and documented in our public [platform-samples](https://github.com/github/platform-samples) repository. 
diff --git a/translations/zh-CN/data/features/README.md b/translations/zh-CN/data/features/README.md
index 615195bd9d..f8ec528a2d 100644
--- a/translations/zh-CN/data/features/README.md
+++ b/translations/zh-CN/data/features/README.md
@@ -21,7 +21,7 @@ versions:
### 液体条件
-现在您可以在内容文件中使用 `{% if meow %} ... {% endif %}`！ 请注意，这是 `if` 标记，而不是新的 `ifversion` 标记。
+现在您可以在内容文件中使用 `{% ifversion meow %} ... {% endif %}`！
### 前辅文
diff --git a/translations/zh-CN/data/features/actions-unified-inputs.yml b/translations/zh-CN/data/features/actions-unified-inputs.yml
new file mode 100644
index 0000000000..8843eefffd
--- /dev/null
+++ b/translations/zh-CN/data/features/actions-unified-inputs.yml
@@ -0,0 +1,7 @@
+---
+#Issue 6921
+versions:
+ fpt: '*'
+ ghec: '*'
+ ghes: '>=3.6'
+ ghae: 'issue-6921'
diff --git a/translations/zh-CN/data/reusables/actions/inputs-vs-github-event-inputs.md b/translations/zh-CN/data/reusables/actions/inputs-vs-github-event-inputs.md
new file mode 100644
index 0000000000..814941103d
--- /dev/null
+++ b/translations/zh-CN/data/reusables/actions/inputs-vs-github-event-inputs.md
@@ -0,0 +1,8 @@
+{% ifversion actions-unified-inputs %}
+
+{% note %}
+
+**Note**: The workflow will also receive the inputs in the `github.event.inputs` context. The information in the `inputs` context and `github.event.inputs` context is identical except that the `inputs` context preserves Boolean values as Booleans instead of converting them to strings.
+
+{% endnote %}
+{% endif %}
diff --git a/translations/zh-CN/data/reusables/actions/workflow-dispatch-inputs.md b/translations/zh-CN/data/reusables/actions/workflow-dispatch-inputs.md
index 07659c76bf..4756038e08 100644
--- a/translations/zh-CN/data/reusables/actions/workflow-dispatch-inputs.md
+++ b/translations/zh-CN/data/reusables/actions/workflow-dispatch-inputs.md
@@ -1,6 +1,8 @@
When using the `workflow_dispatch` event, you can optionally specify inputs that are passed to the workflow.
-触发的工作流程接收 `github.event.input` 上下文中的输入。 更多信息请参阅“[上下文](/actions/learn-github-actions/contexts#github-context)”。
+The triggered workflow receives the inputs in the {% ifversion actions-unified-inputs %}`inputs`{% else %}`github.event.inputs`{% endif %} context. For more information, see "[Contexts]({% ifversion actions-unified-inputs %}/actions/learn-github-actions/contexts#inputs-context{% else %}/actions/learn-github-actions/contexts#github-context{% endif %})."
+
+{% data reusables.actions.inputs-vs-github-event-inputs %}
```yaml
on:
@@ -31,8 +33,8 @@ on:
jobs:
print-tag:
runs-on: ubuntu-latest
- if: {% raw %} ${{ github.event.inputs.print_tags == 'true' }} {% endraw %}
+ if: {% ifversion actions-unified-inputs %}{% raw %} ${{ inputs.print_tags }} {% endraw %}{% else %}{% raw %} ${{ github.event.inputs.print_tags == 'true' }} {% endraw %}{% endif %}
steps:
- name: Print the input tag to STDOUT
- run: echo {% raw %} The tags are ${{ github.event.inputs.tags }} {% endraw %}
+ run: {% ifversion actions-unified-inputs %}echo {% raw %} The tags are ${{ inputs.tags }} {% endraw %}{% else %}echo {% raw %} The tags are ${{ github.event.inputs.tags }} {% endraw %}{% endif %}
```