Merge pull request #13077 from github/repo-sync

repo sync

Author: Octomerger

translations/log/cn-resets.csv

@@ -20,6 +20,12 @@ shortTitle: Merge multiple user accounts
 
 {% endtip %}
 
+{% warning %}
+
+**Warning:** Organization and repository access permissions aren't transferable between accounts. If the account you want to delete has an existing access permission, an organization owner or repository administrator will need to invite the account that you want to keep.
+
+{% endwarning %}
+
 1. [Transfer any repositories](/articles/how-to-transfer-a-repository) from the account you want to delete to the account you want to keep. Issues, pull requests, and wikis are transferred as well. Verify the repositories exist on the account you want to keep.
 2. [Update the remote URLs](/github/getting-started-with-github/managing-remote-repositories) in any local clones of the repositories that were moved.
 3. [Delete the account](/articles/deleting-your-user-account) you no longer want to use.

translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/merging-multiple-user-accounts.md

@@ -1,7 +1,7 @@
 ---
-title: 管理企业的 GitHub Advanced Security
-shortTitle: 管理 GitHub Advanced Security
-intro: '您可以配置 {% data variables.product.prodname_advanced_security %} 并管理企业的使用，以满足组织的需求。'
+title: Managing GitHub Advanced Security for your enterprise
+shortTitle: Managing GitHub Advanced Security
+intro: 'You can configure {% data variables.product.prodname_advanced_security %} and manage use by your enterprise to suit your organization''s needs.'
 product: '{% data reusables.gated-features.ghas %}'
 redirect_from:
   - /enterprise/admin/configuration/configuring-advanced-security-features
@@ -15,8 +15,6 @@ children:
   - /enabling-github-advanced-security-for-your-enterprise
   - /configuring-code-scanning-for-your-appliance
   - /configuring-secret-scanning-for-your-appliance
-  - /viewing-your-github-advanced-security-usage
   - /overview-of-github-advanced-security-deployment
   - /deploying-github-advanced-security-in-your-enterprise
 ---
-

translations/zh-CN/content/admin/advanced-security/index.md

@@ -1,10 +1,10 @@
 ---
-title: 降级 Git Large File Storage
-intro: '您可以按照每月 50 GB 的增量，降级 {% data variables.large_files.product_name_short %} 的存储和带宽。'
+title: Downgrading Git Large File Storage
+intro: 'You can downgrade storage and bandwidth for {% data variables.large_files.product_name_short %} by increments of 50 GB per month.'
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/downgrading-git-large-file-storage
-  - /articles/downgrading-storage-and-bandwidth-for-a-personal-account/
-  - /articles/downgrading-storage-and-bandwidth-for-an-organization/
+  - /articles/downgrading-storage-and-bandwidth-for-a-personal-account
+  - /articles/downgrading-storage-and-bandwidth-for-an-organization
   - /articles/downgrading-git-large-file-storage
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage
 versions:
@@ -16,19 +16,18 @@ topics:
   - LFS
   - Organizations
   - User account
-shortTitle: 降级 Git LFS 存储
+shortTitle: Downgrade Git LFS storage
 ---
+When you downgrade your number of data packs, your change takes effect on your next billing date. For more information, see "[About billing for {% data variables.large_files.product_name_long %}](/articles/about-billing-for-git-large-file-storage)."
 
-降级数据包数量后，更改将在下一个结算日期生效。 更多信息请参阅“[关于 {% data variables.large_files.product_name_long %}](/articles/about-billing-for-git-large-file-storage) 的计费”。
-
-## 降级个人帐户的存储和带宽
+## Downgrading storage and bandwidth for a personal account
 
 {% data reusables.user_settings.access_settings %}
 {% data reusables.user_settings.billing_plans %}
 {% data reusables.dotcom_billing.lfs-remove-data %}
 {% data reusables.large_files.downgrade_data_packs %}
 
-## 降级组织的存储和带宽
+## Downgrading storage and bandwidth for an organization
 
 {% data reusables.dotcom_billing.org-billing-perms %}
 

translations/zh-CN/content/billing/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage.md

@@ -1,10 +1,10 @@
 ---
-title: 升级 Git Large File Storage
-intro: '您可以购买额外的数据包以增加 {% data variables.large_files.product_name_short %} 的每月带宽配额和总存储容量。'
+title: Upgrading Git Large File Storage
+intro: 'You can purchase additional data packs to increase your monthly bandwidth quota and total storage capacity for {% data variables.large_files.product_name_short %}.'
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/upgrading-git-large-file-storage
-  - /articles/purchasing-additional-storage-and-bandwidth-for-a-personal-account/
-  - /articles/purchasing-additional-storage-and-bandwidth-for-an-organization/
+  - /articles/purchasing-additional-storage-and-bandwidth-for-a-personal-account
+  - /articles/purchasing-additional-storage-and-bandwidth-for-an-organization
   - /articles/upgrading-git-large-file-storage
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage
 versions:
@@ -16,18 +16,17 @@ topics:
   - Organizations
   - Upgrades
   - User account
-shortTitle: 升级 Git LFS 存储
+shortTitle: Upgrade Git LFS storage
 ---
-
-## 为个人帐户购买额外的存储空间和带宽
+## Purchasing additional storage and bandwidth for a personal account
 
 {% data reusables.user_settings.access_settings %}
 {% data reusables.user_settings.billing_plans %}
 {% data reusables.dotcom_billing.lfs-add-data %}
 {% data reusables.large_files.pack_selection %}
 {% data reusables.large_files.pack_confirm %}
 
-## 为组织购买额外的存储空间和带宽
+## Purchasing additional storage and bandwidth for an organization
 
 {% data reusables.dotcom_billing.org-billing-perms %}
 
@@ -36,9 +35,9 @@ shortTitle: 升级 Git LFS 存储
 {% data reusables.large_files.pack_selection %}
 {% data reusables.large_files.pack_confirm %}
 
-## 延伸阅读
+## Further reading
 
-- "[关于 {% data variables.large_files.product_name_long %} 的计费](/articles/about-billing-for-git-large-file-storage)"
-- "[关于存储空间和带宽的使用](/articles/about-storage-and-bandwidth-usage)"
-- "[查看您的 {% data variables.large_files.product_name_long %} 使用情况](/articles/viewing-your-git-large-file-storage-usage)"
-- “[大文件版本管理](/articles/versioning-large-files)”
+- "[About billing for {% data variables.large_files.product_name_long %}](/articles/about-billing-for-git-large-file-storage)"
+- "[About storage and bandwidth usage](/articles/about-storage-and-bandwidth-usage)"
+- "[Viewing your {% data variables.large_files.product_name_long %} usage](/articles/viewing-your-git-large-file-storage-usage)"
+- "[Versioning large files](/articles/versioning-large-files)"

translations/zh-CN/content/billing/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage.md

@@ -1,10 +1,10 @@
 ---
-title: 查看您的 Git Large File Storage 使用情况
-intro: '您可以审核帐户的每月带宽配额和 {% data variables.large_files.product_name_short %} 的剩余存储空间。'
+title: Viewing your Git Large File Storage usage
+intro: 'You can audit your account''s monthly bandwidth quota and remaining storage for {% data variables.large_files.product_name_short %}.'
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-git-large-file-storage-usage
-  - /articles/viewing-storage-and-bandwidth-usage-for-a-personal-account/
-  - /articles/viewing-storage-and-bandwidth-usage-for-an-organization/
+  - /articles/viewing-storage-and-bandwidth-usage-for-a-personal-account
+  - /articles/viewing-storage-and-bandwidth-usage-for-an-organization
   - /articles/viewing-your-git-large-file-storage-usage
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage
 versions:
@@ -15,25 +15,24 @@ topics:
   - LFS
   - Organizations
   - User account
-shortTitle: 查看 Git LFS 使用情况
+shortTitle: View Git LFS usage
 ---
-
 {% data reusables.large_files.owner_quota_only %} {% data reusables.large_files.does_not_carry %}
 
-## 查看个人帐户的存储空间和带宽使用情况
+## Viewing storage and bandwidth usage for a personal account
 
 {% data reusables.user_settings.access_settings %}
 {% data reusables.user_settings.billing_plans %}
 {% data reusables.dotcom_billing.lfs-data %}
 
-## 查看组织的存储空间和带宽使用情况
+## Viewing storage and bandwidth usage for an organization
 
 {% data reusables.dotcom_billing.org-billing-perms %}
 
 {% data reusables.organizations.billing-settings %}
 {% data reusables.dotcom_billing.lfs-data %}
 
-## 延伸阅读
+## Further reading
 
-- "[关于存储空间和带宽的使用](/articles/about-storage-and-bandwidth-usage)"
-- “[升级 {% data variables.large_files.product_name_long %}](/articles/upgrading-git-large-file-storage/)”
+- "[About storage and bandwidth usage](/articles/about-storage-and-bandwidth-usage)"
+- "[Upgrading {% data variables.large_files.product_name_long %}](/articles/upgrading-git-large-file-storage/)"

translations/zh-CN/content/billing/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage.md

@@ -1,9 +1,9 @@
 ---
-title: 关于采购公司的组织
-intro: 企业使用组织与多个所有者和管理员协作处理共享的项目。 您可以为客户创建组织，代他们付款，然后将组织的所有权转给客户。
+title: About organizations for procurement companies
+intro: 'Businesses use organizations to collaborate on shared projects with multiple owners and administrators. You can create an organization for your client, make a payment on their behalf, then pass ownership of the organization to your client.'
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/about-organizations-for-procurement-companies
-  - /articles/about-organizations-for-resellers/
+  - /articles/about-organizations-for-resellers
   - /articles/about-organizations-for-procurement-companies
   - /github/setting-up-and-managing-billing-and-payments-on-github/setting-up-paid-organizations-for-procurement-companies/about-organizations-for-procurement-companies
 versions:
@@ -12,28 +12,27 @@ versions:
 type: overview
 topics:
   - Organizations
-shortTitle: 关于组织
+shortTitle: About organizations
 ---
+To access an organization, each member must sign into their own personal user account.
 
-要访问组织，每个成员都必须登录到其自己的个人用户帐户。
+Organization members can have different roles, such as *owner* or *billing manager*:
 
-组织成员可有不同的角色，如*所有者*或*帐单管理员*：
+- **Owners** have complete administrative access to an organization and its contents.
+- **Billing managers** can manage billing settings, and cannot access organization contents. Billing managers are not shown in the list of organization members.
 
-- **所有者**对组织及其内容具有全面的管理权限。
-- **帐单管理员**可以管理帐单设置，但不能访问组织内容。 帐单管理员不会显示在组织成员列表中。
+## Payments and pricing for organizations
 
-## 组织的付款和定价
+We don't provide quotes for organization pricing. You can see our published pricing for [organizations](https://github.com/pricing) and [Git Large File Storage](/articles/about-storage-and-bandwidth-usage/). We do not provide discounts for procurement companies or for renewal orders.
 
-我们不对组织定价提供报价。 您可以查看我们为[组织](https://github.com/pricing)和 [Git Large File Storage](/articles/about-storage-and-bandwidth-usage/) 发布的定价。 我们不对采购公司或续订订单提供折扣。
+We accept payment in US dollars, although end users may be located anywhere in the world.
 
-虽然最终用户可能位于世界各地，但我们接受美元付款。
+We accept payment by credit card and PayPal. We don't accept payment by purchase order or invoice.
 
-我们接受信用卡和 PayPal 付款， 不接受采购单或发票付款。
+For easier and more efficient purchasing, we recommend that procurement companies set up yearly billing for their clients' organizations.
 
-为提高购买的简便性和效率，我们建议采购公司为其客户的组织设置年度帐单。
+## Further reading
 
-## 延伸阅读
-
-- "[代客户创建并支付组织](/articles/creating-and-paying-for-an-organization-on-behalf-of-a-client)"
-- "[升级或降级客户的付费组织](/articles/upgrading-or-downgrading-your-client-s-paid-organization)"
-- "[续订客户的付费组织](/articles/renewing-your-client-s-paid-organization)"
+- "[Creating and paying for an organization on behalf of a client](/articles/creating-and-paying-for-an-organization-on-behalf-of-a-client)"
+- "[Upgrading or downgrading your client's paid organization](/articles/upgrading-or-downgrading-your-client-s-paid-organization)"
+- "[Renewing your client's paid organization](/articles/renewing-your-client-s-paid-organization)"

translations/zh-CN/content/billing/setting-up-paid-organizations-for-procurement-companies/about-organizations-for-procurement-companies.md

@@ -1,11 +1,11 @@
 ---
-title: 为采购公司设置付费组织
-shortTitle: 采购公司的付费组织
-intro: '如果您代表客户为 {% data variables.product.product_name %} 支付，您可以配置其组织和支付设置，以优化便利性和安全性。'
+title: Setting up paid organizations for procurement companies
+shortTitle: Paid organizations for procurement companies
+intro: 'If you pay for {% data variables.product.product_name %} on behalf of a client, you can configure their organization and payment settings to optimize convenience and security.'
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/setting-up-paid-organizations-for-procurement-companies
-  - /articles/setting-up-and-paying-for-organizations-for-resellers/
-  - /articles/setting-up-and-paying-for-organizations-for-procurement-companies/
+  - /articles/setting-up-and-paying-for-organizations-for-resellers
+  - /articles/setting-up-and-paying-for-organizations-for-procurement-companies
   - /articles/setting-up-paid-organizations-for-procurement-companies
 versions:
   fpt: '*'

translations/zh-CN/content/billing/setting-up-paid-organizations-for-procurement-companies/index.md

@@ -2,9 +2,9 @@
 title: Managing vulnerabilities in your project's dependencies
 intro: 'You can track your repository''s dependencies and receive {% data variables.product.prodname_dependabot_alerts %} when {% data variables.product.product_name %} detects vulnerable dependencies.'
 redirect_from:
-  - /articles/updating-your-project-s-dependencies/
-  - /articles/updating-your-projects-dependencies/
-  - /articles/managing-security-vulnerabilities-in-your-projects-dependencies/
+  - /articles/updating-your-project-s-dependencies
+  - /articles/updating-your-projects-dependencies
+  - /articles/managing-security-vulnerabilities-in-your-projects-dependencies
   - /articles/managing-vulnerabilities-in-your-projects-dependencies
   - /github/managing-security-vulnerabilities/managing-vulnerabilities-in-your-projects-dependencies
 versions: