From a90cc1042d0dedd66f3932b201d264dcead2e6dd Mon Sep 17 00:00:00 2001 From: docubot <67483024+docubot@users.noreply.github.com> Date: Tue, 16 Aug 2022 07:52:24 -0400 Subject: [PATCH] New translation batch for cn (#29965) * Add crowdin translations * Run script/i18n/homogenize-frontmatter.js * 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 Co-authored-by: Peter Bengtsson --- translations/log/cn-resets.csv | 12 ++- .../using-environments-for-deployment.md | 2 +- ...using-self-hosted-runners-in-a-workflow.md | 2 +- .../creating-an-enterprise-account.md | 53 ++++++------- ...adding-organizations-to-your-enterprise.md | 67 ++++++++++------ .../about-billing-for-your-enterprise.md | 6 +- ...rise-server-and-github-enterprise-cloud.md | 2 + ...ing-license-usage-for-github-enterprise.md | 77 +++++++++++-------- ...ing-license-usage-for-github-enterprise.md | 13 ++-- .../content/rest/enterprise-admin/license.md | 2 + .../about-license-sync.md | 4 +- .../unique-user-licensing-model.md | 2 +- .../you-can-sync-for-a-combined-view.md | 1 - .../reusables/saml/authorized-creds-info.md | 2 +- 14 files changed, 139 insertions(+), 106 deletions(-) delete mode 100644 translations/zh-CN/data/reusables/enterprise-licensing/you-can-sync-for-a-combined-view.md diff --git a/translations/log/cn-resets.csv b/translations/log/cn-resets.csv index e611a0f36b..d9881e213c 100644 --- a/translations/log/cn-resets.csv +++ b/translations/log/cn-resets.csv @@ -92,7 +92,6 @@ translations/zh-CN/content/admin/overview/about-enterprise-accounts.md,Listed in translations/zh-CN/content/admin/overview/about-enterprise-accounts.md,rendering error translations/zh-CN/content/admin/overview/about-github-enterprise-server.md,broken liquid tags translations/zh-CN/content/admin/overview/about-github-for-enterprises.md,rendering error -translations/zh-CN/content/admin/overview/creating-an-enterprise-account.md,broken liquid tags translations/zh-CN/content/admin/packages/configuring-package-ecosystem-support-for-your-enterprise.md,broken liquid tags translations/zh-CN/content/admin/packages/enabling-github-packages-with-aws.md,broken liquid tags translations/zh-CN/content/admin/packages/enabling-github-packages-with-azure-blob-storage.md,broken liquid tags @@ -101,6 +100,7 @@ translations/zh-CN/content/admin/packages/getting-started-with-github-packages-f translations/zh-CN/content/admin/packages/quickstart-for-configuring-your-minio-storage-bucket-for-github-packages.md,broken liquid tags translations/zh-CN/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-advanced-security-in-your-enterprise.md,broken liquid tags translations/zh-CN/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-github-actions-in-your-enterprise.md,broken liquid tags +translations/zh-CN/content/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md,broken liquid tags translations/zh-CN/content/admin/user-management/managing-organizations-in-your-enterprise/creating-teams.md,broken liquid tags translations/zh-CN/content/admin/user-management/managing-repositories-in-your-enterprise/configuring-git-large-file-storage-for-your-enterprise.md,broken liquid tags translations/zh-CN/content/admin/user-management/managing-users-in-your-enterprise/promoting-or-demoting-a-site-administrator.md,broken liquid tags @@ -378,14 +378,12 @@ translations/zh-CN/data/reusables/dotcom_billing/downgrade-org-to-free.md,broken translations/zh-CN/data/reusables/education/access-github-community-exchange.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 -translations/zh-CN/data/reusables/enterprise-licensing/about-license-sync.md,broken liquid tags translations/zh-CN/data/reusables/enterprise-licensing/verified-domains-license-sync.md,broken liquid tags -translations/zh-CN/data/reusables/enterprise-licensing/you-can-sync-for-a-combined-view.md,broken liquid tags translations/zh-CN/data/reusables/enterprise_installation/hardware-considerations-all-platforms.md,broken liquid tags translations/zh-CN/data/reusables/enterprise_management_console/badge_indicator.md,broken liquid tags -translations/zh-CN/data/reusables/enterprise_user_management/consider-usernames-for-external-authentication.md,rendering error +translations/zh-CN/data/reusables/enterprise_user_management/consider-usernames-for-external-authentication.md,broken liquid tags translations/zh-CN/data/reusables/gated-features/codespaces-classroom-articles.md,broken liquid tags -translations/zh-CN/data/reusables/gated-features/enterprise-accounts.md,rendering error +translations/zh-CN/data/reusables/gated-features/enterprise-accounts.md,broken liquid tags translations/zh-CN/data/reusables/gated-features/packages.md,broken liquid tags translations/zh-CN/data/reusables/gated-features/secret-scanning-partner.md,broken liquid tags translations/zh-CN/data/reusables/gated-features/secret-scanning.md,broken liquid tags @@ -406,9 +404,9 @@ translations/zh-CN/data/reusables/package_registry/packages-cluster-support.md,b translations/zh-CN/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md,broken liquid tags translations/zh-CN/data/reusables/repositories/enable-security-alerts.md,broken liquid tags translations/zh-CN/data/reusables/repositories/select-marketplace-apps.md,broken liquid tags -translations/zh-CN/data/reusables/saml/saml-session-oauth.md,rendering error +translations/zh-CN/data/reusables/saml/saml-session-oauth.md,broken liquid tags translations/zh-CN/data/reusables/saml/you-must-periodically-authenticate.md,Listed in localization-support#489 -translations/zh-CN/data/reusables/saml/you-must-periodically-authenticate.md,rendering error +translations/zh-CN/data/reusables/saml/you-must-periodically-authenticate.md,broken liquid tags translations/zh-CN/data/reusables/scim/after-you-configure-saml.md,broken liquid tags translations/zh-CN/data/reusables/secret-scanning/enterprise-enable-secret-scanning.md,broken liquid tags translations/zh-CN/data/reusables/secret-scanning/partner-program-link.md,broken liquid tags diff --git a/translations/zh-CN/content/actions/deployment/targeting-different-environments/using-environments-for-deployment.md b/translations/zh-CN/content/actions/deployment/targeting-different-environments/using-environments-for-deployment.md index 22323361b4..4f887125d0 100644 --- a/translations/zh-CN/content/actions/deployment/targeting-different-environments/using-environments-for-deployment.md +++ b/translations/zh-CN/content/actions/deployment/targeting-different-environments/using-environments-for-deployment.md @@ -99,7 +99,7 @@ Organizations with {% data variables.product.prodname_team %} and users with {% 1. 输入机密值。 1. 单击 **Add secret（添加密码）**。 -您还可以通过 REST API 创建和配置环境。 更多信息请参阅“[环境](/rest/reference/repos#environments)”和“[密码](/rest/reference/actions#secrets)”。 +您还可以通过 REST API 创建和配置环境。 For more information, see "[Deployment environments](/rest/deployments/environments)," "[GitHub Actions Secrets](/rest/actions/secrets)," and "[Deployment branch policies](/rest/deployments/branch-policies)." 运行引用不存在的环境的工作流程将使用引用的名称创建环境。 新创建的环境将不配置任何保护规则或机密。 可在仓库中编辑工作流程的任何人都可以通过工作流程文件创建环境，但只有仓库管理员才能配置环境。 diff --git a/translations/zh-CN/content/actions/hosting-your-own-runners/using-self-hosted-runners-in-a-workflow.md b/translations/zh-CN/content/actions/hosting-your-own-runners/using-self-hosted-runners-in-a-workflow.md index bb0b399806..218769a74a 100644 --- a/translations/zh-CN/content/actions/hosting-your-own-runners/using-self-hosted-runners-in-a-workflow.md +++ b/translations/zh-CN/content/actions/hosting-your-own-runners/using-self-hosted-runners-in-a-workflow.md @@ -63,7 +63,7 @@ runs-on: [self-hosted, linux, x64, gpu] - `x64` - 仅使用基于 x64 硬件的运行器。 - `gpu` - 此自定义标签已被手动分配给安装了 GPU 硬件的自托管运行器。 -这些标签累计运行，所以自托管运行器的标签必须匹配所有四个标签才能处理该作业。 +These labels operate cumulatively, so a self-hosted runner must have all four labels to be eligible to process the job. ## 自托管运行器的路由优先级 diff --git a/translations/zh-CN/content/admin/overview/creating-an-enterprise-account.md b/translations/zh-CN/content/admin/overview/creating-an-enterprise-account.md index 15d9fa44f1..ae73514e76 100644 --- a/translations/zh-CN/content/admin/overview/creating-an-enterprise-account.md +++ b/translations/zh-CN/content/admin/overview/creating-an-enterprise-account.md @@ -1,6 +1,6 @@ --- -title: Creating an enterprise account -intro: 'If you''re currently using {% data variables.product.prodname_ghe_cloud %} with a single organization, you can create an enterprise account to centrally manage multiple organizations.' +title: 创建企业帐户 +intro: '如果您当前在单个组织中使用 {% data variables.product.prodname_ghe_cloud %} ，则可以创建企业帐户来集中管理多个组织。' versions: ghec: '*' type: how_to @@ -9,48 +9,49 @@ topics: - Enterprise - Fundamentals permissions: Organization owners can create an enterprise account. -shortTitle: Create enterprise account +shortTitle: 创建企业帐户 --- -## About enterprise account creation +## 关于企业帐户创建 -{% data variables.product.prodname_ghe_cloud %} includes the option to create an enterprise account, which enables collaboration between multiple organizations and gives administrators a single point of visibility and management. For more information, see "[About enterprise accounts](/admin/overview/about-enterprise-accounts)." +{% data variables.product.prodname_ghe_cloud %} 包括创建企业帐户的选项，该选项支持多个组织之间的协作，并为管理员提供单一的可见性和管理点。 更多信息请参阅“[关于企业帐户](/admin/overview/about-enterprise-accounts)”。 -{% data reusables.enterprise.create-an-enterprise-account %} If you pay by invoice, you can create an enterprise account yourself on {% data variables.product.prodname_dotcom %}. If not, you can [contact our sales team](https://github.com/enterprise/contact?ref_page=/pricing&ref_cta=Contact%20Sales&ref_loc=cards) to create an enterprise account for you. +{% data reusables.enterprise.create-an-enterprise-account %} 如果您通过发票付款，则可以在 {% data variables.product.prodname_dotcom %} 上自行创建企业帐户。 如果没有，您可以[联系我们的销售团队](https://github.com/enterprise/contact?ref_page=/pricing&ref_cta=Contact%20Sales&ref_loc=cards)为您创建一个企业帐户。 -An enterprise account is included in {% data variables.product.prodname_ghe_cloud %}, so creating one will not affect your bill. +An enterprise account is included with {% data variables.product.prodname_ghe_cloud %}. Creation of an enterprise account does not result in additional charges on your bill. -When you create an enterprise account, your existing organization will automatically be owned by the enterprise account. All current owners of your organization will become owners of the enterprise account. All current billing managers of the organization will become billing managers of the new enterprise account. The current billing details of the organization, including the organization's billing email address, will become billing details of the new enterprise account. +When you create an enterprise account that owns your existing organization on {% data variables.product.product_name %}, the organization's resources remain accessible to members at the same URLs. After you add your organization to the enterprise account, the following changes will apply to the organization. -If the organization is connected to {% data variables.product.prodname_ghe_server %} or {% data variables.product.prodname_ghe_managed %} via {% data variables.product.prodname_github_connect %}, upgrading the organization to an enterprise account **will not** update the connection. If you want to connect to the new enterprise account, you must disable and re-enable {% data variables.product.prodname_github_connect %}. +- Your existing organization will automatically be owned by the enterprise account. +- {% data variables.product.company_short %} bills the enterprise account for usage within all organizations owned by the enterprise. The current billing details for the organization, including the organization's billing email address, will become billing details for the new enterprise account. 更多信息请参阅“[管理企业的计费](/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)”。 +- All current owners of your organization will become owners of the enterprise account, and all current billing managers of the organization will become billing managers of the new enterprise account. 更多信息请参阅“[企业中的角色](/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise)”。 -- "[Managing {% data variables.product.prodname_github_connect %}](/enterprise-server@latest/admin/configuration/configuring-github-connect/managing-github-connect)" in the {% data variables.product.prodname_ghe_server %} documentation -- "[Managing {% data variables.product.prodname_github_connect %}](/github-ae@latest/admin/configuration/configuring-github-connect/managing-github-connect)" in the {% data variables.product.prodname_ghe_managed %} documentation +For more information about the changes that apply to an organization after you add the organization to an enterprise, see "[Adding organizations to your enterprise](/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise#about-addition-of-organizations-to-your-enterprise-account)." -## Creating an enterprise account on {% data variables.product.prodname_dotcom %} +## 在 {% data variables.product.prodname_dotcom %} 上创建企业帐户 -To create an enterprise account, your organization must be using {% data variables.product.prodname_ghe_cloud %}. +要创建企业帐户，您的组织必须使用 {% data variables.product.prodname_ghe_cloud %}。 -If you pay by invoice, you can create an enterprise account directly through {% data variables.product.prodname_dotcom %}. If you do not currently pay by invoice, you can [contact our sales team](https://github.com/enterprise/contact?ref_page=/pricing&ref_cta=Contact%20Sales&ref_loc=cards) to create an enterprise account for you. +如果按发票付款，可以直接通过 {% data variables.product.prodname_dotcom %} 创建企业帐户。 如果您目前不通过发票付款，可以[联系我们的销售团队](https://github.com/enterprise/contact?ref_page=/pricing&ref_cta=Contact%20Sales&ref_loc=cards)为您创建企业帐户。 {% data reusables.organizations.billing-settings %} -1. Click **Upgrade to enterprise account**. +1. 单击 **Upgrade to enterprise account（升级到企业帐户）**。 - ![Screenshot of the "Upgrade to an enterprise account" button](/assets/images/help/business-accounts/upgrade-to-enterprise-account.png) -1. Under "Enterprise name", type a name for your enterprise account. + !["升级到企业帐户" 按钮的屏幕截图](/assets/images/help/business-accounts/upgrade-to-enterprise-account.png) +1. 在“Enterprise name（企业名称）”下，键入企业帐户的名称。 - ![Screenshot of the "Enterprise name" field](/assets/images/help/business-accounts/enterprise-name-field.png) -1. Under "Enterprise URL slug", type a slug for your enterprise account. This slug will be used in the URL for your enterprise. For example, if you choose `octo-enterprise`, the URL for your enterprise will be `https://github.com/enterprises/octo-enterprise`. + !["企业名称" 字段的屏幕截图](/assets/images/help/business-accounts/enterprise-name-field.png) +1. 在“Enterprise URL slug（企业 URL 辅助信息域）”下，键入企业帐户的辅助信息。 此数据辅助信息将在企业的 URL 中使用。 例如，如果您选择 `octo-enterprise`，则企业的 URL 将为 `https://github.com/enterprises/octo-enterprise`。 - ![Screenshot of the "Enterprise URL slug" field](/assets/images/help/business-accounts/enterprise-slug-field.png) -1. Click **Confirm and upgrade**. + !["企业 URL 辅助信息域" 字段的屏幕截图](/assets/images/help/business-accounts/enterprise-slug-field.png) +1. 单击 **Confirm and upgrade（确认并升级）**。 - ![Screenshot of the "Confirm and upgrade" button](/assets/images/help/business-accounts/confirm-and-upgrade-button.png) -1. Read the warnings, then click **Create enterprise account**. + !["确认并升级" 按钮的屏幕截图](/assets/images/help/business-accounts/confirm-and-upgrade-button.png) +1. 阅读警告，然后单击 **Create enterprise account（创建企业帐户）**。 - ![Screenshot of the "Create enterprise account" button](/assets/images/help/business-accounts/create-enterprise-account-button.png) + !["创建企业帐户" 按钮的屏幕截图](/assets/images/help/business-accounts/create-enterprise-account-button.png) -## Next steps +## 后续步骤 -After your enterprise account is created, we recommend learning more about how enterprise accounts work and configuring settings and policies. For more information, follow the "[Get started with your enterprise account](/admin/guides#get-started-with-your-enterprise-account)" learning path. +创建企业帐户后，我们建议详细了解企业帐户的工作原理以及配置设置和策略。 有关详细信息，请遵循“[开始使用您的企业帐户](/admin/guides#get-started-with-your-enterprise-account)”学习路径。 diff --git a/translations/zh-CN/content/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md b/translations/zh-CN/content/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md index 033501e26f..ef9824ba86 100644 --- a/translations/zh-CN/content/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md +++ b/translations/zh-CN/content/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md @@ -1,6 +1,6 @@ --- -title: 将组织添加到企业 -intro: 您可以创建新的组织或邀请现有组织来管理您的企业。 +title: Adding organizations to your enterprise +intro: You can create new organizations or invite existing organizations to manage within your enterprise. redirect_from: - /github/setting-up-and-managing-your-enterprise/managing-organizations-in-your-enterprise-account/adding-organizations-to-your-enterprise-account - /articles/adding-organizations-to-your-enterprise-account @@ -13,39 +13,60 @@ topics: - Administrator - Enterprise - Organizations -shortTitle: 添加组织 +shortTitle: Add organizations permissions: Enterprise owners can add organizations to an enterprise. --- -## 关于组织 +## About addition of organizations to your enterprise account -您的企业帐户可以拥有组织。 企业成员可以跨组织内的相关项目进行协作。 更多信息请参阅“[关于组织](/organizations/collaborating-with-groups-in-organizations/about-organizations)”。 +Your enterprise account can own organizations. Members of your enterprise can collaborate across related projects within an organization. For more information, see "[About organizations](/organizations/collaborating-with-groups-in-organizations/about-organizations)." -You can add a new or existing organization to your enterprise in your enterprise account's settings. +You can add new organizations to your enterprise account. If you do not use {% data variables.product.prodname_emus %}, you can add existing organizations on {% data variables.product.product_location %} to your enterprise. You cannot add an existing organization from an {% data variables.product.prodname_emu_enterprise %} to a different enterprise. -您只能以这种方式将组织添加到现有企业帐户。 {% data reusables.enterprise.create-an-enterprise-account %} 更多信息请参阅“[创建企业帐户](/admin/overview/creating-an-enterprise-account)”。 +{% data reusables.enterprise.create-an-enterprise-account %} For more information, see "[Creating an enterprise account](/admin/overview/creating-an-enterprise-account)." -## 在企业帐户中创建组织 +After you add an existing organization to your enterprise, the organization's resources remain accessible to members at the same URLs, and the following changes will apply. -在企业帐户设置中创建的新组织包含在企业帐户的 {% data variables.product.prodname_ghe_cloud %} 订阅中。 +- The organization's members will become members of the enterprise, and {% data variables.product.company_short %} will bill the enterprise account for the organization's usage. You must ensure that the enterprise account has enough licenses to accommodate any new members. For more information, see "[About billing for your enterprise](/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)." +- Enterprise owners can manage their role within the organization. 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)." +- Any policies applied to the enterprise will apply to the organization. For more information, see "[About enterprise policies](/admin/policies/enforcing-policies-for-your-enterprise/about-enterprise-policies)." +- If SAML SSO is configured for the enterprise account, the enterprise's SAML configuration will apply to the organization. If the organization used SAML SSO, the enterprise account's configuration will replace the organization's configuration. SCIM is not available for enterprise accounts, so SCIM will be disabled for the organization. For more information, see "[Configuring SAML single sign-on for your enterprise](/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-saml-single-sign-on-for-your-enterprise)" and "[Switching your SAML configuration from an organization to an enterprise account](/admin/identity-and-access-management/using-saml-for-enterprise-iam/switching-your-saml-configuration-from-an-organization-to-an-enterprise-account)." +- If SAML SSO was configured for the organization, members' existing personal access tokens (PATs) or SSH keys that were authorized to access the organization's resources will be authorized to access the same resources. To access additional organizations owned by the enterprise, members must authorize the PAT or key. For more information, see "[Authorizing a personal access token for use with SAML single sign-on](/authentication/authenticating-with-saml-single-sign-on/authorizing-a-personal-access-token-for-use-with-saml-single-sign-on)" and "[Authorizing an SSH key for use with SAML single sign-on](/authentication/authenticating-with-saml-single-sign-on/authorizing-an-ssh-key-for-use-with-saml-single-sign-on)." +- If the organization was connected to {% data variables.product.prodname_ghe_server %} or {% data variables.product.prodname_ghe_managed %} using {% data variables.product.prodname_github_connect %}, adding the organization to an enterprise will not update the connection. {% data variables.product.prodname_github_connect %} features will no longer function for the organization. To continue using {% data variables.product.prodname_github_connect %}, you must disable and re-enable the feature. For more information, see the following articles. -创建企业帐户所拥有的组织的企业所有者自动成为组织所有者。 有关组织所有者的更多信息，请参阅“[组织中的角色](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization)”。 + - "[Managing {% data variables.product.prodname_github_connect %}](/enterprise-server@latest/admin/configuration/configuring-github-connect/managing-github-connect)" in the {% data variables.product.prodname_ghe_server %} documentation + - "[Managing {% data variables.product.prodname_github_connect %}](/github-ae@latest/admin/configuration/configuring-github-connect/managing-github-connect)" in the {% data variables.product.prodname_ghe_managed %} documentation +- If the organization used billed {% data variables.product.prodname_marketplace %} apps, the organization can continue to use the apps, but must pay the vendor directly. For more information, contact the app's vendor. + +## Creating an organization in your enterprise account + +New organizations you create within your enterprise account settings are included in your enterprise account's {% data variables.product.prodname_ghe_cloud %} subscription. + +Enterprise owners who create an organization owned by the enterprise account automatically become organization owners. For more information about organization owners, see "[Roles in an organization](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization)." {% data reusables.enterprise-accounts.access-enterprise %} -2. 在 **Organizations（组织）**选项卡中的组织列表上方，单击 **New organization（新组织）**。 ![新组织按钮](/assets/images/help/business-accounts/enterprise-account-add-org.png) -3. 在 "Organization name"（组织名称）下，输入组织的名称。 ![用于输入新组织名称的字段](/assets/images/help/business-accounts/new-organization-name-field.png) -4. 单击 **Create organization（创建组织）**。 -5. 在 "Invite owners"（邀请所有者）下，输入您想邀其成为组织所有者的人员的用户名，然后单击 **Invite（邀请）**。 ![组织所有者搜索字段和邀请按钮](/assets/images/help/business-accounts/invite-org-owner.png) -6. 单击 **Finish（完成）**。 +2. On the **Organizations** tab, above the list of organizations, click **New organization**. + ![New organization button](/assets/images/help/business-accounts/enterprise-account-add-org.png) +3. Under "Organization name", type a name for your organization. + ![Field to type a new organization name](/assets/images/help/business-accounts/new-organization-name-field.png) +4. Click **Create organization**. +5. Under "Invite owners", type the username of a person you'd like to invite to become an organization owner, then click **Invite**. + ![Organization owner search field and Invite button](/assets/images/help/business-accounts/invite-org-owner.png) +6. Click **Finish**. -## 邀请组织加入您的企业帐户 +## Inviting an organization to join your enterprise account -企业所有者可以邀请现有组织加入其企业帐户。 如果您要邀请的组织已经归其他企业所有，则在上一个企业放弃对组织的所有权之前，您将无法发出邀请。 更多信息请参阅“[从企业中删除组织](/admin/user-management/managing-organizations-in-your-enterprise/removing-organizations-from-your-enterprise)”。 +Enterprise owners can invite existing organizations to join their enterprise account. If the organization you want to invite is already owned by another enterprise, you will not be able to issue an invitation until the previous enterprise gives up ownership of the organization. For more information, see "[Removing an organization from your enterprise](/admin/user-management/managing-organizations-in-your-enterprise/removing-organizations-from-your-enterprise)." {% data reusables.enterprise-accounts.access-enterprise %} -2. 在 **Organizations（组织）**选项卡中的组织列表上方，单击 **Invite organization（邀请组织）**。 ![邀请组织](/assets/images/help/business-accounts/enterprise-account-invite-organization.png) -3. 在“Organization name（组织名称）”下，开始键入要邀请的组织名称，并在它出现在下拉列表中时选择它。 ![搜索组织](/assets/images/help/business-accounts/enterprise-account-search-for-organization.png) -4. 单击 **Invite organization（邀请组织）**。 -5. 组织所有者将收到一封邀请他们加入企业的电子邮件。 至少有一个所有者接受邀请才能继续该过程。 您可以在所有者批准邀请之前随时取消或重新发送邀请。 ![取消或重新发送](/assets/images/help/business-accounts/enterprise-account-invitation-sent.png) -6. 一旦组织所有者批准了邀请，您可以在待定邀请列表中查看其状态。 ![待定邀请](/assets/images/help/business-accounts/enterprise-account-pending.png) -7. 点击 **Approve（批准）**完成传输，或点击 **Cancel（取消）**予以取消。 ![批准邀请](/assets/images/help/business-accounts/enterprise-account-transfer-approve.png) +2. On the **Organizations** tab, above the list of organizations, click **Invite organization**. +![Invite organization](/assets/images/help/business-accounts/enterprise-account-invite-organization.png) +3. Under "Organization name", start typing the name of the organization you want to invite and select it when it appears in the drop-down list. +![Search for organization](/assets/images/help/business-accounts/enterprise-account-search-for-organization.png) +4. Click **Invite organization**. +5. The organization owners will receive an email inviting them to join the enterprise. At least one owner needs to accept the invitation before the process can continue. You can cancel or resend the invitation at any time before an owner approves it. +![Cancel or resend](/assets/images/help/business-accounts/enterprise-account-invitation-sent.png) +6. Once an organization owner has approved the invitation, you can view its status in the list of pending invitations. +![Pending invitation](/assets/images/help/business-accounts/enterprise-account-pending.png) +7. Click **Approve** to complete the transfer, or **Cancel** to cancel it. +![Approve invitation](/assets/images/help/business-accounts/enterprise-account-transfer-approve.png) diff --git a/translations/zh-CN/content/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise.md b/translations/zh-CN/content/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise.md index f98a01ab48..60e391323d 100644 --- a/translations/zh-CN/content/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise.md +++ b/translations/zh-CN/content/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise.md @@ -45,7 +45,11 @@ You can see your current usage in your [Azure account portal](https://portal.azu {% ifversion ghec %} -{% data variables.product.company_short %} bills monthly for the total number of licensed seats for your organization or enterprise account, as well as any additional services you use with {% data variables.product.prodname_ghe_cloud %}, such as {% data variables.product.prodname_actions %} minutes. For more information about the licensed seats portion of your bill, see "[About per-user pricing](/billing/managing-billing-for-your-github-account/about-per-user-pricing)." +When you use an enterprise account on {% data variables.product.product_location %}, the enterprise account is the central point for all billing within your enterprise, including the organizations that your enterprise owns. + +If you use {% data variables.product.product_name %} with an individual organization and do not yet have an enterprise account, you create an enterprise account and add your organization. For more information, see "[Creating an enterprise account](/admin/overview/creating-an-enterprise-account)." + +{% data variables.product.company_short %} bills monthly for the total number of licensed seats for your enterprise account, as well as any additional services you use with {% data variables.product.prodname_ghe_cloud %}, such as {% data variables.product.prodname_actions %} minutes. If you use a standalone organization on {% data variables.product.product_name %}, you'll be billed at the organization level for all usage. For more information your bill's license seats, see "[About per-user pricing](/billing/managing-billing-for-your-github-account/about-per-user-pricing)." {% elsif ghes %} diff --git a/translations/zh-CN/content/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud.md b/translations/zh-CN/content/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud.md index 68f09075d0..cbbec0d08d 100644 --- a/translations/zh-CN/content/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud.md +++ b/translations/zh-CN/content/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud.md @@ -22,6 +22,8 @@ To ensure that you see up-to-date license details on {% data variables.product.p If you don't want to enable {% data variables.product.prodname_github_connect %}, you can manually sync license usage by uploading a file from {% data variables.product.prodname_ghe_server %} to {% data variables.product.prodname_dotcom_the_website %}. +When you synchronize license usage, only the user ID and email addresses for each user account on {% data variables.product.prodname_ghe_server %} are transmitted to {% data variables.product.prodname_ghe_cloud %}. + {% data reusables.enterprise-licensing.view-consumed-licenses %} {% data reusables.enterprise-licensing.verified-domains-license-sync %} diff --git a/translations/zh-CN/content/billing/managing-your-license-for-github-enterprise/troubleshooting-license-usage-for-github-enterprise.md b/translations/zh-CN/content/billing/managing-your-license-for-github-enterprise/troubleshooting-license-usage-for-github-enterprise.md index edd90b4d92..b540bac90d 100644 --- a/translations/zh-CN/content/billing/managing-your-license-for-github-enterprise/troubleshooting-license-usage-for-github-enterprise.md +++ b/translations/zh-CN/content/billing/managing-your-license-for-github-enterprise/troubleshooting-license-usage-for-github-enterprise.md @@ -14,32 +14,57 @@ shortTitle: Troubleshoot license usage ## About unexpected license usage -If the number of consumed licenses for your enterprise is unexpected, you can review your consumed license report to audit your license usage across all your enterprise deployments and subscriptions. If you find errors, you can try troubleshooting steps. For more information about viewing your license usage, see "[Viewing license usage for GitHub Enterprise](/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise)" and "[Viewing the subscription and usage for your enterprise account](/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)." +If the number of consumed licenses for your enterprise is unexpected, you can review your consumed license report to audit your license usage across all your enterprise deployments and subscriptions. For more information, see "[Viewing license usage for GitHub Enterprise](/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise)" and "[Viewing the subscription and usage for your enterprise account](/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)." -For privacy reasons, enterprise owners cannot directly access the details of user accounts. +If you find errors, you can try troubleshooting steps. + +For privacy reasons, enterprise owners cannot directly access the details of user accounts unless you use {% data variables.product.prodname_emus %}. ## About the calculation of consumed licenses -{% data variables.product.company_short %} bills for each person who uses deployments of {% data variables.product.prodname_ghe_server %}, is a member of an organization on {% data variables.product.prodname_ghe_cloud %}, or is a {% data variables.product.prodname_vs_subscriber %}. For more information about the people in your enterprise who are counted as consuming a license, see "[About per-user pricing](/billing/managing-billing-for-your-github-account/about-per-user-pricing)." +{% data variables.product.company_short %} bills for each person who uses deployments of {% data variables.product.prodname_ghe_server %}, is a member of one of your organizations on {% data variables.product.prodname_ghe_cloud %}, or is a {% data variables.product.prodname_vs_subscriber %}. For more information about the people in your enterprise who consume a license, see "[About per-user pricing](/billing/managing-billing-for-your-github-account/about-per-user-pricing)." -{% data reusables.enterprise-licensing.about-license-sync %} +For each user to consume a single seat regardless of how many deployments they use, you must synchronize license usage between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}. For more information, see "[Syncing license usage between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}](/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud)." + +After you synchronize license usage, {% data variables.product.prodname_dotcom %} matches user accounts on {% data variables.product.prodname_ghe_server %} with user accounts on {% data variables.product.prodname_ghe_cloud %} by email address. + +First, we first check the primary email address of each user on {% data variables.product.prodname_ghe_server %}. Then, we attempt to match that address with the email address for a user account on {% data variables.product.prodname_ghe_cloud %}. If your enterprise uses SAML SSO, we first check the following SAML attributes for email addresses. + +- `http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name` +- `http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress` +- `username` +- `NameID` +- `emails` + +If no email addresses found in these attributes match the primary email address on {% data variables.product.prodname_ghe_server %}, or if your enterprise doesn't use SAML SSO, we then check each of the user's verified email addresses on {% data variables.product.prodname_ghe_cloud %}. For more information about verification of email addresses on {% data variables.product.prodname_dotcom_the_website %}, see "[Verifying your email address](/enterprise-cloud@latest/get-started/signing-up-for-github/verifying-your-email-address){% ifversion not ghec %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %} ## Fields in the consumed license files The {% data variables.product.prodname_dotcom_the_website %} license usage report and {% data variables.product.prodname_ghe_server %} exported license usage file include a variety of fields to help you troubleshoot license usage for your enterprise. + ### {% data variables.product.prodname_dotcom_the_website %} license usage report (CSV file) The license usage report for your enterprise is a CSV file that contains the following information about members of your enterprise. Some fields are specific to your {% data variables.product.prodname_ghe_cloud %} (GHEC) deployment, {% data variables.product.prodname_ghe_server %} (GHES) connected environments, or your {% data variables.product.prodname_vs %} subscriptions (VSS) with GitHub Enterprise. | 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`. +| github_com_login | The username for the user's GHEC account +| github_com_name | The display name for the user's GHEC account +| github_com_profile | The URL for the user's profile page on GHEC +| github_com_user | Whether or not the user has an account on GHEC | +| github_com_member_roles | For each of the organizations the user belongs to on GHEC, the organization name and the user's role in that organization (`Owner` or `Member`) separated by a colon

Organizations delimited by commas | +| github_com_enterprise_role | Can be one of: `Owner`, `Member`, or `Outside collaborator` +| github_com_verified_domain_emails | All email addresses associated with the user's GHEC account that match your enterprise's verified domains | +| github_com_saml_name_id | The SAML username | +| github_com_orgs_with_pending_invites | All pending invitations for the user's GHEC account to join organizations within your enterprise | +| license_type | Can be one of: `Visual Studio subscription` or `Enterprise` +| enterprise_server_user| Whether or not the user has at least one account on GHES | +| enterprise_server_primary_emails | The primary email addresses associated with each of the user's GHES accounts | +| enterprise_server_user_ids | For each of the user's GHES accounts, the account's user ID +| total_user_accounts | The total number of accounts the person has across both GHEC and GHES +| visual_studio_subscription_user | Whether or not the user is a {% data variables.product.prodname_vs_subscriber %} | +| visual_studio_subscription_email | The email address associated with the user's VSS | +| visual_studio_license_status | Whether the Visual Studio license has been matched to a {% data variables.product.company_short %} user | {% 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. @@ -59,32 +84,16 @@ Your {% data variables.product.prodname_ghe_server %} license usage is a JSON fi ## Troubleshooting consumed licenses -If the number of consumed seats is unexpected, or if you've recently removed members from your enterprise, we recommend that you audit your license usage. +To ensure that the each user is only consuming a single seat for different deployments and subscriptions, try the following troubleshooting steps. -To determine which users are currently consuming seat licenses, first try reviewing the consumed licenses report for your enterprise{% ifversion ghes %} and/or an export of your {% data variables.product.prodname_ghe_server %} license usage{% endif %} for unexpected entries. +1. To help identify users that are consuming multiple seats, if your enterprise uses verified domains for {% data variables.product.prodname_ghe_cloud %}, review the list of enterprise members who do not have an email address from a verified domain associated with their account on {% data variables.product.prodname_dotcom_the_website %}. 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)." -There are two especially common reasons for inaccurate or incorrect license seat counts. -- The email addresses associated with a user do not match across your enterprise deployments and subscriptions. -- An email address for a user was recently updated or verified to correct a mismatch, but a license sync job hasn't run since the update was made. + {% note %} -When attempting to match users across enterprises, {% data variables.product.company_short %} identifies individuals by the verified email addresses associated with their {% data variables.product.prodname_dotcom_the_website %} account, and the primary email address associated with their {% data variables.product.prodname_ghe_server %} account and/or the email address assigned to the {% data variables.product.prodname_vs_subscriber %}. + **Note:** To make troubleshooting easier, we recommend using verified domains with your enterprise account on {% data variables.product.prodname_dotcom_the_website %}. For more information, see "[Verifying or approving a domain for your enterprise](/enterprise-cloud@latest/admin/configuration/configuring-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise)." -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 %} -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 %} - -**Note:** For privacy reasons, your consumed license report only includes the email address associated with a user account on {% data variables.product.prodname_dotcom_the_website %} if the address is hosted by a verified domain. For this reason, we recommend using verified domains with your enterprise account on {% data variables.product.prodname_dotcom_the_website %}. Then, if one person is erroneously consuming multiple licenses, you can more easily troubleshoot, as you will have access to the email address that is being used for license deduplication. - -{% endnote %} - -{% ifversion ghec %} - -If your license includes {% data variables.product.prodname_vss_ghe %} and your enterprise also includes at least one {% data variables.product.prodname_ghe_server %} connected environment, we strongly recommend using {% data variables.product.prodname_github_connect %} to automatically synchronize your license usage. For more information, see "[About Visual Studio subscriptions with GitHub Enterprise](/enterprise-cloud@latest/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise)." - -{% endif %} + {% endnote %} +1. After you identify users who are consuming multiple seats, make sure that the same email address is associated with all of the user's accounts. For more information about which email addresses must match, see "[About the calculation of consumed licenses](#about-the-calculation-of-consumed-licenses)." +1. If an email address was recently updated or verified to correct a mismatch, view the timestamp of the last license sync job. If a job hasn't run since the correction was made, manually trigger a new job. 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)." If you still have questions about your consumed licenses after reviewing the troubleshooting information above, you can contact {% data variables.contact.github_support %} through the {% data variables.contact.contact_enterprise_portal %}. diff --git a/translations/zh-CN/content/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise.md b/translations/zh-CN/content/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise.md index 9678c39bde..6b2e1ca706 100644 --- a/translations/zh-CN/content/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise.md +++ b/translations/zh-CN/content/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise.md @@ -14,21 +14,20 @@ shortTitle: View license usage ## About license usage for {% data variables.product.prodname_enterprise %} -{% ifversion ghec %} +You can view license usage for {% data variables.product.product_name %} on {% data variables.product.product_location %}. -You can view license usage for your enterprise account on {% data variables.product.prodname_ghe_cloud %} on {% data variables.product.prodname_dotcom_the_website %}. +If you use both {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %} and sync license usage between the products, you can view license usage for both on {% data variables.product.prodname_dotcom_the_website %}. For more information about license sync, see "[Syncing license usage between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}](/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud)." -{% data reusables.enterprise-licensing.you-can-sync-for-a-combined-view %} +{% ifversion ghes %} -{% elsif ghes %} +For more information about viewing license usage on {% data variables.product.prodname_dotcom_the_website %} and identifying when the last license sync occurred, see "[Viewing license usage for {% data variables.product.prodname_enterprise %}](/enterprise-cloud@latest/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise)" in the {% data variables.product.prodname_ghe_cloud %} documentation. -You can view license usage for {% data variables.product.prodname_ghe_server %} on {% data variables.product.product_location %}. +{% endif %} -{% data reusables.enterprise-licensing.you-can-sync-for-a-combined-view %} For more information about the display of license usage on {% data variables.product.prodname_dotcom_the_website %} and identifying when the last license sync occurred, see "[Viewing license usage for {% data variables.product.prodname_enterprise %}](/enterprise-cloud@latest/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise)" in the {% data variables.product.prodname_ghe_cloud %} documentation. +You can also use the REST API to return consumed licenses data and the status of the license sync job. For more information, see "[GitHub Enterprise administration](/enterprise-cloud@latest/rest/enterprise-admin/license)" in the REST API documentation. To learn more about the license data associated with your enterprise account and how the number of consumed user seats are calculated, see "[Troubleshooting license usage for GitHub Enterprise](/billing/managing-your-license-for-github-enterprise/troubleshooting-license-usage-for-github-enterprise)." -{% endif %} ## Viewing license usage on {% ifversion ghec %}{% data variables.product.prodname_dotcom_the_website %}{% elsif ghes %}{% data variables.product.product_location %}{% endif %} diff --git a/translations/zh-CN/content/rest/enterprise-admin/license.md b/translations/zh-CN/content/rest/enterprise-admin/license.md index 552c547a0d..4dfac157f6 100644 --- a/translations/zh-CN/content/rest/enterprise-admin/license.md +++ b/translations/zh-CN/content/rest/enterprise-admin/license.md @@ -4,6 +4,8 @@ intro: 许可 API 提供有关企业许可的信息。 versions: ghes: '*' ghae: '*' + ghec: '*' + fpt: '*' topics: - API miniTocMaxHeadingLevel: 3 diff --git a/translations/zh-CN/data/reusables/enterprise-licensing/about-license-sync.md b/translations/zh-CN/data/reusables/enterprise-licensing/about-license-sync.md index 3718a30a20..f8e86fe109 100644 --- a/translations/zh-CN/data/reusables/enterprise-licensing/about-license-sync.md +++ b/translations/zh-CN/data/reusables/enterprise-licensing/about-license-sync.md @@ -1,3 +1 @@ -For a person using multiple {% data variables.product.prodname_enterprise %} environments to only consume a single license, you must synchronize license usage between environments. Then, {% data variables.product.company_short %} will deduplicate users based on the email addresses associated with their user accounts. Multiple user accounts will consume a single license when there is a match between an account's primary email address on {% data variables.product.prodname_ghe_server %} and/or an account's verified email address on {% data variables.product.prodname_dotcom_the_website %}. For more information about verification of email addresses on {% data variables.product.prodname_dotcom_the_website %}, see "[Verifying your email address](/enterprise-cloud@latest/get-started/signing-up-for-github/verifying-your-email-address){% ifversion not ghec %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %} - -When you synchronize license usage, only the user ID and email addresses for each user account on {% data variables.product.prodname_ghe_server %} are transmitted to {% data variables.product.prodname_ghe_cloud %}. +对于使用多个 {% data variables.product.prodname_enterprise %} 环境以仅使用单个许可证的用户，您必须在环境之间同步许可证使用情况。 然后，{% data variables.product.company_short %} 将根据与其用户帐户关联的电子邮件地址对用户进行重复数据删除。 For more information, see "[Troubleshooting license usage for {% data variables.product.prodname_enterprise %}](/billing/managing-your-license-for-github-enterprise/troubleshooting-license-usage-for-github-enterprise#about-the-calculation-of-consumed-licenses)." \ No newline at end of file diff --git a/translations/zh-CN/data/reusables/enterprise-licensing/unique-user-licensing-model.md b/translations/zh-CN/data/reusables/enterprise-licensing/unique-user-licensing-model.md index 0150bdec03..c7a1f3b150 100644 --- a/translations/zh-CN/data/reusables/enterprise-licensing/unique-user-licensing-model.md +++ b/translations/zh-CN/data/reusables/enterprise-licensing/unique-user-licensing-model.md @@ -1,3 +1,3 @@ {% data variables.product.company_short %} uses a unique-user licensing model. For enterprise products that include multiple deployment options, {% data variables.product.company_short %} determines how many licensed seats you're consuming based on the number of unique users across all your deployments. -Each user account only consumes one license, no matter how many {% data variables.product.prodname_ghe_server %} instances the user account uses, or how many organizations the user account is a member of on {% data variables.product.prodname_ghe_cloud %}. This model allows each person to use multiple {% data variables.product.prodname_enterprise %} deployments without incurring extra costs. +Each user only consumes one license, no matter how many {% data variables.product.prodname_ghe_server %} instances the user uses, or how many organizations the user is a member of on {% data variables.product.prodname_ghe_cloud %}. This model allows each person to use multiple {% data variables.product.prodname_enterprise %} deployments without incurring extra costs. diff --git a/translations/zh-CN/data/reusables/enterprise-licensing/you-can-sync-for-a-combined-view.md b/translations/zh-CN/data/reusables/enterprise-licensing/you-can-sync-for-a-combined-view.md deleted file mode 100644 index 70d7a78cb2..0000000000 --- a/translations/zh-CN/data/reusables/enterprise-licensing/you-can-sync-for-a-combined-view.md +++ /dev/null @@ -1 +0,0 @@ -If you use both {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %} and sync license usage between the products, you can view license usage for both on {% data variables.product.prodname_dotcom_the_website %}. For more information, see {% ifversion fpt or ghec %}"[Syncing license usage between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}](/enterprise-server/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud)" in the {% data variables.product.prodname_ghe_server %} documentation.{% elsif ghes %}"[Syncing license usage between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}](/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud)."{% endif %} diff --git a/translations/zh-CN/data/reusables/saml/authorized-creds-info.md b/translations/zh-CN/data/reusables/saml/authorized-creds-info.md index 6140c36f47..e708f4e06f 100644 --- a/translations/zh-CN/data/reusables/saml/authorized-creds-info.md +++ b/translations/zh-CN/data/reusables/saml/authorized-creds-info.md @@ -1,6 +1,6 @@ 在授权个人访问令牌或 SSH 密钥之前，您必须具有链接的 SAML 标识。 如果您是启用了 SAML SSO 的组织的成员，则可以通过至少一次使用 IdP 向组织验证来创建链接身份。 更多信息请参阅“[关于使用 SAML 单点登录进行身份验证](/authentication/authenticating-with-saml-single-sign-on/about-authentication-with-saml-single-sign-on)”。 -授权个人访问令牌或 SSH 密钥后。 令牌或密钥将保持授权状态，直到以下面方式之一吊销。 +After you authorize a personal access token or SSH key, the token or key will stay authorized until revoked in one of the following ways. - 组织或企业所有者撤销授权。 - 您已从组织中删除。 - 编辑个人访问令牌中的范围，或重新生成令牌。