Skip to content

Commit 7498cda

Browse files
authored
New translation batch for cn (#25764)
* Add crowdin translations * Run script/i18n/homogenize-frontmatter.js * Run script/i18n/lint-translation-files.js --check parsing * Run script/i18n/lint-translation-files.js --check rendering * run script/i18n/reset-files-with-broken-liquid-tags.js --language=cn * run script/i18n/reset-known-broken-translation-files.js * Check in cn CSV report
1 parent c95aa4e commit 7498cda

File tree

43 files changed

+353
-105
lines changed

Some content is hidden

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

43 files changed

+353
-105
lines changed

translations/log/cn-resets.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ translations/zh-CN/content/billing/managing-billing-for-your-github-account/inde
8484
translations/zh-CN/content/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription.md,parsing error
8585
translations/zh-CN/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise.md,broken liquid tags
8686
translations/zh-CN/content/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise.md,broken liquid tags
87+
translations/zh-CN/content/billing/managing-your-license-for-github-enterprise/downloading-your-license-for-github-enterprise.md,parsing error
8788
translations/zh-CN/content/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud.md,parsing error
8889
translations/zh-CN/content/billing/managing-your-license-for-github-enterprise/uploading-a-new-license-to-github-enterprise-server.md,broken liquid tags
8990
translations/zh-CN/content/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise.md,broken liquid tags

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ shortTitle: 管理运行器组
122122
![添加运行器组](/assets/images/help/settings/actions-enterprise-account-add-runner-group.png)
123123
1. 输入运行程序组的名称,并分配组织访问策略。
124124

125-
您可以配置运行器组供特定的组织列表或企业中所有组织访问。 默认情况下,只有私有仓库可以访问运行器组中的运行器,但您可以覆盖此设置。 This setting can't be overridden if configuring an organization's runner group that was shared by an enterprise.
125+
您可以配置运行器组供特定的组织列表或企业中所有组织访问。 默认情况下,只有私有仓库可以访问运行器组中的运行器,但您可以覆盖此设置。 如果配置企业共享的组织的运行组,则不能覆盖此设置。
126126

127127
{% warning %}
128128

translations/zh-CN/content/actions/using-workflows/reusing-workflows.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ You can define inputs and secrets, which can be passed from the caller workflow
113113
runs-on: ubuntu-latest
114114
environment: production
115115
steps:
116-
- uses: ./.github/actions/my-action
116+
- uses: ./.github/workflows/my-action
117117
with:
118118
username: ${{ inputs.username }}
119119
token: ${{ secrets.envPAT }}
@@ -154,7 +154,7 @@ jobs:
154154
name: Pass input and secrets to my-action
155155
runs-on: ubuntu-latest
156156
steps:
157-
- uses: ./.github/actions/my-action
157+
- uses: ./.github/workflows/my-action
158158
with:
159159
username: ${{ inputs.username }}
160160
token: ${{ secrets.token }}

translations/zh-CN/content/actions/using-workflows/triggering-a-workflow.md

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,11 @@ If you want more granular control than events, event activity types, or event fi
195195

196196
### Using conditionals
197197

198-
You can use conditionals to further control whether jobs or steps in your workflow will run. For example, if you want the workflow to run when a specific label is added to an issue, you can trigger on the `issues labeled` event activity type and use a conditional to check what label triggered the workflow. The following workflow will run when any label is added to an issue in the workflow's repository, but the `run_if_label_matches` job will only execute if the label is named `bug`.
198+
You can use conditionals to further control whether jobs or steps in your workflow will run.
199+
200+
#### Example using a value in the event payload
201+
202+
For example, if you want the workflow to run when a specific label is added to an issue, you can trigger on the `issues labeled` event activity type and use a conditional to check what label triggered the workflow. The following workflow will run when any label is added to an issue in the workflow's repository, but the `run_if_label_matches` job will only execute if the label is named `bug`.
199203

200204
```yaml
201205
on:
@@ -211,7 +215,34 @@ jobs:
211215
- run: echo 'The label was bug'
212216
```
213217
214-
For more information, see "[Expressions](/actions/learn-github-actions/expressions)."
218+
#### Example using event type
219+
220+
For example, if you want to run different jobs or steps depending on what event triggered the workflow, you can use a conditional to check whether a specific event type exists in the event context. The following workflow will run whenever an issue or pull request is closed. If the workflow ran because an issue was closed, the `github.event` context will contain a value for `issue` but not for `pull_request`. Therefore, the `if_issue` step will run but the `if_pr` step will not run. Conversely, if the workflow ran because a pull request was closed, the `if_pr` step will run but the `if_issue` step will not run.
221+
222+
```yaml
223+
on:
224+
issues:
225+
types:
226+
- closed
227+
pull_request:
228+
types:
229+
- closed
230+
231+
jobs:
232+
state_event_type:
233+
runs-on: ubuntu-latest
234+
steps:
235+
- name: if_issue
236+
if: github.event.issue
237+
run: |
238+
echo An issue was closed
239+
- name: if_pr
240+
if: github.event.pull_request
241+
run: |
242+
echo A pull request was closed
243+
```
244+
245+
For more information about what information is available in the event context, see "[Using event information](#using-event-information)." For more information about how to use conditionals, see "[Expressions](/actions/learn-github-actions/expressions)."
215246

216247
{% ifversion fpt or ghae or ghes > 3.1 or ghec %}
217248

translations/zh-CN/content/admin/overview/about-enterprise-accounts.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ For more information about the management of policies for your enterprise accoun
5050

5151
{% ifversion ghes or ghae %}
5252

53-
From your enterprise account on {% ifversion ghae %}{% data variables.product.product_name %}{% elsif ghes %}a {% data variables.product.prodname_ghe_server %} instance{% endif %}, administrators can view enterprise membership and manage the following for the {% ifversion ghes %}{% data variables.product.prodname_ghe_server %} instance{% elsif ghae %}enterprise on {% data variables.product.prodname_ghe_managed %}{% endif %}.
53+
From your enterprise account on {% ifversion ghae %}{% data variables.product.product_name %}{% elsif ghes %}a {% data variables.product.prodname_ghe_server %} instance{% endif %}, administrators can view{% if remove-enterprise-members %} and manage{% endif %} enterprise membership{% if enterprise-owner-join-org %}, manage their own membership in organizations owned by the enterprise,{% endif %} and manage the following for the {% ifversion ghes %}{% data variables.product.prodname_ghe_server %} instance{% elsif ghae %}enterprise on {% data variables.product.prodname_ghe_managed %}{% endif %}.
5454

5555
{% ifversion ghes %}
5656
- License usage{% endif %}
@@ -65,7 +65,7 @@ From your enterprise account on {% ifversion ghae %}{% data variables.product.pr
6565

6666
{% endif %}
6767

68-
{% ifversion ghec or ghes %}When you try or purchase {% data variables.product.prodname_enterprise %}, you can{% ifversion ghes %} also{% endif %} create an enterprise account for {% data variables.product.prodname_ghe_cloud %} on {% data variables.product.prodname_dotcom_the_website %}. Administrators for the enterprise account on {% data variables.product.prodname_dotcom_the_website %} can view membership and manage the following for the enterprise account{% ifversion ghes %} on {% data variables.product.prodname_dotcom_the_website %}{% endif %}.
68+
{% ifversion ghec or ghes %}When you try or purchase {% data variables.product.prodname_enterprise %}, you can{% ifversion ghes %} also{% endif %} create an enterprise account for {% data variables.product.prodname_ghe_cloud %} on {% data variables.product.prodname_dotcom_the_website %}. Administrators for the enterprise account on {% data variables.product.prodname_dotcom_the_website %} can view {% if remove-enterprise-members %} and manage{% endif %} enterprise membership{% if enterprise-owner-join-org %}, manage their own membership in organizations owned by the enterprise,{% endif %} and manage the following for the enterprise account{% ifversion ghes %} on {% data variables.product.prodname_dotcom_the_website %}{% endif %}.
6969

7070
- Billing and usage (services on {% data variables.product.prodname_dotcom_the_website %}, {% data variables.product.prodname_GH_advanced_security %}, user licenses)
7171
- Security (single sign-on, IP allow lists, SSH certificate authorities, two-factor authentication)

translations/zh-CN/content/admin/user-management/managing-organizations-in-your-enterprise/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ children:
2525
- /adding-people-to-teams
2626
- /viewing-the-audit-logs-for-organizations-in-your-enterprise
2727
- /streaming-the-audit-logs-for-organizations-in-your-enterprise-account
28+
- /managing-your-role-in-an-organization-owned-by-your-enterprise
2829
- /removing-users-from-teams-and-organizations
2930
- /removing-organizations-from-your-enterprise
3031
- /restoring-a-deleted-organization
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
---
2+
title: Managing your role in an organization owned by your enterprise
3+
intro: You can manage your membership in any organization owned by your enterprise and change your role within the organization.
4+
permissions: Enterprise owners can manage their role in an organization owned by the enterprise.
5+
versions:
6+
feature: enterprise-owner-join-org
7+
type: how_to
8+
topics:
9+
- Administrator
10+
- Enterprise
11+
- Organizations
12+
shortTitle: Manage your organization roles
13+
---
14+
15+
{% note %}
16+
17+
**Note:** The ability for enterprise owners to manage their role in an organization owned by the enterprise is in beta and subject to change.
18+
19+
{% endnote %}
20+
21+
## About role management
22+
23+
You can choose to join an organization owned by your enterprise as a member or as an organization owner, change your role within the organization, or leave the organization.
24+
25+
{% warning %}
26+
27+
**Warning**: If an organization uses SCIM to provision users, joining the organization this way could have unintended consequences. 更多信息请参阅“[关于 SCIM](/organizations/managing-saml-single-sign-on-for-your-organization/about-scim)”。
28+
29+
{% endwarning %}
30+
31+
## Managing your role with the enterprise settings
32+
33+
You can join an organization owned by your enterprise and manage your role within the organization, directly from the settings for your enterprise account.
34+
35+
If an organization enforces SAML single sign-on (SSO), you cannot use the enterprise settings to join the organization. Instead, you must join the organization using that organization's identity provider (IdP). Then, you can manage your role in your enterprise settings. For more information, see "[Joining an organization that enforces SAML SSO](#joining-an-organization-that-enforces-saml-sso)."
36+
37+
{% data reusables.enterprise-accounts.access-enterprise %}
38+
1. On the **Organizations** tab, to the right of the organization you want to manage your role in, select the {% octicon "gear" aria-label="The gear icon" %} dropdown menu and click the action you want to take.
39+
40+
![Screenshot of the dropdown menu for the gear icon for an organization](/assets/images/help/business-accounts/change-role-in-org.png)
41+
42+
## Joining an organization that enforces SAML SSO
43+
44+
If an organization enforces SAML SSO, you cannot use the enterprise settings to join the organization. Instead, you must join the organization using that organization's identity provider (IdP).
45+
46+
1. You must be assigned access in your IdP to the application for {% data variables.product.prodname_ghe_cloud %} that is used by the organization. If you're unable to configure your IdP yourself, contact your IdP administrator.
47+
1. Authenticate to the organization using SAML SSO.
48+
49+
- If the organization uses SCIM, accept the organization invitation that will be generated by the SCIM integration.
50+
- If the organization does not use SCIM, visit the following URL, replacing ORGANIZATION with the name of the organization, then follow the prompts to authenticate.
51+
52+
`https://github.com/orgs/ORGANIZATION/sso`
53+
54+
After you've joined the organization, you can use the enterprise settings to manage your role in the organization, such as becoming an organization owner. For more information, see "[Managing your role with the enterprise settings](#managing-your-role-with-the-enterprise-settings)."

translations/zh-CN/content/admin/user-management/managing-users-in-your-enterprise/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ children:
2727
- /viewing-and-managing-a-users-saml-access-to-your-enterprise
2828
- /auditing-users-across-your-enterprise
2929
- /impersonating-a-user
30+
- /removing-a-member-from-your-enterprise
3031
- /managing-dormant-users
3132
- /suspending-and-unsuspending-users
3233
- /placing-a-legal-hold-on-a-user-or-organization
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
---
2+
title: Removing a member from your enterprise
3+
intro: You can remove a member from all organizations owned by your enterprise.
4+
permissions: Enterprise owners can remove an enterprise member from the enterprise.
5+
versions:
6+
feature: remove-enterprise-members
7+
type: how_to
8+
topics:
9+
- Enterprise
10+
shortTitle: Remove member
11+
---
12+
13+
{% note %}
14+
15+
**Note:** The ability to remove enterprise members is in beta and subject to change.
16+
17+
{% endnote %}
18+
19+
## About removal of enterprise members
20+
21+
When you remove an enterprise member from your enterprise, the member is removed from all organizations owned by your enterprise.
22+
23+
If the enterprise member you're removing is the last owner of an organization owned by your enterprise, you will become an owner of that organization.
24+
25+
If your enterprise or any of the organizations owned by your enterprise uses an identity provider (IdP) to manage organization membership, the member may be added back to the organization by the IdP. Make sure to also make any necessary changes in your IdP.
26+
27+
## Removing a member from your enterprise
28+
29+
{% note %}
30+
31+
**Note:** If an enterprise member uses only {% data variables.product.prodname_ghe_server %}, and not {% data variables.product.prodname_ghe_cloud %}, you cannot remove the enterprise member this way.
32+
33+
{% endnote %}
34+
35+
{% data reusables.enterprise-accounts.access-enterprise %}
36+
{% data reusables.enterprise-accounts.people-tab %}
37+
1. To the right of the person you want to remove, select the {% octicon "gear" aria-label="The gear icon" %} dropdown menu and click **Remove from enterprise**.
38+
39+
![Screenshot of the "Remove from enterprise" option for an enterprise member](/assets/images/help/business-accounts/remove-member.png)

translations/zh-CN/content/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,23 @@ topics:
3030

3131
{% endif %}
3232

33-
## 企业所有者
33+
## Enterprise owners
3434

3535
企业所有者可以完全控制企业,并可以采取所有操作,包括:
3636
- 管理管理员
37-
- {% ifversion ghec %}Adding and removing {% elsif ghae or ghes %}Managing{% endif %} organizations {% ifversion ghec %}to and from {% elsif ghae or ghes %} in{% endif %} the enterprise
37+
- {% ifversion ghec %}Adding and removing {% elsif ghae or ghes %}Managing{% endif %} organizations {% ifversion ghec %}to and from {% elsif ghae or ghes %} in{% endif %} the enterprise{% if remove-enterprise-members %}
38+
- Removing enterprise members from all organizations owned by the enterprise{% endif %}
3839
- 管理企业设置
3940
- 在组织范围内强制实施政策
4041
{% ifversion ghec %}- 管理帐单设置{% endif %}
4142

43+
{% if enterprise-owner-join-org %}
44+
Enterprise owners do not have access to organization settings or content by default. To gain access, enterprise owners can join any organization owned by their enterprise. For more information, see "[Managing your role in an organization owned by your enterprise](/admin/user-management/managing-organizations-in-your-enterprise/managing-your-role-in-an-organization-owned-by-your-enterprise)."
45+
46+
Owners of organizations in your enterprise do not have access to the enterprise itself unless you make them enterprise owners.
47+
{% else %}
4248
企业所有者无法访问组织设置或内容,除非将其设为组织所有者或授予直接访问组织所拥有仓库的权限。 同样,除非您将其设为企业所有者,否则企业中的组织所有者无权访问企业。
49+
{% endif %}
4350

4451
企业所有者仅在他们是企业中至少一个组织的所有者或成员时才可使用许可证。 Even if an enterprise owner has a role in multiple organizations, they will consume a single license. {% ifversion ghec %}企业所有者必须在 {% data variables.product.prodname_dotcom %} 上拥有个人帐户。{% endif %} 作为最佳实践,我们建议只将少数人设为公司的企业所有者,以降低业务风险。
4552

0 commit comments

Comments
 (0)