Merge VS Code 1.21 source code (#1067)

* Initial VS Code 1.21 file copy with patches

* A few more merges

* Post npm install

* Fix batch of build breaks

* Fix more build breaks

* Fix more build errors

* Fix more build breaks

* Runtime fixes 1

* Get connection dialog working with some todos

* Fix a few packaging issues

* Copy several node_modules to package build to fix loader issues

* Fix breaks from master

* A few more fixes

* Make tests pass

* First pass of license header updates

* Second pass of license header updates

* Fix restore dialog issues

* Remove add additional themes menu items

* fix select box issues where the list doesn't show up

* formatting

* Fix editor dispose issue

* Copy over node modules to correct location on all platforms

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

@@ -1,9 +1,13 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-// Do not edit this file. It is machine generated.
 {
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the Source EULA. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "Git",
+	"description": "Git 源代码管理集成",
 	"command.clone": "克隆",
 	"command.init": "初始化存储库",
 	"command.close": "关闭存储库",
@@ -54,12 +58,13 @@
 	"command.stashPopLatest": "弹出最新储藏",
 	"config.enabled": "是否启用 Git",
 	"config.path": "Git 可执行文件路径",
+	"config.autoRepositoryDetection": "是否自动检测存储库",
 	"config.autorefresh": "是否启用自动刷新",
 	"config.autofetch": "是否启用自动拉取",
 	"config.enableLongCommitWarning": "是否针对长段提交消息进行警告",
 	"config.confirmSync": "同步 GIT 存储库前请先进行确认",
 	"config.countBadge": "控制 Git 徽章计数器。“all”计算所有更改。“tracked”只计算跟踪的更改。“off”关闭此功能。",
-	"config.checkoutType": "控制运行“签出到...”命令时列出的分支的类型。\"all\" 显示所有 refs，\"local\" 只显示本地分支，\"tags\" 只显示标记，\"remote\" 只显示远程分支。",
+	"config.checkoutType": "控制运行“签出到...”功能时列出的分支类型。\"all\" 显示所有 refs，\"local\" 只显示本地分支，\"tags\" 只显示标签，\"remote\" 只显示远程分支。",
 	"config.ignoreLegacyWarning": "忽略旧版 Git 警告",
 	"config.ignoreMissingGitWarning": "忽略“缺失 Git”警告",
 	"config.ignoreLimitWarning": "忽略“存储库中存在大量更改”的警告",
@@ -68,9 +73,14 @@
 	"config.enableCommitSigning": "启用使用 GPG 签名的提交",
 	"config.discardAllScope": "控制运行“放弃所有更改”命令时放弃的更改类型。\"all\" 放弃所有更改。\"tracked\" 只放弃跟踪的文件。\"prompt\" 表示在每次运行此操作时显示提示对话框。",
 	"config.decorations.enabled": "控制 Git 是否向资源管理器和“打开的编辑器”视图添加颜色和小标。",
+	"config.promptToSaveFilesBeforeCommit": "控制 Git 是否在提交之前检查未保存的文件。",
+	"config.showInlineOpenFileAction": "控制是否在 Git 更改视图中显示内联“打开文件”操作。",
+	"config.inputValidation": "控制何时显示提交消息输入验证。",
+	"config.detectSubmodules": "控制是否自动检测 Git 子模块。",
 	"colors.modified": "已修改资源的颜色。",
 	"colors.deleted": "已删除资源的颜色。",
 	"colors.untracked": "未跟踪资源的颜色。",
 	"colors.ignored": "已忽略资源的颜色。",
-	"colors.conflict": "存在冲突的资源的颜色。"
+	"colors.conflict": "存在冲突的资源的颜色。",
+	"colors.submodule": "子模块资源的颜色。"
 }