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/jpn/src/vs/editor/browser/services/bulkEdit.i18n.json

@@ -1,11 +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.
 {
-	"conflict": "この間に次のファイルが変更されました: {0}",
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
 	"summary.0": "編集は行われませんでした",
 	"summary.nm": "{1} 個のファイルで {0} 件のテキスト編集を実行",
-	"summary.n0": "1 つのファイルで {0} 個のテキストを編集"
+	"summary.n0": "1 つのファイルで {0} 個のテキストを編集",
+	"conflict": "この間に次のファイルが変更されました: {0}"
 }

i18n/jpn/src/vs/editor/browser/widget/diffEditorWidget.i18n.json

@@ -1,8 +1,10 @@
-/*---------------------------------------------------------------------------------------------
- *  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."
+	],
 	"diff.tooLarge": "一方のファイルが大きすぎるため、ファイルを比較できません。"
 }

i18n/jpn/src/vs/editor/browser/widget/diffReview.i18n.json

@@ -1,9 +1,11 @@
-/*---------------------------------------------------------------------------------------------
- *  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."
+	],
 	"label.close": "閉じる",
 	"header": "{1} の差分 {0}: 変更前の {2}、{3} 行、変更後の {4}、{5} 行",
 	"blankLine": "空白",