From ad1ad3b77c9cc7fa52b70b134d1e6455894f2b3b Mon Sep 17 00:00:00 2001 From: docubot <67483024+docubot@users.noreply.github.com> Date: Thu, 9 Dec 2021 15:58:40 -0600 Subject: [PATCH] New translation batch for cn (#23558) * 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 Co-authored-by: Marcelo Jacobus --- translations/log/cn-resets.csv | 30 +- .../about-notifications.md | 2 +- .../configuring-notifications.md | 2 +- .../about-your-profile.md | 31 +- .../workflow-syntax-for-github-actions.md | 15 +- .../using-ldap.md | 183 ++++---- ...-enterprise-server-with-a-load-balancer.md | 30 +- .../configuring-your-enterprise/index.md | 2 +- ...aging-github-mobile-for-your-enterprise.md | 35 ++ .../cluster-network-configuration.md | 169 ++++---- .../increasing-storage-capacity.md | 61 +-- translations/zh-CN/content/admin/guides.md | 2 +- ...exporting-migration-data-from-githubcom.md | 17 +- ...io-subscriptions-with-github-enterprise.md | 18 +- .../connecting-to-a-private-network.md | 45 ++ .../developing-in-codespaces/index.md | 1 + .../saving-repositories-with-stars.md | 119 ++++-- .../zh-CN/content/get-started/index.md | 27 +- .../get-started/quickstart/create-a-repo.md | 2 +- .../get-started/quickstart/fork-a-repo.md | 102 ++--- .../content/get-started/quickstart/index.md | 6 +- .../get-started/quickstart/set-up-git.md | 65 ++- .../get-started/using-github/github-mobile.md | 91 ++++ .../content/get-started/using-github/index.md | 7 +- .../site-policy/github-terms-of-service.md | 402 +++++++++--------- .../guides/managing-enterprise-accounts.md | 127 +++--- ...om-repository-roles-for-an-organization.md | 80 ++-- ...pull-request-branch-created-from-a-fork.md | 51 +-- .../using-files/navigating-code-on-github.md | 73 +++- .../rest/reference/enterprise-admin.md | 4 + .../release-notes/enterprise-server/3-1/0.yml | 2 +- .../proxy-incompatible-with-aws-nlbs.md | 5 + .../github-token-available-permissions.md | 1 + ...-groups-navigate-to-repo-org-enterprise.md | 2 +- ...osted-runner-navigate-to-org-enterprise.md | 2 +- ...-runner-navigate-to-repo-org-enterprise.md | 2 +- ...nerable-dependency-notification-options.md | 2 +- .../reusables/stars/stars-page-navigation.md | 1 + .../reusables/supported-languages/python.md | 2 +- translations/zh-CN/data/variables/product.yml | 4 +- 40 files changed, 1074 insertions(+), 748 deletions(-) create mode 100644 translations/zh-CN/content/admin/configuration/configuring-your-enterprise/managing-github-mobile-for-your-enterprise.md create mode 100644 translations/zh-CN/content/codespaces/developing-in-codespaces/connecting-to-a-private-network.md create mode 100644 translations/zh-CN/content/get-started/using-github/github-mobile.md create mode 100644 translations/zh-CN/data/reusables/enterprise_installation/proxy-incompatible-with-aws-nlbs.md create mode 100644 translations/zh-CN/data/reusables/stars/stars-page-navigation.md diff --git a/translations/log/cn-resets.csv b/translations/log/cn-resets.csv index 8e66faaef2ce..feb7390ba04e 100644 --- a/translations/log/cn-resets.csv +++ b/translations/log/cn-resets.csv @@ -4,6 +4,7 @@ translations/zh-CN/content/account-and-profile/managing-subscriptions-and-notifi translations/zh-CN/content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/about-notifications.md,rendering error translations/zh-CN/content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications.md,rendering error translations/zh-CN/content/account-and-profile/managing-subscriptions-and-notifications-on-github/viewing-and-triaging-notifications/managing-notifications-from-your-inbox.md,rendering error +translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/about-your-profile.md,rendering error translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-graphs-on-your-profile/sending-enterprise-contributions-to-your-githubcom-profile.md,rendering error translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-graphs-on-your-profile/viewing-contributions-on-your-profile.md,rendering error translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/about-your-personal-dashboard.md,rendering error @@ -13,9 +14,7 @@ translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-gith translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/managing-your-theme-settings.md,rendering error translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/permission-levels-for-a-user-account-repository.md,rendering error translations/zh-CN/content/actions/advanced-guides/caching-dependencies-to-speed-up-workflows.md,rendering error -translations/zh-CN/content/actions/advanced-guides/index.md,rendering error translations/zh-CN/content/actions/advanced-guides/storing-workflow-data-as-artifacts.md,rendering error -translations/zh-CN/content/actions/advanced-guides/using-github-cli-in-workflows.md,rendering error translations/zh-CN/content/actions/automating-builds-and-tests/about-continuous-integration.md,rendering error translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-java-with-ant.md,rendering error translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-java-with-gradle.md,rendering error @@ -28,7 +27,6 @@ translations/zh-CN/content/actions/automating-builds-and-tests/building-and-test translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-ruby.md,rendering error translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-swift.md,rendering error translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-xamarin-applications.md,rendering error -translations/zh-CN/content/actions/automating-builds-and-tests/index.md,rendering error translations/zh-CN/content/actions/creating-actions/about-custom-actions.md,rendering error translations/zh-CN/content/actions/creating-actions/creating-a-composite-action.md,rendering error translations/zh-CN/content/actions/creating-actions/creating-a-docker-container-action.md,rendering error @@ -89,7 +87,6 @@ translations/zh-CN/content/actions/learn-github-actions/workflow-syntax-for-gith translations/zh-CN/content/actions/managing-issues-and-pull-requests/adding-labels-to-issues.md,rendering error translations/zh-CN/content/actions/managing-issues-and-pull-requests/closing-inactive-issues.md,rendering error translations/zh-CN/content/actions/managing-issues-and-pull-requests/commenting-on-an-issue-when-a-label-is-added.md,rendering error -translations/zh-CN/content/actions/managing-issues-and-pull-requests/index.md,rendering error translations/zh-CN/content/actions/managing-issues-and-pull-requests/moving-assigned-issues-on-project-boards.md,rendering error translations/zh-CN/content/actions/managing-issues-and-pull-requests/removing-a-label-when-a-card-is-added-to-a-project-board-column.md,rendering error translations/zh-CN/content/actions/managing-issues-and-pull-requests/scheduling-issue-creation.md,rendering error @@ -110,7 +107,7 @@ translations/zh-CN/content/actions/migrating-to-github-actions/migrating-from-az translations/zh-CN/content/actions/migrating-to-github-actions/migrating-from-circleci-to-github-actions.md,rendering error translations/zh-CN/content/actions/migrating-to-github-actions/migrating-from-gitlab-cicd-to-github-actions.md,rendering error translations/zh-CN/content/actions/migrating-to-github-actions/migrating-from-jenkins-to-github-actions.md,rendering error -translations/zh-CN/content/actions/migrating-to-github-actions/migrating-from-travis-ci-to-github-actions.md,broken liquid tags +translations/zh-CN/content/actions/migrating-to-github-actions/migrating-from-travis-ci-to-github-actions.md,rendering error translations/zh-CN/content/actions/monitoring-and-troubleshooting-workflows/about-monitoring-and-troubleshooting.md,rendering error translations/zh-CN/content/actions/monitoring-and-troubleshooting-workflows/adding-a-workflow-status-badge.md,rendering error translations/zh-CN/content/actions/monitoring-and-troubleshooting-workflows/enabling-debug-logging.md,rendering error @@ -129,12 +126,10 @@ translations/zh-CN/content/actions/publishing-packages/publishing-nodejs-package translations/zh-CN/content/actions/quickstart.md,rendering error translations/zh-CN/content/actions/security-guides/automatic-token-authentication.md,rendering error translations/zh-CN/content/actions/security-guides/encrypted-secrets.md,rendering error -translations/zh-CN/content/actions/security-guides/index.md,rendering error translations/zh-CN/content/actions/security-guides/security-hardening-for-github-actions.md,rendering error translations/zh-CN/content/actions/using-containerized-services/about-service-containers.md,rendering error translations/zh-CN/content/actions/using-containerized-services/creating-postgresql-service-containers.md,rendering error translations/zh-CN/content/actions/using-containerized-services/creating-redis-service-containers.md,rendering error -translations/zh-CN/content/actions/using-containerized-services/index.md,rendering error translations/zh-CN/content/actions/using-github-hosted-runners/about-github-hosted-runners.md,rendering error translations/zh-CN/content/actions/using-github-hosted-runners/customizing-github-hosted-runners.md,rendering error translations/zh-CN/content/actions/using-github-hosted-runners/index.md,rendering error @@ -142,6 +137,7 @@ translations/zh-CN/content/admin/advanced-security/configuring-code-scanning-for translations/zh-CN/content/admin/advanced-security/configuring-secret-scanning-for-your-appliance.md,rendering error translations/zh-CN/content/admin/advanced-security/enabling-github-advanced-security-for-your-enterprise.md,rendering error translations/zh-CN/content/admin/authentication/authenticating-users-for-your-github-enterprise-server-instance/allowing-built-in-authentication-for-users-outside-your-identity-provider.md,rendering error +translations/zh-CN/content/admin/authentication/authenticating-users-for-your-github-enterprise-server-instance/using-ldap.md,rendering error translations/zh-CN/content/admin/authentication/authenticating-users-for-your-github-enterprise-server-instance/using-saml.md,rendering error translations/zh-CN/content/admin/authentication/configuring-authentication-and-provisioning-with-your-identity-provider/configuring-authentication-and-provisioning-for-your-enterprise-using-okta.md,rendering error translations/zh-CN/content/admin/authentication/configuring-authentication-and-provisioning-with-your-identity-provider/index.md,rendering error @@ -153,6 +149,7 @@ translations/zh-CN/content/admin/authentication/managing-identity-and-access-for translations/zh-CN/content/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/about-enterprise-managed-users.md,rendering error translations/zh-CN/content/admin/configuration/configuring-network-settings/configuring-an-outbound-web-proxy-server.md,rendering error translations/zh-CN/content/admin/configuration/configuring-network-settings/network-ports.md,rendering error +translations/zh-CN/content/admin/configuration/configuring-network-settings/using-github-enterprise-server-with-a-load-balancer.md,rendering error translations/zh-CN/content/admin/configuration/configuring-your-enterprise/accessing-the-management-console.md,rendering error translations/zh-CN/content/admin/configuration/configuring-your-enterprise/command-line-utilities.md,rendering error translations/zh-CN/content/admin/configuration/configuring-your-enterprise/configuring-backups-on-your-appliance.md,rendering error @@ -161,7 +158,7 @@ translations/zh-CN/content/admin/configuration/configuring-your-enterprise/confi translations/zh-CN/content/admin/configuration/configuring-your-enterprise/configuring-github-pages-for-your-enterprise.md,rendering error translations/zh-CN/content/admin/configuration/configuring-your-enterprise/configuring-rate-limits.md,rendering error translations/zh-CN/content/admin/configuration/configuring-your-enterprise/index.md,rendering error -translations/zh-CN/content/admin/configuration/configuring-your-enterprise/managing-github-for-mobile-for-your-enterprise.md,rendering error +translations/zh-CN/content/admin/configuration/configuring-your-enterprise/managing-github-mobile-for-your-enterprise.md,rendering error translations/zh-CN/content/admin/configuration/configuring-your-enterprise/restricting-network-traffic-to-your-enterprise.md,rendering error translations/zh-CN/content/admin/configuration/configuring-your-enterprise/site-admin-dashboard.md,rendering error translations/zh-CN/content/admin/configuration/managing-connections-between-your-enterprise-accounts/connecting-your-enterprise-account-to-github-enterprise-cloud.md,rendering error @@ -169,9 +166,11 @@ translations/zh-CN/content/admin/configuration/managing-connections-between-your translations/zh-CN/content/admin/configuration/managing-connections-between-your-enterprise-accounts/enabling-unified-contributions-between-your-enterprise-account-and-githubcom.md,rendering error translations/zh-CN/content/admin/configuration/managing-connections-between-your-enterprise-accounts/enabling-unified-search-between-your-enterprise-account-and-githubcom.md,rendering error translations/zh-CN/content/admin/configuration/managing-connections-between-your-enterprise-accounts/index.md,rendering error +translations/zh-CN/content/admin/enterprise-management/configuring-clustering/cluster-network-configuration.md,rendering error translations/zh-CN/content/admin/enterprise-management/configuring-high-availability/about-high-availability-configuration.md,rendering error translations/zh-CN/content/admin/enterprise-management/configuring-high-availability/creating-a-high-availability-replica.md,rendering error translations/zh-CN/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/increasing-cpu-or-memory-resources.md,rendering error +translations/zh-CN/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/increasing-storage-capacity.md,rendering error translations/zh-CN/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrade-requirements.md,rendering error translations/zh-CN/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrading-github-enterprise-server.md,rendering error translations/zh-CN/content/admin/enterprise-support/overview/about-github-enterprise-support.md,rendering error @@ -260,7 +259,6 @@ translations/zh-CN/content/code-security/code-scanning/automatically-scanning-yo translations/zh-CN/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/managing-code-scanning-alerts-for-your-repository.md,rendering error translations/zh-CN/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/running-codeql-code-scanning-in-a-container.md,rendering error translations/zh-CN/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/setting-up-code-scanning-for-a-repository.md,parsing error -translations/zh-CN/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/setting-up-code-scanning-for-a-repository.md,rendering error translations/zh-CN/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/tracking-code-scanning-alerts-in-issues-using-task-lists.md,rendering error translations/zh-CN/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/triaging-code-scanning-alerts-in-pull-requests.md,rendering error translations/zh-CN/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/troubleshooting-the-codeql-workflow.md,Listed in localization-support#489 @@ -307,6 +305,7 @@ translations/zh-CN/content/codespaces/customizing-your-codespace/setting-your-de translations/zh-CN/content/codespaces/customizing-your-codespace/setting-your-default-region-for-codespaces.md,rendering error translations/zh-CN/content/codespaces/customizing-your-codespace/setting-your-timeout-period-for-codespaces.md,rendering error translations/zh-CN/content/codespaces/developing-in-codespaces/codespaces-lifecycle.md,rendering error +translations/zh-CN/content/codespaces/developing-in-codespaces/connecting-to-a-private-network.md,rendering error translations/zh-CN/content/codespaces/developing-in-codespaces/creating-a-codespace.md,rendering error translations/zh-CN/content/codespaces/developing-in-codespaces/deleting-a-codespace.md,rendering error translations/zh-CN/content/codespaces/developing-in-codespaces/developing-in-a-codespace.md,rendering error @@ -369,25 +368,32 @@ translations/zh-CN/content/education/manage-coursework-with-github-classroom/tea translations/zh-CN/content/education/manage-coursework-with-github-classroom/teach-with-github-classroom/manage-classrooms.md,rendering error translations/zh-CN/content/education/manage-coursework-with-github-classroom/teach-with-github-classroom/use-autograding.md,rendering error translations/zh-CN/content/education/manage-coursework-with-github-classroom/teach-with-github-classroom/use-the-git-and-github-starter-assignment.md,rendering error +translations/zh-CN/content/get-started/exploring-projects-on-github/saving-repositories-with-stars.md,rendering error translations/zh-CN/content/get-started/getting-started-with-git/caching-your-github-credentials-in-git.md,rendering error translations/zh-CN/content/get-started/getting-started-with-git/updating-credentials-from-the-macos-keychain.md,rendering error +translations/zh-CN/content/get-started/index.md,rendering error translations/zh-CN/content/get-started/learning-about-github/about-github-advanced-security.md,rendering error translations/zh-CN/content/get-started/quickstart/communicating-on-github.md,rendering error translations/zh-CN/content/get-started/quickstart/create-a-repo.md,rendering error +translations/zh-CN/content/get-started/quickstart/fork-a-repo.md,rendering error translations/zh-CN/content/get-started/quickstart/git-and-github-learning-resources.md,rendering error translations/zh-CN/content/get-started/quickstart/github-flow.md,rendering error +translations/zh-CN/content/get-started/quickstart/index.md,rendering error +translations/zh-CN/content/get-started/quickstart/set-up-git.md,rendering error translations/zh-CN/content/get-started/signing-up-for-github/index.md,rendering error translations/zh-CN/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-ae.md,rendering error translations/zh-CN/content/get-started/using-git/about-git.md,rendering error translations/zh-CN/content/get-started/using-git/dealing-with-non-fast-forward-errors.md,rendering error translations/zh-CN/content/get-started/using-git/getting-changes-from-a-remote-repository.md,rendering error translations/zh-CN/content/get-started/using-git/splitting-a-subfolder-out-into-a-new-repository.md,rendering error -translations/zh-CN/content/get-started/using-github/github-for-mobile.md,rendering error +translations/zh-CN/content/get-started/using-github/github-mobile.md,rendering error +translations/zh-CN/content/get-started/using-github/index.md,rendering error translations/zh-CN/content/get-started/using-github/keyboard-shortcuts.md,rendering error translations/zh-CN/content/github-cli/github-cli/creating-github-cli-extensions.md,rendering error translations/zh-CN/content/github/customizing-your-github-workflow/exploring-integrations/about-github-marketplace.md,rendering error translations/zh-CN/content/github/importing-your-projects-to-github/importing-source-code-to-github/adding-an-existing-project-to-github-using-the-command-line.md,rendering error translations/zh-CN/content/github/site-policy/github-terms-for-additional-products-and-features.md,rendering error +translations/zh-CN/content/github/site-policy/github-terms-of-service.md,rendering error translations/zh-CN/content/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository.md,rendering error translations/zh-CN/content/github/working-with-github-support/about-github-premium-support-for-github-enterprise-cloud.md,rendering error translations/zh-CN/content/github/working-with-github-support/github-enterprise-cloud-support.md,rendering error @@ -398,6 +404,7 @@ translations/zh-CN/content/github/writing-on-github/working-with-advanced-format translations/zh-CN/content/github/writing-on-github/working-with-advanced-formatting/index.md,rendering error translations/zh-CN/content/github/writing-on-github/working-with-advanced-formatting/organizing-information-with-collapsed-sections.md,rendering error translations/zh-CN/content/graphql/guides/index.md,rendering error +translations/zh-CN/content/graphql/guides/managing-enterprise-accounts.md,rendering error translations/zh-CN/content/graphql/guides/migrating-graphql-global-node-ids.md,rendering error translations/zh-CN/content/graphql/index.md,rendering error translations/zh-CN/content/issues/guides.md,rendering error @@ -416,6 +423,7 @@ translations/zh-CN/content/organizations/managing-organization-settings/managing translations/zh-CN/content/organizations/managing-organization-settings/managing-the-publication-of-github-pages-sites-for-your-organization.md,Listed in localization-support#489 translations/zh-CN/content/organizations/managing-organization-settings/managing-the-publication-of-github-pages-sites-for-your-organization.md,rendering error translations/zh-CN/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md,rendering error +translations/zh-CN/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md,rendering error translations/zh-CN/content/organizations/managing-saml-single-sign-on-for-your-organization/index.md,rendering error translations/zh-CN/content/organizations/managing-saml-single-sign-on-for-your-organization/managing-team-synchronization-for-your-organization.md,rendering error translations/zh-CN/content/organizations/managing-saml-single-sign-on-for-your-organization/troubleshooting-identity-and-access-management.md,rendering error @@ -443,6 +451,7 @@ translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/addres translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request.md,rendering error translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-branches.md,rendering error translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests.md,rendering error +translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/committing-changes-to-a-pull-request-branch-created-from-a-fork.md,rendering error translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request.md,rendering error translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/working-with-forks/about-forks.md,rendering error translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork.md,rendering error @@ -469,6 +478,7 @@ translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-f translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md,rendering error translations/zh-CN/content/repositories/viewing-activity-and-data-for-your-repository/viewing-deployment-activity-for-your-repository.md,rendering error translations/zh-CN/content/repositories/working-with-files/managing-files/deleting-files-in-a-repository.md,rendering error +translations/zh-CN/content/repositories/working-with-files/using-files/navigating-code-on-github.md,rendering error translations/zh-CN/content/rest/guides/basics-of-authentication.md,Listed in localization-support#489 translations/zh-CN/content/rest/guides/basics-of-authentication.md,rendering error translations/zh-CN/content/rest/guides/discovering-resources-for-a-user.md,rendering error diff --git a/translations/zh-CN/content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/about-notifications.md b/translations/zh-CN/content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/about-notifications.md index 65e42ba44de0..53af16a5f515 100644 --- a/translations/zh-CN/content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/about-notifications.md +++ b/translations/zh-CN/content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/about-notifications.md @@ -63,7 +63,7 @@ To keep your subscriptions manageable, review your subscriptions and watched rep To customize how you'd like to receive updates for specific pull requests or issues, you can configure your preferences within the issue or pull request. For more information, see "[Triaging a single notification](/github/managing-subscriptions-and-notifications-on-github/triaging-a-single-notification#customizing-when-to-receive-future-updates-for-an-issue-or-pull-request)." {% ifversion fpt or ghes or ghec %} -You can customize and schedule push notifications in the {% data variables.product.prodname_mobile %} app. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#managing-your-notification-settings-with-github-for-mobile)." +You can customize and schedule push notifications in the {% data variables.product.prodname_mobile %} app. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#managing-your-notification-settings-with-github-mobile)." {% endif %} ## Reasons for receiving notifications diff --git a/translations/zh-CN/content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications.md b/translations/zh-CN/content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications.md index 7d63aa603463..f6ed77fe3382 100644 --- a/translations/zh-CN/content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications.md +++ b/translations/zh-CN/content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications.md @@ -54,7 +54,7 @@ The notifications inbox on {% data variables.product.product_location %}{% ifver - Group notifications in your inbox by repository or date to get a quick overview with less context switching {% ifversion fpt or ghes or ghec %} -In addition, you can receive and triage notifications on your mobile device with {% data variables.product.prodname_mobile %}. For more information, see "[Managing your notification settings with GitHub for mobile](#managing-your-notification-settings-with-github-for-mobile)" or "[GitHub for mobile](/github/getting-started-with-github/github-for-mobile)." +In addition, you can receive and triage notifications on your mobile device with {% data variables.product.prodname_mobile %}. For more information, see "[Managing your notification settings with GitHub Mobile](#managing-your-notification-settings-with-github-mobile)" or "[GitHub Mobile](/get-started/using-github/github-mobile)." {% endif %} ### Benefits of using an email client for notifications diff --git a/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/about-your-profile.md b/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/about-your-profile.md index 6e73355a74b4..e711f972ef09 100644 --- a/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/about-your-profile.md +++ b/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/about-your-profile.md @@ -1,6 +1,6 @@ --- -title: 关于您的个人资料 -intro: 您的个人资料向人们讲述您操作感兴趣的仓库的故事、您所做的贡献以及您进行过的对话。 +title: About your profile +intro: 'Your profile page tells people the story of your work through the repositories you''re interested in, the contributions you''ve made, and the conversations you''ve had.' redirect_from: - /articles/viewing-your-feeds/ - /articles/profile-pages/ @@ -15,30 +15,29 @@ versions: topics: - Profiles --- - -您可以在传记中加入您的个人信息，比如您以前工作的地方、您参与过的项目，或者其他人可能想知道的个人兴趣。 更多信息请参阅“[添加传记到个人资料](/articles/personalizing-your-profile/#adding-a-bio-to-your-profile)”。 +You can add personal information about yourself in your bio, like previous places you've worked, projects you've contributed to, or interests you have that other people may like to know about. For more information, see "[Adding a bio to your profile](/articles/personalizing-your-profile/#adding-a-bio-to-your-profile)." {% ifversion fpt or ghes or ghec %} {% data reusables.profile.profile-readme %} -![个人资料上显示的个人资料自述文件](/assets/images/help/repository/profile-with-readme.png) +![Profile README file displayed on profile](/assets/images/help/repository/profile-with-readme.png) {% endif %} -人们在访问您的个人资料时会看到您的贡献活动时间表，如您打开的议题和拉取请求、您进行的提交，以及您审查的拉取请求。 您可以选择只显示公共贡献或同时包含私人的匿名化贡献。 更多信息请参阅“[在个人资料页面中查看贡献](/articles/viewing-contributions-on-your-profile-page)”或“[在您的个人资料中公开或隐藏私人贡献](/articles/publicizing-or-hiding-your-private-contributions-on-your-profile)”。 +People who visit your profile see a timeline of your contribution activity, like issues and pull requests you've opened, commits you've made, and pull requests you've reviewed. You can choose to display only public contributions or to also include private, anonymized contributions. For more information, see "[Viewing contributions on your profile page](/articles/viewing-contributions-on-your-profile-page)" or "[Publicizing or hiding your private contributions on your profile](/articles/publicizing-or-hiding-your-private-contributions-on-your-profile)." -访问您的个人资料的人也可以看到以下信息。 +People who visit your profile can also see the following information. -- 你拥有或参与的仓库和 gists。 {% ifversion fpt or ghes or ghec %}您可以通过将仓库和 Gist 固定到个人资料中来展示您的最佳作品。 更多信息请参阅“[将项目嵌入到个人资料](/github/setting-up-and-managing-your-github-profile/pinning-items-to-your-profile)”。{% endif %} -- 您标星的仓库。 更多信息请参阅“[使用星标保存仓库](/articles/saving-repositories-with-stars/)”。 -- 您在经常参与的组织、仓库和团队中的活动概述。 更多信息请参阅“[在您的个人资料中显示活动概述](/articles/showing-an-overview-of-your-activity-on-your-profile)”。{% ifversion fpt or ghec %} -- 徽章，显示您是否使用 {% data variables.product.prodname_pro %} 或参与计划，例如 {% data variables.product.prodname_arctic_vault %}、{% data variables.product.prodname_sponsors %} 或 {% data variables.product.company_short %} 开发者计划。 更多信息请参阅“[个性化您的个人资料](/github/setting-up-and-managing-your-github-profile/personalizing-your-profile#displaying-badges-on-your-profile)”。{% endif %} +- Repositories and gists you own or contribute to. {% ifversion fpt or ghes or ghec %}You can showcase your best work by pinning repositories and gists to your profile. For more information, see "[Pinning items to your profile](/github/setting-up-and-managing-your-github-profile/pinning-items-to-your-profile)."{% endif %} +- Repositories you've starred{% ifversion fpt or ghec %} and organized into lists.{% endif %} For more information, see "[Saving repositories with stars](/articles/saving-repositories-with-stars/)." +- An overview of your activity in organizations, repositories, and teams you're most active in. For more information, see "[Showing an overview of your activity on your profile](/articles/showing-an-overview-of-your-activity-on-your-profile)."{% ifversion fpt or ghec %} +- Badges that show if you use {% data variables.product.prodname_pro %} or participate in programs like the {% data variables.product.prodname_arctic_vault %}, {% data variables.product.prodname_sponsors %}, or the {% data variables.product.company_short %} Developer Program. For more information, see "[Personalizing your profile](/github/setting-up-and-managing-your-github-profile/personalizing-your-profile#displaying-badges-on-your-profile)."{% endif %} -您还可以在个人资料上设置状态，以提供有关您的可用性的信息。 更多信息请参阅“[设置状态](/articles/personalizing-your-profile/#setting-a-status)”。 +You can also set a status on your profile to provide information about your availability. For more information, see "[Setting a status](/articles/personalizing-your-profile/#setting-a-status)." -## 延伸阅读 +## Further reading -- "[如何设置我的头像？](/articles/how-do-i-set-up-my-profile-picture)“ -- "[在个人资料中公开或隐藏私有贡献](/articles/publicizing-or-hiding-your-private-contributions-on-your-profile)" -- "[在个人资料中查看贡献](/articles/viewing-contributions-on-your-profile)" +- "[How do I set up my profile picture?](/articles/how-do-i-set-up-my-profile-picture)" +- "[Publicizing or hiding your private contributions on your profile](/articles/publicizing-or-hiding-your-private-contributions-on-your-profile)" +- "[Viewing contributions on your profile](/articles/viewing-contributions-on-your-profile)" diff --git a/translations/zh-CN/content/actions/learn-github-actions/workflow-syntax-for-github-actions.md b/translations/zh-CN/content/actions/learn-github-actions/workflow-syntax-for-github-actions.md index 130dd42fc1ee..c0d591e31188 100644 --- a/translations/zh-CN/content/actions/learn-github-actions/workflow-syntax-for-github-actions.md +++ b/translations/zh-CN/content/actions/learn-github-actions/workflow-syntax-for-github-actions.md @@ -294,6 +294,10 @@ A boolean specifying whether the secret must be supplied. When using the `workflow_dispatch` event, you can optionally specify inputs that are passed to the workflow. +The triggered workflow receives the inputs in the `github.event.inputs` context. For more information, see "[Contexts](/actions/learn-github-actions/contexts#github-context)." + +### Example +{% raw %} ```yaml on: workflow_dispatch: @@ -315,9 +319,16 @@ on: description: 'Environment to run tests against' type: environment required: true {% endif %} -``` + +jobs: + print-tag: + runs-on: ubuntu-latest -The triggered workflow receives the inputs in the `github.event.inputs` context. For more information, see "[Contexts](/actions/learn-github-actions/contexts#github-context)." + steps: + - name: Print the input tag to STDOUT + run: echo The tag is ${{ github.event.inputs.tag }} +``` +{% endraw %} ## `on.schedule` diff --git a/translations/zh-CN/content/admin/authentication/authenticating-users-for-your-github-enterprise-server-instance/using-ldap.md b/translations/zh-CN/content/admin/authentication/authenticating-users-for-your-github-enterprise-server-instance/using-ldap.md index f0d346b94200..a7d55a8a1686 100644 --- a/translations/zh-CN/content/admin/authentication/authenticating-users-for-your-github-enterprise-server-instance/using-ldap.md +++ b/translations/zh-CN/content/admin/authentication/authenticating-users-for-your-github-enterprise-server-instance/using-ldap.md @@ -1,5 +1,5 @@ --- -title: 使用 LDAP +title: Using LDAP redirect_from: - /enterprise/admin/articles/configuring-ldap-authentication/ - /enterprise/admin/articles/about-ldap-authentication/ @@ -9,7 +9,7 @@ redirect_from: - /enterprise/admin/user-management/using-ldap - /enterprise/admin/authentication/using-ldap - /admin/authentication/using-ldap -intro: '使用 LDAP，您可以向 {% data variables.product.prodname_ghe_server %} 验证现有帐户的身份和集中管理仓库权限。 LDAP 是一种用于访问和维护目录信息服务的流行应用程序协议，是将第三方软件与大型公司用户目录相集成时使用的最常见协议之一。' +intro: 'LDAP lets you authenticate {% data variables.product.prodname_ghe_server %} against your existing accounts and centrally manage repository access. LDAP is a popular application protocol for accessing and maintaining directory information services, and is one of the most common protocols used to integrate third-party software with large company user directories.' versions: ghes: '*' type: how_to @@ -19,12 +19,11 @@ topics: - Enterprise - Identity --- - {% data reusables.enterprise_user_management.built-in-authentication %} -## 支持的 LDAP 服务 +## Supported LDAP services -{% data variables.product.prodname_ghe_server %} 可与下列 LDAP 服务集成： +{% data variables.product.prodname_ghe_server %} integrates with these LDAP services: * Active Directory * FreeIPA @@ -33,7 +32,7 @@ topics: * Open Directory * 389-ds -## 使用 LDAP 时的用户名考量因素 +## Username considerations with LDAP {% data reusables.enterprise_management_console.username_normalization %} @@ -42,150 +41,153 @@ topics: {% data reusables.enterprise_user_management.two_factor_auth_header %} {% data reusables.enterprise_user_management.2fa_is_available %} -## 在 {% data variables.product.product_location %} 上配置 LDAP +## Configuring LDAP with {% data variables.product.product_location %} -在您配置 LDAP 后，用户将能够使用他们的 LDAP 凭据登录您的实例。 在用户首次登录时，他们个人资料中的姓名、电子邮件地址和 SSH 密钥将使用您的目录中的 LDAP 属性进行设置。 +After you configure LDAP, users will be able to sign into your instance with their LDAP credentials. When users sign in for the first time, their profile names, email addresses, and SSH keys will be set with the LDAP attributes from your directory. -当您通过 {% data variables.enterprise.management_console %} 为用户配置 LDAP 访问权限时，在用户首次登录您的实例前，用户许可不可用。 但是，如果您使用站点管理员设置手动创建帐户，用户许可将立即可用。 +When you configure LDAP access for users via the {% data variables.enterprise.management_console %}, your user licenses aren't used until the first time a user signs in to your instance. However, if you create an account manually using site admin settings, the user license is immediately accounted for. {% warning %} -**警告**：在 {% data variables.product.product_location %} 上配置 LDAP 之前，请确保您的 LDAP 服务支持分页结果。 +**Warning:** Before configuring LDAP on {% data variables.product.product_location %}, make sure that your LDAP service supports paged results. {% endwarning %} {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.management-console %} {% data reusables.enterprise_management_console.authentication %} -3. 在“Authentication”下，选择 **LDAP**。 ![选择 LDAP](/assets/images/enterprise/management-console/ldap-select.png) -4. {% data reusables.enterprise_user_management.built-in-authentication-option %} ![选中 LDAP 内置身份验证复选框](/assets/images/enterprise/management-console/ldap-built-in-authentication.png) -5. 添加您的配置设置。 +3. Under "Authentication", select **LDAP**. +![LDAP select](/assets/images/enterprise/management-console/ldap-select.png) +4. {% data reusables.enterprise_user_management.built-in-authentication-option %} ![Select LDAP built-in authentication checkbox](/assets/images/enterprise/management-console/ldap-built-in-authentication.png) +5. Add your configuration settings. -## LDAP 属性 -使用以下属性完成 {% data variables.product.product_location %} 的 LDAP 配置。 +## LDAP attributes +Use these attributes to finish configuring LDAP for {% data variables.product.product_location %}. -| 属性名称 | 类型 | 描述 | -| ------------------------------------------------ | -- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `Host` | 必选 | LDAP 主机，例如 `ldap.example.com` 或 `10.0.0.30`。 如果主机名只能在您的内部网络中使用，您需要先配置 {% data variables.product.product_location %} 的 DNS，以便它可以使用您的内部域名服务器解析主机名。 | -| `端口` | 必选 | 主机的 LDAP 服务侦听的端口。 示例包括：389 和 636（适用于 LDAPS）。 | -| `Encryption` | 必选 | 用于确保与 LDAP 服务器之间的通信安全的加密方法。 示例包括明文（无加密）、SSL/LDAPS（从一开始就加密）和 StartTLS（在连接后升级为加密通信）。 | -| `Domain search user` | 可选 | 查找其他登录用户的 LDAP 用户，以允许身份验证。 这一般是一个专为第三方集成创建的服务帐户。 使用完全限定名称，例如 `cn=Administrator,cn=Users,dc=Example,dc=com`。 对于 Active Directory，您还可为域搜索用户使用 `[DOMAIN]\[USERNAME]` 语法（例如 `WINDOWS\Administrator`）。 | -| `Domain search password` | 可选 | 域搜索用户的密码。 | -| `Administrators group` | 可选 | 登录您的设备后，此组中的用户将被升级为站点管理员。 如果您不配置 LDAP 管理员组，则登录您的设备的第一个 LDAP 用户帐户将被自动升级为站点管理员。 | -| `Domain base` | 必选 | 您想要搜索用户和组的 LDAP 子树的完全限定 `Distinguished Name` (DN)。 您可以添加任意数量的组；不过，每个组和它所包含的用户都必须在相同的基础域中定义。 如果您指定受限的用户组，那么只有属于这些组的用户将在作用域内。 我们建议您将 LDAP 目录树的顶级指定为您的基础域，并使用受限的用户组来控制权限。 | -| `Restricted user groups` | 可选 | 如果指定，将仅允许这些组中的用户登录。 您只需要指定组的常用名 (CN)，您可以添加任意数量的组。 如果未指定组，则指定基础域作用域中的*所有*用户都将可以登录您的 {% data variables.product.prodname_ghe_server %} 实例。 | -| `User ID` | 必选 | 标识尝试身份验证的 LDAP 用户的 LDAP 属性。 建立映射后，用户可以更改他们的 {% data variables.product.prodname_ghe_server %} 用户名。 对于大多数 Active Directory 安装来说，此字段应为 `sAMAccountName`，但对其他 LDAP 解决方案（例如 OpenLDAP）来说，可能是 `uid`。 默认值为 `uid`。 | -| `Profile name` | 可选 | 将在用户的 {% data variables.product.prodname_ghe_server %} 个人资料页面上显示的姓名。 除非启用 LDAP 同步，否则用户可以更改他们的个人资料姓名。 | -| `Emails` | 可选 | 用户的 {% data variables.product.prodname_ghe_server %} 帐户的电子邮件地址。 | -| `SSH keys` | 可选 | 连接到用户的 {% data variables.product.prodname_ghe_server %} 帐户的 SSH 公钥。 密钥必须采用 OpenSSH 格式。 | -| `GPG keys` | 可选 | 连接到用户的 {% data variables.product.prodname_ghe_server %} 帐户的 GPG 密钥。 | -| `Disable LDAP authentication for Git operations` | 可选 | 如果选择，将[禁止](#disabling-password-authentication-for-git-operations)用户使用 LDAP 密码对 Git 操作进行身份验证。 | -| `Enable LDAP certificate verification` | 可选 | 如果选择，将[启用](#enabling-ldap-certificate-verification) LDAP 证书验证。 | -| `Synchronization` | 可选 | 如果选择，将[启用](#enabling-ldap-sync) LDAP 同步。 | +| Attribute name | Type | Description | +|--------------------------|----------|-------------| +| `Host` | Required | The LDAP host, e.g. `ldap.example.com` or `10.0.0.30`. If the hostname is only available from your internal network, you may need to configure {% data variables.product.product_location %}'s DNS first so it can resolve the hostname using your internal nameservers. | +| `Port` | Required | The port the host's LDAP services are listening on. Examples include: 389 and 636 (for LDAPS). | +| `Encryption` | Required | The encryption method used to secure communications to the LDAP server. Examples include plain (no encryption), SSL/LDAPS (encrypted from the start), and StartTLS (upgrade to encrypted communication once connected). | +| `Domain search user` | Optional | The LDAP user that looks up other users that sign in, to allow authentication. This is typically a service account created specifically for third-party integrations. Use a fully qualified name, such as `cn=Administrator,cn=Users,dc=Example,dc=com`. With Active Directory, you can also use the `[DOMAIN]\[USERNAME]` syntax (e.g. `WINDOWS\Administrator`) for the domain search user with Active Directory. | +| `Domain search password` | Optional | The password for the domain search user. | +| `Administrators group` | Optional | Users in this group are promoted to site administrators when signing into your appliance. If you don't configure an LDAP Administrators group, the first LDAP user account that signs into your appliance will be automatically promoted to a site administrator. | +| `Domain base` | Required | The fully qualified `Distinguished Name` (DN) of an LDAP subtree you want to search for users and groups. You can add as many as you like; however, each group must be defined in the same domain base as the users that belong to it. If you specify restricted user groups, only users that belong to those groups will be in scope. We recommend that you specify the top level of your LDAP directory tree as your domain base and use restricted user groups to control access. | +| `Restricted user groups` | Optional | If specified, only users in these groups will be allowed to log in. You only need to specify the common names (CNs) of the groups, and you can add as many groups as you like. If no groups are specified, *all* users within the scope of the specified domain base will be able to sign in to your {% data variables.product.prodname_ghe_server %} instance. | +| `User ID` | Required | The LDAP attribute that identifies the LDAP user who attempts authentication. Once a mapping is established, users may change their {% data variables.product.prodname_ghe_server %} usernames. This field should be `sAMAccountName` for most Active Directory installations, but it may be `uid` for other LDAP solutions, such as OpenLDAP. The default value is `uid`. | +| `Profile name` | Optional | The name that will appear on the user's {% data variables.product.prodname_ghe_server %} profile page. Unless LDAP Sync is enabled, users may change their profile names. | +| `Emails` | Optional | The email addresses for a user's {% data variables.product.prodname_ghe_server %} account. | +| `SSH keys` | Optional | The public SSH keys attached to a user's {% data variables.product.prodname_ghe_server %} account. The keys must be in OpenSSH format. | +| `GPG keys` | Optional | The GPG keys attached to a user's {% data variables.product.prodname_ghe_server %} account. | +| `Disable LDAP authentication for Git operations` | Optional |If selected, [turns off](#disabling-password-authentication-for-git-operations) users' ability to use LDAP passwords to authenticate Git operations. | +| `Enable LDAP certificate verification` | Optional |If selected, [turns on](#enabling-ldap-certificate-verification) LDAP certificate verification. | +| `Synchronization` | Optional |If selected, [turns on](#enabling-ldap-sync) LDAP Sync. | -### 为 Git 操作禁用密码身份验证 +### Disabling password authentication for Git operations -在您的 LDAP 设置中选择 **Disable username and password authentication for Git operations**，为 Git 权限强制使用个人访问令牌或 SSH 密钥，这样有助于防止您的服务器被 LDAP 身份验证请求过载。 我们建议使用此设置，因为响应慢的 LDAP 服务器是性能问题和故障的常见来源，尤其是在遇到轮询导致的大量请求时。 +Select **Disable username and password authentication for Git operations** in your LDAP settings to enforce use of personal access tokens or SSH keys for Git access, which can help prevent your server from being overloaded by LDAP authentication requests. We recommend this setting because a slow-responding LDAP server, especially combined with a large number of requests due to polling, is a frequent source of performance issues and outages. -![为 Git 禁用 LDAP 密码身份验证的复选框](/assets/images/enterprise/management-console/ldap-disable-password-auth-for-git.png) +![Disable LDAP password auth for Git check box](/assets/images/enterprise/management-console/ldap-disable-password-auth-for-git.png) -选择此选项时，如果用户通过命令行尝试为 Git 操作使用密码，他们将收到一条错误消息，内容为 `Password authentication is not allowed for Git operations. You must use a personal access token.` +When this option is selected, if a user tries to use a password for Git operations via the command line, they will receive an error message that says, `Password authentication is not allowed for Git operations. You must use a personal access token.` -### 启用 LDAP 证书验证 +### Enabling LDAP certificate verification -在您的 LDAP 设置中选择 **Enable LDAP certificate verification**，验证您用于 TLS 的 LDAP 服务器证书。 +Select **Enable LDAP certificate verification** in your LDAP settings to validate the LDAP server certificate you use with TLS. -![LDAP 证书验证复选框](/assets/images/enterprise/management-console/ldap-enable-certificate-verification.png) +![LDAP certificate verification box](/assets/images/enterprise/management-console/ldap-enable-certificate-verification.png) -选择此选项时，将对证书进行验证，以确保： -- 如果证书至少包含一个使用者可选名称 (SAN)，则其中的一个 SAN 将匹配 LDAP 主机名。 否则，常用名 (CN) 将匹配 LDAP 主机名。 -- 证书不会过期。 -- 证书由受信任的证书颁发机构 (CA) 签名。 +When this option is selected, the certificate is validated to make sure: +- If the certificate contains at least one Subject Alternative Name (SAN), one of the SANs matches the LDAP hostname. Otherwise, the Common Name (CN) matches the LDAP hostname. +- The certificate is not expired. +- The certificate is signed by a trusted certificate authority (CA). -### 启用 LDAP 同步 +### Enabling LDAP Sync {% note %} -要启用 LDAP 同步，请在您的 LDAP 设置中选择 **Synchronize Emails（同步电子邮件）**、**Synchronize SSH Keys（同步 SSH 密钥）**或 **Synchronize GPG Keys（同步 GPG 密钥）**。 +**Note:** Teams using LDAP Sync are limited to a maximum 1499 members. {% endnote %} -借助 LDAP 同步，您可以将 {% data variables.product.prodname_ghe_server %} 用户和团队成员关系与建立的 LDAP 组同步。 这样，您可以在 LDAP 服务器中为用户建立基于角色的权限控制，而不用在 {% data variables.product.prodname_ghe_server %} 中手动建立。 更多信息请参阅“[创建团队](/enterprise/{{ currentVersion }}/admin/guides/user-management/creating-teams#creating-teams-with-ldap-sync-enabled)”。 +LDAP Sync lets you synchronize {% data variables.product.prodname_ghe_server %} users and team membership against your established LDAP groups. This lets you establish role-based access control for users from your LDAP server instead of manually within {% data variables.product.prodname_ghe_server %}. For more information, see "[Creating teams](/enterprise/{{ currentVersion }}/admin/guides/user-management/creating-teams#creating-teams-with-ldap-sync-enabled)." -要启用 LDAP 同步，请在您的 LDAP 设置中选择 **Synchronize Emails（同步电子邮件）**、**Synchronize SSH Keys（同步 SSH 密钥）**或 **Synchronize GPG Keys（同步 GPG 密钥）**。 +To enable LDAP Sync, in your LDAP settings, select **Synchronize Emails**, **Synchronize SSH Keys**, or **Synchronize GPG Keys** . -![Synchronization 复选框](/assets/images/enterprise/management-console/ldap-synchronize.png) +![Synchronization check box](/assets/images/enterprise/management-console/ldap-synchronize.png) -启用 LDAP 同步后，某个同步作业将以指定的时间间隔运行，在每个用户帐户上执行以下操作： +After you enable LDAP sync, a synchronization job will run at the specified time interval to perform the following operations on each user account: -- 如果您已允许对您的身份提供程序覆盖范围以外的用户进行内置身份验证，并且该用户使用内置身份验证，请前进到下一个用户。 -- 如果用户没有 LDAP 映射，请尝试将用户映射到目录中的 LDAP 条目。 如果用户无法映射到 LDAP 条目，请挂起该用户并前进到下一个用户。 -- 如果存在 LDAP 映射但目录中相应的 LDAP 条目缺失，请挂起该用户并前进到下一个用户。 -- 如果相应的 LDAP 条目已被标记为禁用并且该用户尚未被挂起，请挂起该用户并前进到下一个用户。 -- 如果相应的 LDAP 条目未被标记为禁用，用户已被挂起，并且已在 Admin Center 中启用 _Reactivate suspended users_，请取消挂起该用户。 -- 如果相应的 LDAP 条目包括 `name` 属性，请更新用户的个人资料姓名。 -- 如果相应的 LDAP 条目位于管理员组中，请将该用户升级为站点管理员。 -- 如果相应的 LDAP 条目不位于管理员组中，请将该用户降级为普通帐户。 -- 如果为电子邮件定义了一个 LDAP 用户字段，请将该用户的电子邮件设置与 LDAP 条目同步。 将第一个 LDAP `mail` 条目设为主电子邮件。 -- 如果为 SSH 公钥定义了一个 LDAP 用户字段，请将该用户的 SSH 公钥与 LDAP 条目同步。 -- 如果为 GPG 密钥定义了一个 LDAP 用户字段，请将该用户的 GPG 密钥与 LDAP 条目同步。 +- If you've allowed built-in authentication for users outside your identity provider, and the user is using built-in authentication, move on to the next user. +- If no LDAP mapping exists for the user, try to map the user to an LDAP entry in the directory. If the user cannot be mapped to an LDAP entry, suspend the user and move on to the next user. +- If there is an LDAP mapping and the corresponding LDAP entry in the directory is missing, suspend the user and move on to the next user. +- If the corresponding LDAP entry has been marked as disabled and the user is not already suspended, suspend the user and move on to the next user. +- If the corresponding LDAP entry is not marked as disabled, and the user is suspended, and _Reactivate suspended users_ is enabled in the Admin Center, unsuspend the user. +- If the corresponding LDAP entry includes a `name` attribute, update the user's profile name. +- If the corresponding LDAP entry is in the Administrators group, promote the user to site administrator. +- If the corresponding LDAP entry is not in the Administrators group, demote the user to a normal account. +- If an LDAP User field is defined for emails, synchronize the user's email settings with the LDAP entry. Set the first LDAP `mail` entry as the primary email. +- If an LDAP User field is defined for SSH public keys, synchronize the user's public SSH keys with the LDAP entry. +- If an LDAP User field is defined for GPG keys, synchronize the user's GPG keys with the LDAP entry. {% note %} -**注**：只有您使用 Active Directory，`userAccountControl` 属性显示并使用 `ACCOUNTDISABLE` 标记时，才可以将 LDAP 条目标记为禁用。 +**Note**: LDAP entries can only be marked as disabled if you use Active Directory and the `userAccountControl` attribute is present and flagged with `ACCOUNTDISABLE`. Some variations of Active Directory, such as AD LDS and ADAM, don't support the `userAccountControl` attribute. {% endnote %} -某个同步作业也将以指定的时间间隔运行，在已经映射到 LDAP 组的每个团队上执行以下操作： +A synchronization job will also run at the specified time interval to perform the following operations on each team that has been mapped to an LDAP group: -- 如果已移除团队的相应 LDAP 组，请移除团队中的所有成员。 -- 如果已从 LDAP 组中移除 LDAP 成员条目，请从团队中移除相应的用户。 If the user is no longer a member of any team in the organization, remove the user from the organization. 如果用户因此失去了任何仓库的访问权限，请删除用户在这些仓库中的任何私有分叉。 -- 如果已向 LDAP 组中添加 LDAP 成员条目，请将相应的用户添加到团队中。 如果用户因此重新获得了任何仓库的访问权限，请恢复过去 90 天内因为用户失去访问权限而被删除的仓库中的任何私有分叉。 +- If a team's corresponding LDAP group has been removed, remove all members from the team. +- If LDAP member entries have been removed from the LDAP group, remove the corresponding users from the team. If the user is no longer a member of any team in the organization, remove the user from the organization. If the user loses access to any repositories as a result, delete any private forks the user has of those repositories. +- If LDAP member entries have been added to the LDAP group, add the corresponding users to the team. If the user regains access to any repositories as a result, restore any private forks of the repositories that were deleted because the user lost access in the past 90 days. {% data reusables.enterprise_user_management.ldap-sync-nested-teams %} {% warning %} -**安全警告：** +**Security Warning:** -启用 LDAP 同步后，站点管理员和组织所有者可以搜索要映射团队的目标组的 LDAP 目录。 +When LDAP Sync is enabled, site admins and organization owners can search the LDAP directory for groups to map the team to. -这样有可能将敏感的组织信息披露给合同工或其他没有权限的用户，包括： +This has the potential to disclose sensitive organizational information to contractors or other unprivileged users, including: -- 对*域搜索用户*可见的特定 LDAP 组的存在性。 -- 具有 {% data variables.product.prodname_ghe_server %} 用户帐户的 LDAP 组的成员，如果创建与该 LDAP 组同步的团队，此信息将被披露。 +- The existence of specific LDAP Groups visible to the *Domain search user*. +- Members of the LDAP group who have {% data variables.product.prodname_ghe_server %} user accounts, which is disclosed when creating a team synced with that LDAP group. -如果不需要披露此类信息，您的公司或组织应在管理员控制台中限制配置的*域搜索用户*的权限。 如果无法进行此类限制，请联系 {% data variables.contact.contact_ent_support %}。 +If disclosing such information is not desired, your company or organization should restrict the permissions of the configured *Domain search user* in the admin console. If such restriction isn't possible, contact {% data variables.contact.contact_ent_support %}. {% endwarning %} -### 支持的 LDAP 组对象类 +### Supported LDAP group object classes -{% data variables.product.prodname_ghe_server %} 支持下列 LDAP 组对象类。 可以嵌套组。 +{% data variables.product.prodname_ghe_server %} supports these LDAP group object classes. Groups can be nested. -- `组` +- `group` - `groupOfNames` - `groupOfUniqueNames` - `posixGroup` -## 查看和创建 LDAP 用户 +## Viewing and creating LDAP users -您可以查看具有您的实例访问权限的 LDAP 用户的完整列表和配置新用户。 +You can view the full list of LDAP users who have access to your instance and provision new users. {% data reusables.enterprise_site_admin_settings.sign-in %} {% data reusables.enterprise_site_admin_settings.access-settings %} -3. 在左侧边栏中，单击 **LDAP users**。 ![LDAP users 选项卡](/assets/images/enterprise/site-admin-settings/ldap-users-tab.png) -4. 要搜索用户，请输入完整或部分用户名，然后单击 **Search**。 现有用户将显示在搜索结果中。 如果用户不存在，请单击 **Create** 以配置新用户帐户。 ![LDAP 搜索](/assets/images/enterprise/site-admin-settings/ldap-users-search.png) +3. In the left sidebar, click **LDAP users**. +![LDAP users tab](/assets/images/enterprise/site-admin-settings/ldap-users-tab.png) +4. To search for a user, type a full or partial username and click **Search**. Existing users will be displayed in search results. If a user doesn’t exist, click **Create** to provision the new user account. +![LDAP search](/assets/images/enterprise/site-admin-settings/ldap-users-search.png) -## 更新 LDAP 帐户 +## Updating LDAP accounts -除非[启用 LDAP 同步](#enabling-ldap-sync)，否则 LDAP 帐户的变更将不会自动与 {% data variables.product.prodname_ghe_server %} 同步。 +Unless [LDAP Sync is enabled](#enabling-ldap-sync), changes to LDAP accounts are not automatically synchronized with {% data variables.product.prodname_ghe_server %}. -* 要使用新的 LDAP 管理员组，必须在 {% data variables.product.prodname_ghe_server %} 上手动升级和降级用户，以反映 LDAP 中的变更。 -* 要在 LDAP 管理员组中添加或移除 LDAP 帐户，请[在 {% data variables.product.prodname_ghe_server %} 上升级或降级帐户](/enterprise/{{ currentVersion }}/admin/guides/user-management/promoting-or-demoting-a-site-administrator)。 -* 要移除 LDAP 帐户，请[挂起 {% data variables.product.prodname_ghe_server %} 帐户](/enterprise/{{ currentVersion }}/admin/guides/user-management/suspending-and-unsuspending-users)。 +* To use a new LDAP admin group, users must be manually promoted and demoted on {% data variables.product.prodname_ghe_server %} to reflect changes in LDAP. +* To add or remove LDAP accounts in LDAP admin groups, [promote or demote the accounts on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/guides/user-management/promoting-or-demoting-a-site-administrator). +* To remove LDAP accounts, [suspend the {% data variables.product.prodname_ghe_server %} accounts](/enterprise/{{ currentVersion }}/admin/guides/user-management/suspending-and-unsuspending-users). -### 手动同步 LDAP 帐户 +### Manually syncing LDAP accounts {% data reusables.enterprise_site_admin_settings.sign-in %} {% data reusables.enterprise_site_admin_settings.access-settings %} @@ -193,12 +195,13 @@ topics: {% data reusables.enterprise_site_admin_settings.click-user %} {% data reusables.enterprise_site_admin_settings.admin-top-tab %} {% data reusables.enterprise_site_admin_settings.admin-tab %} -5. 在“LDAP”下，单击 **Sync now**，使用您的 LDAP 服务器中的数据手动更新帐户。 ![LDAP Sync now 按钮](/assets/images/enterprise/site-admin-settings/ldap-sync-now-button.png) +5. Under "LDAP," click **Sync now** to manually update the account with data from your LDAP server. +![LDAP sync now button](/assets/images/enterprise/site-admin-settings/ldap-sync-now-button.png) -您也可以[使用 API 触发手动同步](/enterprise/{{ currentVersion }}/user/rest/reference/enterprise-admin#ldap)。 +You can also [use the API to trigger a manual sync](/enterprise/{{ currentVersion }}/user/rest/reference/enterprise-admin#ldap). -## 撤销 {% data variables.product.product_location %} 的权限 +## Revoking access to {% data variables.product.product_location %} -如果[启用 LDAP 同步](#enabling-ldap-sync)，移除用户的 LDAP 凭据将在下一次同步操作后挂起他们的帐户。 +If [LDAP Sync is enabled](#enabling-ldap-sync), removing a user's LDAP credentials will suspend their account after the next synchronization run. -如果**未**启用 LDAP 同步，您必须在移除 LDAP 凭据后手动挂起 {% data variables.product.prodname_ghe_server %} 帐户。 更多信息请参阅“[挂起和取消挂起用户](/enterprise/{{ currentVersion }}/admin/guides/user-management/suspending-and-unsuspending-users)”。 +If LDAP Sync is **not** enabled, you must manually suspend the {% data variables.product.prodname_ghe_server %} account after you remove the LDAP credentials. For more information, see "[Suspending and unsuspending users](/enterprise/{{ currentVersion }}/admin/guides/user-management/suspending-and-unsuspending-users)". diff --git a/translations/zh-CN/content/admin/configuration/configuring-network-settings/using-github-enterprise-server-with-a-load-balancer.md b/translations/zh-CN/content/admin/configuration/configuring-network-settings/using-github-enterprise-server-with-a-load-balancer.md index f0a36f793f66..8f8fdadc5aec 100644 --- a/translations/zh-CN/content/admin/configuration/configuring-network-settings/using-github-enterprise-server-with-a-load-balancer.md +++ b/translations/zh-CN/content/admin/configuration/configuring-network-settings/using-github-enterprise-server-with-a-load-balancer.md @@ -1,6 +1,6 @@ --- -title: 结合使用 GitHub Enterprise Server 和负载均衡器 -intro: '在单个 {% data variables.product.prodname_ghe_server %} 设备或一对采用高可用性配置的设备前方使用负载均衡器。' +title: Using GitHub Enterprise Server with a load balancer +intro: 'Use a load balancer in front of a single {% data variables.product.prodname_ghe_server %} appliance or a pair of appliances in a High Availability configuration.' redirect_from: - /enterprise/admin/guides/installation/using-github-enterprise-with-a-load-balancer/ - /enterprise/admin/installation/using-github-enterprise-server-with-a-load-balancer @@ -14,34 +14,39 @@ topics: - High availability - Infrastructure - Networking -shortTitle: 使用负载平衡器 +shortTitle: Use a load balancer --- +## About load balancers + {% data reusables.enterprise_clustering.load_balancer_intro %} {% data reusables.enterprise_clustering.load_balancer_dns %} -## 处理客户端连接信息 +## Handling client connection information -由于与 {% data variables.product.prodname_ghe_server %} 的客户端连接来自负载均衡器，因此客户端 IP 可丢失。 +Because client connections to {% data variables.product.prodname_ghe_server %} come from the load balancer, the client IP address can be lost. {% data reusables.enterprise_clustering.proxy_preference %} {% data reusables.enterprise_clustering.proxy_xff_firewall_warning %} -### 在 {% data variables.product.product_location %} 上启用 PROXY 协议支持 +### Enabling PROXY protocol support on {% data variables.product.product_location %} + +We strongly recommend enabling PROXY protocol support for both your appliance and the load balancer. Use the instructions provided by your vendor to enable the PROXY protocol on your load balancer. For more information, see [the PROXY protocol documentation](http://www.haproxy.org/download/1.8/doc/proxy-protocol.txt). -强烈建议同时为您的设备和负载均衡器启用 PROXY 协议支持。 按照您的供应商提供的说明操作，在负载均衡器上启用 PROXY 协议。 更多信息请参阅 [PROXY 协议文档](http://www.haproxy.org/download/1.8/doc/proxy-protocol.txt)。 +{% data reusables.enterprise_installation.proxy-incompatible-with-aws-nlbs %} {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.management-console %} {% data reusables.enterprise_management_console.privacy %} -3. 在 **External load balancers** 下，选择 **Enable support for PROXY protocol**。 ![启用 PROXY 协议支持的复选框](/assets/images/enterprise/management-console/enable-proxy.png) +3. Under **External load balancers**, select **Enable support for PROXY protocol**. +![Checkbox to enable support for PROXY protocol](/assets/images/enterprise/management-console/enable-proxy.png) {% data reusables.enterprise_management_console.save-settings %} {% data reusables.enterprise_clustering.proxy_protocol_ports %} -### 在 {% data variables.product.product_location %} 上启用 X-Forwarded-For 支持 +### Enabling X-Forwarded-For support on {% data variables.product.product_location %} {% data reusables.enterprise_clustering.x-forwarded-for %} @@ -50,14 +55,15 @@ shortTitle: 使用负载平衡器 {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.management-console %} {% data reusables.enterprise_management_console.privacy %} -3. 在 **External load balancers** 下，选择 **Allow HTTP X-Forwarded-For header**。 ![允许 HTTP X-Forwarded-For 标头的复选框](/assets/images/enterprise/management-console/allow-xff.png) +3. Under **External load balancers**, select **Allow HTTP X-Forwarded-For header**. +![Checkbox to allow the HTTP X-Forwarded-For header](/assets/images/enterprise/management-console/allow-xff.png) {% data reusables.enterprise_management_console.save-settings %} {% data reusables.enterprise_clustering.without_proxy_protocol_ports %} -## 配置健康状态检查 +## Configuring health checks -如果预配置的检查在该节点上失败，则状态检查允许负载均衡器停止向未响应的节点发送流量。 如果设备因维护或计划外的故障而离线，负载均衡器可以显示状态页面。 在高可用性 (HA) 配置下，负载均衡器可用作故障转移策略的组成部分。 不过，不支持 HA 对的自动故障转移。 在副本设备开始为请求提供服务之前，您必须手动升级副本设备。 更多信息请参阅“[配置 {% data variables.product.prodname_ghe_server %} 以实现高可用性](/enterprise/{{ currentVersion }}/admin/guides/installation/configuring-github-enterprise-server-for-high-availability/)”。 +Health checks allow a load balancer to stop sending traffic to a node that is not responding if a pre-configured check fails on that node. If the appliance is offline due to maintenance or unexpected failure, the load balancer can display a status page. In a High Availability (HA) configuration, a load balancer can be used as part of a failover strategy. However, automatic failover of HA pairs is not supported. You must manually promote the replica appliance before it will begin serving requests. For more information, see "[Configuring {% data variables.product.prodname_ghe_server %} for High Availability](/enterprise/{{ currentVersion }}/admin/guides/installation/configuring-github-enterprise-server-for-high-availability/)." {% data reusables.enterprise_clustering.health_checks %} {% data reusables.enterprise_site_admin_settings.maintenance-mode-status %} diff --git a/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/index.md b/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/index.md index d92f270477d7..aa921c6d4552 100644 --- a/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/index.md +++ b/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/index.md @@ -23,7 +23,7 @@ children: - /configuring-backups-on-your-appliance - /site-admin-dashboard - /enabling-private-mode - - /managing-github-for-mobile-for-your-enterprise + - /managing-github-mobile-for-your-enterprise - /configuring-email-for-notifications - /verifying-or-approving-a-domain-for-your-enterprise - /configuring-rate-limits diff --git a/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/managing-github-mobile-for-your-enterprise.md b/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/managing-github-mobile-for-your-enterprise.md new file mode 100644 index 000000000000..a21010bcdc51 --- /dev/null +++ b/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/managing-github-mobile-for-your-enterprise.md @@ -0,0 +1,35 @@ +--- +title: Managing GitHub Mobile for your enterprise +intro: 'You can decide whether authenticated users can connect to {% data variables.product.product_location %} with {% data variables.product.prodname_mobile %}.' +permissions: 'Enterprise owners can manage {% data variables.product.prodname_mobile %} for an enterprise on {% data variables.product.product_name %}.' +versions: + ghes: '*' +type: how_to +topics: + - Enterprise + - Mobile +redirect_from: + - /admin/configuration/configuring-your-enterprise/managing-github-for-mobile-for-your-enterprise + - /admin/configuration/managing-github-for-mobile-for-your-enterprise +shortTitle: 'Manage GitHub Mobile' +--- +{% ifversion ghes %} +{% data reusables.mobile.ghes-release-phase %} +{% endif %} + +## About {% data variables.product.prodname_mobile %} + +{% data reusables.mobile.about-mobile %} For more information, see "[{% data variables.product.prodname_mobile %}](/get-started/using-github/github-mobile)." + +Members of your enterprise can use {% data variables.product.prodname_mobile %} to triage, collaborate, and manage work on {% data variables.product.product_location %} from a mobile device. By default, {% data variables.product.prodname_mobile %} is enabled for {% data variables.product.product_location %}. You can allow or disallow enterprise members from using {% data variables.product.prodname_mobile %} to authenticate to {% data variables.product.product_location %} and access your enterprise's data. + +## Enabling or disabling {% data variables.product.prodname_mobile %} + +{% data reusables.enterprise_site_admin_settings.access-settings %} +{% data reusables.enterprise_site_admin_settings.management-console %} +{% data reusables.enterprise_management_console.type-management-console-password %} +1. In the left sidebar, click **Mobile**. + !["Mobile" in the left sidebar for the {% data variables.product.prodname_ghe_server %} management console](/assets/images/enterprise/management-console/click-mobile.png) +1. Under "GitHub Mobile", select or deselect **Enable GitHub Mobile Apps**. + ![Checkbox for "Enable GitHub Mobile Apps" in the {% data variables.product.prodname_ghe_server %} management console](/assets/images/enterprise/management-console/select-enable-github-mobile-apps.png) +{% data reusables.enterprise_management_console.save-settings %} diff --git a/translations/zh-CN/content/admin/enterprise-management/configuring-clustering/cluster-network-configuration.md b/translations/zh-CN/content/admin/enterprise-management/configuring-clustering/cluster-network-configuration.md index 90657117aa77..9ae58ffd1926 100644 --- a/translations/zh-CN/content/admin/enterprise-management/configuring-clustering/cluster-network-configuration.md +++ b/translations/zh-CN/content/admin/enterprise-management/configuring-clustering/cluster-network-configuration.md @@ -1,6 +1,6 @@ --- -title: 群集网络配置 -intro: '{% data variables.product.prodname_ghe_server %} 集群依靠正确的 DNS 名称解析、负载均衡以及节点之间的通信来正常运行。' +title: Cluster network configuration +intro: '{% data variables.product.prodname_ghe_server %} clustering relies on proper DNS name resolution, load balancing, and communication between nodes to operate properly.' redirect_from: - /enterprise/admin/clustering/cluster-network-configuration - /enterprise/admin/enterprise-management/cluster-network-configuration @@ -13,106 +13,107 @@ topics: - Enterprise - Infrastructure - Networking -shortTitle: 配置集群网络 +shortTitle: Configure a cluster network --- - -## 网络考虑因素 - -对于集群而言，最简单的网络设计是将节点置于单个 LAN 上。 如果群集必须跨子网，我们不建议在网络之间配置任何防火墙规则。 节点之间的延迟应小于 1 毫秒。 - -{% ifversion ghes %}为获取高可用性，具有主动节点的网络与具有被动节点的网络之间的延迟必须小于 70 毫秒。 我们不建议在两个网络之间配置防火墙。{% endif %} - -### 最终用户的应用程序端口 - -应用程序端口为最终用户提供 Web 应用程序和 Git 访问。 - -| 端口 | 描述 | 加密 | -|:-------- |:-------------------------------- |:----------------------------------- | -| 22/TCP | 通过 SSH 访问 Git | 是 | -| 25/TCP | SMTP | 需要 STARTTLS | -| 80/TCP | HTTP | 否
（启用 SSL 时，此端口重定向到 HTTPS） | -| 443/TCP | HTTPS | 是 | -| 9418/TCP | 简单的 Git 协议端口
（在私有模式下禁用） | 否 | - -### 管理端口 - -最终用户在使用基本应用程序时不需要管理端口。 - -| 端口 | 描述 | 加密 | -|:-------- |:------------------------ |:----------------------------------- | -| ICMP | ICMP Ping | 否 | -| 122/TCP | 管理 SSH | 是 | -| 161/UDP | SNMP | 否 | -| 8080/TCP | Management Console HTTP | 否
（启用 SSL 时，此端口重定向到 HTTPS） | -| 8443/TCP | Management Console HTTPS | 是 | - -### 集群通信端口 - -如果节点之间存在网络级防火墙，则需要访问这些端口。 节点之间的通信未加密。 这些端口不应从外部访问。 - -| 端口 | 描述 | -|:--------- |:-------------- | -| 1336/TCP | 内部 API | -| 3033/TCP | 内部 SVN 访问 | -| 3037/TCP | 内部 SVN 访问 | -| 3306/TCP | MySQL | -| 4486/TCP | 管理者访问 | -| 5115/TCP | 存储后端 | -| 5208/TCP | 内部 SVN 访问 | -| 6379/TCP | Redis | -| 8001/TCP | Grafana | -| 8090/TCP | 内部 GPG 访问 | -| 8149/TCP | GitRPC 文件服务器访问 | -| 8300/TCP | Consul | -| 8301/TCP | Consul | -| 8302/TCP | Consul | -| 9000/TCP | Git Daemon | -| 9102/TCP | 页面文件服务器 | -| 9105/TCP | LFS 服务器 | -| 9200/TCP | Elasticsearch | -| 9203/TCP | 语义代码服务 | -| 9300/TCP | Elasticsearch | -| 11211/TCP | Memcache | -| 161/UDP | SNMP | -| 8125/UDP | Statsd | -| 8301/UDP | Consul | -| 8302/UDP | Consul | -| 25827/UDP | Collectd | - -## 配置负载均衡器 - - 我们建议使用基于 TCP 的外部负载均衡器，它支持 PROXY 协议来跨节点分配流量。 请考虑以下负载均衡器配置： - - - 应将 TCP 端口（如下所示）转发到运行 `web-server` 服务的节点。 这些是提供外部客户端请求的唯一节点。 - - 不应启用粘性会话。 +## Network considerations + +The simplest network design for clustering is to place the nodes on a single LAN. If a cluster must span subnetworks, we do not recommend configuring any firewall rules between the networks. The latency between nodes should be less than 1 millisecond. + +{% ifversion ghes %}For high availability, the latency between the network with the active nodes and the network with the passive nodes must be less than 70 milliseconds. We don't recommend configuring a firewall between the two networks.{% endif %} + +### Application ports for end users + +Application ports provide web application and Git access for end users. + +| Port | Description | Encrypted | +| :------------- | :------------- | :------------- | +| 22/TCP | Git over SSH | Yes | +| 25/TCP | SMTP | Requires STARTTLS | +| 80/TCP | HTTP | No
(When SSL is enabled this port redirects to HTTPS) | +| 443/TCP | HTTPS | Yes | +| 9418/TCP | Simple Git protocol port
(Disabled in private mode) | No | + +### Administrative ports + +Administrative ports are not required for basic application use by end users. + +| Port | Description | Encrypted | +| :------------- | :------------- | :------------- | +| ICMP | ICMP Ping | No | +| 122/TCP | Administrative SSH | Yes | +| 161/UDP | SNMP | No | +| 8080/TCP | Management Console HTTP | No
(When SSL is enabled this port redirects to HTTPS) | +| 8443/TCP | Management Console HTTPS | Yes | + +### Cluster communication ports + +If a network level firewall is in place between nodes, these ports will need to be accessible. The communication between nodes is not encrypted. These ports should not be accessible externally. + +| Port | Description | +| :------------- | :------------- | +| 1336/TCP | Internal API | +| 3033/TCP | Internal SVN access | +| 3037/TCP | Internal SVN access | +| 3306/TCP | MySQL | +| 4486/TCP | Governor access | +| 5115/TCP | Storage backend | +| 5208/TCP | Internal SVN access | +| 6379/TCP | Redis | +| 8001/TCP | Grafana | +| 8090/TCP | Internal GPG access | +| 8149/TCP | GitRPC file server access | +| 8300/TCP | Consul | +| 8301/TCP | Consul | +| 8302/TCP | Consul | +| 9000/TCP | Git Daemon | +| 9102/TCP | Pages file server | +| 9105/TCP | LFS server | +| 9200/TCP | Elasticsearch | +| 9203/TCP | Semantic code service | +| 9300/TCP | Elasticsearch | +| 11211/TCP | Memcache | +| 161/UDP | SNMP | +| 8125/UDP | Statsd | +| 8301/UDP | Consul | +| 8302/UDP | Consul | +| 25827/UDP | Collectd | + +## Configuring a load balancer + + We recommend an external TCP-based load balancer that supports the PROXY protocol to distribute traffic across nodes. Consider these load balancer configurations: + + - TCP ports (shown below) should be forwarded to nodes running the `web-server` service. These are the only nodes that serve external client requests. + - Sticky sessions shouldn't be enabled. {% data reusables.enterprise_installation.terminating-tls %} -## 处理客户端连接信息 +## Handling client connection information -由于客户端与集群的连接来自负载均衡器，因此客户端 IP 地址可能会丢失。 要正确捕获客户端连接信息，需要考虑其他因素。 +Because client connections to the cluster come from the load balancer, the client IP address can be lost. To properly capture the client connection information, additional consideration is required. {% data reusables.enterprise_clustering.proxy_preference %} {% data reusables.enterprise_clustering.proxy_xff_firewall_warning %} -### 在 {% data variables.product.prodname_ghe_server %} 上启用 PROXY 支持 +### Enabling PROXY support on {% data variables.product.prodname_ghe_server %} + +We strongly recommend enabling PROXY support for both your instance and the load balancer. -我们强烈建议您为实例和负载均衡器启用 PROXY 支持。 +{% data reusables.enterprise_installation.proxy-incompatible-with-aws-nlbs %} - - 对于您的实例，请使用以下命令： + - For your instance, use this command: ```shell $ ghe-config 'loadbalancer.proxy-protocol' 'true' && ghe-cluster-config-apply ``` - - 对于负载均衡器，请使用供应商提供的说明。 + - For the load balancer, use the instructions provided by your vendor. {% data reusables.enterprise_clustering.proxy_protocol_ports %} -### 在 {% data variables.product.prodname_ghe_server %} 上启用 X-Forwarded-For 支持 +### Enabling X-Forwarded-For support on {% data variables.product.prodname_ghe_server %} {% data reusables.enterprise_clustering.x-forwarded-for %} -要启用 `X-Forwarded-For` 标头，请使用以下命令： +To enable the `X-Forwarded-For` header, use this command: ```shell $ ghe-config 'loadbalancer.http-forward' 'true' && ghe-cluster-config-apply @@ -120,12 +121,12 @@ $ ghe-config 'loadbalancer.http-forward' 'true' && ghe-cluster-config-apply {% data reusables.enterprise_clustering.without_proxy_protocol_ports %} -### 配置状态检查 -如果预配置的检查在该节点上失败，则状态检查允许负载均衡器停止向未响应的节点发送流量。 如果集群节点出现故障，则与冗余节点配对的状态检查可提供高可用性。 +### Configuring Health Checks +Health checks allow a load balancer to stop sending traffic to a node that is not responding if a pre-configured check fails on that node. If a cluster node fails, health checks paired with redundant nodes provides high availability. {% data reusables.enterprise_clustering.health_checks %} {% data reusables.enterprise_site_admin_settings.maintenance-mode-status %} -## DNS 要求 +## DNS Requirements {% data reusables.enterprise_clustering.load_balancer_dns %} diff --git a/translations/zh-CN/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/increasing-storage-capacity.md b/translations/zh-CN/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/increasing-storage-capacity.md index b788c0f9a2a6..b17df486d068 100644 --- a/translations/zh-CN/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/increasing-storage-capacity.md +++ b/translations/zh-CN/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/increasing-storage-capacity.md @@ -1,6 +1,6 @@ --- -title: 增加存储容量 -intro: 您可以增加或更改可供 Git 仓库、数据库、搜索索引和其他持久应用程序数据使用的存储容量。 +title: Increasing storage capacity +intro: 'You can increase or change the amount of storage available for Git repositories, databases, search indexes, and other persistent application data.' redirect_from: - /enterprise/admin/installation/increasing-storage-capacity - /enterprise/admin/enterprise-management/increasing-storage-capacity @@ -13,73 +13,80 @@ topics: - Infrastructure - Performance - Storage -shortTitle: 增加存储容量 +shortTitle: Increase storage capacity --- - {% data reusables.enterprise_installation.warning-on-upgrading-physical-resources %} -随着更多的用户加入 {% data variables.product.product_location %}，您可能需要调整存储卷大小。 有关调整存储容量的信息，请参阅虚拟平台的相关文档。 +As more users join {% data variables.product.product_location %}, you may need to resize your storage volume. Refer to the documentation for your virtualization platform for information on resizing storage. -## 要求与建议 +## Requirements and recommendations {% note %} -**注**：调整任何存储卷之前，请将实例置于维护模式。 更多信息请参阅“[启用和排定维护模式](/enterprise/{{ currentVersion }}/admin/guides/installation/enabling-and-scheduling-maintenance-mode)”。 +**Note:** Before resizing any storage volume, put your instance in maintenance mode. For more information, see "[Enabling and scheduling maintenance mode](/enterprise/{{ currentVersion }}/admin/guides/installation/enabling-and-scheduling-maintenance-mode)." {% endnote %} -### 最低要求 +### Minimum requirements {% data reusables.enterprise_installation.hardware-rec-table %} -## 增加数据分区大小 +## Increasing the data partition size -1. 使用虚拟平台工具调整现有用户卷磁盘大小。 +1. Resize the existing user volume disk using your virtualization platform's tools. {% data reusables.enterprise_installation.ssh-into-instance %} -3. 将设备置于维护模式。 更多信息请参阅“[启用和排定维护模式](/enterprise/{{ currentVersion }}/admin/guides/installation/enabling-and-scheduling-maintenance-mode)”。 -4. 重启设备，以检测新存储分配。 +3. Put the appliance in maintenance mode. For more information, see "[Enabling and scheduling maintenance mode](/enterprise/{{ currentVersion }}/admin/guides/installation/enabling-and-scheduling-maintenance-mode)." +4. Reboot the appliance to detect the new storage allocation: ```shell $ sudo reboot ``` -5. 运行 `ghe-storage-extend` 命令以展开 `/data/user` 文件系统： +5. Run the `ghe-storage-extend` command to expand the `/data/user` filesystem: ```shell $ ghe-storage-extend ``` -## 使用新设备增加根分区大小 +## Increasing the root partition size using a new appliance -1. 使用版本与当前设备相同的较大根磁盘来设置新的 {% data variables.product.prodname_ghe_server %} 实例。 更多信息请参阅“[设置 {% data variables.product.prodname_ghe_server %} 实例](/enterprise/{{ currentVersion }}/admin/guides/installation/setting-up-a-github-enterprise-server-instance)”。 -2. 关闭当前设备： +1. Set up a new {% data variables.product.prodname_ghe_server %} instance with a larger root disk using the same version as your current appliance. For more information, see "[Setting up a {% data variables.product.prodname_ghe_server %} instance](/enterprise/{{ currentVersion }}/admin/guides/installation/setting-up-a-github-enterprise-server-instance)." +2. Shut down the current appliance: ```shell $ sudo poweroff ``` -3. 使用虚拟平台工具将数据磁盘从当前设备中拆下。 -4. 将数据磁盘安装到根磁盘较大的新设备上。 +3. Detach the data disk from the current appliance using your virtualization platform's tools. +4. Attach the data disk to the new appliance with the larger root disk. -## 使用现有设备增加根分区大小 +## Increasing the root partition size using an existing appliance {% warning %} -**警告：** 在增加根分区大小之前，您必须将您的实例置于维护模式。 更多信息请参阅“[启用和排定维护模式](/enterprise/{{ currentVersion }}/admin/guides/installation/enabling-and-scheduling-maintenance-mode)”。 +**Warning:** Before increasing the root partition size, you must put your instance in maintenance mode. For more information, see "[Enabling and scheduling maintenance mode](/enterprise/{{ currentVersion }}/admin/guides/installation/enabling-and-scheduling-maintenance-mode)." {% endwarning %} -1. 将新磁盘连接到 {% data variables.product.prodname_ghe_server %} 设备。 -2. 运行 `parted` 命令，将磁盘格式化： +1. Attach a new disk to your {% data variables.product.prodname_ghe_server %} appliance. +1. Run the `parted` command to format the disk: ```shell $ sudo parted /dev/xvdg mklabel msdos $ sudo parted /dev/xvdg mkpart primary ext4 0% 50% $ sudo parted /dev/xvdg mkpart primary ext4 50% 100% ``` -3. 运行 `ghe-upgrade` 命令，将完整的平台特定包安装到新分区的磁盘中。 `github-enterprise-2.11.9.hpkg` 等通用热补丁升级包将无法按预期运行。 在 `ghe-upgrade` 命令完成后，应用程序服务将自动终止。 +1. To stop replication, run the `ghe-repl-stop` command. + + ```shell + $ ghe-repl-stop + ``` + +1. Run the `ghe-upgrade` command to install a full, platform specific package to the newly partitioned disk. A universal hotpatch upgrade package, such as `github-enterprise-2.11.9.hpkg`, will not work as expected. After the `ghe-upgrade` command completes, application services will automatically terminate. ```shell $ ghe-upgrade PACKAGE-NAME.pkg -s -t /dev/xvdg1 ``` -4. 关闭设备： +1. Shut down the appliance: ```shell $ sudo poweroff ``` -5. 在虚拟机监控程序中，移除旧的根磁盘，并将新的根磁盘连接到旧的根磁盘的位置。 -6. 启动设备。 -7. 确保系统服务正常运行，然后释放维护模式。 更多信息请参阅“[启用和排定维护模式](/admin/guides/installation/enabling-and-scheduling-maintenance-mode)”。 +1. In the hypervisor, remove the old root disk and attach the new root disk at the same location as the old root disk. +1. Start the appliance. +1. Ensure system services are functioning correctly, then release maintenance mode. For more information, see "[Enabling and scheduling maintenance mode](/admin/guides/installation/enabling-and-scheduling-maintenance-mode)." + +If your appliance is configured for high-availability or geo-replication, remember to start replication on each replica node using `ghe-repl-start` after the storage on all nodes has been upgraded. diff --git a/translations/zh-CN/content/admin/guides.md b/translations/zh-CN/content/admin/guides.md index f6ce6a071cb1..c8b10f2083ff 100644 --- a/translations/zh-CN/content/admin/guides.md +++ b/translations/zh-CN/content/admin/guides.md @@ -50,6 +50,7 @@ includeGuides: - /admin/configuration/configuring-secret-scanning-for-your-appliance - /admin/configuration/configuring-tls - /admin/configuration/configuring-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise + - /admin/configuration/configuring-your-enterprise/managing-github-mobile-for-your-enterprise - /admin/configuration/connecting-your-enterprise-account-to-github-enterprise-cloud - /admin/configuration/enabling-and-scheduling-maintenance-mode - /admin/configuration/enabling-automatic-user-license-sync-between-github-enterprise-server-and-github-enterprise-cloud @@ -58,7 +59,6 @@ includeGuides: - /admin/configuration/enabling-unified-contributions-between-your-enterprise-account-and-githubcom - /admin/configuration/enabling-unified-search-between-your-enterprise-account-and-githubcom - /admin/configuration/initializing-github-ae - - /admin/configuration/managing-github-for-mobile-for-your-enterprise - /admin/configuration/network-ports - /admin/configuration/restricting-network-traffic-to-your-enterprise - /admin/configuration/site-admin-dashboard diff --git a/translations/zh-CN/content/admin/user-management/migrating-data-to-and-from-your-enterprise/exporting-migration-data-from-githubcom.md b/translations/zh-CN/content/admin/user-management/migrating-data-to-and-from-your-enterprise/exporting-migration-data-from-githubcom.md index 7154212cf835..949e6b916352 100644 --- a/translations/zh-CN/content/admin/user-management/migrating-data-to-and-from-your-enterprise/exporting-migration-data-from-githubcom.md +++ b/translations/zh-CN/content/admin/user-management/migrating-data-to-and-from-your-enterprise/exporting-migration-data-from-githubcom.md @@ -33,8 +33,7 @@ shortTitle: Export data from GitHub.com To export repository data from {% data variables.product.prodname_dotcom_the_website %}, use the Migrations API. -The Migrations API is currently in a preview period, which means that the endpoints and parameters may change in the future. To access the Migrations API, you must provide a custom [media type](/rest/overview/media-types) in the `Accept` header: `application/vnd.github.wyandotte-preview+json`. The examples below include the custom media type. - +The Migrations API is currently in a preview period, which means that the endpoints and parameters may change in the future. ## Generating a migration archive {% data reusables.enterprise_migrations.locking-repositories %} @@ -45,8 +44,9 @@ The Migrations API is currently in a preview period, which means that the endpoi * Your access token for authentication. * A [list of the repositories](/rest/reference/repos#list-organization-repositories) you want to migrate: ```shell - curl -H "Authorization: token GITHUB_ACCESS_TOKEN" -X POST \ - -H "Accept: application/vnd.github.wyandotte-preview+json" \ + curl -H "Authorization: token GITHUB_ACCESS_TOKEN" \ + -X POST \ + -H "Accept: application/vnd.github.v3+json" \ -d'{"lock_repositories":true,"repositories":["orgname/reponame", "orgname/reponame"]}' \ https://api.github.com/orgs/orgname/migrations ``` @@ -60,7 +60,7 @@ The Migrations API is currently in a preview period, which means that the endpoi * The unique `id` of the migration: ```shell curl -H "Authorization: token GITHUB_ACCESS_TOKEN" \ - -H "Accept: application/vnd.github.wyandotte-preview+json" \ + -H "Accept: application/vnd.github.v3+json" \ https://api.github.com/orgs/orgname/migrations/id ``` @@ -75,7 +75,7 @@ The Migrations API is currently in a preview period, which means that the endpoi * The unique `id` of the migration: ```shell curl -H "Authorization: token GITHUB_ACCESS_TOKEN" \ - -H "Accept: application/vnd.github.wyandotte-preview+json" \ + -H "Accept: application/vnd.github.v3+json" \ -L -o migration_archive.tar.gz \ https://api.github.com/orgs/orgname/migrations/id/archive ``` @@ -84,8 +84,9 @@ The Migrations API is currently in a preview period, which means that the endpoi * Your access token for authentication. * The unique `id` of the migration: ```shell - curl -H "Authorization: token GITHUB_ACCESS_TOKEN" -X DELETE \ - -H "Accept: application/vnd.github.wyandotte-preview+json" \ + curl -H "Authorization: token GITHUB_ACCESS_TOKEN" \ + -X DELETE \ + -H "Accept: application/vnd.github.v3+json" \ https://api.github.com/orgs/orgname/migrations/id/archive ``` {% data reusables.enterprise_migrations.ready-to-import-migrations %} diff --git a/translations/zh-CN/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md b/translations/zh-CN/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md index fddb22eb95b1..6d51a952cec8 100644 --- a/translations/zh-CN/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md +++ b/translations/zh-CN/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md @@ -41,27 +41,27 @@ To set up {% data variables.product.prodname_vss_ghe %}, members of your team mu One person may be able to complete the tasks because the person has all of the roles, but you may need to coordinate the tasks with multiple people. For more information, see "[Roles for {% data variables.product.prodname_vss_ghe %}](#roles-for-visual-studio-subscriptions-with-github-enterprise)." -1. An [enterprise owner](#roles-for-visual-studio-subscriptions-with-github-enterprise) must create at least one organization in your enterprise on {% data variables.product.product_location %}. For more information, see "[Adding organizations to your enterprise](/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise)." +1. An enterprise owner must create at least one organization in your enterprise on {% data variables.product.product_location %}. For more information, see "[Adding organizations to your enterprise](/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise)." -1. The [subscription admin](#roles-for-visual-studio-subscriptions-with-github-enterprise) must assign a license for {% data variables.product.prodname_vs %} to a [subscriber](#roles-for-visual-studio-subscriptions-with-github-enterprise) in {% data variables.product.prodname_vss_admin_portal_with_url %}. For more information, see [Overview of the {% data variables.product.prodname_vs %} Subscriptions Administrator Portal](https://docs.microsoft.com/en-us/visualstudio/subscriptions/using-admin-portal) and [Assign {% data variables.product.prodname_vs %} Licenses in the {% data variables.product.prodname_vs %} Subscriptions Administration Portal](https://docs.microsoft.com/en-us/visualstudio/subscriptions/assign-license) in Microsoft Docs. +1. The subscription admin must assign a license for {% data variables.product.prodname_vs %} to a subscriber in {% data variables.product.prodname_vss_admin_portal_with_url %}. For more information, see [Overview of the {% data variables.product.prodname_vs %} Subscriptions Administrator Portal](https://docs.microsoft.com/en-us/visualstudio/subscriptions/using-admin-portal) and [Assign {% data variables.product.prodname_vs %} Licenses in the {% data variables.product.prodname_vs %} Subscriptions Administration Portal](https://docs.microsoft.com/en-us/visualstudio/subscriptions/assign-license) in Microsoft Docs. -1. Optionally, if the [subscription admin](#roles-for-visual-studio-subscriptions-with-github-enterprise) assigned licenses to [subscribers](#roles-for-visual-studio-subscriptions-with-github-enterprise) in {% data variables.product.prodname_vs %} before adding {% data variables.product.prodname_enterprise %} to the subscription, the [subscription admin](#roles-for-visual-studio-subscriptions-with-github-enterprise) can move the [subscribers](#roles-for-visual-studio-subscriptions-with-github-enterprise) to the combined offering in the {% data variables.product.prodname_vs %} administration portal. For more information, see [Manage {% data variables.product.prodname_vs %} subscriptions with {% data variables.product.prodname_enterprise %}](https://docs.microsoft.com/en-us/visualstudio/subscriptions/assign-github#moving-to-visual-studio-with-github-enterprise) in Microsoft Docs. +1. Optionally, if the subscription admin assigned licenses to subscribers in {% data variables.product.prodname_vs %} before adding {% data variables.product.prodname_enterprise %} to the subscription, the subscription admin can move the subscribers to the combined offering in the {% data variables.product.prodname_vs %} administration portal. For more information, see [Manage {% data variables.product.prodname_vs %} subscriptions with {% data variables.product.prodname_enterprise %}](https://docs.microsoft.com/en-us/visualstudio/subscriptions/assign-github#moving-to-visual-studio-with-github-enterprise) in Microsoft Docs. -1. If the [subscription admin](#roles-for-visual-studio-subscriptions-with-github-enterprise) has not disabled email notifications, the [subscriber](#roles-for-visual-studio-subscriptions-with-github-enterprise) will receive two confirmation emails. For more information, see [{% data variables.product.prodname_vs %} subscriptions with {% data variables.product.prodname_enterprise %}](https://docs.microsoft.com/en-us/visualstudio/subscriptions/access-github#what-is-the-visual-studio-subscription-with-github-enterprise-setup-process) in Microsoft Docs. +1. If the subscription admin has not disabled email notifications, the subscriber will receive two confirmation emails. For more information, see [{% data variables.product.prodname_vs %} subscriptions with {% data variables.product.prodname_enterprise %}](https://docs.microsoft.com/en-us/visualstudio/subscriptions/access-github#what-is-the-visual-studio-subscription-with-github-enterprise-setup-process) in Microsoft Docs. -1. An [organization owner](#roles-for-visual-studio-subscriptions-with-github-enterprise) must invite the [subscriber](#roles-for-visual-studio-subscriptions-with-github-enterprise) to the organization on {% data variables.product.product_location %} from step 1. The [subscriber](#roles-for-visual-studio-subscriptions-with-github-enterprise) can accept the invitation with an existing user account on {% data variables.product.prodname_dotcom_the_website %} or create a new account. After the [subscriber](#roles-for-visual-studio-subscriptions-with-github-enterprise) joins the organization, the [subscriber](#roles-for-visual-studio-subscriptions-with-github-enterprise) becomes an [enterprise member](#roles-for-visual-studio-subscriptions-with-github-enterprise). For more information, see "[Inviting users to join your organization](/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization)." +1. An organization owner must invite the subscriber to the organization on {% data variables.product.product_location %} from step 1. The subscriber can accept the invitation with an existing user account on {% data variables.product.prodname_dotcom_the_website %} or create a new account. After the subscriber joins the organization, the subscriber becomes an enterprise member. For more information, see "[Inviting users to join your organization](/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization)." {% tip %} **Tips**: - - While not required, we recommend that the [organization owner](#roles-for-visual-studio-subscriptions-with-github-enterprise) sends an invitation to the same email address used for the [subscriber](#roles-for-visual-studio-subscriptions-with-github-enterprise)'s User Primary Name (UPN). When the email address on {% data variables.product.product_location %} matches the [subscriber](#roles-for-visual-studio-subscriptions-with-github-enterprise)'s UPN, you can ensure that another [enterprise member](#roles-for-visual-studio-subscriptions-with-github-enterprise) does not claim the [subscriber](#roles-for-visual-studio-subscriptions-with-github-enterprise)'s license. - - If the [subscriber](#roles-for-visual-studio-subscriptions-with-github-enterprise) accepts the invitation to the organization with an existing user account on {% data variables.product.product_location %}, we recommend that the [subscriber](#roles-for-visual-studio-subscriptions-with-github-enterprise) add the email address they use for {% data variables.product.prodname_vs %} to their user account on {% data variables.product.product_location %}. For more information, see "[Adding an email address to your {% data variables.product.prodname_dotcom %} account](/account-and-profile/setting-up-and-managing-your-github-user-account/managing-email-preferences/adding-an-email-address-to-your-github-account)." - - If the [organization owner](#roles-for-visual-studio-subscriptions-with-github-enterprise) must invite a large number of [subscribers](#roles-for-visual-studio-subscriptions-with-github-enterprise), a script may make the process faster. For more information, see [the sample PowerShell script](https://github.com/github/platform-samples/blob/master/api/powershell/invite_members_to_org.ps1) in the `github/platform-samples` repository. + - While not required, we recommend that the organization owner sends an invitation to the same email address used for the subscriber's User Primary Name (UPN). When the email address on {% data variables.product.product_location %} matches the subscriber's UPN, you can ensure that another enterprise does not claim the subscriber's license. + - If the subscriber accepts the invitation to the organization with an existing user account on {% data variables.product.product_location %}, we recommend that the subscriber add the email address they use for {% data variables.product.prodname_vs %} to their user account on {% data variables.product.product_location %}. For more information, see "[Adding an email address to your {% data variables.product.prodname_dotcom %} account](/account-and-profile/setting-up-and-managing-your-github-user-account/managing-email-preferences/adding-an-email-address-to-your-github-account)." + - If the organization owner must invite a large number of subscribers, a script may make the process faster. For more information, see [the sample PowerShell script](https://github.com/github/platform-samples/blob/master/api/powershell/invite_members_to_org.ps1) in the `github/platform-samples` repository. {% endtip %} -After {% data variables.product.prodname_vss_ghe %} is set up for [subscribers](#roles-for-visual-studio-subscriptions-with-github-enterprise) on your team, [enterprise owners](#roles-for-visual-studio-subscriptions-with-github-enterprise) can review licensing information on {% data variables.product.product_location %}. For more information, see "[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)." +After {% data variables.product.prodname_vss_ghe %} is set up for subscribers on your team, enterprise owners can review licensing information on {% data variables.product.product_location %}. For more information, see "[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)." ## Further reading diff --git a/translations/zh-CN/content/codespaces/developing-in-codespaces/connecting-to-a-private-network.md b/translations/zh-CN/content/codespaces/developing-in-codespaces/connecting-to-a-private-network.md new file mode 100644 index 000000000000..8c37404960bd --- /dev/null +++ b/translations/zh-CN/content/codespaces/developing-in-codespaces/connecting-to-a-private-network.md @@ -0,0 +1,45 @@ +--- +title: Connecting to a private network +intro: 'You can connect {% data variables.product.prodname_codespaces %} to resources on a private network, including package registries, license servers, and on-premises databases.' +product: '{% data reusables.gated-features.codespaces %}' +versions: + fpt: '*' + ghec: '*' +type: how_to +topics: + - Codespaces + - Fundamentals + - Developer +--- + +## About codespace networking + +By default, your codespaces have access to all resources on the public internet, including package managers, license servers, databases, and cloud platform APIs, but they have no access to resources on private networks. + +## Connecting to resources on a private network + +The currently supported method of accessing resources on a private network is to use a VPN. It is currently not recommended to allowlist codespaces IPs as this would allow all codespaces (both yours and those of other customers) access to the network protected resources. + +### Using a VPN to access resources behind a private network + +The easiest way to access resources behind a private network is to VPN into that network from within your codespace. + +We recommend VPN tools like [OpenVPN](https://openvpn.net/) to access resources on a private network. For more information, see "[Using the OpenVPN client from GitHub Codespaces](https://github.com/codespaces-contrib/codespaces-openvpn)." + +There are also a number of third party solutions that, while not explicitly endorsed by {% data variables.product.prodname_dotcom %}, have provided examples of how to integrate with {% data variables.product.prodname_codespaces %}. + +These third party solutions include: + +- [Tailscale](https://tailscale.com/kb/1160/github-codespaces/) + +### Allowlisting private resources for codespaces + +While {% data variables.product.prodname_dotcom %} publishes IP ranges for several products on its Meta API, codespaces IPs are dynamically assigned, meaning your codespace is not guaranteed to have the same IP address day to day. We highly discourage users from allowlisting an entire IP range, as this would give overly broad access to all codespaces (including users not affiliated with your codespaces). + +For more information about the Meta API, see "[Meta](/rest/reference/meta)." + +## Restricting access to the public internet + +At present, there is no way to restrict codespaces from accessing the public internet, or to restrict appropriately authenticated users from accessing a forwarded port. + +For more information on how to secure your codespaces, see "[Security in Codespaces](/codespaces/codespaces-reference/security-in-codespaces)." diff --git a/translations/zh-CN/content/codespaces/developing-in-codespaces/index.md b/translations/zh-CN/content/codespaces/developing-in-codespaces/index.md index d6e1e5d12f1f..0558dd88ff3e 100644 --- a/translations/zh-CN/content/codespaces/developing-in-codespaces/index.md +++ b/translations/zh-CN/content/codespaces/developing-in-codespaces/index.md @@ -15,6 +15,7 @@ children: - /using-codespaces-for-pull-requests - /deleting-a-codespace - /forwarding-ports-in-your-codespace + - /connecting-to-a-private-network - /using-codespaces-in-visual-studio-code - /using-codespaces-with-github-cli --- diff --git a/translations/zh-CN/content/get-started/exploring-projects-on-github/saving-repositories-with-stars.md b/translations/zh-CN/content/get-started/exploring-projects-on-github/saving-repositories-with-stars.md index 9b244bf2b7f8..c61495fa8f19 100644 --- a/translations/zh-CN/content/get-started/exploring-projects-on-github/saving-repositories-with-stars.md +++ b/translations/zh-CN/content/get-started/exploring-projects-on-github/saving-repositories-with-stars.md @@ -1,6 +1,6 @@ --- -title: 使用星标保存仓库 -intro: '您可以对仓库和主题标星以跟踪您感兴趣的项目{% ifversion fpt or ghec %} and discover related content in your news feed{% endif %}。' +title: Saving repositories with stars +intro: 'You can star repositories and topics to keep track of projects you find interesting{% ifversion fpt or ghec %} and discover related content in your news feed{% endif %}.' redirect_from: - /articles/stars/ - /articles/about-stars/ @@ -16,47 +16,114 @@ versions: ghec: '*' topics: - Repositories -shortTitle: 保存有星标的仓库 +shortTitle: Save repos with stars --- +You can search, sort, and filter your starred repositories and topics on your {% data variables.explore.your_stars_page %}. -您可以在 {% data variables.explore.your_stars_page %} 上搜索、排序和筛选星标仓库和主题。' +## About stars -## 关于星标 - -标星操作便于以后再次找到仓库或主题。 您可以到 {% data variables.explore.your_stars_page %} 查看已经加星标的所有仓库和主题。 +Starring makes it easy to find a repository or topic again later. You can see all the repositories and topics you have starred by going to your {% data variables.explore.your_stars_page %}. {% ifversion fpt or ghec %} -您可以对仓库和主题加星标以在 {% data variables.product.product_name %} 上发现类似的项目。 对仓库或主题加星标时，{% data variables.product.product_name %} 可能会在消息馈送的发现视图中推荐相关内容。 更多信息请参阅“[寻找在 {% data variables.product.prodname_dotcom %} 上参与开源项目的方法](/github/getting-started-with-github/finding-ways-to-contribute-to-open-source-on-github)”。 +You can star repositories and topics to discover similar projects on {% data variables.product.product_name %}. When you star repositories or topics, {% data variables.product.product_name %} may recommend related content in the discovery view of your news feed. For more information, see "[Finding ways to contribute to open source on {% data variables.product.prodname_dotcom %}](/github/getting-started-with-github/finding-ways-to-contribute-to-open-source-on-github)". {% endif %} -对仓库加星标也可表示赞赏仓库维护员的工作。 许多 {% data variables.product.prodname_dotcom %} 的仓库评级取决于仓库拥有的星标数。 此外，[Explore](https://github.com/explore) 也会根据星标数显示最受欢迎的仓库。 +Starring a repository also shows appreciation to the repository maintainer for their work. Many of {% data variables.product.prodname_dotcom %}'s repository rankings depend on the number of stars a repository has. In addition, [Explore](https://github.com/explore) shows popular repositories based on the number of stars they have. -## 对仓库标星 +## Starring a repository -对仓库标星是一个简单的两步过程。 +Starring a repository is a simple two-step process. {% data reusables.repositories.navigate-to-repo %} -1. 在页面的右上角，单击 **Star（星标）**。 ![对仓库标星](/assets/images/help/stars/starring-a-repository.png) -1. （可选）要取消先前已标星仓库的星标，请点击 **Unstar（取消星标）**。 ![解压仓库](/assets/images/help/stars/unstarring-a-repository.png) +1. In the top-right corner of the page, click **Star**. +![Starring a repository](/assets/images/help/stars/starring-a-repository.png) +1. Optionally, to unstar a previously starred repository, click **Unstar**. +![Untarring a repository](/assets/images/help/stars/unstarring-a-repository.png) + +{% ifversion fpt or ghec %} +## Organizing starred repositories with lists + +{% note %} + +**Note:** Lists are currently in public beta and subject to change. + +{% endnote %} + +Curate repositories that you've starred with public lists. You can create public lists that appear on your stars page at `https://github.com/USERNAME?tab=stars`. + +If you add a private repository to a list, then the private repository will only appear in your list for people with `read` access to the repository. + +![Screenshot of lists on stars page](/assets/images/help/stars/lists-overview-on-stars-page.png) + +You can add a repository to an existing or new list wherever you see a repository's **Star** or **Starred** dropdown menu, whether on a repository page or in a list of starred repositories. + +![Screenshot of "Star" dropdown menu with list options featured from the repository page](/assets/images/help/stars/stars-dropdown-on-repo.png) + +![Screenshot of "Starred" dropdown menu with list options featured from a starred repository list](/assets/images/help/stars/add-repo-to-list.png) + +### Creating a list + +{% data reusables.stars.stars-page-navigation %} +2. Next to "Lists", click **Create list**. + ![Screenshot of "Create list" button](/assets/images/help/stars/create-list.png) +3. Enter a name and description for your list and click **Create**. + ![Screenshot of modal showing where you enter a name and description with the "Create" button.](/assets/images/help/stars/create-list-with-description.png) + +### Adding a repository to a list + +{% data reusables.stars.stars-page-navigation %} +2. Find the repository you want to add to your list. + ![Screenshot of starred repos search bar](/assets/images/help/stars/search-bar-for-starred-repos.png) +3. Next to the repository you want to add, use the **Starred** dropdown menu and select your list. + ![Screenshot of dropdown showing a list checkboxes](/assets/images/help/stars/add-repo-to-list.png) + +### Removing a repository from your list + +{% data reusables.stars.stars-page-navigation %} +2. Select your list. +3. Next to the repository you want to remove, use the **Starred** dropdown menu and deselect your list. + ![Screenshot of dropdown showing list checkboxes](/assets/images/help/stars/add-repo-to-list.png) + +### Editing a list name or description + +{% data reusables.stars.stars-page-navigation %} +1. Select the list you want to edit. +2. Click **Edit list**. +3. Update the name or description and click **Save list**. + ![Screenshot of modal showing "Save list" button](/assets/images/help/stars/edit-list-options.png) + +### Deleting a list + +{% data reusables.stars.stars-page-navigation %} +2. Select the list you want to delete. +3. Click **Delete list**. + ![Screenshot of modal showing "Delete list" button](/assets/images/help/stars/edit-list-options.png) +4. To confirm, click **Delete**. + +{% endif %} -## 搜索星标 +## Searching starred repositories and topics -您可以使用 {% data variables.explore.your_stars_page %} 上的搜索栏快速查找您标星的仓库和主题。 +You can use the search bar on your {% data variables.explore.your_stars_page %} to quickly find repositories and topics you've starred. -1. 转到您的 {% data variables.explore.your_stars_page %}。 -1. 使用搜索栏按名称查找您标星的仓库或主题。 ![搜索星标](/assets/images/help/stars/stars_search_bar.png) +1. Go to your {% data variables.explore.your_stars_page %}. +1. Use the search bar to find your starred repositories or topics by their name. +![Searching through stars](/assets/images/help/stars/stars_search_bar.png) -搜索栏只能根据仓库或主题名称搜索，而不能根据任何其他限定符（如仓库大小或上次更新时间）搜索。 +The search bar only searches based on the name of a repository or topic, and not on any other qualifiers (such as the size of the repository or when it was last updated). -## 排序和过滤星标 +## Sorting and filtering stars on your stars page -您可以使用排序或筛选来自定义您如何在星标页面上查看标星的仓库和主题。 +You can use sorting or filtering to customize how you see starred repositories and topics on your stars page. -1. 转到您的 {% data variables.explore.your_stars_page %}。 -1. 要对星标排序，选择 **Sort（排序）**下拉菜单，然后选择 **Recently starred（最近标星）**、**Recently active（最近活跃）**或 **Most stars（最多星标）**。 ![排序星标](/assets/images/help/stars/stars_sort_menu.png) -1. 要根据星标的语言筛选星标名单，请单击“**Filter by languages（按语言筛选）**下所需的语言。 ![按语言过滤星标](/assets/images/help/stars/stars_filter_language.png) -1. 要根据仓库或主题筛选您的星标列表，请单击所需的选项。 ![按主题筛选星标](/assets/images/help/stars/stars_filter_topic.png) +1. Go to your {% data variables.explore.your_stars_page %}. +1. To sort stars, select the **Sort** drop-down menu, then select **Recently starred**, **Recently active**, or **Most stars**. +![Sorting stars](/assets/images/help/stars/stars_sort_menu.png) +1. To filter your list of stars based on their language, click on the desired language under **Filter by languages**. +![Filter stars by language](/assets/images/help/stars/stars_filter_language.png) +1. To filter your list of stars based on repository or topic, click on the desired option. +![Filter stars by topic](/assets/images/help/stars/stars_filter_topic.png) -## 延伸阅读 +## Further reading -- "[使用主题对仓库分类](/articles/classifying-your-repository-with-topics)" +- "[Classifying your repository with topics](/articles/classifying-your-repository-with-topics)" diff --git a/translations/zh-CN/content/get-started/index.md b/translations/zh-CN/content/get-started/index.md index 74fa36d442d3..8917ef270e3b 100644 --- a/translations/zh-CN/content/get-started/index.md +++ b/translations/zh-CN/content/get-started/index.md @@ -1,21 +1,21 @@ --- -title: 开始使用 GitHub -shortTitle: 入门 -intro: '了解如何开始构建、运输和维护具有 {% data variables.product.prodname_dotcom %} 的软件。 了解我们的产品，注册一个帐户，与世界上最大的发展社区建立联系。' +title: Getting started with GitHub +shortTitle: Get started +intro: 'Learn how to start building, shipping, and maintaining software with {% data variables.product.prodname_dotcom %}. Explore our products, sign up for an account, and connect with the world''s largest development community.' redirect_from: - - /categories/54/articles/ - - /categories/bootcamp/ - - /categories/32/articles/ - - /categories/2/articles/ - - /categories/organizations/ - - /categories/about-github/ - - /categories/53/articles/ - - /categories/setup/ + - /categories/54/articles + - /categories/bootcamp + - /categories/32/articles + - /categories/2/articles + - /categories/organizations + - /categories/about-github + - /categories/53/articles + - /categories/setup - /categories/getting-started-with-github - - /categories/19/articles/ + - /categories/19/articles - /categories/using-git - /github/using-git - - /github/getting-started-with-github/ + - /github/getting-started-with-github versions: fpt: '*' ghes: '*' @@ -60,4 +60,3 @@ children: - /getting-started-with-git - /using-git --- - diff --git a/translations/zh-CN/content/get-started/quickstart/create-a-repo.md b/translations/zh-CN/content/get-started/quickstart/create-a-repo.md index 56c2e95fd07b..d3b24b7e93a0 100644 --- a/translations/zh-CN/content/get-started/quickstart/create-a-repo.md +++ b/translations/zh-CN/content/get-started/quickstart/create-a-repo.md @@ -1,7 +1,7 @@ --- title: Create a repo redirect_from: - - /create-a-repo/ + - /create-a-repo - /articles/create-a-repo - /github/getting-started-with-github/create-a-repo - /github/getting-started-with-github/quickstart/create-a-repo diff --git a/translations/zh-CN/content/get-started/quickstart/fork-a-repo.md b/translations/zh-CN/content/get-started/quickstart/fork-a-repo.md index 6b3d21b415a7..c9fa67d1cbe9 100644 --- a/translations/zh-CN/content/get-started/quickstart/fork-a-repo.md +++ b/translations/zh-CN/content/get-started/quickstart/fork-a-repo.md @@ -1,12 +1,12 @@ --- -title: 复刻仓库 +title: Fork a repo redirect_from: - - /fork-a-repo/ - - /forking/ + - /fork-a-repo + - /forking - /articles/fork-a-repo - /github/getting-started-with-github/fork-a-repo - /github/getting-started-with-github/quickstart/fork-a-repo -intro: 复刻是仓库的副本。 通过复刻仓库，您可以自由地尝试更改而不会影响原始项目。 +intro: A fork is a copy of a repository. Forking a repository allows you to freely experiment with changes without affecting the original project. permissions: '{% data reusables.enterprise-accounts.emu-permission-fork %}' versions: fpt: '*' @@ -19,46 +19,46 @@ topics: - Notifications - Accounts --- +## About forks -## 关于复刻 +Most commonly, forks are used to either propose changes to someone else's project or to use someone else's project as a starting point for your own idea. You can fork a repository to create a copy of the repository and make changes without affecting the upstream repository. For more information, see "[Working with forks](/github/collaborating-with-issues-and-pull-requests/working-with-forks)." -复刻最常见的用法是对其他人的项目提出更改或将其他人的项目用作自己创意的起点。 您可以复刻仓库以创建仓库的副本，并在不影响上游仓库的情况下进行更改。 更多信息请参阅“[使用复刻](/github/collaborating-with-issues-and-pull-requests/working-with-forks)”。 +### Propose changes to someone else's project -### 对其他人的项目提出更改 +For example, you can use forks to propose changes related to fixing a bug. Rather than logging an issue for a bug you've found, you can: -例如，可以使用复刻提出与修复 Bug 相关的更改。 无需为您发现的漏洞创建议题，您可以： +- Fork the repository. +- Make the fix. +- Submit a pull request to the project owner. -- 复刻仓库 -- 进行修复 -- 向项目所有者提交拉取请求。 +### Use someone else's project as a starting point for your own idea. -### 将其他人的项目用作自己创意的起点。 +Open source software is based on the idea that by sharing code, we can make better, more reliable software. For more information, see the "[About the Open Source Initiative](http://opensource.org/about)" on the Open Source Initiative. -开源软件的理念是通过共享代码，可以开发出更好、更可靠的软件。 更多信息请参阅 Open Source Initiative（开源倡议）上的“[关于开源倡议](http://opensource.org/about)”。 - -有关将开源原则应用于组织在 {% data variables.product.product_location %} 上的开发工作的详细信息，请参阅 {% data variables.product.prodname_dotcom %} 的白皮书“[内部来源简介](https://resources.github.com/whitepapers/introduction-to-innersource/)”。 +For more information about applying open source principles to your organization's development work on {% data variables.product.product_location %}, see {% data variables.product.prodname_dotcom %}'s white paper "[An introduction to innersource](https://resources.github.com/whitepapers/introduction-to-innersource/)." {% ifversion fpt or ghes or ghec %} -从其他人的项目复刻创建公共仓库时，请确保包含许可文件以确定您希望与其他人共享项目。 更多信息请参阅 choosealicense.com 上的“[选择开源许可](https://choosealicense.com/)”。 +When creating your public repository from a fork of someone's project, make sure to include a license file that determines how you want your project to be shared with others. For more information, see "[Choose an open source license](https://choosealicense.com/)" at choosealicense.com. {% data reusables.open-source.open-source-guide-repositories %} {% data reusables.open-source.open-source-learning-lab %} {% endif %} -## 基本要求 +## Prerequisites -如果尚未[设置 Git](/articles/set-up-git)，您应该先设置它。 不要忘记[从 Git 设置向 {% data variables.product.product_location %} 验证](/articles/set-up-git#next-steps-authenticating-with-github-from-git)。 +If you haven't yet, you should first [set up Git](/articles/set-up-git). Don't forget to [set up authentication to {% data variables.product.product_location %} from Git](/articles/set-up-git#next-steps-authenticating-with-github-from-git) as well. -## 复刻仓库 +## Forking a repository {% include tool-switcher %} {% webui %} -您可能为了对上游或原始仓库提议更改而复刻项目。 在这种情况下，最好定期将您的复刻与上游仓库同步。 为此，您需要在命令行上使用 Git。 您可以使用刚才复刻的 [octocat/Spoon-Knife](https://github.com/octocat/Spoon-Knife) 仓库练习设置上游仓库。 +You might fork a project to propose changes to the upstream, or original, repository. In this case, it's good practice to regularly sync your fork with the upstream repository. To do this, you'll need to use Git on the command line. You can practice setting the upstream repository using the same [octocat/Spoon-Knife](https://github.com/octocat/Spoon-Knife) repository you just forked. 1. On {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom_the_website %}{% else %}{% data variables.product.product_location %}{% endif %}, navigate to the [octocat/Spoon-Knife](https://github.com/octocat/Spoon-Knife) repository. -2. 在页面的右上角，单击 **Fork（复刻）**。 ![复刻按钮](/assets/images/help/repository/fork_button.jpg) +2. In the top-right corner of the page, click **Fork**. +![Fork button](/assets/images/help/repository/fork_button.jpg) {% endwebui %} @@ -66,13 +66,13 @@ topics: {% data reusables.cli.cli-learn-more %} -要创建仓库的复刻，请使用 `gh repo fork` 子命令。 +To create a fork of a repository, use the `gh repo fork` subcommand. ```shell gh repo fork repository ``` -要在组织中创建复刻，请使用 `- org` 标记。 +To create the fork in an organization, use the `--org` flag. ```shell gh repo fork repository --org "octo-org" @@ -83,7 +83,7 @@ gh repo fork repository --org "octo-org" {% desktop %} {% enddesktop %} -## 克隆复刻的仓库 +## Cloning your forked repository Right now, you have a fork of the Spoon-Knife repository, but you don't have the files in that repository locally on your computer. @@ -94,12 +94,12 @@ Right now, you have a fork of the Spoon-Knife repository, but you don't have the {% data reusables.repositories.copy-clone-url %} {% data reusables.command_line.open_the_multi_os_terminal %} {% data reusables.command_line.change-current-directory-clone %} -4. 键入 `git clone`，然后粘贴先前复制的 URL。 它将如下所示，使用您的 {% data variables.product.product_name %} 用户名替换 `YOUR-USERNAME`： +4. Type `git clone`, and then paste the URL you copied earlier. It will look like this, with your {% data variables.product.product_name %} username instead of `YOUR-USERNAME`: ```shell $ git clone https://{% data variables.command_line.codeblock %}/YOUR-USERNAME/Spoon-Knife ``` -5. 按 **Enter** 键。 将创建您的本地克隆。 +5. Press **Enter**. Your local clone will be created. ```shell $ git clone https://{% data variables.command_line.codeblock %}/YOUR-USERNAME/Spoon-Knife > Cloning into `Spoon-Knife`... @@ -115,7 +115,7 @@ Right now, you have a fork of the Spoon-Knife repository, but you don't have the {% data reusables.cli.cli-learn-more %} -要创建复刻的克隆，请使用 `--clone` 标记。 +To create a clone of your fork, use the `--clone` flag. ```shell gh repo fork repository --clone=true @@ -133,9 +133,9 @@ gh repo fork repository --clone=true {% enddesktop %} -## 配置 Git 以将您的复刻与原始仓库同步 +## Configuring Git to sync your fork with the original repository -为了对原始仓库提议更改而复刻项目时，您可以配置 Git 以将更改从原始或上游仓库拉取到复刻的本地克隆。 +When you fork a project in order to propose changes to the original repository, you can configure Git to pull changes from the original, or upstream, repository into the local clone of your fork. {% include tool-switcher %} {% webui %} @@ -143,24 +143,24 @@ gh repo fork repository --clone=true 1. On {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom_the_website %}{% else %}{% data variables.product.product_location %}{% endif %}, navigate to the [octocat/Spoon-Knife](https://github.com/octocat/Spoon-Knife) repository. {% data reusables.repositories.copy-clone-url %} {% data reusables.command_line.open_the_multi_os_terminal %} -4. 将目录更改为您克隆的复刻的位置。 - - 要转到主目录，请只键入 `cd`，不要键入其他文本。 - - 要列出当前目录中的文件和文件夹，请键入 `ls`。 - - 要进入列出的某个目录，请键入 `cd your_listed_directory`。 - - 要回到上一个目录，请键入 `cd ..`。 -5. 键入 `git remote -v`，然后按 **Enter** 键。 您将看到当前为复刻配置的远程仓库。 +4. Change directories to the location of the fork you cloned. + - To go to your home directory, type just `cd` with no other text. + - To list the files and folders in your current directory, type `ls`. + - To go into one of your listed directories, type `cd your_listed_directory`. + - To go up one directory, type `cd ..`. +5. Type `git remote -v` and press **Enter**. You'll see the current configured remote repository for your fork. ```shell $ git remote -v > origin https://{% data variables.command_line.codeblock %}/YOUR_USERNAME/YOUR_FORK.git (fetch) > origin https://{% data variables.command_line.codeblock %}/YOUR_USERNAME/YOUR_FORK.git (push) ``` -6. 键入 `git remote add upstream`，然后粘贴您在第 2 步中复制的 URL 并按 **Enter** 键。 它将如下所示： +6. Type `git remote add upstream`, and then paste the URL you copied in Step 2 and press **Enter**. It will look like this: ```shell $ git remote add upstream https://{% data variables.command_line.codeblock %}/octocat/Spoon-Knife.git ``` -7. 要验证为复刻指定的新上游仓库，请再次键入 `git remote -v`。 您应该看到复刻的 URL 为 `origin`，原始仓库的 URL 为 `upstream`。 +7. To verify the new upstream repository you've specified for your fork, type `git remote -v` again. You should see the URL for your fork as `origin`, and the URL for the original repository as `upstream`. ```shell $ git remote -v > origin https://{% data variables.command_line.codeblock %}/YOUR_USERNAME/YOUR_FORK.git (fetch) @@ -169,7 +169,7 @@ gh repo fork repository --clone=true > upstream https://{% data variables.command_line.codeblock %}/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git (push) ``` -现在，您可以使用一些 Git 命令使您的复刻与上游仓库保持同步。 更多信息请参阅“[同步复刻](/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork)”。 +Now, you can keep your fork synced with the upstream repository with a few Git commands. For more information, see "[Syncing a fork](/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork)." {% endwebui %} @@ -177,13 +177,13 @@ gh repo fork repository --clone=true {% data reusables.cli.cli-learn-more %} -要为复刻的仓库配置远程仓库，请使用 `--remote` 标记。 +To configure a remote repository for the forked repository, use the `--remote` flag. ```shell gh repo fork repository --remote=true ``` -要指定远程仓库的名称，请使用 `--remote-name` 标记。 +To specify the remote repository's name, use the `--remote-name` flag. ```shell gh repo fork repository --remote-name "main-remote-repo" @@ -191,26 +191,26 @@ gh repo fork repository --remote-name "main-remote-repo" {% endcli %} -### 后续步骤 +### Next steps -您可以对复刻进行任何更改，包括： +You can make any changes to a fork, including: -- **创建分支：**[*分支*](/articles/creating-and-deleting-branches-within-your-repository/)允许您在不影响主项目的情况下构建新功能或测试创意。 -- **打开拉取请求：**如果您希望回馈原始仓库，您可以通过提交[拉取请求](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests)请求原作者将您的复刻拉取到他们的仓库。 +- **Creating branches:** [*Branches*](/articles/creating-and-deleting-branches-within-your-repository/) allow you to build new features or test out ideas without putting your main project at risk. +- **Opening pull requests:** If you are hoping to contribute back to the original repository, you can send a request to the original author to pull your fork into their repository by submitting a [pull request](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests). -## 另找一个仓库进行复刻 -复刻仓库，开始参与项目。 {% data reusables.repositories.you-can-fork %} +## Find another repository to fork +Fork a repository to start contributing to a project. {% data reusables.repositories.you-can-fork %} -{% ifversion fpt or ghec %}您可以浏览 [Explore](https://github.com/explore) 以查找项目并开始参与开源仓库。 更多信息请参阅“[寻找在 {% data variables.product.prodname_dotcom %} 上参与开源项目的方法](/github/getting-started-with-github/finding-ways-to-contribute-to-open-source-on-github)”。 +{% ifversion fpt or ghec %}You can browse [Explore](https://github.com/explore) to find projects and start contributing to open source repositories. For more information, see "[Finding ways to contribute to open source on {% data variables.product.prodname_dotcom %}](/github/getting-started-with-github/finding-ways-to-contribute-to-open-source-on-github)." {% endif %} -## 祝贺 +## Celebrate -您现在已经复刻了仓库、练习了克隆复刻并配置了上游仓库。 有关克隆复刻和从计算机同步复刻仓库更改的更多信息，请参阅“[设置 Git](/articles/set-up-git)”。 +You have now forked a repository, practiced cloning your fork, and configured an upstream repository. For more information about cloning the fork and syncing the changes in a forked repository from your computer see "[Set up Git](/articles/set-up-git)." -您也可以创建一个新的仓库，以将所有项目放在 {% data variables.product.prodname_dotcom %} 上并共享代码。 更多信息请参阅“[创建仓库](/articles/create-a-repo)”。 +You can also create a new repository where you can put all your projects and share the code on {% data variables.product.prodname_dotcom %}. For more information see, "[Create a repository](/articles/create-a-repo)." -{% data variables.product.product_name %} 中的每个仓库均归个人或组织所有。 您可以在 {% data variables.product.product_name %} 上连接和关注人员、仓库和组织以与之进行交互。 更多信息请参阅“[社交](/articles/be-social)”。 +Each repository in {% data variables.product.product_name %} is owned by a person or an organization. You can interact with the people, repositories, and organizations by connecting and following them on {% data variables.product.product_name %}. For more information see "[Be social](/articles/be-social)." {% data reusables.support.connect-in-the-forum-bootcamp %} diff --git a/translations/zh-CN/content/get-started/quickstart/index.md b/translations/zh-CN/content/get-started/quickstart/index.md index 9004dbbfd4dd..cfc4b9e48cb2 100644 --- a/translations/zh-CN/content/get-started/quickstart/index.md +++ b/translations/zh-CN/content/get-started/quickstart/index.md @@ -1,6 +1,6 @@ --- -title: 快速入门 -intro: '开始使用 {% data variables.product.product_name %} 来管理 Git 仓库并与他人合作。' +title: Quickstart +intro: 'Get started using {% data variables.product.product_name %} to manage Git repositories and collaborate with others.' versions: fpt: '*' ghes: '*' @@ -24,6 +24,6 @@ children: - /git-cheatsheet - /git-and-github-learning-resources redirect_from: - - /github/getting-started-with-github/quickstart/ + - /github/getting-started-with-github/quickstart --- diff --git a/translations/zh-CN/content/get-started/quickstart/set-up-git.md b/translations/zh-CN/content/get-started/quickstart/set-up-git.md index b7eb555a1952..2b916a6abb01 100644 --- a/translations/zh-CN/content/get-started/quickstart/set-up-git.md +++ b/translations/zh-CN/content/get-started/quickstart/set-up-git.md @@ -1,18 +1,18 @@ --- -title: 设置 Git +title: Set up Git redirect_from: - - /git-installation-redirect/ - - /linux-git-installation/ - - /linux-set-up-git/ - - /mac-git-installation/ - - /mac-set-up-git/ - - /set-up-git-redirect/ - - /win-git-installation/ - - /win-set-up-git/ + - /git-installation-redirect + - /linux-git-installation + - /linux-set-up-git + - /mac-git-installation + - /mac-set-up-git + - /set-up-git-redirect + - /win-git-installation + - /win-set-up-git - /articles/set-up-git - /github/getting-started-with-github/set-up-git - /github/getting-started-with-github/quickstart/set-up-git -intro: '{% data variables.product.prodname_dotcom %} 的核心是名为 Git 的开源版本控制系统 (VCS) 。 Git 负责在您计算机上本地发生的、与 {% data variables.product.prodname_dotcom %} 有关的所有内容。' +intro: 'At the heart of {% data variables.product.prodname_dotcom %} is an open source version control system (VCS) called Git. Git is responsible for everything {% data variables.product.prodname_dotcom %}-related that happens locally on your computer.' versions: fpt: '*' ghes: '*' @@ -24,29 +24,28 @@ topics: - Notifications - Accounts --- +## Using Git -## 使用 Git +To use Git on the command line, you'll need to download, install, and configure Git on your computer. You can also install {% data variables.product.prodname_cli %} to use {% data variables.product.prodname_dotcom %} from the command line. For more information, see "[About {% data variables.product.prodname_cli %}](/github-cli/github-cli/about-github-cli)." -要在命令行中使用 Git，您将需要在计算机上下载、安装和配置 Git。 You can also install {% data variables.product.prodname_cli %} to use {% data variables.product.prodname_dotcom %} from the command line. 更多信息请参阅“[关于 {% data variables.product.prodname_cli %}](/github-cli/github-cli/about-github-cli)”。 +If you want to work with Git locally, but don't want to use the command line, you can instead download and install the [{% data variables.product.prodname_desktop %}]({% data variables.product.desktop_link %}) client. For more information, see "[Installing and configuring {% data variables.product.prodname_desktop %}](/desktop/installing-and-configuring-github-desktop/)." -如果要在本地使用 Git，但不想使用命令行，您可以下载并安装 [{% data variables.product.prodname_desktop %}]({% data variables.product.desktop_link %}) 客户端。 更多信息请参阅“[安装和配置 {% data variables.product.prodname_desktop %}](/desktop/installing-and-configuring-github-desktop/)”。 +If you don't need to work with files locally, {% data variables.product.product_name %} lets you complete many Git-related actions directly in the browser, including: -如果无需在本地使用文件，{% data variables.product.product_name %} 可让您在浏览器中直接完成许多 Git 相关的操作，包括： +- [Creating a repository](/articles/create-a-repo) +- [Forking a repository](/articles/fork-a-repo) +- [Managing files](/repositories/working-with-files/managing-files) +- [Being social](/articles/be-social) -- [创建仓库](/articles/create-a-repo) -- [复刻仓库](/articles/fork-a-repo) -- [管理文件](/repositories/working-with-files/managing-files) -- [社交化](/articles/be-social) +## Setting up Git -## 设置 Git +1. [Download and install the latest version of Git](https://git-scm.com/downloads). +2. [Set your username in Git](/github/getting-started-with-github/setting-your-username-in-git). +3. [Set your commit email address in Git](/articles/setting-your-commit-email-address). -1. [下载并安装最新版本的 Git](https://git-scm.com/downloads)。 -2. [在 Git 中设置您的用户名](/github/getting-started-with-github/setting-your-username-in-git)。 -3. [在 Git 中设置提交电子邮件地址](/articles/setting-your-commit-email-address)。 +## Next steps: Authenticating with {% data variables.product.prodname_dotcom %} from Git -## 后续步骤：使用来自 Git 的 {% data variables.product.prodname_dotcom %} 进行身份验证 - -从 Git 连接到 {% data variables.product.prodname_dotcom %} 仓库时，您将需要使用 HTTPS 或 SSH 通过 {% data variables.product.product_name %} 进行身份验证。 +When you connect to a {% data variables.product.prodname_dotcom %} repository from Git, you'll need to authenticate with {% data variables.product.product_name %} using either HTTPS or SSH. {% note %} @@ -54,20 +53,20 @@ topics: {% endnote %} -### 通过 HTTPS 连接（推荐） +### Connecting over HTTPS (recommended) -如果[使用 HTTPS 克隆](/github/getting-started-with-github/about-remote-repositories/#cloning-with-https-urls)，您可以使用凭据小助手[在 Git 中缓存 {% data variables.product.prodname_dotcom %} 凭据](/github/getting-started-with-github/caching-your-github-credentials-in-git)。 +If you [clone with HTTPS](/github/getting-started-with-github/about-remote-repositories/#cloning-with-https-urls), you can [cache your {% data variables.product.prodname_dotcom %} credentials in Git](/github/getting-started-with-github/caching-your-github-credentials-in-git) using a credential helper. -### 通过 SSH 连接 +### Connecting over SSH -如果[使用 SSH 克隆](/github/getting-started-with-github/about-remote-repositories/#cloning-with-ssh-urls)，您必须在用于从 {% data variables.product.product_name %} 推送或拉取的每台计算机上[生成 SSH 密钥](/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent)。 +If you [clone with SSH](/github/getting-started-with-github/about-remote-repositories/#cloning-with-ssh-urls), you must [generate SSH keys](/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent) on each computer you use to push or pull from {% data variables.product.product_name %}. -## 祝贺 +## Celebrate -恭喜。您现在已将 Git 和 {% data variables.product.prodname_dotcom %} 全部设置完毕！ 您现在可以选择创建仓库以放置项目。 这是备份代码的好方法，易于在世界各地分享代码。 更多信息请参阅“[创建仓库](/articles/create-a-repo)”。 +Congratulations, you now have Git and {% data variables.product.prodname_dotcom %} all set up! You may now choose to create a repository where you can put your projects. This is a great way to back up your code and makes it easy to share the code around the world. For more information see "[Create a repository](/articles/create-a-repo)". -您可以通过复刻创建仓库的副本，并提出您希望看到的更改，而不会影响上游仓库。 更多信息请参阅“[复刻仓库](/articles/fork-a-repo)”。 +You can create a copy of a repository by forking it and propose the changes that you want to see without affecting the upstream repository. For more information see "[Fork a repository](/articles/fork-a-repo)." -Each repository on {% data variables.product.prodname_dotcom %} is owned by a person or an organization. 您可以在 {% data variables.product.product_name %} 上连接和关注人员、仓库和组织以与之进行交互。 更多信息请参阅“[社交](/articles/be-social)”。 +Each repository on {% data variables.product.prodname_dotcom %} is owned by a person or an organization. You can interact with the people, repositories, and organizations by connecting and following them on {% data variables.product.product_name %}. For more information see "[Be social](/articles/be-social)." {% data reusables.support.connect-in-the-forum-bootcamp %} diff --git a/translations/zh-CN/content/get-started/using-github/github-mobile.md b/translations/zh-CN/content/get-started/using-github/github-mobile.md new file mode 100644 index 000000000000..76e50e0dd828 --- /dev/null +++ b/translations/zh-CN/content/get-started/using-github/github-mobile.md @@ -0,0 +1,91 @@ +--- +title: GitHub Mobile +intro: 'Triage, collaborate, and manage your work on {% data variables.product.product_name %} from your mobile device.' +versions: + fpt: '*' + ghes: '*' + ghec: '*' +topics: + - Mobile +redirect_from: + - /get-started/using-github/github-for-mobile + - /github/getting-started-with-github/github-for-mobile + - /github/getting-started-with-github/using-github/github-for-mobile +--- +{% data reusables.mobile.ghes-release-phase %} + +## About {% data variables.product.prodname_mobile %} + +{% data reusables.mobile.about-mobile %} + +{% data variables.product.prodname_mobile %} gives you a way to do high-impact work on {% data variables.product.product_name %} quickly and from anywhere. {% data variables.product.prodname_mobile %} is a safe and secure way to access your {% data variables.product.product_name %} data through a trusted, first-party client application. + +With {% data variables.product.prodname_mobile %} you can: +- Manage, triage, and clear notifications +- Read, review, and collaborate on issues and pull requests +- Search for, browse, and interact with users, repositories, and organizations +- Receive a push notification when someone mentions your username + +For more information about notifications for {% data variables.product.prodname_mobile %}, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#enabling-push-notifications-with-github-mobile)." + +## Installing {% data variables.product.prodname_mobile %} + +To install {% data variables.product.prodname_mobile %} for Android or iOS, see [{% data variables.product.prodname_mobile %}](https://github.com/mobile). + +## Managing accounts + +You can be simultaneously signed into mobile with one user account on {% data variables.product.prodname_dotcom_the_website %} and one user account on {% data variables.product.prodname_ghe_server %}. + +{% data reusables.mobile.push-notifications-on-ghes %} + +{% data variables.product.prodname_mobile %} may not work with your enterprise if you're required to access your enterprise over VPN. + +### Prerequisites + +You must install {% data variables.product.prodname_mobile %} 1.4 or later on your device to use {% data variables.product.prodname_mobile %} with {% data variables.product.prodname_ghe_server %}. + +To use {% data variables.product.prodname_mobile %} with {% data variables.product.prodname_ghe_server %}, {% data variables.product.product_location %} must be version 3.0 or greater, and your enterprise owner must enable mobile support for your enterprise. For more information, see {% ifversion ghes %}"[Release notes](/enterprise-server/admin/release-notes)" and {% endif %}"[Managing {% data variables.product.prodname_mobile %} for your enterprise]({% ifversion not ghes %}/enterprise-server@latest{% endif %}/admin/configuration/configuring-your-enterprise/managing-github-mobile-for-your-enterprise){% ifversion not ghes %}" in the {% data variables.product.prodname_ghe_server %} documentation.{% else %}."{% endif %} + +During the beta for {% data variables.product.prodname_mobile %} with {% data variables.product.prodname_ghe_server %}, you must be signed in with a user account on {% data variables.product.prodname_dotcom_the_website %}. + +### Adding, switching, or signing out of accounts + +You can sign into mobile with a user account on {% data variables.product.product_location %}. At the bottom of the app, long-press {% octicon "person" aria-label="The person icon" %} **Profile**, then tap {% octicon "plus" aria-label="The plus icon" %} **Add Enterprise Account**. Follow the prompts to sign in. + +After you sign into mobile with a user account on {% data variables.product.product_location %}, you can switch between the account and your account on {% data variables.product.prodname_dotcom_the_website %}. At the bottom of the app, long-press {% octicon "person" aria-label="The person icon" %} **Profile**, then tap the account you want to switch to. + +If you no longer need to access data for your user account on {% data variables.product.product_location %} from {% data variables.product.prodname_mobile %}, you can sign out of the account. At the bottom of the app, long-press {% octicon "person" aria-label="The person icon" %} **Profile**, swipe left on the account to sign out of, then tap **Sign out**. + +## Supported languages for {% data variables.product.prodname_mobile %} + +{% data variables.product.prodname_mobile %} is available in the following languages. + +- English +- Japanese +- Brazilian Portuguese +- Simplified Chinese +- Spanish + +If you configure the language on your device to a supported language, {% data variables.product.prodname_mobile %} will default to the language. You can change the language for {% data variables.product.prodname_mobile %} in {% data variables.product.prodname_mobile %}'s **Settings** menu. + +## Managing Universal Links for {% data variables.product.prodname_mobile %} on iOS + +{% data variables.product.prodname_mobile %} automatically enables Universal Links for iOS. When you tap any {% data variables.product.product_name %} link, the destination URL will open in {% data variables.product.prodname_mobile %} instead of Safari. For more information, see [Universal Links](https://developer.apple.com/ios/universal-links/) on the Apple Developer site. + +To disable Universal Links, long-press any {% data variables.product.product_name %} link, then tap **Open**. Every time you tap a {% data variables.product.product_name %} link in the future, the destination URL will open in Safari instead of {% data variables.product.prodname_mobile %}. + +To re-enable Universal Links, long-press any {% data variables.product.product_name %} link, then tap **Open in {% data variables.product.prodname_dotcom %}**. + +## Sharing feedback + +If you find a bug in {% data variables.product.prodname_mobile %}, you can email us at mobilefeedback@github.com. + +You can submit feature requests or other feedback for {% data variables.product.prodname_mobile %} on [{% data variables.product.prodname_discussions %}](https://github.com/github/feedback/discussions?discussions_q=category%3A%22Mobile+Feedback%22). + +## Opting out of beta releases for iOS + +If you're testing a beta release of {% data variables.product.prodname_mobile %} for iOS using TestFlight, you can leave the beta at any time. + +1. On your iOS device, open the TestFlight app. +2. Under "Apps", tap **{% data variables.product.prodname_dotcom %}**. +3. At the bottom of the page, tap **Stop Testing**. diff --git a/translations/zh-CN/content/get-started/using-github/index.md b/translations/zh-CN/content/get-started/using-github/index.md index 5a261f04b34a..96ef3c0d9ce1 100644 --- a/translations/zh-CN/content/get-started/using-github/index.md +++ b/translations/zh-CN/content/get-started/using-github/index.md @@ -1,6 +1,6 @@ --- -title: 使用 GitHub -intro: '探索来自不同平台和设备的 {% data variables.product.company_short %} 产品。' +title: Using GitHub +intro: 'Explore {% data variables.product.company_short %}''s products from different platforms and devices.' redirect_from: - /articles/using-github - /github/getting-started-with-github/using-github/ @@ -14,9 +14,8 @@ children: - /supported-browsers - /github-cli - /github-desktop - - /github-for-mobile + - /github-mobile - /keyboard-shortcuts - /github-command-palette - /troubleshooting-connectivity-problems --- - diff --git a/translations/zh-CN/content/github/site-policy/github-terms-of-service.md b/translations/zh-CN/content/github/site-policy/github-terms-of-service.md index 0ca1a19af889..a52889b4c1c8 100644 --- a/translations/zh-CN/content/github/site-policy/github-terms-of-service.md +++ b/translations/zh-CN/content/github/site-policy/github-terms-of-service.md @@ -1,5 +1,5 @@ --- -title: GitHub 服务条款 +title: GitHub Terms of Service redirect_from: - /tos/ - /terms/ @@ -13,303 +13,303 @@ topics: - Legal --- -感谢您使用 GitHub！ 我们很高兴在这里与您邂逅。 在访问或使用 GitHub 之前，请仔细阅读本服务条款协议。 由于它是我们与用户之间的重要合同，因此我们尽可能明确阐述。 为方便起见，我们在列出完整的法律条款之前，用简短的非约束性摘要介绍这些条款。 +Thank you for using GitHub! We're happy you're here. Please read this Terms of Service agreement carefully before accessing or using GitHub. Because it is such an important contract between us and our users, we have tried to make it as clear as possible. For your convenience, we have presented these terms in a short non-binding summary followed by the full legal terms. -## 摘要 +## Summary -| 节 | 说明 | -| ----------------------------------------------------------- | ------------------------------------------------------------- | -| [A. 定义](#a-definitions) | 一些基本术语，其定义方式将有助于您理解此协议。 不明确时请回头参阅本节内容。 | -| [B. 帐户条款](#b-account-terms) | 这些是在GitHub 上开设帐户的基本要求。 | -| [C. 可接受的使用](#c-acceptable-use) | 这些是您使用 GitHub 帐户时必须遵循的基本规则。 | -| [D. 用户生成内容](#d-user-generated-content) | 您在 GitHub 上发布的内容归您所有。 但您对此负有一些责任，我们请您向我们授予一些权利，以便我们能够为您提供服务。 | -| [E. 私有仓库](#e-private-repositories) | 本节讨论 GitHub 如何处理您在私有仓库中发布的内容。 | -| [F. 版权和 DMCA 政策](#f-copyright-infringement-and-dmca-policy) | 本节介绍当您认为有人正在侵犯您在 GitHub 上的版权时，GitHub 将如何应对。 | -| [G. 知识产权通告](#g-intellectual-property-notice) | 说明 GitHub 在网站和服务中的权利。 | -| [H. API 条款](#h-api-terms) | 这些是使用 GitHub 的 API 时需遵守的规则，无论您是使用 API 来开发还是数据收集。 | -| [I. 附加产品条款](#i-github-additional-product-terms) | 我们对 GitHub 的功能和产品有一些具体的规则。 | -| [J. 测试版预览](#j-beta-previews) | 这些是适用于 GitHub 仍在开发中的功能的一些附加条款。 | -| [K. 付款](#k-payment) | 您负责付款。 我们负责对您准确计费。 | -| [L. 取消和终止](#l-cancellation-and-termination) | 您可以随时取消此协议并关闭您的帐户。 | -| [M. 与 GitHub 的通信](#m-communications-with-github) | 我们只使用电子邮件和其他电子方式与用户保持联系。 我们不提供电话支持。 | -| [N. 免责声明](#n-disclaimer-of-warranties) | 我们按原样提供服务，我们对此服务不作任何承诺或保证。 **请仔细阅读本节内容；您应该理解要求。** | -| [O. 责任限制](#o-limitation-of-liability) | 对因您使用或不能使用服务或本协议下产生的损害或损失，我们不承担责任。 **请仔细阅读本节内容；它限制了我们对您的义务。** | -| [P. 免除和赔偿](#p-release-and-indemnification) | 您对自己使用服务负全部责任。 | -| [Q. 这些服务条款的更改](#q-changes-to-these-terms) | 我们可能会修改本协议，但对于重大变更，我们会提前 30 天通知您。 | -| [R. 其他](#r-miscellaneous) | 关于法律详情，包括我们对法律的选择，请参阅本节内容。 | +| Section | What can you find there? | +| --- | --- | +| [A. Definitions](#a-definitions) | Some basic terms, defined in a way that will help you understand this agreement. Refer back up to this section for clarification. | +| [B. Account Terms](#b-account-terms) | These are the basic requirements of having an Account on GitHub. | +| [C. Acceptable Use](#c-acceptable-use)| These are the basic rules you must follow when using your GitHub Account. | +| [D. User-Generated Content](#d-user-generated-content) | You own the content you post on GitHub. However, you have some responsibilities regarding it, and we ask you to grant us some rights so we can provide services to you. | +| [E. Private Repositories](#e-private-repositories) | This section talks about how GitHub will treat content you post in private repositories. | +| [F. Copyright & DMCA Policy](#f-copyright-infringement-and-dmca-policy) | This section talks about how GitHub will respond if you believe someone is infringing your copyrights on GitHub. | +| [G. Intellectual Property Notice](#g-intellectual-property-notice) | This describes GitHub's rights in the website and service. | +| [H. API Terms](#h-api-terms) | These are the rules for using GitHub's APIs, whether you are using the API for development or data collection. | +| [I. Additional Product Terms](#i-github-additional-product-terms) | We have a few specific rules for GitHub's features and products. | +| [J. Beta Previews](#j-beta-previews) | These are some of the additional terms that apply to GitHub's features that are still in development. | +| [K. Payment](#k-payment) | You are responsible for payment. We are responsible for billing you accurately. | +| [L. Cancellation and Termination](#l-cancellation-and-termination) | You may cancel this agreement and close your Account at any time. | +| [M. Communications with GitHub](#m-communications-with-github) | We only use email and other electronic means to stay in touch with our users. We do not provide phone support. | +| [N. Disclaimer of Warranties](#n-disclaimer-of-warranties) | We provide our service as is, and we make no promises or guarantees about this service. **Please read this section carefully; you should understand what to expect.** | +| [O. Limitation of Liability](#o-limitation-of-liability) | We will not be liable for damages or losses arising from your use or inability to use the service or otherwise arising under this agreement. **Please read this section carefully; it limits our obligations to you.** | +| [P. Release and Indemnification](#p-release-and-indemnification) | You are fully responsible for your use of the service. | +| [Q. Changes to these Terms of Service](#q-changes-to-these-terms) | We may modify this agreement, but we will give you 30 days' notice of material changes. | +| [R. Miscellaneous](#r-miscellaneous) | Please see this section for legal details including our choice of law. | -## GitHub 服务条款 -生效日期：2020 年 11 月 16 日 +## The GitHub Terms of Service +Effective date: November 16, 2020 -## A. 定义 -**概述：***我们在整个协议中使用这些基本术语，它们具有特定含义。 在我们使用每个术语时，您应该了解我们表达的意思。 我们不会对定义进行检验，但它仍然是有用的信息。* +## A. Definitions +**Short version:** *We use these basic terms throughout the agreement, and they have specific meanings. You should know what we mean when we use each of the terms. There's not going to be a test on it, but it's still useful information.* -1. “帐户”代表您与 GitHub 之间的法律关系。 “用户帐户”代表单个用户登录和使用服务的授权，并在 GitHub 上作为用户的身份。 “组织”是可能与一个实体或者一个或多个用户相关联的共享工作空间，其中多个用户可以同时跨多个项目进行协作。 用户帐户可以是任意数量的组织之成员。 -2. “协议”是一种统称，包括本文档中包含或引用的所有条款、条件、通知（“服务条款”或“条款”）和所有其他操作规则、政策（包括 GitHub 隐私声明，请参阅 [github.com/site/privacy](https://github.com/site/privacy)），以及我们可能不时在网站上发布的程序。 我们大多数站点政策可在 [docs.github.com/categories/site-policy](/categories/site-policy) 上查阅。 -3. “测试版预览”是指识别为 alpha、beta、预览、提早访问或评估或者具有类似含义的字词或短语的软件、服务或功能。 -4. “内容”是指通过网站提供或显示的内容，包括但不限于通过网站或服务提供的代码、文本、数据、文章、图像、照片、图形、软件、应用程序、程序包、设计、功能及其他材料。 “内容”也包括服务。 “用户生成的内容”是由我们用户创建或上传的书面或其他形式的内容。 “您的内容”是您创建或拥有的内容。 -5. “GitHub”和“我们是指 GitHub Inc.，以及我们的附属公司、董事、子公司、承包商、许可人、高管、代理和员工。 -6. “服务”是指 GitHub 提供的应用程序、软件、产品和服务，包括任何测试版预览。 -7. “用户”、“您”和“您的”是指访问或使用网站或服务、访问或使用帐户的任何部分或指示使用帐户以执行其功能的个人、公司或组织。 用户必须年满 13 岁。 特殊条款可能适用于企业或政府帐户（请参阅[第 B(5) 节：附加条款](#5-additional-terms)）。 -8. “网站”是指 [github.com](https://github.com/) 上的 GitHub 网站，以及 GitHub 在该网站上或通过该网站提供的所有内容、服务和产品。 它还指代 GitHub 拥有的 github.com 子域，例如 [education.github.com](https://education.github.com/) 和 [pages.github.com](https://pages.github.com/)。 这些条款还适用于 GitHub 的会议网站（例如 [githubuniverse.com](https://githubuniverse.com/)）和产品网站（例如 [atom.io](https://atom.io/)）。 有时，GitHub 拥有的网站可能会提供不同或附加的服务条款。 如果这些附加条款与本协议有冲突，则以适用于相关页面或服务的更具体条款为准。 +1. An "Account" represents your legal relationship with GitHub. A “User Account” represents an individual User’s authorization to log in to and use the Service and serves as a User’s identity on GitHub. “Organizations” are shared workspaces that may be associated with a single entity or with one or more Users where multiple Users can collaborate across many projects at once. A User Account can be a member of any number of Organizations. +2. The “Agreement” refers, collectively, to all the terms, conditions, notices contained or referenced in this document (the “Terms of Service” or the "Terms") and all other operating rules, policies (including the GitHub Privacy Statement, available at [github.com/site/privacy](https://github.com/site/privacy)) and procedures that we may publish from time to time on the Website. Most of our site policies are available at [docs.github.com/categories/site-policy](/categories/site-policy). +3. "Beta Previews" mean software, services, or features identified as alpha, beta, preview, early access, or evaluation, or words or phrases with similar meanings. +4. “Content” refers to content featured or displayed through the Website, including without limitation code, text, data, articles, images, photographs, graphics, software, applications, packages, designs, features, and other materials that are available on the Website or otherwise available through the Service. "Content" also includes Services. “User-Generated Content” is Content, written or otherwise, created or uploaded by our Users. "Your Content" is Content that you create or own. +5. “GitHub,” “We,” and “Us” refer to GitHub, Inc., as well as our affiliates, directors, subsidiaries, contractors, licensors, officers, agents, and employees. +6. The “Service” refers to the applications, software, products, and services provided by GitHub, including any Beta Previews. +7. “The User,” “You,” and “Your” refer to the individual person, company, or organization that has visited or is using the Website or Service; that accesses or uses any part of the Account; or that directs the use of the Account in the performance of its functions. A User must be at least 13 years of age. Special terms may apply for business or government Accounts (See [Section B(5): Additional Terms](#5-additional-terms)). +8. The “Website” refers to GitHub’s website located at [github.com](https://github.com/), and all content, services, and products provided by GitHub at or through the Website. It also refers to GitHub-owned subdomains of github.com, such as [education.github.com](https://education.github.com/) and [pages.github.com](https://pages.github.com/). These Terms also govern GitHub’s conference websites, such as [githubuniverse.com](https://githubuniverse.com/), and product websites, such as [atom.io](https://atom.io/). Occasionally, websites owned by GitHub may provide different or additional terms of service. If those additional terms conflict with this Agreement, the more specific terms apply to the relevant page or service. -## B. 帐户条款 -**概述：***用户帐户和组织具有不同的管理控制权；每个用户必须创建自己的帐户；必须年满 13 岁；必须提供有效的电子邮件地址；并且不能拥有一个以上的免费帐户。 您自行负责自己的帐户以及登录或使用帐户时发生的任何事情。 您有责任确保自己的帐户安全。* +## B. Account Terms +**Short version:** *User Accounts and Organizations have different administrative controls; a human must create your Account; you must be 13 or over; you must provide a valid email address; and you may not have more than one free Account. You alone are responsible for your Account and anything that happens while you are signed in to or using your Account. You are responsible for keeping your Account secure.* -### 1. 帐户控制 -- 用户. 在符合这些条款的情况下，您对自己的用户帐户及其中的内容具有最终管理控制权。 +### 1. Account Controls +- Users. Subject to these Terms, you retain ultimate administrative control over your User Account and the Content within it. -- 组织. 根据这些条款创建的组织之所有者，对该组织及其中的内容具有最终管理控制权。 在服务中，所有者可以管理用户对组织数据和项目的访问。 一个组织可以有多个所有者，但必须至少指定一个用户帐户为组织的所有者。 如果您是这些条款下的组织之所有者，我们认为您应该对在该组织上或通过该组织执行的操作负责。 +- Organizations. The "owner" of an Organization that was created under these Terms has ultimate administrative control over that Organization and the Content within it. Within the Service, an owner can manage User access to the Organization’s data and projects. An Organization may have multiple owners, but there must be at least one User Account designated as an owner of an Organization. If you are the owner of an Organization under these Terms, we consider you responsible for the actions that are performed on or through that Organization. -### 2. 必需信息 -您必须提供有效的电子邮件地址才能完成注册过程。 要求的任何其他信息（例如您的真实姓名）都是可选的，除非您代表法律实体接受这些条款（在这种情况下，我们需要有关该法律实体的更多信息），或者您选择[付费帐户](#k-payment)（在这种情况下，出于计费目的需要您提供其他信息）。 +### 2. Required Information +You must provide a valid email address in order to complete the signup process. Any other information requested, such as your real name, is optional, unless you are accepting these terms on behalf of a legal entity (in which case we need more information about the legal entity) or if you opt for a [paid Account](#k-payment), in which case additional information will be necessary for billing purposes. -### 3. 帐户要求 -对于 GitHub 服务上的用户帐户，我们有一些简单的规则。 -- 只允许人类创建帐户。 不允许通过“自动程序”或其他自动方法注册帐户。 我们允许机器帐户： -- 机器帐户是由代表该帐户接受条款、提供有效电子邮件地址并对其操作负责的个人所建立的帐户。 机器帐户专用于执行自动化任务。 多个用户可以指示一个机器帐户的操作，但该帐户的所有者对机器的操作承担最终责任。 除了免费用户帐户之外，您最多可以拥有一个免费机器帐户。 -- 一个人或一个法律实体最多可以拥有一个免费帐户（如果您选择还控制一个机器帐户，没问题，但是它只能用于运行机器）。 -- 用户必须年满 13 岁。 虽然我们很高兴看到优秀的年轻编码者热衷于学习编程，但我们必须遵守美国法律。 GitHub 并未针对 13 岁以下的儿童定制服务，因此我们不允许任何 13 岁以下的用户使用我们的服务。 如果我们发现任何用户未满 13 岁，我们将[立即终止该用户的帐户](#l-cancellation-and-termination)。 如果您是美国以外的国家/地区的居民，您所在国家/地区规定的最低年龄可能会更大；在这种情况下，您有责任遵守您所在国家/地区的法律。 -- 您的登录名只能由一个人使用，即不允许多人共享一个登录名。 付费组织只能在订阅允许的范围内向多个用户帐户提供访问权限。 -- 不得违反美国或任何其他适用司法管辖区的出口管制或制裁法律使用 GitHub。 如果您是[特别指定国民 (SDN)](https://www.treasury.gov/resource-center/sanctions/SDN-List/Pages/default.aspx)或被美国政府机构实施的类似封锁或被拒方禁令所限制的个人，或者代表他们工作，则您不得使用 GitHub。 政府机构。 GitHub 可能会根据美国政府的授权，允许某些受制裁国家或地区的人访问某些 GitHub 服务。 政府授权。 更多信息请参阅我们的[出口管制政策](/articles/github-and-export-controls)。 +### 3. Account Requirements +We have a few simple rules for User Accounts on GitHub's Service. +- You must be a human to create an Account. Accounts registered by "bots" or other automated methods are not permitted. We do permit machine accounts: +- A machine account is an Account set up by an individual human who accepts the Terms on behalf of the Account, provides a valid email address, and is responsible for its actions. A machine account is used exclusively for performing automated tasks. Multiple users may direct the actions of a machine account, but the owner of the Account is ultimately responsible for the machine's actions. You may maintain no more than one free machine account in addition to your free User Account. +- One person or legal entity may maintain no more than one free Account (if you choose to control a machine account as well, that's fine, but it can only be used for running a machine). +- You must be age 13 or older. While we are thrilled to see brilliant young coders get excited by learning to program, we must comply with United States law. GitHub does not target our Service to children under 13, and we do not permit any Users under 13 on our Service. If we learn of any User under the age of 13, we will [terminate that User’s Account immediately](#l-cancellation-and-termination). If you are a resident of a country outside the United States, your country’s minimum age may be older; in such a case, you are responsible for complying with your country’s laws. +- Your login may only be used by one person — i.e., a single login may not be shared by multiple people. A paid Organization may only provide access to as many User Accounts as your subscription allows. +- You may not use GitHub in violation of export control or sanctions laws of the United States or any other applicable jurisdiction. You may not use GitHub if you are or are working on behalf of a [Specially Designated National (SDN)](https://www.treasury.gov/resource-center/sanctions/SDN-List/Pages/default.aspx) or a person subject to similar blocking or denied party prohibitions administered by a U.S. government agency. GitHub may allow persons in certain sanctioned countries or territories to access certain GitHub services pursuant to U.S. government authorizations. For more information, please see our [Export Controls policy](/articles/github-and-export-controls). -### 4. 用户帐户安全 -在使用我们的服务时，您负责维护您的帐户安全。 我们提供双重身份验证等工具，帮助您维护帐户的安全性，但您的帐户内容及其安全性取决于您。 -- 您对在您的帐户下发布的所有内容和活动负责（即使是拥有帐户的其他人在您的帐户下发布的内容）。 -- 您负责维护您的帐户和密码的安全。 GitHub 不能也不会对您未能遵守此安全保护义务而造成的任何损失或损害承担责任。 -- 如果您获悉通过您的帐户发生任何未授权的服务使用或访问，包括对您的密码或帐户的任何未授权使用，请立即[通知 GitHub](https://support.github.com/contact?tags=docs-policy)。 +### 4. User Account Security +You are responsible for keeping your Account secure while you use our Service. We offer tools such as two-factor authentication to help you maintain your Account's security, but the content of your Account and its security are up to you. +- You are responsible for all content posted and activity that occurs under your Account (even when content is posted by others who have Accounts under your Account). +- You are responsible for maintaining the security of your Account and password. GitHub cannot and will not be liable for any loss or damage from your failure to comply with this security obligation. +- You will promptly [notify GitHub](https://support.github.com/contact?tags=docs-policy) if you become aware of any unauthorized use of, or access to, our Service through your Account, including any unauthorized use of your password or Account. -### 5. 附加条款 -在某些情况下，第三方的条款可能适用于您对 GitHub 的使用。 例如，您可能是 GitHub 上本身具有条款或许可协议的组织的成员；您可能下载与 GitHub 相集成的应用程序；或者，您可能使用 GitHub 来验证另一项服务。 请注意，虽然这些条款是我们与完全协商一致的，但其他方的条款则制约着他们与你的关系。 +### 5. Additional Terms +In some situations, third parties' terms may apply to your use of GitHub. For example, you may be a member of an organization on GitHub with its own terms or license agreements; you may download an application that integrates with GitHub; or you may use GitHub to authenticate to another service. Please be aware that while these Terms are our full agreement with you, other parties' terms govern their relationships with you. -如果您是政府用户或者在政府部门访问或使用 GitHub 服务，则 [GitHub 服务条款政府修正](/articles/amendment-to-github-terms-of-service-applicable-to-u-s-federal-government-users/)适用，并且您同意其条款。 +If you are a government User or otherwise accessing or using any GitHub Service in a government capacity, this [Government Amendment to GitHub Terms of Service](/articles/amendment-to-github-terms-of-service-applicable-to-u-s-federal-government-users/) applies to you, and you agree to its provisions. -如果您注册了 GitHub Enterprise Cloud，则 [Enterprise Cloud 附录](/articles/github-enterprise-cloud-addendum/)适用于您，并且您同意其规定。 +If you have signed up for GitHub Enterprise Cloud, the [Enterprise Cloud Addendum](/articles/github-enterprise-cloud-addendum/) applies to you, and you agree to its provisions. -## C. 可接受的使用 -**短版本：** *GitHub 托管全球各地大量的协作项目，仅当用户能够善意一起工作时，该协作才能正常进行。 在使用服务时，必须遵守此部分的条款，包括对您可以发布的内容、对服务的操作的一些限制，以及其他限制规定。 简言之，要互惠互利。* +## C. Acceptable Use +**Short version:** *GitHub hosts a wide variety of collaborative projects from all over the world, and that collaboration only works when our users are able to work together in good faith. While using the service, you must follow the terms of this section, which include some restrictions on content you can post, conduct on the service, and other limitations. In short, be excellent to each other.* -您对网站和服务的使用不得违反任何相关法律，包括版权法或商标法、出口管制或制裁法律，或您的司法管辖区的法规。 您有责任确保您对服务的使用符合法律和任何适用条例。 +Your use of the Website and Service must not violate any applicable laws, including copyright or trademark laws, export control or sanctions laws, or other laws in your jurisdiction. You are responsible for making sure that your use of the Service is in compliance with laws and any applicable regulations. -您同意在任何情况下都不会违反我们的[可接受使用政策](/articles/github-acceptable-use-policies)或[社区指导方针](/articles/github-community-guidelines)。 +You agree that you will not under any circumstances violate our [Acceptable Use Policies](/articles/github-acceptable-use-policies) or [Community Guidelines](/articles/github-community-guidelines). -## D. 用户生成内容 -**短版本：** *您创建的内容归您所有，但您允许我们对其拥有某些权限，以便我们能够显示和分享您发布的内容。 您仍然可以控制您的内容并对其负责，您授予我们的权利仅限于我们提供服务所需的权利。 如果我们需要，我们有权删除内容或关闭帐户。* +## D. User-Generated Content +**Short version:** *You own content you create, but you allow us certain rights to it, so that we can display and share the content you post. You still have control over your content, and responsibility for it, and the rights you grant us are limited to those we need to provide the service. We have the right to remove content or close Accounts if we need to.* -### 1. 关于用户生成内容的责任 -您在使用服务时可能创建或上传用户生成的内容。 对于您发布、上传、链接或通过服务提供的任何用户生成内容，无论内容的形式如何，您对其内容以及由此造成的任何伤害负有全部责任。 我们对用户生成内容的任何公开显示或滥用概不负责。 +### 1. Responsibility for User-Generated Content +You may create or upload User-Generated Content while using the Service. You are solely responsible for the content of, and for any harm resulting from, any User-Generated Content that you post, upload, link to or otherwise make available via the Service, regardless of the form of that Content. We are not responsible for any public display or misuse of your User-Generated Content. -### 2. GitHub 可删除内容 -我们有权删除我们认为违反了任何法律或 [GitHub 条款或政策](/github/site-policy)的用户生成内容。 移动版 GitHub 上显示的用户生成内容可能受移动应用商店附加条款的约束。 +### 2. GitHub May Remove Content +We have the right to refuse or remove any User-Generated Content that, in our sole discretion, violates any laws or [GitHub terms or policies](/github/site-policy). User-Generated Content displayed on GitHub Mobile may be subject to mobile app stores' additional terms. -### 3. 内容所有权、发布权利和许可授予 -您对您的内容保有所有权和责任。 如果您发布不是您自己创建或者您没有所有权的内容，则您同意对您发布的任何内容负责；您只会提交您有权发布的内容；并且您将完全遵守与您发布的内容有关的任何第三方许可。 +### 3. Ownership of Content, Right to Post, and License Grants +You retain ownership of and responsibility for Your Content. If you're posting anything you did not create yourself or do not own the rights to, you agree that you are responsible for any Content you post; that you will only submit Content that you have the right to post; and that you will fully comply with any third party licenses relating to Content you post. -因为您对您的内容保有所有权和责任，所以我们需要授予我们——及其他 GitHub 用户——第 D.4 — D.7 部分所列的某些法律权限。 这些许可授予适用于您的内容。 如果您上传的内容具有已经向 GitHub 授予运行服务所需权限的许可，则无需其他许可。 您了解，您对第 D.4-D.7 部分授予的任何权利不会收取任何费用。 您授予我们的许可将在您从我们的服务器删除您的内容后结束，除非其他用户已经复刻它。 +Because you retain ownership of and responsibility for Your Content, we need you to grant us — and other GitHub Users — certain legal permissions, listed in Sections D.4 — D.7. These license grants apply to Your Content. If you upload Content that already comes with a license granting GitHub the permissions we need to run our Service, no additional license is required. You understand that you will not receive any payment for any of the rights granted in Sections D.4 — D.7. The licenses you grant to us will end when you remove Your Content from our servers, unless other Users have forked it. -### 4. 向我们授予许可 -我们需要合法的权利来为您服务，例如托管、发布以及分享您的内容。 您授权我们和我们的合法继承者存储、存档、解析和显示您的内容，以及制作附带副本，但限于提供服务的目的，包括逐步改进服务。 此许可包括如下权利：将您的内容复制到我们的数据库并制作备份；向您及其他用户显示；将其解析为搜索索引或在我们的服务器上分析；与其他用户分享；执行（如果您的内容是音乐或视频之类的内容）。 +### 4. License Grant to Us +We need the legal right to do things like host Your Content, publish it, and share it. You grant us and our legal successors the right to store, archive, parse, and display Your Content, and make incidental copies, as necessary to provide the Service, including improving the Service over time. This license includes the right to do things like copy it to our database and make backups; show it to you and other users; parse it into a search index or otherwise analyze it on our servers; share it with other users; and perform it, in case Your Content is something like music or video. -此许可不授予 GitHub 出售您的内容的权利。 它也不授予 GitHub 出于提供服务之外的目的分发或使用您的内容的权利，但作为存档内容的权利的一部分，GitHub 可能允许我们的合作伙伴在与 [GitHub Arctic Code Vault 和 GitHub Archive Program](https://archiveprogram.github.com/) 相关联的公共仓库中存储和存档您的内容。 +This license does not grant GitHub the right to sell Your Content. It also does not grant GitHub the right to otherwise distribute or use Your Content outside of our provision of the Service, except that as part of the right to archive Your Content, GitHub may permit our partners to store and archive Your Content in public repositories in connection with the [GitHub Arctic Code Vault and GitHub Archive Program](https://archiveprogram.github.com/). -### 5. 向其他用户授予许可 -您公开发布的任何用户生成内容，包括议题、评论以及对其他用户仓库的贡献，都可供其他人查看。 设置公开显示您的仓库，即表示您同意允许他人查看和“复刻”您的仓库（这意味着他人可以从他们控制的仓库自行复制您仓库中的内容）。 +### 5. License Grant to Other Users +Any User-Generated Content you post publicly, including issues, comments, and contributions to other Users' repositories, may be viewed by others. By setting your repositories to be viewed publicly, you agree to allow others to view and "fork" your repositories (this means that others may make their own copies of Content from your repositories in repositories they control). -如果您将页面和仓库设为公开显示，则表示您向每个用户授予非独占、全球许可，允许他们通过 GitHub 服务使用、显示和执行您的内容，以及通过 GitHub 的功能（例如通过复刻）只在 GitHub 上重制您的内容。 如果您[采用许可](/articles/adding-a-license-to-a-repository/#including-an-open-source-license-in-your-repository)，您得授予进一步的权利。 如果您上传不是您创建或拥有的内容，则您负责确保上传的内容根据向其他 GitHub 用户授予这些许可的条款进行许可。 +If you set your pages and repositories to be viewed publicly, you grant each User of GitHub a nonexclusive, worldwide license to use, display, and perform Your Content through the GitHub Service and to reproduce Your Content solely on GitHub as permitted through GitHub's functionality (for example, through forking). You may grant further rights if you [adopt a license](/articles/adding-a-license-to-a-repository/#including-an-open-source-license-in-your-repository). If you are uploading Content you did not create or own, you are responsible for ensuring that the Content you upload is licensed under terms that grant these permissions to other GitHub Users. -### 6. 仓库许可下的参与。 -只要您向包含许可通告的仓库添加内容，则表示您在相同的条款下许可该内容，并且同意其有权利在这些条款下许可该内容。 如果您使用单独的协议在不同的条款下许可该内容，如参与者许可协议，则该协议优先。 +### 6. Contributions Under Repository License +Whenever you add Content to a repository containing notice of a license, you license that Content under the same terms, and you agree that you have the right to license that Content under those terms. If you have a separate agreement to license that Content under different terms, such as a contributor license agreement, that agreement will supersede. -不只是它如此运作吧？ 对。 这在开源社区中广泛接受的行为规范；通常被简称为“入站=出站”。 我们只是将它明确化了。 +Isn't this just how it works already? Yep. This is widely accepted as the norm in the open-source community; it's commonly referred to by the shorthand "inbound=outbound". We're just making it explicit. -### 7. 精神权利 -对您上传、发布或提交到服务任何部分的内容，您保留所有精神权利，包括完整性和归属的权利。 但您对 GitHub 放弃这些权利并且同意不宣称这些权利，以便我们合理行使第 D.4 部分授予的权利，而没有任何其他目的。 +### 7. Moral Rights +You retain all moral rights to Your Content that you upload, publish, or submit to any part of the Service, including the rights of integrity and attribution. However, you waive these rights and agree not to assert them against us, to enable us to reasonably exercise the rights granted in Section D.4, but not otherwise. -在适用法律不能强制执行本协议的范围内，您授权 GitHub 无归属使用您的内容，并在必要时对您的内容进行合理的修改，以便呈现网站和提供服务。 +To the extent this agreement is not enforceable by applicable law, you grant GitHub the rights we need to use Your Content without attribution and to make reasonable adaptations of Your Content as necessary to render the Website and provide the Service. -## E. 私有仓库 -**概述：** *我们将私有仓库的内容视为机密信息，我们仅按照隐私声明中的规定访问它 — 出于安全目的、为了帮助仓库所有者解决支持问题、保持服务的完整性、履行我们的法律义务、我们有理由认为内容违法或者经您同意。* +## E. Private Repositories +**Short version:** *We treat the content of private repositories as confidential, and we only access it as described in our Privacy Statement—for security purposes, to assist the repository owner with a support matter, to maintain the integrity of the Service, to comply with our legal obligations, if we have reason to believe the contents are in violation of the law, or with your consent.* -### 1. 私有仓库的控制 -某些帐户可能有私有仓库，允许用户控制对内容的访问。 +### 1. Control of Private Repositories +Some Accounts may have private repositories, which allow the User to control access to Content. -### 2. 私有仓库的保密 -GitHub 将私有仓库的内容视为您的机密。 GitHub 将保护私有仓库的内容，防止受未授权的使用和访问，在披露时就像处理我们自己性质类似的机密信息一样，在任何情况下都不低于合理的谨慎程度。 +### 2. Confidentiality of Private Repositories +GitHub considers the contents of private repositories to be confidential to you. GitHub will protect the contents of private repositories from unauthorized use, access, or disclosure in the same manner that we would use to protect our own confidential information of a similar nature and in no event with less than a reasonable degree of care. -### 3. 访问 -GitHub 工作人员只能在我们的[隐私声明](/github/site-policy/github-privacy-statement#repository-contents)所述的情况下访问您私有仓库的内容。 +### 3. Access +GitHub personnel may only access the content of your private repositories in the situations described in our [Privacy Statement](/github/site-policy/github-privacy-statement#repository-contents). -您可选择对您私有仓库启用其他访问权限。 例如： -- 例如，您可向不同的 GitHub 服务或功能授予对私有仓库中您的内容的额外访问权限。 这些权限可能因服务或功能而异，但 GitHub 将继续将您的私有仓库内容视为机密。 如果这些服务或功能除了提供 GitHub 服务所需的权限之前，还需要其他权限，我们将会说明这些权限。 +You may choose to enable additional access to your private repositories. For example: +- You may enable various GitHub services or features that require additional rights to Your Content in private repositories. These rights may vary depending on the service or feature, but GitHub will continue to treat your private repository Content as confidential. If those services or features require rights in addition to those we need to provide the GitHub Service, we will provide an explanation of those rights. -此外，我们可能[按法律要求](/github/site-policy/github-privacy-statement#for-legal-disclosure)披露您的私有仓库的内容。 +Additionally, we may be [compelled by law](/github/site-policy/github-privacy-statement#for-legal-disclosure) to disclose the contents of your private repositories. -GitHub 将提供有关我们访问私有仓库内容的通知，访问的目的无外乎[为了法律披露](/github/site-policy/github-privacy-statement#for-legal-disclosure)，为了履行我们的法律义务或遵循法律要求的其他约束，提供自动扫描，或者应对安全威胁或其他安全风险。 +GitHub will provide notice regarding our access to private repository content, unless [for legal disclosure](/github/site-policy/github-privacy-statement#for-legal-disclosure), to comply with our legal obligations, or where otherwise bound by requirements under law, for automated scanning, or if in response to a security threat or other risk to security. -## F. 版权侵权和 DMCA 政策 -如果您认为我们网站上的内容侵犯了您的版权， 请按照我们的[数字千禧年版权法政策](/articles/dmca-takedown-policy/)联系我们。 如果您是版权所有者并且您认为 GitHub 上的内容侵犯了您的权利，请通过[我们便利的 DMCA 表](https://github.com/contact/dmca)联系我们，或发送电子邮件到 copyright@github.com。 发出虚假或无聊的撤销通知可能会产生法律后果。 在发送撤销请求之前，您必须考虑合法用途，如公平使用和许可使用。 +## F. Copyright Infringement and DMCA Policy +If you believe that content on our website violates your copyright, please contact us in accordance with our [Digital Millennium Copyright Act Policy](/articles/dmca-takedown-policy/). If you are a copyright owner and you believe that content on GitHub violates your rights, please contact us via [our convenient DMCA form](https://github.com/contact/dmca) or by emailing copyright@github.com. There may be legal consequences for sending a false or frivolous takedown notice. Before sending a takedown request, you must consider legal uses such as fair use and licensed uses. -我们将终止此政策[反复违反者](/articles/dmca-takedown-policy/#e-repeated-infringement)的帐户。 +We will terminate the Accounts of [repeat infringers](/articles/dmca-takedown-policy/#e-repeated-infringement) of this policy. -## G. 知识产权通告 -**短版本：** *我们拥有服务和我们的所有内容。 为便于您使用我们的内容，我们向您授予某些权限，但你只能以我们允许的方式使用我们的内容。* +## G. Intellectual Property Notice +**Short version:** *We own the service and all of our content. In order for you to use our content, we give you certain rights to it, but you may only use our content in the way we have allowed.* -### 1. GitHub 对内容的权利 -GitHub 和我们的许可人、供应商、代理和/或我们的内容提供者保留对与网站和服务所有知识产权的所有权。 我们保留本协议或法律未明确授予您的所有权利。 网站和服务外观的版权归 © GitHub, Inc. 所有。 未经 GitHub 明确的书面许可，您不得重复、复制或重复使用 HTML/CSS、Javascript 或者可视设计元素或概念的任何部分。 +### 1. GitHub's Rights to Content +GitHub and our licensors, vendors, agents, and/or our content providers retain ownership of all intellectual property rights of any kind related to the Website and Service. We reserve all rights that are not expressly granted to you under this Agreement or by law. The look and feel of the Website and Service is copyright © GitHub, Inc. All rights reserved. You may not duplicate, copy, or reuse any portion of the HTML/CSS, Javascript, or visual design elements or concepts without express written permission from GitHub. -### 2. GitHub 商标和徽标 -如果您想要使用 GitHub 的商标，必须遵循我们所有的商标指南，包括我们徽标页面 https://github.com/logos 上的指南。 +### 2. GitHub Trademarks and Logos +If you’d like to use GitHub’s trademarks, you must follow all of our trademark guidelines, including those on our logos page: https://github.com/logos. -### 3. GitHub 政策的许可 -本协议的许可采用[知识共享零许可](https://creativecommons.org/publicdomain/zero/1.0/)原则。 更多信息请参阅我们的[站点政策仓库](https://github.com/github/site-policy#license)。 +### 3. License to GitHub Policies +This Agreement is licensed under this [Creative Commons Zero license](https://creativecommons.org/publicdomain/zero/1.0/). For details, see our [site-policy repository](https://github.com/github/site-policy#license). -## H. API 条款 -**短版本：** *在使用 GitHub 的任何 API（应用程序提供商界面）时，您同意这些服务条款以及本 H 部分，包括通过第三方产品使用 API 访问GitHub。* +## H. API Terms +**Short version:** *You agree to these Terms of Service, plus this Section H, when using any of GitHub's APIs (Application Provider Interface), including use of the API through a third party product that accesses GitHub.* -滥用或过于频繁地通过 API 请求 GitHub 可能导致暂时或永久中止您的帐户访问 API。 GitHub 将单方面决定是否滥用或过度使用 API。 在暂停帐户之前，我们采取合理的努力通过电子邮件警告您。 +Abuse or excessively frequent requests to GitHub via the API may result in the temporary or permanent suspension of your Account's access to the API. GitHub, in our sole discretion, will determine abuse or excessive usage of the API. We will make a reasonable attempt to warn you via email prior to suspension. -您不能分享超过 GitHub 比率限制的 API 令牌。 +You may not share API tokens to exceed GitHub's rate limitations. -您不能使用 API 从 GitHub 下载数据或内容用于垃圾邮件，包括出售 GitHub 用户的个人信息，如招募者、猎头和招聘网站。 +You may not use the API to download data or Content from GitHub for spamming purposes, including for the purposes of selling GitHub users' personal information, such as to recruiters, headhunters, and job boards. -GitHub API 的所有使用都必须遵守这些服务条款和 [GitHub 隐私声明](https://github.com/site/privacy)。 +All use of the GitHub API is subject to these Terms of Service and the [GitHub Privacy Statement](https://github.com/site/privacy). -GitHub 可为需要高通量访问或者会导致 GitHub 服务转售的访问的用户提供基于订阅的 API 访问。 +GitHub may offer subscription-based access to our API for those Users who require high-throughput access or access that would result in resale of GitHub's Service. -## I. GitHub 附加产品条款 -**短版本：** *您需要按照 GitHub 不同功能和产品的特定条款和条件，并且在同意本协议时也同意补充条款和条件。* +## I. GitHub Additional Product Terms +**Short version:** *You need to follow certain specific terms and conditions for GitHub's various features and products, and you agree to the Supplemental Terms and Conditions when you agree to this Agreement.* -某些服务功能可能受 GitHub 附加产品条款中规定的该功能或产品特定附加条款的约束。 访问或使用服务即表示您也同意 [GitHub 附加产品条款](/github/site-policy/github-additional-product-terms)。 +Some Service features may be subject to additional terms specific to that feature or product as set forth in the GitHub Additional Product Terms. By accessing or using the Services, you also agree to the [GitHub Additional Product Terms](/github/site-policy/github-additional-product-terms). -## J. 测试版预览 -**短版本：** *测试版预览可能不支持或随时更改。 您可以通过这些程序接收机密信息，在程序为私有时，这些信息必须保密。 我们希望您的反馈能改进我们的测试版预览。* +## J. Beta Previews +**Short version:** *Beta Previews may not be supported or may change at any time. You may receive confidential information through those programs that must remain confidential while the program is private. We'd love your feedback to make our Beta Previews better.* -### 1. 可能会变动 +### 1. Subject to Change -测试版预览不受支持，可能随时更改而不另行通知。 此外，测试版预览不像服务一样采取同样的安全措施和审核。 **使用测试版预览的风险您自行承担。** +Beta Previews may not be supported and may be changed at any time without notice. In addition, Beta Previews are not subject to the same security measures and auditing to which the Service has been and is subject. **By using a Beta Preview, you use it at your own risk.** -### 2. 保密 +### 2. Confidentiality -作为测试版预览的用户，您可能有权访问在世界上其他地方无法获取的特殊信息。 鉴于此类信息的敏感性，确保您对此类信息保密对我们而言非常重要。 +As a user of Beta Previews, you may get access to special information that isn’t available to the rest of the world. Due to the sensitive nature of this information, it’s important for us to make sure that you keep that information secret. -**保密义务。**您同意，我们向您提供的任何非公开信息，例如关于私有测试版预览的信息，均应视为 GitHub 的机密信息（统称为“机密信息”），无论其是否被标记或标识为机密信息。 您同意，只将此类机密信息用于测试和评估预测试版预览的目的（“目的”），而不得用于任何其他用途。 您应该像对待自己的机密信息一样保护我们的机密信息，并且至少要采取合理的预防措施，以防止未经授权使用、披露、发布或传播我们的机密信息。 您承诺不向任何第三方披露、公布或传播任何机密信息，除非我们不禁止或限制此种披露（例如，您可能参与了 GitHub 组建的关于私人测试版预览功能的小组讨论）。 +**Confidentiality Obligations.** You agree that any non-public Beta Preview information we give you, such as information about a private Beta Preview, will be considered GitHub’s confidential information (collectively, “Confidential Information”), regardless of whether it is marked or identified as such. You agree to only use such Confidential Information for the express purpose of testing and evaluating the Beta Preview (the “Purpose”), and not for any other purpose. You should use the same degree of care as you would with your own confidential information, but no less than reasonable precautions to prevent any unauthorized use, disclosure, publication, or dissemination of our Confidential Information. You promise not to disclose, publish, or disseminate any Confidential Information to any third party, unless we don’t otherwise prohibit or restrict such disclosure (for example, you might be part of a GitHub-organized group discussion about a private Beta Preview feature). -**例外。**机密信息不包括如下信息：(a) 不是因为您违反本协议的行为或不作为而变得公开的信息（例如当私人测试版预览变成公开测试版预览时）；(b) 在我们向你披露之前您已知道；(c) 由您独立开发，且不违反对我们或任何第三方的任何保密义务；或 (d) 经 GitHub 许可披露。 如果法律要求您披露机密信息，则不视同违反本协定的条款，但要合理事先书面通知 GitHub，除非法律禁止事先通知。 +**Exceptions.** Confidential Information will not include information that is: (a) or becomes publicly available without breach of this Agreement through no act or inaction on your part (such as when a private Beta Preview becomes a public Beta Preview); (b) known to you before we disclose it to you; (c) independently developed by you without breach of any confidentiality obligation to us or any third party; or (d) disclosed with permission from GitHub. You will not violate the terms of this Agreement if you are required to disclose Confidential Information pursuant to operation of law, provided GitHub has been given reasonable advance written notice to object, unless prohibited by law. -### 3. 反馈 +### 3. Feedback -我们一直在努力改进产品和服务，作为测试版预览的用户，您的反馈将有助于我们的改进。 如果您选择提供关于我们产品或服务的任何想法、知识、算法、代码贡献、意见、增强要求、建议或任何其他反馈（统称为“反馈”），则表示您确认并同意，GitHub 将对反馈拥有免版税、全部付清、全球范围、可转让、可再许可、不可撤销且永久性的许可，有权实施、使用、修改及商业利用反馈和 /或将反馈纳入我们的产品、服务和文档中。 +We’re always trying to improve of products and services, and your feedback as a Beta Preview user will help us do that. If you choose to give us any ideas, know-how, algorithms, code contributions, suggestions, enhancement requests, recommendations or any other feedback for our products or services (collectively, “Feedback”), you acknowledge and agree that GitHub will have a royalty-free, fully paid-up, worldwide, transferable, sub-licensable, irrevocable and perpetual license to implement, use, modify, commercially exploit and/or incorporate the Feedback into our products, services, and documentation. -## K. 付款 -**短版本：** *您负责与您使用 GitHub 相关的任何费用。 我们有责任向您明确和准确地告知这些费用，如果这些价格发生变化，会提前让您知道。* +## K. Payment +**Short version:** *You are responsible for any fees associated with your use of GitHub. We are responsible for communicating those fees to you clearly and accurately, and letting you know well in advance if those prices change.* -### 1. 定价 -我们的定价和付款条件发布于 [github.com/price](https://github.com/pricing)。 如果您同意订阅价格，在付款期限内将保持这个价格；但在付款期结束时价格可能会有变化。 +### 1. Pricing +Our pricing and payment terms are available at [github.com/pricing](https://github.com/pricing). If you agree to a subscription price, that will remain your price for the duration of the payment term; however, prices are subject to change at the end of a payment term. -### 2. 升级、降级和更改 -- 当您从免费计划升级到任何付款计划时，我们会立即对您计费。 -- 如果您从月度结算方案改为年度结算方案，GitHub 将在下一个月度结算日期向您收取全年费用。 -- 如果您升级到更高的服务水平，我们将立即按升级的计划对您计费。 -- 您可随时通过[选择计划选项](https://github.com/pricing)或进入[计费设置](https://github.com/settings/billing)更改您的服务水平。 如果您选择降级您的帐户，可能会失去对您帐户的内容、功能或容量的访问权限。 请参阅我们关于[取消](#l-cancellation-and-termination)的部分以获取该内容的副本。 +### 2. Upgrades, Downgrades, and Changes +- We will immediately bill you when you upgrade from the free plan to any paying plan. +- If you change from a monthly billing plan to a yearly billing plan, GitHub will bill you for a full year at the next monthly billing date. +- If you upgrade to a higher level of service, we will bill you for the upgraded plan immediately. +- You may change your level of service at any time by [choosing a plan option](https://github.com/pricing) or going into your [Billing settings](https://github.com/settings/billing). If you choose to downgrade your Account, you may lose access to Content, features, or capacity of your Account. Please see our section on [Cancellation](#l-cancellation-and-termination) for information on getting a copy of that Content. -### 3. 计费时间表；无退款 -**基于计划的付款** 对于月度或年度付款计划，服务分别按月或年预先开具帐单，不可退款。 对于只使用部分服务、降级使用或未使用的月数，将不予退款，也没有积分补偿；但服务将在已付费的计费周期内保持有效。 为了平等对待每一个人，将不会有例外情况。 +### 3. Billing Schedule; No Refunds +**Payment Based on Plan** For monthly or yearly payment plans, the Service is billed in advance on a monthly or yearly basis respectively and is non-refundable. There will be no refunds or credits for partial months of service, downgrade refunds, or refunds for months unused with an open Account; however, the service will remain active for the length of the paid billing period. In order to treat everyone equally, no exceptions will be made. -**基于使用情况的计费** 一些服务功能根据使用情况计费。 这些服务功能的数量有限，可能包含在您的限期计划中，无需额外收费。 如果您选择购买超出计划所含数量的付费服务功能，则根据您上月的实际使用情况支付这些服务功能。 这些购买的每月费用将定期收取。 详情请参阅 [GitHub 附加产品条款](/github/site-policy/github-additional-product-terms)。 +**Payment Based on Usage** Some Service features are billed based on your usage. A limited quantity of these Service features may be included in your plan for a limited term without additional charge. If you choose to purchase paid Service features beyond the quantity included in your plan, you pay for those Service features based on your actual usage in the preceding month. Monthly payment for these purchases will be charged on a periodic basis in arrears. See [GitHub Additional Product Terms for Details](/github/site-policy/github-additional-product-terms). -**发票** 对于开发票的用户，用户同意以美元全额预付费用，没有任何形式的扣减或抵销。 美元。 用户必须在 GitHub 发票日期的三十 (30) 天内支付费用。 除本协定另有规定外，根据本协议应付的金额不可退款。 如果用户未及时支付任何费用，GitHub 有权寻求法律或公平裁决的任何行动，并且 (i) 以每月 1.0% 或法律允许的最高利率（取较小者）对逾期金额收取利息，并收取所有恢复费用，以及 (ii) 终止适用的订单。 用户独自负责本协议造成或与之相关的所有税、费、关税和政府评估（基于 GitHub 净收入的税除外）。 +**Invoicing** For invoiced Users, User agrees to pay the fees in full, up front without deduction or setoff of any kind, in U.S. Dollars. User must pay the fees within thirty (30) days of the GitHub invoice date. Amounts payable under this Agreement are non-refundable, except as otherwise provided in this Agreement. If User fails to pay any fees on time, GitHub reserves the right, in addition to taking any other action at law or equity, to (i) charge interest on past due amounts at 1.0% per month or the highest interest rate allowed by law, whichever is less, and to charge all expenses of recovery, and (ii) terminate the applicable order form. User is solely responsible for all taxes, fees, duties and governmental assessments (except for taxes based on GitHub's net income) that are imposed or become due in connection with this Agreement. -### 4. 授权 -同意这些条款即表示您许可我们从您备案的信用卡、PayPal 帐户或您授权给 GitHub 的其他已批准付款方式扣费。 +### 4. Authorization +By agreeing to these Terms, you are giving us permission to charge your on-file credit card, PayPal account, or other approved methods of payment for fees that you authorize for GitHub. -### 5. 付款责任 -您负责与您使用服务相关的所有费用，包括税款。 使用服务即表示您同意向 GitHub 支付与您使用服务有关的任何费用。 如有争议，请联系 [GitHub 支持](https://support.github.com/contact?tags=docs-policy)。 您负责向我们提供付费帐户的有效付款方式。 免费帐户无需提供付款信息。 +### 5. Responsibility for Payment +You are responsible for all fees, including taxes, associated with your use of the Service. By using the Service, you agree to pay GitHub any charge incurred in connection with your use of the Service. If you dispute the matter, contact [GitHub Support](https://support.github.com/contact?tags=docs-policy). You are responsible for providing us with a valid means of payment for paid Accounts. Free Accounts are not required to provide payment information. -## L. 取消和终止 -**短版本：** *您可随时关闭您的帐户。 如果您关闭帐户，我们将负责任地处理您的信息。* +## L. Cancellation and Termination +**Short version:** *You may close your Account at any time. If you do, we'll treat your information responsibly.* -### 1. 帐户取消 -您有责任通过 GitHub 适当取消您的帐户。 您可以进入屏幕顶部全球导航栏的 Settings（设置）[随时取消您的帐户](/articles/how-do-i-cancel-my-account/)。 Account（帐户）屏幕提供了一个简单、没有问题的取消链接。 我们无法通过回复电子邮件或电话申请来取消帐户。 +### 1. Account Cancellation +It is your responsibility to properly cancel your Account with GitHub. You can [cancel your Account at any time](/articles/how-do-i-cancel-my-account/) by going into your Settings in the global navigation bar at the top of the screen. The Account screen provides a simple, no questions asked cancellation link. We are not able to cancel Accounts in response to an email or phone request. -### 2. 取消后 -我们将根据需要保留并使用您的信息，以履行我们的法律义务、解决争端和执行我们的协议，但是除非法律要求，否则 我们将在取消或终止后 90 天内删除您的全部个人资料和仓库的内容（虽然有些信息可能保留在加密的备份中）。 这些信息在您的帐户取消后无法恢复。 +### 2. Upon Cancellation +We will retain and use your information as necessary to comply with our legal obligations, resolve disputes, and enforce our agreements, but barring legal requirements, we will delete your full profile and the Content of your repositories within 90 days of cancellation or termination (though some information may remain in encrypted backups). This information can not be recovered once your Account is cancelled. -我们不会删除您已贡献到其他用户的仓库或者该用户已复刻的内容。 +We will not delete Content that you have contributed to other Users' repositories or that other Users have forked. -在帐户取消、终止或降级后，我们将应要求作出合理努力，向帐户所有者提供一份合法、非侵权帐户内容的副本。 您必须在取消、终止或降级后 90 天内提出此请求。 +Upon request, we will make a reasonable effort to provide an Account owner with a copy of your lawful, non-infringing Account contents after Account cancellation, termination, or downgrade. You must make this request within 90 days of cancellation, termination, or downgrade. -### 3. GitHub 可能终止 -GitHub 有权在任何时候暂停或终止您对网站全部或任何部分的访问，无论有无理由或有无通知，均立即生效。 GitHub 保留随时以任何理由拒绝提供服务的权利。 +### 3. GitHub May Terminate +GitHub has the right to suspend or terminate your access to all or any part of the Website at any time, with or without cause, with or without notice, effective immediately. GitHub reserves the right to refuse service to anyone for any reason at any time. -### 4. 存续 -本协议在终止时性质上应存续的所有条款都*将*在终止时存续，包括但不限于所有权条款、担保免责声明、赔偿和责任限制。 +### 4. Survival +All provisions of this Agreement which, by their nature, should survive termination *will* survive termination — including, without limitation: ownership provisions, warranty disclaimers, indemnity, and limitations of liability. -## M. 与 GitHub 的通信 -**短版本：** *我们使用电子邮件和其他电子方式与用户保持联系。* +## M. Communications with GitHub +**Short version:** *We use email and other electronic means to stay in touch with our users.* -### 1. 需要电子通信 -出于合同目的，您 (1) 同意通过您提交的电子邮件地址或通过服务从我们接收电子形式的通信；和 (2) 同意我们以电子形式提供的所有服务条款、协议、通知、披露和其他通信满足任何法律要求（如果以书面形式提供的这些通信满足法律要求）。 本部分不影响您不可放弃的权利。 +### 1. Electronic Communication Required +For contractual purposes, you (1) consent to receive communications from us in an electronic form via the email address you have submitted or via the Service; and (2) agree that all Terms of Service, agreements, notices, disclosures, and other communications that we provide to you electronically satisfy any legal requirement that those communications would satisfy if they were on paper. This section does not affect your non-waivable rights. -### 2. 给 GitHub 的法律通知必须是书面的 -在合同或者任何法律或条例要求向 GitHub 发出通知的任何情况下，通过电子邮件或 GitHub Support 的邮件系统进行的通信不构成向 GitHub 或其高管、员工、代理或代表发出的法律通知。 给 GitHub 的法律通知必须是书面的，并且[提供给 GitHub 的法律代理](/articles/guidelines-for-legal-requests-of-user-data/#submitting-requests)。 +### 2. Legal Notice to GitHub Must Be in Writing +Communications made through email or GitHub Support's messaging system will not constitute legal notice to GitHub or any of its officers, employees, agents or representatives in any situation where notice to GitHub is required by contract or any law or regulation. Legal notice to GitHub must be in writing and [served on GitHub's legal agent](/articles/guidelines-for-legal-requests-of-user-data/#submitting-requests). -### 3. 无电话支持 -GitHub 仅通过电子邮件、服务中通信和电子信息提供支持。 我们不提供电话支持。 +### 3. No Phone Support +GitHub only offers support via email, in-Service communications, and electronic messages. We do not offer telephone support. -## N. 免责声明 -**短版本：** *我们按原样提供服务，对此服务我们不作任何承诺或保证。 请仔细阅读本节内容；您应该理解要求。* +## N. Disclaimer of Warranties +**Short version:** *We provide our service as is, and we make no promises or guarantees about this service. Please read this section carefully; you should understand what to expect.* -GitHub 按“原样”和“可获得性”提供网站和服务，不作任何形式的保证。 不限于此，关于网站和服务，我们明确否认所有保证，无论是明示、暗示还是法定保证，包括但不限于任何适销性、特定目的适用性、权利、安全性、准确性和非侵权。 +GitHub provides the Website and the Service “as is” and “as available,” without warranty of any kind. Without limiting this, we expressly disclaim all warranties, whether express, implied or statutory, regarding the Website and the Service including without limitation any warranty of merchantability, fitness for a particular purpose, title, security, accuracy and non-infringement. -GitHub 不保证服务将满足您的要求；服务不中断、及时、安全或无错；通过服务提供的信息准确、可靠或正确；任何缺陷或错误将得到更正；服务在任何特定时间或地点可用；服务没有病毒或其他有害成分。 对于因您下载和/或使用从服务获取的文件、信息、内容或其他材料而造成的任何损失风险，GitHub 概不负责。 +GitHub does not warrant that the Service will meet your requirements; that the Service will be uninterrupted, timely, secure, or error-free; that the information provided through the Service is accurate, reliable or correct; that any defects or errors will be corrected; that the Service will be available at any particular time or location; or that the Service is free of viruses or other harmful components. You assume full responsibility and risk of loss resulting from your downloading and/or use of files, information, content or other material obtained from the Service. -## O. 责任限制 -**短版本：** *对因您使用或不能使用服务或本协议下产生的损害或损失，我们不承担责任。 请仔细阅读本节内容；它限制了我们对您的义务。* +## O. Limitation of Liability +**Short version:** *We will not be liable for damages or losses arising from your use or inability to use the service or otherwise arising under this agreement. Please read this section carefully; it limits our obligations to you.* -您理解并同意，对于以下原因产生的任何利润、使用、声誉或数据损失，或者任何偶然、间接、特殊、后果性或惩戒性损害，我们对您或任何第三方不承担任何责任： +You understand and agree that we will not be liable to you or any third party for any loss of profits, use, goodwill, or data, or for any incidental, indirect, special, consequential or exemplary damages, however arising, that result from -- 使用、披露或显示您的用户生成内容； -- 您使用或无法使用服务； -- 服务的任何修改、价格变动、暂停或终止； -- 一般服务或提供服务的软件或系统； -- 对您的传输或数据的未授权访问或更改； -- 任何第三方对服务的声明或行为； -- 您通过使用服务输入或接收的任何其他用户交互；或 -- 与服务有关的任何其他事项。 +- the use, disclosure, or display of your User-Generated Content; +- your use or inability to use the Service; +- any modification, price change, suspension or discontinuance of the Service; +- the Service generally or the software or systems that make the Service available; +- unauthorized access to or alterations of your transmissions or data; +- statements or conduct of any third party on the Service; +- any other user interactions that you input or receive through your use of the Service; or +- any other matter relating to the Service. -无论我们是否被告知此类损害的可能性，即使本协议规定的补救措施未能达到其基本目的，我们的责任都是有限的。 对于因超出我们合理控制范围的事项而导致的任何故障或延误，我们概不负责。 +Our liability is limited whether or not we have been informed of the possibility of such damages, and even if a remedy set forth in this Agreement is found to have failed of its essential purpose. We will have no liability for any failure or delay due to matters beyond our reasonable control. -## P. 免除和赔偿 -**短版本：** *您负责您对服务的使用。 如果您伤害别人或与别人发生争端，我们不会涉入。* +## P. Release and Indemnification +**Short version:** *You are responsible for your use of the service. If you harm someone else or get into a dispute with someone else, we will not be involved.* -如果您与一个或多个产品用户有争议，对于此类争议引起的或以任何方式与之相关的、已知或未知的、任何类型或性质的任何和所有索赔、要求和损害赔偿（实际和后果性的），您同意免除 GitHub 的任何赔偿责任。 +If you have a dispute with one or more Users, you agree to release GitHub from any and all claims, demands and damages (actual and consequential) of every kind and nature, known and unknown, arising out of or in any way connected with such disputes. -您同意，对于因您使用网站和服务，包括但不限于您违反本协议，而引起的任何和所有索赔、责任和费用，您负责赔偿我们、为我们抗辩并保护我们免受任何损害，但 GitHub 应 (1) 及时向您提供有关索赔、要求、诉讼或程序的书面通知；(2) 赋予您对索赔、要求、诉讼或程序进行抗辩和解决的唯一控制权（但您对任何索赔、要求、诉讼或程序的解决方案必须无条件免除 GitHub 的所有责任）；以及 (3) 向您提供所有合理的协助，但费用由您承担。 +You agree to indemnify us, defend us, and hold us harmless from and against any and all claims, liabilities, and expenses, including attorneys’ fees, arising out of your use of the Website and the Service, including but not limited to your violation of this Agreement, provided that GitHub (1) promptly gives you written notice of the claim, demand, suit or proceeding; (2) gives you sole control of the defense and settlement of the claim, demand, suit or proceeding (provided that you may not settle any claim, demand, suit or proceeding unless the settlement unconditionally releases GitHub of all liability); and (3) provides to you all reasonable assistance, at your expense. -## Q. 这些条款的变更 -**短版本：** *我们希望用户了解我们条款的重要变化，但有些更改并不是那么重要——我们不想每次修复错误时都打扰您。 因此，虽然我们可以随时修改本协议，但对于任何重大更改，我们都会通知用户，并给您时间进行调整。* +## Q. Changes to These Terms +**Short version:** *We want our users to be informed of important changes to our terms, but some changes aren't that important — we don't want to bother you every time we fix a typo. So while we may modify this agreement at any time, we will notify users of any material changes and give you time to adjust to them.* -我们有权利独自裁量随时修订这些服务条款，并在发生任何此类修正时更新这些服务条款。 如果本协议发生重大变更，例如价格上涨，我们会在变更生效之前至少 30 天通知用户 - 在我们网站上发布通知，或者发送电子邮件到您的 GitHub 帐户中指定的主电子邮件地址。 客户在这 30 天后继续使用服务即构成对本协议修订的同意。 对于任何其他修改，您继续使用网站即表示同意我们对这些服务条款的修订。 在我们的[站点政策](https://github.com/github/site-policy)仓库中可查看这些条款的所有变更。 +We reserve the right, at our sole discretion, to amend these Terms of Service at any time and will update these Terms of Service in the event of any such amendments. We will notify our Users of material changes to this Agreement, such as price increases, at least 30 days prior to the change taking effect by posting a notice on our Website or sending email to the primary email address specified in your GitHub account. Customer's continued use of the Service after those 30 days constitutes agreement to those revisions of this Agreement. For any other modifications, your continued use of the Website constitutes agreement to our revisions of these Terms of Service. You can view all changes to these Terms in our [Site Policy](https://github.com/github/site-policy) repository. -我们保留随时和不时修改或停用（临时或永久）网站或其任何部分的权利，可能通知，也可能不通知。 +We reserve the right at any time and from time to time to modify or discontinue, temporarily or permanently, the Website (or any part of it) with or without notice. -## R. 其他 +## R. Miscellaneous -### 1. 管辖法律 -除非适用法律另有规定，否则，您与 GitHub 之间的本协议以及对网站或服务的任何访问或使用，均受美国联邦法律和加利福尼亚州法律的管辖，不考虑冲突法原则。 您和 GitHub 均同意，位于加利福尼亚州旧金山县的法院具有专属管辖权和审判权。 +### 1. Governing Law +Except to the extent applicable law provides otherwise, this Agreement between you and GitHub and any access to or use of the Website or the Service are governed by the federal laws of the United States of America and the laws of the State of California, without regard to conflict of law provisions. You and GitHub agree to submit to the exclusive jurisdiction and venue of the courts located in the City and County of San Francisco, California. -### 2. 不可转让 -GitHub 可随时将这些服务条款和/或 [GitHub 隐私声明](https://github.com/site/privacy)全部或部分转让或委托给任何个人或实体，可以征求或不征求您的同意，包括 D.4 部分的许可授予。 未经我们事先书面同意，您不得转让或委托服务条款或隐私声明下的任何权利或义务，任何未经授权的转让和授权都是无效的。 +### 2. Non-Assignability +GitHub may assign or delegate these Terms of Service and/or the [GitHub Privacy Statement](https://github.com/site/privacy), in whole or in part, to any person or entity at any time with or without your consent, including the license grant in Section D.4. You may not assign or delegate any rights or obligations under the Terms of Service or Privacy Statement without our prior written consent, and any unauthorized assignment and delegation by you is void. -### 3. 章节标题和摘要 -在整个本协议中，每一节都包括下列条款和条件的标题和简短摘要。 这些章节的标题和简短摘要不具有法律约束力。 +### 3. Section Headings and Summaries +Throughout this Agreement, each section includes titles and brief summaries of the following terms and conditions. These section titles and brief summaries are not legally binding. -### 4. 可分割性、非弃权和继续有效 -如果本协议的任何部分被认为无效或不可执行，则该部分将被解释为反映缔约方的初衷。 其余部分仍具有完全效力。 GitHub 方面未执行本协议的任何规定，并不构成我们放弃执行该规定的权利。 我们在本协议下的权利在本协议终止后仍然有效。 +### 4. Severability, No Waiver, and Survival +If any part of this Agreement is held invalid or unenforceable, that portion of the Agreement will be construed to reflect the parties’ original intent. The remaining portions will remain in full force and effect. Any failure on the part of GitHub to enforce any provision of this Agreement will not be considered a waiver of our right to enforce such provision. Our rights under this Agreement will survive any termination of this Agreement. -### 5. 修订；完整协议 -本协议只能通过 GitHub 授权代表签署的书面修订加以修改，或 GitHub 根据 [Q. 这些条款的变更](#q-changes-to-these-terms)发布的修订版予以修改。 这些服务条款以及 GitHub 隐私声明，构成了您与我们之间的完整、专有协议声明。 本协议取代任何口头或书面的提议或事先协议，以及您与 GitHub 之间关于这些条款所述主题的任何其他通信，包括任何保密或非披露协议。 +### 5. Amendments; Complete Agreement +This Agreement may only be modified by a written amendment signed by an authorized representative of GitHub, or by the posting by GitHub of a revised version in accordance with [Section Q. Changes to These Terms](#q-changes-to-these-terms). These Terms of Service, together with the GitHub Privacy Statement, represent the complete and exclusive statement of the agreement between you and us. This Agreement supersedes any proposal or prior agreement oral or written, and any other communications between you and GitHub relating to the subject matter of these terms including any confidentiality or nondisclosure agreements. -### 6. 问题 -对服务条款有疑问吗？ [联系我们](https://support.github.com/contact?tags=docs-policy)。 +### 6. Questions +Questions about the Terms of Service? [Contact us](https://support.github.com/contact?tags=docs-policy). diff --git a/translations/zh-CN/content/graphql/guides/managing-enterprise-accounts.md b/translations/zh-CN/content/graphql/guides/managing-enterprise-accounts.md index d2a4fc9fad0d..c14b5439585c 100644 --- a/translations/zh-CN/content/graphql/guides/managing-enterprise-accounts.md +++ b/translations/zh-CN/content/graphql/guides/managing-enterprise-accounts.md @@ -1,6 +1,6 @@ --- -title: 管理企业帐户 -intro: 您可以使用 GraphQL API 管理企业帐户及其拥有的组织。 +title: Managing enterprise accounts +intro: You can manage your enterprise account and the organizations it owns with the GraphQL API. redirect_from: - /v4/guides/managing-enterprise-accounts versions: @@ -9,98 +9,100 @@ versions: ghae: '*' topics: - API -shortTitle: 管理企业帐户 +shortTitle: Manage enterprise accounts --- -## 关于使用 GraphQL 管理企业帐户 +## About managing enterprise accounts with GraphQL -为帮助您监测和更改组织并保持合规性，可以使用只能作为 GraphQL API 的企业帐户 API 和审核日志 API。 +To help you monitor and make changes in your organizations and maintain compliance, you can use the Enterprise Accounts API and the Audit Log API, which are only available as GraphQL APIs. -企业帐户端点适用于 GitHub Enterprise Cloud 和 GitHub Enterprise Server。 +The enterprise account endpoints work for both GitHub Enterprise Cloud and for GitHub Enterprise Server. -GraphQL 可用于仅请求和返回您指定的数据。 例如，您可以创建 GraphQL 查询或请求信息，以查看添加至您组织的所有新组织成员。 或者，也可以执行突变或更改操作，以邀请管理员加入您的企业帐户。 +GraphQL allows you to request and return just the data you specify. For example, you can create a GraphQL query, or request for information, to see all the new organization members added to your organization. Or you can make a mutation, or change, to invite an administrator to your enterprise account. -通过审核日志 API，可以监测何时有人： -- 访问组织或仓库设置。 -- 更改权限。 -- 在组织、仓库或团队中添加或删除用户。 -- 将用户提升为管理员。 -- 更改 GitHub 应用程序的权限。 +With the Audit Log API, you can monitor when someone: +- Accesses your organization or repository settings. +- Changes permissions. +- Adds or removes users in an organization, repository, or team. +- Promotes users to admin. +- Changes permissions of a GitHub App. -审核日志 API 可帮助您保存审核日志数据的副本。 对于使用审核日志 API 执行的查询，GraphQL 响应最多可包含 90 至 120 天的数据。 有关通过审核日志 API 获得的字段列表，请参阅“[AuditEntry 接口](/graphql/reference/interfaces#auditentry/)。” +The Audit Log API enables you to keep copies of your audit log data. For queries made with the Audit Log API, the GraphQL response can include data for up to 90 to 120 days. For a list of the fields available with the Audit Log API, see the "[AuditEntry interface](/graphql/reference/interfaces#auditentry/)." -通过企业帐户 API，可以： -- 列出并审查属于企业帐户的所有组织和仓库。 -- 更改企业帐户设置。 -- 配置企业帐户及其组织的设置策略。 -- 邀请管理员加入您的企业帐户。 -- 在企业帐户中创建新组织。 +With the Enterprise Accounts API, you can: +- List and review all of the organizations and repositories that belong to your enterprise account. +- Change Enterprise account settings. +- Configure policies for settings on your enterprise account and its organizations. +- Invite administrators to your enterprise account. +- Create new organizations in your enterprise account. -有关通过企业帐户 API 获得的字段列表，请参阅“[企业帐户 API 的 GraphQL 字段和类型](/graphql/guides/managing-enterprise-accounts#graphql-fields-and-types-for-the-enterprise-accounts-api)。” +For a list of the fields available with the Enterprise Accounts API, see "[GraphQL fields and types for the Enterprise account API](/graphql/guides/managing-enterprise-accounts#graphql-fields-and-types-for-the-enterprise-accounts-api)." -## 开始将 GraphQL 用于企业帐户 +## Getting started using GraphQL for enterprise accounts -按照以下步骤开始利用 GraphQL 管理企业帐户： - - 使用个人访问令牌进行身份验证 - - 选择 GraphQL 客户端或使用 GraphQL Explorer - - 设置 Insomnia 以使用 GraphQL API +Follow these steps to get started using GraphQL to manage your enterprise accounts: + - Authenticating with a personal access token + - Choosing a GraphQL client or using the GraphQL Explorer + - Setting up Insomnia to use the GraphQL API -有关查询示例，请参阅“[使用企业帐户 API 的查询示例](#an-example-query-using-the-enterprise-accounts-api)。” +For some example queries, see "[An example query using the Enterprise Accounts API](#an-example-query-using-the-enterprise-accounts-api)." -### 1. 使用个人访问令牌进行身份验证 +### 1. Authenticate with your personal access token -1. 要使用 GraphQL 进行身份验证，需要通过开发者设置生成个人访问令牌 (PAT)。 更多信息请参阅“[创建个人访问令牌](/github/authenticating-to-github/creating-a-personal-access-token)”。 +1. To authenticate with GraphQL, you need to generate a personal access token (PAT) from developer settings. For more information, see "[Creating a personal access token](/github/authenticating-to-github/creating-a-personal-access-token)." -2. 向要访问的 GHES 区域的个人访问令牌授予管理员和完全控制权限。 要获得对私有仓库、组织、团队、用户数据及企业帐单和个人资料数据访问的完全权限，建议您为个人访问令牌选择以下作用域： +2. Grant admin and full control permissions to your personal access token for areas of GHES you'd like to access. For full permission to private repositories, organizations, teams, user data, and access to enterprise billing and profile data, we recommend you select these scopes for your personal access token: - `repo` - `admin:org` - - `用户` + - `user` - `admin:enterprise` - 企业帐户特定作用域包括： - - `admin:enterprise`：全面控制企业（包括 {% ifversion ghes > 3.2 or ghae or ghec %}`manage_runners:enterprise`、{% endif %}`manage_billing:enterprise` 和 `read:enterprise`） - - `manag_billing:enterprise`：读写企业帐单数据。{% ifversion ghes > 3.2 or ghae %} - - `manage_runners:enterprise`：获得管理 GitHub Actions 企业运行器和运行器组的权限。{% endif %} - - `read:enterprise`：读取企业简介数据。 + The enterprise account specific scopes are: + - `admin:enterprise`: Gives full control of enterprises (includes {% ifversion ghes > 3.2 or ghae or ghec %}`manage_runners:enterprise`, {% endif %}`manage_billing:enterprise` and `read:enterprise`) + - `manage_billing:enterprise`: Read and write enterprise billing data.{% ifversion ghes > 3.2 or ghae %} + - `manage_runners:enterprise`: Access to manage GitHub Actions enterprise runners and runner-groups.{% endif %} + - `read:enterprise`: Read enterprise profile data. -3. 复制个人访问令牌并保存在安全的位置，直到将其添加至您的 GraphQL 客户端。 +3. Copy your personal access token and keep it in a secure place until you add it to your GraphQL client. -### 2. 选择 GraphQL 客户端 +### 2. Choose a GraphQL client -建议您使用 GraphiQL 或可用于配置基准 URL 的其他独立 GraphQL 客户端。 +We recommend you use GraphiQL or another standalone GraphQL client that lets you configure the base URL. -也可以考虑使用以下 GraphQL 客户端： +You may also consider using these GraphQL clients: - [Insomnia](https://support.insomnia.rest/article/176-graphql-queries) - [GraphiQL](https://www.gatsbyjs.org/docs/running-queries-with-graphiql/) - [Postman](https://learning.getpostman.com/docs/postman/sending_api_requests/graphql/) -接下来将使用 Insomnia。 +The next steps will use Insomnia. -### 3. 设置 Insomnia，以使用 GitHub GraphQL API 处理企业账户 +### 3. Setting up Insomnia to use the GitHub GraphQL API with enterprise accounts -1. 将基准 url 和 `POST` 方法添加至您的 GraphQL 客户端。 使用 GraphQL 请求信息（查询）、更该信息（突变）或使用 GitHub API 传输数据时，默认 HTTP 方法为 `POST`，基准 url 遵循的语法为： - - 对于企业实例：`https:///api/graphql` - - 对于 GitHub Enterprise Cloud：`https://api.github.com/graphql` +1. Add the base url and `POST` method to your GraphQL client. When using GraphQL to request information (queries), change information (mutations), or transfer data using the GitHub API, the default HTTP method is `POST` and the base url follows this syntax: + - For your enterprise instance: `https:///api/graphql` + - For GitHub Enterprise Cloud: `https://api.github.com/graphql` -2. 要进行身份验证，请打开身份验证选项菜单，并选择 **Bearer token（不记名令牌）**。 接下来，添加您之前复制的个人访问令牌。 +2. To authenticate, open the authentication options menu and select **Bearer token**. Next, add your personal access token that you copied earlier. - ![个人访问令牌的权限选项](/assets/images/developer/graphql/insomnia-base-url-and-pat.png) + ![Permissions options for personal access token](/assets/images/developer/graphql/insomnia-base-url-and-pat.png) - ![个人访问令牌的权限选项](/assets/images/developer/graphql/insomnia-bearer-token-option.png) + ![Permissions options for personal access token](/assets/images/developer/graphql/insomnia-bearer-token-option.png) -3. 加入标头信息。 - - 添加 `Content-Type` 作为标头，`application/json` 作为值。 ![标准标头](/assets/images/developer/graphql/json-content-type-header.png) ![含审核日志 API 预览值的标头](/assets/images/developer/graphql/preview-header-for-2.18.png) +3. Include header information. + - Add `Content-Type` as the header and `application/json` as the value. + ![Standard header](/assets/images/developer/graphql/json-content-type-header.png) + ![Header with preview value for the Audit Log API](/assets/images/developer/graphql/preview-header-for-2.18.png) -现在可以开始执行查询了。 +Now you are ready to start making queries. -## 使用企业账户 API 的查询示例 +## An example query using the Enterprise Accounts API -此 GraphQL 查询使用 Enterprise Accounts API 请求每个设备的组织中 {% ifversion not ghae %}`公共`{% else %}`私有`{% endif %} 仓库的总数。 要自定义此查询，请用企业实例 slug 的 slug 替换 ``。 +This GraphQL query requests the total number of {% ifversion not ghae %}`public`{% else %}`private`{% endif %} repositories in each of your appliance's organizations using the Enterprise Accounts API. To customize this query, replace `` with the handle for your enterprise account. For example, if your enterprise account is located at `https://github.com/enterprises/octo-enterprise`, replace `` with `octo-enterprise`. {% ifversion not ghae %} ```graphql -query publicRepositoriesByOrganization($slug: String!) query publicRepositoriesByOrganization($slug: String!) { +query publicRepositoriesByOrganization($slug: String!) { enterprise(slug: $slug) { ...enterpriseFragment } @@ -162,7 +164,7 @@ variables { ``` {% endif %} -新 GraphQL 查询示例显示了不使用 Enterprise Account API 时检索每个组织中的{% ifversion not ghae %}`公共`{% else %}`私有`{% endif %} 仓库数的难度。 请注意，GraphQL 企业账户 API 已使企业执行此任务变得更简单，因为您只需要自定义单个变量。 要自定义此查询，请将 `` 和 `` 等参数替换为 实例中的组织名称。 +The next GraphQL query example shows how challenging it is to retrieve the number of {% ifversion not ghae %}`public`{% else %}`private`{% endif %} repositories in each organization without using the Enterprise Account API. Notice that the GraphQL Enterprise Accounts API has made this task simpler for enterprises since you only need to customize a single variable. To customize this query, replace `` and ``, etc. with the organization names on your instance. {% ifversion not ghae %} ```graphql @@ -210,7 +212,7 @@ fragment repositories on Organization { ``` {% endif %} -## 分别查询每个组织 +## Query each organization separately {% ifversion not ghae %} @@ -258,7 +260,7 @@ fragment repositories on Organization { {% endif %} -此 GraphQL 查询用于请求企业组织的最后 5 个日志条目。 要自定义此查询，请替换 `` 和 ``。 +This GraphQL query requests the last 5 log entries for an enterprise organization. To customize this query, replace `` and ``. ```graphql { @@ -284,12 +286,13 @@ fragment repositories on Organization { } ``` -有关开始使用 GraphQL 的更多信息，请参阅“[GraphQL 简介](/graphql/guides/introduction-to-graphql)”和“[使用 GraphQL 建立调用](/graphql/guides/forming-calls-with-graphql)。” +For more information about getting started with GraphQL, see "[Introduction to GraphQL](/graphql/guides/introduction-to-graphql)" and "[Forming Calls with GraphQL](/graphql/guides/forming-calls-with-graphql)." -## 企业账户 API 的 GraphQL 字段和类型 +## GraphQL fields and types for the Enterprise Accounts API -下面是关于可与企业账户 API 结合使用的新查询、突变和架构定义类型的概述。 +Here's an overview of the new queries, mutations, and schema defined types available for use with the Enterprise Accounts API. -有关可与企业账户 API 结合使用的新查询、突变和架构定义类型的详细信息，请参阅任何 [GraphQL 参考页面](/graphql)含有详细 GraphQL 定义的边栏。 +For more details about the new queries, mutations, and schema defined types available for use with the Enterprise Accounts API, see the sidebar with detailed GraphQL definitions from any [GraphQL reference page](/graphql). -您可以从 GitHub 的 GraphQL explorer 访问参考文档。 更多信息请参阅“[使用 explorer](/graphql/guides/using-the-explorer#accessing-the-sidebar-docs)。” 有关其他信息，如身份验证和速率限制详细信息，请查看[指南](/v4/guides)。 有关其他信息，如身份验证和速率限制详细信息，请查看[指南](/graphql/guides)。 +You can access the reference docs from within the GraphQL explorer on GitHub. For more information, see "[Using the explorer](/graphql/guides/using-the-explorer#accessing-the-sidebar-docs)." +For other information, such as authentication and rate limit details, check out the [guides](/graphql/guides). diff --git a/translations/zh-CN/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md b/translations/zh-CN/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md index 34b8a8a62632..03a6516b82cd 100644 --- a/translations/zh-CN/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md +++ b/translations/zh-CN/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md @@ -1,7 +1,7 @@ --- title: Managing custom repository roles for an organization -intro: You can more granularly control access to your organization's repositories by creating custom repository roles. -permissions: Organization owners can manage custom repository roles. +intro: "You can more granularly control access to your organization's repositories by creating custom repository roles." +permissions: 'Organization owners can manage custom repository roles.' versions: ghec: '*' topics: @@ -30,22 +30,22 @@ When you create a custom repository role, you start by choosing an inherited rol Your options for the inherited role are standardized for different types of contributors in your repository. -| Inherited role | Designed for | -| -------------- | ------------------------------------------------------------------------------------------------------ | -| **读取** | Non-code contributors who want to view or discuss your project. | -| **分类** | Contributors who need to proactively manage issues and pull requests without write access. | -| **写入** | Organization members and collaborators who actively push to your project. | -| **维护** | Project managers who need to manage the repository without access to sensitive or destructive actions. | +| Inherited role | Designed for | +|----|----| +| **Read** | Non-code contributors who want to view or discuss your project. | +| **Triage** | Contributors who need to proactively manage issues and pull requests without write access. | +| **Write** | Organization members and collaborators who actively push to your project. | +| **Maintain** | Project managers who need to manage the repository without access to sensitive or destructive actions. ## Custom role examples Here are some examples of custom repository roles you can configure. -| Custom repository role | 摘要 | Inherited role | Additional permissions | -| ---------------------- | ----------------------------------------------------------------------------------- | -------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Security engineer | Able to contribute code and maintain the security pipeline | **维护** | Delete code scanning results | -| Contractor | Able to develop webhooks integrations | **写入** | Manage webhooks | -| Community manager | Able to handle all the community interactions without being able to contribute code | **读取** | - Mark an issue as duplicate
- Manage GitHub Page settings
- Manage wiki settings
- Set the social preview
- Edit repository metadata
- Triage discussions | +| Custom repository role | Summary | Inherited role | Additional permissions | +|----|----|----|----| +| Security engineer | Able to contribute code and maintain the security pipeline | **Maintain** | Delete code scanning results | +| Contractor | Able to develop webhooks integrations | **Write** | Manage webhooks | +| Community manager | Able to handle all the community interactions without being able to contribute code | **Read** | - Mark an issue as duplicate
- Manage GitHub Page settings
- Manage wiki settings
- Set the social preview
- Edit repository metadata
- Triage discussions | ## Additional permissions for custom roles @@ -58,38 +58,38 @@ You can only choose an additional permission if it's not already included in the - **Assign or remove a user**: Assign a user to an issue or pull request, or remove a user from an issue or pull request. - **Add or remove a label**: Add a label to an issue or a pull request, or remove a label from an issue or pull request. -### 议题 +### Issue - **Close an issue** - **Reopen a closed issue** - **Delete an issue** - **Mark an issue as a duplicate** -### 拉取请求 +### Pull Request - **Close a pull request** - **Reopen a closed pull request** - **Request a pull request review**: Request a review from a user or team. -### 仓库 +### Repository - **Set milestones**: Add milestones to an issue or pull request. - **Manage wiki settings**: Turn on wikis for a repository. - **Manage project settings**: Turning on projects for a repository. - **Manage pull request merging settings**: Choose the type of merge commits that are allowed in your repository, such as merge, squash, or rebase. -- **Manage {% data variables.product.prodname_pages %} settings**: Enable {% data variables.product.prodname_pages %} for the repository, and select the branch you want to publish. 更多信息请参阅“[配置 {% data variables.product.prodname_pages %} 站点的发布来源](/pages/getting-started-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site)”。 +- **Manage {% data variables.product.prodname_pages %} settings**: Enable {% data variables.product.prodname_pages %} for the repository, and select the branch you want to publish. For more information, see "[Configuring a publishing source for your {% data variables.product.prodname_pages %} site](/pages/getting-started-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site)." - **Manage webhooks**: Add webhooks to the repository. - **Manage deploy keys**: Add deploy keys to the repository. - **Edit repository metadata**: Update the repository description as well as the repository topics. - **Set interaction limits**: Temporarily restrict certain users from commenting, opening issues, or creating pull requests in your public repository to enforce a period of limited activity. For more information, see "[Limiting interactions in your repository](/communities/moderating-comments-and-conversations/limiting-interactions-in-your-repository)." -- **Set the social preview**: Add an identifying image to your repository that appears on social media platforms when your repository is linked. 更多信息请参阅“[自定义仓库的社交媒体审查](/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/customizing-your-repositorys-social-media-preview)”。 +- **Set the social preview**: Add an identifying image to your repository that appears on social media platforms when your repository is linked. For more information, see "[Customizing your repository's social media preview](/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/customizing-your-repositorys-social-media-preview)." - **Push commits to protected branches**: Push to a branch that is marked as a protected branch. -### 安全 +### Security -- **Read {% data variables.product.prodname_code_scanning %} results**: Provide users with read permissions for {% data variables.product.prodname_code_scanning %} alerts. -- **Write {% data variables.product.prodname_code_scanning %} results**: Provide users with write permissions for {% data variables.product.prodname_code_scanning %} alerts. -- **Delete {% data variables.product.prodname_code_scanning %} results**: Provide users with delete permissions for {% data variables.product.prodname_code_scanning %} alerts. +- **View {% data variables.product.prodname_code_scanning %} results**: Ability to view {% data variables.product.prodname_code_scanning %} alerts. +- **Dismiss or reopen {% data variables.product.prodname_code_scanning %} results**: Ability to dismiss or reopen {% data variables.product.prodname_code_scanning %} alerts. +- **Delete {% data variables.product.prodname_code_scanning %} results**: Ability to delete {% data variables.product.prodname_code_scanning %} alerts. ## Precedence for different levels of access @@ -97,9 +97,9 @@ If a person is given different levels of access through different avenues, such If a person has been given conflicting access, you'll see a warning on the repository access page. The warning appears with "{% octicon "alert" aria-label="The alert icon" %} Mixed roles" next to the person with the conflicting access. To see the source of the conflicting access, hover over the warning icon or click **Mixed roles**. -To resolve conflicting access, you can adjust your organization's base permissions or the team's access, or edit the custom role. 更多信息请参阅： - - “[设置组织的基本权限](/github/setting-up-and-managing-organizations-and-teams/setting-base-permissions-for-an-organization)” - - "[管理团队对组织仓库的访问](/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository)" +To resolve conflicting access, you can adjust your organization's base permissions or the team's access, or edit the custom role. For more information, see: + - "[Setting base permissions for an organization](/github/setting-up-and-managing-organizations-and-teams/setting-base-permissions-for-an-organization)" + - "[Managing team access to an organization repository](/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository)" - "[Editing a repository role](#editing-a-repository-role)" ## Creating a repository role @@ -111,12 +111,18 @@ To create a new repository role, you add permissions to an inherited role and gi {% data reusables.organizations.org_settings %} {% data reusables.organizations.org-list %} {% data reusables.organizations.org-settings-repository-roles %} -5. Click **Create a Role**. ![Screenshot of "Create a Role" button](/assets/images/help/organizations/repository-role-create-role.png) -4. Under "Name", type the name of your repository role. ![Field to type a name for the repository role](/assets/images/help/organizations/repository-role-name.png) -5. Under "Description", type a description of your repository role. ![Field to type a description for the repository role](/assets/images/help/organizations/repository-role-description.png) -6. Under "Choose a role to inherit", select the role you want to inherit. ![Selecting repository role base role option](/assets/images/help/organizations/repository-role-base-role-option.png) -7. Under "Add Permissions", use the drop-down menu to select the permissions you want your custom role to include. ![Selecting permission levels from repository role drop-down](/assets/images/help/organizations/repository-role-drop-down.png) -7. Click **Create role**. ![Confirm creating a repository role](/assets/images/help/organizations/repository-role-creation-confirm.png) +5. Click **Create a Role**. + ![Screenshot of "Create a Role" button](/assets/images/help/organizations/repository-role-create-role.png) +4. Under "Name", type the name of your repository role. + ![Field to type a name for the repository role](/assets/images/help/organizations/repository-role-name.png) +5. Under "Description", type a description of your repository role. + ![Field to type a description for the repository role](/assets/images/help/organizations/repository-role-description.png) +6. Under "Choose a role to inherit", select the role you want to inherit. + ![Selecting repository role base role option](/assets/images/help/organizations/repository-role-base-role-option.png) +7. Under "Add Permissions", use the drop-down menu to select the permissions you want your custom role to include. + ![Selecting permission levels from repository role drop-down](/assets/images/help/organizations/repository-role-drop-down.png) +7. Click **Create role**. + ![Confirm creating a repository role](/assets/images/help/organizations/repository-role-creation-confirm.png) ## Editing a repository role @@ -125,8 +131,10 @@ To create a new repository role, you add permissions to an inherited role and gi {% data reusables.organizations.org_settings %} {% data reusables.organizations.org-list %} {% data reusables.organizations.org-settings-repository-roles %} -3. To the right of the role you want to edit, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then click **Edit**. ![Edit option in drop-down menu for repository roles](/assets/images/help/organizations/repository-role-edit-setting.png) -4. Edit, then click **Update role**. ![Edit fields and update repository roles](/assets/images/help/organizations/repository-role-update.png) +3. To the right of the role you want to edit, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then click **Edit**. + ![Edit option in drop-down menu for repository roles](/assets/images/help/organizations/repository-role-edit-setting.png) +4. Edit, then click **Update role**. + ![Edit fields and update repository roles](/assets/images/help/organizations/repository-role-update.png) ## Deleting a repository role @@ -137,5 +145,7 @@ If you delete an existing repository role, all pending invitations, teams, and u {% data reusables.organizations.org_settings %} {% data reusables.organizations.org-list %} {% data reusables.organizations.org-settings-repository-roles %} -3. To the right of the role you want to delete, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then click **Delete**. ![Edit option in drop-down menu for repository roles](/assets/images/help/organizations/repository-role-delete-setting.png) -4. Review changes for the role you want to remove, then click **Delete role**. ![Confirm deleting a repository role](/assets/images/help/organizations/repository-role-delete-confirm.png) +3. To the right of the role you want to delete, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then click **Delete**. + ![Edit option in drop-down menu for repository roles](/assets/images/help/organizations/repository-role-delete-setting.png) +4. Review changes for the role you want to remove, then click **Delete role**. + ![Confirm deleting a repository role](/assets/images/help/organizations/repository-role-delete-confirm.png) diff --git a/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/committing-changes-to-a-pull-request-branch-created-from-a-fork.md b/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/committing-changes-to-a-pull-request-branch-created-from-a-fork.md index 4496a73f4cd7..6dc332b6d9f6 100644 --- a/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/committing-changes-to-a-pull-request-branch-created-from-a-fork.md +++ b/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/committing-changes-to-a-pull-request-branch-created-from-a-fork.md @@ -1,6 +1,6 @@ --- -title: 将更改提交到从复刻创建的拉取请求分支 -intro: 在拉取请求创建者的许可下，您可以在从仓库复刻创建的拉取请求分支上提交更改。 +title: Committing changes to a pull request branch created from a fork +intro: You can commit changes on a pull request branch that was created from a fork of your repository with permission from the pull request creator. redirect_from: - /github/collaborating-with-issues-and-pull-requests/proposing-changes-to-your-work-with-pull-requests/committing-changes-to-a-pull-request-branch-created-from-a-fork - /articles/committing-changes-to-a-pull-request-branch-created-from-a-fork @@ -13,40 +13,39 @@ versions: ghec: '*' topics: - Pull requests -shortTitle: 从复刻提交到 PR 分支 +shortTitle: Commit to PR branch from fork --- +You can only make commits on pull request branches that: +- are opened in a repository that you have push access to and that were created from a fork of that repository +- are on a user-owned fork +- have permission granted from the pull request creator +- don't have [branch restrictions](/github/administering-a-repository/about-protected-branches#restrict-who-can-push-to-matching-branches) that will prevent you from committing -在拉取请求分支上进行提交必须满足以下条件： -- 该拉取请求分支在您拥有推送权限的仓库中打开，并且是从仓库的复刻创建的 -- 在用户拥有的复刻上 -- 拥有拉取请求创建者授予的许可 -- 没有阻止您提交的[分支限制](/github/administering-a-repository/about-protected-branches#restrict-who-can-push-to-matching-branches) - -只有创建拉取请求的用户才能授予您向用户拥有的复刻推送提交的权限。 更多信息请参阅“[允许更改从复刻创建的拉取请求分支](/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork)”。 +Only the user who created the pull request can give you permission to push commits to the user-owned fork. For more information, see "[Allowing changes to a pull request branch created from a fork](/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork)." {% note %} -**注：**还可以通过创建自己的仓库复刻副本（或复刻）并将更改提交到创建原始拉取请求更改的头部分支，从而通过 {% data variables.product.product_location %} 向仓库复刻的拉取请求分支进行提交。 有关一些一般准则，请参阅“[从复刻创建拉取请求](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork)”。 +**Note:** You can also make commits to a pull request branch from a fork of your repository through {% data variables.product.product_location %} by creating your own copy (or fork) of the fork of your repository and committing changes to the same head branch that the original pull request changes were created on. For some general guidelines, see "[Creating a pull request from a fork](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork)." {% endnote %} -1. 在 {% data variables.product.product_name %} 上，导航到创建拉取请求分支的复刻（或仓库副本）的主页面。 +1. On {% data variables.product.product_name %}, navigate to the main page of the fork (or copy of your repository) where the pull request branch was created. {% data reusables.repositories.copy-clone-url %} {% data reusables.command_line.open_the_multi_os_terminal %} {% tip %} - **提示：**如果要使用 {% data variables.product.prodname_desktop %} 克隆复刻，请参阅“[将仓库克隆到 {% data variables.product.prodname_desktop %}](/articles/cloning-a-repository/#cloning-a-repository-to-github-desktop)”。 + **Tip:** If you prefer to clone the fork using {% data variables.product.prodname_desktop %}, then see "[Cloning a repository to {% data variables.product.prodname_desktop %}](/articles/cloning-a-repository/#cloning-a-repository-to-github-desktop)." {% endtip %} -4. 将当前工作目录更改为要下载克隆目录的位置。 +4. Change the current working directory to the location where you want to download the cloned directory. ```shell $ cd open-source-projects ``` -5. 键入 `git clone`，然后粘贴在第 3 步中复制的 URL。 +5. Type `git clone`, and then paste the URL you copied in Step 3. ```shell $ git clone https://{% data variables.command_line.codeblock %}/USERNAME/FORK-OF-THE-REPOSITORY ``` -6. 按 **Enter** 键。 将创建您的本地克隆。 +6. Press **Enter**. Your local clone will be created. ```shell $ git clone https://{% data variables.command_line.codeblock %}/USERNAME/FORK-OF-THE-REPOSITORY > Cloning into `FORK-OF-THE-REPOSITORY`... @@ -57,25 +56,27 @@ shortTitle: 从复刻提交到 PR 分支 ``` {% tip %} - **提示：**错误消息“致命错误：目标路径 'REPOSITORY-NAME' 已存在并且不是空目录”表示您当前的工作目录已包含同名仓库。 要解决此错误，必须将复刻克隆到另一个目录中。 + **Tip:** The error message "fatal: destination path 'REPOSITORY-NAME' already exists and is not an empty directory" means that your current working directory already contains a repository with the same name. To resolve the error, you must clone the fork in a different directory. {% endtip %} -7. 导航到新的克隆仓库。 +7. Navigate into your new cloned repository. ```shell $ cd FORK-OF-THE-REPOSITORY ``` -7. 将分支切换到进行原始更改的拉取请求的比较分支。 如果您导航到原始拉取请求，您将在拉取请求的顶部看到比较分支。 ![比较分支示例](/assets/images/help/pull_requests/compare-branch-example.png) 在此例中，比较分支为 `test-branch`： +7. Switch branches to the compare branch of the pull request where the original changes were made. If you navigate to the original pull request, you'll see the compare branch at the top of the pull request. +![compare-branch-example](/assets/images/help/pull_requests/compare-branch-example.png) + In this example, the compare branch is `test-branch`: ```shell $ git checkout test-branch ``` {% tip %} - **提示：**有关拉取请求分支的更多信息，包括示例，请参阅“[创建拉取请求](/articles/creating-a-pull-request/#changing-the-branch-range-and-destination-repository)”。 + **Tip:** For more information about pull request branches, including examples, see "[Creating a Pull Request](/articles/creating-a-pull-request#changing-the-branch-range-and-destination-repository)." {% endtip %} -8. 现在，您可以使用此分支执行任何操作。 您可以向该分支推送新提交、运行一些本地测试或将其他分支合并到其中。 根据需要进行修改。 -9. 在更改提交到拉取请求的头部分支后，您可以将更改直接推送到原始拉取请求。 在此例中，头部分支为 `test-branch`： +8. At this point, you can do anything you want with this branch. You can push new commits to it, run some local tests, or merge other branches into the branch. Make modifications as you like. +9. After you commit your changes to the head branch of the pull request you can push your changes up to the original pull request directly. In this example, the head branch is `test-branch`: ```shell $ git push origin test-branch > Counting objects: 32, done. @@ -87,8 +88,8 @@ shortTitle: 从复刻提交到 PR 分支 > 12da2e9..250e946 test-branch -> test-branch ``` -您的新提交将反映在 {% data variables.product.product_location %} 上的原始拉取请求中。 +Your new commits will be reflected on the original pull request on {% data variables.product.product_location %}. -## 延伸阅读 +## Further Reading -- "[关于复刻](/pull-requests/collaborating-with-pull-requests/working-with-forks/about-forks)" +- "[About forks](/pull-requests/collaborating-with-pull-requests/working-with-forks/about-forks)" diff --git a/translations/zh-CN/content/repositories/working-with-files/using-files/navigating-code-on-github.md b/translations/zh-CN/content/repositories/working-with-files/using-files/navigating-code-on-github.md index b6de198a6b77..d0f61145653c 100644 --- a/translations/zh-CN/content/repositories/working-with-files/using-files/navigating-code-on-github.md +++ b/translations/zh-CN/content/repositories/working-with-files/using-files/navigating-code-on-github.md @@ -1,6 +1,6 @@ --- -title: 在 GitHub 上导航代码 -intro: '您可以直接在 {% data variables.product.product_name %} 中导航代码，来理解仓库内及仓库之间的关系。' +title: Navigating code on GitHub +intro: 'You can understand the relationships within and across repositories by navigating code directly in {% data variables.product.product_name %}.' redirect_from: - /articles/navigating-code-on-github - /github/managing-files-in-a-repository/navigating-code-on-github @@ -11,39 +11,66 @@ versions: topics: - Repositories --- - -## 关于在 {% data variables.product.prodname_dotcom %} 上导航代码 +## About navigating code on {% data variables.product.prodname_dotcom %} + +Code navigation helps you to read, navigate, and understand code by showing and linking definitions of a named entity corresponding to a reference to that entity, as well as references corresponding to an entity's definition. + +![Code navigation display](/assets/images/help/repository/code-navigation-popover.png) + +Code navigation uses the open source [`tree-sitter`](https://github.com/tree-sitter/tree-sitter) library. The following languages and navigation strategies are supported: + +| Language | search-based code navigation | precise code navigation | +|:----------:|:----------------------------:|:-----------------------:| +| C# | ✅ | | +| CodeQL | ✅ | | +| Go | ✅ | | +| Java | ✅ | | +| JavaScript | ✅ | | +| PHP | ✅ | | +| Python | ✅ | ✅ | +| Ruby | ✅ | | +| TypeScript | ✅ | | + + +You do not need to configure anything in your repository to enable code navigation. We will automatically extract search-based and precise code navigation information for these supported languages in all repositories and you can switch between the two supported code navigation approaches if your programming language is supported by both. + +{% data variables.product.prodname_dotcom %} has developed two code navigation approaches based on the open source [`tree-sitter`](https://github.com/tree-sitter/tree-sitter) and [`stack-graphs`](https://github.com/github/stack-graphs) library: + - search-based - searches all definitions and references across a repository to find entities with a given name + - precise - resolves definitions and references based on the set of classes, functions, and imported definitions at a given point in your code + +To learn more about these approaches, see "[Precise and search-based navigation](#precise-and-search-based-navigation)." + +Future releases will add *precise code navigation* for more languages, which is a code navigation approach that can give more accurate results. + +## Jumping to the definition of a function or method + +You can jump to a function or method's definition within the same repository by clicking the function or method call in a file. + +![Jump-to-definition tab](/assets/images/help/repository/jump-to-definition-tab.png) + +## Finding all references of a function or method -代码导航使用开源库 [`tree-sitter`](https://github.com/tree-sitter/tree-sitter)。 支持以下语言： -- C# -- CodeQL -- Go -- Java -- JavaScript -- PHP -- Python -- Ruby -- TypeScript +You can find all references for a function or method within the same repository by clicking the function or method call in a file, then clicking the **References** tab. -## 跳至功能或方法的定义 +![Find all references tab](/assets/images/help/repository/find-all-references-tab.png) -您可以在文件中单击函数或方法调用，跳至同一仓库中该函数或方法的定义。 +## Precise and search-based navigation -![跳至定义选项卡](/assets/images/help/repository/jump-to-definition-tab.png) +Certain languages supported by {% data variables.product.prodname_dotcom %} have access to *precise code navigation*, which uses an algorithm (based on the open source [`stack-graphs`](https://github.com/github/stack-graphs) library) that resolves definitions and references based on the set of classes, functions, and imported definitions that are visible at any given point in your code. Other languages use *search-based code navigation*, which searches all definitions and references across a repository to find entities with a given name. Both strategies are effective at finding results and both make sure to avoid inappropriate results such as comments, but precise code navigation can give more accurate results, especially when a repository contains multiple methods or functions with the same name. -## 查找函数或方法的所有引用 +If you don't see the results you expect from a precise code navigation query, you can click on the "search-based" link in the displayed popover to perform search-based navigation. -您可以在文件中单击函数或方法调用，然后单击 **References（引用）**选项卡，查找同一仓库中该函数或方法的所有引用。 +![Search-based code navigation link](/assets/images/help/repository/search-based-code-navigation-link.png) -![查找所有引用选项卡](/assets/images/help/repository/find-all-references-tab.png) +If your precise results appear inaccurate, you can file a support request. ## Troubleshooting code navigation If code navigation is enabled for you but you don't see links to the definitions of functions and methods: - Code navigation only works for active branches. Push to the branch and try again. -- Code navigation only works for repositories with less than 100,000 files. +- Code navigation only works for repositories with fewer than 100,000 files. -## 延伸阅读 -- “[搜索代码](/github/searching-for-information-on-github/searching-code)” +## Further reading +- "[Searching code](/github/searching-for-information-on-github/searching-code)" diff --git a/translations/zh-CN/content/rest/reference/enterprise-admin.md b/translations/zh-CN/content/rest/reference/enterprise-admin.md index 099cfa9e8bdd..fbe657c8ebc6 100644 --- a/translations/zh-CN/content/rest/reference/enterprise-admin.md +++ b/translations/zh-CN/content/rest/reference/enterprise-admin.md @@ -34,6 +34,10 @@ REST API endpoints{% ifversion ghes %}—except [Management Console](#management {% data variables.product.api_url_pre %} ``` +{% ifversion fpt or ghec %} +When endpoints include `{enterprise}`, replace `{enterprise}` with the handle for your enterprise account, which is included in the URL for your enterprise settings. For example, if your enterprise account is located at `https://github.com/enterprises/octo-enterprise`, replace `{enterprise}` with `octo-enterprise`. +{% endif %} + {% ifversion ghes %} [Management Console](#management-console) API endpoints are only prefixed with a hostname: diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-1/0.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-1/0.yml index db3ce6dad3cd..1d5de0b2747e 100644 --- a/translations/zh-CN/data/release-notes/enterprise-server/3-1/0.yml +++ b/translations/zh-CN/data/release-notes/enterprise-server/3-1/0.yml @@ -67,7 +67,7 @@ sections: - | [{% data variables.product.prodname_mobile %}](https://github.com/mobile) filtering allows you to search for and find issues, pull requests, and discussions from your device. New metadata for issues and pull request list items allow you to filter by assignees, checks status, review states, and comment counts. - {% data variables.product.prodname_mobile %} beta is available for {% data variables.product.prodname_ghe_server %}. Sign in with our [Android](https://play.google.com/store/apps/details?id=com.github.android) and [iOS](https://apps.apple.com/app/github/id1477376905) apps to triage notifications and manage issues and pull requests on the go. Administrators can disable mobile support for their Enterprise using the management console or by running `ghe-config app.mobile.enabled false`. For more information, see "[GitHub for mobile](/github/getting-started-with-github/using-github/github-for-mobile)." + {% data variables.product.prodname_mobile %} beta is available for {% data variables.product.prodname_ghe_server %}. Sign in with our [Android](https://play.google.com/store/apps/details?id=com.github.android) and [iOS](https://apps.apple.com/app/github/id1477376905) apps to triage notifications and manage issues and pull requests on the go. Administrators can disable mobile support for their Enterprise using the management console or by running `ghe-config app.mobile.enabled false`. For more information, see "[GitHub Mobile](/github/getting-started-with-github/using-github/github-mobile)." changes: - heading: Administration Changes diff --git a/translations/zh-CN/data/reusables/enterprise_installation/proxy-incompatible-with-aws-nlbs.md b/translations/zh-CN/data/reusables/enterprise_installation/proxy-incompatible-with-aws-nlbs.md new file mode 100644 index 000000000000..690abb634fe5 --- /dev/null +++ b/translations/zh-CN/data/reusables/enterprise_installation/proxy-incompatible-with-aws-nlbs.md @@ -0,0 +1,5 @@ +{% note %} + +**Note:** {% data variables.product.prodname_ghe_server %} supports PROXY Protocol V1, which is incompatible with AWS Network Load Balancers. If you use AWS Network Load Balancers with {% data variables.product.prodname_ghe_server %}, do not enable PROXY support. + +{% endnote %} \ No newline at end of file diff --git a/translations/zh-CN/data/reusables/github-actions/github-token-available-permissions.md b/translations/zh-CN/data/reusables/github-actions/github-token-available-permissions.md index f6fbb2a50872..4336f181876c 100644 --- a/translations/zh-CN/data/reusables/github-actions/github-token-available-permissions.md +++ b/translations/zh-CN/data/reusables/github-actions/github-token-available-permissions.md @@ -10,6 +10,7 @@ permissions: issues: read|write|none discussions: read|write|none packages: read|write|none + pages: read|write|none pull-requests: read|write|none repository-projects: read|write|none security-events: read|write|none diff --git a/translations/zh-CN/data/reusables/github-actions/self-hosted-runner-groups-navigate-to-repo-org-enterprise.md b/translations/zh-CN/data/reusables/github-actions/self-hosted-runner-groups-navigate-to-repo-org-enterprise.md index 1f1e976f7046..5f69552bc614 100644 --- a/translations/zh-CN/data/reusables/github-actions/self-hosted-runner-groups-navigate-to-repo-org-enterprise.md +++ b/translations/zh-CN/data/reusables/github-actions/self-hosted-runner-groups-navigate-to-repo-org-enterprise.md @@ -6,7 +6,7 @@ {% elsif ghec or ghes or ghae %} 1. Navigate to where your self-hosted runner groups are located: * **In an organization**: navigate to the main page and click {% octicon "gear" aria-label="The Settings gear" %} **Settings**.{% ifversion ghec %} - * **If using an enterprise account**: navigate to your enterprise account by visiting `https://github.com/enterprises/ENTERPRISE-NAME`, replacing `ENTERPRISE-NAME` with your enterprise account's name.{% elsif ghes or ghae %} + * **If using an enterprise account**: navigate to your enterprise account by clicking your profile photo in the top-right corner of {% data variables.product.prodname_dotcom_the_website %}, then clicking **Your enterprises**, then clicking the enterprise.{% elsif ghes or ghae %} * **如果使用企业级运行器**： 1. 在任何页面的右上角，单击 {% octicon "rocket" aria-label="The rocket ship" %}。 2. 在左边栏中，单击 **Enterprise overview（企业概览）**。 diff --git a/translations/zh-CN/data/reusables/github-actions/self-hosted-runner-navigate-to-org-enterprise.md b/translations/zh-CN/data/reusables/github-actions/self-hosted-runner-navigate-to-org-enterprise.md index 6e43400403b8..afba3561543c 100644 --- a/translations/zh-CN/data/reusables/github-actions/self-hosted-runner-navigate-to-org-enterprise.md +++ b/translations/zh-CN/data/reusables/github-actions/self-hosted-runner-navigate-to-org-enterprise.md @@ -6,7 +6,7 @@ {% elsif ghec or ghes or ghae %} 1. 导航到自托管运行器注册的位置： * **In an organization**: navigate to the main page and click {% octicon "gear" aria-label="The Settings gear" %} **Settings**. - * {% ifversion ghec %}**如果使用企业帐户**：通过访问 `https://github.com/enterprises/ENTERPRISE-NAME`（将 `ENTERPRISE-NAME` 替换为您的企业帐户名称）导航到您的企业帐户。{% elsif ghes or ghae %}**如果使用企业级运行器**： + * {% ifversion ghec %}**If using an enterprise account**: navigate to your enterprise account by clicking your profile photo in the top-right corner of {% data variables.product.prodname_dotcom_the_website %}, then clicking **Your enterprises**, then clicking the enterprise.{% elsif ghes or ghae %}**If using an enterprise-level runner**: 1. 在任何页面的右上角，单击 {% octicon "rocket" aria-label="The rocket ship" %}。 1. 在左边栏中，单击 **Enterprise overview（企业概览）**。 diff --git a/translations/zh-CN/data/reusables/github-actions/self-hosted-runner-navigate-to-repo-org-enterprise.md b/translations/zh-CN/data/reusables/github-actions/self-hosted-runner-navigate-to-repo-org-enterprise.md index 26aee11a8f9c..e6f040fe5cf6 100644 --- a/translations/zh-CN/data/reusables/github-actions/self-hosted-runner-navigate-to-repo-org-enterprise.md +++ b/translations/zh-CN/data/reusables/github-actions/self-hosted-runner-navigate-to-repo-org-enterprise.md @@ -6,7 +6,7 @@ {% elsif ghec or ghes or ghae %} 1. 导航到自托管运行器注册的位置： * **在组织或仓库中**，导航到主页并单击 {% octicon "gear" aria-label="The Settings gear" %} **Settings（设置）**。 {% ifversion ghec %} - * **If using an enterprise account**: navigate to your enterprise account by visiting `https://github.com/enterprises/ENTERPRISE-NAME`, replacing `ENTERPRISE-NAME` with your enterprise account's name.{% elsif ghes or ghae %} + * **If using an enterprise account**: navigate to your enterprise account by clicking your profile photo in the top-right corner of {% data variables.product.prodname_dotcom_the_website %}, then clicking **Your enterprises**, then clicking the enterprise.{% elsif ghes or ghae %} * **如果使用企业级运行器**： 1. 在任何页面的右上角，单击 {% octicon "rocket" aria-label="The rocket ship" %}。 2. 在左边栏中，单击 **Enterprise overview（企业概览）**。 diff --git a/translations/zh-CN/data/reusables/notifications/vulnerable-dependency-notification-options.md b/translations/zh-CN/data/reusables/notifications/vulnerable-dependency-notification-options.md index c20225cce0a4..df4e025ec60c 100644 --- a/translations/zh-CN/data/reusables/notifications/vulnerable-dependency-notification-options.md +++ b/translations/zh-CN/data/reusables/notifications/vulnerable-dependency-notification-options.md @@ -5,7 +5,7 @@ - in the user interface, a warning is shown in your repository's file and code views if there are any vulnerable dependencies (**UI alerts** option). - on the command line, warnings are displayed as callbacks when you push to repositories with any vulnerable dependencies (**Command Line** option). - in your inbox, as web notifications. A web notification is sent when {% data variables.product.prodname_dependabot %} is enabled for a repository, when a new manifest file is committed to the repository, and when a new vulnerability with a critical or high severity is found (**Web** option).{% ifversion not ghae %} -- on {% data variables.product.prodname_mobile %}, as web notifications. For more information, see "[Enabling push notifications with GitHub for mobile](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#enabling-push-notifications-with-github-for-mobile)."{% endif %} +- on {% data variables.product.prodname_mobile %}, as web notifications. For more information, see "[Enabling push notifications with GitHub Mobile](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#enabling-push-notifications-with-github-mobile)."{% endif %} {% note %} diff --git a/translations/zh-CN/data/reusables/stars/stars-page-navigation.md b/translations/zh-CN/data/reusables/stars/stars-page-navigation.md new file mode 100644 index 000000000000..ce2590984807 --- /dev/null +++ b/translations/zh-CN/data/reusables/stars/stars-page-navigation.md @@ -0,0 +1 @@ +1. In the upper-right corner of any page, click your profile photo, then click ** Your stars**. ![Screenshot of stars option in a dropdown menu](/assets/images/help/stars/navigate-to-stars-page.png) \ No newline at end of file diff --git a/translations/zh-CN/data/reusables/supported-languages/python.md b/translations/zh-CN/data/reusables/supported-languages/python.md index 1427723cc85e..2bf98383aef3 100644 --- a/translations/zh-CN/data/reusables/supported-languages/python.md +++ b/translations/zh-CN/data/reusables/supported-languages/python.md @@ -1 +1 @@ -| Python |{% ifversion fpt or ghec %}| {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %}
pip | {% octicon "check" aria-label="The check icon" %}
pip | {% octicon "check" aria-label="The check icon" %} | {% octicon "x" aria-label="The X icon" %} |{% elsif ghes %}| {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %}
pip {% ifversion ghes > 3.2 %}| {% octicon "check" aria-label="The check icon" %}
pip{% endif %} | {% octicon "check" aria-label="The check icon" %} | {% octicon "x" aria-label="The X icon" %} |{% elsif ghae %}| {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %} | {% octicon "x" aria-label="The X icon" %}| |{% endif %} +| Python |{% ifversion fpt or ghec %}| {% octicon "check" aria-label="The check icon" %}
precise| {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %}
pip | {% octicon "check" aria-label="The check icon" %}
pip | {% octicon "check" aria-label="The check icon" %} | {% octicon "x" aria-label="The X icon" %} |{% elsif ghes %}| {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %}
pip {% ifversion ghes > 3.2 %}| {% octicon "check" aria-label="The check icon" %}
pip{% endif %} | {% octicon "check" aria-label="The check icon" %} | {% octicon "x" aria-label="The X icon" %} |{% elsif ghae %}| {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %} | {% octicon "x" aria-label="The X icon" %}| |{% endif %} diff --git a/translations/zh-CN/data/variables/product.yml b/translations/zh-CN/data/variables/product.yml index fe5785a4d9e8..da55e2574375 100644 --- a/translations/zh-CN/data/variables/product.yml +++ b/translations/zh-CN/data/variables/product.yml @@ -46,8 +46,8 @@ prodname_cli: 'GitHub CLI' #GitHub Desktop prodname_desktop: 'GitHub Desktop' desktop_link: 'https://desktop.github.com/' -#GitHub for Mobile -prodname_mobile: '手机版 GitHub' +#GitHub Mobile +prodname_mobile: 'GitHub Mobile' prodname_ios: 'GitHub for iOS' prodname_android: 'GitHub for Android' #GitHub Pages