From 53dfa60edf2c1a5e46f897215210c78b9435d2ca Mon Sep 17 00:00:00 2001 From: docubot <67483024+docubot@users.noreply.github.com> Date: Sat, 22 Oct 2022 10:26:23 -0700 Subject: [PATCH 1/2] New translation batch for es (#31982) --- .../using-enterprise-managed-users-for-iam/index.md | 1 + ...n-and-provisioning-for-your-enterprise-using-azure-ad.md | 2 +- .../telling-git-about-your-signing-key.md | 3 +++ translations/es-ES/data/variables/product.yml | 3 --- translations/log/msft-es-resets.csv | 6 +++--- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/translations/es-ES/content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/index.md b/translations/es-ES/content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/index.md index 0ab736f4db..6fabeb82b8 100644 --- a/translations/es-ES/content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/index.md +++ b/translations/es-ES/content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/index.md @@ -22,6 +22,7 @@ children: - /managing-team-memberships-with-identity-provider-groups - /about-support-for-your-idps-conditional-access-policy - /migrating-from-saml-to-oidc + - /migrating-your-enterprise-to-a-new-identity-provider-or-tenant ms.openlocfilehash: 0d8cc71db11e7eb094b0771f8e03a690f449e380 ms.sourcegitcommit: 47bd0e48c7dba1dde49baff60bc1eddc91ab10c5 ms.translationtype: HT diff --git a/translations/es-ES/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md b/translations/es-ES/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md index 8775694a20..282f059d93 100644 --- a/translations/es-ES/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md +++ b/translations/es-ES/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md @@ -44,7 +44,7 @@ To configure authentication and user provisioning for {% data variables.product. {% ifversion ghae %} -1. In Azure AD, add {% data variables.product.ae_azure_ad_app_link %} to your tenant and configure single sign-on. For more information, see [Tutorial: Azure Active Directory single sign-on (SSO) integration with {% data variables.product.prodname_ghe_managed %}](https://docs.microsoft.com/azure/active-directory/saas-apps/github-ae-tutorial) in the Microsoft Docs. +1. In Azure AD, add the {% data variables.enterprise.ae_azure_ad_app_link %} to your tenant and configure single sign-on. For more information, see [Tutorial: Azure Active Directory single sign-on (SSO) integration with {% data variables.product.prodname_ghe_managed %}](https://docs.microsoft.com/azure/active-directory/saas-apps/github-ae-tutorial) in the Microsoft Docs. 1. In {% data variables.product.prodname_ghe_managed %}, enter the details for your Azure AD tenant. diff --git a/translations/es-ES/content/authentication/managing-commit-signature-verification/telling-git-about-your-signing-key.md b/translations/es-ES/content/authentication/managing-commit-signature-verification/telling-git-about-your-signing-key.md index 504536da90..0ddfcd5c89 100644 --- a/translations/es-ES/content/authentication/managing-commit-signature-verification/telling-git-about-your-signing-key.md +++ b/translations/es-ES/content/authentication/managing-commit-signature-verification/telling-git-about-your-signing-key.md @@ -35,6 +35,7 @@ If you have multiple GPG keys, you need to tell Git which one to use. {% data reusables.gpg.list-keys-with-note %} {% data reusables.gpg.copy-gpg-key-id %} {% data reusables.gpg.paste-gpg-key-id %} +{% data reusables.gpg.set-auto-sign %} 1. If you aren't using the GPG suite, run the following command in the `zsh` shell to add the GPG key to your `.zshrc` file, if it exists, or your `.zprofile` file: ```shell $ if [ -r ~/.zshrc ]; then echo 'export GPG_TTY=$(tty)' >> ~/.zshrc; \ @@ -73,6 +74,7 @@ If you have multiple GPG keys, you need to tell Git which one to use. {% data reusables.gpg.list-keys-with-note %} {% data reusables.gpg.copy-gpg-key-id %} {% data reusables.gpg.paste-gpg-key-id %} +{% data reusables.gpg.set-auto-sign %} {% endwindows %} @@ -95,6 +97,7 @@ If you have multiple GPG keys, you need to tell Git which one to use. {% data reusables.gpg.list-keys-with-note %} {% data reusables.gpg.copy-gpg-key-id %} {% data reusables.gpg.paste-gpg-key-id %} +{% data reusables.gpg.set-auto-sign %} 1. To add your GPG key to your `.bashrc` startup file, run the following command: ```bash $ [ -f ~/.bashrc ] && echo 'export GPG_TTY=$(tty)' >> ~/.bashrc diff --git a/translations/es-ES/data/variables/product.yml b/translations/es-ES/data/variables/product.yml index 903b4ee61b..16646ba56b 100644 --- a/translations/es-ES/data/variables/product.yml +++ b/translations/es-ES/data/variables/product.yml @@ -110,9 +110,6 @@ prodname_oauth_apps: 'OAuth Apps' prodname_enterprise_api: '{% ifversion ghes %}GitHub Enterprise Server{% elsif ghae %}GitHub AE{% endif %} APIs' prodname_unfurls: 'Content Attachments' -# Azure AD -ae_azure_ad_app_link: 'the [GitHub AE application](https://azuremarketplace.microsoft.com/en-us/marketplace/apps/aad.githubenterpriseserver)' - # GitHub Actions ## Use this variable only when referring to GitHub Actions the product. When referring to the thing that someone creates using the product, call it an action (small a). See the terminology page of the Brand Guide for more. prodname_actions: 'GitHub Actions' diff --git a/translations/log/msft-es-resets.csv b/translations/log/msft-es-resets.csv index b481c60826..b82779c5a8 100644 --- a/translations/log/msft-es-resets.csv +++ b/translations/log/msft-es-resets.csv @@ -612,8 +612,8 @@ translations/es-ES/content/code-security/secret-scanning/about-secret-scanning.m translations/es-ES/content/code-security/secret-scanning/configuring-secret-scanning-for-your-repositories.md,rendering error translations/es-ES/content/code-security/secret-scanning/defining-custom-patterns-for-secret-scanning.md,rendering error translations/es-ES/content/code-security/secret-scanning/managing-alerts-from-secret-scanning.md,rendering error -translations/es-ES/content/code-security/secret-scanning/protecting-pushes-with-secret-scanning.md,broken liquid tags -translations/es-ES/content/code-security/secret-scanning/pushing-a-branch-blocked-by-push-protection.md,broken liquid tags +translations/es-ES/content/code-security/secret-scanning/protecting-pushes-with-secret-scanning.md,rendering error +translations/es-ES/content/code-security/secret-scanning/pushing-a-branch-blocked-by-push-protection.md,rendering error translations/es-ES/content/code-security/security-overview/about-the-security-overview.md,rendering error translations/es-ES/content/code-security/security-overview/filtering-alerts-in-the-security-overview.md,rendering error translations/es-ES/content/code-security/security-overview/viewing-the-security-overview.md,rendering error @@ -1037,7 +1037,7 @@ translations/es-ES/data/reusables/dependabot/beta-security-and-version-updates.m translations/es-ES/data/reusables/dependabot/default-dependencies-allow-ignore.md,broken liquid tags translations/es-ES/data/reusables/dependabot/enabling-disabling-dependency-graph-private-repo.md,rendering error translations/es-ES/data/reusables/dependabot/enterprise-enable-dependabot.md,rendering error -translations/es-ES/data/reusables/dependabot/supported-package-managers.md,broken liquid tags +translations/es-ES/data/reusables/dependabot/supported-package-managers.md,rendering error translations/es-ES/data/reusables/desktop/get-an-account.md,broken liquid tags translations/es-ES/data/reusables/discussions/enabling-or-disabling-github-discussions-for-your-organization.md,broken liquid tags translations/es-ES/data/reusables/discussions/navigate-to-repo-or-org.md,broken liquid tags From 074b5f04b280be6eecb5d77cd661ba7e97fe4626 Mon Sep 17 00:00:00 2001 From: docubot <67483024+docubot@users.noreply.github.com> Date: Sat, 22 Oct 2022 10:37:50 -0700 Subject: [PATCH 2/2] New translation batch for ja (#31983) --- .../using-enterprise-managed-users-for-iam/index.md | 1 + ...tion-and-provisioning-for-your-enterprise-using-azure-ad.md | 2 +- .../telling-git-about-your-signing-key.md | 3 +++ translations/ja-JP/data/variables/product.yml | 3 --- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/translations/ja-JP/content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/index.md b/translations/ja-JP/content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/index.md index a069abb6e9..53f86f9cb0 100644 --- a/translations/ja-JP/content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/index.md +++ b/translations/ja-JP/content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/index.md @@ -22,6 +22,7 @@ children: - /managing-team-memberships-with-identity-provider-groups - /about-support-for-your-idps-conditional-access-policy - /migrating-from-saml-to-oidc + - /migrating-your-enterprise-to-a-new-identity-provider-or-tenant ms.openlocfilehash: 0d8cc71db11e7eb094b0771f8e03a690f449e380 ms.sourcegitcommit: 47bd0e48c7dba1dde49baff60bc1eddc91ab10c5 ms.translationtype: HT diff --git a/translations/ja-JP/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md b/translations/ja-JP/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md index 8775694a20..282f059d93 100644 --- a/translations/ja-JP/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md +++ b/translations/ja-JP/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md @@ -44,7 +44,7 @@ To configure authentication and user provisioning for {% data variables.product. {% ifversion ghae %} -1. In Azure AD, add {% data variables.product.ae_azure_ad_app_link %} to your tenant and configure single sign-on. For more information, see [Tutorial: Azure Active Directory single sign-on (SSO) integration with {% data variables.product.prodname_ghe_managed %}](https://docs.microsoft.com/azure/active-directory/saas-apps/github-ae-tutorial) in the Microsoft Docs. +1. In Azure AD, add the {% data variables.enterprise.ae_azure_ad_app_link %} to your tenant and configure single sign-on. For more information, see [Tutorial: Azure Active Directory single sign-on (SSO) integration with {% data variables.product.prodname_ghe_managed %}](https://docs.microsoft.com/azure/active-directory/saas-apps/github-ae-tutorial) in the Microsoft Docs. 1. In {% data variables.product.prodname_ghe_managed %}, enter the details for your Azure AD tenant. diff --git a/translations/ja-JP/content/authentication/managing-commit-signature-verification/telling-git-about-your-signing-key.md b/translations/ja-JP/content/authentication/managing-commit-signature-verification/telling-git-about-your-signing-key.md index 504536da90..0ddfcd5c89 100644 --- a/translations/ja-JP/content/authentication/managing-commit-signature-verification/telling-git-about-your-signing-key.md +++ b/translations/ja-JP/content/authentication/managing-commit-signature-verification/telling-git-about-your-signing-key.md @@ -35,6 +35,7 @@ If you have multiple GPG keys, you need to tell Git which one to use. {% data reusables.gpg.list-keys-with-note %} {% data reusables.gpg.copy-gpg-key-id %} {% data reusables.gpg.paste-gpg-key-id %} +{% data reusables.gpg.set-auto-sign %} 1. If you aren't using the GPG suite, run the following command in the `zsh` shell to add the GPG key to your `.zshrc` file, if it exists, or your `.zprofile` file: ```shell $ if [ -r ~/.zshrc ]; then echo 'export GPG_TTY=$(tty)' >> ~/.zshrc; \ @@ -73,6 +74,7 @@ If you have multiple GPG keys, you need to tell Git which one to use. {% data reusables.gpg.list-keys-with-note %} {% data reusables.gpg.copy-gpg-key-id %} {% data reusables.gpg.paste-gpg-key-id %} +{% data reusables.gpg.set-auto-sign %} {% endwindows %} @@ -95,6 +97,7 @@ If you have multiple GPG keys, you need to tell Git which one to use. {% data reusables.gpg.list-keys-with-note %} {% data reusables.gpg.copy-gpg-key-id %} {% data reusables.gpg.paste-gpg-key-id %} +{% data reusables.gpg.set-auto-sign %} 1. To add your GPG key to your `.bashrc` startup file, run the following command: ```bash $ [ -f ~/.bashrc ] && echo 'export GPG_TTY=$(tty)' >> ~/.bashrc diff --git a/translations/ja-JP/data/variables/product.yml b/translations/ja-JP/data/variables/product.yml index 903b4ee61b..16646ba56b 100644 --- a/translations/ja-JP/data/variables/product.yml +++ b/translations/ja-JP/data/variables/product.yml @@ -110,9 +110,6 @@ prodname_oauth_apps: 'OAuth Apps' prodname_enterprise_api: '{% ifversion ghes %}GitHub Enterprise Server{% elsif ghae %}GitHub AE{% endif %} APIs' prodname_unfurls: 'Content Attachments' -# Azure AD -ae_azure_ad_app_link: 'the [GitHub AE application](https://azuremarketplace.microsoft.com/en-us/marketplace/apps/aad.githubenterpriseserver)' - # GitHub Actions ## Use this variable only when referring to GitHub Actions the product. When referring to the thing that someone creates using the product, call it an action (small a). See the terminology page of the Brand Guide for more. prodname_actions: 'GitHub Actions'