diff options
Diffstat (limited to 'i18n/chs/extensions/git')
| -rw-r--r-- | i18n/chs/extensions/git/out/commands.i18n.json | 5 | ||||
| -rw-r--r-- | i18n/chs/extensions/git/package.i18n.json | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/i18n/chs/extensions/git/out/commands.i18n.json b/i18n/chs/extensions/git/out/commands.i18n.json index ceede002e08..f87bd986082 100644 --- a/i18n/chs/extensions/git/out/commands.i18n.json +++ b/i18n/chs/extensions/git/out/commands.i18n.json @@ -11,6 +11,7 @@ "cloning": "正在克隆 GIT 存储库...", "openrepo": "打开存储库", "proposeopen": "是否要打开已克隆存储库?", + "HEAD not available": "“{0}”的 HEAD 版本不可用。", "confirm revert": "是否确实要还原 {0} 中的已选更改?", "revert": "还原更改", "confirm discard": "确定要放弃 {0} 中更改吗?", @@ -24,12 +25,16 @@ "no changes": "没有要提交的更改。", "commit message": "提交消息", "provide commit message": "请提供提交消息", + "select a ref to checkout": "选择要签出的 ref", "branch name": "分支名称", "provide branch name": "请提供分支名称", "select branch to delete": "选择要删除的分支", "confirm force delete branch": "“{0}”分支未被完全合并。是否仍要删除？", "delete branch": "删除分支", + "select a branch to merge from": "选择要从其合并的分支", + "merge conflicts": "存在合并冲突。请在提交之前解决这些冲突。", "no remotes to pull": "存储库未配置任何从其中进行拉取的远程存储库。", + "pick remote pull repo": "选择要从其拉取分支的远程位置", "no remotes to push": "存储库未配置任何要推送到的远程存储库。", "nobranch": "请签出一个分支以推送到远程。", "pick remote": "选取要将分支“{0}”发布到的远程:", diff --git a/i18n/chs/extensions/git/package.i18n.json b/i18n/chs/extensions/git/package.i18n.json index 792d3e841ba..a4e031e5adb 100644 --- a/i18n/chs/extensions/git/package.i18n.json +++ b/i18n/chs/extensions/git/package.i18n.json @@ -9,6 +9,7 @@ "command.refresh": "刷新", "command.openChange": "打开更改", "command.openFile": "打开文件", + "command.openHEADFile": "打开文件 (HEAD)", "command.stage": "暂存更改", "command.stageAll": "暂存所有更改", "command.stageSelectedRanges": "暂存所选范围", @@ -27,13 +28,16 @@ "command.checkout": "签出到...", "command.branch": "创建分支...", "command.deleteBranch": "删除分支...", + "command.merge": "合并分支...", "command.pull": "拉取", "command.pullRebase": "拉取(变基)", + "command.pullFrom": "拉取自...", "command.push": "推送", "command.pushTo": "推送到...", "command.sync": "同步", "command.publish": "发布分支", "command.showOutput": "显示 GIT 输出", + "command.ignore": "将文件添加到 .gitignore", "config.enabled": "是否已启用 GIT", "config.path": "Git 可执行文件路径", "config.autorefresh": "是否已启用自动刷新", @@ -44,5 +48,6 @@ "config.checkoutType": "控制运行“签出到...”时列出的分支的类型。“all”显示所有 refs，“local”只显示本地分支，“tags”只显示标签，“remote”只显示远程分支。", "config.ignoreLegacyWarning": "忽略旧版 Git 警告", "config.ignoreLimitWarning": "忽略“存储库中存在大量更改”的警告", - "config.defaultCloneDirectory": "克隆 Git 存储库的默认位置" + "config.defaultCloneDirectory": "克隆 Git 存储库的默认位置", + "config.enableSmartCommit": "在没有暂存的更改时提交所有更改。" }
\ No newline at end of file |