Merge VS Code 1.23.1 (#1520)

i18n/chs/extensions/git/out/commands.i18n.json

@@ -11,9 +11,7 @@
 	"create branch": "$(plus) 创建新分支",
 	"repourl": "存储库 URL",
 	"parent": "父目录",
-	"cancel": "$(sync~spin) 正在克隆存储库... 点击取消",
-	"cancel tooltip": "取消克隆",
-	"cloning": "正在克隆 Git 存储库...",
+	"cloning": "正在克隆 Git 存储库“{0}”...",
 	"openrepo": "打开存储库",
 	"proposeopen": "是否要打开已克隆存储库?",
 	"init": "选择用于初始化 Git 储存库的工作区文件夹",
@@ -75,7 +73,7 @@
 	"ok": "确定",
 	"push with tags success": "已成功带标签进行推送。",
 	"pick remote": "选取要将分支“{0}”发布到的远程:",
-	"sync is unpredictable": "此操作将推送提交至“{0}”，并从中拉取提交。",
+	"sync is unpredictable": "此操作将推送提交至“{0}/{1}”，并从中拉取提交。",
 	"never again": "确定，且不再显示",
 	"no remotes to publish": "存储库未配置任何要发布到的远程存储库。",
 	"no changes stash": "没有要储藏的更改。",

i18n/chs/extensions/git/out/main.i18n.json

@@ -6,8 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"looking": "在 {0} 查找 Git 中",
-	"using git": "使用 {1} 中的 Git {0}",
+	"looking": "正在查找 Git: {0}",
+	"using git": "将使用位于 {1} 的 Git {0}",
 	"downloadgit": "下载 Git",
 	"neverShowAgain": "不再显示",
 	"notfound": "未找到 Git。请安装 Git，或在 \"git.path\" 设置中配置。",

i18n/chs/extensions/git/package.i18n.json

@@ -26,7 +26,7 @@
 	"command.unstageSelectedRanges": "取消暂存所选范围",
 	"command.clean": "放弃更改",
 	"command.cleanAll": "放弃所有更改",
-	"command.commit": "Commit",
+	"command.commit": "提交",
 	"command.commitStaged": "提交已暂存文件",
 	"command.commitStagedSigned": "提交已暂存文件(已签名)",
 	"command.commitStagedAmend": "已暂存提交(修改)",
@@ -62,10 +62,10 @@
 	"config.autorefresh": "是否启用自动刷新",
 	"config.autofetch": "是否启用自动拉取",
 	"config.enableLongCommitWarning": "是否针对长段提交消息进行警告",
-	"config.confirmSync": "同步 GIT 存储库前请先进行确认",
+	"config.confirmSync": "同步 Git 存储库前进行确认",
 	"config.countBadge": "控制 Git 徽章计数器。“all”计算所有更改。“tracked”只计算跟踪的更改。“off”关闭此功能。",
 	"config.checkoutType": "控制运行“签出到...”功能时列出的分支类型。\"all\" 显示所有 refs，\"local\" 只显示本地分支，\"tags\" 只显示标签，\"remote\" 只显示远程分支。",
-	"config.ignoreLegacyWarning": "忽略旧版 Git 警告",
+	"config.ignoreLegacyWarning": "忽略“旧版 Git”警告",
 	"config.ignoreMissingGitWarning": "忽略“缺失 Git”警告",
 	"config.ignoreLimitWarning": "忽略“存储库中存在大量更改”的警告",
 	"config.defaultCloneDirectory": "克隆 Git 存储库的默认位置",
@@ -77,6 +77,7 @@
 	"config.showInlineOpenFileAction": "控制是否在 Git 更改视图中显示内联“打开文件”操作。",
 	"config.inputValidation": "控制何时显示提交消息输入验证。",
 	"config.detectSubmodules": "控制是否自动检测 Git 子模块。",
+	"config.detectSubmodulesLimit": "控制可检测到的 Git 子模块的限制。",
 	"colors.modified": "已修改资源的颜色。",
 	"colors.deleted": "已删除资源的颜色。",
 	"colors.untracked": "未跟踪资源的颜色。",