From 641d2951639217d72a91159651a697df6b567bc3 Mon Sep 17 00:00:00 2001 From: Jinjing <6427696+AmethystLiang@users.noreply.github.com> Date: Tue, 4 Aug 2026 02:09:35 -0700 Subject: [PATCH] fix(i18n): localize the remaining pull-policy and PR-action reasons (#5640) Most of #5640 landed independently, but 12 strings were still falling through to English: the ko "Diverged" pull-policy notice, and the ja source-control primary-action blocked reasons. Co-authored-by: Jinjing <6427696+AmethystLiang@users.noreply.github.com> Co-authored-by: Orca --- src/renderer/src/i18n/locales/ja.json | 24 ++++++++++++------------ src/renderer/src/i18n/locales/ko.json | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json index 376e5a7121a..06892f1b47a 100644 --- a/src/renderer/src/i18n/locales/ja.json +++ b/src/renderer/src/i18n/locales/ja.json @@ -11025,19 +11025,19 @@ "8c6d15a07d": "PR を作成", "d37e68f61d": "レビュー用にブランチを準備中…", "c72e5e65d1": "このブランチを準備して {{value0}} を作成", - "b8e4f2a901": "Wait for the remote operation to finish.", - "c9f3a1b802": "Resolve conflicts before creating a {{value0}}.", - "d2a8c4e703": "No changes on this branch to include in a {{value0}}.", - "e3b9d5f814": "Cannot create a {{value0}} from the default branch.", - "f4c0e6a925": "Commit changes before creating a {{value0}}.", - "a5d1f7b036": "Publish commits before creating a {{value0}}.", - "b6e2a8c147": "Push commits before creating a {{value0}}.", - "c7f3b9d258": "Sync this branch before creating a {{value0}}.", - "d8a4c0e369": "Authenticate before creating a {{value0}}.", - "e9b5d1f470": "Check out a branch before creating a {{value0}}.", - "f0c6e2a581": "This branch is not ready for a {{value0}} yet.", + "b8e4f2a901": "リモート操作が終了するまでお待ちください。", + "c9f3a1b802": "{{value0}} を作成する前に競合を解決してください。", + "d2a8c4e703": "このブランチに {{value0}} に含める変更はありません。", + "e3b9d5f814": "デフォルトブランチから {{value0}} を作成することはできません。", + "f4c0e6a925": "{{value0}} を作成する前に変更を commit してください。", + "a5d1f7b036": "{{value0}} を作成する前に commit を公開してください。", + "b6e2a8c147": "{{value0}} を作成する前に commit をプッシュしてください。", + "c7f3b9d258": "{{value0}} を作成する前にこのブランチを同期してください。", + "d8a4c0e369": "{{value0}} を作成する前に認証してください。", + "e9b5d1f470": "{{value0}} を作成する前にブランチをチェックアウトしてください。", + "f0c6e2a581": "このブランチはまだ {{value0}} の準備ができていません。", "8f9a0b1c2d": "コミットするものがありません。ブランチは最新です。", - "h3i4j5k607": "Checking whether this branch can create a {{value0}}…" + "h3i4j5k607": "このブランチが {{value0}} を作成できるか確認中…" } } } diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json index 4a3cf0378ea..37db2d6b69f 100644 --- a/src/renderer/src/i18n/locales/ko.json +++ b/src/renderer/src/i18n/locales/ko.json @@ -11289,7 +11289,7 @@ "fastForwardOnly": "fast-forward만 허용", "fastForwardOnlyDescription": "병합이나 리베이스가 필요 없을 때만 pull합니다.", "title": "Pull 정책 필요", - "diverged": "Diverged", + "diverged": "분기됨", "body": "이 브랜치에는 로컬 commits과 원격 commits이 모두 있습니다. 이 워크트리 또는 SSH 호스트에서 명령 하나를 실행한 다음 풀 또는 동기화를 다시 시도하세요.", "copyAria": "{{value0}} pull 정책 명령 복사", "copied": "복사됨",