diff --git a/packages/app/src/i18n/resources.test.ts b/packages/app/src/i18n/resources.test.ts index 4e00a7ccb5..de25b85059 100644 --- a/packages/app/src/i18n/resources.test.ts +++ b/packages/app/src/i18n/resources.test.ts @@ -164,6 +164,28 @@ describe("translation resources", () => { } }); + it("distinguishes Git stashing from staging in Chinese action and restore guidance", () => { + const unavailable = zhCN.workspace.git.actions.unavailable; + const branchSwitcher = zhCN.branchSwitcher; + const stashGuidance = [ + unavailable.pullDirty, + unavailable.pullAndPushDirty, + unavailable.mergeDirty, + unavailable.updateDirty, + branchSwitcher.uncommittedMessage, + branchSwitcher.stashAndSwitch, + branchSwitcher.failedToStash, + branchSwitcher.restoreStashTitle, + branchSwitcher.restoreStashMessage, + branchSwitcher.stashRestored, + ]; + + for (const label of stashGuidance) { + expect(label).toContain("贮藏(stash)"); + expect(label).not.toContain("暂存"); + } + }); + it("preserves interpolation placeholders in every language", () => { expect(findInterpolationMismatches(ar)).toEqual([]); expect(findInterpolationMismatches(es)).toEqual([]); diff --git a/packages/app/src/i18n/resources/zh-CN.ts b/packages/app/src/i18n/resources/zh-CN.ts index ca364718c3..281594c707 100644 --- a/packages/app/src/i18n/resources/zh-CN.ts +++ b/packages/app/src/i18n/resources/zh-CN.ts @@ -841,23 +841,23 @@ export const zhCN: TranslationResources = { unavailable: { viewPrNoForge: "当前无法查看 {{noun}},因为 {{brand}} 未连接", pullNoRemote: "此处无法拉取,因为此分支尚未连接到远程仓库", - pullDirty: "有本地变更时无法拉取,请先提交或暂存", + pullDirty: "有本地变更时无法拉取,请先提交或贮藏(stash)", pullUpToDate: "无法拉取,因为此分支已是最新", pushNoRemote: "此处无法推送,因为此分支尚未连接到远程仓库", pushBehind: "暂时无法推送,因为需要先拉取更新的变更", pushNothing: "无法推送,因为没有新的内容可发送", pullAndPushNoRemote: "此处无法拉取并推送,因为此分支尚未连接到远程仓库", - pullAndPushDirty: "有本地变更时无法拉取并推送,请先提交或暂存", + pullAndPushDirty: "有本地变更时无法拉取并推送,请先提交或贮藏(stash)", pullAndPushNoIncoming: "无法拉取并推送,因为没有需要先拉取的传入变更", pullAndPushInSync: "无法拉取并推送,因为此分支已同步", pullAndPushNothingToPush: "无法拉取并推送,因为拉取之后没有新的内容可发送", createPrNoForge: "当前无法创建 {{noun}},因为 {{brand}} 未连接", createPrNoCommits: "无法创建 PR,因为此分支还没有新的提交", mergeNoBase: "无法合并,因为无法确定基准分支", - mergeDirty: "有本地变更时无法合并,请先提交或暂存", + mergeDirty: "有本地变更时无法合并,请先提交或贮藏(stash)", mergeNothing: "无法合并,因为此分支没有可合并的新内容", updateNoBase: "无法更新,因为无法确定基准分支", - updateDirty: "有本地变更时无法更新,请先提交或暂存", + updateDirty: "有本地变更时无法更新,请先提交或贮藏(stash)", updateCurrent: "无法更新,因为此分支已与 {{baseRef}} 保持最新", mergePrNoGithub: "当前无法合并 PR,因为 GitHub 未连接", archiveNotWorktree: "此处无法归档,因为此工作区不是作为 Paseo worktree 创建的", @@ -1509,15 +1509,15 @@ export const zhCN: TranslationResources = { empty: "没有找到分支。", title: "切换分支", uncommittedTitle: "未提交的变更", - uncommittedMessage: "你有未提交的变更。切换分支前要先暂存吗?", - stashAndSwitch: "暂存并切换", - failedToStash: "暂存变更失败", + uncommittedMessage: "你有未提交的变更。切换分支前要先贮藏(stash)这些变更吗?", + stashAndSwitch: "贮藏(stash)并切换", + failedToStash: "贮藏(stash)变更失败", failedToSwitch: "切换分支失败", - restoreStashTitle: "恢复暂存变更?", - restoreStashMessage: "此分支有上一会话暂存的变更。要恢复它们吗?", + restoreStashTitle: "恢复贮藏(stash)的变更?", + restoreStashMessage: "此分支有上一会话贮藏(stash)的变更。要将它们恢复到工作树吗?", restore: "恢复", later: "稍后", - stashRestored: "暂存变更已恢复", + stashRestored: "贮藏(stash)的变更已恢复", }, agentAutocomplete: { searchingWorkspace: "正在搜索工作区...",