From 604e1dde29709b62f120e7633c33dee79474d6e2 Mon Sep 17 00:00:00 2001 From: docubot <67483024+docubot@users.noreply.github.com> Date: Thu, 31 Mar 2022 16:40:31 -0700 Subject: [PATCH] New translation batch for ja (#26599) * Add crowdin translations * Run script/i18n/homogenize-frontmatter.js * Run script/i18n/lint-translation-files.js --check rendering * run script/i18n/reset-files-with-broken-liquid-tags.js --language=ja * run script/i18n/reset-known-broken-translation-files.js * Check in ja CSV report Co-authored-by: Grace Park --- ...ing-to-amazon-elastic-container-service.md | 3 +- .../ja-JP/content/authentication/index.md | 24 +++++++ ...tomating-dependabot-with-github-actions.md | 2 +- .../graphql/overview/resource-limitations.md | 16 +++-- ...dding-a-pull-request-to-the-merge-queue.md | 60 ---------------- .../index.md | 2 +- ...rging-a-pull-request-with-a-merge-queue.md | 72 +++++++++++++++++++ .../configuring-pull-request-merges/index.md | 2 +- .../managing-a-merge-queue.md | 58 +++++++++++++++ .../using-a-merge-queue.md | 55 -------------- .../content/rest/overview/api-previews.md | 21 ------ .../github-acceptable-use-policies.md | 4 +- .../github-active-malware-or-exploits.md | 2 +- .../github-community-guidelines.md | 8 +-- .../github-data-protection-agreement.md | 3 +- .../graphql_upcoming_changes.public-ghae.yml | 35 ++++----- .../ghec/graphql_upcoming_changes.public.yml | 35 ++++----- .../graphql_upcoming_changes.public.yml | 35 ++++----- .../actions/usage-workflow-run-time.md | 2 +- ...cing-a-cluster-node-modify-cluster-conf.md | 4 +- ...placing-a-cluster-node-replacement-name.md | 4 +- .../merge-queue-merging-method.md | 5 +- .../merge-queue-overview-short.md | 3 - .../pull_requests/merge-queue-overview.md | 6 +- .../pull_requests/merge-queue-references.md | 2 +- .../pull_requests/merge-queue-reject.md | 2 +- translations/log/ja-resets.csv | 4 +- 27 files changed, 237 insertions(+), 232 deletions(-) delete mode 100644 translations/ja-JP/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/adding-a-pull-request-to-the-merge-queue.md create mode 100644 translations/ja-JP/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request-with-a-merge-queue.md create mode 100644 translations/ja-JP/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue.md delete mode 100644 translations/ja-JP/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/using-a-merge-queue.md delete mode 100644 translations/ja-JP/data/reusables/pull_requests/merge-queue-overview-short.md diff --git a/translations/ja-JP/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-amazon-elastic-container-service.md b/translations/ja-JP/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-amazon-elastic-container-service.md index 124f79a8ee..06f9315452 100644 --- a/translations/ja-JP/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-amazon-elastic-container-service.md +++ b/translations/ja-JP/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-amazon-elastic-container-service.md @@ -45,7 +45,8 @@ On every new push to `main` in your {% data variables.product.company_short %} r たとえば[AWS CLI](https://aws.amazon.com/cli/)を使って以下を行います。 {% raw %}```bash{:copy} - aws ecr create-repository \ --repository-name MY_ECR_REPOSITORY \ --region MY_AWS_REGION + aws ecr create-repository \ + --repository-name MY_ECR_REPOSITORY \ --region MY_AWS_REGION ```{% endraw %} 以下のワークフロー中では、`ECR_REPOSITORY`変数に同じAmazon ECRリポジトリ名（ここでは`MY_ECR_REPOSITORY`）を使っていることを確認してください。 diff --git a/translations/ja-JP/content/authentication/index.md b/translations/ja-JP/content/authentication/index.md index 228c41526a..bd8939d403 100644 --- a/translations/ja-JP/content/authentication/index.md +++ b/translations/ja-JP/content/authentication/index.md @@ -18,6 +18,30 @@ versions: ghes: '*' ghae: '*' ghec: '*' +introLinks: + overview: /authentication/keeping-your-account-and-data-secure/about-authentication-to-github +featuredLinks: + guides: + - /authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent + - /authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token + - /authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication + - '{% ifversion ghae %}/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials{% endif %}' + popular: + - /authentication/troubleshooting-ssh + - /authentication/connecting-to-github-with-ssh/checking-for-existing-ssh-keys + - /authentication/connecting-to-github-with-ssh/adding-a-new-ssh-key-to-your-github-account + - '{% ifversion ghae %}/authentication/connecting-to-github-with-ssh/testing-your-ssh-connection{% endif %}' + - /authentication/authenticating-with-saml-single-sign-on + - /authentication/managing-commit-signature-verification/displaying-verification-statuses-for-all-of-your-commits + guideCards: + - /authentication/securing-your-account-with-two-factor-authentication-2fa/recovering-your-account-if-you-lose-your-2fa-credentials + - /authentication/troubleshooting-ssh/error-permission-denied-publickey + - /authentication/keeping-your-account-and-data-secure/creating-a-strong-password + - '{% ifversion ghae %}/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials{% endif %}' + - '{% ifversion ghae %}/authentication/authenticating-with-saml-single-sign-on/about-authentication-with-saml-single-sign-on{% endif %}' +changelog: + label: '2FA,authentication,security keys,SSH,token authentication' +layout: product-landing topics: - 2FA - Identity diff --git a/translations/ja-JP/content/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions.md b/translations/ja-JP/content/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions.md index 04794ab34a..5cb4f941b8 100644 --- a/translations/ja-JP/content/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions.md +++ b/translations/ja-JP/content/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions.md @@ -464,7 +464,7 @@ jobs: ### Pull Requestの自動マージを有効化する -Pull Requestを自動マージしたいなら、{% data variables.product.prodname_dotcom %}の自動マージ機能を利用できます。 これは、すべての必須テストと承認が正常に満たされた場合に、Pull Requestがマージされるようにしてくれます。 For more information on auto-merge, see "[Automatically merging a pull request"](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request)." +Pull Requestを自動マージしたいなら、{% data variables.product.prodname_dotcom %}の自動マージ機能を利用できます。 これは、すべての必須テストと承認が正常に満たされた場合に、Pull Requestがマージされるようにしてくれます。 For more information on auto-merge, see "[Automatically merging a pull request](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request)." 以下は、`my-dependency`に対するすべてのパッチアップデートの自動マージを有効化する例です。 diff --git a/translations/ja-JP/content/graphql/overview/resource-limitations.md b/translations/ja-JP/content/graphql/overview/resource-limitations.md index e16b313637..f94b595dde 100644 --- a/translations/ja-JP/content/graphql/overview/resource-limitations.md +++ b/translations/ja-JP/content/graphql/overview/resource-limitations.md @@ -24,7 +24,9 @@ topics: 以下の2つの例は、呼び出し中の合計ノード数を計算する方法を示しています。 -1. 単純なクエリ： 
query {
+1. 単純なクエリ：
+
+  
query {
     viewer {
       repositories(first: 50) {
         edges {
@@ -46,13 +48,17 @@ topics:
     }
   }

 
-  計算： 
50         = 50 リポジトリ
+  計算：
+
+  
50         = 50 リポジトリ
    +
   50 x 10  = 500 リポジトリのIssue
 
               = 550 総ノード

 
-2. 複雑なクエリ： 
query {
+2. 複雑なクエリ：
+
+  
query {
     viewer {
       repositories(first: 50) {
         edges {
@@ -106,7 +112,9 @@ topics:
     }
   }

 
-  計算： 
50              = 50 リポジトリ
+  計算：
+
+  
50              = 50 リポジトリ
    +
   50 x 20       = 1,000 プルリクエスト
    +
diff --git a/translations/ja-JP/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/adding-a-pull-request-to-the-merge-queue.md b/translations/ja-JP/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/adding-a-pull-request-to-the-merge-queue.md
deleted file mode 100644
index 90a7d54f83..0000000000
--- a/translations/ja-JP/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/adding-a-pull-request-to-the-merge-queue.md
+++ /dev/null
@@ -1,60 +0,0 @@
----
-title: Adding a pull request to the merge queue
-intro: 'If merge queues are enabled for the repository, you can add your pull requests to the merge queue once all the required checks have passed. {% data variables.product.product_name %} will merge the pull requests for you.'
-versions:
-  fpt: '*'
-  ghec: '*'
-topics:
-  - Pull requests
-shortTitle: Add PR to merge queue
-redirect_from:
-  - /github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/adding-a-pull-request-to-the-merge-queue
----
-
-{% data reusables.pull_requests.merge-queue-beta %}
-
-## About pull request merge queue
-
-{% data reusables.pull_requests.merge-queue-overview-short %}
-{% data reusables.pull_requests.merge-queue-references %}
-
-## Adding a pull request to the merge queue
-
-{% data reusables.repositories.navigate-to-repo %}
-{% data reusables.repositories.sidebar-pr %}
-1. In the "Pull Requests" list, click the pull request you'd like to add to the merge queue.
-1. Click **Add to merge queue** to add your pull request to the merge queue. This enables the default **Queue and merge in a group** option. Alternatively, you can:
-   - Add your pull request to the front of the queue by selecting the **Add to merge queue** drop down menu, and clicking **Jump the queue** (only available to repository maintainers and administrators).
-   - Directly merge your pull request by selecting the **Add to merge queue** drop down menu, and clicking **Directly merge** (only available to repository administrators). ![Merge queue options](/assets/images/help/pull_requests/merge-queue-options.png)
-
-   {% tip %}
-
-   **Tip:** The **Add to merge queue** button is only enabled once the pull request meets all the review/approval and status check requirements.
-
-   {% endtip %}
-2. Confirm you want to add the pull request to the merge queue by clicking **Confirm add to merge queue**.
-   {% data variables.product.product_name %} adds the pull request to the merge queue and will merge it for you.
-
-## Viewing the merge queue
-
-You can view the merge queue in various places on {% data variables.product.product_name %}.
-
-   - On the **Branches** page for the repository. We recommend you use this route if you don't have or don't know about a pull request already in the queue, and if you want to see what's in the queue. For more information, see "[Viewing branches in your repository](/repositories/configuring-branches-and-merges-in-your-repository/managing-branches-in-your-repository/viewing-branches-in-your-repository)."
-
-  ![View merge queue in Branches page](/assets/images/help/pull_requests/merge-queue-branches-page.png)
-
-- On the **Pull requests** page of your repository, click {% octicon "clock" aria-label="The clock symbol" %}.
-
-  ![View merge queue on Pull requests page](/assets/images/help/pull_requests/clock-icon-in-pull-request-list.png)
-
-- On your pull request, scroll down to the section with the checks, and click **View merge queue**.
-
-  ![View Merge queue button on pull request](/assets/images/help/pull_requests/view-merge-queue-button.png)
-
-The merge queue view shows the pull requests that are currently in the queue, with your pull requests clearly marked.
-
-![Merge queue view](/assets/images/help/pull_requests/merge-queue-view.png)
-
-## Handling pull requests removed from the merge queue
-
-{% data reusables.pull_requests.merge-queue-reject %}
diff --git a/translations/ja-JP/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/index.md b/translations/ja-JP/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/index.md
index 28bdf176f5..f6f9734a13 100644
--- a/translations/ja-JP/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/index.md
+++ b/translations/ja-JP/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/index.md
@@ -16,7 +16,7 @@ children:
   - /about-pull-request-merges
   - /merging-a-pull-request
   - /automatically-merging-a-pull-request
-  - /adding-a-pull-request-to-the-merge-queue
+  - /merging-a-pull-request-with-a-merge-queue
   - /closing-a-pull-request
   - /reverting-a-pull-request
 shortTitle: Incorporate changes
diff --git a/translations/ja-JP/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request-with-a-merge-queue.md b/translations/ja-JP/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request-with-a-merge-queue.md
new file mode 100644
index 0000000000..854e790d35
--- /dev/null
+++ b/translations/ja-JP/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request-with-a-merge-queue.md
@@ -0,0 +1,72 @@
+---
+title: Merging a pull request with a merge queue
+intro: 'If a merge queue is required by the branch protection setting for the branch, you can add your pull requests to a merge queue and {% data variables.product.product_name %} will merge the pull requests for you once all required checks have passed.'
+versions:
+  fpt: '*'
+  ghec: '*'
+topics:
+  - Pull requests
+shortTitle: Merge PR with merge queue
+redirect_from:
+  - /pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/adding-a-pull-request-to-the-merge-queue
+---
+
+{% data reusables.pull_requests.merge-queue-beta %}
+
+## About merge queues
+
+{% data reusables.pull_requests.merge-queue-overview %}
+{% data reusables.pull_requests.merge-queue-references %}
+
+## Adding a pull request to a merge queue
+
+{% data reusables.repositories.navigate-to-repo %}
+{% data reusables.repositories.sidebar-pr %}
+
+1. In the "Pull Requests" list, click the pull request you would like to add to a merge queue.
+
+1. Click **Merge when ready** to add the pull request to the merge queue. Alternatively, if you are an administrator, you can:
+   -  Directly merge the pull request by checking **Merge without waiting for requirements to be met (administrators only)**, if allowed by branch protection settings, and follow the standard flow. ![Merge queue options](/assets/images/help/pull_requests/merge-queue-options.png)
+
+  {% tip %}
+
+  **Tip:** You can click  **Merge when ready** whenever you're ready to merge your proposed changes. {% data variables.product.product_name %} will automatically add the pull request to the merge queue once required approval and status checks conditions are met.
+
+  {% endtip %}
+
+1. Confirm you want to add the pull request to the merge queue by clicking  **Confirm merge when ready**.
+
+## Removing a pull request from a merge queue
+
+{% data reusables.repositories.navigate-to-repo %}
+{% data reusables.repositories.sidebar-pr %}
+
+1. In the "Pull Requests" list, click the pull request you would like to remove from a merge queue.
+
+1. To remove the pull request from the queue, click **Remove from queue**. ![Remove pull request from queue](/assets/images/help/pull_requests/remove-from-queue-button.png)
+
+Alternatively, you can navigate to the merge queue page for the base branch, click **...** next to the pull request you want to remove, and select **Remove from queue**. For information on how to get to the merge queue page for the base branch, see the section below.
+
+## Viewing merge queues
+
+You can view the merge queue for a base branch in various places on {% data variables.product.product_name %}.
+
+- On the **Branches** page for the repository. We recommend you use this route if you don't have or don't know about a pull request already in a queue, and if you want to see what's in that queue. For more information, see "[Viewing branches in your repository](/repositories/configuring-branches-and-merges-in-your-repository/managing-branches-in-your-repository/viewing-branches-in-your-repository)."
+
+  ![View merge queue in Branches page](/assets/images/help/pull_requests/merge-queue-branches-page.png)
+
+- On the **Pull requests** page of your repository, click {% octicon "clock" aria-label="The clock symbol" %} next to any pull request in the merge queue.
+
+  ![View merge queue on Pull requests page](/assets/images/help/pull_requests/clock-icon-in-pull-request-list.png)
+
+- On the pull request page when merge queue is required for merging, scroll to the bottom of the timeline and click **the merge queue** link.
+
+  ![Merge queue link on pull request](/assets/images/help/pull_requests/merge-queue-link.png)
+
+- The merge queue view shows the pull requests that are currently in the queue, with your pull requests clearly marked.
+
+  ![Merge queue view](/assets/images/help/pull_requests/merge-queue-view.png)
+
+## Handling pull requests removed from the merge queue
+
+{% data reusables.pull_requests.merge-queue-reject %}
diff --git a/translations/ja-JP/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/index.md b/translations/ja-JP/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/index.md
index 64c9ddcb06..ae41f0abbd 100644
--- a/translations/ja-JP/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/index.md
+++ b/translations/ja-JP/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/index.md
@@ -15,7 +15,7 @@ children:
   - /about-merge-methods-on-github
   - /configuring-commit-squashing-for-pull-requests
   - /configuring-commit-rebasing-for-pull-requests
-  - /using-a-merge-queue
+  - /managing-a-merge-queue
   - /managing-suggestions-to-update-pull-request-branches
   - /managing-auto-merge-for-pull-requests-in-your-repository
   - /managing-the-automatic-deletion-of-branches
diff --git a/translations/ja-JP/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue.md b/translations/ja-JP/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue.md
new file mode 100644
index 0000000000..24f946b0ac
--- /dev/null
+++ b/translations/ja-JP/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue.md
@@ -0,0 +1,58 @@
+---
+title: Managing a merge queue
+intro: You can increase development velocity with a merge queue for pull requests in your repository.
+versions:
+  fpt: '*'
+  ghec: '*'
+permissions: People with admin permissions can manage merge queues for pull requests targeting selected branches of a repository.
+topics:
+  - Repositories
+  - Pull requests
+shortTitle: Managing merge queue
+redirect_from:
+  - /repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/using-a-merge-queue
+---
+
+{% data reusables.pull_requests.merge-queue-beta %}
+
+## About merge queues
+
+{% data reusables.pull_requests.merge-queue-overview %}
+
+The merge queue creates temporary branches with a special prefix to validate pull request changes. The changes in the pull request are then grouped with the latest version of the `base_branch` as well as changes ahead of it in the queue. {% data variables.product.product_name %} will merge all these changes into `base_branch` once the checks required by the branch protections of `base_branch` pass.
+
+You may need to update your Continuous Integration (CI) configuration to trigger builds on branch names that begin with the special prefix `gh-readonly-queue/{base_branch}` after the group is created.
+
+For example, with {% data variables.product.prodname_actions %}, a workflow with the following trigger will run each time a pull request that targets the base branch `main` is queued to merge.
+
+```yaml
+on:
+  push:
+    branches:
+    - gh-readonly-queue/main/**
+```
+
+{% data reusables.pull_requests.merge-queue-merging-method %}
+
+For information about merge methods, see "[About pull request merges](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges)."
+
+{% note %}
+
+**注釈:**
+
+* A merge queue cannot be enabled with branch protection rules that use wildcard characters (`*`) in the branch name pattern.
+
+{% endnote %}
+
+{% data reusables.pull_requests.merge-queue-reject %}
+
+## Managing a merge queue
+
+Repository administrators can require a merge by enabling the branch protection setting "Require merge queue" in the protection rules for the base branch.
+
+For information about how to enable the merge queue protection setting, see "[Managing a branch protection rule](/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule#creating-a-branch-protection-rule)."
+
+## 参考リンク
+
+* "[Merging a pull request with a merge queue](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request-with-a-merge-queue)"
+* [保護されたブランチについて](/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/about-protected-branches)
diff --git a/translations/ja-JP/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/using-a-merge-queue.md b/translations/ja-JP/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/using-a-merge-queue.md
deleted file mode 100644
index b38d054831..0000000000
--- a/translations/ja-JP/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/using-a-merge-queue.md
+++ /dev/null
@@ -1,55 +0,0 @@
----
-title: Using a merge queue
-intro: You can increase development velocity by enabling merge queues for pull requests in your repository.
-versions:
-  fpt: '*'
-  ghec: '*'
-permissions: People with admin permissions can configure merge queues for pull requests targeting selected branches of a repository.
-topics:
-  - Repositories
-  - Pull requests
-shortTitle: Use merge queue
----
-
-{% data reusables.pull_requests.merge-queue-beta %}
-
-## About pull request merge queue
-
-{% data reusables.pull_requests.merge-queue-overview %}
-
-The merge queue creates temporary preparatory branches to validate pull requests against the latest version of the base branch. To ensure that {% data variables.product.prodname_dotcom %} validates these preparatory branches, you may need to update your CI configuration to trigger builds on branch names starting with `gh-readonly-queue/{base_branch}`.
-
-For example, with {% data variables.product.prodname_actions %}, adding the following trigger to a workflow will cause the workflow to run when any push is made to a merge queue preparatory branch that targets `main`.
-
-```
-on:
-  push:
-    branches:
-    - main
-    - gh-readonly-queue/main/**
-```
-
-{% data reusables.pull_requests.merge-queue-merging-method %}
-
-For information about merge methods, see "[About pull request merges](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges)." For information about the "Require linear history" branch protection setting, see "[About protected branches](/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/about-protected-branches#require-linear-history)."
-
-{% note %}
-
-**Note:** During the beta, there are some limitations when using the merge queue:
-
-* The merge queue cannot be enabled on branch protection rules using wildcards (`*`) in the name.
-* There is no support for squash merge commits. (Only merge commits and "rebase and merge" commits are supported.)
-
-{% endnote %}
-
-{% data reusables.pull_requests.merge-queue-reject %}
-## Managing pull request merge queue
-
-Repository administrators can configure merge queues for pull requests targeting selected branches of a repository. The requirement to use a merge queue is a branch protection setting called "Require merge queue" that can be enabled in branch protection rules.
-
-For information about how to enable the merge queue protection setting, see "[Managing a branch protection rule](/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule#creating-a-branch-protection-rule)."
-
-## 参考リンク
-
-- "[Adding a pull request to the merge queue](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/adding-a-pull-request-to-the-merge-queue)"
-- [保護されたブランチについて](/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/about-protected-branches)
diff --git a/translations/ja-JP/content/rest/overview/api-previews.md b/translations/ja-JP/content/rest/overview/api-previews.md
index b9388a8cab..3c97fc7a4c 100644
--- a/translations/ja-JP/content/rest/overview/api-previews.md
+++ b/translations/ja-JP/content/rest/overview/api-previews.md
@@ -4,10 +4,8 @@ intro: API プレビューを使用して新機能を試し、これらの機能
 redirect_from:
   - /v3/previews
 versions:
-  fpt: '*'
   ghes: '*'
   ghae: '*'
-  ghec: '*'
 topics:
   - API
 ---
@@ -118,16 +116,6 @@ API を使用して、プルリクエストに対して[複数の承認レビュ
 
 {% endif %}
 
-
-{% ifversion ghes %}
-
-## リポジトリへの匿名 Git アクセス
-
-{% data variables.product.prodname_ghe_server %} インスタンスがプライベートモードの場合、サイトおよびリポジトリの管理者は、パブリックリポジトリに対して匿名の Git アクセスを有効にすることができます。
-
-**カスタムメディアタイプ:** `x-ray-preview` **発表日:** [2018-07-12](https://blog.github.com/2018-07-12-introducing-enterprise-2-14/)
-
-{% endif %}
 {% ifversion ghes < 3.3 %}
 
 ## プロジェクトカードの詳細
@@ -136,15 +124,6 @@ API を使用して、プルリクエストに対して[複数の承認レビュ
 
 **カスタムメディアタイプ:** `starfox-preview` **発表日:** [2018-09-05](https://developer.github.com/changes/2018-09-05-project-card-events)
 
-{% endif %}
-{% ifversion fpt or ghec %}
-
-## GitHub App マニフェスト
-
-GitHub App マニフェストを使用すると、事前設された GitHub App を作成できます。 詳細については、「[GitHub App のマニフェスト](/apps/building-github-apps/creating-github-apps-from-a-manifest/)」を参照してください。
-
-**カスタムメディアタイプ:** `fury-preview`
-
 {% endif %}
 
 {% ifversion ghes < 3.3 %}
diff --git a/translations/ja-JP/content/site-policy/acceptable-use-policies/github-acceptable-use-policies.md b/translations/ja-JP/content/site-policy/acceptable-use-policies/github-acceptable-use-policies.md
index 5c74019da9..bc974512f0 100644
--- a/translations/ja-JP/content/site-policy/acceptable-use-policies/github-acceptable-use-policies.md
+++ b/translations/ja-JP/content/site-policy/acceptable-use-policies/github-acceptable-use-policies.md
@@ -109,4 +109,6 @@ We will interpret our policies and resolve disputes in favor of protecting users
 
 ---
 
-GitHub retains full discretion to [take action](/github/site-policy/github-community-guidelines#what-happens-if-someone-violates-githubs-policies) in response to a violation of these policies, including account suspension, account [termination](/github/site-policy/github-terms-of-service#3-github-may-terminate), or [removal](/github/site-policy/github-terms-of-service#2-github-may-remove-content) of content.
+**Enforcement.** GitHub retains full discretion to [take action](/github/site-policy/github-community-guidelines#what-happens-if-someone-violates-githubs-policies) in response to a violation of these policies, including account suspension, account [termination](/github/site-policy/github-terms-of-service#3-github-may-terminate), or [removal](/github/site-policy/github-terms-of-service#2-github-may-remove-content) of content. Please also see our [Community Guidelines](/site-policy/github-terms/github-community-guidelines) for actions you can take if something or someone offends you.
+
+**Reinstatement and appeal.** If your content or account has been disabled or restricted and you seek reinstatement or wish to appeal, please see our [Appeal and Reinstatement page](/site-policy/acceptable-use-policies/github-appeal-and-reinstatement) for information about the process and use our [Appeal and Reinstatement form](https://support.github.com/contact/reinstatement) to submit a request.
diff --git a/translations/ja-JP/content/site-policy/acceptable-use-policies/github-active-malware-or-exploits.md b/translations/ja-JP/content/site-policy/acceptable-use-policies/github-active-malware-or-exploits.md
index 8875459751..03651f7aff 100644
--- a/translations/ja-JP/content/site-policy/acceptable-use-policies/github-active-malware-or-exploits.md
+++ b/translations/ja-JP/content/site-policy/acceptable-use-policies/github-active-malware-or-exploits.md
@@ -17,7 +17,7 @@ Being part of a community includes not taking advantage of other members of the
 
   デュアルユースのコンテンツが広範に乱用されている場合、当社は GitHub platform as an エクスプロイトやマルウェアの CDN として GitHub プラットフォームを活用している、現在進行中の非合法な攻撃やマルウェアキャンペーンを妨げるため、コンテンツの特定のインスタンスへの制限することが稀にあります。 ほとんどのインスタンスでは、コンテンツに認証を要求するという形で制限しますが、最後の手段として、アクセスの無効化や、それが不可能な場合 (Gist として投稿されている場合) はインスタンスの完全な削除を行う場合もあります。 また、可能な場合は導入した制限についてプロジェクトのオーナーに連絡します。
 
-  制限は可能な限り一時的なものとし、プラットフォームから特定のデュアルユースコンテンツやそのコピーを永久的に取り除いたり、制限したりする目的で行うものではありません。 こうした稀な制限を、当社はプロジェクトのオーナーとの共同作業とすることを目指していますが、コンテンツが過度に制限されていると感じる場合は、[異議申し立てプロセス](/github/site-policy/github-community-guidelines#appeal-and-reinstatement)をご用意しています。
+  制限は可能な限り一時的なものとし、プラットフォームから特定のデュアルユースコンテンツやそのコピーを永久的に取り除いたり、制限したりする目的で行うものではありません。 While we aim to make these rare cases of restriction a collaborative process with project owners, if you do feel your content was unduly restricted, we have an [appeals process](/site-policy/acceptable-use-policies/github-appeal-and-reinstatement) in place.
 
   プロジェクトメンテナ自身による不正利用の解決を促進するため、GitHub に不正利用を報告する前に、リポジトリのオーナーが潜在的に有害なセキュリティ研究コンテンツを投稿する際に、リポジトリのオーナーが次のステップを実行するよう推奨します。(強制ではありません。)
 
diff --git a/translations/ja-JP/content/site-policy/github-terms/github-community-guidelines.md b/translations/ja-JP/content/site-policy/github-terms/github-community-guidelines.md
index b348700d44..b4064a4365 100644
--- a/translations/ja-JP/content/site-policy/github-terms/github-community-guidelines.md
+++ b/translations/ja-JP/content/site-policy/github-terms/github-community-guidelines.md
@@ -71,13 +71,7 @@ Where we have decided that moderation action is warranted, these are some of the
 
 ## 意義申し立てと復帰
 
-In some cases there may be a basis to reverse a moderation action taken by GitHub Staff.
-
-* **Reinstatement**: Where a user wishes to address the violation and is willing to agree to abide by our Acceptable Use Policies moving forward, we may choose to reinstate their account or content depending on the severity of the initial violation.
-
-* **Appeal**: If a user wishes to dispute the basis of an enforcement action and can provide additional information regarding the alleged violation, we will review that information and may grant the appeal where we determined that a violation did not occur.
-
-If you seek reinstatement or wish to appeal an enforcement action, please contact [support](https://support.github.com/contact?tags=docs-policy).
+If your content or account has been disabled or restricted and you seek reinstatement or wish to appeal, please see our [Appeal and Reinstatement page](/site-policy/acceptable-use-policies/github-appeal-and-reinstatement) for information about the process and use our [Appeal and Reinstatement form](https://support.github.com/contact/reinstatement) to submit a request.
 
 ## 法的通知
 
diff --git a/translations/ja-JP/content/site-policy/privacy-policies/github-data-protection-agreement.md b/translations/ja-JP/content/site-policy/privacy-policies/github-data-protection-agreement.md
index 6bb63fbd78..91f2718617 100644
--- a/translations/ja-JP/content/site-policy/privacy-policies/github-data-protection-agreement.md
+++ b/translations/ja-JP/content/site-policy/privacy-policies/github-data-protection-agreement.md
@@ -378,7 +378,8 @@ The details of the transfer(s), and in particular the categories of personal dat
 
 The data exporter warrants that it has used reasonable efforts to determine that the data importer is able, through the implementation of appropriate technical and organisational measures, to satisfy its obligations under these Clauses.
 
-**8.1 Instructions** 
    
+**8.1 Instructions**
+  
      
       
    1. The data importer shall process the personal data only on documented instructions from the data exporter. The data exporter may give such instructions throughout the duration of the contract.
      2. 
       
    2. The data importer shall immediately inform the data exporter if it is unable to follow those instructions.
      3. 
   
    
diff --git a/translations/ja-JP/data/graphql/ghae/graphql_upcoming_changes.public-ghae.yml b/translations/ja-JP/data/graphql/ghae/graphql_upcoming_changes.public-ghae.yml
index 0fc739eed5..5e10ec4cfe 100644
--- a/translations/ja-JP/data/graphql/ghae/graphql_upcoming_changes.public-ghae.yml
+++ b/translations/ja-JP/data/graphql/ghae/graphql_upcoming_changes.public-ghae.yml
@@ -42,13 +42,6 @@ upcoming_changes:
     date: '2020-07-01T00:00:00+00:00'
     criticality: 破壊的
     owner: BrentWheeldon
-  - 
-    location: EnterpriseOwnerInfo.pendingCollaborators
-    description: '`pendingCollaborators`は削除されます。代わりに`pendingCollaboratorInvitations`フィールドを使用してください。'
-    reason: リポジトリの招待は、招待者だけではなくメールにも関連づけられるようになりました。
-    date: '2020-10-01T00:00:00+00:00'
-    criticality: 破壊的
-    owner: jdennes
   - 
     location: Issue.timeline
     description: '`timeline`は削除されます。代わりにIssue.timelineItemsを使ってください。'
@@ -63,13 +56,6 @@ upcoming_changes:
     date: '2020-10-01T00:00:00+00:00'
     criticality: 破壊的
     owner: mikesea
-  - 
-    location: RepositoryInvitationOrderField.INVITEE_LOGIN
-    description: '`INVITEE_LOGIN`は削除されます。'
-    reason: '`INVITEE_LOGIN` は有効なフィールド値ではなくなりました。リポジトリの招待は、招待者だけではなく、メールにも関連付けられるようになりました。'
-    date: '2020-10-01T00:00:00+00:00'
-    criticality: 破壊的
-    owner: jdennes
   - 
     location: EnterpriseMemberEdge.isUnlicensed
     description: '`isUnlicensed`は削除されます。'
@@ -84,13 +70,6 @@ upcoming_changes:
     date: '2021-01-01T00:00:00+00:00'
     criticality: 破壊的
     owner: BrentWheeldon
-  - 
-    location: EnterprisePendingCollaboratorEdge.isUnlicensed
-    description: '`isUnlicensed`は削除されます。'
-    reason: すべての保留中のコラボレータはライセンスを消費します
-    date: '2021-01-01T00:00:00+00:00'
-    criticality: 破壊的
-    owner: BrentWheeldon
   - 
     location: MergeStateStatus.DRAFT
     description: '`DRAFT`は削除されます。代わりにPullRequest.isDraftを使ってください。'
@@ -126,3 +105,17 @@ upcoming_changes:
     date: '2022-04-01'
     criticality: 破壊的
     owner: colinshum
+  - 
+    location: AddPullRequestToMergeQueueInput.branch
+    description: '`branch` will be removed.'
+    reason: PRs are added to the merge queue for the base branch, the `branch` argument is now a no-op
+    date: '2022-07-01T00:00:00+00:00'
+    criticality: 破壊的
+    owner: jhunschejones
+  - 
+    location: Enterprise.userAccounts
+    description: '`userAccounts` will be removed. Use the `Enterprise.members` field instead.'
+    reason: The `Enterprise.userAccounts` field is being removed.
+    date: '2022-07-01T00:00:00+00:00'
+    criticality: 破壊的
+    owner: jdennes
diff --git a/translations/ja-JP/data/graphql/ghec/graphql_upcoming_changes.public.yml b/translations/ja-JP/data/graphql/ghec/graphql_upcoming_changes.public.yml
index d54fd9ec40..e719382fe2 100644
--- a/translations/ja-JP/data/graphql/ghec/graphql_upcoming_changes.public.yml
+++ b/translations/ja-JP/data/graphql/ghec/graphql_upcoming_changes.public.yml
@@ -49,13 +49,6 @@ upcoming_changes:
     date: '2020-07-01T00:00:00+00:00'
     criticality: 破壊的
     owner: BrentWheeldon
-  - 
-    location: EnterpriseOwnerInfo.pendingCollaborators
-    description: '`pendingCollaborators`は削除されます。代わりに`pendingCollaboratorInvitations`フィールドを使用してください。'
-    reason: リポジトリの招待は、招待者だけではなくメールにも関連づけられるようになりました。
-    date: '2020-10-01T00:00:00+00:00'
-    criticality: 破壊的
-    owner: jdennes
   - 
     location: Issue.timeline
     description: '`timeline`は削除されます。代わりにIssue.timelineItemsを使ってください。'
@@ -70,13 +63,6 @@ upcoming_changes:
     date: '2020-10-01T00:00:00+00:00'
     criticality: 破壊的
     owner: mikesea
-  - 
-    location: RepositoryInvitationOrderField.INVITEE_LOGIN
-    description: '`INVITEE_LOGIN`は削除されます。'
-    reason: '`INVITEE_LOGIN` は有効なフィールド値ではなくなりました。リポジトリの招待は、招待者だけではなく、メールにも関連付けられるようになりました。'
-    date: '2020-10-01T00:00:00+00:00'
-    criticality: 破壊的
-    owner: jdennes
   - 
     location: Sponsorship.sponsor
     description: '`sponsor`は削除されます。代わりに`Sponsorship.sponsorEntity`を使ってください。'
@@ -98,13 +84,6 @@ upcoming_changes:
     date: '2021-01-01T00:00:00+00:00'
     criticality: 破壊的
     owner: BrentWheeldon
-  - 
-    location: EnterprisePendingCollaboratorEdge.isUnlicensed
-    description: '`isUnlicensed`は削除されます。'
-    reason: すべての保留中のコラボレータはライセンスを消費します
-    date: '2021-01-01T00:00:00+00:00'
-    criticality: 破壊的
-    owner: BrentWheeldon
   - 
     location: MergeStateStatus.DRAFT
     description: '`DRAFT`は削除されます。代わりにPullRequest.isDraftを使ってください。'
@@ -140,6 +119,20 @@ upcoming_changes:
     date: '2022-04-01'
     criticality: 破壊的
     owner: colinshum
+  - 
+    location: AddPullRequestToMergeQueueInput.branch
+    description: '`branch` will be removed.'
+    reason: PRs are added to the merge queue for the base branch, the `branch` argument is now a no-op
+    date: '2022-07-01T00:00:00+00:00'
+    criticality: 破壊的
+    owner: jhunschejones
+  - 
+    location: Enterprise.userAccounts
+    description: '`userAccounts` will be removed. Use the `Enterprise.members` field instead.'
+    reason: The `Enterprise.userAccounts` field is being removed.
+    date: '2022-07-01T00:00:00+00:00'
+    criticality: 破壊的
+    owner: jdennes
   - 
     location: Query.sponsorables.dependencyEcosystem
     description: '`dependencyEcosystem` will be removed. Use the ecosystem argument instead.'
diff --git a/translations/ja-JP/data/graphql/graphql_upcoming_changes.public.yml b/translations/ja-JP/data/graphql/graphql_upcoming_changes.public.yml
index d54fd9ec40..e719382fe2 100644
--- a/translations/ja-JP/data/graphql/graphql_upcoming_changes.public.yml
+++ b/translations/ja-JP/data/graphql/graphql_upcoming_changes.public.yml
@@ -49,13 +49,6 @@ upcoming_changes:
     date: '2020-07-01T00:00:00+00:00'
     criticality: 破壊的
     owner: BrentWheeldon
-  - 
-    location: EnterpriseOwnerInfo.pendingCollaborators
-    description: '`pendingCollaborators`は削除されます。代わりに`pendingCollaboratorInvitations`フィールドを使用してください。'
-    reason: リポジトリの招待は、招待者だけではなくメールにも関連づけられるようになりました。
-    date: '2020-10-01T00:00:00+00:00'
-    criticality: 破壊的
-    owner: jdennes
   - 
     location: Issue.timeline
     description: '`timeline`は削除されます。代わりにIssue.timelineItemsを使ってください。'
@@ -70,13 +63,6 @@ upcoming_changes:
     date: '2020-10-01T00:00:00+00:00'
     criticality: 破壊的
     owner: mikesea
-  - 
-    location: RepositoryInvitationOrderField.INVITEE_LOGIN
-    description: '`INVITEE_LOGIN`は削除されます。'
-    reason: '`INVITEE_LOGIN` は有効なフィールド値ではなくなりました。リポジトリの招待は、招待者だけではなく、メールにも関連付けられるようになりました。'
-    date: '2020-10-01T00:00:00+00:00'
-    criticality: 破壊的
-    owner: jdennes
   - 
     location: Sponsorship.sponsor
     description: '`sponsor`は削除されます。代わりに`Sponsorship.sponsorEntity`を使ってください。'
@@ -98,13 +84,6 @@ upcoming_changes:
     date: '2021-01-01T00:00:00+00:00'
     criticality: 破壊的
     owner: BrentWheeldon
-  - 
-    location: EnterprisePendingCollaboratorEdge.isUnlicensed
-    description: '`isUnlicensed`は削除されます。'
-    reason: すべての保留中のコラボレータはライセンスを消費します
-    date: '2021-01-01T00:00:00+00:00'
-    criticality: 破壊的
-    owner: BrentWheeldon
   - 
     location: MergeStateStatus.DRAFT
     description: '`DRAFT`は削除されます。代わりにPullRequest.isDraftを使ってください。'
@@ -140,6 +119,20 @@ upcoming_changes:
     date: '2022-04-01'
     criticality: 破壊的
     owner: colinshum
+  - 
+    location: AddPullRequestToMergeQueueInput.branch
+    description: '`branch` will be removed.'
+    reason: PRs are added to the merge queue for the base branch, the `branch` argument is now a no-op
+    date: '2022-07-01T00:00:00+00:00'
+    criticality: 破壊的
+    owner: jhunschejones
+  - 
+    location: Enterprise.userAccounts
+    description: '`userAccounts` will be removed. Use the `Enterprise.members` field instead.'
+    reason: The `Enterprise.userAccounts` field is being removed.
+    date: '2022-07-01T00:00:00+00:00'
+    criticality: 破壊的
+    owner: jdennes
   - 
     location: Query.sponsorables.dependencyEcosystem
     description: '`dependencyEcosystem` will be removed. Use the ecosystem argument instead.'
diff --git a/translations/ja-JP/data/reusables/actions/usage-workflow-run-time.md b/translations/ja-JP/data/reusables/actions/usage-workflow-run-time.md
index 0a25c5f61b..b12b6ba725 100644
--- a/translations/ja-JP/data/reusables/actions/usage-workflow-run-time.md
+++ b/translations/ja-JP/data/reusables/actions/usage-workflow-run-time.md
@@ -1 +1 @@
-- **ワークフローの実行時間** - 各ワークフローの実行は72時間までに制限されます。 ワークフローの実行がこの制限に達すると、そのワークフローの実行はキャンセルされます。
+- **Workflow run time** - {% ifversion fpt or ghec or ghes > 3.2 or ghae-issue-6469 %}Each workflow run is limited to 35 days. ワークフローの実行がこの制限に達すると、そのワークフローの実行はキャンセルされます。 This period includes execution duration, and time spent on waiting and approval.{% else %}Each workflow run is limited to 72 hours. If a workflow run reaches this limit, the workflow run is cancelled.{% endif %}
diff --git a/translations/ja-JP/data/reusables/enterprise_clustering/replacing-a-cluster-node-modify-cluster-conf.md b/translations/ja-JP/data/reusables/enterprise_clustering/replacing-a-cluster-node-modify-cluster-conf.md
index 7a2b75b235..dba235e95a 100644
--- a/translations/ja-JP/data/reusables/enterprise_clustering/replacing-a-cluster-node-modify-cluster-conf.md
+++ b/translations/ja-JP/data/reusables/enterprise_clustering/replacing-a-cluster-node-modify-cluster-conf.md
@@ -1,4 +1,6 @@
-1. 新たにプロビジョニングされた置き換えノードを追加するには、任意のノードで`cluster.conf`ファイルを修正し、障害が起きたノードを取り除き、置き換えのノードを追加します。 たとえば以下の修正された`cluster.conf`ファイルは、`ghe-data-node-3`を新たにプロビジョニングされた`ghe-replacement-data-node-3`で置き換えます。 
    +1. 新たにプロビジョニングされた置き換えノードを追加するには、任意のノードで`cluster.conf`ファイルを修正し、障害が起きたノードを取り除き、置き換えのノードを追加します。 たとえば以下の修正された`cluster.conf`ファイルは、`ghe-data-node-3`を新たにプロビジョニングされた`ghe-replacement-data-node-3`で置き換えます。
+
+  
       [cluster "ghe-replacement-data-node-3"]
     hostname = ghe-replacement-data-node-3
     ipv4 = 192.168.0.7
diff --git a/translations/ja-JP/data/reusables/enterprise_clustering/replacing-a-cluster-node-replacement-name.md b/translations/ja-JP/data/reusables/enterprise_clustering/replacing-a-cluster-node-replacement-name.md
index 3b576ab63d..c7077fd36a 100644
--- a/translations/ja-JP/data/reusables/enterprise_clustering/replacing-a-cluster-node-replacement-name.md
+++ b/translations/ja-JP/data/reusables/enterprise_clustering/replacing-a-cluster-node-replacement-name.md
@@ -1,6 +1,8 @@
 1. プライマリのMySQLもしくはRedisノードを置き換えようとしているなら、`cluster.conf`で`mysql-master`もしくは`redis-master`の値を置き換えるノード名に変更してください。
 
-  たとえば、以下の変更された`cluster.conf`ファイルは新しくプロビジョニングされたノードの`ghe-replacement-data-node-1`をプライマリのMySQL及びRedisノードとして指定しています。 
    +  たとえば、以下の変更された`cluster.conf`ファイルは新しくプロビジョニングされたノードの`ghe-replacement-data-node-1`をプライマリのMySQL及びRedisノードとして指定しています。
+
+  
       mysql-master = ghe-replacement-data-node-1
   redis-master = ghe-replacement-data-node-1
   
    
diff --git a/translations/ja-JP/data/reusables/pull_requests/merge-queue-merging-method.md b/translations/ja-JP/data/reusables/pull_requests/merge-queue-merging-method.md
index d1f2bac8d7..835c80cbc7 100644
--- a/translations/ja-JP/data/reusables/pull_requests/merge-queue-merging-method.md
+++ b/translations/ja-JP/data/reusables/pull_requests/merge-queue-merging-method.md
@@ -1,2 +1,3 @@
-Once CI checks pass, {% data variables.product.product_name %} merges the pull request by fast-forwarding the default branch. The merge queue will use merge commits if the "Require linear history" branch protection setting is turned off, and the "Rebase and merge" method otherwise. 
- 
+{% data variables.product.product_name %} merges the pull request according to the merge strategy configured in the branch protection once all required CI checks pass.
+
+![Merge queue merging method](/assets/images/help/pull_requests/merge-queue-merging-method.png)
\ No newline at end of file
diff --git a/translations/ja-JP/data/reusables/pull_requests/merge-queue-overview-short.md b/translations/ja-JP/data/reusables/pull_requests/merge-queue-overview-short.md
deleted file mode 100644
index 4b2b9145bf..0000000000
--- a/translations/ja-JP/data/reusables/pull_requests/merge-queue-overview-short.md
+++ /dev/null
@@ -1,3 +0,0 @@
-If repository administrators enable merge queues for pull requests targeting selected branches within a repository, contributors to these branches can add their pull requests to a merge queue once the required checks have passed.
-
-{% data variables.product.product_name %} will process the merge queue, and will merge the pull requests on your behalf if you're a contributor, by fast-forwarding the default branch.
diff --git a/translations/ja-JP/data/reusables/pull_requests/merge-queue-overview.md b/translations/ja-JP/data/reusables/pull_requests/merge-queue-overview.md
index 6e2a7cdd0f..c4c8b41566 100644
--- a/translations/ja-JP/data/reusables/pull_requests/merge-queue-overview.md
+++ b/translations/ja-JP/data/reusables/pull_requests/merge-queue-overview.md
@@ -1,5 +1,5 @@
-Merge queues for pull requests can increase the rate at which pull requests are merged into a busy default branch, whilst ensuring that CI checks pass.
+A merge queue can increase the rate at which pull requests are merged into a busy target branch while ensuring that all required branch protection checks pass.
 
-Merge queues use {% data variables.product.prodname_actions %}. For more information about actions, see "[{% data variables.product.prodname_actions %}](/actions/)."
+Once a pull request has passed all of the required branch protection checks, a user with write access to the repository can add that pull request to a merge queue.
 
-Once a pull request has passed any required checks and approvals, a contributor with write access can add the pull request to the merge queue. The queue then creates a temporary branch with that pull request and any pull requests ahead of it in the queue, and triggers any required continuous integration (CI) checks.
+A merge queue may use {% data variables.product.prodname_actions %}. For more information, see "[{% data variables.product.prodname_actions %}](/actions/)."
diff --git a/translations/ja-JP/data/reusables/pull_requests/merge-queue-references.md b/translations/ja-JP/data/reusables/pull_requests/merge-queue-references.md
index a0247330e7..ed073e1647 100644
--- a/translations/ja-JP/data/reusables/pull_requests/merge-queue-references.md
+++ b/translations/ja-JP/data/reusables/pull_requests/merge-queue-references.md
@@ -1,2 +1,2 @@
 
-For more information about merge queues, see "[Using a merge queue](/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/using-a-merge-queue)."
+For information about merge queue, see "[Managing a merge queue](/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue)."
diff --git a/translations/ja-JP/data/reusables/pull_requests/merge-queue-reject.md b/translations/ja-JP/data/reusables/pull_requests/merge-queue-reject.md
index 49a59dca54..d7a40d1716 100644
--- a/translations/ja-JP/data/reusables/pull_requests/merge-queue-reject.md
+++ b/translations/ja-JP/data/reusables/pull_requests/merge-queue-reject.md
@@ -1,2 +1,2 @@
 
-If there are failed status checks or conflicts with the base branch, {% data variables.product.product_name %} will remove the pull request from the queue. The pull request timeline will display the reason why the pull request has been removed from the queue.
+After grouping a pull request with the latest version of the target branch and changes ahead of it in the queue, if there are failed required status checks or conflicts with the base branch, {% data variables.product.product_name %} will remove the pull request from the queue. The pull request timeline will display the reason why the pull request was removed from the queue.
diff --git a/translations/log/ja-resets.csv b/translations/log/ja-resets.csv
index dc5ea5b455..58d48ef82a 100644
--- a/translations/log/ja-resets.csv
+++ b/translations/log/ja-resets.csv
@@ -249,9 +249,9 @@ translations/ja-JP/data/reusables/dotcom_billing/lfs-remove-data.md,broken liqui
 translations/ja-JP/data/reusables/education/apply-for-team.md,broken liquid tags
 translations/ja-JP/data/reusables/enterprise-accounts/actions-tab.md,broken liquid tags
 translations/ja-JP/data/reusables/enterprise-accounts/hooks-tab.md,Listed in localization-support#489
-translations/ja-JP/data/reusables/enterprise-accounts/hooks-tab.md,broken liquid tags
+translations/ja-JP/data/reusables/enterprise-accounts/hooks-tab.md,rendering error
 translations/ja-JP/data/reusables/enterprise-accounts/messages-tab.md,Listed in localization-support#489
-translations/ja-JP/data/reusables/enterprise-accounts/messages-tab.md,broken liquid tags
+translations/ja-JP/data/reusables/enterprise-accounts/messages-tab.md,rendering error
 translations/ja-JP/data/reusables/enterprise-accounts/pages-tab.md,broken liquid tags
 translations/ja-JP/data/reusables/enterprise_installation/download-appliance.md,broken liquid tags
 translations/ja-JP/data/reusables/enterprise_installation/hardware-considerations-all-platforms.md,broken liquid tags